@selesai/code 0.8.3 → 0.8.5

package/dist/extensions/pi-subagents/test/integration/async-status.test.ts

@@ -4,20 +4,24 @@ import * as os from "node:os";
 import * as path from "node:path";
 import { describe, it } from "node:test";
 import { formatAsyncRunList, listAsyncRuns } from "../../src/runs/background/async-status.ts";
+import { ACTIVE_RUN_INDEX_DIR, updateActiveRunIndex } from "../../src/runs/background/active-run-index.ts";
+import { claimRunFanoutBatch, createRunFanoutBudget, writeRunFanoutBudgetDescriptor } from "../../src/runs/shared/run-fanout-budget.ts";
 
 function createAsyncDir(root: string, id: string, status: Record<string, unknown>): string {
 	const dir = path.join(root, id);
 	fs.mkdirSync(dir, { recursive: true });
 	fs.writeFileSync(path.join(dir, "status.json"), JSON.stringify(status), "utf-8");
+	if (status.state === "queued" || status.state === "running") updateActiveRunIndex(dir, status.state);
 	return dir;
 }
 
 describe("async status helpers", () => {
 	it("lists only requested states and includes flattened step summaries", () => {
 		const root = fs.mkdtempSync(path.join(os.tmpdir(), "pi-async-status-"));
+		let budgetDirectory: string | undefined;
 		try {
 			const outputFile = path.join(root, "run-a", "output-1.log");
-			createAsyncDir(root, "run-a", {
+			const runDir = createAsyncDir(root, "run-a", {
 				runId: "run-a",
 				mode: "chain",
 				state: "running",
@@ -25,19 +29,24 @@ describe("async status helpers", () => {
 				lastUpdate: 200,
 				cwd: "/repo-a",
 				currentStep: 1,
+				runFanoutBudget: { used: 2, limit: 64, remaining: 62 },
 				outputFile,
 				steps: [
-					{ agent: "explorer", status: "complete", durationMs: 10, description: "Inspect auth only" },
-					{ agent: "builder", status: "running", durationMs: 20, description: "Patch billing only" },
+					{ agent: "scout", status: "complete", durationMs: 10, description: "Inspect auth only" },
+					{ agent: "worker", status: "running", durationMs: 20, description: "Patch billing only" },
 				],
 			});
+			const descriptor = createRunFanoutBudget("run-a", 64);
+			budgetDirectory = descriptor.directory;
+			writeRunFanoutBudgetDescriptor(runDir, descriptor);
+			claimRunFanoutBatch(descriptor, ["chain[0]", "chain[1]", "chain[1]/single"]);
 			createAsyncDir(root, "run-b", {
 				runId: "run-b",
 				mode: "single",
 				state: "complete",
 				startedAt: 50,
 				lastUpdate: 75,
-				steps: [{ agent: "commentator", status: "complete" }],
+				steps: [{ agent: "reviewer", status: "complete" }],
 			});
 
 			const runs = listAsyncRuns(root, { states: ["queued", "running"] });
@@ -45,13 +54,16 @@ describe("async status helpers", () => {
 			assert.equal(runs[0]?.id, "run-a");
 			assert.equal(runs[0]?.cwd, "/repo-a");
 			assert.equal(runs[0]?.steps.length, 2);
-			assert.equal(runs[0]?.steps[1]?.agent, "builder");
+			assert.equal(runs[0]?.steps[1]?.agent, "worker");
 			assert.equal(runs[0]?.steps[1]?.status, "running");
 			assert.equal(runs[0]?.steps[0]?.description, "Inspect auth only");
 			assert.equal(runs[0]?.steps[1]?.description, "Patch billing only");
-			assert.match(formatAsyncRunList(runs), /output: .*output-1\.log/);
+			const text = formatAsyncRunList(runs);
+			assert.match(text, /Run fan-out: 3\/64 used, 61 remaining/);
+			assert.match(text, /output: .*output-1\.log/);
 		} finally {
 			fs.rmSync(root, { recursive: true, force: true });
+			if (budgetDirectory) fs.rmSync(budgetDirectory, { recursive: true, force: true });
 		}
 	});
 
@@ -65,7 +77,7 @@ describe("async status helpers", () => {
 				startedAt: 100,
 				lastUpdate: 200,
 				steps: [{
-					agent: "builder",
+					agent: "worker",
 					status: "complete",
 					agentContract: { version: 1 },
 					execution: { status: "completed", success: true, exitCode: 0 },
@@ -100,7 +112,7 @@ describe("async status helpers", () => {
 				lastUpdate: 200,
 				capabilityCeiling: ceiling,
 				capabilityAudit: audit,
-				steps: [{ agent: "builder", status: "complete", capabilityCeiling: ceiling, capabilityAudit: audit }],
+				steps: [{ agent: "worker", status: "complete", capabilityCeiling: ceiling, capabilityAudit: audit }],
 			});
 
 			const runs = listAsyncRuns(root, { states: ["complete"] });
@@ -123,8 +135,8 @@ describe("async status helpers", () => {
 				startedAt: 100,
 				lastUpdate: 200,
 				steps: [
-					{ agent: "explorer", context: "fresh", status: "running" },
-					{ agent: "builder", context: "fork", status: "running" },
+					{ agent: "scout", context: "fresh", status: "running" },
+					{ agent: "worker", context: "fork", status: "running" },
 				],
 			});
 
@@ -133,8 +145,8 @@ describe("async status helpers", () => {
 			assert.deepEqual(runs[0]?.steps.map((step) => step.context), ["fresh", "fork"]);
 			const text = formatAsyncRunList(runs);
 			assert.match(text, /run-context \| running .* \| parallel \[mixed\]/);
-			assert.match(text, /1\. explorer \[fresh\] \| running/);
-			assert.match(text, /2\. builder \[fork\] \| running/);
+			assert.match(text, /1\. scout \[fresh\] \| running/);
+			assert.match(text, /2\. worker \[fork\] \| running/);
 		} finally {
 			fs.rmSync(root, { recursive: true, force: true });
 		}
@@ -150,16 +162,16 @@ describe("async status helpers", () => {
 				startedAt: 100,
 				lastUpdate: 200,
 				steps: [
-					{ agent: "commentator", status: "running", model: "openai-codex/gpt-5.5:high" },
-					{ agent: "explorer", status: "running", model: "anthropic/claude-haiku-4-5", thinking: "low" },
+					{ agent: "reviewer", status: "running", model: "openai-codex/gpt-5.5:high" },
+					{ agent: "scout", status: "running", model: "anthropic/claude-haiku-4-5", thinking: "low" },
 					{ agent: "local", status: "running", model: "ollama/qwen2.5-coder:7b" },
 					{ agent: "fallback", status: "running", model: "anthropic/claude-sonnet-4-5:low", thinking: "high" },
 				],
 			});
 
 			const text = formatAsyncRunList(listAsyncRuns(root, { states: ["running"] }));
-			assert.match(text, /1\. commentator \| running \| gpt-5\.5 · thinking high/);
-			assert.match(text, /2\. explorer \| running \| claude-haiku-4-5 · thinking low/);
+			assert.match(text, /1\. reviewer \| running \| gpt-5\.5 · thinking high/);
+			assert.match(text, /2\. scout \| running \| claude-haiku-4-5 · thinking low/);
 			assert.match(text, /3\. local \| running \| qwen2\.5-coder:7b(?! · thinking)/);
 			assert.match(text, /4\. fallback \| running \| claude-sonnet-4-5 · thinking low/);
 			assert.doesNotMatch(text, /openai-codex\/gpt-5\.5/);
@@ -181,7 +193,7 @@ describe("async status helpers", () => {
 				lastActivityAt,
 				startedAt: Date.now() - 70_000,
 				lastUpdate: Date.now(),
-				steps: [{ agent: "builder", status: "running", activityState: "needs_attention", lastActivityAt }],
+				steps: [{ agent: "worker", status: "running", activityState: "needs_attention", lastActivityAt }],
 			});
 
 			const runs = listAsyncRuns(root, { states: ["running"] });
@@ -206,7 +218,7 @@ describe("async status helpers", () => {
 				wrapUpRequested: true,
 				turnBudget: { maxTurns: 2, graceTurns: 1, turnCount: 3, outcome: "termination-deferred", wrapUpRequestedAtTurn: 2, terminationDeferredAtTurn: 3 },
 				steps: [{
-					agent: "builder",
+					agent: "worker",
 					status: "running",
 					wrapUpRequested: true,
 					turnBudget: { maxTurns: 2, graceTurns: 1, turnCount: 3, outcome: "termination-deferred", wrapUpRequestedAtTurn: 2, terminationDeferredAtTurn: 3 },
@@ -232,13 +244,35 @@ describe("async status helpers", () => {
 				lastActivityAt: now - 90_000,
 				startedAt: now - 120_000,
 				lastUpdate: now,
-				steps: [{ agent: "builder", status: "running", lastActivityAt: now - 90_000 }],
+				steps: [{ agent: "worker", status: "running", lastActivityAt: now - 90_000 }],
 			});
 
 			const runs = listAsyncRuns(root, { states: ["running"] });
 			assert.equal(runs[0]?.activityState, undefined);
 			assert.equal(runs[0]?.steps[0]?.activityState, undefined);
-			assert.match(formatAsyncRunList(runs, "Active async runs"), /builder \| running \| active/);
+			assert.match(formatAsyncRunList(runs, "Active async runs"), /worker \| running \| active/);
+		} finally {
+			fs.rmSync(root, { recursive: true, force: true });
+		}
+	});
+
+	it("does not infer workflow activity from the workflow launch time", () => {
+		const root = fs.mkdtempSync(path.join(os.tmpdir(), "pi-async-workflow-no-false-activity-"));
+		try {
+			const now = Date.now();
+			createAsyncDir(root, "workflow-running", {
+				runId: "workflow-running",
+				mode: "workflow",
+				state: "running",
+				startedAt: now - 120_000,
+				lastUpdate: now - 120_000,
+				steps: [{ agent: "main", workflowKey: "main", status: "running", startedAt: now - 120_000 }],
+			});
+
+			const runs = listAsyncRuns(root, { states: ["running"] });
+			assert.equal(runs[0]?.lastActivityAt, undefined);
+			assert.equal(runs[0]?.steps[0]?.lastActivityAt, undefined);
+			assert.doesNotMatch(formatAsyncRunList(runs), /active 2m ago/);
 		} finally {
 			fs.rmSync(root, { recursive: true, force: true });
 		}
@@ -283,7 +317,7 @@ describe("async status helpers", () => {
 				startedAt: 100,
 				lastUpdate: 200,
 				endedAt: 200,
-				steps: [{ agent: "builder", status: "complete" }],
+				steps: [{ agent: "worker", status: "complete" }],
 			});
 
 			const runs = listAsyncRuns(root, { states: ["paused"] });
@@ -293,7 +327,7 @@ describe("async status helpers", () => {
 
 			const text = formatAsyncRunList(runs, "Paused async runs");
 			assert.match(text, /run-paused \| paused/);
-			assert.match(text, /builder \| complete/);
+			assert.match(text, /worker \| complete/);
 			assert.doesNotMatch(text, /paused\/paused/);
 		} finally {
 			fs.rmSync(root, { recursive: true, force: true });
@@ -324,7 +358,7 @@ describe("async status helpers", () => {
 				mode: "single",
 				state: "running",
 				startedAt: 100,
-				steps: [{ agent: "builder", status: "running" }],
+				steps: [{ agent: "worker", status: "running" }],
 			});
 
 			assert.throws(
@@ -347,7 +381,7 @@ describe("async status helpers", () => {
 				pid: 12345,
 				startedAt: 100,
 				lastUpdate: 100,
-				steps: [{ agent: "explorer", status: "running", startedAt: 100 }],
+				steps: [{ agent: "scout", status: "running", startedAt: 100 }],
 			});
 
 			const active = listAsyncRuns(root, {
@@ -380,9 +414,9 @@ describe("async status helpers", () => {
 				chainStepCount: 1,
 				parallelGroups: [{ start: 0, count: 3, stepIndex: 0 }],
 				steps: [
-					{ agent: "explorer", status: "running", durationMs: 12_000 },
-					{ agent: "commentator", status: "running", durationMs: 11_000 },
-					{ agent: "builder", status: "pending" },
+					{ agent: "scout", status: "running", durationMs: 12_000 },
+					{ agent: "reviewer", status: "running", durationMs: 11_000 },
+					{ agent: "worker", status: "pending" },
 				],
 			});
 			const text = formatAsyncRunList(listAsyncRuns(root, { states: ["running"] }));
@@ -407,9 +441,9 @@ describe("async status helpers", () => {
 				chainStepCount: 1,
 				parallelGroups: [{ start: 0, count: 3, stepIndex: 0 }],
 				steps: [
-					{ agent: "explorer", status: "failed" },
-					{ agent: "commentator", status: "failed" },
-					{ agent: "builder", status: "paused" },
+					{ agent: "scout", status: "failed" },
+					{ agent: "reviewer", status: "failed" },
+					{ agent: "worker", status: "paused" },
 				],
 			});
 			const text = formatAsyncRunList(listAsyncRuns(root, { states: ["failed"] }));
@@ -433,9 +467,9 @@ describe("async status helpers", () => {
 				chainStepCount: 2,
 				parallelGroups: [{ start: 0, count: 3, stepIndex: 0 }],
 				steps: [
-					{ agent: "explorer", status: "running", durationMs: 12_000 },
-					{ agent: "commentator", status: "running", durationMs: 11_000 },
-					{ agent: "builder", status: "pending" },
+					{ agent: "scout", status: "running", durationMs: 12_000 },
+					{ agent: "reviewer", status: "running", durationMs: 11_000 },
+					{ agent: "worker", status: "pending" },
 					{ agent: "writer", status: "pending" },
 				],
 			});
@@ -459,9 +493,9 @@ describe("async status helpers", () => {
 				chainStepCount: 1,
 				parallelGroups: [{ start: 0, count: 3, stepIndex: 0 }],
 				steps: [
-					{ agent: "explorer", status: "complete", durationMs: 12_000 },
-					{ agent: "commentator", status: "running", durationMs: 11_000 },
-					{ agent: "builder", status: "pending" },
+					{ agent: "scout", status: "complete", durationMs: 12_000 },
+					{ agent: "reviewer", status: "running", durationMs: 11_000 },
+					{ agent: "worker", status: "pending" },
 				],
 			});
 			const text = formatAsyncRunList(listAsyncRuns(root, { states: ["running"] }));
@@ -485,7 +519,7 @@ describe("async status helpers", () => {
 				chainStepCount: 2,
 				parallelGroups: [{ start: 0, count: 3, stepIndex: 4 }, null, "bad"],
 				steps: [
-					{ agent: "explorer", status: "running", durationMs: 12_000 },
+					{ agent: "scout", status: "running", durationMs: 12_000 },
 					{ agent: "writer", status: "pending" },
 				],
 			});
@@ -510,8 +544,8 @@ describe("async status helpers", () => {
 				chainStepCount: 1,
 				parallelGroups: "bad",
 				steps: [
-					{ agent: "explorer", status: "running" },
-					{ agent: "commentator", status: "pending" },
+					{ agent: "scout", status: "running" },
+					{ agent: "reviewer", status: "pending" },
 				],
 			});
 			const text = formatAsyncRunList(listAsyncRuns(root, { states: ["running"] }));
@@ -533,8 +567,8 @@ describe("async status helpers", () => {
 				lastUpdate: 300,
 				currentStep: 0,
 				steps: [
-					{ agent: "explorer", status: "running", durationMs: 12_000 },
-					{ agent: "commentator", status: "pending" },
+					{ agent: "scout", status: "running", durationMs: 12_000 },
+					{ agent: "reviewer", status: "pending" },
 				],
 			});
 			const text = formatAsyncRunList(listAsyncRuns(root, { states: ["running"] }));
@@ -544,32 +578,64 @@ describe("async status helpers", () => {
 		}
 	});
 
-	it("filters terminal runs to active states without scanning nested routes per run", () => {
-		// Regression guard: load-time restoration calls listAsyncRuns with a
-		// queued/running filter over every run dir on disk. The nested-route
-		// lookup must be skipped for runs that fail the state filter, otherwise
-		// session start freezes when many stale run dirs have accumulated.
-		const root = fs.mkdtempSync(path.join(os.tmpdir(), "pi-async-status-filter-"));
+	it("lists indexed active runs without reading historical status files", () => {
+		const root = fs.mkdtempSync(path.join(os.tmpdir(), "pi-async-status-indexed-"));
 		try {
 			for (let i = 0; i < 200; i++) {
-				createAsyncDir(root, `run-${i}`, {
-					runId: `run-${i}`,
+				createAsyncDir(root, `terminal-${i}`, {
+					runId: `terminal-${i}`,
 					mode: "single",
 					state: "complete",
 					startedAt: 100,
-					lastUpdate: 200,
-					steps: [{ agent: "commentator", status: "complete" }],
+					steps: [{ agent: "reviewer", status: "complete" }],
 				});
 			}
+			fs.writeFileSync(path.join(root, "terminal-0", "status.json"), "{not-json", "utf-8");
+			createAsyncDir(root, "active", {
+				runId: "active",
+				mode: "single",
+				state: "running",
+				startedAt: 100,
+				steps: [{ agent: "worker", status: "running" }],
+			});
 
-			const start = Date.now();
-			const runs = listAsyncRuns(root, { states: ["queued", "running"] });
-			const elapsed = Date.now() - start;
+			const runs = listAsyncRuns(root, { states: ["queued", "running"], reconcile: false });
+
+			assert.deepEqual(runs.map((run) => run.id), ["active"]);
+		} finally {
+			fs.rmSync(root, { recursive: true, force: true });
+		}
+	});
 
-			assert.equal(runs.length, 0);
-			// 200 terminal dirs filtered to active states should resolve in well
-			// under a second. The old per-run nested-route scan blew past this.
-			assert.ok(elapsed < 1000, `listAsyncRuns took ${elapsed}ms for 200 terminal runs`);
+	it("keeps terminal active markers until observed process-terminal proof releases them", () => {
+		const root = fs.mkdtempSync(path.join(os.tmpdir(), "pi-async-status-index-prune-"));
+		try {
+			const asyncDir = createAsyncDir(root, "finished", {
+				runId: "finished",
+				mode: "single",
+				state: "complete",
+				startedAt: 100,
+				lastUpdate: 200,
+				displayDismissedAt: 250,
+				processTerminal: { version: 1, state: "unknown", runId: "finished", runnerProcessInstanceId: "runner", reason: "process-tree-unverified" },
+				steps: [{ agent: "worker", status: "complete" }],
+			});
+			updateActiveRunIndex(asyncDir, "running");
+			const markerPath = path.join(root, ACTIVE_RUN_INDEX_DIR, "finished");
+
+			assert.deepEqual(listAsyncRuns(root, { states: ["running"], reconcile: false }), []);
+			assert.equal(fs.existsSync(markerPath), true);
+
+			fs.writeFileSync(path.join(asyncDir, "process-terminal.json"), JSON.stringify({
+				version: 1,
+				state: "observed",
+				runId: "finished",
+				runnerProcessInstanceId: "runner",
+				observedAt: 300,
+				instances: [{ kind: "runner", processInstanceId: "runner", closeObservedAt: 300, exitCode: 0, signal: null }],
+			}), "utf-8");
+			assert.deepEqual(listAsyncRuns(root, { states: ["running"], reconcile: false }), []);
+			assert.equal(fs.existsSync(markerPath), false);
 		} finally {
 			fs.rmSync(root, { recursive: true, force: true });
 		}

package/dist/extensions/pi-subagents/test/integration/chain-clarify.test.ts

@@ -44,14 +44,14 @@ describe("chain clarify model display", { skip: !available ? "pi packages not av
 			{ requestRender() {} },
 			{ fg(_key: string, text: string) { return text; } },
 			[{
-				name: "builder",
+				name: "worker",
 				description: "",
 				systemPrompt: "",
 				systemPromptMode: "replace",
 				inheritProjectContext: false,
 				inheritSkills: false,
 				source: "user",
-				filePath: "builder.md",
+				filePath: "worker.md",
 				model: "gpt-5-mini",
 			}],
 			["Task"],
@@ -79,14 +79,14 @@ describe("chain clarify model display", { skip: !available ? "pi packages not av
 			{ requestRender() {} },
 			{ fg(_key: string, text: string) { return text; } },
 			[{
-				name: "builder",
+				name: "worker",
 				description: "",
 				systemPrompt: "",
 				systemPromptMode: "replace",
 				inheritProjectContext: false,
 				inheritSkills: false,
 				source: "user",
-				filePath: "builder.md",
+				filePath: "worker.md",
 				model: "deepseek-v4-pro",
 			}],
 			["Task"],
@@ -124,14 +124,14 @@ describe("chain clarify model display", { skip: !available ? "pi packages not av
 			{ requestRender() {} },
 			{ fg(_key: string, text: string) { return text; } },
 			[{
-				name: "builder",
+				name: "worker",
 				description: "",
 				systemPrompt: "",
 				systemPromptMode: "replace",
 				inheritProjectContext: false,
 				inheritSkills: false,
 				source: "user",
-				filePath: "builder.md",
+				filePath: "worker.md",
 				model: "openai/gpt-5",
 			}],
 			["Task"],
@@ -155,14 +155,14 @@ describe("chain clarify model display", { skip: !available ? "pi packages not av
 			{ requestRender() {} },
 			{ fg(_key: string, text: string) { return text; } },
 			[{
-				name: "builder",
+				name: "worker",
 				description: "",
 				systemPrompt: "",
 				systemPromptMode: "replace",
 				inheritProjectContext: false,
 				inheritSkills: false,
 				source: "user",
-				filePath: "builder.md",
+				filePath: "worker.md",
 				model: "reasoning-model",
 			}],
 			["Task"],
@@ -194,14 +194,14 @@ describe("chain clarify model display", { skip: !available ? "pi packages not av
 			{ requestRender() {} },
 			{ fg(_key: string, text: string) { return text; } },
 			[{
-				name: "builder",
+				name: "worker",
 				description: "",
 				systemPrompt: "",
 				systemPromptMode: "replace",
 				inheritProjectContext: false,
 				inheritSkills: false,
 				source: "user",
-				filePath: "builder.md",
+				filePath: "worker.md",
 			}],
 			["Task"],
 			"Task",
@@ -232,14 +232,14 @@ describe("chain clarify model display", { skip: !available ? "pi packages not av
 			{ requestRender() {} },
 			{ fg(_key: string, text: string) { return text; } },
 			[{
-				name: "builder",
+				name: "worker",
 				description: "",
 				systemPrompt: "",
 				systemPromptMode: "replace",
 				inheritProjectContext: false,
 				inheritSkills: false,
 				source: "user",
-				filePath: "builder.md",
+				filePath: "worker.md",
 			}],
 			["界".repeat(60)],
 			"Task",
@@ -265,14 +265,14 @@ describe("chain clarify model display", { skip: !available ? "pi packages not av
 			{ requestRender() {} },
 			{ fg(_key: string, text: string) { return text; } },
 			[{
-				name: "builder",
+				name: "worker",
 				description: "",
 				systemPrompt: "",
 				systemPromptMode: "replace",
 				inheritProjectContext: false,
 				inheritSkills: false,
 				source: "user",
-				filePath: "builder.md",
+				filePath: "worker.md",
 				model: "gpt-5-mini",
 			}],
 			["Task"],
@@ -304,7 +304,36 @@ describe("chain clarify model display", { skip: !available ? "pi packages not av
 		assert.equal(component.getEffectiveModel(0), "github-copilot/gpt-5:high");
 	});
 
-	it("labels every shortcut and keeps the clarify overlay within 84 columns", () => {
+	it("renders malformed chain output values without throwing", () => {
+		const component = new ChainClarifyComponent(
+			{ requestRender() {} },
+			{ fg(_key: string, text: string) { return text; } },
+			[{
+				name: "worker",
+				description: "",
+				systemPrompt: "",
+				systemPromptMode: "replace",
+				inheritProjectContext: false,
+				inheritSkills: false,
+				source: "user",
+				filePath: "worker.md",
+			}],
+			["Task"],
+			"Task",
+			undefined,
+			[{ output: true, outputMode: "inline", reads: false, progress: false, skills: [], model: undefined }],
+			[],
+			undefined,
+			[],
+			() => {},
+			"chain",
+		);
+
+		assert.doesNotThrow(() => component.render(84));
+		assert.match(component.render(84).map(stripAnsi).join("\n"), /writes: \(none\)/);
+	});
+
+	it("labels every shortcut and keeps the clarify overlay within its allocated width", () => {
 		for (const mode of ["single", "parallel", "chain"] as const) {
 			const count = mode === "single" ? 1 : mode === "parallel" ? 2 : 4;
 			const component = new ChainClarifyComponent(
@@ -363,6 +392,23 @@ describe("chain clarify model display", { skip: !available ? "pi packages not av
 			for (const line of initialLines) {
 				assert.equal(visibleWidth(line), 84, `${mode} line did not match component width: ${line}`);
 			}
+			for (const width of [0, 1, 2, 3, 74]) {
+				for (const line of component.render(width)) {
+					assert.ok(visibleWidth(line) <= width, `${mode} line exceeded constrained render width: ${visibleWidth(line)} > ${width}`);
+				}
+			}
+
+			if (mode === "single") {
+				component.editingStep = 0;
+				component.enterModelSelector();
+				for (let index = 0; index < 100; index++) component.handleModelSelectorInput("x");
+				for (const width of [0, 1, 2, 3, 74, 84]) {
+					for (const line of component.render(width)) {
+						assert.ok(visibleWidth(line) <= width, `model selector line exceeded component width: ${visibleWidth(line)} > ${width}`);
+					}
+				}
+				component.editingStep = null;
+			}
 
 			component.handleInput("b");
 			assert.match(component.render(84).map(stripAnsi).join("\n"), /\[b\]Background:ON/);
@@ -370,7 +416,7 @@ describe("chain clarify model display", { skip: !available ? "pi packages not av
 	});
 
 	it("navigates non-editing chain steps with j and k", () => {
-		const agents = ["explorer", "builder"].map((name) => ({
+		const agents = ["scout", "worker"].map((name) => ({
 			name,
 			description: "",
 			systemPrompt: "",