This commit is contained in:
jif-oai
2026-03-30 19:20:58 +02:00
parent 9e6edbb1bc
commit 51062332c2
5 changed files with 22 additions and 22 deletions
+1 -1
View File
@@ -6,8 +6,8 @@ use tokio_util::sync::CancellationToken;
use crate::codex::TurnContext;
use crate::codex::run_turn;
use crate::protocol::EventMsg;
use crate::protocol::TurnStartedEvent;
use crate::protocol::TurnOutcome;
use crate::protocol::TurnStartedEvent;
use crate::session_startup_prewarm::SessionStartupPrewarmResolution;
use crate::state::TaskKind;
use codex_protocol::user_input::UserInput;
+1 -1
View File
@@ -2,9 +2,9 @@ use std::sync::Arc;
use crate::codex::TurnContext;
use crate::protocol::EventMsg;
use crate::protocol::TurnOutcome;
use crate::protocol::UndoCompletedEvent;
use crate::protocol::UndoStartedEvent;
use crate::protocol::TurnOutcome;
use crate::state::TaskKind;
use crate::tasks::SessionTask;
use crate::tasks::SessionTaskContext;
+1 -1
View File
@@ -23,8 +23,8 @@ use crate::protocol::ExecCommandEndEvent;
use crate::protocol::ExecCommandSource;
use crate::protocol::ExecCommandStatus;
use crate::protocol::SandboxPolicy;
use crate::protocol::TurnStartedEvent;
use crate::protocol::TurnOutcome;
use crate::protocol::TurnStartedEvent;
use crate::sandboxing::ExecRequest;
use crate::state::TaskKind;
use crate::tools::format_exec_output_str;
+12 -12
View File
@@ -762,18 +762,18 @@ fn append_terminal_turn_events(events: &mut Vec<Event>, turn: &Turn, include_fai
turn_id: turn.id.clone(),
outcome: TurnOutcome::Failed {
error: ErrorEvent {
message: turn
.error
.as_ref()
.map(|error| error.message.clone())
.unwrap_or_default(),
codex_error_info: turn.error.as_ref().and_then(|error| {
error
.codex_error_info
.clone()
.and_then(app_server_codex_error_info_to_core)
}),
},
message: turn
.error
.as_ref()
.map(|error| error.message.clone())
.unwrap_or_default(),
codex_error_info: turn.error.as_ref().and_then(|error| {
error
.codex_error_info
.clone()
.and_then(app_server_codex_error_info_to_core)
}),
},
},
}),
});
+7 -7
View File
@@ -6925,16 +6925,16 @@ impl ChatWidget {
self.on_task_started();
}
}
EventMsg::TurnComplete(codex_protocol::protocol::TurnCompleteEvent { outcome, .. }) => {
match outcome {
codex_protocol::protocol::TurnOutcome::Succeeded { last_agent_message } => {
EventMsg::TurnComplete(codex_protocol::protocol::TurnCompleteEvent {
outcome, ..
}) => match outcome {
codex_protocol::protocol::TurnOutcome::Succeeded { last_agent_message } => {
self.on_task_complete(last_agent_message, from_replay);
}
codex_protocol::protocol::TurnOutcome::Failed { error } => {
self.on_error(error.message);
}
codex_protocol::protocol::TurnOutcome::Failed { error } => {
self.on_error(error.message);
}
}
},
EventMsg::TokenCount(ev) => {
self.set_token_info(ev.info);
self.on_rate_limit_snapshot(ev.rate_limits);