@selesai/code 0.8.3 → 0.8.5

package/dist/extensions/pi-subagents/test/unit/render-helpers.test.ts

@@ -61,20 +61,39 @@ test("truncLine respects grapheme display width", () => {
 	assert.equal(visibleWidth(rendered), 5);
 });
 
+test("truncLine emits no marker at zero width", () => {
+	assert.equal(truncLine("abcdef", 0), "");
+});
+
+test("multiline rendering omits two-column graphemes at one-column width", () => {
+	const originalColumns = Object.getOwnPropertyDescriptor(process.stdout, "columns");
+	Object.defineProperty(process.stdout, "columns", { configurable: true, value: 5 });
+	try {
+		const rendered = componentText(renderSubagentResult({
+			content: [{ type: "text", text: "a🙂b\n🙂" }],
+		}, { expanded: true }, theme as any));
+		assert.deepEqual(rendered.split("\n"), ["a", "b"]);
+		for (const line of rendered.split("\n")) assert.ok(visibleWidth(line) <= 1);
+	} finally {
+		if (originalColumns) Object.defineProperty(process.stdout, "columns", originalColumns);
+		else delete (process.stdout as { columns?: number }).columns;
+	}
+});
+
 test("compact chain rendering uses workflow graph spans for dynamic fanout results", () => {
 	const component = renderSubagentResult({
 		content: [{ type: "text", text: "done" }],
 		details: {
 			mode: "chain",
-			chainAgents: ["explorer", "expand:commentator", "writer"],
+			chainAgents: ["scout", "expand:reviewer", "writer"],
 			totalSteps: 3,
-			results: [result("explorer", "targets"), result("commentator", "a"), result("commentator", "b"), result("writer", "final")],
+			results: [result("scout", "targets"), result("reviewer", "a"), result("reviewer", "b"), result("writer", "final")],
 			workflowGraph: {
 				runId: "render-dynamic",
 				mode: "chain",
 				phases: [],
 				nodes: [
-					{ id: "step-0", kind: "step", agent: "explorer", label: "Scout", status: "completed", flatIndex: 0, stepIndex: 0 },
+					{ id: "step-0", kind: "step", agent: "scout", label: "Scout", status: "completed", flatIndex: 0, stepIndex: 0 },
 					{
 						id: "step-1",
 						kind: "dynamic-parallel-group",
@@ -82,8 +101,8 @@ test("compact chain rendering uses workflow graph spans for dynamic fanout resul
 						status: "completed",
 						stepIndex: 1,
 						children: [
-							{ id: "step-1-item-a", kind: "agent", agent: "commentator", label: "Review A", status: "completed", flatIndex: 1, stepIndex: 1 },
-							{ id: "step-1-item-b", kind: "agent", agent: "commentator", label: "Review B", status: "completed", flatIndex: 2, stepIndex: 1 },
+							{ id: "step-1-item-a", kind: "agent", agent: "reviewer", label: "Review A", status: "completed", flatIndex: 1, stepIndex: 1 },
+							{ id: "step-1-item-b", kind: "agent", agent: "reviewer", label: "Review B", status: "completed", flatIndex: 2, stepIndex: 1 },
 						],
 						dynamic: { sourceOutput: "targets", sourcePath: "/items", itemName: "target", collectAs: "reviews" },
 					},
@@ -94,9 +113,9 @@ test("compact chain rendering uses workflow graph spans for dynamic fanout resul
 	}, { expanded: false }, theme as any);
 
 	const text = componentText(component);
-	assert.match(text, /Step 1: explorer/);
-	assert.match(text, /Agent 1\/2: commentator/);
-	assert.match(text, /Agent 2\/2: commentator/);
+	assert.match(text, /Step 1: scout/);
+	assert.match(text, /Agent 1\/2: reviewer/);
+	assert.match(text, /Agent 2\/2: reviewer/);
 	assert.match(text, /Step 3: writer/);
 });
 
@@ -105,15 +124,15 @@ test("compact chain rendering shows failed zero-child dynamic fanout groups", ()
 		content: [{ type: "text", text: "failed" }],
 		details: {
 			mode: "chain",
-			chainAgents: ["explorer", "expand:commentator", "writer"],
+			chainAgents: ["scout", "expand:reviewer", "writer"],
 			totalSteps: 3,
-			results: [result("explorer", "targets")],
+			results: [result("scout", "targets")],
 			workflowGraph: {
 				runId: "render-empty-dynamic-failed",
 				mode: "chain",
 				phases: [],
 				nodes: [
-					{ id: "step-0", kind: "step", agent: "explorer", label: "Scout", status: "completed", flatIndex: 0, stepIndex: 0 },
+					{ id: "step-0", kind: "step", agent: "scout", label: "Scout", status: "completed", flatIndex: 0, stepIndex: 0 },
 					{
 						id: "step-1",
 						kind: "dynamic-parallel-group",
@@ -133,7 +152,7 @@ test("compact chain rendering shows failed zero-child dynamic fanout groups", ()
 	const text = componentText(component);
 	assert.match(text, /step 1\/3/);
 	assert.doesNotMatch(text, /step 3\/3/);
-	assert.match(text, /Step 1: explorer/);
+	assert.match(text, /Step 1: scout/);
 	assert.match(text, /Step 2: Review targets .* failed/);
 	assert.match(text, /No review targets materialized/);
 	assert.match(text, /Step 3: writer .* pending/);
@@ -144,15 +163,15 @@ test("expanded chain rendering uses workflow graph spans for dynamic fanout resu
 		content: [{ type: "text", text: "done" }],
 		details: {
 			mode: "chain",
-			chainAgents: ["explorer", "expand:commentator", "writer"],
+			chainAgents: ["scout", "expand:reviewer", "writer"],
 			totalSteps: 3,
-			results: [result("explorer", "targets"), result("commentator", "a"), result("commentator", "b"), result("writer", "final")],
+			results: [result("scout", "targets"), result("reviewer", "a"), result("reviewer", "b"), result("writer", "final")],
 			workflowGraph: {
 				runId: "render-dynamic-expanded",
 				mode: "chain",
 				phases: [],
 				nodes: [
-					{ id: "step-0", kind: "step", agent: "explorer", label: "Scout", status: "completed", flatIndex: 0, stepIndex: 0 },
+					{ id: "step-0", kind: "step", agent: "scout", label: "Scout", status: "completed", flatIndex: 0, stepIndex: 0 },
 					{
 						id: "step-1",
 						kind: "dynamic-parallel-group",
@@ -160,8 +179,8 @@ test("expanded chain rendering uses workflow graph spans for dynamic fanout resu
 						status: "completed",
 						stepIndex: 1,
 						children: [
-							{ id: "step-1-item-a", kind: "agent", agent: "commentator", label: "Review A", status: "completed", flatIndex: 1, stepIndex: 1 },
-							{ id: "step-1-item-b", kind: "agent", agent: "commentator", label: "Review B", status: "completed", flatIndex: 2, stepIndex: 1 },
+							{ id: "step-1-item-a", kind: "agent", agent: "reviewer", label: "Review A", status: "completed", flatIndex: 1, stepIndex: 1 },
+							{ id: "step-1-item-b", kind: "agent", agent: "reviewer", label: "Review B", status: "completed", flatIndex: 2, stepIndex: 1 },
 						],
 						dynamic: { sourceOutput: "targets", sourcePath: "/items", itemName: "target", collectAs: "reviews" },
 					},
@@ -172,9 +191,9 @@ test("expanded chain rendering uses workflow graph spans for dynamic fanout resu
 	}, { expanded: true }, theme as any);
 
 	const text = componentText(component);
-	assert.match(text, /Step 1: explorer/);
-	assert.match(text, /Agent 1\/2: commentator/);
-	assert.match(text, /Agent 2\/2: commentator/);
+	assert.match(text, /Step 1: scout/);
+	assert.match(text, /Agent 1\/2: reviewer/);
+	assert.match(text, /Agent 2\/2: reviewer/);
 	assert.match(text, /Step 3: writer/);
 });
 
@@ -183,7 +202,7 @@ test("compact multi-result rendering shows total cost in the header", () => {
 		content: [{ type: "text", text: "done" }],
 		details: {
 			mode: "parallel",
-			results: [result("explorer", "a"), result("commentator", "b")],
+			results: [result("scout", "a"), result("reviewer", "b")],
 			totalCost: { inputTokens: 30, outputTokens: 12, costUsd: 0.04 },
 		},
 	}, { expanded: false }, theme as any));
@@ -197,25 +216,25 @@ test("static sequential and static parallel chain rendering keep existing labels
 		content: [{ type: "text", text: "done" }],
 		details: {
 			mode: "chain",
-			chainAgents: ["explorer", "writer"],
+			chainAgents: ["scout", "writer"],
 			totalSteps: 2,
-			results: [result("explorer", "a"), result("writer", "b")],
+			results: [result("scout", "a"), result("writer", "b")],
 		},
 	}, { expanded: false }, theme as any));
-	assert.match(sequential, /Step 1: explorer/);
+	assert.match(sequential, /Step 1: scout/);
 	assert.match(sequential, /Step 2: writer/);
 
 	const parallel = componentText(renderSubagentResult({
 		content: [{ type: "text", text: "done" }],
 		details: {
 			mode: "chain",
-			chainAgents: ["explorer", "[commentator+auditor]", "writer"],
+			chainAgents: ["scout", "[reviewer+auditor]", "writer"],
 			totalSteps: 3,
-			results: [result("explorer", "a"), result("commentator", "b"), result("auditor", "c"), result("writer", "d")],
+			results: [result("scout", "a"), result("reviewer", "b"), result("auditor", "c"), result("writer", "d")],
 		},
 	}, { expanded: false }, theme as any));
-	assert.match(parallel, /Step 1: explorer/);
-	assert.match(parallel, /Agent 1\/2: commentator/);
+	assert.match(parallel, /Step 1: scout/);
+	assert.match(parallel, /Agent 1\/2: reviewer/);
 	assert.match(parallel, /Agent 2\/2: auditor/);
 	assert.match(parallel, /Step 3: writer/);
 });

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

@@ -21,15 +21,15 @@ describe("result intercom formatter", () => {
 			chainSteps: 4,
 			children: [
 				{
-					agent: "commentator-a",
+					agent: "reviewer-a",
 					status: "completed",
 					summary: "Completed checks",
 					artifactPath: "/tmp/a.md",
 					sessionPath: "/tmp/a-session.jsonl",
-					intercomTarget: "subagent-commentator-a-run-123-1",
+					intercomTarget: "subagent-reviewer-a-run-123-1",
 				},
 				{
-					agent: "commentator-b",
+					agent: "reviewer-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\. 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, /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, /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: "builder", status: "completed", summary: "done", sessionPath }],
+				children: [{ agent: "worker", 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: "builder", status: "failed", summary: "failed", sessionPath: path.join(os.tmpdir(), "missing-pi-session.jsonl") }],
+			children: [{ agent: "worker", 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,7 +132,7 @@ describe("result intercom formatter", () => {
 				depth: 1,
 				path: [{ runId: "root-run", stepIndex: 1 }],
 				state: "complete",
-				agent: "commentator",
+				agent: "reviewer",
 				model: "provider/gpt-5.6-luna:medium",
 				thinking: "medium",
 				sessionFile: path.join(os.tmpdir(), "nested-a.jsonl"),
@@ -166,7 +166,7 @@ describe("result intercom formatter", () => {
 		assert.equal(Object.hasOwn(grandchild ?? {}, "controlInbox"), false);
 		assert.equal(Object.hasOwn(grandchild ?? {}, "capabilityToken"), false);
 		assert.match(payload.message, /Nested subagents:/);
-		assert.match(payload.message, /↳ commentator — complete \[nested-a\]/);
+		assert.match(payload.message, /↳ reviewer — complete \[nested-a\]/);
 	});
 
 	it("separates process failure from output presence and gives salvage guidance", () => {
@@ -197,7 +197,7 @@ describe("result intercom formatter", () => {
 			runId: "run-bound",
 			mode: "single",
 			source: "foreground",
-			children: [{ agent: "builder", status: "completed", summary: longSummary }],
+			children: [{ agent: "worker", status: "completed", summary: longSummary }],
 		});
 		assert.equal(payload.children[0]!.summary, longSummary);
 		assert.match(payload.message, new RegExp(`${"x".repeat(2000)}\\n${"y".repeat(2000)}`));
@@ -232,7 +232,7 @@ describe("result intercom formatter", () => {
 		const stripped = stripDetailsOutputsForIntercomReceipt({
 			mode: "single",
 			results: [{
-				agent: "builder",
+				agent: "worker",
 				task: "Task",
 				exitCode: 0,
 				messages: [{ role: "assistant", content: [{ type: "text", text: "full" }] } as never],

package/dist/extensions/pi-subagents/test/unit/retained-children.test.ts

@@ -0,0 +1,57 @@
+import assert from "node:assert/strict";
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { describe, it } from "node:test";
+import { listRetainedChildren } from "../../src/runs/background/retained-children.ts";
+
+function writeRetainedRun(root: string, index: number, sessionId = "parent-a", parentWorkflowRunId: string | null = "workflow-a"): void {
+	const runId = `child-${index}`;
+	const sessionFile = path.join(root, "sessions", `${runId}.jsonl`);
+	fs.mkdirSync(path.dirname(sessionFile), { recursive: true });
+	fs.writeFileSync(sessionFile, "", "utf-8");
+	const asyncDir = path.join(root, "runs", runId);
+	fs.mkdirSync(asyncDir, { recursive: true });
+	fs.writeFileSync(path.join(asyncDir, "status.json"), JSON.stringify({
+		runId,
+		sessionId,
+		mode: "single",
+		state: "complete",
+		startedAt: index,
+		endedAt: 1_000 + index,
+		lastUpdate: 1_000 + index,
+		...(parentWorkflowRunId ? { parentWorkflowRunId } : {}),
+		steps: [{
+			agent: "worker",
+			status: "complete",
+			description: `  Task ${index}  with   spacing ${"x".repeat(140)}  `,
+			endedAt: 1_000 + index,
+			sessionFile,
+			tokens: { input: index, output: index + 1, total: index * 2 + 1 },
+		}],
+	}), "utf-8");
+}
+
+describe("retained child roster", () => {
+	it("returns only the newest 10 completed workflow children owned by the parent session", () => {
+		const root = fs.mkdtempSync(path.join(os.tmpdir(), "pi-retained-children-"));
+		try {
+			for (let index = 0; index < 12; index++) writeRetainedRun(root, index);
+			writeRetainedRun(root, 50, "parent-b");
+			writeRetainedRun(root, 51, "parent-a", null);
+
+			const children = listRetainedChildren(path.join(root, "runs"), "parent-a");
+
+			assert.equal(children.length, 10);
+			assert.deepEqual(children.map((child) => child.runId), Array.from({ length: 10 }, (_, offset) => `child-${11 - offset}`));
+			assert.equal(children[0]?.agent, "worker");
+			assert.equal(children[0]?.completedAt, 1_011);
+			assert.ok((children[0]?.taskSummary.length ?? 0) <= 120);
+			assert.equal(children[0]?.taskSummary.startsWith("Task 11 with spacing"), true);
+			assert.deepEqual(children[0]?.tokenTotals, { input: 11, output: 12, total: 23 });
+			assert.equal(children.some((child) => child.runId === "child-50" || child.runId === "child-51"), false);
+		} finally {
+			fs.rmSync(root, { recursive: true, force: true });
+		}
+	});
+});

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

@@ -146,7 +146,7 @@ describe("subagent extension RPC bridge", () => {
 		assert.deepEqual(executedParams, { action: "status", id: "abc123" });
 		assert.equal((reply as { data: { text?: string } }).data.text, "Run: abc123");
 		assert.deepEqual((reply as { data: { fleet?: unknown } }).data.fleet, {
-			version: 1, entries: [], totalActive: 0, omitted: 0,
+			version: 1, entries: [], totalActive: 0, topLevelAsyncCapacity: { used: 0, limit: 0 }, omitted: 0,
 		});
 
 		bridge.dispose();
@@ -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: "commentator", 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: "reviewer", 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,14 +173,41 @@ 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: "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",
+			key: "fleet-1", agent: "reviewer", role: "opaque label", model: "anthropic/claude-opus-4-8:high", effort: "high",
+			startedAt: 120, tokens: { input: 12, output: 34, total: 46 },
 		});
+		assert.equal(JSON.stringify(fleet).includes("Review the diff"), false);
 		assert.equal(JSON.stringify(fleet).includes("async-private-id"), false);
 		bridge.dispose();
 	});
 
-	it("projects resolved foreground model, effort, split usage, and goal", async () => {
+	it("projects fleet text without control characters or malformed UTF-16", async () => {
+		const events = new FakeEvents();
+		const state = {
+			currentSessionId: "session-123",
+			foregroundControls: new Map(),
+			asyncJobs: new Map([["unicode", {
+				asyncId: "unicode", sessionId: "session-123", status: "running", mode: "single", startedAt: 1,
+				description: "start\n" + "😀".repeat(257),
+				agents: [`worker\ud800broken\udc00${"😀".repeat(45)}`],
+			}]]),
+		} as any;
+		const bridge = registerSubagentRpcBridge({
+			events, getContext: () => ctx("session-123", "session-123"), state,
+			execute: async () => ({ content: [], details: { mode: "management", results: [] } } as any),
+		});
+		const reply = await request(events, "fleet-unicode", "status");
+		const entry = (reply as any).data.fleet.entries[0];
+		const malformedSurrogate = /[\ud800-\udbff](?![\udc00-\udfff])|(?<![\ud800-\udbff])[\udc00-\udfff]/u;
+
+		assert.doesNotMatch(entry.agent, malformedSurrogate);
+		assert.equal(entry.goal, undefined);
+		assert.ok(entry.agent.length <= 96);
+		assert.match(entry.agent, /^worker broken/);
+		bridge.dispose();
+	});
+
+	it("projects resolved foreground model, effort, and split usage without prompt goals", async () => {
 		const events = new FakeEvents();
 		const state = {
 			currentSessionId: "session-123",
@@ -191,7 +218,7 @@ describe("subagent extension RPC bridge", () => {
 				startedAt: 90,
 				activeChildren: new Map([[0, {
 					index: 0,
-					agent: "builder",
+					agent: "worker",
 					description: "Implement the fix",
 					startedAt: 100,
 					updatedAt: 110,
@@ -203,13 +230,14 @@ describe("subagent extension RPC bridge", () => {
 				}]]),
 			}]]),
 			asyncJobs: new Map(),
+			activeAsyncCapacity: { used: 2, limit: 4 },
 		} as any;
 		state.foregroundControls.set("private-old", {
 			runId: "private-old",
 			sessionId: "old-session",
 			mode: "single",
 			startedAt: 50,
-			currentAgent: "commentator",
+			currentAgent: "reviewer",
 			description: "Old work",
 		});
 		const bridge = registerSubagentRpcBridge({
@@ -222,15 +250,15 @@ describe("subagent extension RPC bridge", () => {
 		assert.deepEqual((reply as any).data.fleet, {
 			version: 1,
 			totalActive: 1,
+			topLevelAsyncCapacity: { used: 2, limit: 4 },
 			omitted: 0,
 			entries: [{
 				key: "fleet-1",
-				agent: "builder",
+				agent: "worker",
 				model: "openai/gpt-5.6-terra:high",
 				effort: "high",
 				startedAt: 100,
 				tokens: { input: 321, output: 45, total: 366 },
-				goal: "Implement the fix",
 			}],
 		});
 		assert.equal(JSON.stringify((reply as any).data.fleet).includes("private-run"), false);
@@ -269,7 +297,7 @@ describe("subagent extension RPC bridge", () => {
 				status: "running",
 				mode: "single",
 				startedAt: index + 1,
-				agents: [`builder-${index}`],
+				agents: [`worker-${index}`],
 			});
 		}
 		jobs.set("unattributed", { asyncId: "unattributed", status: "running", mode: "single", startedAt: 20, agents: ["hidden"] });
@@ -300,19 +328,18 @@ describe("subagent extension RPC bridge", () => {
 			execute: async (_id, params) => {
 				executedParams = params;
 				return {
-					content: [{ type: "text", text: "Async: builder [run-1]" }],
+					content: [{ type: "text", text: "Async: worker [run-1]" }],
 					details: { mode: "single", results: [], asyncId: "run-1", asyncDir: "/tmp/run-1" },
 				} as any;
 			},
 		});
 
-		const reply = await request(events, "spawn-1", "spawn", { agent: "builder", task: "Do work" });
+		const reply = await request(events, "spawn-1", "spawn", { workflowScript: "return runs.run('main', { agent: 'worker', task: 'Do work' })" });
 
 		assert.equal(reply.success, true);
-		assert.equal(executedParams.agent, "builder");
-		assert.equal(executedParams.task, "Do work");
+		assert.equal(executedParams.workflowScript, "return runs.run('main', { agent: 'worker', task: 'Do work' })");
 		assert.equal(executedParams.async, true);
-		assert.equal(executedParams.clarify, false);
+		assert.equal("clarify" in executedParams, false);
 		assert.equal((reply as { data: { details?: { asyncId?: string } } }).data.details?.asyncId, "run-1");
 
 		bridge.dispose();
@@ -326,11 +353,11 @@ describe("subagent extension RPC bridge", () => {
 			getContext: () => ctx(),
 			execute: async (_id, params) => {
 				executedParams = params;
-				return { content: [{ type: "text", text: "Async: builder [run-1]" }], details: { mode: "single", results: [] } } as any;
+				return { content: [{ type: "text", text: "Async: worker [run-1]" }], details: { mode: "single", results: [] } } as any;
 			},
 		});
 
-		const reply = await request(events, "spawn-worktree", "spawn", { agent: "builder", task: "Do work", worktree: true });
+		const reply = await request(events, "spawn-worktree", "spawn", { workflowScript: "return runs.run('main', { agent: 'worker', task: 'Do work' })", worktree: true });
 
 		assert.equal(reply.success, true);
 		assert.equal(executedParams.worktree, true);
@@ -338,24 +365,25 @@ describe("subagent extension RPC bridge", () => {
 		bridge.dispose();
 	});
 
-	it("rejects removed top-level chain and parallel spawn inputs", async () => {
+	it("accepts chain, parallel, single, and worktree spawn inputs", async () => {
 		const events = new FakeEvents();
 		let executeCalls = 0;
 		const bridge = registerSubagentRpcBridge({
 			events,
 			getContext: () => ctx(),
-			execute: async () => { executeCalls++; throw new Error("unreachable"); },
+			execute: async () => { executeCalls++; return { content: [], details: { mode: "workflow", results: [] } } as any; },
 		});
 
-		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 });
+		const chainReply = await request(events, "spawn-chain", "spawn", { chain: [{ agent: "worker" }] });
+		const parallelReply = await request(events, "spawn-parallel", "spawn", { tasks: [{ agent: "worker", task: "work" }] });
+		const singleReply = await request(events, "spawn-single", "spawn", { agent: "worker", task: "work" });
+		const worktreeReply = await request(events, "spawn-worktree", "spawn", { worktree: true, workflowScript: "return 1" });
 
-		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);
+		assert.equal(chainReply.success, true);
+		assert.equal(parallelReply.success, true);
+		assert.equal(singleReply.success, true);
+		assert.equal(worktreeReply.success, true);
+		assert.equal(executeCalls, 4);
 		bridge.dispose();
 	});
 
@@ -371,15 +399,19 @@ describe("subagent extension RPC bridge", () => {
 			},
 		});
 
-		const foreground = await request(events, "spawn-foreground", "spawn", { agent: "builder", task: "Do work", async: false });
+		const direct = await request(events, "spawn-direct", "spawn", { agent: "worker", task: "Do work" });
+		const foreground = await request(events, "spawn-foreground", "spawn", { workflowScript: "return runs.run('main', { agent: 'worker' })", async: false });
 		const management = await request(events, "spawn-management", "spawn", { action: "list" });
 
+		assert.equal(direct.success, true);
+		assert.equal(executeCalls, 1);
+
 		assert.equal(foreground.success, false);
 		assert.equal((foreground as { error: { code: string; message: string } }).error.code, "invalid_params");
 		assert.match((foreground as { error: { message: string } }).error.message, /detached async/);
 		assert.equal(management.success, false);
 		assert.match((management as { error: { message: string } }).error.message, /does not accept management/);
-		assert.equal(executeCalls, 0);
+		assert.equal(executeCalls, 1);
 
 		bridge.dispose();
 	});
@@ -403,6 +435,7 @@ describe("subagent extension RPC bridge", () => {
 			id: "abc123",
 			index: 0,
 			message: " Focus on the failing test. ",
+			mode: "follow_up",
 		});
 
 		assert.equal(reply.success, true);
@@ -411,6 +444,7 @@ describe("subagent extension RPC bridge", () => {
 			id: "abc123",
 			index: 0,
 			message: "Focus on the failing test.",
+			mode: "follow_up",
 			steeringRecovery: false,
 		});
 		assert.equal((reply as { data: { text?: string } }).data.text, "Steering delivered.");
@@ -569,7 +603,7 @@ describe("subagent extension RPC bridge", () => {
 				pid: 4242,
 				startedAt: 100,
 				lastUpdate: 100,
-				steps: [{ agent: "builder", status: "running", startedAt: 100 }],
+				steps: [{ agent: "worker", status: "running", startedAt: 100 }],
 			}, null, 2), "utf-8");
 			const bridge = registerSubagentRpcBridge({
 				events,
@@ -594,6 +628,52 @@ describe("subagent extension RPC bridge", () => {
 		}
 	});
 
+	it("rejects stop requests for reload-recovered workflows", async () => {
+		const root = fs.mkdtempSync(path.join(os.tmpdir(), "pi-rpc-stop-workflow-"));
+		try {
+			const events = new FakeEvents();
+			const asyncRoot = path.join(root, "runs");
+			const resultsDir = path.join(root, "results");
+			const asyncDir = path.join(asyncRoot, "workflow-run");
+			let killCalls = 0;
+			fs.mkdirSync(asyncDir, { recursive: true });
+			fs.writeFileSync(path.join(asyncDir, "status.json"), JSON.stringify({
+				runId: "workflow-run",
+				sessionId: "/sessions/parent.jsonl",
+				mode: "workflow",
+				state: "running",
+				pid: 4242,
+				startedAt: 100,
+				lastUpdate: 100,
+				steps: [{ agent: "worker", status: "running", startedAt: 100 }],
+			}, null, 2), "utf-8");
+			const bridge = registerSubagentRpcBridge({
+				events,
+				getContext: () => ctx(),
+				execute: async () => assert.fail("stop should not call executor"),
+				asyncDirRoot: asyncRoot,
+				resultsDir,
+				kill: () => {
+					killCalls++;
+					return true;
+				},
+				now: () => 150,
+			});
+
+			const reply = await request(events, "stop-workflow", "stop", { id: "workflow-run" });
+
+			assert.equal(reply.success, false);
+			assert.equal((reply as { error: { code: string; message: string } }).error.code, "invalid_state");
+			assert.match((reply as { error: { message: string } }).error.message, /reload recovery cannot stop it safely/);
+			assert.equal(fs.existsSync(stopRequestPath(asyncDir)), false);
+			assert.equal(killCalls, 0);
+
+			bridge.dispose();
+		} finally {
+			fs.rmSync(root, { recursive: true, force: true });
+		}
+	});
+
 	it("rejects stop requests for async runs from a different session", async () => {
 		const root = fs.mkdtempSync(path.join(os.tmpdir(), "pi-rpc-stop-session-"));
 		try {
@@ -611,7 +691,7 @@ describe("subagent extension RPC bridge", () => {
 				pid: 4242,
 				startedAt: 100,
 				lastUpdate: 100,
-				steps: [{ agent: "builder", status: "running", startedAt: 100 }],
+				steps: [{ agent: "worker", status: "running", startedAt: 100 }],
 			}, null, 2), "utf-8");
 			const bridge = registerSubagentRpcBridge({
 				events,