Skip to content

Commit 0b3e4b7

Browse files
committed
fix(session): settle an accepted approval a closing reactor never ran
A decision handed to a reactor that closes before running the call, such as an interrupt landing while the loop is busy, left the call parked on disk with nothing to settle it: rehydration announces no gate, recovery ignores a correlation it handed over, and no drop was recorded. The rebuilt agent answered it with "approval timed out" at the old deadline. A handed-over decision is tracked like a drop until a rebuilt store shows its call closed.
1 parent d0a70d6 commit 0b3e4b7

7 files changed

Lines changed: 199 additions & 42 deletions

File tree

‎docs/ARCHITECTURE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ tool call
411411
- **command** — Splits chained commands for security classification and derives command-shape approval scopes. Multi-segment chains only offer an exact-command persist pattern (a prefix like `npm *` must not cover `npm i && rm -rf /` later).
412412
- **auto-shell-policy** — Constrains `run_shell` even when auto mode would otherwise rubber-stamp it. Before matching, `expandShellSubjects` peels `bash`/`sh`/`zsh -c`, `xargs` utility tails, and transparent prefixes (`env`, `nice`, `timeout`, …) so rules see the real payload; an unparseable wrapper (variable expansion or command substitution) sets an opaque flag that forces `ask`. Effects: `deny` blocks outright (file mutations through ad-hoc tooling — output redirection, `tee`, `sed -i`/`perl -i`, interpreter inline programs or heredocs — which must instead go through `write_file`/`edit_file`); `ask` declines to auto-allow and falls through to the operator prompt (recursive `rm`, dependency installs and remote runners: npm/yarn/pnpm/bun, pip, cargo, go, brew, npx/bunx, …, force or uncontained `git worktree` ops, shell that references a sensitive path such as `.env` or a private key, and opaque wrappers). Contained non-force `git worktree add`/`remove`/`prune` and read-only `list` auto-allow (sibling destinations like `../corbits-dispatch-wts/…` included; absolute outside, `~`, globs, and credential basenames still ask). Deny beats ask when multiple subjects match. Quoted spans are stripped before pattern matching so a quoted `>` or install word in an argument is not flagged, and program names are matched only in command position. Adding a table category is a one-line rule append in `AUTO_SHELL_RULES`.
413413
- **gate** — Evaluates a call in order: catastrophic authorization denial, `skipPermissions`, then the normal tier, grant, and auto policies. Catastrophic commands remain denied under every mode. Skip mode, enabled for the process by `--dangerously-skip-permissions` or `--yolo` and persisted to the active settings source by TUI `/yolo` (machine-wide only for the default user-global source, not an explicit `--config` source), allows the call before normal policy evaluation. Therefore `--auto --yolo` behaves as yolo: auto-mode file-mutation asks and denials do not run. Otherwise, `allow`-tier passes; for `ask`-tier, the gate checks persisted approvals and then requests operator approval. Shell security classifies each chain segment (`||` / `&&` / `|` / `;` / newlines), but the operator is prompted once for the full command block — any unapproved segment fails the whole block, and execution always runs the unsplit original. Safe pipeline tails and pure shell no-ops (`true` / `false` / `:` and bare control-flow keywords stranded by chain-splitting) skip without a prompt. In a non-interactive run an unresolved `ask` becomes a denial. In auto mode: non-shell built-ins in `AUTO_ALLOWED_TOOLS` (writes/edits/deletes, `web_fetch`, `web_search`, `manage_tasks`, `spawn_agent`, `wait_agents`, …) auto-allow when not path-restricted; for `run_shell` the gate consults the auto-shell policy — a `deny` rule fails the call, an `ask` rule skips the auto-allow shortcut and proceeds to the normal approval flow, and anything unmatched is auto-allowed. Paths outside the workspace on path-arg tools are denied at authorize time (the same sandbox path-escape enforces at execution, so the gate does not show an Accept overlay that cannot succeed). Writes under the in-workspace session state root (legacy `.agent-state`) still ask under auto mode. Under process-only `--dangerously-skip-permissions` / `--yolo` or TUI `/yolo` persisted in the active settings source (machine-wide only for the default user-global source), the gate auto-allows those same cases, and pre-gate sandboxes (path-escape, shell session cwd retention, `list_dir` / `delete_file` workspace bounds) honor `getSkipPermissions()` live so outside-workspace access is not hard-denied after the gate already allowed it — without rebuilding the plugin stack. Static secret-guard denies for path-keyed tools and authorization hard blocks still apply. Sensitive shell references require approval in normal and auto modes, but skip mode allows them without approval after catastrophic authorization checks. Mutating MCP and unknown built-ins are not blanket-allowed outside skip. Newly granted scopes are appended in memory and persisted.
414-
- **Reactor-gated sessions (main session; `reactorGated: true`).** The gate's decision logic lives in one `decide()` used by both consumers: `evaluate()` (the middleware path below, still used by sub-agents) and `authorizeCall()`, which expresses the decision as the vendored reactor's before-tool authz effect (`src/permission/reactor-authorize.ts` bridges it into `env.authorize`). An `ask` there suspends the call as a reactor `PendingOperation` keyed by a correlationId (persisted through the context store's existing `pendingOperations`); `send()` settles as `suspended` and `src/session/approval-resume.ts` rebuilds the operator request from the approval snapshot, resolves it through the same `requestApproval` seam the TUI overlay uses, and delivers the decision to the reactor on the correlationId signal channel — an approved decision grants a one-shot bypass and the exact parked call re-dispatches; a rejected one answers it with an error result. Idle rebuild waits on three signals. `inFlight` occupancy keeps the TUI busy across the overlay until the correlated resume is accepted (`message.received` / `message.correlated`) or a generation bump `settleAll`s the waiter. The reactor's message-run bracket (`message.run.started` to `message.run.ended`) stays open while the parked run suspends and while the resumed tool and next inference execute, so a deferred reload (for example, MCP tools landing while the overlay is up) runs only after the run reaches `reply`, `wait`, or `done`. A decision delivered to a reactor that rehydrated the parked approval from disk resumes with no run open, so the TUI also holds rebuilds from that `message.correlated` until the reactor announces a terminal (`connector.reply`, a run end, the chat director's silent settle of a dropped approval, a fatal `reactor.error`, or `reactor.done`). Every agent build logs its reason (`initial`, `mcp-tools-changed`, `interrupt`, `session-rotation`). Delivery generation owns session identity: interrupt, `/clear`, and `/new` abort the outstanding overlay, skip minting a grant, drop the decision, and surface an operator notice rather than delivering the operator's decision into a rebuilt agent. A rebuild that keeps the session (interrupt, or an MCP tool-set reload) instead rejects each dropped approval its store still shows parked on the rebuilt agent, again on every such rebuild until the store shows the call closed, and the chat director commits that result without starting a turn. `/clear` and `/new` forget dropped approvals, since the new session never loads the old one's parked calls. Under reactor gating the middleware/MCP `gateToolCall` is an execution backstop, not a second copy of `env.authorize`: it consumes the `authorizeCall` verdict only when id, name, and arguments match, and does not re-decide. Deny still blocks and does not call `next`; an `ask` or `allow` skips the middleware prompt so an approved re-dispatch never re-asks. A reused `codex-proxy` id cannot apply an outer `shell` allow to an inner `run_shell` deny. Inner posix runs whose outer tool is not `run_shell` (Codex `apply_patch` proxy) never pass `env.authorize`, so `gateToolCall` decides on that cache miss and still blocks a deny. The headless denial and the stricter chained-command hard-deny are preserved as deny effects (upstream `block`s) decided inside the same `decide()`.
414+
- **Reactor-gated sessions (main session; `reactorGated: true`).** The gate's decision logic lives in one `decide()` used by both consumers: `evaluate()` (the middleware path below, still used by sub-agents) and `authorizeCall()`, which expresses the decision as the vendored reactor's before-tool authz effect (`src/permission/reactor-authorize.ts` bridges it into `env.authorize`). An `ask` there suspends the call as a reactor `PendingOperation` keyed by a correlationId (persisted through the context store's existing `pendingOperations`); `send()` settles as `suspended` and `src/session/approval-resume.ts` rebuilds the operator request from the approval snapshot, resolves it through the same `requestApproval` seam the TUI overlay uses, and delivers the decision to the reactor on the correlationId signal channel — an approved decision grants a one-shot bypass and the exact parked call re-dispatches; a rejected one answers it with an error result. Idle rebuild waits on three signals. `inFlight` occupancy keeps the TUI busy across the overlay until the correlated resume is accepted (`message.received` / `message.correlated`) or a generation bump `settleAll`s the waiter. The reactor's message-run bracket (`message.run.started` to `message.run.ended`) stays open while the parked run suspends and while the resumed tool and next inference execute, so a deferred reload (for example, MCP tools landing while the overlay is up) runs only after the run reaches `reply`, `wait`, or `done`. A decision delivered to a reactor that rehydrated the parked approval from disk resumes with no run open, so the TUI also holds rebuilds from that `message.correlated` until the reactor announces a terminal (`connector.reply`, a run end, the chat director's silent settle of a dropped approval, a fatal `reactor.error`, or `reactor.done`). Every agent build logs its reason (`initial`, `mcp-tools-changed`, `interrupt`, `session-rotation`). Delivery generation owns session identity: interrupt, `/clear`, and `/new` abort the outstanding overlay, skip minting a grant, drop the decision, and surface an operator notice rather than delivering the operator's decision into a rebuilt agent. A rebuild that keeps the session (interrupt, or an MCP tool-set reload) instead rejects each dropped approval its store still shows parked on the rebuilt agent, again on every such rebuild until the store shows the call closed, and the chat director commits that result without starting a turn. An operator decision handed to a reactor that closes before acting on it leaves its call parked the same way and is settled the same way. `/clear` and `/new` forget dropped approvals, since the new session never loads the old one's parked calls. Under reactor gating the middleware/MCP `gateToolCall` is an execution backstop, not a second copy of `env.authorize`: it consumes the `authorizeCall` verdict only when id, name, and arguments match, and does not re-decide. Deny still blocks and does not call `next`; an `ask` or `allow` skips the middleware prompt so an approved re-dispatch never re-asks. A reused `codex-proxy` id cannot apply an outer `shell` allow to an inner `run_shell` deny. Inner posix runs whose outer tool is not `run_shell` (Codex `apply_patch` proxy) never pass `env.authorize`, so `gateToolCall` decides on that cache miss and still blocks a deny. The headless denial and the stricter chained-command hard-deny are preserved as deny effects (upstream `block`s) decided inside the same `decide()`.
415415
- **Approval resume identity.** Before opening the operator gate, resume captures the session generation and agent/store pair and resolves the correlation exactly once through `ContextStore.load().pendingOperations` to one approval operation's `suspendedCall.id`. Missing or duplicate mappings produce no gate or delivery; store errors propagate with registration cleanup. Every decision path first checks captured history for an exact-call approval timeout, and operator decisions check again after the gate. While the overlay is open, resume watches history for that exact-call timeout and aborts the overlay signal so the gate auto-denies, occupancy (`inFlight`) unsticks, and no late decision is delivered. Identical tool names and arguments never establish identity. Cancellation during lookup cannot deliver a rejection. This suppresses observed exact timeouts, not all expired correlations: the reactor removes correlation state before the queued timeout result publishes, and expiration can also race the final history check or TUI delivery queue. Atomic stale-decision admission remains reactor-owned work tracked separately in CL-8000.
416416
- **Worker reactor ownership.** `workerPermissionGate` is a reactor-gated view over the parent's live permission gate: grants and policy are shared, not copied or toggled. Worker posix plugins and inherited MCP tools are bound to that view at worker start, so they take the reactor-gated `gateToolCall` path because the view reports `isReactorGated()` — they do not close over the parent's middleware-gated `isReactorGated()`. Deny still blocks; ask/allow skip the middleware prompt. `authorizeCall` on the view never emits `ask` — unresolved approvals become denials that name the permission subject, without invoking an approval callback or suspending, even with an interactive parent; the parent can obtain a grant and retry. Worker control-plane tools (`submit_result`, `ask_director`, and nested fleet verbs other than `spawn_agent`) allow without a parent grant. Authorization and tool execution run under the same async-local worker identity and cwd. Fleet authority remains an independent restriction, not an alternative permission grant.
417417

‎e2e/reactor-approval-reload.test.ts‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,9 @@ type InterruptPoint =
440440
/** Before the prompt opens, while the approval resolves its parked call. */
441441
| "resolving-call"
442442
/** After an approval, while it waits behind a busy session queue. */
443-
| "decision-queued";
443+
| "decision-queued"
444+
/** After the reactor accepted an approval, while its loop is busy. */
445+
| "decision-accepted";
444446

445447
/**
446448
* Parks `call` on an ask, then interrupts at `opts.interruptWhile` (while
@@ -528,6 +530,22 @@ async function dropThenInterrupt(
528530
ctx.approve();
529531
await queued;
530532
}
533+
if (interruptWhile === "decision-accepted") {
534+
// A second message's held inference keeps the loop busy, so the close's
535+
// abort is served ahead of the accepted approval.
536+
void live.session.agent.send("Still there?").catch(() => undefined);
537+
await waitFor(
538+
() => live.session.harness.scenario.matchedRequests().length === 2,
539+
"second message's inference",
540+
);
541+
ctx.approve();
542+
expect(await handling).toBe(true);
543+
await waitFor(
544+
() => parkedEvents.some((e) => e.type === "message.correlated"),
545+
"approval accepted",
546+
);
547+
}
548+
531549
let events: ReactorEmittedEvent[] = [];
532550
let parkedAtRebuild: (string | undefined)[] = [];
533551
startInterruptRebuild({
@@ -538,6 +556,8 @@ async function dropThenInterrupt(
538556
if (opts.deadlinePassesDuringRebuild === true) {
539557
clock.shift(deadline + 1_000);
540558
}
559+
// As the TUI does: prepared from the closed agent's store.
560+
await live.session.agent.close();
541561
parkedAtRebuild = (
542562
await live.session.storage.load()
543563
).pendingOperations.map((op) => op.suspendedCall?.id);
@@ -1096,4 +1116,18 @@ describe("integration: an ask dropped by an interrupt, then settled on the rebui
10961116
},
10971117
20_000,
10981118
);
1119+
1120+
test.serial(
1121+
"an approval a closing reactor accepted but never ran settles with no model turn",
1122+
async () => {
1123+
const reloaded = await dropThenInterrupt(
1124+
{ name: "run_shell", args: { command: CLOSED_PORT_PROBE } },
1125+
NATIVE_ANTHROPIC,
1126+
{ interruptWhile: "decision-accepted" },
1127+
);
1128+
1129+
await expectSettledWithoutRunning(reloaded);
1130+
},
1131+
20_000,
1132+
);
10991133
});

‎src/agent/director.ts‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -395,14 +395,15 @@ function applyManageTasksToolCall(
395395
// reserved prefixes (inference., tool., reactor., fork.).
396396
export const CHAT_TASKS_CHANGED_EVENT = "custom.chat.tasks.changed";
397397
export const CHAT_TOOLS_ACTIVATE_EVENT = "custom.chat.tools.activate";
398-
/** Marks a dropped approval settled with no turn, since `wait` announces nothing. */
398+
/** Marks an approval a rebuilt agent settled with no turn, since `wait` announces nothing. */
399399
export const DROPPED_APPROVAL_SETTLED_EVENT =
400400
"custom.chat.approval.dropped-settled";
401401

402402
/**
403-
* Calls whose parked approval an interrupt or a worker's expiring ask
404-
* dropped. `claim` is true once for each, so its result settles the call
405-
* without a turn nobody asked for.
403+
* Calls whose parked approval the reactor that parked them may never
404+
* settle: dropped by an interrupt or a worker's expiring ask, or handed to a
405+
* reactor that closed before acting on the decision. `claim` is true once
406+
* for each, so its result settles the call without a turn nobody asked for.
406407
*/
407408
export interface DroppedApprovalCalls {
408409
claim: (callId: string) => boolean;
@@ -498,8 +499,8 @@ class ChatDirectorImpl extends DefaultDirector {
498499
// Forget cached permission denies on the next inbound user message. Session
499500
// wiring points this at PermissionGate.clearDenials; unset in unit tests.
500501
private clearDenials: (() => void) | undefined;
501-
// Shared across rebuilds by the session, so the director that loads a
502-
// dropped call recognizes its result.
502+
// Shared across rebuilds by the session, so the director that loads one of
503+
// these calls recognizes its result.
503504
private droppedApprovalCalls: DroppedApprovalCalls | undefined;
504505
// Consecutive tool-call-only turns (reset by any text or fresh user
505506
// message). Drives the soft check-in nudge at toolOnlyTurnNudgeAt — a

0 commit comments

Comments
 (0)