mirror of
https://github.com/openai/codex.git
synced 2026-11-16 22:00:36 +00:00
Merge remote-tracking branch 'origin/main' into pakrym/core-cwd-absolutepathbuf
# Conflicts: # codex-rs/cli/src/main.rs # codex-rs/core/src/tasks/user_shell.rs # codex-rs/core/src/unified_exec/process_manager.rs
This commit is contained in:
@@ -7,8 +7,8 @@
|
||||
mod cli;
|
||||
mod event_processor;
|
||||
mod event_processor_with_human_output;
|
||||
pub mod event_processor_with_jsonl_output;
|
||||
pub mod exec_events;
|
||||
pub(crate) mod event_processor_with_jsonl_output;
|
||||
pub(crate) mod exec_events;
|
||||
|
||||
pub use cli::Cli;
|
||||
pub use cli::Command;
|
||||
@@ -85,7 +85,42 @@ use codex_utils_absolute_path::AbsolutePathBuf;
|
||||
use codex_utils_oss::ensure_oss_provider_ready;
|
||||
use codex_utils_oss::get_default_model_for_oss_provider;
|
||||
use event_processor_with_human_output::EventProcessorWithHumanOutput;
|
||||
use event_processor_with_jsonl_output::EventProcessorWithJsonOutput;
|
||||
pub use event_processor_with_jsonl_output::CodexStatus;
|
||||
pub use event_processor_with_jsonl_output::CollectedThreadEvents;
|
||||
pub use event_processor_with_jsonl_output::EventProcessorWithJsonOutput;
|
||||
pub use exec_events::AgentMessageItem;
|
||||
pub use exec_events::CollabAgentState;
|
||||
pub use exec_events::CollabAgentStatus;
|
||||
pub use exec_events::CollabTool;
|
||||
pub use exec_events::CollabToolCallItem;
|
||||
pub use exec_events::CollabToolCallStatus;
|
||||
pub use exec_events::CommandExecutionItem;
|
||||
pub use exec_events::CommandExecutionStatus;
|
||||
pub use exec_events::ErrorItem;
|
||||
pub use exec_events::FileChangeItem;
|
||||
pub use exec_events::FileUpdateChange;
|
||||
pub use exec_events::ItemCompletedEvent;
|
||||
pub use exec_events::ItemStartedEvent;
|
||||
pub use exec_events::ItemUpdatedEvent;
|
||||
pub use exec_events::McpToolCallItem;
|
||||
pub use exec_events::McpToolCallItemError;
|
||||
pub use exec_events::McpToolCallItemResult;
|
||||
pub use exec_events::McpToolCallStatus;
|
||||
pub use exec_events::PatchApplyStatus;
|
||||
pub use exec_events::PatchChangeKind;
|
||||
pub use exec_events::ReasoningItem;
|
||||
pub use exec_events::ThreadErrorEvent;
|
||||
pub use exec_events::ThreadEvent;
|
||||
pub use exec_events::ThreadItem as ExecThreadItem;
|
||||
pub use exec_events::ThreadItemDetails;
|
||||
pub use exec_events::ThreadStartedEvent;
|
||||
pub use exec_events::TodoItem;
|
||||
pub use exec_events::TodoListItem;
|
||||
pub use exec_events::TurnCompletedEvent;
|
||||
pub use exec_events::TurnFailedEvent;
|
||||
pub use exec_events::TurnStartedEvent;
|
||||
pub use exec_events::Usage;
|
||||
pub use exec_events::WebSearchItem;
|
||||
use serde_json::Value;
|
||||
use std::collections::HashMap;
|
||||
use std::io::IsTerminal;
|
||||
@@ -105,7 +140,6 @@ use tracing_subscriber::prelude::*;
|
||||
use uuid::Uuid;
|
||||
|
||||
use crate::cli::Command as ExecCommand;
|
||||
use crate::event_processor::CodexStatus;
|
||||
use crate::event_processor::EventProcessor;
|
||||
|
||||
const DEFAULT_ANALYTICS_ENABLED: bool = true;
|
||||
|
||||
Reference in New Issue
Block a user