Route message-board notifications through agent mailboxes (#59139)

## Why

Board notifications were skipped when recipients had no active turn accepting mailbox delivery. Queue them through the ordinary agent-message path so idle recipients can receive them in a later turn.

## What changed

- Submit board notices as `Op::InterAgentCommunication` with `trigger_turn` disabled, preserving normal mailbox scheduling without reopening finalized answers.
- Hold a residency guard through dispatch of submitted agent messages to coordinate delivery with agent eviction.
- Update board tool descriptions to describe the host's notification queueing and wake policy.

## Testing

Update local and HTTP board scenarios to cover queued idle notices, delivery after a finalized answer, and mailbox delivery before a pending tool call. Extend residency coverage to verify that submission waits for the eviction gate and queued messages survive eviction.

GitOrigin-RevId: a77137fc40932f5903852e14742483844e07c9bc
This commit is contained in:
jif
2026-11-03 12:33:26 +00:00
committed by copyberry
parent 3b5483307d
commit f05aa41da6
16 changed files with 159 additions and 110 deletions
+3 -3
View File
@@ -171,15 +171,15 @@ impl LocalAgentRuntime {
/// Pins and touches the registered runtime without waiting for unrelated eviction.
pub(crate) async fn pin_v2_residency(
&self,
state: &ThreadManagerState,
thread: &Arc<CodexThread>,
thread: &CodexThread,
) -> CodexResult<Option<tokio::sync::OwnedRwLockReadGuard<()>>> {
if !is_resident_candidate(thread) {
return Ok(None);
}
let guard = Arc::clone(&thread.residency_gate).read_owned().await;
let thread_id = thread.session.thread_id;
if !Arc::ptr_eq(thread, &state.get_thread(thread_id).await?) {
let registered = self.upgrade()?.get_thread(thread_id).await?;
if !std::ptr::eq(thread, registered.as_ref()) {
return Err(CodexErr::ThreadNotFound(thread_id));
}
self.residency.touch(thread_id);
@@ -7,11 +7,15 @@ use crate::config::test_config;
use crate::thread_manager::ThreadManagerState;
use codex_features::Feature;
use codex_login::CodexAuth;
use codex_protocol::AgentPath;
use codex_protocol::ThreadId;
use codex_protocol::error::CodexErrorDetails;
use codex_protocol::protocol::EventMsg;
use codex_protocol::protocol::InterAgentCommunication;
use codex_protocol::protocol::Op;
use codex_protocol::protocol::SessionSource;
use codex_protocol::protocol::SubAgentSource;
use codex_protocol::protocol::ThreadSettingsOverrides;
use codex_protocol::protocol::ThreadSource;
use codex_protocol::protocol::TurnAbortReason;
use codex_protocol::protocol::TurnAbortedEvent;
@@ -58,6 +62,29 @@ async fn residency_slot_reservation_unloads_oldest_idle_v2_agent() {
first_slot.commit(first.thread_id);
mark_thread_completed(first.thread.as_ref()).await;
// Public message submission must honor the same eviction gate as MAv2 sends.
let eviction_gate = Arc::clone(&first.thread.residency_gate).write_owned().await;
let communication = InterAgentCommunication::new(
AgentPath::root(),
AgentPath::try_from("/root/worker_1").unwrap(),
Vec::new(),
"queued notice".into(),
/*trigger_turn*/ false,
);
let delivery = first.thread.submit(Op::InterAgentCommunication {
communication: communication.clone(),
start_options: Default::default(),
});
tokio::pin!(delivery);
assert!(futures::poll!(delivery.as_mut()).is_pending());
drop(eviction_gate);
delivery.await.expect("submit after eviction gate releases");
first
.thread
.update_thread_settings(ThreadSettingsOverrides::default())
.await
.expect("dispatch queued notice before eviction");
let second_slot = control
.reserve_v2_residency_slot(
&state,
@@ -74,6 +101,14 @@ async fn residency_slot_reservation_unloads_oldest_idle_v2_agent() {
},
Ok(_) => panic!("expected evicted thread to be missing"),
}
let retained = first
.thread
.session
.services
.local_agent_runtime
.mailboxes
.take(first.thread_id);
assert_eq!(retained, vec![communication.into()]);
let second = spawn_v2_subagent(&control, &state, config, root.thread_id, "worker-2").await;
second_slot.commit(second.thread_id);
+4 -6
View File
@@ -264,7 +264,7 @@ impl LocalAgentControl {
if owner_thread_id.is_none()
&& let Ok(thread) = state.get_thread(thread_id).await
{
return self.runtime.pin_v2_residency(&state, &thread).await;
return self.runtime.pin_v2_residency(&thread).await;
}
if self
.runtime
@@ -328,7 +328,7 @@ impl LocalAgentControl {
}
if let Ok(thread) = state.get_thread(thread_id).await {
self.validate_loaded_v2_child(&thread, parent_thread_id)?;
return self.runtime.pin_v2_residency(&state, &thread).await;
return self.runtime.pin_v2_residency(&thread).await;
}
}
let parent = if let Some(parent) = parent {
@@ -589,9 +589,7 @@ impl LocalAgentControl {
// Finish registration even if the sender is cancelled while acquiring its pin.
tokio::spawn(async move {
let _membership = membership;
let residency_pin = runtime
.pin_v2_residency(&state, &reloaded_thread.thread)
.await?;
let residency_pin = runtime.pin_v2_residency(&reloaded_thread.thread).await?;
runtime.registry.clear_evicted_environments(thread_id);
residency_slot.commit(reloaded_thread.thread_id);
// Register before listeners can forward events from the resumed thread.
@@ -616,7 +614,7 @@ impl LocalAgentControl {
}
self.runtime.registry.clear_evicted_environments(thread_id);
drop(residency_slot);
return self.runtime.pin_v2_residency(&state, &thread).await;
return self.runtime.pin_v2_residency(&thread).await;
}
Err(err)
}