Merge remote-tracking branch 'origin/master' into worktree-docs-overhaul-b-agents

examples/acp-agent/tests/acp.e2e.ts

@@ -56,6 +56,9 @@ interface Spawned {
   stderr: string[]
 }
 
+// TODO(acp-test-harness): this subprocess/client boot glue is duplicated with
+// hooks.e2e.ts and partly with snapshot-harness.ts. Extract one shared ACP test
+// launcher before the TSX/env/permission-stub details drift again.
 function spawnAcpAgent(cwd: string, env: NodeJS.ProcessEnv = process.env): Spawned {
   const child = spawn(
     process.execPath,

examples/acp-agent/tests/acp.snapshot.ts

@@ -106,6 +106,9 @@ const SCENARIOS: Scenario[] = [
   { name: 'hook-cc-promptsubmit-context', hasModelTurn: true, recorded: true },
   { name: 'hook-cc-pretool-deny', hasModelTurn: true, recorded: true },
   { name: 'hook-cc-pretool-ask', hasModelTurn: true, recorded: true },
+  // TODO(hook-snapshot-noise): re-record the PostToolUse block fixtures with a
+  // self-limiting prompt or hook so one rejected result proves the seam without
+  // repeated block/retry cycles in the committed JSONL.
   { name: 'hook-cc-posttool-block', hasModelTurn: true, recorded: true },
   { name: 'hook-cc-posttool-context', hasModelTurn: true, recorded: true },
   { name: 'hook-cc-stop-continue', hasModelTurn: true, recorded: true },

examples/acp-agent/tests/hooks.e2e.ts

@@ -29,7 +29,7 @@ import {
  * Key-gated; owns and disposes its subprocess.
  *
  * A keyless companion lives in acp.e2e.ts (stdout purity + session/new); the
- * full hook-fires-end-to-end transcript is the keyless `hook-prompt-block`
+ * full hook-fires-end-to-end transcript is the keyless `hook-cc-promptsubmit-block`
  * snapshot scenario. This one closes the "green plumbing, broken product" gap:
  * only a real model deciding to call bash exercises the PreToolUse seam live.
  */