@selesai/code 0.6.2 → 0.7.0

package/dist/extensions/pi-subagents/test/unit/skills-fallback.test.ts

@@ -52,6 +52,13 @@ async function importSkillsFresh() {
 	return await import(`${pathToFileURL(modulePath).href}?bust=${bust}`) as typeof import("../../src/agents/skills.ts");
 }
 
+async function importAgentsFresh() {
+	const projectRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..", "..");
+	const modulePath = path.resolve(projectRoot, "src/agents/agents.ts");
+	const bust = `${Date.now()}-${Math.random()}`;
+	return await import(`${pathToFileURL(modulePath).href}?bust=${bust}`) as typeof import("../../src/agents/agents.ts");
+}
+
 describe("skills filesystem fallback", () => {
 	beforeEach(() => {
 		tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "pi-skills-fallback-"));
@@ -347,6 +354,7 @@ describe("skills filesystem fallback", () => {
 					...process.env,
 					HOME: fakeHome,
 					USERPROFILE: fakeHome,
+					APPDATA: path.join(fakeHome, "appdata"),
 					PATH: `${binDir}${path.delimiter}${process.env.PATH ?? ""}`,
 					PI_DISCOVERY_MARKER: marker,
 					PI_OFFLINE: "1",
@@ -357,6 +365,137 @@ describe("skills filesystem fallback", () => {
 		assert.deepEqual(fs.readFileSync(marker, "utf-8").trim().split(/\r?\n/), ["npm-root-called", "npm-root-called"]);
 	});
 
+	it("uses the Windows APPDATA npm root without invoking npm", async () => {
+		const appData = path.join(tempDir, "appdata");
+		const packageRoot = path.join(appData, "npm", "node_modules", "windows-global-package");
+		const marker = path.join(tempDir, "npm-called");
+		const binDir = path.join(tempDir, "bin");
+		fs.mkdirSync(binDir, { recursive: true });
+		fs.writeFileSync(
+			path.join(binDir, "npm"),
+			`#!/bin/sh\ntouch "${marker}"\nexit 1\n`,
+			{ encoding: "utf-8", mode: 0o755 },
+		);
+		writeSkillFile(path.join(packageRoot, "skills", "windows-global-skill"), "Use the Windows global skill.");
+		fs.writeFileSync(
+			path.join(packageRoot, "package.json"),
+			JSON.stringify({
+				name: "windows-global-package",
+				pi: { skills: ["./skills"] },
+				"pi-subagents": { agents: ["./agents"] },
+			}, null, 2),
+			"utf-8",
+		);
+		fs.mkdirSync(path.join(packageRoot, "agents"), { recursive: true });
+		fs.writeFileSync(path.join(packageRoot, "agents", "windows-global-agent.md"), `---
+name: windows-global-agent
+description: Loaded from the Windows global npm root.
+---
+
+Windows global agent.
+`, "utf-8");
+
+		const platformDescriptor = Object.getOwnPropertyDescriptor(process, "platform");
+		const previousAppData = process.env.APPDATA;
+		const previousPath = process.env.PATH;
+		try {
+			Object.defineProperty(process, "platform", { value: "win32" });
+			process.env.APPDATA = appData;
+			process.env.PATH = `${binDir}${path.delimiter}${previousPath ?? ""}`;
+
+			const skills = await importSkillsFresh();
+			assert.ok(skills.discoverAvailableSkills(tempDir).some((skill) => skill.name === "windows-global-skill"));
+
+			const agents = await importAgentsFresh();
+			assert.ok(agents.discoverAgents(tempDir, "both").agents.some((agent) => agent.name === "windows-global-agent"));
+			assert.equal(fs.existsSync(marker), false, "npm root -g should not run when APPDATA has a global root");
+		} finally {
+			if (platformDescriptor) Object.defineProperty(process, "platform", platformDescriptor);
+			if (previousAppData === undefined) delete process.env.APPDATA;
+			else process.env.APPDATA = previousAppData;
+			if (previousPath === undefined) delete process.env.PATH;
+			else process.env.PATH = previousPath;
+		}
+	});
+
+	it("falls back to npm when the Windows APPDATA npm root is invalid", async () => {
+		const appData = path.join(tempDir, "appdata-file");
+		const fallbackRoot = path.join(tempDir, "fallback-global-root");
+		const packageRoot = path.join(fallbackRoot, "fallback-global-package");
+		const marker = path.join(tempDir, "npm-called");
+		const binDir = path.join(tempDir, "bin");
+		fs.mkdirSync(path.join(appData, "npm"), { recursive: true });
+		fs.writeFileSync(path.join(appData, "npm", "node_modules"), "not a directory", "utf-8");
+		fs.mkdirSync(binDir, { recursive: true });
+		fs.writeFileSync(
+			path.join(binDir, "npm"),
+			`#!/bin/sh\ntouch "$PI_TEST_NPM_MARKER"\nprintf '%s\\n' "$PI_TEST_FALLBACK_ROOT"\n`,
+			{ encoding: "utf-8", mode: 0o755 },
+		);
+		fs.writeFileSync(
+			path.join(binDir, "npm.cmd"),
+			`@echo off\r\necho called > "%PI_TEST_NPM_MARKER%"\r\necho %PI_TEST_FALLBACK_ROOT%\r\n`,
+			"utf-8",
+		);
+		fs.writeFileSync(
+			path.join(binDir, "cmd.exe"),
+			`#!/bin/sh\nexec sh -c "npm root -g"\n`,
+			{ encoding: "utf-8", mode: 0o755 },
+		);
+		writeSkillFile(path.join(packageRoot, "skills", "fallback-global-skill"), "Use the fallback global skill.");
+		fs.writeFileSync(
+			path.join(packageRoot, "package.json"),
+			JSON.stringify({
+				name: "fallback-global-package",
+				pi: { skills: ["./skills"] },
+				"pi-subagents": { agents: ["./agents"] },
+			}, null, 2),
+			"utf-8",
+		);
+		fs.mkdirSync(path.join(packageRoot, "agents"), { recursive: true });
+		fs.writeFileSync(path.join(packageRoot, "agents", "fallback-global-agent.md"), `---
+name: fallback-global-agent
+description: Loaded from npm fallback global root.
+---
+
+Fallback global agent.
+`, "utf-8");
+
+		const platformDescriptor = Object.getOwnPropertyDescriptor(process, "platform");
+		const previousAppData = process.env.APPDATA;
+		const previousPath = process.env.PATH;
+		const previousComSpec = process.env.ComSpec;
+		const previousMarkerEnv = process.env.PI_TEST_NPM_MARKER;
+		const previousFallbackRootEnv = process.env.PI_TEST_FALLBACK_ROOT;
+		try {
+			Object.defineProperty(process, "platform", { value: "win32" });
+			process.env.APPDATA = appData;
+			process.env.PATH = `${binDir}${path.delimiter}${previousPath ?? ""}`;
+			if (os.platform() !== "win32") process.env.ComSpec = path.join(binDir, "cmd.exe");
+			process.env.PI_TEST_NPM_MARKER = marker;
+			process.env.PI_TEST_FALLBACK_ROOT = fallbackRoot;
+
+			const skills = await importSkillsFresh();
+			assert.ok(skills.discoverAvailableSkills(tempDir).some((skill) => skill.name === "fallback-global-skill"));
+
+			const agents = await importAgentsFresh();
+			assert.ok(agents.discoverAgents(tempDir, "both").agents.some((agent) => agent.name === "fallback-global-agent"));
+			assert.equal(fs.existsSync(marker), true, "npm root -g should run when APPDATA root is invalid");
+		} finally {
+			if (platformDescriptor) Object.defineProperty(process, "platform", platformDescriptor);
+			if (previousAppData === undefined) delete process.env.APPDATA;
+			else process.env.APPDATA = previousAppData;
+			if (previousPath === undefined) delete process.env.PATH;
+			else process.env.PATH = previousPath;
+			if (previousComSpec === undefined) delete process.env.ComSpec;
+			else process.env.ComSpec = previousComSpec;
+			if (previousMarkerEnv === undefined) delete process.env.PI_TEST_NPM_MARKER;
+			else process.env.PI_TEST_NPM_MARKER = previousMarkerEnv;
+			if (previousFallbackRootEnv === undefined) delete process.env.PI_TEST_FALLBACK_ROOT;
+			else process.env.PI_TEST_FALLBACK_ROOT = previousFallbackRootEnv;
+		}
+	});
+
 	it("falls back to the runtime cwd when the execution cwd lacks the skill", () => {
 		const nestedDir = path.join(tempDir, "nested");
 		fs.mkdirSync(nestedDir, { recursive: true });

package/dist/extensions/pi-subagents/test/unit/slash-bridge.test.ts

@@ -51,4 +51,33 @@ describe("slash subagent bridge requester context", () => {
     events.emit(REQUEST, { requestId: "ctx-test", params: { action: "list" }, ctx: requestCtx });
     await done;
   });
+
+  it("rejects removed chain and parallel inputs before executor dispatch", async () => {
+    const events = eventBus();
+    let executeCalls = 0;
+    registerSlashSubagentBridge({
+      events,
+      getContext: () => ({ cwd: "/repo" }) as any,
+      execute: async () => {
+        executeCalls++;
+        return { content: [{ type: "text", text: "unexpected" }], details: { mode: "single", results: [] } } as any;
+      },
+    });
+
+    const done = new Promise<void>((resolve, reject) => {
+      events.on(RESPONSE, (data: any) => {
+        try {
+          assert.equal(data.isError, true);
+          assert.match(data.errorText, /removed.*workflowScript/i);
+          assert.equal(executeCalls, 0);
+          resolve();
+        } catch (error) {
+          reject(error);
+        }
+      });
+    });
+
+    events.emit(REQUEST, { requestId: "legacy-parallel", params: { tasks: [{ agent: "builder", task: "work" }] } });
+    await done;
+  });
 });

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

@@ -42,7 +42,7 @@ describe("async stale-run reconciliation", () => {
 				startedAt: 1000,
 				lastUpdate: 1000,
 				currentStep: 0,
-				steps: [{ agent: "scout", status: "running", startedAt: 1000 }],
+				steps: [{ agent: "explorer", status: "running", startedAt: 1000 }],
 			});
 
 			const result = reconcileAsyncRun(asyncDir, {
@@ -84,7 +84,7 @@ describe("async stale-run reconciliation", () => {
 				startedAt: 1000,
 				lastUpdate: 1000,
 				currentStep: 0,
-				steps: [{ agent: "scout", status: "running", startedAt: 1000 }],
+				steps: [{ agent: "explorer", status: "running", startedAt: 1000 }],
 			});
 			fs.writeFileSync(path.join(asyncDir, "runner.stderr.log"), "startup failed\nmissing peer package\n", "utf-8");
 
@@ -119,7 +119,7 @@ describe("async stale-run reconciliation", () => {
 				startedAt: 1000,
 				lastUpdate: 1000,
 				currentStep: 0,
-				steps: [{ agent: "worker", status: "running", startedAt: 1000 }],
+				steps: [{ agent: "builder", status: "running", startedAt: 1000 }],
 			});
 			fs.mkdirSync(path.join(asyncDir, "events.jsonl"));
 
@@ -153,19 +153,19 @@ describe("async stale-run reconciliation", () => {
 				startedAt: 1000,
 				lastUpdate: 1000,
 				steps: [
-					{ agent: "scout", status: "running", startedAt: 1000, model: "planned-scout", attemptedModels: ["planned-scout"] },
-					{ agent: "worker", status: "running", startedAt: 1100, model: "planned-worker", attemptedModels: ["planned-worker"] },
+					{ agent: "explorer", status: "running", startedAt: 1000, model: "planned-explorer", attemptedModels: ["planned-explorer"] },
+					{ agent: "builder", status: "running", startedAt: 1100, model: "planned-builder", attemptedModels: ["planned-builder"] },
 				],
 			});
-			const scoutSession = path.join(root, "scout.jsonl");
-			const workerSession = path.join(root, "worker.jsonl");
+			const scoutSession = path.join(root, "explorer.jsonl");
+			const workerSession = path.join(root, "builder.jsonl");
 			fs.writeFileSync(path.join(resultsDir, "run-mixed.json"), JSON.stringify({
 				id: "run-mixed",
 				success: false,
 				state: "failed",
 				results: [
-					{ agent: "scout", success: true, sessionFile: scoutSession, model: "fast", attemptedModels: ["planned-scout", "fast"] },
-					{ agent: "worker", success: false, error: "boom", sessionFile: workerSession, model: "careful", attemptedModels: ["planned-worker", "careful"] },
+					{ agent: "explorer", success: true, sessionFile: scoutSession, model: "fast", attemptedModels: ["planned-explorer", "fast"] },
+					{ agent: "builder", success: false, error: "boom", sessionFile: workerSession, model: "careful", attemptedModels: ["planned-builder", "careful"] },
 				],
 			}, null, 2), "utf-8");
 
@@ -180,13 +180,13 @@ describe("async stale-run reconciliation", () => {
 			assert.equal(result.status?.steps?.[0]?.status, "complete");
 			assert.equal(result.status?.steps?.[0]?.exitCode, 0);
 			assert.equal(result.status?.steps?.[0]?.model, "fast");
-			assert.deepEqual(result.status?.steps?.[0]?.attemptedModels, ["planned-scout", "fast"]);
+			assert.deepEqual(result.status?.steps?.[0]?.attemptedModels, ["planned-explorer", "fast"]);
 			assert.equal(result.status?.steps?.[0]?.sessionFile, scoutSession);
 			assert.equal(result.status?.steps?.[1]?.status, "failed");
 			assert.equal(result.status?.steps?.[1]?.exitCode, 1);
 			assert.equal(result.status?.steps?.[1]?.error, "boom");
 			assert.equal(result.status?.steps?.[1]?.model, "careful");
-			assert.deepEqual(result.status?.steps?.[1]?.attemptedModels, ["planned-worker", "careful"]);
+			assert.deepEqual(result.status?.steps?.[1]?.attemptedModels, ["planned-builder", "careful"]);
 			assert.equal(result.status?.steps?.[1]?.sessionFile, workerSession);
 		} finally {
 			fs.rmSync(root, { recursive: true, force: true });
@@ -205,7 +205,7 @@ describe("async stale-run reconciliation", () => {
 				pid: 12345,
 				startedAt: 1000,
 				lastUpdate: 1000,
-				steps: [{ agent: "worker", status: "running", startedAt: 1000 }],
+				steps: [{ agent: "builder", status: "running", startedAt: 1000 }],
 			});
 
 			const result = reconcileAsyncRun(asyncDir, {
@@ -236,7 +236,7 @@ describe("async stale-run reconciliation", () => {
 				pid: 12345,
 				startedAt: 1000,
 				lastUpdate: 1000,
-				steps: [{ agent: "worker", status: "running", startedAt: 1000 }],
+				steps: [{ agent: "builder", status: "running", startedAt: 1000 }],
 			});
 			const resultPath = path.join(resultsDir, "run-result.json");
 			fs.writeFileSync(resultPath, JSON.stringify({ id: "run-result", success: true, state: "complete", summary: "already done" }, null, 2), "utf-8");

package/dist/extensions/pi-subagents/test/unit/steering-action.test.ts

@@ -43,7 +43,7 @@ function runningStatus(runId: string, mode: AsyncStatus["mode"] = "single", coun
 		cwd: os.tmpdir(),
 		startedAt: Date.now(),
 		lastUpdate: Date.now(),
-		steps: Array.from({ length: count }, (_, index) => ({ agent: `worker-${index}`, status: "running" as const, startedAt: Date.now() })),
+		steps: Array.from({ length: count }, (_, index) => ({ agent: `builder-${index}`, status: "running" as const, startedAt: Date.now() })),
 		steering: createSteeringStatus(),
 	};
 }
@@ -83,7 +83,7 @@ function recoveryDescriptor(runId: string): SteeringRecoveryDescriptor {
 	return {
 		version: 1,
 		sourceRunId: runId,
-		agent: "worker-0",
+		agent: "builder-0",
 		cwd: os.tmpdir(),
 		systemPromptMode: "replace",
 		inheritProjectContext: false,

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

@@ -116,7 +116,7 @@ describe("steering lifecycle ledger", () => {
 
 	it("reconstructs the original agent contract without leaking changed current fields", () => {
 		const current = {
-			name: "worker",
+			name: "builder",
 			description: "current",
 			model: "current/model",
 			fallbackModels: ["current/fallback"],
@@ -141,7 +141,7 @@ describe("steering lifecycle ledger", () => {
 		const recovered = applySteeringRecoveryAgentConfig(current, {
 			version: 1,
 			sourceRunId: "source",
-			agent: "worker",
+			agent: "builder",
 			cwd: "/original",
 			model: "original/model",
 			tools: ["read"],

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

@@ -29,7 +29,7 @@ describe("subagent control attention state", () => {
 		const event = buildControlEvent({
 			to: "needs_attention",
 			runId: "run-1",
-			agent: "worker",
+			agent: "builder",
 			index: 2,
 			ts: 1_000,
 			lastActivityAt: 100,
@@ -39,9 +39,9 @@ describe("subagent control attention state", () => {
 			to: "needs_attention",
 			ts: 1_000,
 			runId: "run-1",
-			agent: "worker",
+			agent: "builder",
 			index: 2,
-			message: "worker needs attention (no observed activity for 0s)",
+			message: "builder needs attention (no observed activity for 0s)",
 			reason: "idle",
 			elapsedMs: 900,
 		});
@@ -51,19 +51,19 @@ describe("subagent control attention state", () => {
 		const event = buildControlEvent({
 			to: "needs_attention",
 			runId: "run-1",
-			agent: "worker",
-			message: "worker completed without making edits for an implementation task",
+			agent: "builder",
+			message: "builder completed without making edits for an implementation task",
 		});
 
-		assert.equal(event.message, "worker completed without making edits for an implementation task");
+		assert.equal(event.message, "builder completed without making edits for an implementation task");
 	});
 
 	it("builds terminal completion guard control events", () => {
 		const event = buildControlEvent({
 			to: "needs_attention",
 			runId: "run-1",
-			agent: "worker",
-			message: "worker completed without making edits for an implementation task",
+			agent: "builder",
+			message: "builder completed without making edits for an implementation task",
 			reason: "completion_guard",
 		});
 
@@ -71,8 +71,8 @@ describe("subagent control attention state", () => {
 	});
 
 	it("defaults notifications to active-long-running and needs attention", () => {
-		const event = buildControlEvent({ to: "needs_attention", runId: "run-1", agent: "worker" });
-		const activeEvent = buildControlEvent({ type: "active_long_running", to: "active_long_running", runId: "run-1", agent: "worker" });
+		const event = buildControlEvent({ to: "needs_attention", runId: "run-1", agent: "builder" });
+		const activeEvent = buildControlEvent({ type: "active_long_running", to: "active_long_running", runId: "run-1", agent: "builder" });
 		assert.equal(shouldNotifyControlEvent(config, event), true);
 		assert.equal(shouldNotifyControlEvent(config, activeEvent), true);
 		assert.deepEqual(config.notifyOn, ["active_long_running", "needs_attention"]);
@@ -150,23 +150,23 @@ describe("subagent control attention state", () => {
 			notifyOn: [],
 			notifyChannels: [],
 		});
-		const event = buildControlEvent({ to: "needs_attention", runId: "run-1", agent: "worker" });
+		const event = buildControlEvent({ to: "needs_attention", runId: "run-1", agent: "builder" });
 		assert.deepEqual(custom.notifyOn, []);
 		assert.deepEqual(custom.notifyChannels, []);
 		assert.equal(shouldNotifyControlEvent(custom, event), false);
 	});
 
 	it("formats control notices with a proactive hint and concrete commands", () => {
-		const event = buildControlEvent({ to: "needs_attention", runId: "78f659a3", agent: "worker" });
+		const event = buildControlEvent({ to: "needs_attention", runId: "78f659a3", agent: "builder" });
 
-		const message = formatControlNoticeMessage(event, "subagent-worker-78f659a3");
+		const message = formatControlNoticeMessage(event, "subagent-builder-78f659a3");
 
-		assert.match(message, /Subagent needs attention: worker/);
+		assert.match(message, /Subagent needs attention: builder/);
 		assert.match(message, /Hint: Inspect status first unless the run is clearly blocked/);
 		assert.match(message, /steer for a top-level live async child, routed resume for a live nested child/);
 		assert.match(message, /Top-level live async nudge: subagent\(\{ action: "steer", id: "78f659a3", message: "What are you blocked on\?/);
 		assert.match(message, /Routed live nested nudge: subagent\(\{ action: "resume", id: "78f659a3", message: "What are you blocked on\?/);
-		assert.match(message, /Direct intercom target: subagent-worker-78f659a3/);
+		assert.match(message, /Direct intercom target: subagent-builder-78f659a3/);
 		assert.match(message, /Status: subagent\(\{ action: "status", id: "78f659a3" \}\)/);
 		assert.match(message, /Interrupt: subagent\(\{ action: "interrupt", id: "78f659a3" \}\)/);
 		assert.doesNotMatch(message, /Wait:/);
@@ -176,12 +176,12 @@ describe("subagent control attention state", () => {
 		const event = buildControlEvent({
 			to: "needs_attention",
 			runId: "78f659a3",
-			agent: "worker",
+			agent: "builder",
 			reason: "supervisor_request",
 			currentTool: "contact_supervisor",
 		});
 
-		const message = formatControlNoticeMessage(event, "subagent-worker-78f659a3");
+		const message = formatControlNoticeMessage(event, "subagent-builder-78f659a3");
 
 		assert.match(message, /Supervisor request: reply to the pending request/);
 		assert.match(message, /subagent_supervisor pending/);
@@ -193,7 +193,7 @@ describe("subagent control attention state", () => {
 			type: "active_long_running",
 			to: "active_long_running",
 			runId: "78f659a3",
-			agent: "worker",
+			agent: "builder",
 			turns: 15,
 			tokens: 160000,
 			toolCount: 42,
@@ -202,9 +202,9 @@ describe("subagent control attention state", () => {
 			reason: "turn_threshold",
 		});
 
-		const message = formatControlNoticeMessage(event, "subagent-worker-78f659a3-1");
+		const message = formatControlNoticeMessage(event, "subagent-builder-78f659a3-1");
 
-		assert.match(message, /Subagent active but long-running: worker/);
+		assert.match(message, /Subagent active but long-running: builder/);
 		assert.match(message, /Inspect status/);
 		assert.match(message, /steer for a top-level live async child, routed resume for a live nested child/);
 		assert.match(message, /Top-level live async nudge: subagent\(\{ action: "steer", id: "78f659a3", message: "What are you blocked on\?/);
@@ -219,48 +219,48 @@ describe("subagent control attention state", () => {
 		const event = buildControlEvent({
 			to: "needs_attention",
 			runId: "78f659a3",
-			agent: "worker",
+			agent: "builder",
 			index: 0,
-			message: "worker completed without making edits for an implementation task",
+			message: "builder completed without making edits for an implementation task",
 			reason: "completion_guard",
 		});
 
-		const message = formatControlNoticeMessage(event, "subagent-worker-78f659a3-1");
+		const message = formatControlNoticeMessage(event, "subagent-builder-78f659a3-1");
 
-		assert.match(message, /Subagent failed: worker/);
+		assert.match(message, /Subagent failed: builder/);
 		assert.match(message, /read the output artifact or session/);
-		assert.match(message, /Run intercom target \(may be inactive\): subagent-worker-78f659a3-1/);
+		assert.match(message, /Run intercom target \(may be inactive\): subagent-builder-78f659a3-1/);
 		assert.doesNotMatch(message, /Status:/);
 		assert.doesNotMatch(message, /Interrupt:/);
 		assert.doesNotMatch(message, /What are you blocked on/);
 	});
 
 	it("formats intercom notifications with the same control commands", () => {
-		const event = buildControlEvent({ to: "needs_attention", runId: "78f659a3", agent: "worker" });
+		const event = buildControlEvent({ to: "needs_attention", runId: "78f659a3", agent: "builder" });
 
-		const message = formatControlIntercomMessage(event, "subagent-worker-78f659a3");
+		const message = formatControlIntercomMessage(event, "subagent-builder-78f659a3");
 
-		assert.match(message, /worker needs attention in run 78f659a3/);
+		assert.match(message, /builder needs attention in run 78f659a3/);
 		assert.match(message, /Top-level live async nudge: subagent\(\{ action: "steer", id: "78f659a3", message: "What are you blocked on\?/);
 		assert.match(message, /Routed live nested nudge: subagent\(\{ action: "resume", id: "78f659a3", message: "What are you blocked on\?/);
 	});
 
 	it("dedupes notifications once per child target and attention state", () => {
-		const event = buildControlEvent({ to: "needs_attention", runId: "run-1", agent: "worker", index: 0 });
+		const event = buildControlEvent({ to: "needs_attention", runId: "run-1", agent: "builder", index: 0 });
 		const seen = new Set<string>();
 
-		assert.equal(controlNotificationKey(event, "subagent-worker-run-1-1"), "subagent-worker-run-1-1:needs_attention:idle");
-		assert.equal(claimControlNotification(resolveControlConfig(), event, seen, "subagent-worker-run-1-1"), true);
-		assert.equal(claimControlNotification(resolveControlConfig(), event, seen, "subagent-worker-run-1-1"), false);
+		assert.equal(controlNotificationKey(event, "subagent-builder-run-1-1"), "subagent-builder-run-1-1:needs_attention:idle");
+		assert.equal(claimControlNotification(resolveControlConfig(), event, seen, "subagent-builder-run-1-1"), true);
+		assert.equal(claimControlNotification(resolveControlConfig(), event, seen, "subagent-builder-run-1-1"), false);
 
 		const terminalEvent = buildControlEvent({
 			to: "needs_attention",
 			runId: "run-1",
-			agent: "worker",
+			agent: "builder",
 			index: 0,
-			message: "worker completed without making edits for an implementation task",
+			message: "builder completed without making edits for an implementation task",
 			reason: "completion_guard",
 		});
-		assert.equal(claimControlNotification(resolveControlConfig(), terminalEvent, seen, "subagent-worker-run-1-1"), true);
+		assert.equal(claimControlNotification(resolveControlConfig(), terminalEvent, seen, "subagent-builder-run-1-1"), true);
 	});
 });