fix(agent): a racing cancel can no longer wedge the session's turn slot
Port of upstream grok-build 0.2.103. session/prompt runs an async intake preamble before enqueueing SessionCommand::Prompt on the actor mailbox; a concurrent cancel could enqueue Cancel first, land on an idle actor as a no-op, and the prompt then started a turn nothing would ever cancel. The per-session prompt-intake lock becomes the dispatch lock: prompt() holds it across intake as before, and cancel() now holds it around its Cancel send, so a cancel orders behind the prompt it targets. Regression test ported verbatim (unix-only harness, like its siblings). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01KSy9S31pZNWXtRZNVJ1sDf
This commit is contained in:
1 parent
6e0464fa74
commit
6a4bff0d45
5 files changed
+77
-25
No files matched your search
@@ -462,19 +462,16 @@ pub struct MvpAgent {
|
||||
loading_sessions: RefCell<
|
||||
HashMap<acp::SessionId, tokio::sync::watch::Receiver<bool>>,
|
||||
>,
|
||||
/// Per-session prompt-intake serialization lock. LEADER-SAFE(per-session):
|
||||
/// keyed by SessionId, mirrors `sessions` lifecycle.
|
||||
///
|
||||
/// Each incoming `session/prompt` RPC is dispatched as its own task by the
|
||||
/// ACP message loop, and [`Self::prompt`] runs an async preamble (prompt-mode
|
||||
/// query, trace context, model lookup) BEFORE it enqueues
|
||||
/// `SessionCommand::Prompt` onto the actor's FIFO mailbox. Without
|
||||
/// serialization those preambles interleave across tasks, so the mailbox —
|
||||
/// and therefore the authoritative prompt queue — receives prompts out of
|
||||
/// submission order. `prompt()` holds this lock across the preamble and
|
||||
/// releases it immediately after the enqueue (the turn itself runs unlocked),
|
||||
/// which makes intake order match arrival order.
|
||||
prompt_intake_locks: RefCell<
|
||||
/// Per-session lock ordering dispatch onto the actor's mailbox:
|
||||
/// [`Self::prompt`] holds it across its intake preamble (prompt-mode
|
||||
/// query, trace context, model lookup) and releases it right after the
|
||||
/// enqueue, so prompts land in submission order; `cancel` holds it
|
||||
/// around its `Cancel` send, so a cancel cannot overtake the prompt it
|
||||
/// targets and wedge the turn slot (see
|
||||
/// `cancel_never_overtakes_in_flight_prompt_intake`). Cancels wait out
|
||||
/// preambles held ahead of them — keep preambles lean.
|
||||
/// LEADER-SAFE(per-session): mirrors `sessions` lifecycle.
|
||||
dispatch_locks: RefCell<
|
||||
HashMap<acp::SessionId, std::rc::Rc<tokio::sync::Mutex<()>>>,
|
||||
>,
|
||||
/// LEADER-SAFE(per-session): keyed by SessionId. Mirrors `sessions` lifecycle.
|
||||
|
||||
Reference in new issue
Block a user