Skip to content

armgit / codex

Public Imported from GitHub
0

Lightweight coding agent that runs in your terminal

Rust

Route message board agent resolution through the selected controller (#47633)

jifdce62a50a23c
diff --git a/codex-rs/core/src/agent_message_board.rs b/codex-rs/core/src/agent_message_board.rs
index 0597d8efa4..b21e94e7c3 100644
--- a/codex-rs/core/src/agent_message_board.rs
+++ b/codex-rs/core/src/agent_message_board.rs
@@ -1,4 +1,4 @@
-//! Bridges the board extension to existing tree, clock and active-turn services.
+//! Bridges the board extension to the selected controller, clock and active-turn services.
//!
//! The extension owns storage and tools. This adapter never starts or restores
//! recipients and never queues a notification for an idle agent.
@@ -68,68 +68,76 @@ struct LocalBoardHost {
}
impl LocalBoardHost {
- async fn actor(&self) -> Result<Arc<CodexThread>> {
+ async fn actor(&self, caller: ThreadId) -> Result<Arc<CodexThread>> {
let manager = self
.manager
.upgrade()
- .ok_or_else(|| CodexErr::ThreadNotFound(self.caller))?;
- let actor = manager.get_thread(self.caller).await?;
+ .ok_or_else(|| CodexErr::ThreadNotFound(caller))?;
+ let actor = manager.get_thread(caller).await?;
if actor.session.session_id() != self.tree {
return Err(CodexErr::InvalidRequest(
"agent belongs to another message board".into(),
));
}
- // Match existing collaboration resolution: roots are registered lazily.
- if self.caller == ThreadId::from(self.tree) {
- actor
- .session
- .services
- .local_agent_runtime
- .register_session_root(self.caller, /*current_parent_thread_id*/ None);
- }
Ok(actor)
}
+
+ async fn registered_path(&self, actor: &CodexThread) -> Result<AgentPath> {
+ let caller = actor.session.thread_id;
+ let path = actor
+ .session_source
+ .get_agent_path()
+ .or_else(|| (caller == ThreadId::from(self.tree)).then(AgentPath::root))
+ .ok_or_else(|| CodexErr::InvalidRequest("agent has no tree path".into()))?;
+ let resolved = actor
+ .session
+ .services
+ .agent_control
+ .resolve(
+ caller,
+ actor.session_source.parent_thread_id(),
+ &actor.session_source,
+ path.as_str(),
+ )
+ .await?;
+ if resolved != caller {
+ return Err(CodexErr::InvalidRequest(
+ "agent does not own its tree path".into(),
+ ));
+ }
+ Ok(path)
+ }
}
impl MessageBoardHost for LocalBoardHost {
fn agent_path(&self, caller: ThreadId) -> BoxFuture<'_, Result<AgentPath>> {
Box::pin(async move {
- self.actor()
- .await?
- .session
- .services
- .local_agent_runtime
- .ensure_agent_known(caller)?
- .agent_path
- .ok_or_else(|| CodexErr::InvalidRequest("agent has no tree path".into()))
+ let actor = self.actor(caller).await?;
+ self.registered_path(&actor).await
})
}
fn resolve_agent(&self, path: AgentPath) -> BoxFuture<'_, Result<ThreadId>> {
Box::pin(async move {
- let actor = self.actor().await?;
+ let actor = self.actor(self.caller).await?;
actor
.session
.services
- .local_agent_runtime
- .resolve_agent_reference(self.caller, &actor.session_source, path.as_str())
+ .agent_control
+ .resolve(
+ self.caller,
+ actor.session_source.parent_thread_id(),
+ &actor.session_source,
+ path.as_str(),
+ )
.await
})
}
fn current_time(&self, caller: ThreadId) -> BoxFuture<'_, Result<DateTime<Utc>>> {
Box::pin(async move {
- self.agent_path(caller).await?;
- let manager = self
- .manager
- .upgrade()
- .ok_or_else(|| CodexErr::ThreadNotFound(caller))?;
- let actor = manager.get_thread(caller).await?;
- if actor.session.session_id() != self.tree {
- return Err(CodexErr::InvalidRequest(
- "agent belongs to another message board".into(),
- ));
- }
+ let actor = self.actor(caller).await?;
+ self.registered_path(&actor).await?;
actor
.session
.services
@@ -161,13 +169,7 @@ impl MessageBoardHost for LocalBoardHost {
"notification recipient belongs to another board".into(),
));
}
- let recipient_path = recipient
- .session
- .services
- .local_agent_runtime
- .ensure_agent_known(recipient_id)?
- .agent_path
- .ok_or_else(|| CodexErr::InvalidRequest("agent has no tree path".into()))?;
+ let recipient_path = self.registered_path(&recipient).await?;
let notice = AgentMessageBoardNotification(post);
let communication = InterAgentCommunication::new(
notice.0.metadata.author.clone(),