@junghanacs/entwurf 0.12.2 → 0.12.3

package/scripts/check-acp-sdk-surface.ts

@@ -1,16 +1,16 @@
 // Deterministic gate for the S2a ACP SDK dependency surface.
 //
-// Pins the ACP runtime deps to the 0.11.0 behavior-oracle versions and locks
+// Pins the ACP runtime deps to the current behavior-oracle versions and locks
 // the peer-resolution that makes the Claude ACP adapter satisfiable:
 //
-//   @agentclientprotocol/sdk              0.29.0   wire SDK (acp-bridge import source)
-//   @agentclientprotocol/claude-agent-acp 0.50.0   Claude adapter (spawn binary)
+//   @agentclientprotocol/sdk              1.1.0    wire SDK (acp-bridge import source)
+//   @agentclientprotocol/claude-agent-acp 0.54.1   Claude adapter (spawn binary)
 //   @anthropic-ai/sdk                     0.100.1  peer-resolution pin ONLY (see below)
 //
 // The anthropic SDK is NOT an API client / auth surface here. It is a direct
-// dep solely to satisfy @anthropic-ai/claude-agent-sdk@0.3.186's peer floor
+// dep solely to satisfy @anthropic-ai/claude-agent-sdk@0.3.197's peer floor
 // (>=0.93.0); drop it and the tree resolves a stale 0.91.1 so the peer goes
-// unmet — a failure that would only surface at the first raw turn. 0.11.0's
+// unmet — a failure that would only surface at the first raw turn. The
 // lockfile proves the same shape. Source-level import / API-client
 // instantiation / credential use stays forbidden — asserted in layer (4).
 // (GPT hard constraint 2, revised 2026-06-18: direct dep allowed ONLY as an
@@ -42,15 +42,15 @@ const read = (p: string): string => readFileSync(resolve(repoRoot, p), "utf8");
 const pkg = JSON.parse(read("package.json")) as { dependencies?: Record<string, string> };
 const deps = pkg.dependencies ?? {};
 const PINS: Record<string, string> = {
-	"@agentclientprotocol/sdk": "0.29.0",
-	"@agentclientprotocol/claude-agent-acp": "0.50.0",
+	"@agentclientprotocol/sdk": "1.1.0",
+	"@agentclientprotocol/claude-agent-acp": "0.54.1",
 	[ANTHROPIC_SDK]: "0.100.1",
 };
 for (const [name, ver] of Object.entries(PINS)) {
 	assert.equal(
 		deps[name],
 		ver,
-		`package.json dependencies["${name}"] must be exact "${ver}" (got "${deps[name]}") — S2a pins the 0.11.0 oracle versions`,
+		`package.json dependencies["${name}"] must be exact "${ver}" (got "${deps[name]}") — S2a pins the current oracle versions`,
 	);
 }
 
@@ -63,13 +63,13 @@ for (const [name, ver] of Object.entries(PINS)) {
 const lock = read("pnpm-lock.yaml");
 assert.match(
 	lock,
-	/@agentclientprotocol\/claude-agent-acp@0\.50\.0\(@anthropic-ai\/sdk@0\.100\.1/,
-	"pnpm-lock: claude-agent-acp@0.50.0 must peer-resolve @anthropic-ai/sdk@0.100.1 (peer-pin), not the stale 0.91.1",
+	/@agentclientprotocol\/claude-agent-acp@0\.54\.1\(@anthropic-ai\/sdk@0\.100\.1/,
+	"pnpm-lock: claude-agent-acp@0.54.1 must peer-resolve @anthropic-ai/sdk@0.100.1 (peer-pin), not the stale 0.91.1",
 );
 assert.match(
 	lock,
-	/@anthropic-ai\/claude-agent-sdk@0\.3\.186\(@anthropic-ai\/sdk@0\.100\.1/,
-	"pnpm-lock: claude-agent-sdk@0.3.186 must peer-resolve @anthropic-ai/sdk@0.100.1 — else its >=0.93.0 peer floor is unmet",
+	/@anthropic-ai\/claude-agent-sdk@0\.3\.197\(@anthropic-ai\/sdk@0\.100\.1/,
+	"pnpm-lock: claude-agent-sdk@0.3.197 must peer-resolve @anthropic-ai/sdk@0.100.1 — else its >=0.93.0 peer floor is unmet",
 );
 
 // ---------------------------------------------------------------------------
@@ -108,8 +108,8 @@ const casEntry = adapterRequire.resolve("@anthropic-ai/claude-agent-sdk");
 const casInfo = pkgInfoFromEntry(casEntry);
 assert.equal(
 	casInfo.version,
-	"0.3.186",
-	`@anthropic-ai/claude-agent-sdk must runtime-resolve to 0.3.186 from the adapter context (got ${casInfo.version})`,
+	"0.3.197",
+	`@anthropic-ai/claude-agent-sdk must runtime-resolve to 0.3.197 from the adapter context (got ${casInfo.version})`,
 );
 const casRequire = createRequire(resolve(casInfo.dir, "package.json"));
 const sdkEntry = casRequire.resolve(ANTHROPIC_SDK);
@@ -121,19 +121,19 @@ assert.equal(
 );
 
 // ---------------------------------------------------------------------------
-// (2c) adapter-context wire-SDK + MCP-SDK runtime resolve — the 0.50 bump's real
-//      fault surface. Lock text (layer 2) freezes the publish floor; these probe
+// (2c) adapter-context wire-SDK + MCP-SDK runtime resolve — the ACP dep bump's
+//      real fault surface. Lock text (layer 2) freezes the publish floor; these probe
 //      the LIVE module graph the adapter actually traverses: the adapter must SEE
-//      the same wire SDK the backend imports at root (0.29.0), and claude-agent-sdk
+//      the same wire SDK the backend imports at root (1.1.0), and claude-agent-sdk
 //      must SEE its declared MCP peer (1.29.x). Cheap edges, both newly relevant
-//      after the 0.39→0.50 / 0.22→0.29 bump.
+//      after the 0.50→0.54 / 0.29→1.1 bump.
 // ---------------------------------------------------------------------------
 const wireEntry = adapterRequire.resolve("@agentclientprotocol/sdk");
 const wireInfo = pkgInfoFromEntry(wireEntry);
 assert.equal(
 	wireInfo.version,
-	"0.29.0",
-	`@agentclientprotocol/sdk must runtime-resolve to 0.29.0 from the adapter context (got ${wireInfo.version}) — the adapter and the backend must share one wire SDK`,
+	"1.1.0",
+	`@agentclientprotocol/sdk must runtime-resolve to 1.1.0 from the adapter context (got ${wireInfo.version}) — the adapter and the backend must share one wire SDK`,
 );
 // @modelcontextprotocol/sdk gates its bare specifier behind "exports", so a
 // require.resolve of the package ROOT throws (no resolvable entry) — read the
@@ -143,12 +143,12 @@ assert.equal(
 const mcpPkg = JSON.parse(read("node_modules/@modelcontextprotocol/sdk/package.json")) as { version?: string };
 assert.ok(
 	typeof mcpPkg.version === "string" && mcpPkg.version.startsWith("1.29."),
-	`@modelcontextprotocol/sdk must be 1.29.x (got ${mcpPkg.version}) — claude-agent-sdk 0.3.186 declares a ^1.29.0 peer`,
+	`@modelcontextprotocol/sdk must be 1.29.x (got ${mcpPkg.version}) — claude-agent-sdk 0.3.197 declares a ^1.29.0 peer`,
 );
 
 // ---------------------------------------------------------------------------
 // (3) @agentclientprotocol/sdk value-export surface (silent-rename gate)
-//     The 0.11.0 acp-bridge imports these from the wire SDK; a silent upstream
+//     The ACP bridge imports these from the wire SDK; a silent upstream
 //     rename would not fail typecheck (type-only erasure) but would break the
 //     raw turn. Assert the *value* exports exist at runtime.
 // ---------------------------------------------------------------------------

package/scripts/check-acp-session-reuse.ts

@@ -32,7 +32,7 @@ import { resolve } from "node:path";
 import { pathToFileURL } from "node:url";
 import type { Api, AssistantMessageEvent, Context, Message, Model } from "@earendil-works/pi-ai";
 
-const sonnet = { id: "claude-sonnet-4-6" } as unknown as Model<Api>;
+const sonnet = { id: "claude-sonnet-5" } as unknown as Model<Api>;
 const opus = { id: "claude-opus-4-8" } as unknown as Model<Api>;
 
 type Stream = AsyncIterable<AssistantMessageEvent> & {
@@ -488,7 +488,7 @@ try {
 		);
 		const d1 = deltaText(t1);
 		const iPrep = d1.indexOf("[acp: preparing claude session]");
-		const iReady = d1.indexOf("[acp: session ready model=claude-sonnet-4-6]");
+		const iReady = d1.indexOf("[acp: session ready model=claude-sonnet-5]");
 		const iSent = d1.indexOf("[acp: sending prompt]");
 		assert.ok(
 			iPrep >= 0 && iReady > iPrep && iSent > iReady,
@@ -517,7 +517,7 @@ try {
 			messages: [
 				{ role: "user", content: "real user line", timestamp: 0 },
 				mkAssistant([
-					{ type: "text", text: "\n[acp: session ready model=claude-sonnet-4-6]\n", textSignature: MARKER },
+					{ type: "text", text: "\n[acp: session ready model=claude-sonnet-5]\n", textSignature: MARKER },
 					{ type: "text", text: "real assistant line" },
 				]),
 			],

package/scripts/check-acp-session-store.ts

@@ -43,8 +43,8 @@ import {
 
 const baseInput = (): BridgeConfigInput => ({
 	backend: "claude",
-	modelId: "claude-sonnet-4-6",
-	nativeModelId: "claude-sonnet-4-6",
+	modelId: "claude-sonnet-5",
+	nativeModelId: "claude-sonnet-5",
 	appendSystemPrompt: "",
 	mcpServersHash: "deadbeef",
 	settingSources: [],
@@ -61,7 +61,7 @@ const baseInput = (): BridgeConfigInput => ({
 {
 	const sig0 = bridgeConfigSignature(baseInput());
 	assert.ok(isSha256Hex(sig0), "config signature is a sha256 digest (no raw carrier text on disk)");
-	assert.ok(!sig0.includes("claude-sonnet-4-6"), "config signature is a digest — never embeds the raw modelId/carrier");
+	assert.ok(!sig0.includes("claude-sonnet-5"), "config signature is a digest — never embeds the raw modelId/carrier");
 	assert.equal(sig0, bridgeConfigSignature(baseInput()), "signature is deterministic");
 	// Array copies do not affect equality (same content).
 	assert.equal(bridgeConfigSignature({ ...baseInput(), settingSources: [] }), sig0, "empty settingSources stable");
@@ -178,7 +178,7 @@ const baseInput = (): BridgeConfigInput => ({
 
 	const facts = (over: Partial<SessionCompatFacts> = {}): SessionCompatFacts => ({
 		cwd: "/w",
-		modelId: "claude-sonnet-4-6",
+		modelId: "claude-sonnet-5",
 		bridgeConfigSignature: bridgeConfigSignature(baseInput()),
 		contextMessageSignatures: ["user:text:a"],
 		...over,
@@ -201,7 +201,7 @@ const baseInput = (): BridgeConfigInput => ({
 	const sig = bridgeConfigSignature(baseInput());
 	const compatFacts: SessionCompatFacts = {
 		cwd: "/w",
-		modelId: "claude-sonnet-4-6",
+		modelId: "claude-sonnet-5",
 		bridgeConfigSignature: sig,
 		contextMessageSignatures: ["user:text:a"],
 	};
@@ -305,7 +305,7 @@ const baseInput = (): BridgeConfigInput => ({
 {
 	const facts: SessionCompatFacts = {
 		cwd: "/w",
-		modelId: "claude-sonnet-4-6",
+		modelId: "claude-sonnet-5",
 		bridgeConfigSignature: bridgeConfigSignature(baseInput()),
 		contextMessageSignatures: ["user:text:a"],
 	};

package/scripts/check-acp-tool-surface.ts

@@ -90,7 +90,7 @@ assert.ok(nativeThrew, "non-claude backend exposing write natively must throw wh
 // ---------------------------------------------------------------------------
 
 const baseParams = {
-	modelId: "claude-sonnet-4-6",
+	modelId: "claude-sonnet-5",
 	tools: DEFAULT_CLAUDE_TOOLS,
 	permissionAllow: DEFAULT_CLAUDE_PERMISSION_ALLOW,
 	disallowedTools: DEFAULT_CLAUDE_DISALLOWED_TOOLS,
@@ -101,7 +101,7 @@ const baseParams = {
 
 const meta = buildClaudeSessionMeta(baseParams);
 const opts = (meta.claudeCode as { options: Record<string, unknown> }).options;
-assert.equal(opts.model, "claude-sonnet-4-6", "model must propagate");
+assert.equal(opts.model, "claude-sonnet-5", "model must propagate");
 assert.deepEqual(opts.tools, [...DEFAULT_CLAUDE_TOOLS], "tools must propagate (copied)");
 assert.deepEqual(
 	(opts.settings as { permissions: { allow: string[] } }).permissions.allow,

package/scripts/check-entwurf-session-identity.ts

@@ -132,7 +132,7 @@ try {
 		{ p: "entwurf", m: "claude-opus-4-8", title: "Review substrate smoke", tags: ["entwurf", "review"] },
 		{ p: "openai-codex", m: "gpt-5.5", title: "async resume check", tags: ["entwurf", "smoke"] },
 		{ p: "entwurf", m: "gemini-3.1-pro-preview", title: "vision team", tags: ["entwurf"] },
-		{ p: "entwurf", m: "claude-sonnet-4-6", title: "manual session", tags: [] as string[] },
+		{ p: "entwurf", m: "claude-sonnet-5", title: "manual session", tags: [] as string[] },
 	];
 	for (const c of cases) {
 		const sid = generateSessionId(new Date(2026, 5, 3, 19, 12, 45));
@@ -252,7 +252,7 @@ try {
 		tags: ["entwurf"],
 	});
 	eq(parseSessionName(goodName)?.model, recorded, "name model mirrors recorded model");
-	const driftName = "20260603T191245-deadbe==entwurf/claude-sonnet-4-6--x__entwurf";
+	const driftName = "20260603T191245-deadbe==entwurf/claude-sonnet-5--x__entwurf";
 	ok(parseSessionName(driftName)?.model !== recorded, "model drift is detectable for fail-fast");
 
 	// ---- T-collision: header scan is authority; spawn pre-check ----
@@ -440,12 +440,12 @@ try {
 		bigFile,
 		`${JSON.stringify({ type: "session", id: "20260603T210000-bbbbbb", cwd: "/b" })}\n` +
 			msg({ content: bigBody, model: "m-big", provider: "p-big", usage: { cost: { total: 1 } } }) +
-			msg({ content: "final", model: "claude-sonnet-4-6", provider: "entwurf", usage: { cost: { total: 0.5 } } }),
+			msg({ content: "final", model: "claude-sonnet-5", provider: "entwurf", usage: { cost: { total: 0.5 } } }),
 	);
 	const a2 = analyzeSessionFileLike(bigFile);
 	eq(a2.turns, 2, "analyze(big): turns correct across chunk boundaries");
 	eq(a2.lastAssistantText, "final", "analyze(big): trailing turn intact after multi-chunk line");
-	eq(a2.lastModel, "claude-sonnet-4-6", "analyze(big): trailing model intact");
+	eq(a2.lastModel, "claude-sonnet-5", "analyze(big): trailing model intact");
 	eq(Math.round(a2.cost * 100) / 100, 1.5, "analyze(big): cost summed across large line");
 
 	// ---- T-identity: resume identity authority = FIRST model_change ----
@@ -513,21 +513,21 @@ try {
 	const cleanName = buildSessionName({
 		sessionId: idE,
 		provider: "entwurf",
-		model: "claude-sonnet-4-6",
+		model: "claude-sonnet-5",
 		rawTitle: "clean resume",
 		tags: ["entwurf", "async"],
 	});
 	fs.writeFileSync(
 		fileE,
 		sessionLine(idE, "/identity/e") +
-			mc("entwurf", "claude-sonnet-4-6") +
+			mc("entwurf", "claude-sonnet-5") +
 			infoLine(cleanName) +
-			msg({ content: "ok", model: "claude-sonnet-4-6", provider: "entwurf" }),
+			msg({ content: "ok", model: "claude-sonnet-5", provider: "entwurf" }),
 	);
 	noThrow(() => readSessionIdentity(fileE), "identity: clean session does not throw");
 	const recE = readSessionIdentity(fileE);
 	eq(recE?.provider, "entwurf", "identity(clean): provider");
-	eq(recE?.modelId, "claude-sonnet-4-6", "identity(clean): modelId mirrors name");
+	eq(recE?.modelId, "claude-sonnet-5", "identity(clean): modelId mirrors name");
 
 	// 6. no model_change → null (caller refuses with its own no-recorded-model result).
 	const idF = "20260603T220000-6666ff";
@@ -583,7 +583,7 @@ try {
 	);
 	eq(
 		readSessionIdentity(fileE, { requireEntwurf: true })?.modelId,
-		"claude-sonnet-4-6",
+		"claude-sonnet-5",
 		"requireEntwurf: accepted Entwurf session returns first-model_change identity",
 	);
 

package/scripts/check-model-lock.ts

@@ -210,7 +210,7 @@ async function makeHarness(opts: MakeHarnessOpts = {}): Promise<Harness> {
 // Test models.
 const NATIVE_A: ModelLike = { provider: "openai-codex", id: "gpt-5.4" };
 const NATIVE_B: ModelLike = { provider: "openai-codex", id: "gpt-5.5" };
-const PSA_SONNET: ModelLike = { provider: "entwurf", id: "claude-sonnet-4-6" };
+const PSA_SONNET: ModelLike = { provider: "entwurf", id: "claude-sonnet-5" };
 const PSA_OPUS: ModelLike = { provider: "entwurf", id: "claude-opus-4-8" };
 
 let passed = 0;
@@ -250,7 +250,7 @@ await run("2. native → entwurf: revert + warning notify", async () => {
 	assert.equal(h.notifyCalls.length, 1);
 	assert.equal(h.notifyCalls[0].level, "warning");
 	assert.match(h.notifyCalls[0].message, /locked to openai-codex\/gpt-5\.4/);
-	assert.match(h.notifyCalls[0].message, /entwurf\/claude-sonnet-4-6/);
+	assert.match(h.notifyCalls[0].message, /entwurf\/claude-sonnet-5/);
 });
 
 await run("3. entwurf → native: revert + warning notify", async () => {

package/scripts/check-package-source-routing.ts

@@ -74,7 +74,7 @@ function rmInstall(...segs: string[]): void {
 	fs.rmSync(path.join(tmpAgent, ...segs), { recursive: true, force: true });
 }
 
-const ACP: ResolvedTarget = { provider: "entwurf", model: "claude-sonnet-4-6", explicitOnly: false };
+const ACP: ResolvedTarget = { provider: "entwurf", model: "claude-sonnet-5", explicitOnly: false };
 const eArg = (r: { args: string[] }): string | undefined => {
 	const i = r.args.indexOf("-e");
 	return i >= 0 ? r.args[i + 1] : undefined;
@@ -211,7 +211,7 @@ check("project-scope source (unseen in user settings) fails fast on remote", ()
 //     (resume callers fail-fast; no -e injected).
 check("resume recorded entwurf + remote + no source → unresolvedAcpIntent", () => {
 	setSource(null);
-	const r = getEntwurfExplicitExtensions("claude-sonnet-4-6", true, "entwurf");
+	const r = getEntwurfExplicitExtensions("claude-sonnet-5", true, "entwurf");
 	assert.equal(r.unresolvedAcpIntent, true);
 	assert.equal(eArg(r), undefined);
 	assert.ok(r.warnings.length > 0, "should warn about the unresolved bridge");
@@ -220,7 +220,7 @@ check("resume recorded entwurf + remote + no source → unresolvedAcpIntent", ()
 // 13. recorded provider=entwurf + LOCAL → self-root resolves, no fail-fast.
 check("resume recorded entwurf + local resolves via self-root", () => {
 	setSource(null);
-	const r = getEntwurfExplicitExtensions("claude-sonnet-4-6", false, "entwurf");
+	const r = getEntwurfExplicitExtensions("claude-sonnet-5", false, "entwurf");
 	assert.ok(!r.unresolvedAcpIntent, "local self-root should resolve");
 	assert.equal(eArg(r), REPO_ROOT);
 	assert.equal(r.provider, "entwurf");
@@ -242,7 +242,7 @@ check("resume Codex-via-ACP opt-in + remote + no source → unresolvedAcpIntent"
 //     fail-fast — because the legacy pi-claude-code-use bridge may exist.
 check("resume Claude-only heuristic + remote + no source stays warning-only", () => {
 	setSource(null);
-	const r = getEntwurfExplicitExtensions("claude-sonnet-4-6", true, undefined);
+	const r = getEntwurfExplicitExtensions("claude-sonnet-5", true, undefined);
 	assert.ok(!r.unresolvedAcpIntent, "Claude heuristic must not fail-fast");
 	assert.ok(r.warnings.length > 0, "should warn");
 	assert.equal(eArg(r), undefined);

package/scripts/meta-bridge-doctor.sh

@@ -117,7 +117,7 @@ PY
   EXPECTED_STATUSLINE="$REPO/scripts/meta-bridge-statusline.sh"
   if [ "$STATUSLINE_CMD" = "$EXPECTED_STATUSLINE" ]; then ok "statusLine.command is repo-owned: $STATUSLINE_CMD"; else bad "statusLine.command drifted (got '$STATUSLINE_CMD', expected '$EXPECTED_STATUSLINE')"; fi
   if [ -x "$EXPECTED_STATUSLINE" ]; then ok "statusline executable"; else bad "statusline script not executable: $EXPECTED_STATUSLINE"; fi
-  SAMPLE_STATUSLINE_OUT="$(printf '%s' '{"session_id":"doctor-no-record","workspace":{"current_dir":"/tmp"},"model":{"id":"claude-sonnet-4-6"},"context_window":{"context_window_size":200000,"used_percentage":1,"current_usage":{"input_tokens":1}}}' | "$EXPECTED_STATUSLINE" 2>/dev/null || true)"
+  SAMPLE_STATUSLINE_OUT="$(printf '%s' '{"session_id":"doctor-no-record","workspace":{"current_dir":"/tmp"},"model":{"id":"claude-sonnet-5"},"context_window":{"context_window_size":200000,"used_percentage":1,"current_usage":{"input_tokens":1}}}' | "$EXPECTED_STATUSLINE" 2>/dev/null || true)"
   if [ "$(printf '%s\n' "$SAMPLE_STATUSLINE_OUT" | wc -l | tr -d ' ')" = "2" ] && printf '%s\n' "$SAMPLE_STATUSLINE_OUT" | sed -n '1p' | grep -q 'tmp' && printf '%s\n' "$SAMPLE_STATUSLINE_OUT" | sed -n '2p' | grep -q '🪛' && printf '%s\n' "$SAMPLE_STATUSLINE_OUT" | sed -n '2p' | grep -q ' cc | s'; then ok "statusline synthetic execution emits two rows (work context + identity)"; else bad "statusline synthetic execution failed or omitted two-row work/identity marker"; fi
 else
   bad "cannot validate statusline without python3"

package/scripts/meta-bridge-state.py

@@ -80,6 +80,8 @@ MANAGED_SETTINGS_SCALARS: list[tuple[str, list[str], Any]] = [
     ("showTurnDuration", ["showTurnDuration"], False),
     ("terminalProgressBarEnabled", ["terminalProgressBarEnabled"], False),
     ("useAutoModeDuringPlan", ["useAutoModeDuringPlan"], False),
+    ("enableWorkflows", ["enableWorkflows"], False),
+    ("workflowKeywordTriggerEnabled", ["workflowKeywordTriggerEnabled"], False),
 ]
 
 

package/scripts/resolve-acp-bridge.ts

@@ -16,7 +16,7 @@ import type { ResolvedTarget } from "../pi-extensions/lib/entwurf-core.ts";
 import { getRegistryRouting } from "../pi-extensions/lib/entwurf-core.ts";
 
 const isRemote = process.argv[2] === "remote";
-const target: ResolvedTarget = { provider: "entwurf", model: "claude-sonnet-4-6", explicitOnly: false };
+const target: ResolvedTarget = { provider: "entwurf", model: "claude-sonnet-5", explicitOnly: false };
 
 // Throws EntwurfRoutingError (non-zero exit) when the bridge cannot be resolved —
 // exactly the fail-fast the smoke wants to observe as a failure, not a pass.

package/scripts/smoke-acp-bundled-mcp-live.ts

@@ -46,7 +46,7 @@ import { generateSessionId } from "../pi-extensions/lib/entwurf-core.ts";
 import { terminateChild } from "./lib/acp-child-cleanup.ts";
 
 const ACP_PROVIDER = "entwurf";
-const ACP_MODEL = process.env.ENTWURF_ACP_PROVIDER_MODEL?.trim() || "claude-sonnet-4-6";
+const ACP_MODEL = process.env.ENTWURF_ACP_PROVIDER_MODEL?.trim() || "claude-sonnet-5";
 
 const REAL_CONTROL_DIR = path.join(os.homedir(), ".pi", "entwurf-control");
 const SOCKET_SUFFIX = ".sock";

package/scripts/smoke-acp-carrier-augment-live.ts

@@ -47,7 +47,7 @@ import { dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
 const REPO_ROOT = resolve(dirname(fileURLToPath(import.meta.url)), "..");
-const MODEL = process.env.ENTWURF_ACP_PROVIDER_MODEL?.trim() || "claude-sonnet-4-6";
+const MODEL = process.env.ENTWURF_ACP_PROVIDER_MODEL?.trim() || "claude-sonnet-5";
 const PROVIDER = "entwurf";
 const TURN_TIMEOUT_MS = Number(process.env.ENTWURF_ACP_PROVIDER_TIMEOUT_MS) || 240_000;
 

package/scripts/smoke-acp-mcp-live.ts

@@ -29,7 +29,7 @@ import { fileURLToPath } from "node:url";
 
 const REPO_ROOT = resolve(dirname(fileURLToPath(import.meta.url)), "..");
 const PROBE_SERVER = join(REPO_ROOT, "scripts", "fixtures", "probe-mcp-server.ts");
-const MODEL = process.env.ENTWURF_ACP_PROVIDER_MODEL?.trim() || "claude-sonnet-4-6";
+const MODEL = process.env.ENTWURF_ACP_PROVIDER_MODEL?.trim() || "claude-sonnet-5";
 const PROVIDER = "entwurf";
 const TURN_TIMEOUT_MS = Number(process.env.ENTWURF_ACP_PROVIDER_TIMEOUT_MS) || 240_000;
 

package/scripts/smoke-acp-memory-containment-live.ts

@@ -69,7 +69,7 @@ import {
 } from "../pi-extensions/lib/acp/tool-surface.ts";
 import { terminateChild } from "./lib/acp-child-cleanup.ts";
 
-const REQUESTED_MODEL_ID = process.env.ENTWURF_ACP_MEMORY_MODEL ?? "claude-sonnet-4-6";
+const REQUESTED_MODEL_ID = process.env.ENTWURF_ACP_MEMORY_MODEL ?? "claude-sonnet-5";
 const ALLOW_PATH_FALLBACK = process.env.ENTWURF_ACP_MEMORY_ALLOW_PATH_FALLBACK === "1";
 const RAW_TAIL_CAP = 64 * 1024;
 
@@ -78,15 +78,14 @@ function fail(msg: string): never {
 	process.exit(1);
 }
 
-const sleep = (ms: number): Promise<void> => new Promise((r) => setTimeout(r, ms));
-
 function withTimeout<T>(label: string, p: Promise<T>, ms: number): Promise<T> {
-	return Promise.race([
-		p,
-		sleep(ms).then((): never => {
-			throw new Error(`${label} timed out after ${ms}ms`);
-		}),
-	]);
+	let timer: ReturnType<typeof setTimeout> | undefined;
+	const timeout = new Promise<never>((_, reject) => {
+		timer = setTimeout(() => reject(new Error(`${label} timed out after ${ms}ms`)), ms);
+	});
+	return Promise.race([p, timeout]).finally(() => {
+		if (timer) clearTimeout(timer);
+	});
 }
 
 /** Recursively list files under `dir` whose path contains a `memory` segment. */

package/scripts/smoke-acp-overlay-live.ts

@@ -56,7 +56,7 @@ import {
 } from "../pi-extensions/lib/acp/tool-surface.ts";
 import { terminateChild } from "./lib/acp-child-cleanup.ts";
 
-const REQUESTED_MODEL_ID = process.env.ENTWURF_ACP_OVERLAY_MODEL ?? "claude-sonnet-4-6";
+const REQUESTED_MODEL_ID = process.env.ENTWURF_ACP_OVERLAY_MODEL ?? "claude-sonnet-5";
 const ALLOW_PATH_FALLBACK = process.env.ENTWURF_ACP_OVERLAY_ALLOW_PATH_FALLBACK === "1";
 const RAW_TAIL_CAP = 64 * 1024;
 
@@ -65,15 +65,14 @@ function fail(msg: string): never {
 	process.exit(1);
 }
 
-const sleep = (ms: number): Promise<void> => new Promise((r) => setTimeout(r, ms));
-
 function withTimeout<T>(label: string, p: Promise<T>, ms: number): Promise<T> {
-	return Promise.race([
-		p,
-		sleep(ms).then((): never => {
-			throw new Error(`${label} timed out after ${ms}ms`);
-		}),
-	]);
+	let timer: ReturnType<typeof setTimeout> | undefined;
+	const timeout = new Promise<never>((_, reject) => {
+		timer = setTimeout(() => reject(new Error(`${label} timed out after ${ms}ms`)), ms);
+	});
+	return Promise.race([p, timeout]).finally(() => {
+		if (timer) clearTimeout(timer);
+	});
 }
 
 if (process.env.LIVE !== "1") {

package/scripts/smoke-acp-provider-live.ts

@@ -28,7 +28,7 @@ import { dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
 const REPO_ROOT = resolve(dirname(fileURLToPath(import.meta.url)), "..");
-const MODEL = process.env.ENTWURF_ACP_PROVIDER_MODEL?.trim() || "claude-sonnet-4-6";
+const MODEL = process.env.ENTWURF_ACP_PROVIDER_MODEL?.trim() || "claude-sonnet-5";
 const PROVIDER = "entwurf";
 const TURN_TIMEOUT_MS = Number(process.env.ENTWURF_ACP_PROVIDER_TIMEOUT_MS) || 240_000;
 

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.39.0) spawns, speaks the ACP wire
+// (@agentclientprotocol/claude-agent-acp@0.54.1) 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+).
@@ -35,7 +35,7 @@ import { ndJsonStream, PROTOCOL_VERSION } from "@agentclientprotocol/sdk";
 import { connectAcpClient } from "../pi-extensions/lib/acp/acp-client.ts";
 import { terminateChild } from "./lib/acp-child-cleanup.ts";
 
-const REQUESTED_MODEL_ID = process.env.ENTWURF_ACP_RAW_TURN_MODEL ?? "claude-sonnet-4-6";
+const REQUESTED_MODEL_ID = process.env.ENTWURF_ACP_RAW_TURN_MODEL ?? "claude-sonnet-5";
 const ALLOW_PATH_FALLBACK = process.env.ENTWURF_ACP_RAW_TURN_ALLOW_PATH_FALLBACK === "1";
 const RAW_TAIL_CAP = 64 * 1024; // cap captured raw NDJSON to 64KB tail on report.
 
@@ -44,17 +44,18 @@ function fail(msg: string): never {
 	process.exit(1);
 }
 
-const sleep = (ms: number): Promise<void> => new Promise((r) => setTimeout(r, ms));
-
 // Guard each RPC so a hung backend fails this smoke instead of the outer
-// process timeout — keeps the failure attributable to the right step.
+// process timeout — keeps the failure attributable to the right step. Always
+// clear the timeout; otherwise a successful live turn can print PASS and keep
+// Node alive until the stale timer fires.
 function withTimeout<T>(label: string, p: Promise<T>, ms: number): Promise<T> {
-	return Promise.race([
-		p,
-		sleep(ms).then((): never => {
-			throw new Error(`${label} timed out after ${ms}ms`);
-		}),
-	]);
+	let timer: ReturnType<typeof setTimeout> | undefined;
+	const timeout = new Promise<never>((_, reject) => {
+		timer = setTimeout(() => reject(new Error(`${label} timed out after ${ms}ms`)), ms);
+	});
+	return Promise.race([p, timeout]).finally(() => {
+		if (timer) clearTimeout(timer);
+	});
 }
 
 if (process.env.LIVE !== "1") {

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

@@ -27,7 +27,7 @@ import { fileURLToPath, pathToFileURL } from "node:url";
 import type { Api, AssistantMessageEvent, Context, Model } from "@earendil-works/pi-ai";
 
 const REPO_ROOT = resolve(dirname(fileURLToPath(import.meta.url)), "..");
-const MODEL = process.env.ENTWURF_ACP_PROVIDER_MODEL?.trim() || "claude-sonnet-4-6";
+const MODEL = process.env.ENTWURF_ACP_PROVIDER_MODEL?.trim() || "claude-sonnet-5";
 const TURN_TIMEOUT_MS = Number(process.env.ENTWURF_ACP_PROVIDER_TIMEOUT_MS) || 240_000;
 
 function fail(msg: string): never {
@@ -35,6 +35,16 @@ function fail(msg: string): never {
 	process.exit(1);
 }
 
+function withTimeout<T>(label: string, p: Promise<T>, ms: number): Promise<T> {
+	let timer: ReturnType<typeof setTimeout> | undefined;
+	const timeout = new Promise<never>((_, reject) => {
+		timer = setTimeout(() => reject(new Error(`${label} timed out after ${ms}ms`)), ms);
+	});
+	return Promise.race([p, timeout]).finally(() => {
+		if (timer) clearTimeout(timer);
+	});
+}
+
 if (process.env.LIVE !== "1") {
 	console.error("[smoke-acp-session-reuse-live] skipped — set LIVE=1 to run the real 2-turn reuse acceptance.");
 	process.exit(0);
@@ -100,13 +110,15 @@ async function main(): Promise<void> {
 			},
 		],
 	};
-	const r1 = await Promise.race([
+	const r1 = await withTimeout(
+		"turn 1",
 		consume(backend.streamShellAcp(model, turn1, options) as Stream),
-		new Promise<never>((_, rej) => setTimeout(() => rej(new Error("turn 1 timed out")), TURN_TIMEOUT_MS)),
-	]);
+		TURN_TIMEOUT_MS,
+	);
 	if (r1.error) fail(`turn 1 errored: ${r1.error}`);
 	if (!r1.done) fail("turn 1 did not complete");
 	console.error(`[smoke-acp-session-reuse-live] turn 1 reply: ${JSON.stringify(r1.text.slice(-120))}`);
+	console.error("[smoke-acp-session-reuse-live] starting turn 2 reuse prompt");
 
 	// --- turn 2 (reuse): ask for the codeword, DELTA ONLY ---
 	const turn2: Context = {
@@ -136,10 +148,11 @@ async function main(): Promise<void> {
 			},
 		],
 	};
-	const r2 = await Promise.race([
+	const r2 = await withTimeout(
+		"turn 2",
 		consume(backend.streamShellAcp(model, turn2, options) as Stream),
-		new Promise<never>((_, rej) => setTimeout(() => rej(new Error("turn 2 timed out")), TURN_TIMEOUT_MS)),
-	]);
+		TURN_TIMEOUT_MS,
+	);
 	if (r2.error) fail(`turn 2 errored: ${r2.error}`);
 	if (!r2.done) fail("turn 2 did not complete");
 	console.error(`[smoke-acp-session-reuse-live] turn 2 reply: ${JSON.stringify(r2.text.slice(-120))}`);
@@ -160,8 +173,10 @@ async function main(): Promise<void> {
 
 main()
 	.then(() => {
-		// retained child is SIGKILLed by the backend's process 'exit' hook.
-		process.exit(0);
+		// Let stdout/stderr and finally cleanup drain naturally; the backend's process
+		// 'exit' hook still SIGKILLs the retained child when Node exits. A direct
+		// process.exit(0) can truncate the success/PASS log after the live turn.
+		process.exitCode = 0;
 	})
 	.catch((err) => {
 		fail(err instanceof Error ? err.message : String(err));

package/scripts/smoke-acp-skill-live.ts

@@ -30,7 +30,7 @@ import { dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
 const REPO_ROOT = resolve(dirname(fileURLToPath(import.meta.url)), "..");
-const MODEL = process.env.ENTWURF_ACP_PROVIDER_MODEL?.trim() || "claude-sonnet-4-6";
+const MODEL = process.env.ENTWURF_ACP_PROVIDER_MODEL?.trim() || "claude-sonnet-5";
 const PROVIDER = "entwurf";
 const TURN_TIMEOUT_MS = Number(process.env.ENTWURF_ACP_PROVIDER_TIMEOUT_MS) || 240_000;
 

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

@@ -102,7 +102,7 @@ assert settings['cleanupPeriodDays'] == 365
 assert settings['env']['DISABLE_AUTOCOMPACT'] == '1'
 assert settings['env']['KEEP_ME'] == 'yes'
 assert settings['statusLine']['command'] == os.environ['REPO'] + '/scripts/meta-bridge-statusline.sh'
-for key in ['promptSuggestionEnabled','awaySummaryEnabled','autoMemoryEnabled','verbose','autoCompactEnabled','showTurnDuration','terminalProgressBarEnabled','useAutoModeDuringPlan']:
+for key in ['promptSuggestionEnabled','awaySummaryEnabled','autoMemoryEnabled','verbose','autoCompactEnabled','showTurnDuration','terminalProgressBarEnabled','useAutoModeDuringPlan','enableWorkflows','workflowKeywordTriggerEnabled']:
     assert settings[key] is False, key
 assert settings['skipDangerousModePermissionPrompt'] is True
 for item in ['Bash','Read','Write','Edit','Grep','Glob','WebFetch','WebSearch','Skill','mcp__entwurf-bridge__*']:
@@ -192,7 +192,7 @@ assert settings['statusLine']['command'] == '/old/user/statusline.sh'
 assert settings['promptSuggestionEnabled'] is True
 assert settings['skipDangerousModePermissionPrompt'] is False
 assert settings['showTurnDuration'] is True
-for key in ['awaySummaryEnabled','autoMemoryEnabled','verbose','autoCompactEnabled','terminalProgressBarEnabled','useAutoModeDuringPlan']:
+for key in ['awaySummaryEnabled','autoMemoryEnabled','verbose','autoCompactEnabled','terminalProgressBarEnabled','useAutoModeDuringPlan','enableWorkflows','workflowKeywordTriggerEnabled']:
     assert key not in settings, key
 allow=settings['permissions']['allow']
 deny=settings['permissions']['deny']
@@ -319,7 +319,7 @@ STORE="$TMP/store"; export STORE; mkdir -p "$STORE"
 valid_record "20260606T000000-aaaaaa" "native-a" > "$STORE/20260606T000000-aaaaaa.meta.json"
 valid_record "20260606T000001-bbbbbb" "native-b" > "$STORE/20260606T000001-bbbbbb.meta.json"
 
-STATUS_INPUT_MATCH='{"session_id":"native-a","workspace":{"current_dir":"/tmp"},"model":{"id":"claude-sonnet-4-6"},"context_window":{"context_window_size":200000,"used_percentage":2,"current_usage":{"input_tokens":10}}}'
+STATUS_INPUT_MATCH='{"session_id":"native-a","workspace":{"current_dir":"/tmp"},"model":{"id":"claude-sonnet-5"},"context_window":{"context_window_size":200000,"used_percentage":2,"current_usage":{"input_tokens":10}}}'
 STATUS_INPUT_MISS='{"session_id":"native-missing","workspace":{"current_dir":"/tmp"},"model":{"id":"claude-opus-4-8"}}'
 STATUS_INPUT_READY='{"workspace":{"current_dir":"/tmp"},"model":{"id":"claude-haiku-4-5"}}'
 STATUS_OUT_MATCH="$(printf '%s' "$STATUS_INPUT_MATCH" | ENTWURF_META_SESSIONS_DIR="$STORE" "$REPO/scripts/meta-bridge-statusline.sh")"