@junghanacs/entwurf 0.23.0 → 0.24.0

package/scripts/mutants/herdr-activation.json

@@ -13,6 +13,22 @@
 			"signature": "[QK:HAC-PI-USER-SCOPE-ONLY]",
 			"signatureSource": "scripts/check-herdr-activation.ts"
 		},
+		{
+			"claim": "HAC-PI-FLOOR-BOTH-DOORS",
+			"title": "dropping the pi range check from install-user-scope re-opens the door asymmetry: setup refuses a below-floor pi by name while the herdr activation door writes the same registration in silence, so one host reports two verdicts for one citizen",
+			"subject": "run.sh",
+			"find": [
+				"    if ! pi_version_in_range \"${pi_ver:-0}\" \"$pi_range\"; then",
+				"      echo \"[install-user-scope] pi: FAIL — detected pi ${pi_ver:-<unreadable version>} is outside the supported range $pi_range; nothing was written. Align pi, then re-run.\" >&2",
+				"      exit 1",
+				"    fi"
+			],
+			"replace": ["    : \"$pi_range\""],
+			"gate": ["bash", "run.sh", "check-herdr-activation"],
+			"timeoutSeconds": 300,
+			"signature": "[QK:HAC-PI-FLOOR-BOTH-DOORS]",
+			"signatureSource": "scripts/check-herdr-activation.ts"
+		},
 		{
 			"claim": "HAC-COMMAND-IS-DERIVED",
 			"title": "accepting any absolute directory as 'the plugin runtime' is a way to point every pi session at an executable of the caller's choosing — 'absolute' was never the contract, 'this host's stable runtime' was",

package/scripts/mutants/herdr-fresh-call.json

@@ -443,6 +443,17 @@
 			"timeoutSeconds": 120,
 			"signature": "[QK:HFC-WITNESS-BINDING-COMPLETE]",
 			"signatureSource": "scripts/check-herdr-fresh-call.ts"
+		},
+		{
+			"claim": "HFC-CALLBACK-ENV",
+			"title": "the launcher-computed callback pair is dropped from herdr --env, so a herdr sibling's first action has to retype a garden id out of prose",
+			"subject": "pi-extensions/lib/herdr-fresh-call.ts",
+			"find": ["\t\t...callbackEnvAssignments(params.callback).flatMap((assignment) => [\"--env\", assignment]),"],
+			"replace": [""],
+			"gate": ["bash", "run.sh", "check-herdr-fresh-call"],
+			"timeoutSeconds": 120,
+			"signature": "[QK:HFC-CALLBACK-ENV]",
+			"signatureSource": "scripts/check-herdr-fresh-call.ts"
 		}
 	]
 }

package/scripts/mutants/herdr-plugin-build.json

@@ -110,7 +110,7 @@
 			"find": [
 				"\tprogress.step(",
 				"\t\t`fetching and installing the Entwurf runtime from ${describeRequest(plan.requested)} — this is the long step ` +",
-				"\t\t\t\"(npm packs the source; expect minutes of silence)\",",
+				"\t\t\t\"(npm acquires the locked artifact; expect minutes of silence)\",",
 				"\t);"
 			],
 			"replace": ["\tprogress.step(\"working\");"],

package/scripts/mutants/mux-fresh-call.json

@@ -18,7 +18,7 @@
 			"title": "claude-code goes back to the variadic space form, which swallows the prompt as an option value",
 			"subject": "pi-extensions/lib/fresh-call-composition.ts",
 			"find": [
-				"\t\t\treturn [composition.prompt, `--allowedTools=${FRESH_CALL_CALLBACK_TOOL[\"claude-code\"]}`, `--model=${model}`];"
+				"\t\t\treturn [\n\t\t\t\tcomposition.prompt,\n\t\t\t\t`--allowedTools=${FRESH_CALL_CALLBACK_TOOL[\"claude-code\"]},${FRESH_CALL_DELIVERY_TOOL[\"claude-code\"]}`,\n\t\t\t\t`--model=${model}`,\n\t\t\t];"
 			],
 			"replace": [
 				"\t\t\treturn [composition.prompt, \"--allowedTools\", FRESH_CALL_CALLBACK_TOOL[\"claude-code\"], `--model=${model}`];"
@@ -55,9 +55,11 @@
 			"title": "Claude Code drops the explicit model token and silently resolves its ambient Opus default again",
 			"subject": "pi-extensions/lib/fresh-call-composition.ts",
 			"find": [
-				"\t\t\treturn [composition.prompt, `--allowedTools=${FRESH_CALL_CALLBACK_TOOL[\"claude-code\"]}`, `--model=${model}`];"
+				"\t\t\treturn [\n\t\t\t\tcomposition.prompt,\n\t\t\t\t`--allowedTools=${FRESH_CALL_CALLBACK_TOOL[\"claude-code\"]},${FRESH_CALL_DELIVERY_TOOL[\"claude-code\"]}`,\n\t\t\t\t`--model=${model}`,\n\t\t\t];"
+			],
+			"replace": [
+				"\t\t\treturn [\n\t\t\t\tcomposition.prompt,\n\t\t\t\t`--allowedTools=${FRESH_CALL_CALLBACK_TOOL[\"claude-code\"]},${FRESH_CALL_DELIVERY_TOOL[\"claude-code\"]}`,\n\t\t\t];"
 			],
-			"replace": ["\t\t\treturn [composition.prompt, `--allowedTools=${FRESH_CALL_CALLBACK_TOOL[\"claude-code\"]}`];"],
 			"gate": ["bash", "run.sh", "check-mux-fresh-call"],
 			"timeoutSeconds": 120,
 			"signature": "[QK:FRESHCALL-CLAUDE-MODEL-ARGV]",
@@ -67,8 +69,8 @@
 			"claim": "FRESHCALL-CALLBACK-PRECEDES-TASK",
 			"title": "the task is framed before the callback instruction, so a sibling that stalls in the task never names itself",
 			"subject": "pi-extensions/lib/fresh-call-composition.ts",
-			"find": ["\t\t`FIRST ACTION, before reading files or anything else: call ${tool} with ` +"],
-			"replace": ["\t\t`FINAL ACTION, after completing the task: call ${tool} with ` +"],
+			"find": ["\t\t\t\t\t`FIRST ACTION, before reading files or anything else: call ${birthTool} with no arguments.`"],
+			"replace": ["\t\t\t\t\t`FINAL ACTION, after completing the task: call ${birthTool} with no arguments.`"],
 			"gate": ["bash", "run.sh", "check-mux-fresh-call"],
 			"timeoutSeconds": 120,
 			"signature": "[QK:FRESHCALL-CALLBACK-PRECEDES-TASK]",
@@ -275,7 +277,7 @@
 			"claim": "FRESHCALL-COPILOT-CALLBACK-TOOL",
 			"title": "the Copilot callback names Claude Code's `mcp__server__tool` spelling — a dialect copied instead of measured, and the whole first turn is spent looking for a tool that is not there",
 			"subject": "pi-extensions/lib/fresh-call-composition.ts",
-			"find": ["\tcopilot: \"entwurf-bridge-entwurf_v2\","],
+			"find": ["\tcopilot: \"entwurf-bridge-entwurf_callback\","],
 			"replace": ["\tcopilot: \"mcp__entwurf-bridge__entwurf_v2\","],
 			"gate": ["bash", "run.sh", "check-mux-fresh-call"],
 			"timeoutSeconds": 180,
@@ -669,7 +671,7 @@
 			"title": "the first turn stops naming where the result goes, so a sibling finishes its task, prints the answer in its own window, and the caller never learns it is done",
 			"subject": "pi-extensions/lib/fresh-call-composition.ts",
 			"find": [
-				"\t\t`When the task reaches its requested final result, send that result to the same target with ${tool}.`,"
+				"\t\t`When the task reaches its requested final result, send that result to the same target with ${deliveryTool}.`,"
 			],
 			"replace": [""],
 			"gate": ["bash", "run.sh", "check-mux-fresh-call"],
@@ -682,13 +684,24 @@
 			"title": "the Claude child loses the one sentence that tells it how to load a deferred callback tool — the framing goes back to naming a tool the child cannot call on its first turn, which is the measured silence: 0/5 directly callable, 5 of 14 production launches dead",
 			"subject": "pi-extensions/lib/fresh-call-composition.ts",
 			"find": [
-				"\t\"claude-code\": [\n\t\t\"If ${callbackTool} is not callable yet, the entwurf-bridge server is still connecting or its\",\n\t\t'tools are deferred: load them first with ToolSearch(\"select:${callbackTool},${peersTool}\") —',\n\t\t\"it waits for the server — then call ${callbackTool}.\",\n\t],"
+				"\t\"claude-code\": [\n\t\t\"If ${callbackTool} is not callable yet, the entwurf-bridge server is still connecting or its\",\n\t\t'tools are deferred: load them first with ToolSearch(\"select:${callbackTool},${deliveryTool},${peersTool}\") —',\n\t\t\"it waits for the server — then call ${callbackTool}.\",\n\t],"
 			],
 			"replace": ["\t\"claude-code\": [],"],
 			"gate": ["bash", "run.sh", "check-mux-fresh-call"],
 			"timeoutSeconds": 300,
 			"signature": "[QK:FRESHCOMP-TOOL-LOAD-HINT-CLAUDE-ONLY]",
 			"signatureSource": "test/fresh-call-composition.contract.test.ts"
+		},
+		{
+			"claim": "FRESHCALL-CALLBACK-ENV",
+			"title": "the launcher-computed callback pair is dropped from tmux -e, so the sibling's first action has to retype a garden id out of prose — Hard Rule 2",
+			"subject": "pi-extensions/lib/mux-fresh-call.ts",
+			"find": ["\t\t...callbackEnvAssignments(callback).flatMap((assignment) => [\"-e\", assignment]),"],
+			"replace": [""],
+			"gate": ["bash", "run.sh", "check-mux-fresh-call"],
+			"timeoutSeconds": 120,
+			"signature": "[QK:FRESHCALL-CALLBACK-ENV]",
+			"signatureSource": "test/mux-fresh-call.test.ts"
 		}
 	]
 }

package/scripts/mutants/omp-fresh.json

@@ -45,7 +45,7 @@
 			"claim": "FRESHCALL-OMP-CALLBACK-TOOL-DIALECT",
 			"title": "the callback tool name spelled the way a reader expects instead of the way omp mints it — `entwurf_v2` keeps its digit, which omp's sanitizer charset [a-z_] eats. The sibling is told to call a tool that does not exist in its session, so the whole first turn is spent and no address ever comes back. A launch receipt still prints",
 			"subject": "pi-extensions/lib/fresh-call-composition.ts",
-			"find": ["\tomp: \"mcp__entwurf_bridge_entwurf_v\","],
+			"find": ["\tomp: \"mcp__entwurf_bridge_entwurf_callback\","],
 			"replace": ["\tomp: \"mcp__entwurf_bridge_entwurf_v2\","],
 			"gate": ["bash", "run.sh", "check-mux-fresh-call"],
 			"timeoutSeconds": 300,
@@ -167,10 +167,8 @@
 			"claim": "OMP-BOOTSTRAP-CALLBACK-ONLY",
 			"title": "the task folded back into the stage-one prompt, so the sibling is asked to call back AND to work in one message. This is the prompt the failed LIVE actually ran, minus the missing tool: a competing goal beside the callback is what the two-stage split exists to remove, and nothing about argv or readiness would notice it coming back",
 			"subject": "pi-extensions/meta-bridge-omp.ts",
-			"find": ["\t\t\tsend(buildOmpCallbackOnlyPrompt({ target: payload.target, nonce: payload.nonce }));"],
-			"replace": [
-				"\t\t\tsend(`${buildOmpCallbackOnlyPrompt({ target: payload.target, nonce: payload.nonce })}\\n\\n${payload.task}`);"
-			],
+			"find": ["\t\t\tsend(buildOmpCallbackOnlyPrompt());"],
+			"replace": ["\t\t\tsend(`${buildOmpCallbackOnlyPrompt()}\\n\\n${payload.task}`);"],
 			"gate": ["bash", "run.sh", "check-mux-fresh-call"],
 			"timeoutSeconds": 300,
 			"signature": "[QK:OMP-BOOTSTRAP-CALLBACK-ONLY]",
@@ -204,11 +202,9 @@
 			"claim": "OMP-BOOTSTRAP-RESULT-ARMS-ONLY",
 			"title": "the task sent from inside the tool_result handler again, instead of at the turn_end boundary. `[LIVE 2026-08-30]` this is the exact shape that failed: the hook log showed armed/ready/callback-observed/released, the release predicate was provably correct, and the task still never appeared in the session — because that handler runs while the callback turn is streaming. Every static contract about correlation and readiness stays green while the product delivers nothing",
 			"subject": "pi-extensions/meta-bridge-omp.ts",
-			"find": [
-				"\t\t\tlog(\"INFO\", `bootstrap-released nonce=${payload.nonce} toolCallId=${callId}: task armed for the next turn_end`);"
-			],
+			"find": ["\t\t\tlog(\"INFO\", `bootstrap-released toolCallId=${callId}: task armed for the next turn_end`);"],
 			"replace": [
-				"\t\t\tlog(\"INFO\", `bootstrap-released nonce=${payload.nonce} toolCallId=${callId}: task armed for the next turn_end`);\n\t\t\tphase = \"task-sent\";\n\t\t\tsend(payload.task);"
+				"\t\t\tlog(\"INFO\", `bootstrap-released toolCallId=${callId}: task armed for the next turn_end`);\n\t\t\tphase = \"task-sent\";\n\t\t\tsend(payload.task);"
 			],
 			"gate": ["bash", "run.sh", "check-mux-fresh-call"],
 			"timeoutSeconds": 300,

package/scripts/mutants/pack-install.json

@@ -6,7 +6,7 @@
 			"claim": "PACK-INSTALL-PIN-MATCHER-BOUNDED",
 			"title": "the pin-leak matcher loses its version boundary and blesses substring lookalikes — @0.85.10 reads as the pinned 0.85.1 and the gate announces a verified tree it never verified (independent review, 2026-08-25)",
 			"subject": "run.sh",
-			"find": ["  grep '^@earendil-works+' | grep -Ev '@0\\.85\\.1(_|$)' || true"],
+			"find": ["  grep '^@earendil-works+' | grep -Ev '@0\\.86\\.0(_|$)' || true"],
 			"replace": ["  grep '^@earendil-works+' | grep -v '@0\\.85\\.1' || true"],
 			"gate": ["bash", "run.sh", "check-pack-pin-matcher"],
 			"timeoutSeconds": 120,
@@ -17,8 +17,8 @@
 			"claim": "PACK-INSTALL-PIN-MATCHER-COVERS-CLOSURE",
 			"title": "the pin-leak matcher narrows back to the pi-* families and goes blind to a non-pi member of the same runtime closure — @earendil-works/chord (new in pi 0.85.0, a runtime dependency of pi-coding-agent/pi-agent-core/pi-client/pi-protocol) floats unpinned while the gate prints a verified pin (measured 2026-09-06 on a real 0.85.1 install tree)",
 			"subject": "run.sh",
-			"find": ["  grep '^@earendil-works+' | grep -Ev '@0\\.85\\.1(_|$)' || true"],
-			"replace": ["  grep '^@earendil-works+pi-' | grep -Ev '@0\\.85\\.1(_|$)' || true"],
+			"find": ["  grep '^@earendil-works+' | grep -Ev '@0\\.86\\.0(_|$)' || true"],
+			"replace": ["  grep '^@earendil-works+pi-' | grep -Ev '@0\\.86\\.0(_|$)' || true"],
 			"gate": ["bash", "run.sh", "check-pack-pin-matcher"],
 			"timeoutSeconds": 120,
 			"signature": "[QK:PACK-INSTALL-PIN-MATCHER-COVERS-CLOSURE]",

package/scripts/mutants/pi-launch.json

@@ -0,0 +1,113 @@
+{
+	"schemaVersion": 1,
+	"lane": "pi-launch",
+	"mutants": [
+		{
+			"claim": "PILAUNCH-FLAG-SSOT",
+			"title": "the launcher spells the control flag itself, so a typo in run.sh silently produces a pi that is not a citizen and reports nothing",
+			"subject": "run.sh",
+			"find": ["    exec \"$entwurf_pi_bin\" --entwurf-control \"$@\""],
+			"replace": ["    exec \"$entwurf_pi_bin\" --entwurf-controll \"$@\""],
+			"gate": ["bash", "run.sh", "check-pi-launch"],
+			"timeoutSeconds": 300,
+			"signature": "[QK:PILAUNCH-FLAG-SSOT]",
+			"signatureSource": "scripts/check-pi-launch.ts"
+		},
+		{
+			"claim": "PILAUNCH-VERB-DROPPED",
+			"title": "without the shift the dispatcher verb stays in the forwarded argv and `pi` arrives at the vendor as a prompt argument",
+			"subject": "run.sh",
+			"find": ["    shift || true\n    if [ -n \"${ENTWURF_PI_LAUNCH_ACTIVE:-}\" ]; then"],
+			"replace": ["    if [ -n \"${ENTWURF_PI_LAUNCH_ACTIVE:-}\" ]; then"],
+			"gate": ["bash", "run.sh", "check-pi-launch"],
+			"timeoutSeconds": 300,
+			"signature": "[QK:PILAUNCH-VERB-DROPPED]",
+			"signatureSource": "scripts/check-pi-launch.ts"
+		},
+		{
+			"claim": "PILAUNCH-FLAG-FIRST",
+			"title": "injecting the flag AFTER the operator argv puts it behind a positional prompt, where pi reads it as data instead of standing up a control socket",
+			"subject": "run.sh",
+			"find": ["    exec \"$entwurf_pi_bin\" --entwurf-control \"$@\""],
+			"replace": ["    exec \"$entwurf_pi_bin\" \"$@\" --entwurf-control"],
+			"gate": ["bash", "run.sh", "check-pi-launch"],
+			"timeoutSeconds": 300,
+			"signature": "[QK:PILAUNCH-FLAG-FIRST]",
+			"signatureSource": "scripts/check-pi-launch.ts"
+		},
+		{
+			"claim": "PILAUNCH-NOTHING-ELSE-INJECTED",
+			"title": "a launcher that also injects operator taste stops being a spelling and starts deciding the session (Rule 9)",
+			"subject": "run.sh",
+			"find": ["    exec \"$entwurf_pi_bin\" --entwurf-control \"$@\""],
+			"replace": ["    exec \"$entwurf_pi_bin\" --entwurf-control --emacs-agent-socket \"$@\""],
+			"gate": ["bash", "run.sh", "check-pi-launch"],
+			"timeoutSeconds": 300,
+			"signature": "[QK:PILAUNCH-NOTHING-ELSE-INJECTED]",
+			"signatureSource": "scripts/check-pi-launch.ts"
+		},
+		{
+			"claim": "PILAUNCH-ARGV-BYTES",
+			"title": "an unquoted forward word-splits the operator argv and drops empty elements, so a quoted prompt silently becomes several arguments",
+			"subject": "run.sh",
+			"find": ["    exec \"$entwurf_pi_bin\" --entwurf-control \"$@\""],
+			"replace": ["    exec \"$entwurf_pi_bin\" --entwurf-control $@"],
+			"gate": ["bash", "run.sh", "check-pi-launch"],
+			"timeoutSeconds": 300,
+			"signature": "[QK:PILAUNCH-ARGV-BYTES]",
+			"signatureSource": "scripts/check-pi-launch.ts"
+		},
+		{
+			"claim": "PILAUNCH-EXEC-KEEPS-PID",
+			"title": "forking instead of exec leaves run.sh as a parent that supervises nothing and owns neither the terminal nor the exit",
+			"subject": "run.sh",
+			"find": ["    exec \"$entwurf_pi_bin\" --entwurf-control \"$@\""],
+			"replace": ["    \"$entwurf_pi_bin\" --entwurf-control \"$@\""],
+			"gate": ["bash", "run.sh", "check-pi-launch"],
+			"timeoutSeconds": 300,
+			"signature": "[QK:PILAUNCH-EXEC-KEEPS-PID]",
+			"signatureSource": "scripts/check-pi-launch.ts"
+		},
+		{
+			"claim": "PILAUNCH-VENDOR-ABSENT",
+			"title": "an absent vendor that exits 0 is the false success this repo refuses: nothing launched and the caller was told it worked",
+			"subject": "run.sh",
+			"find": [
+				"      echo \"         'entwurf pi' launches the pi coding agent; it does not install one.\" >&2\n      exit 1"
+			],
+			"replace": [
+				"      echo \"         'entwurf pi' launches the pi coding agent; it does not install one.\" >&2\n      exit 0"
+			],
+			"gate": ["bash", "run.sh", "check-pi-launch"],
+			"timeoutSeconds": 300,
+			"signature": "[QK:PILAUNCH-VENDOR-ABSENT]",
+			"signatureSource": "scripts/check-pi-launch.ts"
+		},
+		{
+			"claim": "PILAUNCH-SENTINEL-EXPORTED",
+			"title": "a sentinel that is set but not exported is invisible to the re-entered child, so the recursion fence never fires and the terminal hangs",
+			"subject": "run.sh",
+			"find": ["    export ENTWURF_PI_LAUNCH_ACTIVE=1"],
+			"replace": ["    ENTWURF_PI_LAUNCH_ACTIVE=1"],
+			"gate": ["bash", "run.sh", "check-pi-launch"],
+			"timeoutSeconds": 300,
+			"signature": "[QK:PILAUNCH-SENTINEL-EXPORTED]",
+			"signatureSource": "scripts/check-pi-launch.ts"
+		},
+		{
+			"claim": "PILAUNCH-RECURSION-FENCE",
+			"title": "with the fence removed a PATH `pi` that shells back here spins forever, and the symptom is a hung terminal rather than an error",
+			"subject": "run.sh",
+			"find": [
+				"    if [ -n \"${ENTWURF_PI_LAUNCH_ACTIVE:-}\" ]; then\n      echo \"entwurf: recursive managed launch detected (ENTWURF_PI_LAUNCH_ACTIVE is already set).\" >&2"
+			],
+			"replace": [
+				"    if false; then\n      echo \"entwurf: recursive managed launch detected (ENTWURF_PI_LAUNCH_ACTIVE is already set).\" >&2"
+			],
+			"gate": ["bash", "run.sh", "check-pi-launch"],
+			"timeoutSeconds": 300,
+			"signature": "[QK:PILAUNCH-RECURSION-FENCE]",
+			"signatureSource": "scripts/check-pi-launch.ts"
+		}
+	]
+}

package/scripts/mutants/resume-args.json

@@ -11,7 +11,7 @@
 			"gate": ["bash", "run.sh", "check-entwurf-resume-args"],
 			"timeoutSeconds": 60,
 			"signature": "[QK:RESUMEARGS-NO-HEADLESS]",
-			"signatureSource": "scripts/check-entwurf-resume-args.ts"
+			"signatureSource": "pi-extensions/lib/entwurf-resume-args.test.ts"
 		},
 		{
 			"claim": "RESUMEARGS-CONTROL-FIRST",
@@ -24,7 +24,7 @@
 			"gate": ["bash", "run.sh", "check-entwurf-resume-args"],
 			"timeoutSeconds": 60,
 			"signature": "[QK:RESUMEARGS-CONTROL-FIRST]",
-			"signatureSource": "scripts/check-entwurf-resume-args.ts"
+			"signatureSource": "pi-extensions/lib/entwurf-resume-args.test.ts"
 		},
 		{
 			"claim": "RESUMEARGS-EXT-ONCE-BEFORE-SESSION",
@@ -37,7 +37,7 @@
 			"gate": ["bash", "run.sh", "check-entwurf-resume-args"],
 			"timeoutSeconds": 60,
 			"signature": "[QK:RESUMEARGS-EXT-ONCE-BEFORE-SESSION]",
-			"signatureSource": "scripts/check-entwurf-resume-args.ts"
+			"signatureSource": "pi-extensions/lib/entwurf-resume-args.test.ts"
 		},
 		{
 			"claim": "RESUMEARGS-SESSION-IS-FILE",
@@ -48,7 +48,7 @@
 			"gate": ["bash", "run.sh", "check-entwurf-resume-args"],
 			"timeoutSeconds": 60,
 			"signature": "[QK:RESUMEARGS-SESSION-IS-FILE]",
-			"signatureSource": "scripts/check-entwurf-resume-args.ts"
+			"signatureSource": "pi-extensions/lib/entwurf-resume-args.test.ts"
 		},
 		{
 			"claim": "RESUMEARGS-PROVIDER-OPTIONAL",
@@ -59,7 +59,7 @@
 			"gate": ["bash", "run.sh", "check-entwurf-resume-args"],
 			"timeoutSeconds": 60,
 			"signature": "[QK:RESUMEARGS-PROVIDER-OPTIONAL]",
-			"signatureSource": "scripts/check-entwurf-resume-args.ts"
+			"signatureSource": "pi-extensions/lib/entwurf-resume-args.test.ts"
 		},
 		{
 			"claim": "RESUMEARGS-NO-PROMPT-TAIL",
@@ -70,7 +70,7 @@
 			"gate": ["bash", "run.sh", "check-entwurf-resume-args"],
 			"timeoutSeconds": 60,
 			"signature": "[QK:RESUMEARGS-NO-PROMPT-TAIL]",
-			"signatureSource": "scripts/check-entwurf-resume-args.ts"
+			"signatureSource": "pi-extensions/lib/entwurf-resume-args.test.ts"
 		}
 	]
 }

package/scripts/mutants/v2-surface.json

@@ -25,7 +25,7 @@
 			"gate": ["bash", "run.sh", "check-entwurf-v2-send"],
 			"timeoutSeconds": 60,
 			"signature": "[QK:V2SEND-INBAND-REJECT-REASON]",
-			"signatureSource": "scripts/check-entwurf-v2-send.ts"
+			"signatureSource": "pi-extensions/lib/entwurf-v2-send.test.ts"
 		},
 		{
 			"claim": "V2PROD-INBAND-ERROR-WIRED",
@@ -206,7 +206,7 @@
 			"gate": ["bash", "run.sh", "check-entwurf-v2-native-push"],
 			"timeoutSeconds": 120,
 			"signature": "[QK:NATIVE-PUSH-RETRY-BYTE-IDENTITY]",
-			"signatureSource": "scripts/check-entwurf-v2-native-push.ts"
+			"signatureSource": "pi-extensions/lib/entwurf-v2-native-push.test.ts"
 		}
 	]
 }

package/scripts/mutants/v2-visible-resume.json

@@ -11,7 +11,7 @@
 			"gate": ["bash", "run.sh", "check-entwurf-v2-visible-resume"],
 			"timeoutSeconds": 60,
 			"signature": "[QK:V2RESUME-LIVE-REFUSED]",
-			"signatureSource": "scripts/check-entwurf-v2-visible-resume.ts"
+			"signatureSource": "pi-extensions/lib/entwurf-v2-visible-resume.test.ts"
 		},
 		{
 			"claim": "V2RESUME-INDETERMINATE-NO-START",
@@ -22,7 +22,7 @@
 			"gate": ["bash", "run.sh", "check-entwurf-v2-visible-resume"],
 			"timeoutSeconds": 60,
 			"signature": "[QK:V2RESUME-INDETERMINATE-NO-START]",
-			"signatureSource": "scripts/check-entwurf-v2-visible-resume.ts"
+			"signatureSource": "pi-extensions/lib/entwurf-v2-visible-resume.test.ts"
 		},
 		{
 			"claim": "V2RESUME-CONFLICT-NO-START",
@@ -33,7 +33,7 @@
 			"gate": ["bash", "run.sh", "check-entwurf-v2-visible-resume"],
 			"timeoutSeconds": 60,
 			"signature": "[QK:V2RESUME-CONFLICT-NO-START]",
-			"signatureSource": "scripts/check-entwurf-v2-visible-resume.ts"
+			"signatureSource": "pi-extensions/lib/entwurf-v2-visible-resume.test.ts"
 		},
 		{
 			"claim": "V2RESUME-LOCKED-NO-RESOLVE",
@@ -44,7 +44,7 @@
 			"gate": ["bash", "run.sh", "check-entwurf-v2-visible-resume"],
 			"timeoutSeconds": 60,
 			"signature": "[QK:V2RESUME-LOCKED-NO-RESOLVE]",
-			"signatureSource": "scripts/check-entwurf-v2-visible-resume.ts"
+			"signatureSource": "pi-extensions/lib/entwurf-v2-visible-resume.test.ts"
 		},
 		{
 			"claim": "V2RESUME-NO-TRANSCRIPT-FAILS-LOUD",
@@ -67,7 +67,7 @@
 			"gate": ["bash", "run.sh", "check-entwurf-v2-visible-resume"],
 			"timeoutSeconds": 60,
 			"signature": "[QK:V2RESUME-NO-TRANSCRIPT-FAILS-LOUD]",
-			"signatureSource": "scripts/check-entwurf-v2-visible-resume.ts"
+			"signatureSource": "pi-extensions/lib/entwurf-v2-visible-resume.test.ts"
 		},
 		{
 			"claim": "V2RESUME-OBSERVE-IS-BOUNDED-WAIT",
@@ -78,7 +78,7 @@
 			"gate": ["bash", "run.sh", "check-entwurf-v2-visible-resume"],
 			"timeoutSeconds": 60,
 			"signature": "[QK:V2RESUME-OBSERVE-IS-BOUNDED-WAIT]",
-			"signatureSource": "scripts/check-entwurf-v2-visible-resume.ts"
+			"signatureSource": "pi-extensions/lib/entwurf-v2-visible-resume.test.ts"
 		},
 		{
 			"claim": "V2RESUME-UNOBSERVED-IS-REAL",
@@ -89,7 +89,7 @@
 			"gate": ["bash", "run.sh", "check-entwurf-v2-visible-resume"],
 			"timeoutSeconds": 60,
 			"signature": "[QK:V2RESUME-UNOBSERVED-IS-REAL]",
-			"signatureSource": "scripts/check-entwurf-v2-visible-resume.ts"
+			"signatureSource": "pi-extensions/lib/entwurf-v2-visible-resume.test.ts"
 		},
 		{
 			"claim": "V2RESUME-RELEASE-FAILURE-LOUD",
@@ -100,7 +100,7 @@
 			"gate": ["bash", "run.sh", "check-entwurf-v2-visible-resume"],
 			"timeoutSeconds": 60,
 			"signature": "[QK:V2RESUME-RELEASE-FAILURE-LOUD]",
-			"signatureSource": "scripts/check-entwurf-v2-visible-resume.ts"
+			"signatureSource": "pi-extensions/lib/entwurf-v2-visible-resume.test.ts"
 		},
 		{
 			"claim": "V2RESUME-ARGV-FROM-RECORD",
@@ -111,7 +111,7 @@
 			"gate": ["bash", "run.sh", "check-entwurf-v2-visible-resume"],
 			"timeoutSeconds": 60,
 			"signature": "[QK:V2RESUME-ARGV-FROM-RECORD]",
-			"signatureSource": "scripts/check-entwurf-v2-visible-resume.ts"
+			"signatureSource": "pi-extensions/lib/entwurf-v2-visible-resume.test.ts"
 		},
 		{
 			"claim": "V2RESUME-RECEIPTS-SEPARATE",
@@ -124,7 +124,7 @@
 			"gate": ["bash", "run.sh", "check-entwurf-v2-visible-resume"],
 			"timeoutSeconds": 60,
 			"signature": "[QK:V2RESUME-RECEIPTS-SEPARATE]",
-			"signatureSource": "scripts/check-entwurf-v2-visible-resume.ts"
+			"signatureSource": "pi-extensions/lib/entwurf-v2-visible-resume.test.ts"
 		},
 		{
 			"claim": "V2RESUME-RENDER-SEPARATES",
@@ -137,7 +137,7 @@
 			"gate": ["bash", "run.sh", "check-entwurf-v2-visible-resume"],
 			"timeoutSeconds": 60,
 			"signature": "[QK:V2RESUME-RENDER-SEPARATES]",
-			"signatureSource": "scripts/check-entwurf-v2-visible-resume.ts"
+			"signatureSource": "pi-extensions/lib/entwurf-v2-visible-resume.test.ts"
 		},
 		{
 			"claim": "V2RESUME-IDENTITY-BEFORE-WINDOW",
@@ -148,7 +148,7 @@
 			"gate": ["bash", "run.sh", "check-entwurf-v2-visible-resume"],
 			"timeoutSeconds": 60,
 			"signature": "[QK:V2RESUME-IDENTITY-BEFORE-WINDOW]",
-			"signatureSource": "scripts/check-entwurf-v2-visible-resume.ts"
+			"signatureSource": "pi-extensions/lib/entwurf-v2-visible-resume.test.ts"
 		},
 		{
 			"claim": "V2RESUME-TIMEOUT-RELEASES",
@@ -161,7 +161,7 @@
 			"gate": ["bash", "run.sh", "check-entwurf-v2-visible-resume"],
 			"timeoutSeconds": 60,
 			"signature": "[QK:V2RESUME-TIMEOUT-RELEASES]",
-			"signatureSource": "scripts/check-entwurf-v2-visible-resume.ts"
+			"signatureSource": "pi-extensions/lib/entwurf-v2-visible-resume.test.ts"
 		},
 		{
 			"claim": "V2RESUME-LOCK-BEFORE-LIVENESS",
@@ -172,7 +172,7 @@
 			"gate": ["bash", "run.sh", "check-entwurf-v2-visible-resume"],
 			"timeoutSeconds": 60,
 			"signature": "[QK:V2RESUME-LOCK-BEFORE-LIVENESS]",
-			"signatureSource": "scripts/check-entwurf-v2-visible-resume.ts"
+			"signatureSource": "pi-extensions/lib/entwurf-v2-visible-resume.test.ts"
 		},
 		{
 			"claim": "V2RESUME-NOT-PI-REFUSED",
@@ -183,7 +183,7 @@
 			"gate": ["bash", "run.sh", "check-entwurf-v2-visible-resume"],
 			"timeoutSeconds": 60,
 			"signature": "[QK:V2RESUME-NOT-PI-REFUSED]",
-			"signatureSource": "scripts/check-entwurf-v2-visible-resume.ts"
+			"signatureSource": "pi-extensions/lib/entwurf-v2-visible-resume.test.ts"
 		},
 		{
 			"claim": "V2RESUME-NOT-PI-BY-FIELD",
@@ -198,7 +198,7 @@
 			"gate": ["bash", "run.sh", "check-entwurf-v2-visible-resume"],
 			"timeoutSeconds": 60,
 			"signature": "[QK:V2RESUME-NOT-PI-BY-FIELD]",
-			"signatureSource": "scripts/check-entwurf-v2-visible-resume.ts"
+			"signatureSource": "pi-extensions/lib/entwurf-v2-visible-resume.test.ts"
 		},
 		{
 			"claim": "V2RESUME-SHARED-ID-GRAMMAR",
@@ -209,7 +209,7 @@
 			"gate": ["bash", "run.sh", "check-entwurf-v2-visible-resume"],
 			"timeoutSeconds": 60,
 			"signature": "[QK:V2RESUME-SHARED-ID-GRAMMAR]",
-			"signatureSource": "scripts/check-entwurf-v2-visible-resume.ts"
+			"signatureSource": "pi-extensions/lib/entwurf-v2-visible-resume.test.ts"
 		}
 	]
 }

package/scripts/probe-bridge-command.ts

@@ -67,6 +67,7 @@ export const EXPECTED_TOOLS = [
 	"entwurf_register_native",
 	"entwurf_fresh_call",
 	"entwurf_resume_call",
+	"entwurf_callback",
 ] as const;
 const DEFAULT_TIMEOUT_MS = 10_000;
 /** How long a probed child gets to die politely before it is killed outright. */

package/scripts/smoke-acp-raw-turn-live.ts

@@ -3,7 +3,7 @@
 //   LIVE=1 ./run.sh smoke-acp-raw-turn-live
 //
 // What this proves (and ONLY this): the pinned Claude ACP adapter
-// (@agentclientprotocol/claude-agent-acp@0.76.0) spawns, speaks the ACP wire
+// (@agentclientprotocol/claude-agent-acp@0.79.0) spawns, speaks the ACP wire
 // protocol over stdio NDJSON, and returns one real model turn. It is the
 // bytes-flow proof that the S2a dep surface is not just installable but
 // actually drivable — before any provider/overlay/streamSimple code (S2b+).

package/scripts/smoke-acp-session-reuse-live.ts

@@ -24,11 +24,26 @@ import { copyFileSync, mkdirSync, mkdtempSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { dirname, resolve } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
-import type { Api, AssistantMessageEvent, Context, Model } from "@earendil-works/pi-ai";
+import type { Api, AssistantMessageEvent, Model, TranscriptContext } from "@earendil-works/pi-ai";
+import { normalizeContext } from "@earendil-works/pi-ai";
 import { skipLive } from "./lib/live-skip.ts";
 
 const REPO_ROOT = resolve(dirname(fileURLToPath(import.meta.url)), "..");
 const MODEL = process.env.ENTWURF_ACP_PROVIDER_MODEL?.trim() || "claude-sonnet-5";
+// The pi built-ins the Claude child also exposes natively. pi declares its tool surface on
+// every turn, and since 0.86 that declaration reaches a provider as the leading system
+// message's `toolsAdded` (`normalizeContext`), which backend.ts replays for the exclude-tools
+// truthfulness preflight. A fixture that declares NO tools is therefore not "a turn with the
+// defaults" — it is a turn where the operator excluded everything, and the preflight rejects it
+// before the prompt is ever sent. So every provider-path context here is built through
+// `normalizeContext`, never typed as a raw `Context`: that annotation is exactly what hid this
+// shape from typecheck when the 0.86 pin landed.
+const PI_DECLARED_TOOLS = ["read", "bash", "edit", "write"].map((name) => ({
+	name,
+	description: "",
+	parameters: {} as never,
+}));
+
 const TURN_TIMEOUT_MS = Number(process.env.ENTWURF_ACP_PROVIDER_TIMEOUT_MS) || 240_000;
 
 function fail(msg: string): never {
@@ -101,7 +116,8 @@ async function main(): Promise<void> {
 	console.error(`[smoke-acp-session-reuse-live] codeword: ${codeword}`);
 
 	// --- turn 1 (new): introduce the codeword, full transcript ---
-	const turn1: Context = {
+	const turn1: TranscriptContext = normalizeContext({
+		tools: PI_DECLARED_TOOLS,
 		messages: [
 			{
 				role: "user",
@@ -109,7 +125,7 @@ async function main(): Promise<void> {
 				timestamp: 0,
 			},
 		],
-	};
+	});
 	const r1 = await withTimeout(
 		"turn 1",
 		consume(backend.streamShellAcp(model, turn1, options) as Stream),
@@ -121,7 +137,9 @@ async function main(): Promise<void> {
 	console.error("[smoke-acp-session-reuse-live] starting turn 2 reuse prompt");
 
 	// --- turn 2 (reuse): ask for the codeword, DELTA ONLY ---
-	const turn2: Context = {
+	// turn1.messages already carries the folded system message, so spreading it keeps the
+	// declared surface on the reuse turn too; normalizeContext does not double it.
+	const turn2: TranscriptContext = normalizeContext({
 		messages: [
 			...turn1.messages,
 			{
@@ -147,7 +165,7 @@ async function main(): Promise<void> {
 				timestamp: 0,
 			},
 		],
-	};
+	});
 	const r2 = await withTimeout(
 		"turn 2",
 		consume(backend.streamShellAcp(model, turn2, options) as Stream),

package/scripts/smoke-agy-install-state.sh

@@ -67,7 +67,7 @@ write_mcp_fake() {   # $1 = path
 while IFS= read -r line; do
   case "$line" in
     *'"id":1'*) printf '%s\n' '{"jsonrpc":"2.0","id":1,"result":{"protocolVersion":"2024-11-05","capabilities":{},"serverInfo":{"name":"fake-entwurf-bridge","version":"0"}}}' ;;
-    *'"id":2'*) printf '%s\n' '{"jsonrpc":"2.0","id":2,"result":{"tools":[{"name":"entwurf_v2"},{"name":"entwurf_self"},{"name":"entwurf_peers"},{"name":"entwurf_inbox_read"},{"name":"entwurf_register_native"},{"name":"entwurf_fresh_call"},{"name":"entwurf_resume_call"}]}}' ;;
+    *'"id":2'*) printf '%s\n' '{"jsonrpc":"2.0","id":2,"result":{"tools":[{"name":"entwurf_v2"},{"name":"entwurf_self"},{"name":"entwurf_peers"},{"name":"entwurf_inbox_read"},{"name":"entwurf_register_native"},{"name":"entwurf_fresh_call"},{"name":"entwurf_resume_call"},{"name":"entwurf_callback"}]}}' ;;
   esac
 done
 FAKE
@@ -89,7 +89,7 @@ if [ "${REVIEW_ENV:-}" = "fail" ]; then echo configured-env-failure >&2; exit 24
 while IFS= read -r line; do
   case "$line" in
     *'"id":1'*) printf '%s\n' '{"jsonrpc":"2.0","id":1,"result":{"protocolVersion":"2024-11-05","capabilities":{},"serverInfo":{"name":"fake-entwurf-bridge","version":"0"}}}' ;;
-    *'"id":2'*) printf '%s\n' '{"jsonrpc":"2.0","id":2,"result":{"tools":[{"name":"entwurf_v2"},{"name":"entwurf_self"},{"name":"entwurf_peers"},{"name":"entwurf_inbox_read"},{"name":"entwurf_register_native"},{"name":"entwurf_fresh_call"},{"name":"entwurf_resume_call"}]}}' ;;
+    *'"id":2'*) printf '%s\n' '{"jsonrpc":"2.0","id":2,"result":{"tools":[{"name":"entwurf_v2"},{"name":"entwurf_self"},{"name":"entwurf_peers"},{"name":"entwurf_inbox_read"},{"name":"entwurf_register_native"},{"name":"entwurf_fresh_call"},{"name":"entwurf_resume_call"},{"name":"entwurf_callback"}]}}' ;;
   esac
 done
 FAKE