gsd-pi 2.79.0-dev.ece5fd8ba → 2.80.0-dev.4ea7d80e7

package/packages/pi-coding-agent/src/core/chat-controller-ordering.test.ts

@@ -1002,6 +1002,93 @@ test("chat-controller does not pin when there are no tool calls", async () => {
 	assert.equal(host.pinnedMessageContainer.children.length, 0, "pinned zone should stay empty without tool calls");
 });
 
+test("chat-controller rolls up only contiguous low-signal tool runs on message_end", async () => {
+	(globalThis as any)[Symbol.for("@gsd/pi-coding-agent:theme")] = {
+		fg: (_key: string, text: string) => text,
+		bg: (_key: string, text: string) => text,
+		bold: (text: string) => text,
+		italic: (text: string) => text,
+		truncate: (text: string) => text,
+	};
+
+	const host = createHost();
+	host.getMarkdownThemeWithSettings = () => ({});
+
+	const t1 = { type: "toolCall", id: "t1", name: "bash", arguments: { command: "true" } };
+	const t2 = { type: "toolCall", id: "t2", name: "bash", arguments: { command: "true" } };
+	const text = { type: "text", text: "middle output" };
+	const t3 = { type: "toolCall", id: "t3", name: "read", arguments: { path: "/tmp/a" } };
+	const t4 = { type: "toolCall", id: "t4", name: "read", arguments: { path: "/tmp/b" } };
+	const content = [t1, t2, text, t3, t4];
+
+	await handleAgentEvent(host, { type: "message_start", message: makeAssistant([]) } as any);
+	await handleAgentEvent(host, {
+		type: "message_update",
+		message: makeAssistant(content),
+		assistantMessageEvent: {
+			type: "text_delta",
+			contentIndex: 2,
+			delta: text.text,
+			partial: makeAssistant(content),
+		},
+	} as any);
+
+	for (const tool of [t1, t2, t3, t4]) {
+		await handleAgentEvent(host, {
+			type: "tool_execution_end",
+			toolCallId: tool.id,
+			isError: false,
+			result: { content: [], details: {} },
+		} as any);
+	}
+
+	await handleAgentEvent(host, { type: "message_end", message: makeAssistant(content) } as any);
+
+	assert.equal(host.chatContainer.children.length, 3, "two separated tool runs should become two summaries around text");
+	assert.equal(host.chatContainer.children[0]?.constructor?.name, "ToolPhaseSummaryComponent");
+	assert.equal(host.chatContainer.children[1]?.constructor?.name, "AssistantMessageComponent");
+	assert.equal(host.chatContainer.children[2]?.constructor?.name, "ToolPhaseSummaryComponent");
+	assert.match(host.chatContainer.children[0].render(120).join("\n"), /Setup \/ shell 2 actions/);
+	assert.match(host.chatContainer.children[2].render(120).join("\n"), /Context reads 2 actions/);
+	assert.equal(host.chatContainer._prevRender, null, "summary reposition must invalidate the chat container render cache");
+});
+
+test("chat-controller rolls up low-signal direct tool execution events on agent_end", async () => {
+	(globalThis as any)[Symbol.for("@gsd/pi-coding-agent:theme")] = {
+		fg: (_key: string, text: string) => text,
+		bg: (_key: string, text: string) => text,
+		bold: (text: string) => text,
+		italic: (text: string) => text,
+		truncate: (text: string) => text,
+	};
+
+	const host = createHost();
+	host.getMarkdownThemeWithSettings = () => ({});
+
+	for (const toolCallId of ["bash-1", "bash-2", "bash-3"]) {
+		await handleAgentEvent(host, {
+			type: "tool_execution_start",
+			toolCallId,
+			toolName: "bash",
+			args: { command: "true" },
+		} as any);
+		await handleAgentEvent(host, {
+			type: "tool_execution_end",
+			toolCallId,
+			isError: false,
+			result: { content: [], details: {} },
+		} as any);
+	}
+
+	assert.equal(host.chatContainer.children.length, 3, "direct tool events render as individual rows while running");
+
+	await handleAgentEvent(host, { type: "agent_end" } as any);
+
+	assert.equal(host.chatContainer.children.length, 1, "direct low-signal tool rows should roll up on agent_end");
+	assert.equal(host.chatContainer.children[0]?.constructor?.name, "ToolPhaseSummaryComponent");
+	assert.match(host.chatContainer.children[0].render(120).join("\n"), /Setup \/ shell 3 actions/);
+});
+
 // Regression test for issue #4144: interleaved text/tool content must render in content[] index order.
 // Stream: [text "A", toolCall T1, text "B", toolCall T2, text "C"]
 // Expected chatContainer order: textRun(A), toolExec(T1), textRun(B), toolExec(T2), textRun(C)

package/packages/pi-coding-agent/src/core/extensions/runner.test.ts

@@ -102,6 +102,60 @@ describe("ExtensionRunner.emitToolCall", () => {
 		assert.equal(errors[0].event, "tool_call");
 		assert.equal(errors[0].extensionPath, "/test/throwing-ext");
 	});
+
+	it("preserves shutdown in tool_call handler context", async (t) => {
+		const dir = mkdtempSync(join(tmpdir(), "runner-test-"));
+		t.after(() => {
+			rmSync(dir, { recursive: true, force: true });
+		});
+
+		const sessionManager = SessionManager.create(dir, dir);
+		const authStorage = AuthStorage.create();
+		const modelRegistry = new ModelRegistry(authStorage, join(dir, "models.json"));
+		const runtime = makeMinimalRuntime();
+		let shutdownCount = 0;
+		const handlers = new Map();
+		handlers.set("tool_call", [
+			async (_event: unknown, ctx: { shutdown: () => void }) => {
+				ctx.shutdown();
+			},
+		]);
+		const extension = {
+			path: "/test/shutdown-on-tool-call",
+			handlers,
+			commands: new Map(),
+			shortcuts: new Map(),
+			tools: new Map(),
+			flags: new Map(),
+			diagnostics: [],
+		} as unknown as Extension;
+		const runner = new ExtensionRunner([extension], runtime, dir, sessionManager, modelRegistry);
+		runner.bindCore({} as any, {
+			getModel: () => undefined,
+			isIdle: () => true,
+			abort: () => {},
+			hasPendingMessages: () => false,
+			shutdown: () => {
+				shutdownCount += 1;
+			},
+			getContextUsage: () => undefined,
+			compact: () => {},
+			getSystemPrompt: () => "",
+		});
+
+		const errors: any[] = [];
+		runner.onError((err) => errors.push(err));
+
+		await runner.emitToolCall({
+			type: "tool_call",
+			toolCallId: "test-123",
+			toolName: "test_tool",
+			input: {},
+		} as ToolCallEvent);
+
+		assert.equal(shutdownCount, 1);
+		assert.equal(errors.length, 0);
+	});
 });
 
 describe("ExtensionRunner.createContext", () => {
@@ -127,6 +181,60 @@ describe("ExtensionRunner.createContext", () => {
 		assert.equal(runner.createContext().cwd, realProjectDir);
 		assert.equal(runner.createCommandContext().cwd, realProjectDir);
 	});
+
+	it("does not let lifecycle event handlers close the TUI", async (t) => {
+		const dir = mkdtempSync(join(tmpdir(), "runner-test-"));
+		t.after(() => {
+			rmSync(dir, { recursive: true, force: true });
+		});
+
+		const sessionManager = SessionManager.create(dir, dir);
+		const authStorage = AuthStorage.create();
+		const modelRegistry = new ModelRegistry(authStorage, join(dir, "models.json"));
+		const runtime = makeMinimalRuntime();
+		let shutdownCount = 0;
+		const handlers = new Map();
+		handlers.set("agent_end", [
+			async (_event: unknown, ctx: { shutdown: () => void }) => {
+				ctx.shutdown();
+			},
+		]);
+		const extension = {
+			path: "/test/shutdown-on-agent-end",
+			handlers,
+			commands: new Map(),
+			shortcuts: new Map(),
+			tools: new Map(),
+			flags: new Map(),
+			diagnostics: [],
+		} as unknown as Extension;
+		const runner = new ExtensionRunner([extension], runtime, dir, sessionManager, modelRegistry);
+		runner.bindCore({} as any, {
+			getModel: () => undefined,
+			isIdle: () => true,
+			abort: () => {},
+			hasPendingMessages: () => false,
+			shutdown: () => {
+				shutdownCount += 1;
+			},
+			getContextUsage: () => undefined,
+			compact: () => {},
+			getSystemPrompt: () => "",
+		});
+
+		const errors: any[] = [];
+		runner.onError((err) => errors.push(err));
+
+		await runner.emit({ type: "agent_end", messages: [] } as any);
+
+		assert.equal(shutdownCount, 0);
+		assert.equal(errors.length, 1);
+		assert.equal(errors[0].event, "agent_end");
+		assert.match(errors[0].error, /cannot request TUI shutdown/);
+
+		runner.createCommandContext().shutdown();
+		assert.equal(shutdownCount, 1);
+	});
 });
 
 describe("ExtensionRunner protected commands", () => {

package/packages/pi-coding-agent/src/core/extensions/runner.ts

@@ -717,6 +717,19 @@ export class ExtensionRunner {
 		};
 	}
 
+	private createEventContext(eventType: string): ExtensionContext {
+		return {
+			...this.createContext(),
+			shutdown: () => {
+				throw new Error(`Extension event '${eventType}' cannot request TUI shutdown`);
+			},
+		};
+	}
+
+	private isShutdownGuardedEvent(eventType: string): boolean {
+		return eventType === "agent_end" || eventType === "stop" || eventType === "session_end";
+	}
+
 	createCommandContext(): ExtensionCommandContext {
 		return {
 			...this.createContext(),
@@ -757,7 +770,9 @@ export class ExtensionRunner {
 		getEvent: () => unknown,
 		processResult: (handlerResult: unknown, extensionPath: string) => { done: boolean },
 	): Promise<void> {
-		const ctx = this.createContext();
+		const ctx = this.isShutdownGuardedEvent(eventType)
+			? this.createEventContext(eventType)
+			: this.createContext();
 
 		for (const ext of this.extensions) {
 			const handlers = ext.handlers.get(eventType);

package/packages/pi-coding-agent/src/core/model-registry.ts

@@ -578,6 +578,10 @@ export class ModelRegistry {
 	 * Defaults to "apiKey" for built-ins and providers without explicit mode.
 	 */
 	getProviderAuthMode(provider: string): ProviderAuthMode {
+		// E2E-test-only: the fake provider is keyless. Sentinel is project-
+		// internal ("gsd-fake") so it cannot collide with a real provider.
+		// See packages/pi-ai/src/providers/fake.ts.
+		if (provider === "gsd-fake") return "none";
 		const config = this.registeredProviders.get(provider);
 		if (!config) return "apiKey";
 		if (config.authMode) return config.authMode;

package/packages/pi-coding-agent/src/core/settings-manager.ts

@@ -32,6 +32,7 @@ export interface RetrySettings {
 export interface TerminalSettings {
 	showImages?: boolean; // default: true (only relevant if terminal supports images)
 	clearOnShrink?: boolean; // default: false (clear empty rows when content shrinks)
+	adaptiveMode?: AdaptiveTuiMode; // default: "auto"
 }
 
 export interface ImageSettings {
@@ -149,6 +150,7 @@ export interface HooksSettings {
 }
 
 export type TransportSetting = Transport;
+export type AdaptiveTuiMode = "auto" | "chat" | "workflow" | "validation" | "debug" | "compact";
 
 /**
  * Package source for npm/git packages.
@@ -978,6 +980,16 @@ export class SettingsManager {
 		this.setNestedGlobalSetting("terminal", "clearOnShrink", enabled);
 	}
 
+	getAdaptiveMode(): AdaptiveTuiMode {
+		const mode = this.settings.terminal?.adaptiveMode;
+		const valid: AdaptiveTuiMode[] = ["auto", "chat", "workflow", "validation", "debug", "compact"];
+		return mode && valid.includes(mode) ? mode : "auto";
+	}
+
+	setAdaptiveMode(mode: AdaptiveTuiMode): void {
+		this.setNestedGlobalSetting("terminal", "adaptiveMode", mode);
+	}
+
 	getImageAutoResize(): boolean {
 		return this.settings.images?.autoResize ?? true;
 	}

package/packages/pi-coding-agent/src/core/slash-commands.ts

@@ -38,5 +38,6 @@ export const BUILTIN_SLASH_COMMANDS: ReadonlyArray<BuiltinSlashCommand> = [
 	{ name: "thinking", description: "Set thinking level (off/minimal/low/medium/high/xhigh)" },
 	{ name: "edit-mode", description: "Toggle edit mode (standard/hashline)" },
 	{ name: "terminal", description: "Run a shell command directly (e.g. /terminal ping -c3 1.1.1.1)" },
+	{ name: "tui", description: "Configure TUI layout mode (e.g. /tui mode workflow)" },
 	{ name: "quit", description: "Quit pi" },
 ];

package/packages/pi-coding-agent/src/modes/interactive/components/__tests__/chat-frame-compaction-tone.test.ts

@@ -1,3 +1,4 @@
+// GSD2 TUI Tests - Chat frame card visual contract coverage.
 import { test, describe } from "node:test";
 import assert from "node:assert/strict";
 import stripAnsi from "strip-ansi";
@@ -8,12 +9,12 @@ initTheme("dark", false);
 
 // Regression tests for the "compaction" tone added to renderChatFrame.
 // The compaction notice shares the same visual frame as user / assistant
-// messages (top rule, `• label` header, `│ ` body prefix) but uses the
+// messages (top rule, label header, `│ ` body prefix) but uses the
 // purple `customMessageLabel` color key so it is visually distinct from
 // conversation turns.
 
 describe("renderChatFrame — compaction tone", () => {
-	test("produces a top rule, `• compaction` header row, and a │ body margin", () => {
+	test("produces a top rule, compaction header row, and a │ body margin", () => {
 		const lines = renderChatFrame(
 			["Compacted from 1,224,262 tokens (ctrl+o to expand)"],
 			60,
@@ -33,11 +34,12 @@ describe("renderChatFrame — compaction tone", () => {
 		// Top rule is a solid horizontal bar
 		assert.match(plain[0], /^─+$/, "first line should be the solid top rule");
 
-		// Header row contains `• compaction`
+		// Header row contains `compaction`
 		assert.ok(
-			plain[1].includes("• compaction"),
-			`expected header to contain "• compaction", got ${JSON.stringify(plain[1])}`,
+			plain[1].includes("compaction"),
+			`expected header to contain "compaction", got ${JSON.stringify(plain[1])}`,
 		);
+		assert.ok(!plain[1].includes("•"), `header should not render a bullet prefix, got ${JSON.stringify(plain[1])}`);
 
 		// Body line(s) start with `│ `
 		assert.ok(

package/packages/pi-coding-agent/src/modes/interactive/components/__tests__/tool-execution.test.ts

@@ -1,7 +1,8 @@
+// GSD-2 Interactive Tool Execution Rendering Tests
 import { describe, test } from "node:test";
 import assert from "node:assert/strict";
 import stripAnsi from "strip-ansi";
-import { ToolExecutionComponent } from "../tool-execution.js";
+import { ToolExecutionComponent, ToolPhaseSummaryComponent, type ToolExecutionPhase } from "../tool-execution.js";
 import { initTheme } from "../../theme/theme.js";
 
 initTheme("dark", false);
@@ -14,7 +15,7 @@ function renderTool(
 		isError: boolean;
 		details?: Record<string, unknown>;
 	},
-	toolDefinition?: { label?: string },
+	toolDefinition?: { label?: string; renderCall?: (...args: any[]) => any; renderResult?: (...args: any[]) => any },
 ): string {
 	const component = new ToolExecutionComponent(
 		toolName,
@@ -36,7 +37,7 @@ function renderToolCollapsed(
 		isError: boolean;
 		details?: Record<string, unknown>;
 	},
-	toolDefinition?: { label?: string },
+	toolDefinition?: { label?: string; renderCall?: (...args: any[]) => any; renderResult?: (...args: any[]) => any },
 ): string {
 	const component = new ToolExecutionComponent(
 		toolName,
@@ -50,25 +51,106 @@ function renderToolCollapsed(
 }
 
 describe("ToolExecutionComponent", () => {
-	test("renders framed header with Running status while tool is partial", () => {
+	test("renders framed header with running status while tool is partial", () => {
 		const rendered = renderToolCollapsed("mcp__demo__do_thing", { ok: true });
 
-		assert.match(rendered, /Tool demo\u00b7do_thing/);
-		assert.match(rendered, /Running/);
+		assert.match(rendered, /demo\u00b7do_thing/);
+		assert.doesNotMatch(rendered, /Tool demo\u00b7do_thing/);
+		assert.match(rendered, /running/);
+		assert.match(rendered, /running · \d+(ms|s)/);
 	});
 
-	test("renders framed header with Error status for failed tool result", () => {
+	test("renders framed header with failed status for failed tool result", () => {
 		const rendered = renderTool(
 			"mcp__demo__do_thing",
 			{ ok: true },
 			{ content: [{ type: "text", text: "boom" }], isError: true },
 		);
 
-		assert.match(rendered, /Tool demo\u00b7do_thing/);
-		assert.match(rendered, /Error/);
+		assert.match(rendered, /demo\u00b7do_thing/);
+		assert.doesNotMatch(rendered, /Tool demo\u00b7do_thing/);
+		assert.match(rendered, /failed/);
+		assert.match(rendered, /failed · \d+(ms|s)/);
 		assert.match(rendered, /boom/);
 	});
 
+	test("collapses successful low-signal tool cards by default", () => {
+		const rendered = renderToolCollapsed(
+			"mcp__demo__noop",
+			{ ok: true },
+			{ content: [], isError: false },
+		);
+
+		assert.match(rendered, /success · \d+(ms|s)/);
+		assert.match(rendered, /demo\u00b7noop/);
+		assert.doesNotMatch(rendered, /Completed/);
+		assert.doesNotMatch(rendered, /ok=true/);
+	});
+
+	test("exposes phase metadata for successful low-signal tool rows", () => {
+		const component = new ToolExecutionComponent(
+			"gsd_requirement_update",
+			{ id: "R001" },
+			{},
+			{ label: "Update Requirement" } as any,
+			{ requestRender() {} } as any,
+		);
+		component.updateResult({ content: [], isError: false });
+
+		assert.deepEqual(component.getRollupPhase()?.label, "Requirement writes");
+	});
+
+	test("exposes phase metadata for collapsed output-bearing generic tools", () => {
+		const component = new ToolExecutionComponent(
+			"mcp__demo__do_thing",
+			{ ok: true },
+			{},
+			undefined,
+			{ requestRender() {} } as any,
+		);
+		component.updateResult({ content: [{ type: "text", text: "important output" }], isError: false });
+
+		assert.deepEqual(component.getRollupPhase()?.label, "Other tool actions");
+	});
+
+	test("renders phase-based summaries for rolled-up tool executions", () => {
+		const phases: ToolExecutionPhase[] = [
+			{ label: "Setup / shell", count: 6, durationMs: 12 },
+			{ label: "Context reads", count: 4, durationMs: 6 },
+			{ label: "Requirement writes", count: 4, durationMs: 4 },
+			{ label: "Memory lookups", count: 4, durationMs: 4 },
+			{ label: "Finalization", count: 1, durationMs: 1 },
+		];
+		const rendered = stripAnsi(new ToolPhaseSummaryComponent(phases).render(120).join("\n"));
+
+		assert.match(rendered, /Setup \/ shell 6 actions\s+success · 12ms/);
+		assert.match(rendered, /Context reads 4 actions\s+success · 6ms/);
+		assert.match(rendered, /Requirement writes 4 actions\s+success · 4ms/);
+		assert.match(rendered, /Memory lookups 4 actions\s+success · 4ms/);
+		assert.match(rendered, /Finalization 1 action\s+success · 1ms/);
+	});
+
+	test("passes failed result status to custom result renderers", () => {
+		const rendered = renderTool(
+			"gsd_requirement_save",
+			{ id: "R001" },
+			{ content: [{ type: "text", text: "saved" }], isError: true },
+			{
+				label: "Save Requirement",
+				renderResult(result: { isError?: boolean }) {
+					return {
+						render: () => [result.isError ? "custom saw error" : "custom saw success"],
+						invalidate() {},
+					};
+				},
+			},
+		);
+
+		assert.match(rendered, /failed/);
+		assert.match(rendered, /custom saw error/);
+		assert.doesNotMatch(rendered, /custom saw success/);
+	});
+
 	test("renders capitalized Claude Code Bash tool names with bash output instead of generic args JSON", () => {
 		const rendered = renderTool(
 			"Bash",
@@ -127,14 +209,16 @@ describe("ToolExecutionComponent", () => {
 			{ label: "Complete Slice" },
 		);
 
-		assert.match(rendered, /Tool Complete Slice/);
+		assert.match(rendered, /Complete Slice/);
+		assert.doesNotMatch(rendered, /Tool Complete Slice/);
 		assert.doesNotMatch(rendered, /gsd_slice_complete/);
 	});
 
 	test("frame header strips gsd_ prefix and title-cases when no label is registered", () => {
 		const rendered = renderToolCollapsed("gsd_requirement_update", { id: "R005" });
 
-		assert.match(rendered, /Tool Requirement Update/);
+		assert.match(rendered, /Requirement Update/);
+		assert.doesNotMatch(rendered, /Tool Requirement Update/);
 		assert.doesNotMatch(rendered, /gsd_requirement_update/);
 	});
 
@@ -163,7 +247,7 @@ describe("ToolExecutionComponent", () => {
 		assert.doesNotMatch(rendered, /…/);
 	});
 
-	test("generic fallback truncates long output when collapsed", () => {
+	test("generic fallback collapses successful output rows until expanded", () => {
 		const longOutput = Array.from({ length: 25 }, (_, i) => `line ${i + 1}`).join("\n");
 		const rendered = renderToolCollapsed(
 			"mcp__demo__do_thing",
@@ -171,10 +255,10 @@ describe("ToolExecutionComponent", () => {
 			{ content: [{ type: "text", text: longOutput }], isError: false },
 		);
 
-		assert.match(rendered, /line 1\b/);
-		assert.match(rendered, /line 10\b/);
-		assert.doesNotMatch(rendered, /line 20\b/);
-		assert.match(rendered, /\(15 more lines/);
+		assert.match(rendered, /demo\u00b7do_thing/);
+		assert.match(rendered, /success · \d+(ms|s)/);
+		assert.doesNotMatch(rendered, /line 1\b/);
+		assert.doesNotMatch(rendered, /\(15 more lines/);
 	});
 
 	test("generic fallback falls back to truncated JSON for complex args", () => {

package/packages/pi-coding-agent/src/modes/interactive/components/adaptive-layout.test.ts

@@ -0,0 +1,59 @@
+// GSD2 - Runtime tests for adaptive terminal layout rendering
+
+import assert from "node:assert/strict";
+import { describe, it, before } from "node:test";
+import stripAnsi from "strip-ansi";
+import { AdaptiveLayoutComponent } from "./adaptive-layout.js";
+import { initTheme } from "../theme/theme.js";
+
+before(() => {
+	initTheme("dark", false);
+});
+
+function render(component: AdaptiveLayoutComponent, width: number): string {
+	return component.render(width).map(stripAnsi).join("\n");
+}
+
+describe("AdaptiveLayoutComponent", () => {
+	it("renders workflow command center and inspector on wide terminals", () => {
+		const component = new AdaptiveLayoutComponent(() => ({
+			override: "workflow",
+			activeToolCount: 2,
+			gsdPhase: "executing milestone M001",
+			sessionName: "demo",
+			cwd: "/tmp/demo",
+		}));
+
+		const output = render(component, 132);
+		assert.match(output, /GSD Command Center/);
+		assert.match(output, /signals/);
+		assert.match(output, /2 running/);
+	});
+
+	it("falls back to a single compact row for narrow workflow terminals", () => {
+		const component = new AdaptiveLayoutComponent(() => ({
+			override: "workflow",
+			activeToolCount: 1,
+			gsdPhase: "executing milestone M001",
+			cwd: "/tmp/demo",
+		}));
+
+		const output = render(component, 68);
+		assert.match(output, /GSD compact/);
+		assert.doesNotMatch(output, /signals/);
+	});
+
+	it("renders blocking failure context in debug mode", () => {
+		const component = new AdaptiveLayoutComponent(() => ({
+			override: "auto",
+			activeToolCount: 0,
+			lastError: "Cannot find module @gsd/native",
+			cwd: "/tmp/demo",
+		}));
+
+		const output = render(component, 120);
+		assert.match(output, /blocking failure/);
+		assert.match(output, /Cannot find module/);
+		assert.match(output, /inspect the failed output/);
+	});
+});