@junghanacs/entwurf 0.35.0 → 0.36.0

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@junghanacs/entwurf",
-	"version": "0.35.0",
-	"description": "Garden-citizen dispatch substrate and meta-bridge for pi, Claude Code, Copilot CLI, OMP, Antigravity, and Codex CLI; Claude and Snowflake Cortex Code ACP backends.",
+	"version": "0.36.0",
+	"description": "Visible sibling sessions across independent agent harnesses: launch in Herdr or tmux, reopen pi in tmux, and deliver messages by garden id; native bridges and Claude/Cortex ACP adapters.",
 	"license": "MIT",
 	"author": {
 		"name": "Junghan Kim",
@@ -30,7 +30,12 @@
 		"copilot",
 		"antigravity",
 		"pi-coding-agent",
-		"pi-extension"
+		"pi-extension",
+		"herdr",
+		"tmux",
+		"visible-sessions",
+		"session-lifecycle",
+		"multi-agent"
 	],
 	"type": "module",
 	"files": [
@@ -59,7 +64,6 @@
 		"pi/pi-durable/carrier-resolver.mjs",
 		"pi/pi-durable/carrier/",
 		"pi/pi-durable/overlay/upstream-pin.json",
-		"pi/pi-durable/overlay/runtime-contacts.patch",
 		"pi/meta-bridge/.claude-plugin/marketplace.json",
 		"pi/meta-bridge/entwurf-meta-receive/.claude-plugin/plugin.json",
 		"pi/meta-bridge/entwurf-meta-receive/hooks/hooks.json",
@@ -95,15 +99,15 @@
 		"@agentclientprotocol/claude-agent-acp": "0.85.1",
 		"@agentclientprotocol/sdk": "1.6.0",
 		"@anthropic-ai/sdk": "0.100.1",
-		"@earendil-works/chord": "1.1.0",
-		"@earendil-works/pi-agent-core": "1.1.0",
-		"@earendil-works/pi-ai": "1.1.0",
-		"@earendil-works/pi-codemode": "1.1.0",
-		"@earendil-works/pi-coding-agent": "1.1.0",
-		"@earendil-works/pi-durable": "1.1.0",
-		"@earendil-works/pi-mcp": "1.1.0",
-		"@earendil-works/pi-telemetry": "1.1.0",
-		"@earendil-works/pi-tui": "1.1.0",
+		"@earendil-works/chord": "1.2.0",
+		"@earendil-works/pi-agent-core": "1.2.0",
+		"@earendil-works/pi-ai": "1.2.0",
+		"@earendil-works/pi-codemode": "1.2.0",
+		"@earendil-works/pi-coding-agent": "1.2.0",
+		"@earendil-works/pi-durable": "1.2.0",
+		"@earendil-works/pi-mcp": "1.2.0",
+		"@earendil-works/pi-telemetry": "1.2.0",
+		"@earendil-works/pi-tui": "1.2.0",
 		"@modelcontextprotocol/sdk": "^1.12.1",
 		"proper-lockfile": "4.1.2",
 		"smol-toml": "^1.8.0",
@@ -115,6 +119,7 @@
 	"devDependencies": {
 		"@biomejs/biome": "^2.4.13",
 		"@types/node": "^24.3.0",
+		"@types/proper-lockfile": "4.1.4",
 		"husky": "^9.1.7",
 		"rregex": "1.13.1",
 		"typescript": "^6.0.2",
@@ -178,7 +183,7 @@
 		"test": "vitest run",
 		"test:watch": "vitest",
 		"test:pack": "pnpm run check-pack && pnpm run check-pack-install",
-		"typecheck": "tsc --noEmit && tsc -p mcp/tsconfig.json && tsc -p scripts/tsconfig.json",
+		"typecheck": "tsc --noEmit && tsc -p mcp/tsconfig.json && tsc -p scripts/tsconfig.json && tsc -p pi/pi-durable/tsconfig.json",
 		"lint": "biome check .",
 		"format": "biome check --write .",
 		"check-meta-manifest-schema": "./run.sh check-meta-manifest-schema",
@@ -188,7 +193,7 @@
 		"check:core": "pnpm run check:toolchain && pnpm run check:vitest && pnpm run check:contracts",
 		"check:toolchain": "pnpm lint && pnpm typecheck",
 		"check:vitest": "./run.sh check-mux-fresh-call && ./run.sh check-acp-sdk-surface && ./run.sh check-pi-queue-oracle && ./run.sh check-tests-beside-behavior",
-		"check:contracts": "./run.sh check-demo-reproducibility && ./run.sh check-shell-quote && ./run.sh check-entwurf-session-identity && ./run.sh check-meta-session && ./run.sh check-meta-v3-record && ./run.sh check-mailbox-receipt-state && ./run.sh check-entwurf-capabilities && ./run.sh check-harness-admission-parity && ./run.sh check-capability-bundle-reach && ./run.sh check-meta-mailbox-state-write && ./run.sh check-meta-receiver-marker && ./run.sh check-meta-capability-source && ./run.sh check-model-lock && ./run.sh check-dep-versions && ./run.sh check-node-floor-coherence && ./run.sh check-claude-floor-coherence && ./run.sh check-copilot-statusline && ./run.sh check-pi-import-surface && ./run.sh check-env-namespace && ./run.sh check-pi-runtime-version && ./run.sh check-pi-preflight && ./run.sh check-project-trust-handler && ./run.sh check-entwurf-v2-contract && ./run.sh check-entwurf-v2-send && ./run.sh check-entwurf-v2-runner && ./run.sh check-control-send-receipt && ./run.sh check-compaction-send-guard && ./run.sh check-entwurf-resume-args && ./run.sh check-entwurf-v2-native-push && ./run.sh check-entwurf-v2-production && ./run.sh check-entwurf-v2-surface && ./run.sh check-entwurf-bridge-pi-free && ./run.sh check-resume-launch-identity && ./run.sh check-mux-placement && ./run.sh check-mux-launch && ./run.sh check-mux-resume-call && ./run.sh check-mux-parent-artifact && ./run.sh check-mux-launcher-fence && ./run.sh check-entwurf-v2-visible-resume && ./run.sh check-control-socket-path && ./run.sh check-meta-listing && ./run.sh check-entwurf-fact-provider && ./run.sh check-herdr-placement && ./run.sh check-herdr-fresh-call && ./run.sh check-herdr-supply && ./run.sh check-fresh-call-dispatch && ./run.sh check-entwurf-peers-surface && ./run.sh check-entwurf-self-address && ./run.sh check-entwurf-deliverability && ./run.sh check-native-push-adapter && ./run.sh check-native-push-register && ./run.sh check-auth-boundary && ./run.sh check-acp-overlay && ./run.sh check-acp-tool-surface && ./run.sh check-acp-event-mapper && ./run.sh check-acp-prompt-builder && ./run.sh check-acp-config && ./run.sh check-acp-session-store && ./run.sh check-acp-carrier-augment && ./run.sh check-acp-foreground-only && ./run.sh check-acp-vendor-rejection && ./run.sh check-codex-sender-identity && ./run.sh check-codex-native-push && ./run.sh check-pi-durable-beside",
+		"check:contracts": "./run.sh check-demo-reproducibility && ./run.sh check-shell-quote && ./run.sh check-entwurf-session-identity && ./run.sh check-meta-session && ./run.sh check-meta-v3-record && ./run.sh check-mailbox-receipt-state && ./run.sh check-entwurf-capabilities && ./run.sh check-harness-admission-parity && ./run.sh check-capability-bundle-reach && ./run.sh check-meta-mailbox-state-write && ./run.sh check-meta-receiver-marker && ./run.sh check-meta-capability-source && ./run.sh check-model-lock && ./run.sh check-dep-versions && ./run.sh check-node-floor-coherence && ./run.sh check-claude-floor-coherence && ./run.sh check-copilot-statusline && ./run.sh check-pi-import-surface && ./run.sh check-env-namespace && ./run.sh check-pi-runtime-version && ./run.sh check-pi-preflight && ./run.sh check-project-trust-handler && ./run.sh check-entwurf-v2-contract && ./run.sh check-entwurf-v2-send && ./run.sh check-entwurf-v2-runner && ./run.sh check-control-send-receipt && ./run.sh check-compaction-send-guard && ./run.sh check-entwurf-resume-args && ./run.sh check-entwurf-v2-native-push && ./run.sh check-entwurf-v2-production && ./run.sh check-entwurf-v2-surface && ./run.sh check-entwurf-bridge-pi-free && ./run.sh check-resume-launch-identity && ./run.sh check-mux-placement && ./run.sh check-mux-launch && ./run.sh check-mux-resume-call && ./run.sh check-mux-parent-artifact && ./run.sh check-mux-launcher-fence && ./run.sh check-entwurf-v2-visible-resume && ./run.sh check-control-socket-path && ./run.sh check-meta-listing && ./run.sh check-entwurf-fact-provider && ./run.sh check-herdr-placement && ./run.sh check-herdr-fresh-call && ./run.sh check-herdr-supply && ./run.sh check-fresh-call-dispatch && ./run.sh check-entwurf-peers-surface && ./run.sh check-entwurf-self-address && ./run.sh check-entwurf-deliverability && ./run.sh check-native-push-adapter && ./run.sh check-native-push-register && ./run.sh check-auth-boundary && ./run.sh check-acp-overlay && ./run.sh check-acp-tool-surface && ./run.sh check-acp-event-mapper && ./run.sh check-acp-prompt-builder && ./run.sh check-acp-config && ./run.sh check-acp-session-store && ./run.sh check-acp-carrier-augment && ./run.sh check-acp-foreground-only && ./run.sh check-acp-set-model-readback && ./run.sh check-acp-vendor-rejection && ./run.sh check-codex-sender-identity && ./run.sh check-codex-native-push && ./run.sh check-pi-durable-beside",
 		"check:hermetic": "./run.sh check-bridge-delivery && ./run.sh smoke-pi-attach && ./run.sh check-fresh-cut-gate && ./run.sh check-hook-launch-topology && ./run.sh check-meta-hook-session-switch && ./run.sh check-copilot-birth-hook && ./run.sh check-copilot-receive-arm && ./run.sh check-copilot-launch && ./run.sh check-pi-launch && ./run.sh check-codex-app-server-launch && ./run.sh check-meta-identity-consumers && ./run.sh check-socket-probe && ./run.sh smoke-meta-honesty && ./run.sh check-meta-doctor-oracle && ./run.sh check-agy-permission-matrix && ./run.sh smoke-agy-statusline-state && ./run.sh smoke-copilot-statusline-state && ./run.sh smoke-copilot-mcp-state && ./run.sh smoke-omp-bridge-state && ./run.sh smoke-omp-mcp-state && ./run.sh smoke-omp-receive-state && ./run.sh check-omp-birth-hook && ./run.sh check-omp-receive-arm && ./run.sh check-omp-fresh-preflight && ./run.sh smoke-agy-hooks-state && ./run.sh smoke-pi-provider-state && ./run.sh smoke-user-scope-citizen && ./run.sh smoke-meta-prune && ./run.sh smoke-meta-keyset-guard && ./run.sh check-meta-manifest-schema && ./run.sh check-entwurf-control-rpc && ./run.sh check-entwurf-bridge-boot && ./run.sh check-probe-bridge-command && ./run.sh check-meta-facts && ./run.sh check-peer-facts && ./run.sh check-herdr-plugin && ./run.sh check-herdr-plugin-profile && ./run.sh check-herdr-plugin-build && ./run.sh check-herdr-runtime-bootstrap && ./run.sh check-herdr-activation && ./run.sh check-agy-sender-identity && ./run.sh check-acp-provider-surface && ./run.sh check-acp-stop-reason && ./run.sh check-acp-prompt-lifecycle && ./run.sh check-acp-usage-accounting && ./run.sh check-acp-launch-namespace && ./run.sh check-acp-stream-hooks && ./run.sh check-acp-backend-preflight && ./run.sh check-acp-session-reuse && ./run.sh check-typing-call-fence && ./run.sh check-gate-manifests && ./run.sh check-release-gate-outcomes && ./run.sh check-probe-ordering && ./run.sh check-probe-cli-shim && ./run.sh check-acp-cortex && ./run.sh check-codex-bridge-identity && ./run.sh check-pi-bridge-sender && ./run.sh check-pi-mcp-register && ./run.sh check-pi-mcp-bridge && ./run.sh check-codex-birth-hook && ./run.sh smoke-codex-config-state && ./run.sh smoke-codex-birth && ./run.sh check-herdr-sandbox",
 		"check:package": "./run.sh check-install-surface && ./run.sh smoke-meta-install-state && ./run.sh smoke-agy-install-state && ./run.sh smoke-setup-verdict && ./run.sh check-pack-pin-matcher && ./run.sh check-pack-consumer-roots && ./run.sh check-package-source-routing && ./run.sh check-install-preflight && ./run.sh check-pack"
 	},

package/pi/pi-durable/bootstrap.mjs

@@ -9,15 +9,16 @@
 // with these differences:
 // - Entwurf's tools-only extension is handed to `openDurable`;
 // - a NEW session is opened with an explicit model and an explicit width, never a default (below);
-// - the citizen is born once `openDurable` returns, with the overlay's `submitToRoot` so its
-//   doorbell can announce mail to the root conversation;
+// - the citizen is born once `openDurable` returns, with the owned runtime's `submitToRoot` so its
+//   doorbell can announce mail to the root conversation, and its `onFailed` so a session that
+//   fails and closes itself retires that doorbell at once;
 // - a launcher's first input, when given, is admitted to the root ONCE, after that birth;
 // - the TUI is handed the native view with the garden id on every conversation label
 //   (`withGardenIdentity`).
 // Nothing of the native registry, controller or TUI is rebuilt here.
 //
-// The durable app itself is this package's CARRIER (./carrier/, the pinned upstream files emitted by
-// the maintainer — upstream publishes no experimental app), and it runs under the carrier's resolver,
+// The durable app itself is this package's CARRIER (./carrier/, emitted from Entwurf's owned source
+// pi/pi-durable/src — upstream publishes no experimental app), and it runs under the carrier's resolver,
 // which maps the app's pi-coding-agent internals to the published package the carrier resolves.
 // `entwurf pi-durable` (run.sh) verifies the carrier and its SDK set (pi-durable-runtime.ts) and
 // execs:
@@ -29,11 +30,11 @@
 //
 // Explicit means the native API, not a vendor argv: upstream's durable main takes only
 // `--continue`, so `--provider`/`--model` reach pi's own `findInitialAgentModel` through the
-// overlay's `model` option, for a new session only, and an unresolvable pair fails the open
+// owned runtime's `model` option, for a new session only, and an unresolvable pair fails the open
 // before any citizen is born (the native session directory may already exist by then). The model
 // must be one registered catalog model of that provider, named by its canonical id or by
 // `id:<level>` as pi's own parser reads a thinking level: a typo, a partial or case-variant match, a
-// provider-prefixed id or an unregistered custom-id fallback is refused by the overlay as
+// provider-prefixed id or an unregistered custom-id fallback is refused by the owned runtime as
 // `explicit-model-not-exact`, before the birth and the first input.
 // `--width task-wide` is the one width: no tool filter, so the model is offered exactly the tools
 // the installed extensions register. It is a statement of what is OFFERED, not an approval or
@@ -50,7 +51,7 @@
 // its initialization, and its default export is a native durable Extension, handed to `openDurable`
 // by reference after the contact. Initialization runs before the TUI or the runtime is imported —
 // the runtime creates the provider runtime before it installs any extension (carrier/runtime.js
-// 142-148), so an extension object cannot carry an environment phase. Entwurf checks only what the
+// 153-159), so an extension object cannot carry an environment phase. Entwurf checks only what the
 // ingress needs: a default export object with a name, no extension name the app installs itself (a
 // same-name install REPLACES), and no tool name of the contact. Every other field is the native
 // registry's to validate. The module is trusted operator code: the identity carriers and the
@@ -341,7 +342,10 @@ export async function openDurableCitizen({
 	}
 	let attachment;
 	try {
-		attachment = await contact.attach(durable.view.current().session, { submitToRoot: durable.submitToRoot });
+		attachment = await contact.attach(durable.view.current().session, {
+			submitToRoot: durable.submitToRoot,
+			onFailed: durable.onFailed,
+		});
 	} catch (error) {
 		return failAfterCleanup(
 			error,

package/pi/pi-durable/carrier/runtime.js

@@ -62,6 +62,11 @@ const context = BACKGROUND_CONTEXT;
 	                           
 	                                                                 
 	                             
+	   
+	                                                                                                               
+	                                                                                             
+	   
+	                                               
  
 
                                     
@@ -98,6 +103,12 @@ const context = BACKGROUND_CONTEXT;
 	                                   
 	                                                                                                                   
 	                                                               
+	   
+	                                                                                                                  
+	                                                                                                                
+	                                            
+	   
+	                                           
 	                       
  
 
@@ -234,8 +245,27 @@ export async function openDurable(options                     = {})
 			update({ notices: [...state.notices, { id: nextNotice++, level, message }].slice(-20) });
 		};
 		const fail = (error         )       => notice("error", error instanceof Error ? error.message : String(error));
-		report = (error) => notice("warning", error instanceof Error ? error.message : String(error));
+		report = (error) => {
+			const message = error instanceof Error ? error.message : String(error);
+			// A failing Session runs its close listeners first and reports the cause right after: that report names it.
+			if (state.failure !== undefined && state.failure.error === undefined) update({ failure: { error: message } });
+			else notice("warning", message);
+		};
 		for (const error of pendingReports) report(error);
+		const failedListeners = new Set            ();
+		// The Session closes itself when its Storage fails. Its `closed` settles only after every running task returned,
+		// which a task ignoring its abort can delay without end, so the failure is shown from the close listener itself.
+		// `close()` unsubscribes before it closes the Session, so only a Session closing itself gets here.
+		const unsubscribeClose = harness.subscribeClose(() => {
+			update({ failure: {} });
+			for (const listener of failedListeners) {
+				try {
+					listener();
+				} catch (error) {
+					fail(error);
+				}
+			}
+		});
 		let unsubscribe = conversation.subscribe((value) => update({ conversation: value }));
 		// Subagents appear as their conversations are created. A commit listener only records; it calls no Session API.
 		const unsubscribeCommits = harness.subscribeCommits((publication) => {
@@ -286,7 +316,12 @@ export async function openDurable(options                     = {})
 		};
 		const controller                    = {
 			submit: (text, whenBusy) =>
-				command(async () => watchAnswer(await current.submit({ type: "input", content: text, whenBusy }, context))),
+				command(async () => {
+					if (state.failure !== undefined) {
+						throw new Error("The session failed and takes no input. Close it, then reopen it with --continue.");
+					}
+					watchAnswer(await current.submit({ type: "input", content: text, whenBusy }, context));
+				}),
 			compact: (instructions) =>
 				command(async () => {
 					const id = await current.compact(instructions, context);
@@ -374,8 +409,23 @@ export async function openDurable(options                     = {})
 			controller,
 			settings: settingsManager,
 			submitToRoot: (draft) => root.submit(draft, context),
+			onFailed(listener) {
+				// The failure is kept in the view, so a listener that comes after it is told at once, and still only once.
+				if (state.failure !== undefined) {
+					try {
+						listener();
+					} catch (error) {
+						fail(error);
+					}
+					return () => {};
+				}
+				failedListeners.add(listener);
+				return () => failedListeners.delete(listener);
+			},
 			close() {
 				closing ??= (async () => {
+					// First: the Session runs its close listeners inside its own close call.
+					unsubscribeClose();
 					unsubscribe();
 					unsubscribeCommits();
 					conversation.dispose();

package/pi/pi-durable/carrier/subagent.js

@@ -8,6 +8,7 @@ import {
 	             
 	               
 	                      
+	                         
 } from "@earendil-works/pi-durable";
 
 async function answerText(api                  , answer         , context         )                  {
@@ -48,7 +49,11 @@ export const Subagent            = defineExtension({
 					throw new Error(`Subagent ${child} failed: ${settled.status}`);
 				}
 				const text = await answerText(api, settled.answer, context);
-				return { content: [{ type: "text", text }], details: { conversationId: child } };
+				// `output` is what the model reads; spelled out so the result shape is checked, not just accepted.
+				return {
+					output: [{ type: "text", text }],
+					details: { conversationId: child },
+				}                              ;
 			},
 		}),
 	],

package/pi/pi-durable/carrier/tui.js

@@ -46,7 +46,7 @@ import { ToolExecutionComponent,                    } from "entwurf-pi-dist:mode
 import { UserMessageComponent } from "entwurf-pi-dist:modes/interactive/components/user-message.js";
 import { getEditorTheme, getMarkdownTheme, initTheme, theme } from "entwurf-pi-dist:modes/interactive/theme/theme.js";
 import { InteractiveThemeController } from "entwurf-pi-dist:modes/interactive/theme/theme-controller.js";
-import { agentOf,                                                                  } from "./runtime.js";
+import { agentOf,                                                                               } from "./runtime.js";
 
 const SELECT_THEME                  = {
 	selectedPrefix: (text) => theme.fg("accent", text),
@@ -152,6 +152,26 @@ class CompactionComponent extends Box {
 	                      
  
 
+/**
+ * The lines above the editor: first what stays true for as long as it is true, the session's failure and the
+ * compaction failure a conversation keeps until a compaction produces a summary, then the latest notices.
+ */
+export function durableNotices(view             )                                               {
+	const lines                                      = [];
+	if (view.failure !== undefined) {
+		const cause = view.failure.error === undefined ? "" : `: ${view.failure.error}`;
+		lines.push({
+			level: "error",
+			message: `Session failed${cause}. It takes no more input, and a tool still running may take a while to stop. Close this session, then reopen it with --continue.`,
+		});
+	}
+	const compaction = ((view.conversation.docs["pi.live"] ?? {})             ).compactionFailure;
+	if (compaction !== undefined) {
+		lines.push({ level: "error", message: `Compaction failed (${compaction.reason}): ${compaction.error}` });
+	}
+	return [...lines, ...view.notices.slice(-4)];
+}
+
 /**
  * The live background-task badge: the dock's first row, never shrunk, so live background work stays on
  * screen however small the terminal gets. It counts the graph's background tasks whatever their kind and
@@ -212,7 +232,13 @@ export function durableLayout(transcript           , badge           , dock
 			minSize: 1,
 			visible: (viewport) => badge.count === 0 || viewport.height > 1,
 		},
-		{ component: new VStack([{ component: badge, shrink: 0 }, ...dock]), basis: "auto", grow: 0, shrink: 1, minSize: 1 },
+		{
+			component: new VStack([{ component: badge, shrink: 0 }, ...dock]),
+			basis: "auto",
+			grow: 0,
+			shrink: 1,
+			minSize: 1,
+		},
 	]);
 }
 
@@ -368,7 +394,8 @@ class DurableTui {
 		this.#syncQueue((view.conversation.docs["pi.inbox"] ?? { items: [] })              );
 		this.#syncNotices(view);
 		this.#editor.borderColor = theme.getThinkingBorderColor(agentOf(view.conversation).thinkingLevel ?? "off");
-		this.#syncStatus(live);
+		// A failed session's live state is its last one; nothing is working any more.
+		this.#syncStatus(view.failure === undefined ? live : {});
 		this.#syncFooter(view);
 		if (this.#rebuilt) this.#transcript.scrollToEnd();
 		this.#ui.requestRender(this.#rebuilt);
@@ -409,7 +436,7 @@ class DurableTui {
 
 	#syncNotices(view             )       {
 		this.#notices.clear();
-		for (const item of view.notices.slice(-4)) {
+		for (const item of durableNotices(view)) {
 			const color = item.level === "error" ? "error" : item.level === "warning" ? "warning" : "muted";
 			this.#notices.addChild(new TruncatedText(theme.fg(color, item.message), 1, 0));
 		}

package/pi/pi-durable/carrier-relocation.mjs

@@ -3,8 +3,8 @@
 // rewrite the emitter performs and the resolution the runtime accepts cannot drift apart.
 //
 // The durable app is source-only upstream: published `@earendil-works/pi-coding-agent` ships no
-// `dist/experimental`, and its exports map exposes no deep `dist/` path. The carrier is the pinned
-// upstream app files, type-stripped, with exactly two rewrites:
+// `dist/experimental`, and its exports map exposes no deep `dist/` path. The carrier is Entwurf's
+// owned app source (pi/pi-durable/src, #141), type-stripped, with exactly two rewrites:
 //
 //   "./<sibling>.ts"   → "./<sibling>.js"                 a carrier file importing another carrier file
 //   "../../<path>.ts"  → entwurf-pi-dist:<path>.js        the app importing a pi-coding-agent internal

package/pi/pi-durable/overlay/upstream-pin.json

@@ -1,64 +1,107 @@
 {
-	"schemaVersion": 2,
-	"comment": "The one upstream commit the pi-durable carrier is emitted from, the patch it applies, the emitted files and the published SDK set they run against. The experimental durable app is source-only upstream (published pi-coding-agent ships no dist/experimental), so Entwurf ships it as a CARRIER: the pinned app files, type-stripped, with the relocation in pi/pi-durable/carrier-relocation.mjs. scripts/emit-pi-durable-carrier.ts is the only writer of the generated fields (blob, sha256, emitter.node) and the only reader of upstream source; an installed package never reads source. Model data rides the published @earendil-works/pi-ai.",
-	"repository": "https://github.com/earendil-works/pi",
-	"tag": "v1.1.0",
-	"commit": "abe508e1b89912adde45528136c3221eb69acdd7",
-	"patches": ["runtime-contacts.patch"],
+	"schemaVersion": 3,
+	"comment": "The pi-durable carrier: what it is emitted from, what it is, and the published SDK set it runs against. The experimental durable app is source-only upstream (published pi-coding-agent ships no dist/experimental), so Entwurf owns its thin application/TUI composition as canonical source (pi/pi-durable/src) and ships it as a CARRIER: those files, type-stripped, with the relocation in pi/pi-durable/carrier-relocation.mjs. The SDK engine (execution, scheduler, queues, storage/transcript, compaction, cancellation/recovery, providers, auth) stays the published packages in `sdk`. scripts/emit-pi-durable-carrier.ts is the only writer of the generated fields (carrier blob, sha256, emitter.node); an installed package never reads source. Model data rides the published @earendil-works/pi-ai.",
+	"origin": {
+		"comment": "Frozen history, never an input: the upstream commit the owned source was first taken from, its objects as recorded then, the overlay patch that carried Entwurf's changes until it was folded into the source (#141), and the carrier bytes the last patch-built release shipped. Neither install nor emit reads this; `emit-pi-durable-carrier --origin <clone>` checks it as provenance only.",
+		"repository": "https://github.com/earendil-works/pi",
+		"tag": "v1.1.0",
+		"commit": "abe508e1b89912adde45528136c3221eb69acdd7",
+		"license": {
+			"path": "LICENSE",
+			"blob": "b0a8e9b81083294360c69b4ec45d3d39a2b28197"
+		},
+		"files": [
+			{
+				"path": "packages/coding-agent/src/experimental/durable/runtime.ts",
+				"blob": "fcd6e5239e999ebf17dea0335fb3dc9cd7f7ce45"
+			},
+			{
+				"path": "packages/coding-agent/src/experimental/durable/tui.ts",
+				"blob": "397b276cbeb1c90e1fbc96c3cc59e6a25f92dad7"
+			},
+			{
+				"path": "packages/coding-agent/src/experimental/durable/harness-setup.ts",
+				"blob": "4d6a4be5333ebb8e0f17eac1987f18ea35a91fc7"
+			},
+			{
+				"path": "packages/coding-agent/src/experimental/durable/prompt.ts",
+				"blob": "8e2f5d5273fba58da8b314766956ed62951c3814"
+			},
+			{
+				"path": "packages/coding-agent/src/experimental/durable/sessions.ts",
+				"blob": "34f9ceeeaeaf874f7478d56115da2e4f726c6a85"
+			},
+			{
+				"path": "packages/coding-agent/src/experimental/durable/subagent.ts",
+				"blob": "e767d54e0bf2908e0f4f41c6933b55c00562eb25"
+			}
+		],
+		"retiredOverlay": {
+			"name": "runtime-contacts.patch",
+			"sha256": "5b1bd9b48d4ff58ad223006d81cc12c4e0b18959cca5cda5ab3ad89f68bbe898"
+		},
+		"baselineCarrier": {
+			"release": "0.35.1",
+			"node": "v24.18.1",
+			"files": {
+				"runtime.js": "bfd88844fae61e8bd32d57b5b986f48056c64eebb5466d9826318a0783ac9005",
+				"tui.js": "f61cc68e5d32552a8196785093ae9e2f4a946088fe71582bb05690517db8c5b4",
+				"harness-setup.js": "712b630145dc6f5c655a85b01b1e20299c962542e63c5494d2202bb7bf414a15",
+				"prompt.js": "ff1ff765fa313e5cb1c3d7537c901c23adb0562ee433bd050fd35eb3d892134c",
+				"sessions.js": "1bd1a04ece66f5ab3ca22860c64dba9abc848334d11a27a9afe543f1365c7254",
+				"subagent.js": "8a75d934ef87efbb0bb2006a2141f1ea932560851f1718b991ed947d6efdb54c",
+				"LICENSE": "0457f5bcec3b3b211605dfb5d1a49042fd638f3686a410fe099c24a25af13c48"
+			}
+		}
+	},
 	"carrier": {
-		"comment": "files: the six app files bootstrap.mjs needs (main.ts is replaced by the bootstrap). distTargets: every pi-coding-agent internal the stripped files import, as paths under the published dist/; the emitter refuses a set that differs and the resolver answers no other.",
+		"comment": "files: the six app files bootstrap.mjs needs (main.ts is replaced by the bootstrap), each emitted from its owned `source`. distTargets: every pi-coding-agent internal the stripped files import, as paths under the published dist/; the emitter refuses a set that differs and the resolver answers no other.",
 		"emitter": {
 			"tool": "node:module.stripTypeScriptTypes",
 			"mode": "strip",
 			"node": "v24.18.1"
 		},
 		"license": {
-			"source": "LICENSE",
+			"source": "pi/pi-durable/src/LICENSE",
 			"blob": "b0a8e9b81083294360c69b4ec45d3d39a2b28197",
 			"sha256": "0457f5bcec3b3b211605dfb5d1a49042fd638f3686a410fe099c24a25af13c48"
 		},
 		"files": [
 			{
 				"name": "runtime.js",
-				"source": "packages/coding-agent/src/experimental/durable/runtime.ts",
-				"patched": true,
-				"blob": "fcd6e5239e999ebf17dea0335fb3dc9cd7f7ce45",
-				"sha256": "bfd88844fae61e8bd32d57b5b986f48056c64eebb5466d9826318a0783ac9005"
+				"source": "pi/pi-durable/src/experimental/durable/runtime.ts",
+				"blob": "36c352291620ab86184172a1b4a0df4562ab9581",
+				"sha256": "60c2965eadbdbbe78fce1b7eeb89d97eb3104a30b7d58ebca87009d2e9118403"
 			},
 			{
 				"name": "tui.js",
-				"source": "packages/coding-agent/src/experimental/durable/tui.ts",
-				"patched": true,
-				"blob": "397b276cbeb1c90e1fbc96c3cc59e6a25f92dad7",
-				"sha256": "f61cc68e5d32552a8196785093ae9e2f4a946088fe71582bb05690517db8c5b4"
+				"source": "pi/pi-durable/src/experimental/durable/tui.ts",
+				"blob": "dab99cd4778ae1db7f062e64db2d0c068f7e342d",
+				"sha256": "0f9ebaf8fbb2a532ccd1a7198e1a25533a99720b5fedbf03f42d5c381db3abc5"
 			},
 			{
 				"name": "harness-setup.js",
-				"source": "packages/coding-agent/src/experimental/durable/harness-setup.ts",
-				"patched": false,
+				"source": "pi/pi-durable/src/experimental/durable/harness-setup.ts",
 				"blob": "4d6a4be5333ebb8e0f17eac1987f18ea35a91fc7",
 				"sha256": "712b630145dc6f5c655a85b01b1e20299c962542e63c5494d2202bb7bf414a15"
 			},
 			{
 				"name": "prompt.js",
-				"source": "packages/coding-agent/src/experimental/durable/prompt.ts",
-				"patched": false,
+				"source": "pi/pi-durable/src/experimental/durable/prompt.ts",
 				"blob": "8e2f5d5273fba58da8b314766956ed62951c3814",
 				"sha256": "ff1ff765fa313e5cb1c3d7537c901c23adb0562ee433bd050fd35eb3d892134c"
 			},
 			{
 				"name": "sessions.js",
-				"source": "packages/coding-agent/src/experimental/durable/sessions.ts",
-				"patched": false,
+				"source": "pi/pi-durable/src/experimental/durable/sessions.ts",
 				"blob": "34f9ceeeaeaf874f7478d56115da2e4f726c6a85",
 				"sha256": "1bd1a04ece66f5ab3ca22860c64dba9abc848334d11a27a9afe543f1365c7254"
 			},
 			{
 				"name": "subagent.js",
-				"source": "packages/coding-agent/src/experimental/durable/subagent.ts",
-				"patched": false,
-				"blob": "e767d54e0bf2908e0f4f41c6933b55c00562eb25",
-				"sha256": "8a75d934ef87efbb0bb2006a2141f1ea932560851f1718b991ed947d6efdb54c"
+				"source": "pi/pi-durable/src/experimental/durable/subagent.ts",
+				"blob": "3fa9aebbe93e82cfff436e7b9d4c9877e0ed0e27",
+				"sha256": "1cb2390b673a0d914117bc07708c39b004fb10e48b31436bf9d9d2b953a64220"
 			}
 		],
 		"distTargets": [
@@ -89,17 +132,17 @@
 		]
 	},
 	"sdk": {
-		"comment": "The published library set the carrier runs against, derived from the 1.1.0 declarations. members: the @earendil-works packages the carrier imports and every @earendil-works package those declare. direct: a third-party package a carrier file imports itself (sessions.ts: proper-lockfile, at the version pi-coding-agent 1.1.0 pins). Each is an exact production dependency in package.json; the members' own edges are caret ranges, so the installed physical edges, not semver, are what must equal these versions.",
+		"comment": "The published library set the carrier runs against, derived from the 1.2.0 declarations. members: the @earendil-works packages the carrier imports and every @earendil-works package those declare. direct: a third-party package a carrier file imports itself (sessions.ts: proper-lockfile, at the version pi-coding-agent 1.2.0 pins). Each is an exact production dependency in package.json; the members' own edges are caret ranges, so the installed physical edges, not semver, are what must equal these versions.",
 		"members": {
-			"@earendil-works/chord": "1.1.0",
-			"@earendil-works/pi-agent-core": "1.1.0",
-			"@earendil-works/pi-ai": "1.1.0",
-			"@earendil-works/pi-codemode": "1.1.0",
-			"@earendil-works/pi-coding-agent": "1.1.0",
-			"@earendil-works/pi-durable": "1.1.0",
-			"@earendil-works/pi-mcp": "1.1.0",
-			"@earendil-works/pi-telemetry": "1.1.0",
-			"@earendil-works/pi-tui": "1.1.0"
+			"@earendil-works/chord": "1.2.0",
+			"@earendil-works/pi-agent-core": "1.2.0",
+			"@earendil-works/pi-ai": "1.2.0",
+			"@earendil-works/pi-codemode": "1.2.0",
+			"@earendil-works/pi-coding-agent": "1.2.0",
+			"@earendil-works/pi-durable": "1.2.0",
+			"@earendil-works/pi-mcp": "1.2.0",
+			"@earendil-works/pi-telemetry": "1.2.0",
+			"@earendil-works/pi-tui": "1.2.0"
 		},
 		"direct": {
 			"proper-lockfile": "4.1.2"

package/pi-extensions/lib/acp/backend-adapter.ts

@@ -339,6 +339,50 @@ function resolveClaudeLaunch(): AcpLaunchSpec {
  */
 export const CLAUDE_FOREGROUND_ONLY_ENV = { CLAUDE_CODE_DISABLE_BACKGROUND_TASKS: "1" } as const;
 
+/**
+ * The set-model answer is read back before the prompt (#128). claude-agent-acp resolves the
+ * requested id onto one of the rows it offers and answers with that row's `value` as the model
+ * option's `currentValue` (0.85.1 `dist/acp-agent.js:5459-5499`). `[측정 2026-10-12]` 0.85.1, no
+ * prompt: `claude-fable-5-1` answers its own row, while `claude-sonnet-5-5` and `claude-opus-5-5`
+ * answer the alias rows `sonnet` and `opus`, named `Sonnet 5.5` and `Opus 5.5`. The id an alias row
+ * resolves to (`ModelInfo.resolvedModel`) is not on the ACP wire, so an alias answer is accepted
+ * only as the exact measured row, value AND name, declared here for the requested id. No other
+ * spelling is matched.
+ */
+export const CLAUDE_SET_MODEL_ALIAS_ROWS: Readonly<Record<string, Readonly<{ value: string; name: string }>>> =
+	Object.freeze({
+		"claude-sonnet-5-5": Object.freeze({ value: "sonnet", name: "Sonnet 5.5" }),
+		"claude-opus-5-5": Object.freeze({ value: "opus", name: "Opus 5.5" }),
+	});
+
+/** Refuse unless the set-model answer names the requested model. A missing model option, another
+ *  row, or a row that is not the measured alias row would let a different model answer under this id. */
+export function confirmClaudeSetModelAnswer(response: unknown, nativeModelId: string): void {
+	const configOptions = (response as { configOptions?: unknown } | null | undefined)?.configOptions;
+	const modelOption = Array.isArray(configOptions)
+		? (configOptions as Array<Record<string, unknown> | null>).find((option) => option?.id === "model")
+		: undefined;
+	const currentValue = modelOption?.currentValue;
+	if (typeof currentValue === "string" && currentValue === nativeModelId) return;
+	const rows = Array.isArray(modelOption?.options)
+		? (modelOption.options as Array<Record<string, unknown> | null>).flatMap((row) =>
+				Array.isArray(row?.options) ? (row.options as Array<Record<string, unknown> | null>) : [row],
+			)
+		: [];
+	const selected = typeof currentValue === "string" ? rows.find((row) => row?.value === currentValue) : undefined;
+	const alias = CLAUDE_SET_MODEL_ALIAS_ROWS[nativeModelId];
+	if (alias !== undefined && currentValue === alias.value && selected?.name === alias.name) return;
+	const answered =
+		modelOption === undefined
+			? "no model option"
+			: `model ${jsonText(currentValue)} named ${jsonText(selected?.name ?? null)}`;
+	throw new Error(
+		`entwurf: claude-agent-acp answered set-model ${JSON.stringify(nativeModelId)} with ${answered}, which does not ` +
+			`name the requested model. Refusing before the prompt so a different model cannot answer under this id; ` +
+			`the installed driver and the curated id disagree, and repeating the turn cannot change that.`,
+	);
+}
+
 export const claudeAdapter: AcpBackendAdapter = {
 	backend: "claude",
 
@@ -402,7 +446,12 @@ export const claudeAdapter: AcpBackendAdapter = {
 		if (typeof setConfig !== "function") {
 			throw new Error(`setSessionConfigOption unsupported — cannot enforce model ${modelId}`);
 		}
-		await setConfig.call(connection, { sessionId: acpSessionId, configId: "model", value: nativeModelId });
+		const answer = await setConfig.call(connection, {
+			sessionId: acpSessionId,
+			configId: "model",
+			value: nativeModelId,
+		});
+		confirmClaudeSetModelAnswer(answer, nativeModelId);
 	},
 
 	configSignatureFields(_adapterSettings) {
@@ -566,7 +615,8 @@ export const cortexAdapter: AcpBackendAdapter = {
 	// serves fails loud BEFORE the prompt (`Unsupported model: …`). PR #40's
 	// launch-time `-m` pin was retired for this: set-model is the single model
 	// authority (resolveLaunch never passes `-m`), and "auto" is set explicitly
-	// rather than treated as an unspoken default.
+	// rather than treated as an unspoken default. NO answer readback, unlike claude: nobody has
+	// measured what cortex's set_config_option response carries, so a check would be a guess.
 	async enforceModel({ connection, acpSessionId, nativeModelId, modelId }) {
 		const setConfig = connection.setSessionConfigOption;
 		if (typeof setConfig !== "function") {