@selesai/code 0.8.3 → 0.8.5

package/dist/extensions/pi-subagents/test/integration/detect-error.test.ts

@@ -232,7 +232,7 @@ describe("detectSubagentError", { skip: !available ? "utils not importable" : un
 	// ---- Real-world regression test ----
 
 	it("real-world: 19-read review run with trailing EISDIR", () => {
-		// Simulate the actual _impl-commentator run that produced a false positive
+		// Simulate the actual _impl-reviewer run that produced a false positive
 		const readResults = Array.from({ length: 18 }, (_, i) =>
 			toolResult("read", `contents of file ${i + 1}`),
 		);

package/dist/extensions/pi-subagents/test/integration/external-cli-runner.test.ts

@@ -4,6 +4,7 @@ import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
 import { afterEach, describe, it } from "node:test";
+import { fileURLToPath } from "node:url";
 
 const tempDirs: string[] = [];
 afterEach(() => {
@@ -12,7 +13,7 @@ afterEach(() => {
 
 function runProcess(command: string, args: string[], cwd: string): Promise<number | null> {
 	return new Promise((resolve, reject) => {
-		const child = spawn(command, args, { cwd, stdio: "inherit", shell: false, windowsHide: true });
+		const child = spawn(command, args, { cwd, stdio: "inherit", shell: false });
 		child.once("error", reject);
 		child.once("close", resolve);
 	});
@@ -45,7 +46,8 @@ describe("external CLI async lifecycle", () => {
 			resultMode: "single",
 		}));
 		const repo = path.resolve(import.meta.dirname, "../..");
-		const exitCode = await runProcess(process.execPath, [path.join(repo, "node_modules/jiti/lib/jiti-cli.mjs"), path.join(repo, "src/runs/background/subagent-runner.ts"), configPath], repo);
+		const jitiCli = path.join(path.dirname(fileURLToPath(import.meta.resolve("jiti/package.json"))), "lib", "jiti-cli.mjs");
+		const exitCode = await runProcess(process.execPath, [jitiCli, path.join(repo, "src/runs/background/subagent-runner.ts"), configPath], repo);
 		assert.equal(exitCode, 0);
 		const status = JSON.parse(fs.readFileSync(path.join(asyncDir, "status.json"), "utf-8"));
 		assert.equal(status.state, "complete");

package/dist/extensions/pi-subagents/test/integration/fork-context-execution.test.ts

@@ -5,6 +5,7 @@ import * as path from "node:path";
 import type { MockPi } from "../support/helpers.ts";
 import { createEventBus, createMockPi, createTempDir, events, removeTempDir, tryImport } from "../support/helpers.ts";
 import { discoverAgents } from "../../src/agents/agents.ts";
+import { ACTIVE_ASYNC_CAPACITY_DIR, acquireActiveAsyncCapacity, activeAsyncCapacitySessionKey } from "../../src/runs/background/active-async-capacity.ts";
 import { DEFAULT_FORK_PREAMBLE, INTERCOM_DETACH_REQUEST_EVENT, SUBAGENT_ASYNC_STARTED_EVENT } from "../../src/shared/types.ts";
 
 interface ExecutorModule {
@@ -335,14 +336,14 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 		const { manager, openedPaths, branchedLeafIds } = makeForkingSessionManagerRecorder({ sessionFile: parentSessionFile, leafId: "leaf-current" });
 		const executor = makeExecutorWithDiscoverAgents(() => ({
 			agents: [
-				{ name: "builder", description: "Worker", defaultContext: "fork" },
+				{ name: "worker", description: "Worker", defaultContext: "fork" },
 			],
 			projectAgentsDir: null,
 		}));
 
 		const result = await executor.execute(
 			"id",
-			{ agent: "builder", task: "test" },
+			{ agent: "worker", task: "test" },
 			new AbortController().signal,
 			undefined,
 			makeCtx(manager),
@@ -376,14 +377,14 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 		};
 		const executor = makeExecutorWithDiscoverAgents(() => ({
 			agents: [
-				{ name: "builder", description: "Worker", defaultContext: "fork", model: "anthropic/claude-sonnet-4-5:high", thinking: "high" },
+				{ name: "worker", description: "Worker", defaultContext: "fork", model: "anthropic/claude-sonnet-4-5:high", thinking: "high" },
 			],
 			projectAgentsDir: null,
 		}));
 
 		const result = await executor.execute(
 			"id",
-			{ agent: "builder", task: "test" },
+			{ agent: "worker", task: "test" },
 			new AbortController().signal,
 			undefined,
 			makeCtx(manager),
@@ -433,7 +434,7 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 		};
 		const executor = makeExecutorWithDiscoverAgents(() => ({
 			agents: [
-				{ name: "builder", description: "Worker", defaultContext: "fork", model: "openai/gpt-5-mini:high", fallbackModels: ["anthropic/claude-sonnet-4:low"], thinking: "high" },
+				{ name: "worker", description: "Worker", defaultContext: "fork", model: "openai/gpt-5-mini:high", fallbackModels: ["anthropic/claude-sonnet-4:low"], thinking: "high" },
 			],
 			projectAgentsDir: null,
 		}));
@@ -449,7 +450,7 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 		};
 		const result = await executor.execute(
 			"id",
-			{ agent: "builder", task: "test" },
+			{ agent: "worker", task: "test" },
 			new AbortController().signal,
 			undefined,
 			ctx,
@@ -482,7 +483,7 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 		};
 		const executor = makeExecutorWithDiscoverAgents(() => ({
 			agents: [
-				{ name: "builder", description: "Worker", defaultContext: "fork", model: "openai/gpt-5-mini:high", thinking: "high" },
+				{ name: "worker", description: "Worker", defaultContext: "fork", model: "openai/gpt-5-mini:high", thinking: "high" },
 			],
 			projectAgentsDir: null,
 		}));
@@ -495,7 +496,7 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 		};
 		const result = await executor.execute(
 			"id",
-			{ agent: "builder", task: "test" },
+			{ agent: "worker", task: "test" },
 			new AbortController().signal,
 			undefined,
 			ctx,
@@ -516,7 +517,7 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 		const manager = makeSignedThinkingSessionManager(childSessionFile);
 		const executor = makeExecutorWithDiscoverAgents(() => ({
 			agents: [
-				{ name: "builder", description: "Worker", defaultContext: "fork", model: "openai/gpt-5-mini:high", thinking: "high" },
+				{ name: "worker", description: "Worker", defaultContext: "fork", model: "openai/gpt-5-mini:high", thinking: "high" },
 			],
 			projectAgentsDir: null,
 			modelScope: { enforce: true, allow: ["anthropic/*"] },
@@ -533,7 +534,7 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 		try {
 			const result = await executor.execute(
 				"id",
-				{ agent: "builder", task: "test" },
+				{ agent: "worker", task: "test" },
 				new AbortController().signal,
 				undefined,
 				ctx,
@@ -554,7 +555,7 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 		const manager = makeSignedThinkingSessionManager(childSessionFile);
 		const executor = makeExecutorWithDiscoverAgents(() => ({
 			agents: [
-				{ name: "builder", description: "Worker", defaultContext: "fork", model: "openai/gpt-5-mini", thinking: "high" },
+				{ name: "worker", description: "Worker", defaultContext: "fork", model: "openai/gpt-5-mini", thinking: "high" },
 			],
 			projectAgentsDir: null,
 			modelScope: { enforce: true, allow: ["anthropic/*"] },
@@ -572,7 +573,7 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 			for (const model of ["", "inherit"]) {
 				const result = await executor.execute(
 					"id",
-					{ agent: "builder", task: "test", model },
+					{ agent: "worker", task: "test", model },
 					new AbortController().signal,
 					undefined,
 					ctx,
@@ -612,7 +613,7 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 		};
 		const executor = makeExecutorWithDiscoverAgents(() => ({
 			agents: [
-				{ name: "builder", description: "Worker", defaultContext: "fork", model: "anthropic/claude-sonnet-4-5:high", thinking: "high" },
+				{ name: "worker", description: "Worker", defaultContext: "fork", model: "anthropic/claude-sonnet-4-5:high", thinking: "high" },
 			],
 			projectAgentsDir: null,
 		}));
@@ -625,7 +626,7 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 		};
 		const result = await executor.execute(
 			"id",
-			{ agent: "builder", task: "test" },
+			{ agent: "worker", task: "test" },
 			new AbortController().signal,
 			undefined,
 			ctx,
@@ -633,7 +634,7 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 
 		assert.equal(result.isError, undefined);
 		const text = result.content.filter((block) => block.type === "text").map((block) => block.text).join("\n");
-		assert.equal(text.includes("fork context forced thinking off for builder (child 0)"), true);
+		assert.equal(text.includes("fork context forced thinking off for worker (child 0)"), true);
 	});
 
 	it("resolves inherit before classifying a forked child", async () => {
@@ -641,7 +642,7 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 		const manager = makeSignedThinkingSessionManager(childSessionFile);
 		const executor = makeExecutorWithDiscoverAgents(() => ({
 			agents: [
-				{ name: "builder", description: "Worker", defaultContext: "fork", thinking: "high" },
+				{ name: "worker", description: "Worker", defaultContext: "fork", thinking: "high" },
 			],
 			projectAgentsDir: null,
 		}));
@@ -655,7 +656,7 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 
 		const result = await executor.execute(
 			"id",
-			{ agent: "builder", task: "test", model: "inherit" },
+			{ agent: "worker", task: "test", model: "inherit" },
 			new AbortController().signal,
 			undefined,
 			ctx,
@@ -671,7 +672,7 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 		const manager = makeSignedThinkingSessionManager(childSessionFile);
 		const executor = makeExecutorWithDiscoverAgents(() => ({
 			agents: [
-				{ name: "builder", description: "Worker", defaultContext: "fork", model: "anthropic/claude-sonnet-4-5", thinking: "high" },
+				{ name: "worker", description: "Worker", defaultContext: "fork", model: "anthropic/claude-sonnet-4-5", thinking: "high" },
 			],
 			projectAgentsDir: null,
 		}));
@@ -688,7 +689,7 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 
 		const result = await executor.execute(
 			"id",
-			{ tasks: [{ agent: "builder", task: "test", model: "" }] },
+			{ tasks: [{ agent: "worker", task: "test", model: "" }] },
 			new AbortController().signal,
 			undefined,
 			ctx,
@@ -706,7 +707,7 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 		const manager = makeSignedThinkingSessionManager(childSessionFile);
 		const executor = makeExecutorWithDiscoverAgents(() => ({
 			agents: [
-				{ name: "builder", description: "Worker", defaultContext: "fork", model: "openai/gpt-5-mini", thinking: "high" },
+				{ name: "worker", description: "Worker", defaultContext: "fork", model: "openai/gpt-5-mini", thinking: "high" },
 			],
 			projectAgentsDir: null,
 		}));
@@ -719,7 +720,7 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 
 		const result = await executor.execute(
 			"id",
-			{ tasks: [{ agent: "builder", task: "test", model: "" }] },
+			{ tasks: [{ agent: "worker", task: "test", model: "" }] },
 			new AbortController().signal,
 			undefined,
 			ctx,
@@ -737,7 +738,7 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 		const manager = makeSignedThinkingSessionManager(childSessionFile);
 		const executor = makeExecutorWithDiscoverAgents(() => ({
 			agents: [
-				{ name: "builder", description: "Worker", defaultContext: "fork", model: "anthropic/claude-sonnet-4-5:high", thinking: "high" },
+				{ name: "worker", description: "Worker", defaultContext: "fork", model: "anthropic/claude-sonnet-4-5:high", thinking: "high" },
 			],
 			projectAgentsDir: null,
 		}));
@@ -763,7 +764,7 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 
 		const result = await executor.execute(
 			"id",
-			{ agent: "builder", task: "test", clarify: true },
+			{ agent: "worker", task: "test", clarify: true },
 			new AbortController().signal,
 			undefined,
 			ctx,
@@ -783,7 +784,7 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 		const manager = makeSignedThinkingSessionManager(childSessionFile);
 		const executor = makeExecutorWithDiscoverAgents(() => ({
 			agents: [
-				{ name: "builder", description: "Worker", defaultContext: "fork", model: "anthropic/claude-sonnet-4-5:high", thinking: "high" },
+				{ name: "worker", description: "Worker", defaultContext: "fork", model: "anthropic/claude-sonnet-4-5:high", thinking: "high" },
 			],
 			projectAgentsDir: null,
 		}));
@@ -796,7 +797,7 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 
 		const result = await executor.execute(
 			"id",
-			{ agent: "builder", task: "test" },
+			{ agent: "worker", task: "test" },
 			new AbortController().signal,
 			undefined,
 			ctx,
@@ -804,7 +805,7 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 
 		assert.equal(result.isError, true);
 		const text = result.content.filter((block) => block.text).map((block) => block.text).join("\n");
-		assert.equal(text.includes("fork context forced thinking off for builder (child 0)"), true);
+		assert.equal(text.includes("fork context forced thinking off for worker (child 0)"), true);
 	});
 
 	it("keeps default-fork context on run-path errors", async () => {
@@ -812,7 +813,7 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 		const { manager } = makeForkingSessionManagerRecorder({ sessionFile: parentSessionFile, leafId: "leaf-current" });
 		const executor = makeExecutorWithDiscoverAgents(() => ({
 			agents: [
-				{ name: "builder", description: "Worker", defaultContext: "fork" },
+				{ name: "worker", description: "Worker", defaultContext: "fork" },
 			],
 			projectAgentsDir: null,
 		}));
@@ -824,7 +825,7 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 
 		const result = await executor.execute(
 			"id",
-			{ agent: "builder" },
+			{ agent: "worker" },
 			new AbortController().signal,
 			undefined,
 			ctx,
@@ -840,14 +841,14 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 		const { manager, openedPaths, branchedLeafIds } = makeForkingSessionManagerRecorder({ sessionFile: parentSessionFile, leafId: "leaf-current" });
 		const executor = makeExecutorWithDiscoverAgents(() => ({
 			agents: [
-				{ name: "commentator", description: "Oracle", defaultContext: "fork" },
+				{ name: "oracle", description: "Oracle", defaultContext: "fork" },
 			],
 			projectAgentsDir: null,
 		}));
 
 		const result = await executor.execute(
 			"id",
-			{ agent: "commentator", task: "test", context: "fresh" },
+			{ agent: "oracle", task: "test", context: "fresh" },
 			new AbortController().signal,
 			undefined,
 			makeCtx(manager),
@@ -866,7 +867,7 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 		const { manager, openedPaths, branchedLeafIds } = makeForkingSessionManagerRecorder({ sessionFile: parentSessionFile, leafId: "leaf-current" });
 		const executor = makeExecutorWithDiscoverAgents(() => ({
 			agents: [
-				{ name: "builder", description: "Worker", defaultContext: "fork" },
+				{ name: "worker", description: "Worker", defaultContext: "fork" },
 				{ name: "second", description: "Second" },
 			],
 			projectAgentsDir: null,
@@ -874,7 +875,7 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 
 		const result = await executor.execute(
 			"id",
-			{ tasks: [{ agent: "builder", task: "one" }, { agent: "second", task: "two" }] },
+			{ tasks: [{ agent: "worker", task: "one" }, { agent: "second", task: "two" }] },
 			new AbortController().signal,
 			undefined,
 			makeCtx(manager),
@@ -898,7 +899,7 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 		const { manager, openedPaths } = makeForkingSessionManagerRecorder({ sessionFile: parentSessionFile, leafId: "leaf-current" });
 		const executor = makeExecutorWithDiscoverAgents(() => ({
 			agents: [
-				{ name: "builder", description: "Worker", defaultContext: "fork" },
+				{ name: "worker", description: "Worker", defaultContext: "fork" },
 				{ name: "second", description: "Second" },
 			],
 			projectAgentsDir: null,
@@ -906,7 +907,7 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 
 		const result = await executor.execute(
 			"id",
-			{ tasks: [{ agent: "builder", task: "one" }, { agent: "second", task: "two" }], context: "fresh" },
+			{ tasks: [{ agent: "worker", task: "one" }, { agent: "second", task: "two" }], context: "fresh" },
 			new AbortController().signal,
 			undefined,
 			makeCtx(manager),
@@ -924,14 +925,14 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 		const executor = makeExecutorWithDiscoverAgents(() => ({
 			agents: [
 				{ name: "echo", description: "Echo" },
-				{ name: "builder", description: "Worker", defaultContext: "fork" },
+				{ name: "worker", description: "Worker", defaultContext: "fork" },
 			],
 			projectAgentsDir: null,
 		}));
 
 		const result = await executor.execute(
 			"id",
-			{ chain: [{ agent: "echo", task: "scan" }, { agent: "builder", task: "write" }], clarify: false },
+			{ chain: [{ agent: "echo", task: "scan" }, { agent: "worker", task: "write" }], clarify: false },
 			new AbortController().signal,
 			undefined,
 			makeCtx(manager),
@@ -965,15 +966,15 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 		};
 		const executor = makeExecutorWithDiscoverAgents(() => ({
 			agents: [
-				{ name: "explorer", description: "Scout", defaultContext: "fresh" },
-				{ name: "builder", description: "Worker", defaultContext: "fork" },
+				{ name: "scout", description: "Scout", defaultContext: "fresh" },
+				{ name: "worker", description: "Worker", defaultContext: "fork" },
 			],
 			projectAgentsDir: null,
 		}));
 
 		const result = await executor.execute(
 			"id",
-			{ tasks: [{ agent: "explorer", task: "scan" }, { agent: "builder", task: "write" }] },
+			{ tasks: [{ agent: "scout", task: "scan" }, { agent: "worker", task: "write" }] },
 			new AbortController().signal,
 			undefined,
 			makeCtx(manager),
@@ -1000,8 +1001,8 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 		};
 		const executor = makeExecutorWithDiscoverAgents(() => ({
 			agents: [
-				{ name: "explorer", description: "Scout", defaultContext: "fresh" },
-				{ name: "builder", description: "Worker", defaultContext: "fork" },
+				{ name: "scout", description: "Scout", defaultContext: "fresh" },
+				{ name: "worker", description: "Worker", defaultContext: "fork" },
 			],
 			projectAgentsDir: null,
 		}));
@@ -1010,11 +1011,11 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 			"id",
 			{
 				chain: [
-					{ agent: "explorer", task: "scan" },
-					{ agent: "builder", task: "write" },
+					{ agent: "scout", task: "scan" },
+					{ agent: "worker", task: "write" },
 					{
 						expand: { from: { output: "items", path: "$" } },
-						parallel: { agent: "explorer", task: "inspect item" },
+						parallel: { agent: "scout", task: "inspect item" },
 						collect: { as: "inspections" },
 					},
 				],
@@ -1041,7 +1042,7 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 		const executor = makeExecutorWithDiscoverAgents(() => ({
 			agents: [
 				{ name: "producer", description: "Producer", defaultContext: "fresh" },
-				{ name: "builder", description: "Worker", defaultContext: "fork" },
+				{ name: "worker", description: "Worker", defaultContext: "fork" },
 			],
 			projectAgentsDir: null,
 		}));
@@ -1053,10 +1054,10 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 					{ agent: "producer", task: "produce", as: "items", outputSchema: { type: "object" } },
 					{
 						expand: { from: { output: "items", path: "/items" }, item: "item", key: "/id", maxItems: 3 },
-						parallel: { agent: "builder", task: "inspect {item.id}" },
+						parallel: { agent: "worker", task: "inspect {item.id}" },
 						collect: { as: "inspections" },
 					},
-					{ agent: "builder", task: "final" },
+					{ agent: "worker", task: "final" },
 				],
 				clarify: false,
 			},
@@ -1074,13 +1075,13 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 	it("reports unknown top-level parallel agents before default-fork preconditions", async () => {
 		const { manager } = makeSessionManagerRecorder({ sessionFile: undefined, leafId: "leaf-current" });
 		const executor = makeExecutorWithDiscoverAgents(() => ({
-			agents: [{ name: "builder", description: "Worker", defaultContext: "fork" }],
+			agents: [{ name: "worker", description: "Worker", defaultContext: "fork" }],
 			projectAgentsDir: null,
 		}));
 
 		const result = await executor.execute(
 			"id",
-			{ tasks: [{ agent: "builder", task: "one" }, { agent: "missing", task: "two" }] },
+			{ tasks: [{ agent: "worker", task: "one" }, { agent: "missing", task: "two" }] },
 			new AbortController().signal,
 			undefined,
 			makeCtx(manager),
@@ -1446,7 +1447,7 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 
 	it("keeps inherited model-scope warnings non-fatal in async parallel conversion", { skip: !asyncAvailable ? "jiti not available" : undefined }, async () => {
 		const executor = makeExecutorWithDiscoverAgents(() => ({
-			agents: [{ name: "builder", description: "Worker", model: "openai/gpt-5-mini" }],
+			agents: [{ name: "worker", description: "Worker", model: "openai/gpt-5-mini" }],
 			projectAgentsDir: null,
 			modelScope: { enforce: true, allow: ["anthropic/*"] },
 		}));
@@ -1462,7 +1463,7 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 		try {
 			const result = await executor.execute(
 				"id",
-				{ tasks: [{ agent: "builder", task: "test" }], async: true },
+				{ tasks: [{ agent: "worker", task: "test" }], async: true },
 				new AbortController().signal,
 				undefined,
 				ctx,
@@ -1478,7 +1479,7 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 
 	it("keeps inherited model-scope warnings non-fatal after Clarify switches parallel work to background", { skip: !asyncAvailable ? "jiti not available" : undefined }, async () => {
 		const executor = makeExecutorWithDiscoverAgents(() => ({
-			agents: [{ name: "builder", description: "Worker", model: "openai/gpt-5-mini" }],
+			agents: [{ name: "worker", description: "Worker", model: "openai/gpt-5-mini" }],
 			projectAgentsDir: null,
 			modelScope: { enforce: true, allow: ["anthropic/*"] },
 		}));
@@ -1503,7 +1504,7 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 		try {
 			const result = await executor.execute(
 				"id",
-				{ tasks: [{ agent: "builder", task: "test" }], clarify: true },
+				{ tasks: [{ agent: "worker", task: "test" }], clarify: true },
 				new AbortController().signal,
 				undefined,
 				ctx,
@@ -1523,6 +1524,7 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 		const rawParallelChainGoal = "Parallel chain first child raw goal";
 		const paddedWorkflowGoal = "  preserve this workflow padding  ";
 		const literalPreambleGoal = `${DEFAULT_FORK_PREAMBLE}\n\nTask:\nliteral fresh-context text`;
+		const redactedGoal = "[prompt redacted]";
 		const executor = makeExecutorWithDiscoverAgents(() => ({
 			agents: [
 				{ name: "echo", description: "Echo", defaultContext: "fork" },
@@ -1576,13 +1578,91 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 			assert.ok(result.details?.asyncId, `${testCase.name}: expected an async id`);
 			const event = started.find((entry) => entry.id === result.details?.asyncId);
 			assert.ok(event, `${testCase.name}: missing async-started event for ${result.details?.asyncId}`);
-			assert.equal(event.goal, testCase.goal, testCase.name);
+			assert.equal(event.goal, redactedGoal, testCase.name);
 			if (!("allowsLiteralPreamble" in testCase)) {
 				assert.doesNotMatch(event.goal ?? "", /delegated subagent running from a fork/, testCase.name);
+				assert.notEqual(event.goal, testCase.goal, testCase.name);
 			}
 		}
 	});
 
+	it("rejects Clarify background switches over the active async capacity cap", { skip: !asyncAvailable ? "jiti not available" : undefined }, async () => {
+		const previousDepth = process.env.SELESAI_SUBAGENT_DEPTH;
+		process.env.SELESAI_SUBAGENT_DEPTH = "0";
+		try {
+			for (const testCase of [
+				{
+					name: "single",
+					mode: "single",
+					params: { agent: "echo", task: "Original single", async: true, clarify: true },
+					templates: ["Edited single"],
+				},
+				{
+					name: "parallel",
+					mode: "parallel",
+					params: { tasks: [{ agent: "echo", task: "Original parallel" }, { agent: "second", task: "Second child" }], async: true, clarify: true },
+					templates: ["Edited parallel", "Second child"],
+				},
+				{
+					name: "chain",
+					mode: "chain",
+					params: { chain: [{ agent: "echo", task: "Original chain" }], async: true, clarify: true },
+					templates: ["Edited chain"],
+				},
+			] as const) {
+				const sessionId = `session-clarify-cap-${testCase.name}-${Date.now()}`;
+				const sessionCapacityDir = path.join(ACTIVE_ASYNC_CAPACITY_DIR, activeAsyncCapacitySessionKey(sessionId));
+				fs.rmSync(sessionCapacityDir, { recursive: true, force: true });
+				const held = acquireActiveAsyncCapacity({
+					sessionId,
+					limit: 1,
+					runId: `held-${testCase.name}`,
+					kind: "runner",
+					asyncDir: path.join(tempDir, `held-${testCase.name}`),
+				});
+				held?.markStarted(`held-runner-${testCase.name}`);
+				try {
+					const executor = makeExecutorWithConfig({ maxActiveAsyncRunsPerSession: 1 });
+					const manager = {
+						...makeSessionManagerRecorder().manager,
+						getSessionId: () => sessionId,
+					};
+					const ctx = {
+						...makeCtx(manager),
+						hasUI: true,
+						ui: {
+							custom: async () => ({
+								confirmed: true,
+								templates: testCase.templates,
+								behaviorOverrides: testCase.templates.map(() => undefined),
+								runInBackground: true,
+							}),
+						},
+					};
+
+					const result = await executor.execute(
+						`clarify-cap-${testCase.name}`,
+						testCase.params,
+						new AbortController().signal,
+						undefined,
+						ctx,
+					);
+
+					assert.equal(result.isError, true, testCase.name);
+					assert.equal(result.details?.mode, testCase.mode, testCase.name);
+					assert.equal(result.details?.asyncId, undefined, testCase.name);
+					assert.match(result.content[0]?.text ?? "", /Active async run capacity exhausted: 1\/1 used/, testCase.name);
+					assert.equal(mockPi.callCount(), 0, testCase.name);
+				} finally {
+					fs.rmSync(sessionCapacityDir, { recursive: true, force: true });
+				}
+			}
+		} finally {
+			if (previousDepth === undefined) delete process.env.SELESAI_SUBAGENT_DEPTH;
+			else process.env.SELESAI_SUBAGENT_DEPTH = previousDepth;
+		}
+	});
+
 	it("uses edited raw goals when clarification switches each mode to background", { skip: !asyncAvailable ? "jiti not available" : undefined }, async () => {
 		const executor = makeExecutorWithDiscoverAgents(() => ({
 			agents: [
@@ -1640,7 +1720,8 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 			assert.equal(result.isError, undefined, testCase.name);
 			assert.ok(result.details?.asyncId, `${testCase.name}: expected an async id`);
 			const event = started.find((entry) => entry.id === result.details?.asyncId);
-			assert.equal(event?.goal, testCase.goal, testCase.name);
+			assert.equal(event?.goal, "[prompt redacted]", testCase.name);
+			assert.notEqual(event?.goal, testCase.goal, testCase.name);
 			assert.doesNotMatch(event?.goal ?? "", /delegated subagent running from a fork/, testCase.name);
 		}
 	});
@@ -1863,14 +1944,14 @@ describe("fork context execution wiring", { skip: !available ? "subagent executo
 		process.env.USERPROFILE = tempHome;
 		const worktreeDir = path.join(tempDir, "worktree");
 		fs.mkdirSync(worktreeDir, { recursive: true });
-		writeProjectOverride(tempDir, "commentator", "openai/gpt-5-main");
-		writeProjectOverride(worktreeDir, "commentator", "openai/gpt-5-worktree");
+		writeProjectOverride(tempDir, "reviewer", "openai/gpt-5-main");
+		writeProjectOverride(worktreeDir, "reviewer", "openai/gpt-5-worktree");
 		const executor = makeExecutor();
 
 		try {
 			const result = await executor.execute(
 				"id",
-				{ action: "get", agent: "commentator", cwd: "worktree" },
+				{ action: "get", agent: "reviewer", cwd: "worktree" },
 				new AbortController().signal,
 				undefined,
 				makeCtx(makeSessionManagerRecorder().manager),