@selesai/code 0.6.3 → 0.8.0

package/dist/extensions/pi-subagents/test/unit/subagent-prompt-runtime.test.ts

@@ -19,6 +19,7 @@ import {
 import { RUNTIME_EXTENSION_ACK_EVENT, RUNTIME_EXTENSION_ACK_PATH_ENV } from "../../src/runs/shared/runtime-acknowledged-extensions.ts";
 import { STRUCTURED_OUTPUT_CAPTURE_ENV, STRUCTURED_OUTPUT_SCHEMA_ENV } from "../../src/runs/shared/structured-output.ts";
 import { TOOL_BUDGET_ENV } from "../../src/runs/shared/tool-budget.ts";
+import { PERMISSION_POLICY_ENV } from "../../src/runs/shared/permissions.ts";
 import { CHILD_TOOL_DIAGNOSTIC_PATH_ENV, formatChildToolDiagnostic, MCP_DIRECT_CHILD_TOOLS_ENV, readChildToolDiagnostic, REQUIRED_CHILD_TOOLS_ENV } from "../../src/runs/shared/tool-availability.ts";
 import { CHILD_WATCHDOG_CONFIG_ENV } from "../../src/watchdog/child-status.ts";
 import { SUBAGENT_WATCHDOG_WARNING_TYPE } from "../../src/watchdog/types.ts";
@@ -26,6 +27,7 @@ import registerSubagentPromptRuntime, {
 	CHILD_FANOUT_BOUNDARY_INSTRUCTIONS,
 	CHILD_SUBAGENT_BOUNDARY_INSTRUCTIONS,
 	SUBAGENT_INTERCOM_SESSION_NAME_ENV,
+	registerPermissionGate,
 	registerSteeringInbox,
 	rewriteSubagentPrompt,
 	stripInheritedSkills,
@@ -44,7 +46,9 @@ const envSnapshot = {
 	SELESAI_SUBAGENT_STEER_ACK_DIR: process.env.SELESAI_SUBAGENT_STEER_ACK_DIR,
 	SELESAI_SUBAGENT_STRUCTURED_OUTPUT_CAPTURE: process.env.SELESAI_SUBAGENT_STRUCTURED_OUTPUT_CAPTURE,
 	SELESAI_SUBAGENT_STRUCTURED_OUTPUT_SCHEMA: process.env.SELESAI_SUBAGENT_STRUCTURED_OUTPUT_SCHEMA,
+	SELESAI_SUBAGENT_RUNTIME_ACKNOWLEDGED_EXTENSIONS: process.env.SELESAI_SUBAGENT_RUNTIME_ACKNOWLEDGED_EXTENSIONS,
 	SELESAI_SUBAGENT_TOOL_BUDGET: process.env.SELESAI_SUBAGENT_TOOL_BUDGET,
+	SELESAI_SUBAGENT_PERMISSION_POLICY: process.env.SELESAI_SUBAGENT_PERMISSION_POLICY,
 	SELESAI_SUBAGENT_REQUIRED_TOOLS: process.env.SELESAI_SUBAGENT_REQUIRED_TOOLS,
 	SELESAI_SUBAGENT_MCP_DIRECT_TOOLS: process.env.SELESAI_SUBAGENT_MCP_DIRECT_TOOLS,
 	SELESAI_SUBAGENT_TOOL_DIAGNOSTIC_PATH: process.env.SELESAI_SUBAGENT_TOOL_DIAGNOSTIC_PATH,
@@ -57,7 +61,7 @@ const envSnapshot = {
 	SELESAI_SUBAGENT_WATCHDOG_CHILD_CONFIG: process.env.SELESAI_SUBAGENT_WATCHDOG_CHILD_CONFIG,
 };
 
-const SKILLS_SECTION = "\n\nThe following skills provide specialized instructions for specific tasks.\nUse the read tool to load a skill's file when the task matches its description.\nWhen a skill file references a relative path, resolve it against the skill directory (parent of SKILL.md / dirname of the path) and use that absolute path in tool commands.\n\n<available_skills>\n  <skill>\n    <name>safe-bash</name>\n    <description>desc</description>\n    <location>/tmp/SKILL.md</location>\n  </skill>\n  <skill>\n    <name>pi-subagents</name>\n    <description>delegate to subagents</description>\n    <location>/tmp/pi-subagents/SKILL.md</location>\n  </skill>\n</available_skills>";
+const SKILLS_SECTION = "\n\nThe following skills provide specialized instructions for specific tasks.\nUse the read tool to load a skill's file when the task matches its description.\nWhen a skill file references a relative path, resolve it against the skill directory (parent of SKILL.md / dirname of the path) and use that absolute path in tool commands.\n\n<available_skills>\n  <skill>\n    <name>safe-bash</name>\n    <description>desc</description>\n    <location>/tmp/SKILL.md</location>\n  </skill>\n  <skill>\n    <name>pi-subagents</name>\n    <description>explorer to subagents</description>\n    <location>/tmp/pi-subagents/SKILL.md</location>\n  </skill>\n</available_skills>";
 
 const BASE_PROMPT = [
 	"You are a subagent.",
@@ -95,8 +99,12 @@ afterEach(() => {
 	else process.env[STRUCTURED_OUTPUT_CAPTURE_ENV] = envSnapshot.SELESAI_SUBAGENT_STRUCTURED_OUTPUT_CAPTURE;
 	if (envSnapshot.SELESAI_SUBAGENT_STRUCTURED_OUTPUT_SCHEMA === undefined) delete process.env[STRUCTURED_OUTPUT_SCHEMA_ENV];
 	else process.env[STRUCTURED_OUTPUT_SCHEMA_ENV] = envSnapshot.SELESAI_SUBAGENT_STRUCTURED_OUTPUT_SCHEMA;
+	if (envSnapshot.SELESAI_SUBAGENT_RUNTIME_ACKNOWLEDGED_EXTENSIONS === undefined) delete process.env[RUNTIME_EXTENSION_ACK_PATH_ENV];
+	else process.env[RUNTIME_EXTENSION_ACK_PATH_ENV] = envSnapshot.SELESAI_SUBAGENT_RUNTIME_ACKNOWLEDGED_EXTENSIONS;
 	if (envSnapshot.SELESAI_SUBAGENT_TOOL_BUDGET === undefined) delete process.env[TOOL_BUDGET_ENV];
 	else process.env[TOOL_BUDGET_ENV] = envSnapshot.SELESAI_SUBAGENT_TOOL_BUDGET;
+	if (envSnapshot.SELESAI_SUBAGENT_PERMISSION_POLICY === undefined) delete process.env[PERMISSION_POLICY_ENV];
+	else process.env[PERMISSION_POLICY_ENV] = envSnapshot.SELESAI_SUBAGENT_PERMISSION_POLICY;
 	if (envSnapshot.SELESAI_SUBAGENT_REQUIRED_TOOLS === undefined) delete process.env[REQUIRED_CHILD_TOOLS_ENV];
 	else process.env[REQUIRED_CHILD_TOOLS_ENV] = envSnapshot.SELESAI_SUBAGENT_REQUIRED_TOOLS;
 	if (envSnapshot.SELESAI_SUBAGENT_MCP_DIRECT_TOOLS === undefined) delete process.env[MCP_DIRECT_CHILD_TOOLS_ENV];
@@ -124,11 +132,38 @@ function setSupervisorEnv(): void {
 	process.env[SUBAGENT_ORCHESTRATOR_SESSION_ID_ENV] = "session-parent";
 	process.env[SUBAGENT_SUPERVISOR_CHANNEL_DIR_ENV] = path.join(os.tmpdir(), "subagent-supervisor-runtime-test");
 	process.env[SUBAGENT_RUN_ID_ENV] = "run-123";
-	process.env[SUBAGENT_CHILD_AGENT_ENV] = "worker";
+	process.env[SUBAGENT_CHILD_AGENT_ENV] = "builder";
 	process.env[SUBAGENT_CHILD_INDEX_ENV] = "0";
 }
 
 describe("subagent prompt runtime", () => {
+	it("registers no permission hook by default and routes ask only to the watchdog arbiter", async () => {
+		const handlers: Array<(event: { toolName?: string; input?: unknown }, ctx?: unknown) => unknown> = [];
+		const pi = { on(event: string, handler: (event: { toolName?: string; input?: unknown }, ctx?: unknown) => unknown) { if (event === "tool_call") handlers.push(handler); } };
+		delete process.env[PERMISSION_POLICY_ENV];
+		registerPermissionGate(pi as never);
+		assert.equal(handlers.length, 0);
+
+		process.env[PERMISSION_POLICY_ENV] = JSON.stringify({ write: "deny" });
+		registerPermissionGate(pi as never);
+		assert.equal(handlers.length, 1);
+		assert.equal(await handlers[0]!({ toolName: "bash", input: { command: "rm -rf /" } }), undefined);
+		assert.equal(await handlers[0]!({ toolName: "contact_supervisor", input: {} }), undefined);
+		assert.deepEqual(await handlers[0]!({ toolName: "write", input: {} }), {
+			block: true,
+			reason: "Blocked by pi-subagents permission rule: 'write' is denied.",
+		});
+
+		process.env[PERMISSION_POLICY_ENV] = JSON.stringify({ write: "ask" });
+		const askHandlers: Array<(event: { toolName?: string; input?: unknown }, ctx: unknown) => unknown> = [];
+		const requests: Array<{ toolName: string; args: unknown }> = [];
+		registerPermissionGate({ on(event: string, handler: (event: { toolName?: string; input?: unknown }, ctx: unknown) => unknown) { if (event === "tool_call") askHandlers.push(handler); } } as never, async (request) => {
+			requests.push({ toolName: request.toolName, args: request.args });
+			return { approved: true, reason: "approved by watchdog", source: "watchdog" };
+		});
+		assert.equal(await askHandlers[0]!({ toolName: "write", input: { path: "out.txt" } }, { signal: undefined }), undefined);
+		assert.deepEqual(requests, [{ toolName: "write", args: { path: "out.txt" } }]);
+	});
 	it("collects runtime extension acknowledgements until terminal serialization", () => {
 		const dir = fs.mkdtempSync(path.join(os.tmpdir(), "subagent-runtime-ack-"));
 		try {
@@ -351,7 +386,7 @@ describe("subagent prompt runtime", () => {
 		process.env[CHILD_WATCHDOG_CONFIG_ENV] = JSON.stringify({
 			enabled: true,
 			runId: "run-1",
-			agent: "worker",
+			agent: "builder",
 			childIndex: 0,
 			watchdogTailTimeoutMs: 1000,
 			agentEndTimeoutMs: 500,
@@ -551,7 +586,7 @@ describe("subagent prompt runtime", () => {
 
 		assert.ok(rewritten.includes("<name>safe-bash</name>"));
 		assert.ok(!rewritten.includes("<name>pi-subagents</name>"));
-		assert.ok(!rewritten.includes("delegate to subagents"));
+		assert.ok(!rewritten.includes("explorer to subagents"));
 	});
 
 	it("strips explicit pi-subagents skill injection from child prompts", () => {
@@ -584,13 +619,13 @@ describe("subagent prompt runtime", () => {
 			role: "assistant",
 			content: [
 				{ type: "text", text: "I will inspect the repo." },
-				{ type: "toolCall", name: "subagent", input: { agent: "worker" } },
+				{ type: "toolCall", name: "subagent", input: { agent: "builder" } },
 				{ type: "toolCall", name: "read", input: { path: "README.md" } },
 			],
 		};
 		const pureSubagentCall = {
 			role: "assistant",
-			content: [{ type: "toolCall", name: "subagent", input: { agent: "reviewer" } }],
+			content: [{ type: "toolCall", name: "subagent", input: { agent: "commentator" } }],
 		};
 
 		assert.deepEqual(
@@ -612,7 +647,7 @@ describe("subagent prompt runtime", () => {
 	it("preserves live nested subagent calls and results in fanout child context", () => {
 		const user = { role: "user", content: "Task" };
 		const subagentResult = { role: "toolResult", toolName: "subagent", content: "OK" };
-		const subagentCall = { role: "assistant", content: [{ type: "toolCall", name: "subagent", input: { agent: "delegate" } }] };
+		const subagentCall = { role: "assistant", content: [{ type: "toolCall", name: "subagent", input: { agent: "explorer" } }] };
 		const instruction = { role: "custom", customType: "subagent-orchestration-instructions", content: "Subagent orchestration is enabled." };
 		process.env[SUBAGENT_FANOUT_CHILD_ENV] = "1";
 
@@ -649,7 +684,7 @@ describe("subagent prompt runtime", () => {
 			const registered: string[] = [];
 			process.env[REQUIRED_CHILD_TOOLS_ENV] = JSON.stringify(["read", "grep", "find", "ls", "bash", "edit", "write", "intercom"]);
 			process.env[CHILD_TOOL_DIAGNOSTIC_PATH_ENV] = diagnosticPath;
-			process.env[SUBAGENT_CHILD_AGENT_ENV] = "scout";
+			process.env[SUBAGENT_CHILD_AGENT_ENV] = "explorer";
 
 			registerSubagentPromptRuntime({
 				on(event: string, handler: (payload?: unknown) => unknown) {
@@ -728,7 +763,7 @@ describe("subagent prompt runtime", () => {
 			const available = ["read"];
 			process.env[REQUIRED_CHILD_TOOLS_ENV] = JSON.stringify(["read", "fixture_search"]);
 			process.env[CHILD_TOOL_DIAGNOSTIC_PATH_ENV] = diagnosticPath;
-			process.env[SUBAGENT_CHILD_AGENT_ENV] = "extension-worker";
+			process.env[SUBAGENT_CHILD_AGENT_ENV] = "extension-builder";
 
 			registerSubagentPromptRuntime({
 				on(event: string, handler: (payload?: unknown) => unknown) {
@@ -744,7 +779,7 @@ describe("subagent prompt runtime", () => {
 
 			handlers.get("agent_start")?.({});
 			assert.deepEqual(readChildToolDiagnostic(diagnosticPath), {
-				agent: "extension-worker",
+				agent: "extension-builder",
 				required: ["read", "fixture_search"],
 				available: ["read"],
 				missing: ["fixture_search"],
@@ -766,7 +801,7 @@ describe("subagent prompt runtime", () => {
 			process.env[REQUIRED_CHILD_TOOLS_ENV] = JSON.stringify(["read", "fixture_search"]);
 			process.env[MCP_DIRECT_CHILD_TOOLS_ENV] = "not-json";
 			process.env[CHILD_TOOL_DIAGNOSTIC_PATH_ENV] = diagnosticPath;
-			process.env[SUBAGENT_CHILD_AGENT_ENV] = "worker";
+			process.env[SUBAGENT_CHILD_AGENT_ENV] = "builder";
 
 			registerSubagentPromptRuntime({
 				on(event: string, handler: (payload?: unknown) => unknown) {
@@ -778,7 +813,7 @@ describe("subagent prompt runtime", () => {
 
 			assert.doesNotThrow(() => handlers.get("agent_start")?.({}));
 			assert.deepEqual(readChildToolDiagnostic(diagnosticPath), {
-				agent: "worker",
+				agent: "builder",
 				required: ["read", "fixture_search"],
 				available: ["read"],
 				missing: ["fixture_search"],
@@ -796,7 +831,7 @@ describe("subagent prompt runtime", () => {
 			process.env[REQUIRED_CHILD_TOOLS_ENV] = JSON.stringify(["read", "rust_symbols_workspace_symbols", "fixture_search"]);
 			process.env[MCP_DIRECT_CHILD_TOOLS_ENV] = JSON.stringify(["rust_symbols_workspace_symbols"]);
 			process.env[CHILD_TOOL_DIAGNOSTIC_PATH_ENV] = diagnosticPath;
-			process.env[SUBAGENT_CHILD_AGENT_ENV] = "worker";
+			process.env[SUBAGENT_CHILD_AGENT_ENV] = "builder";
 
 			registerSubagentPromptRuntime({
 				on(event: string, handler: (payload?: unknown) => unknown) {
@@ -809,7 +844,7 @@ describe("subagent prompt runtime", () => {
 			handlers.get("agent_start")?.({});
 			const diagnostic = readChildToolDiagnostic(diagnosticPath);
 			assert.deepEqual(diagnostic, {
-				agent: "worker",
+				agent: "builder",
 				required: ["read", "rust_symbols_workspace_symbols", "fixture_search"],
 				available: ["read"],
 				missing: ["rust_symbols_workspace_symbols", "fixture_search"],
@@ -826,7 +861,7 @@ describe("subagent prompt runtime", () => {
 	it("sets the child intercom session name from env during agent startup", async () => {
 		let sessionName: string | undefined;
 		let beforeAgentStart: ((event: { systemPrompt: string }) => Promise<{ systemPrompt: string } | undefined>) | undefined;
-		process.env[SUBAGENT_INTERCOM_SESSION_NAME_ENV] = "subagent-worker-78f659a3";
+		process.env[SUBAGENT_INTERCOM_SESSION_NAME_ENV] = "subagent-builder-78f659a3";
 
 		registerSubagentPromptRuntime({
 			on(event: string, handler: (payload: { systemPrompt: string }) => Promise<{ systemPrompt: string } | undefined>) {
@@ -840,7 +875,7 @@ describe("subagent prompt runtime", () => {
 
 		await beforeAgentStart?.({ systemPrompt: BASE_PROMPT });
 
-		assert.equal(sessionName, "subagent-worker-78f659a3");
+		assert.equal(sessionName, "subagent-builder-78f659a3");
 	});
 
 	it("rewrites the final child-visible prompt through before_agent_start", async () => {
@@ -889,12 +924,12 @@ describe("subagent prompt runtime", () => {
 			},
 		} as { on(event: string, handler: (payload: { messages: unknown[] }) => { messages: unknown[] } | undefined): void });
 
-		const priorParentTurn = { role: "user", content: "Earlier we said planner → worker → reviewers → worker." };
+		const priorParentTurn = { role: "user", content: "Earlier we said architect → builder → reviewers → builder." };
 		const currentTask = { role: "user", content: "Now implement only the assigned fix." };
 		const instruction = { role: "custom", customType: "subagent-orchestration-instructions", content: "Subagent orchestration is enabled." };
 		const slashResult = { role: "custom", customType: "subagent-slash-result", content: "## Orchestration" };
 		const subagentResult = { role: "toolResult", toolName: "subagent", content: "subagent results" };
-		const subagentCall = { role: "assistant", content: [{ type: "toolCall", name: "subagent", input: { agent: "worker" } }] };
+		const subagentCall = { role: "assistant", content: [{ type: "toolCall", name: "subagent", input: { agent: "builder" } }] };
 		const watchdogWarning = { role: "custom", customType: SUBAGENT_WATCHDOG_WARNING_TYPE, content: "<subagent_watchdog>parent-only</subagent_watchdog>" };
 		const childWatchdogWarning = { role: "custom", customType: SUBAGENT_WATCHDOG_WARNING_TYPE, content: "<subagent_watchdog>child-visible</subagent_watchdog>", details: { source: "child" } };
 		const otherCustom = { role: "custom", customType: "other", content: "keep" };

package/dist/extensions/pi-subagents/test/unit/subagent-startup-retry.test.ts

@@ -35,13 +35,25 @@ describe("subagent startup retry", () => {
 		assert.equal(isRetryableSubagentStartupFailure(startupFailure()), true);
 	});
 
+	it("retries only the canonical zero-activity SIGKILL startup failure", () => {
+		assert.equal(
+			isRetryableSubagentStartupFailure(startupFailure({
+				processSignal: "SIGKILL",
+				error: "Subagent process terminated by signal SIGKILL.",
+			})),
+			true,
+		);
+		assert.equal(isRetryableSubagentStartupFailure(startupFailure({ processSignal: "SIGKILL" })), true);
+		assert.equal(isRetryableSubagentStartupFailure(startupFailure({ processSignal: "SIGTERM" })), false);
+		assert.equal(isRetryableSubagentStartupFailure(startupFailure({ processSignal: "SIGKILL", error: "authentication failed" })), false);
+	});
+
 	it("rejects successful, long-running, and diagnosed exits", () => {
 		assert.equal(isRetryableSubagentStartupFailure(startupFailure({ exitCode: 0 })), false);
 		assert.equal(isRetryableSubagentStartupFailure(startupFailure({ durationMs: MAX_SUBAGENT_STARTUP_FAILURE_DURATION_MS + 1 })), false);
 		assert.equal(isRetryableSubagentStartupFailure(startupFailure({ error: "authentication failed" })), false);
 		assert.equal(isRetryableSubagentStartupFailure(startupFailure({ finalOutput: "partial response" })), false);
 		assert.equal(isRetryableSubagentStartupFailure(startupFailure({ protocolError: { code: "protocol_output_limit" } })), false);
-		assert.equal(isRetryableSubagentStartupFailure(startupFailure({ processSignal: "SIGKILL" })), false);
 	});
 
 	it("rejects any model, tool, usage, mutation, or lifecycle activity", () => {

package/dist/extensions/pi-subagents/test/unit/subagent-wait.test.ts

@@ -20,7 +20,7 @@ function writeStatus(asyncRoot: string, runId: string, state: string, extra: obj
 			state,
 			startedAt: nowMs,
 			lastUpdate: nowMs,
-			steps: [{ agent: "worker", status: state }],
+			steps: [{ agent: "builder", status: state }],
 			...extra,
 		}),
 		"utf-8",
@@ -138,6 +138,39 @@ describe("subagent_wait tool", () => {
 		}
 	});
 
+	it("streams active async run status while waiting", async () => {
+		const root = fs.mkdtempSync(path.join(os.tmpdir(), "pi-wait-progress-"));
+		try {
+			const asyncRoot = path.join(root, "runs");
+			const state = makeState("sess-1");
+			writeStatus(asyncRoot, "run-live", "running", {
+				sessionId: "sess-1",
+				pid: 999999,
+				steps: [{
+					agent: "builder",
+					status: "running",
+					currentTool: "edit",
+					currentPath: "src/render.ts",
+					turnCount: 2,
+					toolCount: 4,
+				}],
+			});
+			const updates: string[] = [];
+			const result = await waitForSubagents({}, undefined, baseDeps(root, state, {
+				onUpdate: (update) => updates.push(textOf(update)),
+				sleep: async () => writeStatus(asyncRoot, "run-live", "complete", { sessionId: "sess-1" }),
+			}));
+
+			assert.equal(result.isError, undefined);
+			assert.equal(updates.length, 1);
+			assert.match(updates[0]!, /Waiting .* for 1 async run/);
+			assert.match(updates[0]!.split("\n")[0]!, /builder: edit .*src\/render\.ts/);
+			assert.match(updates[0]!, /run-live/);
+		} finally {
+			fs.rmSync(root, { recursive: true, force: true });
+		}
+	});
+
 	it("surfaces failed terminal runs as errors only for internal auto-drain", async () => {
 		const root = fs.mkdtempSync(path.join(os.tmpdir(), "pi-wait-drain-failure-"));
 		try {
@@ -216,7 +249,7 @@ describe("subagent_wait tool", () => {
 			writeStatus(asyncRoot, "run-step-blocked", "running", {
 				sessionId: "sess-1",
 				pid: 999999,
-				steps: [{ agent: "worker", status: "running", activityState: "needs_attention" }],
+				steps: [{ agent: "builder", status: "running", activityState: "needs_attention" }],
 			});
 
 			let polls = 0;
@@ -310,7 +343,7 @@ describe("subagent_wait tool", () => {
 					cwd: root,
 					sessionId: "sess-1",
 					updatedAt: 1,
-					children: [{ agent: "reviewer", index: 0, status: "detached", updatedAt: 1 }],
+					children: [{ agent: "commentator", index: 0, status: "detached", updatedAt: 1 }],
 				}],
 				["foreground-other", {
 					runId: "foreground-other",
@@ -318,7 +351,7 @@ describe("subagent_wait tool", () => {
 					cwd: root,
 					sessionId: "sess-2",
 					updatedAt: 1,
-					children: [{ agent: "worker", index: 0, status: "detached", updatedAt: 1 }],
+					children: [{ agent: "builder", index: 0, status: "detached", updatedAt: 1 }],
 				}],
 			]);
 			let polls = 0;
@@ -326,7 +359,7 @@ describe("subagent_wait tool", () => {
 				sleep: async () => {
 					polls += 1;
 					state.foregroundRuns!.get("foreground-alpha")!.children[0] = {
-						agent: "reviewer",
+						agent: "commentator",
 						index: 0,
 						status: "completed",
 						finalOutput: "Recovered review",
@@ -394,7 +427,7 @@ describe("subagent_wait tool", () => {
 				cwd: root,
 				sessionId: "sess-1",
 				updatedAt: 1,
-				children: [{ agent: "worker", index: 0, status: "detached", updatedAt: 1 }],
+				children: [{ agent: "builder", index: 0, status: "detached", updatedAt: 1 }],
 			}]]);
 			const handlers = new Map<string, Array<(data: unknown) => void>>();
 			const events = {
@@ -447,14 +480,14 @@ describe("subagent_wait tool", () => {
 				cwd: root,
 				sessionId: "sess-1",
 				updatedAt: ts,
-				children: [{ agent: "worker", index: 0, status: "detached", transcriptPath, updatedAt: ts }],
+				children: [{ agent: "builder", index: 0, status: "detached", transcriptPath, updatedAt: ts }],
 			}]]);
 			const updates: string[] = [];
 			const result = await waitForSubagents({ id: "foreground-live" }, undefined, baseDeps(root, state, {
 				onUpdate: (update) => updates.push(textOf(update)),
 				sleep: async () => {
 					state.foregroundRuns!.get("foreground-live")!.children[0] = {
-						agent: "worker",
+						agent: "builder",
 						index: 0,
 						status: "completed",
 						finalOutput: "Implemented the renderer fix.",
@@ -467,7 +500,7 @@ describe("subagent_wait tool", () => {
 			assert.equal(result.isError, undefined);
 			assert.equal(updates.length, 1);
 			assert.match(updates[0]!, /Waiting for detached foreground run "foreground-live"/);
-			assert.match(updates[0]!, /worker · working after supervisor handoff/);
+			assert.match(updates[0]!, /builder · working after supervisor handoff/);
 			assert.match(updates[0]!, /current: edit: \{ path: src\/render\.ts \}/);
 			assert.match(updates[0]!, /assistant: I found the relevant renderer path\./);
 			assert.doesNotMatch(updates[0]!, /large delegated task/);
@@ -487,7 +520,7 @@ describe("subagent_wait tool", () => {
 					cwd: root,
 					sessionId: "sess-1",
 					updatedAt: 1,
-					children: [{ agent: "reviewer", index: 0, status: "detached", updatedAt: 1 }],
+					children: [{ agent: "commentator", index: 0, status: "detached", updatedAt: 1 }],
 				}]]);
 				const result = await waitForSubagents({ id: "foreground-still", timeoutMs: 5000 }, undefined, baseDeps(root, state, {
 					sleep: async () => {
@@ -516,7 +549,7 @@ describe("subagent_wait tool", () => {
 				cwd: root,
 				sessionId: "sess-1",
 				updatedAt: 1,
-				children: [{ agent: "reviewer", index: 0, status: "detached", updatedAt: 1 }],
+				children: [{ agent: "commentator", index: 0, status: "detached", updatedAt: 1 }],
 			}]]);
 
 			const result = await waitForSubagents({ id: "shared" }, undefined, baseDeps(root, state));

package/dist/extensions/pi-subagents/test/unit/task-intent.test.ts

@@ -1,6 +1,6 @@
 import assert from "node:assert/strict";
 import { describe, it } from "node:test";
-import { classifyTaskMutationIntent, expectsImplementationMutation, resolveAgentRoutingRole, taskMayMutate } from "../../src/runs/shared/task-intent.ts";
+import { classifyTaskMutationIntent, expectsImplementationMutation, taskMayMutate } from "../../src/runs/shared/task-intent.ts";
 
 describe("classifyTaskMutationIntent", () => {
 	it("keeps write imperatives despite investigative wording", () => {
@@ -38,9 +38,7 @@ describe("classifyTaskMutationIntent", () => {
 		assert.equal(classifyTaskMutationIntent("builder", "Do not edit files. Tell me how to fix the bug.").kind, "read-only");
 		assert.equal(classifyTaskMutationIntent("builder", "Report on the extraction pipeline. Do not modify project/source files.").kind, "read-only");
 		assert.equal(classifyTaskMutationIntent("commentator", "Final correctness review after prior fixes. Inspect all changed files and tests. Do not modify project/source files. Report findings.").kind, "read-only");
-		assert.equal(classifyTaskMutationIntent("builder", `Verification-only task. Do not edit product/source/config files.
-   Run a disposable check, delete its temporary harness, and retain only
-   a sanitized report at an explicitly named artifact path.`).kind, "read-only");
+		assert.equal(classifyTaskMutationIntent("builder", "Verification-only task. Do not edit product/source/config files.\n   Run a disposable check, delete its temporary harness, and retain only\n   a sanitized report at an explicitly named artifact path.").kind, "read-only");
 	});
 
 	it("strips repeated prohibition phrases before testing write intent", () => {
@@ -69,28 +67,6 @@ describe("classifyTaskMutationIntent", () => {
 	});
 });
 
-describe("resolveAgentRoutingRole", () => {
-	it("lets a declared acceptanceRole override name heuristics", () => {
-		assert.equal(resolveAgentRoutingRole("commentator", "writer"), "writer");
-		assert.equal(resolveAgentRoutingRole("builder", "read-only"), "read-only");
-		assert.equal(resolveAgentRoutingRole("custom-agent", "writer"), "writer");
-		assert.equal(resolveAgentRoutingRole("custom-agent", "read-only"), "read-only");
-	});
-
-	it("infers writer for builder-named agents and read-only for reviewer-style names", () => {
-		assert.equal(resolveAgentRoutingRole("builder"), "writer");
-		assert.equal(resolveAgentRoutingRole("package.builder"), "writer");
-		for (const name of ["architect", "commentator", "explorer", "recapper", "researcher", "analyst"]) {
-			assert.equal(resolveAgentRoutingRole(name), "read-only", name);
-		}
-	});
-
-	it("returns undefined for names without an established role", () => {
-		assert.equal(resolveAgentRoutingRole("custom-agent"), undefined);
-		assert.equal(resolveAgentRoutingRole("reviewer"), undefined);
-	});
-});
-
 describe("taskMayMutate", () => {
 	it("treats any bare write verb as write-capable", () => {
 		for (const task of ["Write the code", "Commit the changes", "Delete temporary data", "Remove obsolete assets", "Update dependencies"]) {