mirror of
https://github.com/openai/codex.git
synced 2026-11-16 22:00:36 +00:00
Reload Multi-Agent V2 children through their parent (#40477)
## Why Multi-Agent V2 children are owned by their parent at runtime. Resuming an unloaded child directly could rebuild it from caller-provided settings instead of the parent's current authority. ## What changed - Route child reloads through their loaded immediate parent and reject direct cold resume when that parent is unavailable. - Preserve the child's recorded model, provider, reasoning effort, and role while inheriting the parent's execution policy and MCP extensions. - Validate cached environments against the parent, intersect local permission profiles, and reject stale remote or workspace-root configurations. - Keep paginated cold-resume token usage attribution when attaching to the reloaded child. ## Testing Add coverage for owner validation, nested-parent reloads, permission and environment changes, role instruction restoration, paginated usage replay, and app-server child resume behavior. GitOrigin-RevId: 84014762bcdb57f94fc23974c9c1af55dc1babf1
This commit is contained in:
@@ -328,6 +328,7 @@ pub(crate) struct ResumeThreadWithHistoryOptions {
|
||||
pub(crate) environment_selections: Option<Vec<TurnEnvironmentSelection>>,
|
||||
pub(crate) inherited_environments: Option<TurnEnvironmentSnapshot>,
|
||||
pub(crate) inherited_exec_policy: Option<Arc<crate::exec_policy::ExecPolicyManager>>,
|
||||
pub(crate) client_mcp_extensions: Option<ClientMcpExtensions>,
|
||||
}
|
||||
|
||||
/// Shared, `Arc`-owned state for [`ThreadManager`]. This `Arc` is required to have a single
|
||||
@@ -1012,6 +1013,39 @@ impl ThreadManager {
|
||||
.await
|
||||
}
|
||||
|
||||
/// Reloads a recorded Multi-Agent V2 child through its currently loaded immediate parent.
|
||||
///
|
||||
/// The child keeps the existing parent-controlled reload semantics. Callers cannot supply
|
||||
/// configuration overrides, and an unavailable or unrecognized owner is an error.
|
||||
pub async fn ensure_multi_agent_v2_child_loaded(
|
||||
&self,
|
||||
child_thread_id: ThreadId,
|
||||
) -> CodexResult<()> {
|
||||
let stored_thread = self
|
||||
.state
|
||||
.read_stored_thread(ReadThreadParams {
|
||||
thread_id: child_thread_id,
|
||||
include_archived: true,
|
||||
include_history: false,
|
||||
})
|
||||
.await?;
|
||||
let Some(parent_thread_id) = stored_thread.parent_thread_id else {
|
||||
return Err(CodexErr::InvalidRequest(format!(
|
||||
"thread {child_thread_id} is not a recorded multi-agent v2 child"
|
||||
)));
|
||||
};
|
||||
let parent = self.get_thread(parent_thread_id).await.map_err(|_| {
|
||||
CodexErr::InvalidRequest(format!(
|
||||
"cannot resume multi-agent v2 child {child_thread_id}: parent {parent_thread_id} is not loaded; resume the parent first"
|
||||
))
|
||||
})?;
|
||||
let config = parent.session.get_config().await.as_ref().clone();
|
||||
let agent_control = parent.session.services.agent_control.clone();
|
||||
agent_control
|
||||
.ensure_v2_agent_loaded(config, child_thread_id, Some(parent))
|
||||
.await
|
||||
}
|
||||
|
||||
#[instrument(level = "trace", skip_all)]
|
||||
pub async fn resume_thread_with_history(
|
||||
&self,
|
||||
@@ -1708,8 +1742,12 @@ impl ThreadManagerState {
|
||||
environment_selections,
|
||||
inherited_environments,
|
||||
inherited_exec_policy,
|
||||
client_mcp_extensions,
|
||||
} = options;
|
||||
let client_mcp_extensions = self.client_mcp_extensions_for_child(parent_thread_id).await;
|
||||
let client_mcp_extensions = match client_mcp_extensions {
|
||||
Some(client_mcp_extensions) => client_mcp_extensions,
|
||||
None => self.client_mcp_extensions_for_child(parent_thread_id).await,
|
||||
};
|
||||
let thread_source = initial_history.get_resumed_thread_source();
|
||||
let environments = environment_selections.or_else(|| {
|
||||
inherited_environments
|
||||
|
||||
Reference in New Issue
Block a user