@selesai/code 0.6.2 → 0.7.0

package/dist/extensions/pi-subagents/test/unit/result-intercom.test.ts

@@ -21,15 +21,15 @@ describe("result intercom formatter", () => {
 			chainSteps: 4,
 			children: [
 				{
-					agent: "reviewer-a",
+					agent: "commentator-a",
 					status: "completed",
 					summary: "Completed checks",
 					artifactPath: "/tmp/a.md",
 					sessionPath: "/tmp/a-session.jsonl",
-					intercomTarget: "subagent-reviewer-a-run-123-1",
+					intercomTarget: "subagent-commentator-a-run-123-1",
 				},
 				{
-					agent: "reviewer-b",
+					agent: "commentator-b",
 					status: "failed",
 					summary: "Failed checks",
 					artifactPath: "/tmp/b.md",
@@ -48,9 +48,9 @@ describe("result intercom formatter", () => {
 		assert.match(payload.message, /Outputs: 2 unknown \(semantic adequacy unassessed\)/);
 		assert.match(payload.message, /Chain steps: 4/);
 		assert.match(payload.message, /Intercom targets below identify child sessions used while they were running/);
-		assert.match(payload.message, /1\. reviewer-a — process completed · output unknown/);
-		assert.match(payload.message, /Run intercom target: subagent-reviewer-a-run-123-1/);
-		assert.match(payload.message, /2\. reviewer-b — process failed · output unknown/);
+		assert.match(payload.message, /1\. commentator-a — process completed · output unknown/);
+		assert.match(payload.message, /Run intercom target: subagent-commentator-a-run-123-1/);
+		assert.match(payload.message, /2\. commentator-b — process failed · output unknown/);
 		assert.match(payload.message, /Output artifact: \/tmp\/a\.md/);
 		assert.match(payload.message, /Session: \/tmp\/a-session\.jsonl/);
 	});
@@ -66,7 +66,7 @@ describe("result intercom formatter", () => {
 				mode: "single",
 				source: "async",
 				asyncId: "run-single",
-				children: [{ agent: "worker", status: "completed", summary: "done", sessionPath }],
+				children: [{ agent: "builder", status: "completed", summary: "done", sessionPath }],
 			});
 
 			assert.match(payload.message, /Revive: subagent\(\{ action: "resume", id: "run-single", message: "\.\.\." \}\)/);
@@ -109,7 +109,7 @@ describe("result intercom formatter", () => {
 			mode: "single",
 			source: "async",
 			asyncId: "run-missing-session",
-			children: [{ agent: "worker", status: "failed", summary: "failed", sessionPath: path.join(os.tmpdir(), "missing-pi-session.jsonl") }],
+			children: [{ agent: "builder", status: "failed", summary: "failed", sessionPath: path.join(os.tmpdir(), "missing-pi-session.jsonl") }],
 		});
 
 		assert.match(payload.message, /Resume: unavailable; no child session file was persisted/);
@@ -132,8 +132,11 @@ describe("result intercom formatter", () => {
 				depth: 1,
 				path: [{ runId: "root-run", stepIndex: 1 }],
 				state: "complete",
-				agent: "reviewer",
+				agent: "commentator",
+				model: "provider/gpt-5.6-luna:medium",
+				thinking: "medium",
 				sessionFile: path.join(os.tmpdir(), "nested-a.jsonl"),
+				steps: [{ agent: "leaf", status: "complete", model: "provider/leaf", thinking: "low" }],
 				controlInbox: "/tmp/should-not-leak",
 				capabilityToken: "secret-token",
 				children: [{
@@ -153,13 +156,17 @@ describe("result intercom formatter", () => {
 		const grandchild = nested?.children?.[0];
 		assert.equal(payload.children[0]?.children, undefined);
 		assert.equal(nested?.id, "nested-a");
+		assert.equal(nested?.model, "provider/gpt-5.6-luna:medium");
+		assert.equal(nested?.thinking, "medium");
+		assert.equal(nested?.steps?.[0]?.model, "provider/leaf");
+		assert.equal(nested?.steps?.[0]?.thinking, "low");
 		assert.equal(Object.hasOwn(nested ?? {}, "controlInbox"), false);
 		assert.equal(Object.hasOwn(nested ?? {}, "capabilityToken"), false);
 		assert.equal(grandchild?.id, "nested-grandchild");
 		assert.equal(Object.hasOwn(grandchild ?? {}, "controlInbox"), false);
 		assert.equal(Object.hasOwn(grandchild ?? {}, "capabilityToken"), false);
 		assert.match(payload.message, /Nested subagents:/);
-		assert.match(payload.message, /↳ reviewer — complete \[nested-a\]/);
+		assert.match(payload.message, /↳ commentator — complete \[nested-a\]/);
 	});
 
 	it("separates process failure from output presence and gives salvage guidance", () => {
@@ -190,7 +197,7 @@ describe("result intercom formatter", () => {
 			runId: "run-bound",
 			mode: "single",
 			source: "foreground",
-			children: [{ agent: "worker", status: "completed", summary: longSummary }],
+			children: [{ agent: "builder", status: "completed", summary: longSummary }],
 		});
 		assert.equal(payload.children[0]!.summary, longSummary);
 		assert.match(payload.message, new RegExp(`${"x".repeat(2000)}\\n${"y".repeat(2000)}`));
@@ -225,7 +232,7 @@ describe("result intercom formatter", () => {
 		const stripped = stripDetailsOutputsForIntercomReceipt({
 			mode: "single",
 			results: [{
-				agent: "worker",
+				agent: "builder",
 				task: "Task",
 				exitCode: 0,
 				messages: [{ role: "assistant", content: [{ type: "text", text: "full" }] } as never],

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

@@ -160,7 +160,7 @@ describe("subagent extension RPC bridge", () => {
 			asyncJobs: new Map([["async-private-id", {
 				asyncId: "async-private-id", sessionId: "/sessions/parent.jsonl", status: "running", mode: "single",
 				description: ["Review", "\u001b]8;;hostile\u0007", "the diff"].join("\n"),
-				startedAt: 100, steps: [{ agent: "reviewer", label: "opaque label", status: "running", startedAt: 120, model: "anthropic/claude-opus-4-8:high", thinking: "high", tokens: { input: 12, output: 34, total: 46 } }],
+				startedAt: 100, steps: [{ agent: "commentator", label: "opaque label", status: "running", startedAt: 120, model: "anthropic/claude-opus-4-8:high", thinking: "high", tokens: { input: 12, output: 34, total: 46 } }],
 			}]]),
 		} as any;
 		const bridge = registerSubagentRpcBridge({
@@ -173,7 +173,7 @@ describe("subagent extension RPC bridge", () => {
 		assert.equal((fleet as { totalActive?: number }).totalActive, 1);
 		assert.equal((fleet as { omitted?: number }).omitted, 0);
 		assert.deepEqual(fleet.entries[0], {
-			key: "fleet-1", agent: "reviewer", role: "opaque label", model: "anthropic/claude-opus-4-8:high", effort: "high",
+			key: "fleet-1", agent: "commentator", role: "opaque label", model: "anthropic/claude-opus-4-8:high", effort: "high",
 			startedAt: 120, tokens: { input: 12, output: 34, total: 46 }, goal: "Review the diff",
 		});
 		assert.equal(JSON.stringify(fleet).includes("async-private-id"), false);
@@ -191,7 +191,7 @@ describe("subagent extension RPC bridge", () => {
 				startedAt: 90,
 				activeChildren: new Map([[0, {
 					index: 0,
-					agent: "worker",
+					agent: "builder",
 					description: "Implement the fix",
 					startedAt: 100,
 					updatedAt: 110,
@@ -209,7 +209,7 @@ describe("subagent extension RPC bridge", () => {
 			sessionId: "old-session",
 			mode: "single",
 			startedAt: 50,
-			currentAgent: "reviewer",
+			currentAgent: "commentator",
 			description: "Old work",
 		});
 		const bridge = registerSubagentRpcBridge({
@@ -225,7 +225,7 @@ describe("subagent extension RPC bridge", () => {
 			omitted: 0,
 			entries: [{
 				key: "fleet-1",
-				agent: "worker",
+				agent: "builder",
 				model: "openai/gpt-5.6-terra:high",
 				effort: "high",
 				startedAt: 100,
@@ -269,7 +269,7 @@ describe("subagent extension RPC bridge", () => {
 				status: "running",
 				mode: "single",
 				startedAt: index + 1,
-				agents: [`worker-${index}`],
+				agents: [`builder-${index}`],
 			});
 		}
 		jobs.set("unattributed", { asyncId: "unattributed", status: "running", mode: "single", startedAt: 20, agents: ["hidden"] });
@@ -300,16 +300,16 @@ describe("subagent extension RPC bridge", () => {
 			execute: async (_id, params) => {
 				executedParams = params;
 				return {
-					content: [{ type: "text", text: "Async: worker [run-1]" }],
+					content: [{ type: "text", text: "Async: builder [run-1]" }],
 					details: { mode: "single", results: [], asyncId: "run-1", asyncDir: "/tmp/run-1" },
 				} as any;
 			},
 		});
 
-		const reply = await request(events, "spawn-1", "spawn", { agent: "worker", task: "Do work" });
+		const reply = await request(events, "spawn-1", "spawn", { agent: "builder", task: "Do work" });
 
 		assert.equal(reply.success, true);
-		assert.equal(executedParams.agent, "worker");
+		assert.equal(executedParams.agent, "builder");
 		assert.equal(executedParams.task, "Do work");
 		assert.equal(executedParams.async, true);
 		assert.equal(executedParams.clarify, false);
@@ -318,7 +318,7 @@ describe("subagent extension RPC bridge", () => {
 		bridge.dispose();
 	});
 
-	it("preserves schema-valid static parallel extension fields", async () => {
+	it("allows direct managed worktree spawn requests", async () => {
 		const events = new FakeEvents();
 		let executedParams: any;
 		const bridge = registerSubagentRpcBridge({
@@ -326,20 +326,36 @@ describe("subagent extension RPC bridge", () => {
 			getContext: () => ctx(),
 			execute: async (_id, params) => {
 				executedParams = params;
-				return {
-					content: [{ type: "text", text: "Async: worker [run-1]" }],
-					details: { mode: "chain", results: [], asyncId: "run-1", asyncDir: "/tmp/run-1" },
-				} as any;
+				return { content: [{ type: "text", text: "Async: builder [run-1]" }], details: { mode: "single", results: [] } } as any;
 			},
 		});
 
-		const reply = await request(events, "spawn-chain-extra", "spawn", {
-			chain: [{ parallel: [{ agent: "worker", extensionField: true }] }],
-		});
+		const reply = await request(events, "spawn-worktree", "spawn", { agent: "builder", task: "Do work", worktree: true });
 
 		assert.equal(reply.success, true);
-		assert.equal(executedParams.chain[0].parallel[0].extensionField, true);
+		assert.equal(executedParams.worktree, true);
+		assert.equal(executedParams.async, true);
+		bridge.dispose();
+	});
 
+	it("rejects removed top-level chain and parallel spawn inputs", async () => {
+		const events = new FakeEvents();
+		let executeCalls = 0;
+		const bridge = registerSubagentRpcBridge({
+			events,
+			getContext: () => ctx(),
+			execute: async () => { executeCalls++; throw new Error("unreachable"); },
+		});
+
+		const chainReply = await request(events, "spawn-chain", "spawn", { chain: [{ agent: "builder" }] });
+		const parallelReply = await request(events, "spawn-parallel", "spawn", { tasks: [{ agent: "builder", task: "work" }] });
+		const worktreeReply = await request(events, "spawn-worktree", "spawn", { worktree: true });
+
+		assert.equal(chainReply.success, false);
+		assert.equal(parallelReply.success, false);
+		assert.equal(worktreeReply.success, false);
+		assert.match((chainReply as { error?: { message?: string } }).error?.message ?? "", /workflowScript/);
+		assert.equal(executeCalls, 0);
 		bridge.dispose();
 	});
 
@@ -355,7 +371,7 @@ describe("subagent extension RPC bridge", () => {
 			},
 		});
 
-		const foreground = await request(events, "spawn-foreground", "spawn", { agent: "worker", task: "Do work", async: false });
+		const foreground = await request(events, "spawn-foreground", "spawn", { agent: "builder", task: "Do work", async: false });
 		const management = await request(events, "spawn-management", "spawn", { action: "list" });
 
 		assert.equal(foreground.success, false);
@@ -553,7 +569,7 @@ describe("subagent extension RPC bridge", () => {
 				pid: 4242,
 				startedAt: 100,
 				lastUpdate: 100,
-				steps: [{ agent: "worker", status: "running", startedAt: 100 }],
+				steps: [{ agent: "builder", status: "running", startedAt: 100 }],
 			}, null, 2), "utf-8");
 			const bridge = registerSubagentRpcBridge({
 				events,
@@ -595,7 +611,7 @@ describe("subagent extension RPC bridge", () => {
 				pid: 4242,
 				startedAt: 100,
 				lastUpdate: 100,
-				steps: [{ agent: "worker", status: "running", startedAt: 100 }],
+				steps: [{ agent: "builder", status: "running", startedAt: 100 }],
 			}, null, 2), "utf-8");
 			const bridge = registerSubagentRpcBridge({
 				events,

package/dist/extensions/pi-subagents/test/unit/run-id-resolver.test.ts

@@ -45,7 +45,7 @@ function writeNestedChild(route: ReturnType<typeof createNestedRoute>, parentRun
 		ts: 100,
 		parentRunId,
 		...(parentStepIndex !== undefined ? { parentStepIndex } : {}),
-		child: { id, parentRunId, ...(parentStepIndex !== undefined ? { parentStepIndex } : {}), depth: 1, path: [{ runId: parentRunId, ...(parentStepIndex !== undefined ? { stepIndex: parentStepIndex } : {}) }], state: "running", agent: "worker" },
+		child: { id, parentRunId, ...(parentStepIndex !== undefined ? { parentStepIndex } : {}), depth: 1, path: [{ runId: parentRunId, ...(parentStepIndex !== undefined ? { stepIndex: parentStepIndex } : {}) }], state: "running", agent: "builder" },
 	});
 }
 

package/dist/extensions/pi-subagents/test/unit/run-status.test.ts

@@ -37,7 +37,7 @@ describe("async run status inspection", () => {
 				lastUpdate: 100,
 				currentStep: 0,
 				sessionFile,
-				steps: [{ agent: "scout", status: "running", startedAt: 100, sessionFile }],
+				steps: [{ agent: "explorer", status: "running", startedAt: 100, sessionFile }],
 			}, null, 2), "utf-8");
 
 			const result = inspectSubagentStatus({ id: "run-stale" }, {
@@ -52,7 +52,7 @@ describe("async run status inspection", () => {
 			assert.match(text, /State: failed/);
 			assert.match(text, /Diagnosis: Async runner process 12345 exited or disappeared/);
 			assert.match(text, new RegExp(`Result: ${path.join(resultsDir, "run-stale.json").replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}`));
-			assert.match(text, /Step 1: scout failed, error: Async runner process 12345 exited or disappeared/);
+			assert.match(text, /Step 1: explorer failed, error: Async runner process 12345 exited or disappeared/);
 			assert.match(text, /Revive: subagent\(\{ action: "resume", id: "run-stale", message: "\.\.\." \}\)/);
 			const resultJson = JSON.parse(fs.readFileSync(path.join(resultsDir, "run-stale.json"), "utf-8"));
 			assert.equal(resultJson.success, false);
@@ -71,8 +71,8 @@ describe("async run status inspection", () => {
 			const runOutputPath = path.join(asyncDir, "combined-output.log");
 			const firstStepOutputPath = path.join(asyncDir, "output-0.log");
 			const secondStepOutputPath = path.join(asyncDir, "output-1.log");
-			fs.writeFileSync(firstStepOutputPath, "reviewer one", "utf-8");
-			fs.writeFileSync(secondStepOutputPath, "reviewer two", "utf-8");
+			fs.writeFileSync(firstStepOutputPath, "commentator one", "utf-8");
+			fs.writeFileSync(secondStepOutputPath, "commentator two", "utf-8");
 			fs.writeFileSync(path.join(asyncDir, "status.json"), JSON.stringify({
 				runId: "run-parallel",
 				mode: "parallel",
@@ -86,9 +86,9 @@ describe("async run status inspection", () => {
 				chainStepCount: 1,
 				parallelGroups: [{ start: 0, count: 3, stepIndex: 0 }],
 				steps: [
-					{ agent: "reviewer", status: "running", startedAt: 100, model: "openai-codex/gpt-5.5:high" },
-					{ agent: "reviewer", status: "running", startedAt: 100, model: "anthropic/claude-haiku-4-5", thinking: "low" },
-					{ agent: "reviewer", status: "pending" },
+					{ agent: "commentator", status: "running", startedAt: 100, model: "openai-codex/gpt-5.5:high" },
+					{ agent: "commentator", status: "running", startedAt: 100, model: "anthropic/claude-haiku-4-5", thinking: "low" },
+					{ agent: "commentator", status: "pending" },
 				],
 			}, null, 2), "utf-8");
 
@@ -104,13 +104,13 @@ describe("async run status inspection", () => {
 			assert.match(text, /Error: top-level async status error/);
 			assert.match(text, /Progress: 2 agents running · 0\/3 done/);
 			assert.match(text, new RegExp(`Output: ${runOutputPath.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}`));
-			assert.match(text, /Agent 1\/3: reviewer running \(gpt-5\.5 · thinking high\)/);
-			assert.match(text, /Agent 2\/3: reviewer running \(claude-haiku-4-5 · thinking low\)/);
-			assert.match(text, /Agent 3\/3: reviewer pending/);
+			assert.match(text, /Agent 1\/3: commentator running \(gpt-5\.5 · thinking high\)/);
+			assert.match(text, /Agent 2\/3: commentator running \(claude-haiku-4-5 · thinking low\)/);
+			assert.match(text, /Agent 3\/3: commentator pending/);
 			assert.doesNotMatch(text, /openai-codex\/gpt-5\.5/);
 			assert.match(text, new RegExp(`  Output: ${firstStepOutputPath.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}`));
 			assert.match(text, new RegExp(`  Output: ${secondStepOutputPath.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}`));
-			assert.doesNotMatch(text, /Step 1: reviewer/);
+			assert.doesNotMatch(text, /Step 1: commentator/);
 		} finally {
 			fs.rmSync(root, { recursive: true, force: true });
 		}
@@ -131,7 +131,7 @@ describe("async run status inspection", () => {
 				startedAt: 100,
 				lastUpdate: 200,
 				currentStep: 0,
-				steps: [{ agent: "worker", status: "running", startedAt: 100 }],
+				steps: [{ agent: "builder", status: "running", startedAt: 100 }],
 			}, null, 2), "utf-8");
 
 			const result = inspectSubagentStatus({ id: "run-transcript", view: "transcript", lines: 2 }, {
@@ -144,7 +144,7 @@ describe("async run status inspection", () => {
 			const text = textContent(result);
 			assert.equal(result.isError, undefined);
 			assert.match(text, /Run: run-transcript/);
-			assert.match(text, /Step: 0 \(worker\) \| running/);
+			assert.match(text, /Step: 0 \(builder\) \| running/);
 			assert.match(text, new RegExp(`Transcript tail from ${outputPath.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")} \\(tail truncated\\):`));
 			assert.doesNotMatch(text, /first line/);
 			assert.match(text, /second line/);
@@ -172,8 +172,8 @@ describe("async run status inspection", () => {
 				currentStep: 0,
 				outputFile: wrongOutputPath,
 				steps: [
-					{ agent: "worker", status: "running", startedAt: 100 },
-					{ agent: "reviewer", status: "pending", recentOutput: ["RIGHT_CHILD_RECENT"] },
+					{ agent: "builder", status: "running", startedAt: 100 },
+					{ agent: "commentator", status: "pending", recentOutput: ["RIGHT_CHILD_RECENT"] },
 				],
 			}, null, 2), "utf-8");
 
@@ -186,7 +186,7 @@ describe("async run status inspection", () => {
 
 			const text = textContent(result);
 			assert.equal(result.isError, undefined);
-			assert.match(text, /Agent: 1 \(reviewer\) \| pending/);
+			assert.match(text, /Agent: 1 \(commentator\) \| pending/);
 			assert.match(text, /Recent output from status\.json:/);
 			assert.match(text, /RIGHT_CHILD_RECENT/);
 			assert.doesNotMatch(text, /WRONG_CHILD_OUTPUT/);
@@ -246,7 +246,7 @@ describe("async run status inspection", () => {
 				state: "complete",
 				startedAt: 100,
 				lastUpdate: 200,
-				steps: [{ agent: "worker", status: "complete", sessionFile: linkedSession }],
+				steps: [{ agent: "builder", status: "complete", sessionFile: linkedSession }],
 			}, null, 2), "utf-8");
 
 			const result = inspectSubagentStatus({ id: "run-session-symlink", view: "transcript", index: 0 }, {
@@ -271,7 +271,7 @@ describe("async run status inspection", () => {
 			const asyncRoot = path.join(root, "runs");
 			const asyncDir = path.join(asyncRoot, "run-fleet");
 			fs.mkdirSync(asyncDir, { recursive: true });
-			fs.writeFileSync(path.join(asyncDir, "output-0.log"), "worker output", "utf-8");
+			fs.writeFileSync(path.join(asyncDir, "output-0.log"), "builder output", "utf-8");
 			fs.writeFileSync(path.join(asyncDir, "status.json"), JSON.stringify({
 				runId: "run-fleet",
 				mode: "parallel",
@@ -282,8 +282,8 @@ describe("async run status inspection", () => {
 				chainStepCount: 1,
 				parallelGroups: [{ start: 0, count: 2, stepIndex: 0 }],
 				steps: [
-					{ agent: "worker", status: "running", startedAt: 100 },
-					{ agent: "reviewer", status: "pending" },
+					{ agent: "builder", status: "running", startedAt: 100 },
+					{ agent: "commentator", status: "pending" },
 				],
 			}, null, 2), "utf-8");
 			const state = {
@@ -292,7 +292,7 @@ describe("async run status inspection", () => {
 					mode: "single",
 					startedAt: 100,
 					updatedAt: 250,
-					currentAgent: "scout",
+					currentAgent: "explorer",
 					currentIndex: 0,
 					lastActivityAt: 240,
 				}]]),
@@ -310,7 +310,7 @@ describe("async run status inspection", () => {
 			assert.equal(result.isError, undefined);
 			assert.match(text, /Subagent fleet: 2 tracked/);
 			assert.match(text, /Foreground runs:/);
-			assert.match(text, /fg-run \| running \| scout/);
+			assert.match(text, /fg-run \| running \| explorer/);
 			assert.match(text, /Async runs:/);
 			assert.match(text, /run-fleet \| running .*\| parallel \| 1 agent running · 0\/2 done/);
 			assert.match(text, /transcript: subagent\(\{ action: "status", id: "run-fleet", view: "transcript" \}\)/);
@@ -335,7 +335,7 @@ describe("async run status inspection", () => {
 				state: "running",
 				startedAt: 100,
 				lastUpdate: 200,
-				steps: [{ agent: "worker", status: "running", startedAt: 100 }],
+				steps: [{ agent: "builder", status: "running", startedAt: 100 }],
 			}, null, 2), "utf-8");
 			fs.writeFileSync(path.join(otherDir, "status.json"), JSON.stringify({
 				runId: "run-other",
@@ -344,7 +344,7 @@ describe("async run status inspection", () => {
 				state: "running",
 				startedAt: 100,
 				lastUpdate: 200,
-				steps: [{ agent: "reviewer", status: "running", startedAt: 100 }],
+				steps: [{ agent: "commentator", status: "running", startedAt: 100 }],
 			}, null, 2), "utf-8");
 			const state = {
 				currentSessionId: "session-current",
@@ -384,7 +384,7 @@ describe("async run status inspection", () => {
 				startedAt: 100,
 				lastUpdate: 200,
 				currentStep: 0,
-				steps: [{ agent: "worker", status: "running", startedAt: 100 }],
+				steps: [{ agent: "builder", status: "running", startedAt: 100 }],
 			}, null, 2), "utf-8");
 			const state = {
 				currentSessionId: "session-current",
@@ -421,8 +421,8 @@ describe("async run status inspection", () => {
 				success: true,
 				summary: "AGGREGATE_SENTINEL",
 				results: [
-					{ agent: "worker", output: "first child" },
-					{ agent: "reviewer" },
+					{ agent: "builder", output: "first child" },
+					{ agent: "commentator" },
 				],
 			}, null, 2), "utf-8");
 
@@ -433,7 +433,7 @@ describe("async run status inspection", () => {
 
 			const text = textContent(result);
 			assert.equal(result.isError, undefined);
-			assert.match(text, /Child: 1 \(reviewer\)/);
+			assert.match(text, /Child: 1 \(commentator\)/);
 			assert.match(text, /\(no transcript lines available yet\)/);
 			assert.doesNotMatch(text, /AGGREGATE_SENTINEL/);
 			assert.doesNotMatch(text, /first child/);
@@ -457,7 +457,7 @@ describe("async run status inspection", () => {
 				lastUpdate: 200,
 				currentStep: 0,
 				steering: { requested: 2, scheduled: 1, pending: 1, delivered: 2, failed: 0, recovered: 1, lastRequestedAt: 150, lastDeliveredAt: 150, recent: [{ id: "request", requestedAt: 150, message: "guidance", targets: [{ index: 0, state: "recovered", recoveredAt: 180, lateDeliveredAt: 190 }] }] },
-				steps: [{ agent: "worker", status: "running", startedAt: 100, steering: { requested: 2, scheduled: 1, pending: 1, delivered: 2, failed: 0, recovered: 1, lastRequestedAt: 150, lastDeliveredAt: 150, recent: [{ id: "request", requestedAt: 150, message: "guidance", targets: [{ index: 0, state: "recovered", recoveredAt: 180, lateDeliveredAt: 190 }] }] } }],
+				steps: [{ agent: "builder", status: "running", startedAt: 100, steering: { requested: 2, scheduled: 1, pending: 1, delivered: 2, failed: 0, recovered: 1, lastRequestedAt: 150, lastDeliveredAt: 150, recent: [{ id: "request", requestedAt: 150, message: "guidance", targets: [{ index: 0, state: "recovered", recoveredAt: 180, lateDeliveredAt: 190 }] }] } }],
 			}, null, 2), "utf-8");
 
 			const exact = inspectSubagentStatus({ id: "run-steered" }, {
@@ -469,7 +469,7 @@ describe("async run status inspection", () => {
 			const exactText = textContent(exact);
 			assert.equal(exact.isError, undefined);
 			assert.match(exactText, /Steering: 2 requested, 1 scheduled, 1 pending, 2 delivered, 0 failed, 1 recovered, 1 late acknowledged/);
-			assert.match(exactText, /Step 1: worker running/);
+			assert.match(exactText, /Step 1: builder running/);
 
 			const list = inspectSubagentStatus({}, {
 				asyncDirRoot: asyncRoot,
@@ -513,7 +513,7 @@ describe("async run status inspection", () => {
 					depth: 1,
 					path: [{ runId: "run-nested-root", stepIndex: 0, agent: "orchestrator" }],
 					state: "running",
-					agent: "reviewer",
+					agent: "commentator",
 					currentTool: "read",
 					lastUpdate: 150,
 				},
@@ -529,7 +529,7 @@ describe("async run status inspection", () => {
 			const text = textContent(result);
 			assert.equal(result.isError, undefined);
 			assert.match(text, /Step 1: orchestrator running/);
-			assert.match(text, /↳ reviewer \[nested-status-child\] running \| tool read/);
+			assert.match(text, /↳ commentator \[nested-status-child\] running \| tool read/);
 			assert.match(text, /Status: subagent\(\{ action: "status", id: "nested-status-child" \}\)/);
 		} finally {
 			fs.rmSync(root, { recursive: true, force: true });
@@ -562,7 +562,7 @@ describe("async run status inspection", () => {
 				pid: 54321,
 				startedAt: 150,
 				lastUpdate: 150,
-				steps: [{ agent: "reviewer", status: "running", startedAt: 150 }],
+				steps: [{ agent: "commentator", status: "running", startedAt: 150 }],
 			}, null, 2), "utf-8");
 			writeNestedEvent(route, {
 				type: "subagent.nested.updated",
@@ -578,7 +578,7 @@ describe("async run status inspection", () => {
 					asyncDir: nestedAsyncDir,
 					pid: 54321,
 					state: "running",
-					agent: "reviewer",
+					agent: "commentator",
 					lastUpdate: 150,
 				},
 			});
@@ -592,8 +592,8 @@ describe("async run status inspection", () => {
 
 			const text = textContent(result);
 			assert.equal(result.isError, undefined);
-			assert.match(text, /↳ reviewer \[nested-stale\] failed/);
-			assert.match(text, /1\. reviewer failed \| error: Async runner process 54321 exited or disappeared/);
+			assert.match(text, /↳ commentator \[nested-stale\] failed/);
+			assert.match(text, /1\. commentator failed \| error: Async runner process 54321 exited or disappeared/);
 			assert.ok(fs.existsSync(path.join(resultsDir, "nested", "run-stale-nested-root", "nested-stale.json")));
 		} finally {
 			fs.rmSync(root, { recursive: true, force: true });
@@ -782,8 +782,8 @@ describe("async run status inspection", () => {
 				chainStepCount: 3,
 				parallelGroups: [{ start: 1, count: 2, stepIndex: 1 }],
 				steps: [
-					{ agent: "scout", status: "complete", startedAt: 100 },
-					{ agent: "reviewer", status: "running", startedAt: 100 },
+					{ agent: "explorer", status: "complete", startedAt: 100 },
+					{ agent: "commentator", status: "running", startedAt: 100 },
 					{ agent: "auditor", status: "pending" },
 					{ agent: "writer", status: "pending" },
 				],
@@ -797,8 +797,8 @@ describe("async run status inspection", () => {
 			});
 
 			const text = textContent(result);
-			assert.match(text, /Step 1\/3: scout complete/);
-			assert.match(text, /Step 2\/3 Agent 1\/2: reviewer running/);
+			assert.match(text, /Step 1\/3: explorer complete/);
+			assert.match(text, /Step 2\/3 Agent 1\/2: commentator running/);
 			assert.match(text, /Step 2\/3 Agent 2\/2: auditor pending/);
 			assert.match(text, /Step 3\/3: writer pending/);
 		} finally {
@@ -819,7 +819,7 @@ describe("async run status inspection", () => {
 				pid: 12345,
 				startedAt: 100,
 				lastUpdate: 100,
-				steps: [{ agent: "scout", status: "running", startedAt: 100 }],
+				steps: [{ agent: "explorer", status: "running", startedAt: 100 }],
 			}, null, 2), "utf-8");
 
 			const result = inspectSubagentStatus({ id: "run-live" }, {
@@ -830,8 +830,8 @@ describe("async run status inspection", () => {
 			});
 
 			const text = textContent(result);
-			assert.match(text, /Step 1: scout running/);
-			assert.match(text, /Intercom target: subagent-scout-run-live-1 \(if registered\)/);
+			assert.match(text, /Step 1: explorer running/);
+			assert.match(text, /Intercom target: subagent-explorer-run-live-1 \(if registered\)/);
 		} finally {
 			fs.rmSync(root, { recursive: true, force: true });
 		}
@@ -913,7 +913,7 @@ describe("async run status inspection", () => {
 			fs.writeFileSync(sessionFile, "", "utf-8");
 			fs.writeFileSync(path.join(resultsDir, "run-result-transcript.json"), JSON.stringify({
 				id: "run-result-transcript",
-				agent: "worker",
+				agent: "builder",
 				success: false,
 				state: "failed",
 				sessionFile,
@@ -927,7 +927,7 @@ describe("async run status inspection", () => {
 
 			const text = textContent(result);
 			assert.equal(result.isError, undefined);
-			assert.match(text, /Child: 0 \(worker\)/);
+			assert.match(text, /Child: 0 \(builder\)/);
 			assert.match(text, /legacy result transcript/);
 		} finally {
 			fs.rmSync(root, { recursive: true, force: true });
@@ -943,7 +943,7 @@ describe("async run status inspection", () => {
 			fs.mkdirSync(resultsDir, { recursive: true });
 			fs.writeFileSync(path.join(resultsDir, "run-result-index-validation.json"), JSON.stringify({
 				id: "run-result-index-validation",
-				agent: "worker",
+				agent: "builder",
 				success: true,
 				summary: "done",
 			}, null, 2), "utf-8");
@@ -971,7 +971,7 @@ describe("async run status inspection", () => {
 			fs.writeFileSync(sessionFile, "", "utf-8");
 			fs.writeFileSync(path.join(resultsDir, "run-stopped-result.json"), JSON.stringify({
 				id: "run-stopped-result",
-				agent: "worker",
+				agent: "builder",
 				success: false,
 				state: "stopped",
 				stopped: true,
@@ -1003,11 +1003,11 @@ describe("async run status inspection", () => {
 			fs.mkdirSync(resultsDir, { recursive: true });
 			fs.writeFileSync(path.join(resultsDir, "run-signal-result.json"), JSON.stringify({
 				id: "run-signal-result",
-				agent: "worker",
+				agent: "builder",
 				success: false,
 				state: "failed",
 				summary: "Subagent process terminated by signal SIGTERM.",
-				results: [{ agent: "worker", success: false, exitCode: 1, processSignal: "SIGTERM" }],
+				results: [{ agent: "builder", success: false, exitCode: 1, processSignal: "SIGTERM" }],
 			}, null, 2), "utf-8");
 
 			const result = inspectSubagentStatus({ id: "run-signal-result" }, {
@@ -1035,7 +1035,7 @@ describe("async run status inspection", () => {
 			fs.writeFileSync(sessionFile, "", "utf-8");
 			fs.writeFileSync(path.join(resultsDir, "run-result-only.json"), JSON.stringify({
 				id: "run-result-only",
-				agent: "worker",
+				agent: "builder",
 				success: false,
 				state: "failed",
 				sessionFile,