clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-04-30 17:36:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: case where agent is already closed (#15163)

Browse Source
This commit is contained in:
jif-oai
2026-03-19 12:12:50 +00:00
committed by GitHub
parent 70cdb17703
commit 32d2df5c1e
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
codex-rs/core/src/agent/control.rs
View File

@@ -444,11 +444,17 @@ impl AgentControl {
/// persisted spawn-edge state.
pub(crate) async fn shutdown_live_agent(&self, agent_id: ThreadId) -> CodexResult<String> {
let state = self.upgrade()?;
if let Ok(thread) = state.get_thread(agent_id).await {
let result = if let Ok(thread) = state.get_thread(agent_id).await {
thread.codex.session.ensure_rollout_materialized().await;
thread.codex.session.flush_rollout().await;
}
let result = state.send_op(agent_id, Op::Shutdown {}).await;
if matches!(thread.agent_status().await, AgentStatus::Shutdown) {
Ok(String::new())
} else {
state.send_op(agent_id, Op::Shutdown {}).await
}
} else {
state.send_op(agent_id, Op::Shutdown {}).await
};
let _ = state.remove_thread(&agent_id).await;
self.state.release_spawned_thread(agent_id);
result