@agent-compose/sdk 0.8.5 → 0.8.6

package/src/runtimes/_cli-agent.ts

@@ -4,7 +4,7 @@
  * contract.
  *
  * This is a different *mechanism* from the other runtimes: `claudeRuntime`
- * drives the Anthropic Agent SDK and `vercelRuntime` drives the Vercel AI SDK,
+ * drives the Anthropic Agent SDK and `createVercelRuntime` drives the Vercel AI SDK,
  * but a CLI-agent runtime spawns the provider's own CLI (`codex exec --json`,
  * `amp -x --stream-json`) — the CLI brings its own agent loop + tools, and we
  * only stream-parse the events it prints. Codex and Amp are the first two; this
@@ -241,13 +241,16 @@ export function probeDeathVerdict(
   return null;
 }
 
-/** The claude CLI's stderr complaint when `--resume <id>` names a thread
- *  that does not exist on this machine (the 2026-08-18 split-brain
- *  forensic). When a nonzero exit's stderr carries it, the transport
- *  surfaces the stderr as the turn's LAST error event even though a bare
- *  result error already streamed — the consumer's classifier needs the
- *  specific complaint, not the generic `error_during_execution` token. */
-export const RESUME_TARGET_MISSING_STDERR = /no conversation found with session id/i;
+/** The CLI's stderr complaint when the thread it was told to resume does
+ *  not exist on this machine: claude's `--resume <id>` "No conversation
+ *  found with session ID" (the 2026-08-18 split-brain forensic) and
+ *  opencode's `--session <id>` "Error: Session not found" (in the CLI's
+ *  red-bold ANSI dressing; 1.18.34). When a nonzero exit's stderr carries
+ *  it, the transport surfaces the stderr as the turn's LAST error event
+ *  even though a bare result error already streamed — the consumer's
+ *  classifier needs the specific complaint, not the generic
+ *  `error_during_execution` token. */
+export const RESUME_TARGET_MISSING_STDERR = /no conversation found with session id|error:\s*(?:\x1b\[[0-9;]*m)*\s*session not found/i;
 
 /** One durable-trio reading, parsed from the probe exec's single line. */
 export interface TurnProbeReading {
@@ -336,18 +339,24 @@ export function livenessVerdictFromReading(reading: TurnProbeReading | null): Ru
   return "dead";
 }
 
-// ── Mid-turn stream input (the delivery half of injectUserMessage) ──────────
-// The durable transport's stdin, when the spec declares `streamInput`, is a
-// FIFO fed by an in-guest subshell: the prompt line first, then any complete
-// lines appended to the turn's durable INBOX file. A steering-capable CLI
-// (claude -p --input-format stream-json) folds a message that arrives while
-// the turn runs into the RUNNING turn at its next tool boundary — verified
-// live against claude 2.1.233. The feeder checks for the CLI's terminal
-// `result` line BEFORE each delivery (a message that races the result stays
-// owed for the follow-up turn, never half-consumed) and stops on it; closing
-// the FIFO is what EOFs the CLI's stdin and lets it exit. The DELIVERED
-// counter file is the ack the server trusts: it advances only after the
-// feeder forwarded those inbox lines into the CLI's stdin.
+// ── Mid-turn input (the delivery half of injectUserMessage) ─────────────────
+// A message for a RUNNING turn is appended as one line to the turn's durable
+// INBOX file; the DELIVERED counter file beside it is the ack the server
+// trusts, advancing only once the line was handed to the CLI. Two transports
+// hand it over (CliAgentSpec.midTurnInput):
+//   - "stdin-stream": the durable transport's stdin is a FIFO fed by an
+//     in-guest subshell — the prompt line first, then any complete inbox
+//     lines. A steering-capable CLI (claude -p --input-format stream-json)
+//     folds a message that arrives while the turn runs into the RUNNING turn
+//     at its next tool boundary — verified live against claude 2.1.233. The
+//     feeder checks for the CLI's terminal `result` line BEFORE each delivery
+//     (a message that races the result stays owed for the follow-up turn,
+//     never half-consumed) and stops on it; closing the FIFO is what EOFs the
+//     CLI's stdin and lets it exit.
+//   - "tool-hook": the CLI runs a platform hook after every tool call it
+//     completes (codex: a PostToolUse command hook); the hook forwards the
+//     unfed inbox lines to the model as additional context and advances the
+//     counter. The CLI's stdin stays the plain prompt file.
 
 /** Feeder poll cadence (seconds — it is a shell `sleep`; GNU sleep accepts
  *  fractions and the durable transport only runs on the GNU guest image). */
@@ -364,10 +373,40 @@ export const INJECT_ACK_POLL_ATTEMPTS = 30;
 export const INJECT_ACK_POLL_SECONDS = "0.5";
 export const INJECT_ACK_EXEC_TIMEOUT_MS = 25_000;
 
+/** How the guest recognises the CLI's terminal `result` event in the durable
+ *  .out: a line that carries the `"type":"result"` pair and does not open
+ *  with another event's type, as an awk condition over `$0` (POSIX awk, so
+ *  dash, busybox and the macOS test hosts read it alike). The CLI does not
+ *  keep its key order: 2.1.212 wrote `{"type":"result",…` but 2.1.278 and
+ *  later write the pair near the END of the object
+ *  (`{"duration_api_ms":…,"result":"…","type":"result","duration_ms":…}`), so
+ *  the anchored prefix the resident contract used matched nothing on the
+ *  pinned 2.1.283. Every other event the CLI writes opens with its own type
+ *  (`{"type":"assistant",…`, `{"type":"stream_event",…`), which keeps a tool
+ *  call whose input holds the same pair from counting; tool output and model
+ *  text ride inside JSON strings, where the quotes are escaped. */
+export const CLI_RESULT_LINE_AWK =
+  'index($0, "\\"type\\":\\"result\\"") > 0 && '
+  + '(index($0, "{\\"type\\":\\"") != 1 || index($0, "{\\"type\\":\\"result\\"") == 1)';
+
+/** An awk program over the lines on stdin (or the files after it) that
+ *  applies `action` to each result line and runs `end` at the end. */
+function resultLineAwk(action: string, end: string): string {
+  return `awk ${shellQuote(`${CLI_RESULT_LINE_AWK} { ${action} } END { ${end} }`)}`;
+}
+
 /** The in-guest feeder fragment, prepended to the detached wrapper script.
  *  Runs inside the setsid session (group-kill reaps it) and keys its loop to
  *  the wrapper's own pid (`$$`), like the heartbeat subshell. Exported for
- *  tests. */
+ *  tests.
+ *
+ *  The forward is GUARDED: the fed and delivered counters advance only
+ *  when `sed` wrote the lines. The loop keys on the wrapper, which outlives
+ *  a CLI that died without a result line by the sentinel write and the
+ *  exit push; in that window the FIFO has no reader, `sed` dies of SIGPIPE,
+ *  and an unguarded counter still advanced, so the ack exited 0 for a line
+ *  nobody could read and the settle sealed it (review C1). Guarded, the ack
+ *  sees no advance and exits 4 or 5, and the message stays owed. */
 export function streamInputFeederFragment(paths: {
   promptPath: string; fifoPath: string; inboxPath: string;
   deliveredPath: string; outPath: string;
@@ -376,11 +415,11 @@ export function streamInputFeederFragment(paths: {
   return `rm -f ${q(paths.fifoPath)}; mkfifo ${q(paths.fifoPath)}; `
     + `: > ${q(paths.inboxPath)}; echo 0 > ${q(paths.deliveredPath)}; `
     + `( cat ${q(paths.promptPath)}; ac_fed=0; while kill -0 "$$" 2>/dev/null; do `
-    + `if tail -c ${INJECT_FEEDER_RESULT_TAIL_BYTES} ${q(paths.outPath)} 2>/dev/null | grep -q '"type":"result"'; then break; fi; `
+    + `if tail -c ${INJECT_FEEDER_RESULT_TAIL_BYTES} ${q(paths.outPath)} 2>/dev/null | ${resultLineAwk("f = 1", "exit f ? 0 : 1")}; then break; fi; `
     + `ac_lines=$(wc -l < ${q(paths.inboxPath)} 2>/dev/null || echo 0); ac_lines=\${ac_lines:-0}; `
     + `if [ "$ac_lines" -gt "$ac_fed" ]; then `
-    + `sed -n "$((ac_fed+1)),$((ac_lines))p" ${q(paths.inboxPath)}; ac_fed=$ac_lines; `
-    + `echo "$ac_fed" > ${q(paths.deliveredPath)}; fi; `
+    + `sed -n "$((ac_fed+1)),$((ac_lines))p" ${q(paths.inboxPath)} && { ac_fed=$ac_lines; `
+    + `echo "$ac_fed" > ${q(paths.deliveredPath)}; }; fi; `
     + `sleep ${INJECT_FEEDER_POLL_SECONDS}; done ) > ${q(paths.fifoPath)} 2>/dev/null </dev/null & `;
 }
 
@@ -395,18 +434,44 @@ export function streamInputFeederFragment(paths: {
  *  activity) MUST wrap through here — the wrapper rides only the wire to
  *  the model; the stored conversation row keeps the user's raw text.
  *  The text is pinned by tests: change it deliberately or not at all. */
-export function wrapMidTurnUserMessage(text: string): string {
-  return "The user sent a new message while you were working:\n\n"
+export function wrapMidTurnUserMessage(text: string, opts?: MidTurnEnvelopeOptions): string {
+  const relayedFrom = opts?.relayedFrom?.trim();
+  // A person's own words RELAYED by the agent that owns the worker's thread
+  // (review D2, 2026-09-25): the envelope names who said them, because they
+  // are not the session user's words and "The user sent" would misattribute
+  // them. The relayed row's own text carries the SAID marker and its frame.
+  // The thread agent that owns this worker, in its own words (owner decision
+  // 2026-09-27): not the session user either. The row's own text closes with
+  // its trust frame.
+  const head = relayedFrom
+    ? `A message relaying ${relayedFrom}'s own words arrived while you were working:\n\n`
+    : opts?.fromOwnerAgent
+      ? "The agent that owns your thread sent a message while you were working:\n\n"
+      : "The user sent a new message while you were working:\n\n";
+  return head
     + text
     + "\n\nAddress the message above as you continue this turn.";
 }
 
+/** Who a mid-turn message speaks for, when it is not the session user.
+ *  `relayedFrom` = the display name of the person whose own words an agent
+ *  relayed verbatim; `fromOwnerAgent` = the thread agent that owns this
+ *  worker, in its own words; both absent = the session user's own message. */
+export interface MidTurnEnvelopeOptions {
+  relayedFrom?: string | null;
+  fromOwnerAgent?: boolean;
+}
+
 /** The one delivery-ack exec `injectUserMessage` runs: append the message
  *  line to the durable inbox, then wait for the feeder's delivered counter
- *  to cover it. Exit 0 = delivered into the CLI's stdin pre-result; 4 = the
- *  runner died first; 5 = not delivered within the ack window (feeder
- *  stopped on the result, or the guest is crawling) — both non-zero exits
- *  mean "leave the message owed". Exported for tests. */
+ *  to cover it. Exit 0 = written into the CLI's stdin pipe pre-result,
+ *  which is NOT "the model saw it": the CLI surfaces the line at its next
+ *  tool boundary, so a kill before then loses it, and the settle's kill
+ *  terminals hold the anchor at the pre-inject dispatch head for that
+ *  reason (review D8). 4 = the runner died first; 5 = not forwarded within
+ *  the ack window (the feeder is not forwarding: it stopped on the result,
+ *  the resident turn gate is closed, or the guest is crawling). Both
+ *  non-zero exits mean "leave the message owed". Exported for tests. */
 export function injectAppendAndAckCommand(args: {
   line: string; target: number; pid: number;
   inboxPath: string; deliveredPath: string;
@@ -420,6 +485,71 @@ export function injectAppendAndAckCommand(args: {
     + `sleep ${INJECT_ACK_POLL_SECONDS}; i=$((i+1)); done; exit 5`;
 }
 
+// ── Mid-turn input transports (CliAgentSpec.midTurnInput) ───────────────────
+
+/** stdin is a live message stream: the FIFO feeder above delivers the prompt
+ *  line first and inbox lines after (claude: `--input-format stream-json`). */
+export interface StdinStreamInputSpec {
+  transport: "stdin-stream";
+  /** Serialise the opening prompt into ONE stream-input stdin line
+   *  (claude: a stream-json user message). No trailing newline — the
+   *  transport owns line framing. */
+  promptLine(prompt: string): string;
+  /** Serialise one mid-turn user message into ONE stdin line. No
+   *  trailing newline. */
+  messageLine(text: string): string;
+  /** Serialise ONE in-band interrupt control line (claude: a stream-json
+   *  `control_request` with subtype "interrupt") — the ESC equivalent.
+   *  The CLI's control layer handles these immediately, MID-STEP
+   *  included: the running tool call aborts (its tool_result records the
+   *  harness's own rejection text), the run ends with an
+   *  `error_during_execution` result within ~100ms, and the session file
+   *  stays `--resume`-able with the whole turn context. Verified live
+   *  against claude 2.1.236. Absent → the runtime has no in-band
+   *  interrupt; callers fall back to kill semantics. */
+  interruptLine?(requestId: string): string;
+}
+
+/** The CLI hands the inbox to the model itself, through a hook it runs after
+ *  each tool call it completes (codex: the platform's PostToolUse command
+ *  hook, CODEX_MID_TURN_HOOK_COMMAND in codex.ts). The launch creates the
+ *  inbox and exports its paths into the CLI's environment
+ *  (toolHookInboxFragment); the hook reads them back, prints the unfed lines
+ *  as its additional context for the model and advances the delivered
+ *  counter. stdin stays the plain prompt file, so there is no in-band
+ *  interrupt on this transport. */
+export interface ToolHookInputSpec {
+  transport: "tool-hook";
+  /** Serialise one mid-turn user message into ONE inbox line the hook can
+   *  splice into its JSON output without decoding: a JSON string literal. */
+  messageLine(text: string): string;
+}
+
+export type MidTurnInputSpec = StdinStreamInputSpec | ToolHookInputSpec;
+
+/** The stdin-stream transport of a spec, or undefined. The FIFO feeder, the
+ *  resident harness, the prewarm lane and the in-band interrupt exist only
+ *  for this transport; the inject lane itself reads `midTurnInput`. */
+export function stdinStreamInputOf(spec: Pick<CliAgentSpec, "midTurnInput">): StdinStreamInputSpec | undefined {
+  return spec.midTurnInput?.transport === "stdin-stream" ? spec.midTurnInput : undefined;
+}
+
+/** The environment the tool-hook lane hands the CLI, and so the hook: codex
+ *  runs a command hook with the CLI process's own environment (codex-rs
+ *  hooks/src/registry.rs Hooks::new, engine/command_runner.rs at
+ *  rust-v0.160.0). The turn's inbox and delivered-counter paths. */
+export const MID_TURN_INBOX_ENV = "AC_MID_TURN_INBOX";
+export const MID_TURN_DELIVERED_ENV = "AC_MID_TURN_DELIVERED";
+
+/** The tool-hook lane's launch fragment, prepended to the detached wrapper
+ *  script (the shell the CLI starts in): a fresh inbox, the counter at 0,
+ *  and both paths exported for the hook. Exported for tests. */
+export function toolHookInboxFragment(paths: { inboxPath: string; deliveredPath: string }): string {
+  const q = shellQuote;
+  return `: > ${q(paths.inboxPath)}; echo 0 > ${q(paths.deliveredPath)}; `
+    + `export ${MID_TURN_INBOX_ENV}=${q(paths.inboxPath)} ${MID_TURN_DELIVERED_ENV}=${q(paths.deliveredPath)}; `;
+}
+
 // ── Reap = kill AND CONFIRM (2026-08-18 incident: codex writer lock) ────────
 // A reaped runner must be CONFIRMED dead before the turn unwinds. codex holds
 // a kernel flock on its thread store (`~/.codex/thread-writer-locks/<id>.lock`)
@@ -467,14 +597,19 @@ export function reapKillAndConfirmCommand(pid: number): string {
 // clean sentinel — the probe measured 625ms), and a guest idle watchdog
 // reaps the group if the server's durable record is ever lost. Turn
 // accounting rides two guest numbers next to the inbox:
-//   `<prompt>.served`     — turns DELIVERED into this process (1 at launch,
-//                           +1 per adoption; the server mirrors it durably
+//   `<prompt>.served`     — turns DELIVERED into this process (1 at launch;
+//                           each adoption rebases it to the result lines it
+//                           counted + 1, so a result the CLI wrote on its
+//                           own, such as a background task's wake turn,
+//                           never desyncs it; the server mirrors it durably
 //                           as the runner stamp's `turnsServed`);
-//   result lines in .out  — turns FINISHED (anchored grep — hint-grade; the
-//                           server-side stream-json parse is authoritative).
-// idle ⇔ results ≥ served AND the inbox is fully fed. Mid-turn injects ride
-// the same inbox WITHOUT bumping served, and fold into the running turn
-// producing no result of their own — the parity holds.
+//   result lines in .out  — turns FINISHED (CLI_RESULT_LINE_AWK — hint-
+//                           grade; the server-side stream-json parse is
+//                           authoritative).
+// idle ⇔ results ≥ served. Mid-turn injects ride the same inbox WITHOUT
+// bumping served, and fold into the running turn producing no result of
+// their own. The feeder forwards inbox lines only while results < served,
+// so a line that raced the result is never fed into an idle CLI.
 
 /** Guest idle TTL for a resident with no new inbox line: hot window (180s)
  *  + margin, so the park gate's graceful `.end` normally wins and the
@@ -482,11 +617,14 @@ export function reapKillAndConfirmCommand(pid: number): string {
 export const RESIDENT_IDLE_TTL_S = 240;
 /** Watchdog poll cadence (seconds). */
 export const RESIDENT_WATCHDOG_POLL_S = 15;
-/** Anchored prefix of the CLI's terminal result event line. Anchoring keeps
- *  the guest-side counts honest against tool output that merely CONTAINS
- *  the substring; a serialization-order change fails SAFE (parity check
- *  refuses adoption → cold launch — a latency cost, never correctness). */
-export const RESIDENT_RESULT_LINE_PREFIX = '{"type":"result"';
+
+/** Shell command printing how many result lines the durable .out holds —
+ *  the guest's turn accounting (feeder gate, idle check, adoption parity).
+ *  Prints nothing when the file is missing: callers default an empty count
+ *  to 0. */
+export function cliResultCountCommand(outPath: string): string {
+  return `${resultLineAwk("n++", "print n + 0")} ${shellQuote(outPath)} 2>/dev/null`;
+}
 
 /** One bounded exec printing the count of result lines at or past
  *  `fromByte` (0-based) in the durable .out. Always exits 0; stdout is the
@@ -496,41 +634,82 @@ export function residentResultCountCommand(outPath: string, fromByte = 0): strin
   const src = fromByte > 0
     ? `tail -c +${fromByte + 1} ${q(outPath)} 2>/dev/null`
     : `cat ${q(outPath)} 2>/dev/null`;
-  return `ac_res=$(${src} | grep -c ${q(`^${RESIDENT_RESULT_LINE_PREFIX}`)}); echo "\${ac_res:-0}"`;
+  return `ac_res=$(${src} | ${resultLineAwk("n++", "print n + 0")}); echo "\${ac_res:-0}"`;
+}
+
+/** One bounded exec reporting the LAST result line in the durable .out
+ *  window [`fromByte`, `toByte`): prints `none` (no result line), `error`
+ *  (its `is_error` is true) or `ok`. Always exits 0 and never prints the
+ *  line itself. The harvest's confirm for a resident result the tailer never
+ *  parsed (review C2): a count alone cannot say whether the turn failed. The
+ *  whole line is searched for `"is_error":true`, wherever the CLI put it
+ *  (key order is not fixed). `toByte` bounds the window to bytes a drain
+ *  already walked past, so a result the drain never reached (or a line still
+ *  being written past its line-aligned offset) is not confirmed; omitted,
+ *  the window runs to the end of the file. A window with `toByte <= fromByte`
+ *  is empty. */
+export function residentLastResultCommand(outPath: string, fromByte = 0, toByte?: number): string {
+  const q = shellQuote;
+  const read = fromByte > 0
+    ? `tail -c +${fromByte + 1} ${q(outPath)} 2>/dev/null`
+    : `cat ${q(outPath)} 2>/dev/null`;
+  const src = toByte === undefined ? read : `${read} | head -c ${Math.max(0, toByte - fromByte)}`;
+  return `${src} | ${resultLineAwk("last = $0",
+    'if (last == "") print "none"; else if (index(last, "\\"is_error\\":true") > 0) print "error"; else print "ok"')}`;
 }
 
 /** The resident feeder: `streamInputFeederFragment` with the result-break
- *  REPLACED by the end-file break — the ONLY guest-contract change the
- *  resident shape needs (verified live by the spec's probe: two messages,
- *  one process, one session file, graceful exit on `.end`). */
+ *  REPLACED by the end-file break (verified live by the spec's probe: two
+ *  messages, one process, one session file, graceful exit on `.end`), plus
+ *  the TURN GATE: inbox lines are forwarded only while a delivered turn is
+ *  still unanswered (the result count in .out is below `.served`),
+ *  the same two numbers the idle predicate reads. Without the gate, a line
+ *  appended after the turn's result line but before the server settled the
+ *  turn was fed into the idle CLI, started a turn nobody tails, and was
+ *  acked as delivered: the message was never answered, and the extra result
+ *  line broke the next adoption's parity. With the gate that line stays
+ *  unfed, the inject ack exits 5, and the message stays owed for the
+ *  follow-up turn. Adoption bumps `.served` BEFORE it appends, so the next
+ *  turn's prompt still flows. The count is a full-file grep, re-run
+ *  only on a poll that has unfed lines AND a changed (.out size, .served)
+ *  pair, so an idle resident holding a gated line never rescans. The
+ *  forward is guarded like the plain feeder's: the counters advance only
+ *  when `sed` wrote the lines into the FIFO. */
 export function residentFeederFragment(paths: {
   promptPath: string; fifoPath: string; inboxPath: string;
-  deliveredPath: string; endPath: string;
+  deliveredPath: string; endPath: string; outPath: string; servedPath: string;
 }): string {
   const q = shellQuote;
   return `rm -f ${q(paths.fifoPath)}; mkfifo ${q(paths.fifoPath)}; `
     + `: > ${q(paths.inboxPath)}; echo 0 > ${q(paths.deliveredPath)}; rm -f ${q(paths.endPath)}; `
-    + `( cat ${q(paths.promptPath)}; ac_fed=0; while kill -0 "$$" 2>/dev/null; do `
+    + `( cat ${q(paths.promptPath)}; ac_fed=0; ac_gk=; ac_gr=0; while kill -0 "$$" 2>/dev/null; do `
     + `if [ -f ${q(paths.endPath)} ]; then break; fi; `
     + `ac_lines=$(wc -l < ${q(paths.inboxPath)} 2>/dev/null || echo 0); ac_lines=\${ac_lines:-0}; `
     + `if [ "$ac_lines" -gt "$ac_fed" ]; then `
-    + `sed -n "$((ac_fed+1)),$((ac_lines))p" ${q(paths.inboxPath)}; ac_fed=$ac_lines; `
-    + `echo "$ac_fed" > ${q(paths.deliveredPath)}; fi; `
+    + `ac_gs=$(wc -c < ${q(paths.outPath)} 2>/dev/null); ac_gv=$(cat ${q(paths.servedPath)} 2>/dev/null); ac_gv=\${ac_gv:-1}; `
+    + `if [ "$ac_gs:$ac_gv" != "$ac_gk" ]; then ac_gk="$ac_gs:$ac_gv"; `
+    + `ac_gr=$(${cliResultCountCommand(paths.outPath)}); ac_gr=\${ac_gr:-0}; fi; `
+    + `if [ "$ac_gr" -lt "$ac_gv" ]; then `
+    + `sed -n "$((ac_fed+1)),$((ac_lines))p" ${q(paths.inboxPath)} && { ac_fed=$ac_lines; `
+    + `echo "$ac_fed" > ${q(paths.deliveredPath)}; }; fi; fi; `
     + `sleep ${INJECT_FEEDER_POLL_SECONDS}; done ) > ${q(paths.fifoPath)} 2>/dev/null </dev/null & `;
 }
 
-/** Sets `ac_idle` (1 = between turns: every delivered turn has its result
- *  and the inbox is fully fed). Embedded by the watchdog and the resident
- *  heartbeat gate — one idle predicate, stated once. */
+/** Sets `ac_idle` (1 = between turns: every delivered turn has its result).
+ *  Embedded by the watchdog and the resident heartbeat gate: one idle
+ *  predicate, stated once. Unfed inbox lines do not make a resident busy:
+ *  the feeder's turn gate forwards a line only while results < served, so
+ *  a line still unfed once results >= served is held until the next
+ *  adoption bumps `.served` (a message that raced the result, owed on the
+ *  server). Reading it as work would keep the heartbeat fresh and the
+ *  watchdog quiet for as long as the line sat there. */
 export function residentIdleCheckFragment(paths: {
-  outPath: string; inboxPath: string; deliveredPath: string; servedPath: string;
+  outPath: string; servedPath: string;
 }): string {
   const q = shellQuote;
-  return `ac_res=$(grep -c ${q(`^${RESIDENT_RESULT_LINE_PREFIX}`)} ${q(paths.outPath)} 2>/dev/null); ac_res=\${ac_res:-0}; `
+  return `ac_res=$(${cliResultCountCommand(paths.outPath)}); ac_res=\${ac_res:-0}; `
     + `ac_srv=$(cat ${q(paths.servedPath)} 2>/dev/null); ac_srv=\${ac_srv:-1}; `
-    + `ac_in=$(wc -l < ${q(paths.inboxPath)} 2>/dev/null); ac_in=\${ac_in:-0}; `
-    + `ac_del=$(cat ${q(paths.deliveredPath)} 2>/dev/null); ac_del=\${ac_del:-0}; `
-    + `if [ "$ac_res" -ge "$ac_srv" ] && [ "$ac_in" -eq "$ac_del" ]; then ac_idle=1; else ac_idle=0; fi; `;
+    + `if [ "$ac_res" -ge "$ac_srv" ]; then ac_idle=1; else ac_idle=0; fi; `;
 }
 
 /** Guest idle watchdog: reap the whole process group after
@@ -554,7 +733,7 @@ export function residentIdleCheckFragment(paths: {
  *  guest rule about not killing, and journal advance is required, not mere
  *  process existence). */
 export function residentIdleWatchdogFragment(paths: {
-  outPath: string; inboxPath: string; deliveredPath: string; servedPath: string;
+  outPath: string; servedPath: string;
 }): string {
   return `( ac_idle_s=0; while kill -0 "$$" 2>/dev/null; do `
     + residentIdleCheckFragment(paths)
@@ -621,8 +800,10 @@ function parsePid(raw: string): number {
 /** Recover the detached runner's pid from its durable pidfile after the
  *  launch exec's STREAM died (deadline_exceeded, canceled context, any wire
  *  fault). Reads over the file transport with a short retry so the race
- *  where the launch shell is still writing the pidfile is absorbed. */
-async function recoverLaunchPid(read: (path: string) => Promise<string>, pidPath: string): Promise<number> {
+ *  where the launch shell is still writing the pidfile is absorbed.
+ *  Exported for the server's workflow-lane launch (turn-workflow/tailer.ts
+ *  launchDetachedRunner), which recovers the same way. */
+export async function recoverLaunchPid(read: (path: string) => Promise<string>, pidPath: string): Promise<number> {
   for (let attempt = 0; attempt < LAUNCH_PID_RECOVERY_ATTEMPTS; attempt++) {
     try {
       const pid = parsePid(await read(pidPath));
@@ -662,6 +843,23 @@ export function sessionEnvSourceFragment(relPath: string | undefined): string {
   return `[ -f "$HOME/${relPath}" ] && . "$HOME/${relPath}" >/dev/null 2>&1 || true; `;
 }
 
+/** Shell command printing a fingerprint of the session env file's current
+ *  bytes (POSIX `cksum`), or `absent` when there is no file. A resident
+ *  records it next to its prompt immediately BEFORE sourcing the file, and
+ *  an adoption compares the file's fingerprint at that moment with it: a
+ *  fresh launch would source the file as it is now, the resident only ever
+ *  saw the one it started with. Recording before the source keeps the
+ *  comparison conservative — a write that lands between the two reads as a
+ *  change. The guest file is the one truth every replica writes to, so the
+ *  verdict never depends on which server process wrote it. */
+export function sessionEnvFingerprintCommand(relPath: string): string {
+  if (!SESSION_ENV_FILE_SAFE.test(relPath) || relPath.includes("..")) {
+    throw new Error(`unsafe session env path: ${relPath}`);
+  }
+  // One group, so a redirect after it (`> <prompt>.envsum`) takes either arm.
+  return `{ { cksum < "$HOME/${relPath}"; } 2>/dev/null || echo absent; }`;
+}
+
 /** The per-turn model-credential source fragment (`RuntimeOptions.
  *  credEnvFile` — an ABSOLUTE guest path), or "" when none is configured.
  *  Sourced AFTER the session env file so the turn actor's credential wins.
@@ -825,9 +1023,9 @@ export interface CliAgentSpec {
    *  `effort` is present only when the caller configured a reasoning effort
    *  AND the spec has a real knob for it (see `CliReasoningEffort`).
    *  `streamInput` is true when the durable transport is feeding stdin as a
-   *  live message stream (see `CliAgentSpec.streamInput`): `promptPath` is
-   *  then the FIFO the feeder writes, and the CLI must be invoked in its
-   *  stream-input mode (claude: `--input-format stream-json`). */
+   *  live message stream (the "stdin-stream" `midTurnInput` transport):
+   *  `promptPath` is then the FIFO the feeder writes, and the CLI must be
+   *  invoked in its stream-input mode (claude: `--input-format stream-json`). */
   buildCommand(args: { promptPath: string; sessionId?: string; model?: string; cwd?: string; effort?: CliReasoningEffort; streamInput?: boolean }): string;
   /** Map one parsed JSONL stdout event to `AgentMessage`s. The base emits
    *  `init`/`done`/`error` lifecycle itself, so a spec maps only content +
@@ -858,37 +1056,15 @@ export interface CliAgentSpec {
    *  `extractSessionId`/`mapEvent` members are used only as the version-mismatch
    *  fallback. Absent → the spec is JSONL-only (legacy path always). */
   acp?: { command: string; args: string[]; env?: Record<string, string> };
-  /** Mid-turn STREAM-INPUT support (the delivery half of
-   *  `injectUserMessage`). When present AND the durable detached transport
-   *  is in play, the CLI's stdin is fed from a FIFO by an in-guest feeder:
-   *  the prompt line first, then any lines appended to the turn's durable
-   *  inbox file — so a steering-capable CLI (claude: queued user input is
-   *  folded into the RUNNING turn at the next tool boundary; verified live
-   *  against claude 2.1.233) receives user messages while the turn runs.
-   *  The feeder stops at the CLI's terminal result line (a message that
-   *  races the result is NOT forwarded — it stays owed) and closes the
-   *  FIFO, which is what ends the CLI process (stream-input CLIs exit on
-   *  stdin EOF, not after a result). Absent → the prompt file is the whole
-   *  stdin, exactly as before. */
-  streamInput?: {
-    /** Serialise the opening prompt into ONE stream-input stdin line
-     *  (claude: a stream-json user message). No trailing newline — the
-     *  transport owns line framing. */
-    promptLine(prompt: string): string;
-    /** Serialise one mid-turn user message into ONE stdin line. No
-     *  trailing newline. */
-    messageLine(text: string): string;
-    /** Serialise ONE in-band interrupt control line (claude: a stream-json
-     *  `control_request` with subtype "interrupt") — the ESC equivalent.
-     *  The CLI's control layer handles these immediately, MID-STEP
-     *  included: the running tool call aborts (its tool_result records the
-     *  harness's own rejection text), the run ends with an
-     *  `error_during_execution` result within ~100ms, and the session file
-     *  stays `--resume`-able with the whole turn context. Verified live
-     *  against claude 2.1.236. Absent → the runtime has no in-band
-     *  interrupt; callers fall back to kill semantics. */
-    interruptLine?(requestId: string): string;
-  };
+  /** Mid-turn INPUT support (the delivery half of `injectUserMessage`): how
+   *  a line appended to the turn's durable inbox reaches the CLI while its
+   *  turn runs — see the transports above. Engages only on the durable
+   *  detached transport (the inbox, the delivered counter and the feeder or
+   *  hook live in the guest; single-exec transports keep the plain
+   *  prompt-file stdin). Absent → the runtime cannot take a message
+   *  mid-turn: every inject answers "unsupported" and the message waits for
+   *  the turn boundary. */
+  midTurnInput?: MidTurnInputSpec;
 }
 
 /** The CURRENT turn's mid-turn injection state (durable stream-input
@@ -1001,19 +1177,20 @@ export class CliAgentRunner implements ModelExecutionContract {
   /** Deliver one user message INTO the live turn — see the contract doc
    *  (types/runtime.ts). Appends a stream-input line to the turn's durable
    *  inbox and waits for the in-guest feeder's delivered-counter ack; only
-   *  an acked forward (pre-result, into the CLI's stdin) reports
-   *  "delivered". Guest exit 5 (ack window exhausted with the runner still
-   *  alive — a CLI that is not draining stdin mid-step) reports "pending":
-   *  the appended line may still be read when the current step finishes,
-   *  but it was NOT seen yet. Never throws. */
-  async injectUserMessage(text: string): Promise<"delivered" | "pending" | "closed" | "unsupported"> {
+   *  an acked forward (pre-result, written into the CLI's stdin pipe)
+   *  reports "delivered", and even then the model reads the line only at
+   *  its next tool boundary (review D8). Guest exit 5 (ack window exhausted
+   *  with the runner still alive: the feeder is not forwarding) reports
+   *  "pending": the appended line may still be forwarded later, but it was
+   *  NOT seen yet. Never throws. */
+  async injectUserMessage(text: string, opts?: MidTurnEnvelopeOptions): Promise<"delivered" | "pending" | "closed" | "unsupported"> {
     const inject = this.turnInject;
-    const streamInput = this.spec.streamInput;
-    if (!inject || !streamInput || this.guestDetached) return "unsupported";
+    const input = this.spec.midTurnInput;
+    if (!inject || !input || this.guestDetached) return "unsupported";
     // The address-this envelope (wrapMidTurnUserMessage): a raw injected
     // line carries no framing, and the model continues its narration
     // without acknowledging the message.
-    return this.appendTurnStreamLine(inject, streamInput.messageLine(wrapMidTurnUserMessage(text)));
+    return this.appendTurnStreamLine(inject, input.messageLine(wrapMidTurnUserMessage(text, opts)));
   }
 
   /** Request an in-band step interrupt of the LIVE turn — the ESC
@@ -1027,7 +1204,7 @@ export class CliAgentRunner implements ModelExecutionContract {
    *  throws. */
   async interruptTurn(): Promise<"delivered" | "pending" | "closed" | "unsupported"> {
     const inject = this.turnInject;
-    const interruptLine = this.spec.streamInput?.interruptLine;
+    const interruptLine = stdinStreamInputOf(this.spec)?.interruptLine;
     if (!inject || !interruptLine || this.guestDetached) return "unsupported";
     return this.appendTurnStreamLine(inject, interruptLine(`itr-${Date.now().toString(36)}`));
   }
@@ -1055,7 +1232,7 @@ export class CliAgentRunner implements ModelExecutionContract {
           { timeoutMs: INJECT_ACK_EXEC_TIMEOUT_MS });
         if (res.exitCode === 0) return "delivered";
         // 5 = ack window exhausted, runner alive: the line is in the inbox
-        // and may be fed when the CLI next drains stdin (the mid-step wall).
+        // and the feeder is not forwarding it (stopped, or gated).
         // 4 = the runner died first; anything else is a fault — both closed.
         return res.exitCode === 5 ? "pending" : "closed";
       } catch { return "closed"; }
@@ -1507,25 +1684,27 @@ export class CliAgentRunner implements ModelExecutionContract {
       this.turnPendingLineEnd = null;
       this.nudgePending = false;
       this.wakeTailWatchdog = null;
-      // Mid-turn stream input engages only where BOTH halves exist: a spec
-      // that can serialise stream-input lines AND the durable detached
-      // transport (the feeder, inbox, and result-watch live in the guest;
-      // single-exec transports keep the plain prompt-file stdin).
-      const streamInput = this.spec.streamInput !== undefined
-        && this.sandbox.commands.runBackground !== undefined;
+      // Mid-turn input engages only where BOTH halves exist: a spec that
+      // declares a mid-turn input transport AND the durable detached
+      // transport (the inbox, the delivered counter and the feeder or hook
+      // live in the guest; single-exec transports keep the plain
+      // prompt-file stdin).
+      const durable = this.sandbox.commands.runBackground !== undefined;
+      const stdinStream = durable ? stdinStreamInputOf(this.spec) : undefined;
+      const toolHook = durable && this.spec.midTurnInput?.transport === "tool-hook";
       const fifoPath = `${promptPath}.fifo`;
-      const promptWrite = this.sandbox.files.write(promptPath, streamInput
-        ? `${this.spec.streamInput!.promptLine(opts.prompt)}\n`
+      const promptWrite = this.sandbox.files.write(promptPath, stdinStream
+        ? `${stdinStream.promptLine(opts.prompt)}\n`
         : this.spec.promptPayload(opts.prompt));
       const cmd = this.spec.buildCommand({
         // Stream-input turns read stdin from the feeder's FIFO; the prompt
         // file is the feeder's first delivery, not the CLI's stdin.
-        promptPath: streamInput ? fifoPath : promptPath,
+        promptPath: stdinStream ? fifoPath : promptPath,
         sessionId: opts.sessionId,
         model: this.model,
         cwd: this.options.cwd,
         effort: this.configEffort,
-        ...(streamInput ? { streamInput: true } : {}),
+        ...(stdinStream ? { streamInput: true } : {}),
       });
 
       // Frame guard (see _jsonl-guard.ts): the CLI's stdout is piped through
@@ -1643,14 +1822,18 @@ export class CliAgentRunner implements ModelExecutionContract {
         // supersede group-kill still reaps this subshell with the tree.
         const busyPath = `${promptPath}.busy`;
         const tasksPath = `${promptPath}.tasks`;
-        // Mid-turn stream input: the feeder subshell (see
+        // Mid-turn input: the stdin-stream feeder subshell (see
         // streamInputFeederFragment) rides at the FRONT of the detached
-        // script so the FIFO exists before the CLI opens it as stdin.
+        // script so the FIFO exists before the CLI opens it as stdin; the
+        // tool-hook lane creates the inbox here and exports its paths into
+        // the CLI's environment, for the hook the CLI runs at each tool step.
         const inboxPath = `${promptPath}.inbox`;
         const deliveredPath = `${promptPath}.delivered`;
-        const feeder = streamInput
+        const feeder = stdinStream
           ? streamInputFeederFragment({ promptPath, fifoPath, inboxPath, deliveredPath, outPath })
-          : "";
+          : toolHook
+            ? toolHookInboxFragment({ inboxPath, deliveredPath })
+            : "";
         // Perf sampling rides the same beat: every 6th beat (~60s) the
         // subshell burst-reads /proc and rewrites the `.perf` token the
         // durable-trio probe carries as its trailing field (perf-sampler.ts).
@@ -1747,8 +1930,9 @@ export class CliAgentRunner implements ModelExecutionContract {
         // durable files without this process's memory.
         this.options.onDetachedLaunch?.({ promptPath, sentinel, pid });
         // Arm mid-turn injection now that the detached runner (and its
-        // feeder) exist; cleared with the turn in the finally below.
-        if (streamInput) {
+        // feeder or hook inbox) exist; cleared with the turn in the finally
+        // below.
+        if (stdinStream !== undefined || toolHook) {
           this.turnInject = { inboxPath, deliveredPath, pid, appended: 0, chain: Promise.resolve() };
         }