@selesai/code 0.8.3 → 0.8.5

package/dist/extensions/pi-subagents/test/unit/model-scope.test.ts

@@ -81,6 +81,11 @@ describe("checkModelScope", () => {
 		assert.equal(violation?.severity, "warn");
 	});
 
+	it("returns an error violation for an inherited model in strict mode", () => {
+		const violation = checkModelScope("deepseek/deepseek-v4", { ...scope, strict: true }, "inherited");
+		assert.equal(violation?.severity, "error");
+	});
+
 	it("defaults to inherited (warn) severity when source is omitted-ish via inherited", () => {
 		// Caller passes "inherited" for frontmatter/parent-inherited models.
 		assert.equal(checkModelScope("meta/llama-4", scope, "inherited")?.severity, "warn");
@@ -105,8 +110,8 @@ describe("parseModelScopeConfig", () => {
 
 	it("parses a well-formed config", () => {
 		assert.deepEqual(
-			parseModelScopeConfig({ enforce: true, allow: ["anthropic/*", "openai/gpt-5-*"] }, meta),
-			{ enforce: true, allow: ["anthropic/*", "openai/gpt-5-*"] },
+			parseModelScopeConfig({ enforce: true, strict: true, allow: ["anthropic/*", "openai/gpt-5-*"] }, meta),
+			{ enforce: true, strict: true, allow: ["anthropic/*", "openai/gpt-5-*"] },
 		);
 	});
 
@@ -130,6 +135,10 @@ describe("parseModelScopeConfig", () => {
 		assert.throws(() => parseModelScopeConfig({ enforce: "yes" }, meta), /invalid 'modelScope.enforce'/);
 	});
 
+	it("rejects a non-boolean strict value", () => {
+		assert.throws(() => parseModelScopeConfig({ strict: "yes" }, meta), /invalid 'modelScope.strict'/);
+	});
+
 	it("rejects a non-array allow", () => {
 		assert.throws(() => parseModelScopeConfig({ allow: "anthropic/*" }, meta), /invalid 'modelScope.allow'/);
 	});

package/dist/extensions/pi-subagents/test/unit/native-supervisor-channel.test.ts

@@ -49,7 +49,7 @@ function makeState(sessionId: string | null, ctx: unknown): SubagentState {
 }
 
 function writeRequest(input: { sessionId: string; runId: string; agent?: string; index?: number; message?: string; createdAt?: number; expiresAt?: number }): string {
-	const agent = input.agent ?? "builder";
+	const agent = input.agent ?? "worker";
 	const index = input.index ?? 0;
 	const channelDir = resolveSupervisorChannelDir(input.runId, agent, index);
 	createdChannels.push(channelDir);
@@ -72,16 +72,16 @@ function writeRequest(input: { sessionId: string; runId: string; agent?: string;
 	return requestId;
 }
 
-function requestFile(runId: string, requestId: string, agent = "builder", index = 0): string {
+function requestFile(runId: string, requestId: string, agent = "worker", index = 0): string {
 	return path.join(resolveSupervisorChannelDir(runId, agent, index), "requests", `${requestId}.json`);
 }
 
-function replyFile(runId: string, requestId: string, agent = "builder", index = 0): string {
+function replyFile(runId: string, requestId: string, agent = "worker", index = 0): string {
 	return path.join(resolveSupervisorChannelDir(runId, agent, index), "replies", `${requestId}.json`);
 }
 
 function makeEmptyChannel(runId: string): string {
-	const channelDir = resolveSupervisorChannelDir(runId, "builder", 0);
+	const channelDir = resolveSupervisorChannelDir(runId, "worker", 0);
 	createdChannels.push(channelDir);
 	ensureSupervisorChannelDir(channelDir);
 	return channelDir;
@@ -94,6 +94,14 @@ function ageChannel(channelDir: string, ageMs: number): void {
 	}
 }
 
+async function waitForCondition(condition: () => boolean, description: string): Promise<void> {
+	const deadline = Date.now() + 1000;
+	while (!condition()) {
+		if (Date.now() > deadline) assert.fail(`Timed out waiting for ${description}`);
+		await new Promise((resolve) => setTimeout(resolve, 10));
+	}
+}
+
 function restoreEnv(): void {
 	for (const [key, value] of Object.entries(savedEnv)) {
 		if (value === undefined) delete process.env[key];
@@ -149,6 +157,72 @@ describe("native supervisor channel", () => {
 		assert.equal(sent.some(({ message }) => message.details?.id === otherId), false);
 	});
 
+	it("uses polling instead of native watchers on Windows", () => {
+		const currentSessionId = `session-${randomUUID()}`;
+		const requestId = writeRequest({ sessionId: currentSessionId, runId: `run-${randomUUID()}` });
+		const sent: Array<{ details?: { id?: string } }> = [];
+		const ctx = {
+			cwd: process.cwd(),
+			hasUI: false,
+			sessionManager: {
+				getSessionId: () => currentSessionId,
+				getSessionFile: () => null,
+				getEntries: () => [],
+			},
+		};
+		const pi = {
+			getAllTools: () => [],
+			registerTool: () => {},
+			sendMessage: (message: { details?: { id?: string } }) => { sent.push(message); },
+			getSessionName: () => "shared-name",
+		};
+		let watchCalls = 0;
+		const channel = createNativeSupervisorChannel(pi as never, makeState(currentSessionId, ctx), {
+			platform: "win32",
+			watch: (() => {
+				watchCalls += 1;
+				throw new Error("Windows supervisor channel must not call fs.watch.");
+			}) as never,
+		});
+
+		channel.start();
+		channel.dispose();
+
+		assert.equal(watchCalls, 0);
+		assert.deepEqual(sent.map((message) => message.details?.id), [requestId]);
+	});
+
+	it("delivers requests written under an existing request directory by watch event", async () => {
+		const currentSessionId = `session-${randomUUID()}`;
+		const runId = `run-${randomUUID()}`;
+		makeEmptyChannel(runId);
+		const sent: Array<{ details?: { id?: string } }> = [];
+		const ctx = {
+			cwd: process.cwd(),
+			hasUI: false,
+			sessionManager: {
+				getSessionId: () => currentSessionId,
+				getSessionFile: () => null,
+				getEntries: () => [],
+			},
+		};
+		const pi = {
+			getAllTools: () => [],
+			registerTool: () => {},
+			sendMessage: (message: { details?: { id?: string } }) => { sent.push(message); },
+			getSessionName: () => "shared-name",
+		};
+		const channel = createNativeSupervisorChannel(pi as never, makeState(currentSessionId, ctx));
+
+		try {
+			channel.start();
+			const requestId = writeRequest({ sessionId: currentSessionId, runId });
+			await waitForCondition(() => sent.some((message) => message.details?.id === requestId), "supervisor request watch delivery");
+		} finally {
+			channel.dispose();
+		}
+	});
+
 	it("prunes stale empty supervisor channel directories before polling", () => {
 		const currentSessionId = `session-${randomUUID()}`;
 		const staleEmptyChannel = makeEmptyChannel(`run-${randomUUID()}`);
@@ -211,7 +285,7 @@ describe("native supervisor channel", () => {
 	it("emits foreground detach only after displaying a pending supervisor request", () => {
 		const currentSessionId = `session-${randomUUID()}`;
 		const runId = `run-${randomUUID()}`;
-		const requestId = writeRequest({ sessionId: currentSessionId, runId, agent: "builder", index: 2 });
+		const requestId = writeRequest({ sessionId: currentSessionId, runId, agent: "worker", index: 2 });
 		const log: string[] = [];
 		const emitted: Array<{ channel: string; payload: { requestId?: string; runId?: string; agent?: string; childIndex?: number } }> = [];
 		const ctx = {
@@ -242,7 +316,7 @@ describe("native supervisor channel", () => {
 			assert.deepEqual(log, ["send", "emit"]);
 			assert.deepEqual(emitted, [{
 				channel: INTERCOM_DETACH_REQUEST_EVENT,
-				payload: { requestId, runId, agent: "builder", childIndex: 2 },
+				payload: { requestId, runId, agent: "worker", childIndex: 2 },
 			}]);
 			assert.equal(channel.pending.has(requestId), true);
 		} finally {
@@ -271,7 +345,7 @@ describe("native supervisor channel", () => {
 			cwd: process.cwd(),
 			sessionId: currentSessionId,
 			updatedAt: 1,
-			children: [{ agent: "builder", index: 0, status: "detached", updatedAt: 1 }],
+			children: [{ agent: "worker", index: 0, status: "detached", updatedAt: 1 }],
 		}]]);
 		const pi = {
 			getAllTools: () => [...registeredTools.keys()].map((name) => ({ name })),
@@ -398,7 +472,7 @@ describe("native supervisor channel", () => {
 			mode: "single",
 			cwd: process.cwd(),
 			updatedAt: Date.now(),
-			children: [{ agent: "builder", index: 0, status: "completed", updatedAt: Date.now() }],
+			children: [{ agent: "worker", index: 0, status: "completed", updatedAt: Date.now() }],
 		}]]);
 		const pi = {
 			getAllTools: () => [],
@@ -464,13 +538,13 @@ describe("native supervisor channel", () => {
 
 	it("removes the request file when a child supervisor ask is cancelled", async () => {
 		const runId = `run-${randomUUID()}`;
-		const channelDir = resolveSupervisorChannelDir(runId, "builder", 0);
+		const channelDir = resolveSupervisorChannelDir(runId, "worker", 0);
 		createdChannels.push(channelDir);
 		process.env[SUBAGENT_ORCHESTRATOR_TARGET_ENV] = "shared-name";
 		process.env[SUBAGENT_ORCHESTRATOR_SESSION_ID_ENV] = "session-parent";
 		process.env[SUBAGENT_SUPERVISOR_CHANNEL_DIR_ENV] = channelDir;
 		process.env[SUBAGENT_RUN_ID_ENV] = runId;
-		process.env[SUBAGENT_CHILD_AGENT_ENV] = "builder";
+		process.env[SUBAGENT_CHILD_AGENT_ENV] = "worker";
 		process.env[SUBAGENT_CHILD_INDEX_ENV] = "0";
 		const registeredTools = new Map<string, { execute: (_id: string, params: { reason: string; message?: string }, signal?: AbortSignal) => Promise<unknown> | unknown }>();
 		const pi = {

package/dist/extensions/pi-subagents/test/unit/nested-control.test.ts

@@ -19,6 +19,7 @@ import {
 import { ASYNC_DIR, type SubagentState } from "../../src/shared/types.ts";
 
 const routeRoots: string[] = [];
+const fanoutListenerCleanupKey = "__piSubagentFanoutChildNestedControlInboxCleanups";
 const savedEnv = {
 	[SUBAGENT_CHILD_ENV]: process.env[SUBAGENT_CHILD_ENV],
 	[SUBAGENT_FANOUT_CHILD_ENV]: process.env[SUBAGENT_FANOUT_CHILD_ENV],
@@ -31,6 +32,15 @@ const savedEnv = {
 };
 
 afterEach(() => {
+	const globalStore = globalThis as Record<string, unknown>;
+	const listenerCleanups = globalStore[fanoutListenerCleanupKey];
+	if (listenerCleanups instanceof Map) {
+		for (const entry of listenerCleanups.values()) {
+			if (typeof entry === "function") entry();
+			else if (entry && typeof entry === "object" && typeof (entry as { cleanup?: unknown }).cleanup === "function") (entry as { cleanup: () => void }).cleanup();
+		}
+	}
+	delete globalStore[fanoutListenerCleanupKey];
 	for (const root of routeRoots.splice(0)) fs.rmSync(root, { recursive: true, force: true });
 	for (const [key, value] of Object.entries(savedEnv)) {
 		if (value === undefined) delete process.env[key];
@@ -88,7 +98,7 @@ function createNestedRun(id = "nested-live", state: "running" | "complete" | "fa
 		ts: 100,
 		parentRunId: "root-control",
 		parentStepIndex: 0,
-		child: { id, parentRunId: "root-control", parentStepIndex: 0, depth: 1, path: [{ runId: "root-control", stepIndex: 0 }], state, agent: "builder", ownerState: state === "running" ? "live" : "gone", ...extras },
+		child: { id, parentRunId: "root-control", parentStepIndex: 0, depth: 1, path: [{ runId: "root-control", stepIndex: 0 }], state, agent: "worker", ownerState: state === "running" ? "live" : "gone", ...extras },
 	});
 	return route;
 }
@@ -186,11 +196,52 @@ describe("nested control routing", () => {
 			const result = await createExecutor(state).execute("status", { action: "status", id: "root-control" }, new AbortController().signal, undefined, ctx(root));
 
 			assert.equal(result.isError, undefined);
+			assert.match(text(result), /^Status target: run root-control\nSpawn budget:/);
 			assert.match(text(result), /Run: root-control/);
-			assert.match(text(result), /↳ builder \[nested-foreground\] running/);
+			assert.match(text(result), /↳ worker \[nested-foreground\] running/);
 			assert.match(text(result), /Status: subagent\(\{ action: "status", id: "nested-foreground" \}\)/);
+
+			const transcript = await createExecutor(state).execute("transcript", { action: "status", id: "root-control", index: 0, view: "transcript" }, new AbortController().signal, undefined, ctx(root));
+			assert.equal(transcript.isError, undefined);
+			assert.match(text(transcript), /^Transcript target: run root-control · child 0\nSpawn budget:/);
+		} finally {
+			fs.rmSync(root, { recursive: true, force: true });
+		}
+	});
+
+	it("labels dir-target status output", async () => {
+		const root = fs.mkdtempSync(path.join(os.tmpdir(), "pi-status-dir-label-"));
+		const runId = `status-dir-${Date.now().toString(36)}`;
+		const asyncDir = path.join(ASYNC_DIR, runId);
+		try {
+			fs.mkdirSync(asyncDir, { recursive: true });
+			fs.writeFileSync(path.join(asyncDir, "status.json"), JSON.stringify({
+				runId,
+				mode: "single",
+				state: "running",
+				startedAt: 1,
+				lastUpdate: 1,
+				cwd: root,
+				steps: [{ agent: "worker", status: "running" }],
+			}), "utf-8");
+
+			const state = createState();
+			state.foregroundControls.set("foreground-live", { runId: "foreground-live", mode: "single", startedAt: 1, updatedAt: 1, currentAgent: "worker", currentIndex: 0 });
+			state.lastForegroundControlId = "foreground-live";
+			const executor = createExecutor(state);
+			const result = await executor.execute("status-dir", { action: "status", dir: asyncDir }, new AbortController().signal, undefined, ctx(root));
+
+			assert.equal(result.isError, undefined);
+			assert.ok(text(result).startsWith(`Status target: dir ${asyncDir}\nSpawn budget:`), text(result));
+			assert.match(text(result), new RegExp(`Run: ${runId}`));
+			assert.doesNotMatch(text(result), /foreground-live/);
+
+			const transcript = await executor.execute("transcript-dir", { action: "status", dir: asyncDir, view: "transcript" }, new AbortController().signal, undefined, ctx(root));
+			assert.ok(text(transcript).startsWith(`Transcript target: dir ${asyncDir}\nSpawn budget:`), text(transcript));
+			assert.doesNotMatch(text(transcript), /Live foreground transcript/);
 		} finally {
 			fs.rmSync(root, { recursive: true, force: true });
+			fs.rmSync(asyncDir, { recursive: true, force: true });
 		}
 	});
 
@@ -318,7 +369,7 @@ describe("nested control routing", () => {
 		try {
 			const route = createNestedRun("nested-terminal-resume", "complete", { sessionFile: path.join(root, "missing-session.jsonl") });
 
-			const result = await createExecutor(stateWithNestedRoute(route), [{ name: "builder", description: "Worker", prompt: "Do work" }])
+			const result = await createExecutor(stateWithNestedRoute(route), [{ name: "worker", description: "Worker", prompt: "Do work" }])
 				.execute("resume", { action: "resume", id: "nested-terminal-resume", message: "continue" }, new AbortController().signal, undefined, ctx(root));
 
 			assert.equal(result.isError, true);
@@ -333,7 +384,7 @@ describe("nested control routing", () => {
 		try {
 			const route = createNestedRun("nested-stopped-resume", "stopped", { sessionFile: path.join(root, "missing-session.jsonl") });
 
-			const result = await createExecutor(stateWithNestedRoute(route), [{ name: "builder", description: "Worker", prompt: "Do work" }])
+			const result = await createExecutor(stateWithNestedRoute(route), [{ name: "worker", description: "Worker", prompt: "Do work" }])
 				.execute("resume", { action: "resume", id: "nested-stopped-resume", message: "continue" }, new AbortController().signal, undefined, ctx(root));
 
 			assert.equal(result.isError, true);
@@ -354,7 +405,7 @@ describe("nested control routing", () => {
 			fs.writeFileSync(attackerSessionFile, "");
 			const route = createNestedRun("nested-untrusted-resume", "complete", { sessionFile: attackerSessionFile });
 
-			const result = await createExecutor(stateWithNestedRoute(route), [{ name: "builder", description: "Worker", prompt: "Do work" }])
+			const result = await createExecutor(stateWithNestedRoute(route), [{ name: "worker", description: "Worker", prompt: "Do work" }])
 				.execute("resume", { action: "resume", id: "nested-untrusted-resume", message: "continue" }, new AbortController().signal, undefined, ctx(root, parentSessionFile));
 
 			assert.equal(result.isError, true);
@@ -374,7 +425,7 @@ describe("nested control routing", () => {
 			fs.writeFileSync(siblingSessionFile, "");
 			const route = createNestedRun("nested-sibling-resume", "complete", { sessionFile: siblingSessionFile });
 
-			const result = await createExecutor(stateWithNestedRoute(route), [{ name: "builder", description: "Worker", prompt: "Do work" }])
+			const result = await createExecutor(stateWithNestedRoute(route), [{ name: "worker", description: "Worker", prompt: "Do work" }])
 				.execute("resume", { action: "resume", id: "nested-sibling-resume", message: "continue" }, new AbortController().signal, undefined, ctx(root, parentSessionFile));
 
 			assert.equal(result.isError, true);
@@ -395,8 +446,8 @@ describe("nested control routing", () => {
 				modelRegistry: { getAvailable() { throw new Error("model registry exploded"); } },
 			};
 
-			const result = await createExecutor(createState(), [{ name: "builder", description: "Worker", prompt: "Do work" }])
-				.execute("run", { agent: "builder", task: "go" }, new AbortController().signal, undefined, throwingCtx);
+			const result = await createExecutor(createState(), [{ name: "worker", description: "Worker", prompt: "Do work" }])
+				.execute("run", { agent: "worker", task: "go" }, new AbortController().signal, undefined, throwingCtx);
 
 			assert.equal(result.isError, true);
 			assert.match(text(result), /model registry exploded/);
@@ -485,6 +536,69 @@ describe("nested control routing", () => {
 		}
 	});
 
+	it("cleans the prior listener on reload and processes a resume request once", async () => {
+		const route = createNestedRoute("root-reload-listener");
+		routeRoots.push(path.dirname(route.eventSink));
+		setNestedRouteEnv(route, "root-reload-listener");
+		process.env[SUBAGENT_CHILD_ENV] = "1";
+		process.env[SUBAGENT_FANOUT_CHILD_ENV] = "1";
+		const registrations: string[] = [];
+		const activeIntervals = new Set<ReturnType<typeof setInterval>>();
+		const originalSetInterval = globalThis.setInterval;
+		const originalClearInterval = globalThis.clearInterval;
+		globalThis.setInterval = ((...args: Parameters<typeof setInterval>) => {
+			const interval = originalSetInterval(...args);
+			activeIntervals.add(interval);
+			return interval;
+		}) as typeof setInterval;
+		globalThis.clearInterval = ((interval: ReturnType<typeof setInterval>) => {
+			activeIntervals.delete(interval);
+			return originalClearInterval(interval);
+		}) as typeof clearInterval;
+		try {
+			const makePi = () => ({
+				events: { emit() {}, on() { return () => {}; } },
+				registerTool() { registrations.push("subagent"); },
+				getSessionName() { return "child"; },
+			}) as any;
+			const firstPi = makePi();
+
+			registerFanoutChildSubagentExtension(firstPi);
+			registerFanoutChildSubagentExtension(firstPi);
+			registerFanoutChildSubagentExtension(makePi());
+			assert.equal(activeIntervals.size, 1);
+
+			const unrelatedRoute = createNestedRoute("root-unrelated-listener");
+			routeRoots.push(path.dirname(unrelatedRoute.eventSink));
+			setNestedRouteEnv(unrelatedRoute, "root-unrelated-listener");
+			registerFanoutChildSubagentExtension(makePi());
+			assert.equal(activeIntervals.size, 2);
+
+			delete process.env[SUBAGENT_PARENT_EVENT_SINK_ENV];
+			delete process.env[SUBAGENT_PARENT_CONTROL_INBOX_ENV];
+			delete process.env[SUBAGENT_PARENT_ROOT_RUN_ID_ENV];
+			delete process.env[SUBAGENT_PARENT_CAPABILITY_TOKEN_ENV];
+			registerFanoutChildSubagentExtension(makePi());
+			assert.equal(activeIntervals.size, 2);
+
+			setNestedRouteEnv(route, "root-reload-listener");
+			writeNestedControlRequest(route, {
+				ts: Date.now(),
+				requestId: "reload-resume-once",
+				targetRunId: "missing-run",
+				action: "resume",
+				message: "continue",
+			});
+
+			await waitFor(() => readNestedControlResults(route).length === 1);
+			assert.equal(registrations.length, 4);
+			assert.equal(readNestedControlResults(route)[0]?.requestId, "reload-resume-once");
+		} finally {
+			globalThis.setInterval = originalSetInterval;
+			globalThis.clearInterval = originalClearInterval;
+		}
+	});
+
 	it("negatively acknowledges ownerless fanout child control requests and removes them", async () => {
 		const route = createNestedRoute("root-ownerless");
 		routeRoots.push(path.dirname(route.eventSink));

package/dist/extensions/pi-subagents/test/unit/nested-events.test.ts

@@ -64,8 +64,8 @@ function child(id: string, state: "queued" | "running" | "complete" | "failed" |
 		path: [{ runId: parentRunId, stepIndex: 1 }],
 		mode: "single" as const,
 		state,
-		agent: "commentator",
-		agents: ["commentator"],
+		agent: "reviewer",
+		agents: ["reviewer"],
 		startedAt: 10,
 		lastUpdate: ts,
 		steps: [{ agent: "leaf", status: state === "running" ? "running" as const : "complete" as const }],
@@ -355,7 +355,7 @@ describe("nested event parsing and projection", () => {
 				...child("nested-model-bounds", "running", 100),
 				model: "m".repeat(600),
 				thinking: "turbo",
-				steps: [{ agent: "leaf", status: "running", model: "builder", thinking: "xhigh" }],
+				steps: [{ agent: "leaf", status: "running", model: "worker", thinking: "xhigh" }],
 			},
 		});
 		const summary = projectNestedEvents(route).children[0]!;
@@ -371,13 +371,13 @@ describe("nested event parsing and projection", () => {
 			state: "running",
 			startedAt: 1,
 			steps: [
-				{ agent: "builder", status: "running", model: "provider/builder", thinking: "high" },
+				{ agent: "worker", status: "running", model: "provider/worker", thinking: "high" },
 			],
 		}, "/tmp/child-run", { id: "child-run", parentRunId: "parent-run", depth: 1, mode: "single", ts: 2 });
 
-		assert.equal(summary.model, "provider/builder");
+		assert.equal(summary.model, "provider/worker");
 		assert.equal(summary.thinking, "high");
-		assert.equal(summary.steps?.[0]?.model, "provider/builder");
+		assert.equal(summary.steps?.[0]?.model, "provider/worker");
 		assert.equal(summary.steps?.[0]?.thinking, "high");
 	});
 
@@ -389,7 +389,7 @@ describe("nested event parsing and projection", () => {
 			startedAt: 1,
 			processTerminal: { version: 1, state: "bogus", runId: "child-run", runnerProcessInstanceId: "runner-1" } as never,
 			steps: [{
-				agent: "builder",
+				agent: "worker",
 				status: "complete",
 				processTerminal: { version: 1, state: "observed", runId: "wrong-run", runnerProcessInstanceId: "runner-1" } as never,
 			}],
@@ -409,7 +409,7 @@ describe("nested event parsing and projection", () => {
 			startedAt: 1,
 			runtimeAcknowledgedExtensions: { version: 1, source: "child-runtime", ids: ["/Users/alice/.secret-extension", "ok-ext", "x".repeat(5000)], omitted: 0 } as never,
 			steps: [{
-				agent: "builder",
+				agent: "worker",
 				status: "complete",
 				runtimeAcknowledgedExtensions: { version: 1, source: "child-runtime", ids: ["C:/Users/alice/secret"], omitted: 0 } as never,
 			}],

package/dist/extensions/pi-subagents/test/unit/notify.test.ts

@@ -99,7 +99,7 @@ function createFakeClock() {
 function completionResult(overrides: Record<string, unknown> = {}) {
 	return {
 		id: `notify-${Math.random().toString(36).slice(2)}`,
-		agent: "builder",
+		agent: "worker",
 		success: true,
 		summary: "Done",
 		exitCode: 0,
@@ -115,7 +115,7 @@ describe("registerSubagentNotify", () => {
 
 		events.emit(SUBAGENT_ASYNC_COMPLETE_EVENT, {
 			id: "notify-empty-1",
-			agent: "builder",
+			agent: "worker",
 			success: true,
 			summary: "",
 			exitCode: 0,
@@ -127,7 +127,7 @@ describe("registerSubagentNotify", () => {
 		assert.deepEqual(sent[0], {
 			message: {
 				customType: "subagent-notify",
-				content: "Background task completed: **builder**\n\n(no output)",
+				content: "Background task completed: **worker**\n\n(no output)",
 				display: false,
 			},
 			options: { triggerTurn: true },
@@ -169,7 +169,7 @@ describe("registerSubagentNotify", () => {
 			id: "foreground-run:0",
 			runId: "foreground-run",
 			source: "foreground",
-			agent: "commentator",
+			agent: "reviewer",
 			success: true,
 			summary: "Recovered final review",
 			exitCode: 0,
@@ -181,7 +181,7 @@ describe("registerSubagentNotify", () => {
 		assert.deepEqual(sent[0], {
 			message: {
 				customType: "subagent-notify",
-				content: "Detached foreground task completed: **commentator**\n\nRecovered final review",
+				content: "Detached foreground task completed: **reviewer**\n\nRecovered final review",
 				display: true,
 			},
 			options: { triggerTurn: true },
@@ -193,7 +193,7 @@ describe("registerSubagentNotify", () => {
 		events.emit(SUBAGENT_FOREGROUND_COMPLETE_EVENT, {
 			id: "foreground-run:0",
 			source: "foreground",
-			agent: "commentator",
+			agent: "reviewer",
 			success: true,
 			summary: "Recovered final review",
 			timestamp: 123,
@@ -208,7 +208,7 @@ describe("registerSubagentNotify", () => {
 
 		events.emit(SUBAGENT_ASYNC_COMPLETE_EVENT, {
 			id: "notify-summary-1",
-			agent: "builder",
+			agent: "worker",
 			success: true,
 			summary,
 			exitCode: 0,
@@ -222,7 +222,7 @@ describe("registerSubagentNotify", () => {
 		assert.deepEqual(sent[0], {
 			message: {
 				customType: "subagent-notify",
-				content: `Background task completed: **builder** (2/3)\n\n${summary}`,
+				content: `Background task completed: **worker** (2/3)\n\n${summary}`,
 				display: false,
 			},
 			options: { triggerTurn: true },
@@ -234,7 +234,7 @@ describe("registerSubagentNotify", () => {
 
 		events.emit(SUBAGENT_ASYNC_COMPLETE_EVENT, {
 			id: "notify-path-1",
-			agent: "builder",
+			agent: "worker",
 			success: true,
 			summary: "Done",
 			exitCode: 0,
@@ -246,7 +246,7 @@ describe("registerSubagentNotify", () => {
 		assert.deepEqual(sent, [{
 			message: {
 				customType: "subagent-notify",
-				content: "Background task completed: **builder**\n\nDone\n\nSession file: /tmp/session.jsonl",
+				content: "Background task completed: **worker**\n\nDone\n\nSession file: /tmp/session.jsonl",
 				display: false,
 			},
 			options: { triggerTurn: true },
@@ -258,7 +258,7 @@ describe("registerSubagentNotify", () => {
 
 		events.emit(SUBAGENT_ASYNC_COMPLETE_EVENT, {
 			id: "notify-paused-1",
-			agent: "builder",
+			agent: "worker",
 			success: false,
 			state: "paused",
 			summary: "Paused after interrupt. Waiting for explicit next action.",
@@ -270,7 +270,7 @@ describe("registerSubagentNotify", () => {
 		assert.deepEqual(sent[0], {
 			message: {
 				customType: "subagent-notify",
-				content: "Background task paused: **builder**\n\nPaused after interrupt. Waiting for explicit next action.",
+				content: "Background task paused: **worker**\n\nPaused after interrupt. Waiting for explicit next action.",
 				display: true,
 			},
 			options: { triggerTurn: true },
@@ -282,7 +282,7 @@ describe("registerSubagentNotify", () => {
 
 		events.emit(SUBAGENT_ASYNC_COMPLETE_EVENT, {
 			id: "notify-other-session",
-			agent: "builder",
+			agent: "worker",
 			success: true,
 			summary: "Other done",
 			timestamp: 100,
@@ -290,7 +290,7 @@ describe("registerSubagentNotify", () => {
 		});
 		events.emit(SUBAGENT_ASYNC_COMPLETE_EVENT, {
 			id: "notify-sessionless",
-			agent: "builder",
+			agent: "worker",
 			success: true,
 			summary: "Legacy cwd-scoped done",
 			timestamp: 101,
@@ -407,16 +407,16 @@ describe("registerSubagentNotify", () => {
 describe("completion formatting helpers", () => {
 	it("formats and parses a parallel handoff without folding it into the result preview", () => {
 		const content = formatSingleCompletion({
-			agent: "builder",
+			agent: "worker",
 			status: "completed",
 			resultPreview: "Done",
 			handoffPath: "/tmp/run/handoff.json",
 			sessionLabel: "Session file",
 			sessionValue: "/tmp/session.jsonl",
 		});
-		assert.equal(content, "Background task completed: **builder**\n\nDone\n\nParallel handoff: /tmp/run/handoff.json\n\nSession file: /tmp/session.jsonl");
+		assert.equal(content, "Background task completed: **worker**\n\nDone\n\nParallel handoff: /tmp/run/handoff.json\n\nSession file: /tmp/session.jsonl");
 		assert.deepEqual(parseSubagentNotifyContent(content), {
-			agent: "builder",
+			agent: "worker",
 			status: "completed",
 			resultPreview: "Done",
 			handoffPath: "/tmp/run/handoff.json",
@@ -425,7 +425,7 @@ describe("completion formatting helpers", () => {
 		});
 		assert.equal(buildCompletionDetails({
 			id: "run",
-			agent: "builder",
+			agent: "worker",
 			success: true,
 			summary: "Done",
 			parallelHandoff: { path: "/tmp/run/handoff.json" },
@@ -434,32 +434,32 @@ describe("completion formatting helpers", () => {
 
 	it("formatSingleCompletion mirrors the in-handler single message shape", () => {
 		const content = formatSingleCompletion({
-			agent: "builder",
+			agent: "worker",
 			status: "completed",
 			taskInfo: " (2/3)",
 			resultPreview: "Done",
 			sessionLabel: "Session file",
 			sessionValue: "/tmp/session.jsonl",
 		});
-		assert.equal(content, "Background task completed: **builder** (2/3)\n\nDone\n\nSession file: /tmp/session.jsonl");
+		assert.equal(content, "Background task completed: **worker** (2/3)\n\nDone\n\nSession file: /tmp/session.jsonl");
 	});
 
 	it("parses detached foreground notification content for the custom renderer", () => {
 		const content = formatSingleCompletion({
-			agent: "commentator",
+			agent: "reviewer",
 			status: "failed",
 			source: "foreground",
 			resultPreview: "Acceptance rejected",
 			sessionLabel: "Session file",
-			sessionValue: "/tmp/commentator.jsonl",
+			sessionValue: "/tmp/reviewer.jsonl",
 		});
 		assert.deepEqual(parseSubagentNotifyContent(content), {
-			agent: "commentator",
+			agent: "reviewer",
 			status: "failed",
 			source: "foreground",
 			resultPreview: "Acceptance rejected",
 			sessionLabel: "session file",
-			sessionValue: "/tmp/commentator.jsonl",
+			sessionValue: "/tmp/reviewer.jsonl",
 		});
 	});