gsd-pi 2.79.0-dev.ece5fd8ba → 2.80.0-dev.96f4d89d5

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

@@ -14,7 +14,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 +36,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,
@@ -55,6 +55,7 @@ describe("ToolExecutionComponent", () => {
 
 		assert.match(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", () => {
@@ -66,9 +67,43 @@ describe("ToolExecutionComponent", () => {
 
 		assert.match(rendered, /Tool demo\u00b7do_thing/);
 		assert.match(rendered, /Error/);
+		assert.match(rendered, /Error · \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, /Done · \d+(ms|s)/);
+		assert.match(rendered, /Completed/);
+		assert.doesNotMatch(rendered, /ok=true/);
+	});
+
+	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, /Error/);
+		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",

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/);
+	});
+});

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

@@ -0,0 +1,160 @@
+// GSD2 - Adaptive terminal mode dashboard for the interactive TUI
+
+import { style, truncateToWidth, visibleWidth, type Component } from "@gsd/pi-tui";
+import type { TuiAdaptiveMode, TuiMode } from "../tui-mode.js";
+import { resolveTuiMode } from "../tui-mode.js";
+import { theme, type ThemeColor } from "../theme/theme.js";
+
+export interface AdaptiveLayoutState {
+	override: TuiAdaptiveMode;
+	activeToolCount: number;
+	gsdPhase?: string;
+	lastError?: string;
+	sessionName?: string;
+	cwd: string;
+}
+
+export class AdaptiveLayoutComponent implements Component {
+	constructor(private readonly getState: () => AdaptiveLayoutState) {}
+
+	invalidate(): void {}
+
+	render(width: number): string[] {
+		const state = this.getState();
+		const mode = resolveTuiMode({
+			terminalWidth: width,
+			override: state.override,
+			activeToolCount: state.activeToolCount,
+			gsdPhase: state.gsdPhase,
+			hasBlockingError: !!state.lastError,
+		});
+
+		if (state.override === "auto" && mode === "chat" && !state.gsdPhase && !state.lastError && state.activeToolCount === 0) {
+			return [];
+		}
+
+		if (mode === "compact" || width < 72) return this.renderCompact(width, mode, state);
+		if (mode === "debug") return this.renderDebug(width, state);
+		if (mode === "validation") return this.renderValidation(width, state);
+		if (mode === "workflow") return this.renderWorkflow(width, state);
+		return this.renderChat(width, state);
+	}
+
+	private renderWorkflow(width: number, state: AdaptiveLayoutState): string[] {
+		if (width < 112) return this.renderCompact(width, "workflow", state);
+
+		const leftWidth = Math.max(44, Math.floor(width * 0.56));
+		const rightWidth = Math.max(32, width - leftWidth - 2);
+		const phase = state.gsdPhase ?? "Ready";
+		const left = this.frame(
+			[
+				this.metric("Active", phase, "modeWorkflow"),
+				this.metric("Tools", state.activeToolCount > 0 ? `${state.activeToolCount} running` : "idle", "toolRunning"),
+				this.metric("Mode", state.override === "auto" ? "auto workflow" : state.override, "modeWorkflow"),
+			],
+			leftWidth,
+			"GSD Command Center",
+			"workflow",
+			"modeWorkflow",
+		);
+		const right = this.frame(
+			[
+				`Session ${state.sessionName ?? "current"}`,
+				`Path ${this.basename(state.cwd)}`,
+				`Next ${state.activeToolCount > 0 ? "watch tool output" : "continue from prompt"}`,
+			],
+			rightWidth,
+			"signals",
+			"inspector",
+			"surfaceAccent",
+		);
+		return this.columns(left, right, leftWidth);
+	}
+
+	private renderValidation(width: number, state: AdaptiveLayoutState): string[] {
+		const phase = state.gsdPhase ?? "Validation pending";
+		return this.frame(
+			[
+				this.metric("Focus", phase, "modeValidation"),
+				this.metric("Checks", state.activeToolCount > 0 ? `${state.activeToolCount} active` : "waiting", "toolRunning"),
+				this.metric("Timeline", state.lastError ? "blocked" : "ready for completion evidence", state.lastError ? "toolError" : "toolSuccess"),
+			],
+			width,
+			"validation",
+			state.override === "auto" ? "auto" : state.override,
+			"modeValidation",
+		);
+	}
+
+	private renderDebug(width: number, state: AdaptiveLayoutState): string[] {
+		const error = state.lastError ?? "Blocking error detected";
+		return this.frame(
+			[
+				this.metric("Failure", truncateToWidth(error, Math.max(20, width - 20), ""), "toolError"),
+				this.metric("Tools", state.activeToolCount > 0 ? `${state.activeToolCount} still running` : "none running", "toolRunning"),
+				this.metric("Next", "inspect the failed output, then retry the smallest step", "modeDebug"),
+			],
+			width,
+			"blocking failure",
+			"debug",
+			"modeDebug",
+		);
+	}
+
+	private renderChat(width: number, state: AdaptiveLayoutState): string[] {
+		return this.frame(
+			[
+				this.metric("Mode", state.override === "auto" ? "auto chat" : state.override, "surfaceAccent"),
+				this.metric("Tools", state.activeToolCount > 0 ? `${state.activeToolCount} active` : "compact rows", "toolMuted"),
+			],
+			width,
+			"chat",
+			state.sessionName ?? "conversation",
+			"surfaceAccent",
+		);
+	}
+
+	private renderCompact(width: number, mode: TuiMode, state: AdaptiveLayoutState): string[] {
+		const phase = state.lastError ?? state.gsdPhase ?? (state.activeToolCount > 0 ? `${state.activeToolCount} tools` : "ready");
+		const line = `${theme.fg("modeCompact", "GSD compact")} ${theme.fg("surfaceMuted", `${mode} · ${phase}`)}`;
+		return style()
+			.border("minimal")
+			.borderColor((text) => theme.fg("surfaceBorder", text))
+			.bodyGutter(" ")
+			.render([line], width);
+	}
+
+	private frame(lines: string[], width: number, title: string, rightTitle: string, accent: ThemeColor): string[] {
+		return style()
+			.border("rounded")
+			.density("comfortable")
+			.toneColor((text) => theme.fg("surfaceMuted", text))
+			.borderColor((text) => theme.fg("surfaceBorder", text))
+			.title(theme.fg("surfaceTitle", title))
+			.rightTitle(theme.fg(accent, rightTitle))
+			.bodyGutter(theme.fg(accent, "│ "))
+			.render(lines, width);
+	}
+
+	private metric(label: string, value: string, color: ThemeColor): string {
+		return `${theme.fg("surfaceMuted", `${label.padEnd(8)} `)}${theme.fg(color, value)}`;
+	}
+
+	private columns(left: string[], right: string[], leftWidth: number): string[] {
+		const rows = Math.max(left.length, right.length);
+		const output: string[] = [];
+		for (let i = 0; i < rows; i++) {
+			const leftLine = left[i] ?? "";
+			const rightLine = right[i] ?? "";
+			const gap = " ".repeat(Math.max(2, leftWidth - visibleWidth(leftLine) + 2));
+			output.push(`${leftLine}${gap}${rightLine}`);
+		}
+		return output;
+	}
+
+	private basename(cwd: string): string {
+		const trimmed = cwd.replace(/\/+$/, "");
+		const slash = trimmed.lastIndexOf("/");
+		return slash === -1 ? trimmed : trimmed.slice(slash + 1);
+	}
+}

package/packages/pi-coding-agent/src/modes/interactive/components/chat-frame.ts

@@ -1,4 +1,4 @@
-import { truncateToWidth, visibleWidth } from "@gsd/pi-tui";
+import { style, truncateToWidth, visibleWidth } from "@gsd/pi-tui";
 import { theme } from "../theme/theme.js";
 import { formatTimestamp, type TimestampFormat } from "./timestamp.js";
 
@@ -67,21 +67,21 @@ export function renderChatFrame(
 	const headerRow = `${leftStyled}${" ".repeat(gap)}${rightStyled}`;
 	const headerPad = Math.max(0, outerWidth - visibleWidth(headerRow));
 
-	const sourceLines = trimOuterBlankLines(contentLines);
 	const bodyColor =
 		opts.tone === "user"
 			? "userMessageText"
 			: isPurple
 				? "customMessageText"
 				: "assistantMessageText";
+	const sourceLines = trimOuterBlankLines(contentLines);
 	const bodyLines = (sourceLines.length > 0 ? sourceLines : [""]).map((line) => {
 		const clipped = truncateToWidth(line, contentWidth, "");
-		return border("│ ") + theme.fg(bodyColor, clipped);
+		return theme.fg(bodyColor, clipped);
 	});
 
-	return [
-		theme.fg(borderMuted, "─".repeat(outerWidth)),
-		headerRow + " ".repeat(headerPad),
-		...bodyLines,
-	];
+	return style()
+		.border("rule")
+		.borderColor((line) => (line.startsWith("─") ? theme.fg(borderMuted, line) : border(line)))
+		.title(headerRow + " ".repeat(headerPad))
+		.render(bodyLines, outerWidth);
 }

package/packages/pi-coding-agent/src/modes/interactive/components/settings-selector.ts

@@ -1,5 +1,6 @@
 import type { ThinkingLevel } from "@gsd/pi-agent-core";
 import type { Transport } from "@gsd/pi-ai";
+import type { AdaptiveTuiMode } from "../../../core/settings-manager.js";
 import {
 	Container,
 	getCapabilities,
@@ -46,6 +47,7 @@ export interface SettingsConfig {
 	quietStartup: boolean;
 	clearOnShrink: boolean;
 	timestampFormat: "date-time-iso" | "date-time-us";
+	adaptiveMode: AdaptiveTuiMode;
 }
 
 export interface SettingsCallbacks {
@@ -71,6 +73,7 @@ export interface SettingsCallbacks {
 	onQuietStartupChange: (enabled: boolean) => void;
 	onClearOnShrinkChange: (enabled: boolean) => void;
 	onTimestampFormatChange: (format: "date-time-iso" | "date-time-us") => void;
+	onAdaptiveModeChange: (mode: AdaptiveTuiMode) => void;
 	onCancel: () => void;
 }
 
@@ -367,6 +370,15 @@ export class SettingsSelectorComponent extends Container {
 			values: ["date-time-iso", "date-time-us"],
 		});
 
+		const timestampIndex = items.findIndex((item) => item.id === "timestamp-format");
+		items.splice(timestampIndex + 1, 0, {
+			id: "adaptive-mode",
+			label: "TUI adaptive mode",
+			description: "Auto-select or force the terminal layout mode",
+			currentValue: config.adaptiveMode,
+			values: ["auto", "chat", "workflow", "validation", "debug", "compact"],
+		});
+
 		// Add borders
 		this.addChild(new DynamicBorder());
 
@@ -435,6 +447,9 @@ export class SettingsSelectorComponent extends Container {
 					case "timestamp-format":
 						callbacks.onTimestampFormatChange(newValue as "date-time-iso" | "date-time-us");
 						break;
+					case "adaptive-mode":
+						callbacks.onAdaptiveModeChange(newValue as AdaptiveTuiMode);
+						break;
 				}
 			},
 			callbacks.onCancel,

package/packages/pi-coding-agent/src/modes/interactive/components/tool-card-cleanup-and-success-runtime.test.ts

@@ -17,6 +17,7 @@ import { Container, Text } from "@gsd/pi-tui";
 import stripAnsi from "strip-ansi";
 
 import { initTheme, theme } from "../theme/theme.js";
+import { renderExtensionNotifyInChat, shouldRenderExtensionNotifyInChat } from "../interactive-mode.js";
 import { DynamicBorder } from "./dynamic-border.js";
 import { ToolExecutionComponent } from "./tool-execution.js";
 
@@ -26,6 +27,36 @@ before(() => {
 	initTheme("dark");
 });
 
+describe("Extension warning notifications", () => {
+	it("do not render into chat output", () => {
+		assert.equal(shouldRenderExtensionNotifyInChat("warning"), false);
+		assert.equal(shouldRenderExtensionNotifyInChat("error"), true);
+		assert.equal(shouldRenderExtensionNotifyInChat("success"), true);
+		assert.equal(shouldRenderExtensionNotifyInChat("info"), true);
+		assert.equal(shouldRenderExtensionNotifyInChat(undefined), true);
+
+		const warningChat = new Container();
+		const warningResult = renderExtensionNotifyInChat(warningChat, "extension warning", "warning");
+		assert.equal(warningResult.rendered, false);
+		assert.equal(
+			warningChat.render(80).map(stripAnsi).join("\n"),
+			"",
+			"warning notifications must not add chat output",
+		);
+
+		for (const type of ["error", "success", "info"] as const) {
+			const chat = new Container();
+			const result = renderExtensionNotifyInChat(chat, `${type} notification`, type);
+			assert.equal(result.rendered, true, `${type} notification should render`);
+			assert.match(
+				chat.render(80).map(stripAnsi).join("\n"),
+				new RegExp(`${type} notification`),
+				`${type} notification text should appear in chat output`,
+			);
+		}
+	});
+});
+
 interface MockTui {
 	renderCount: number;
 	requestRender(): void;

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

@@ -6,6 +6,7 @@ import {
 	type ImageDimensions,
 	imageFallback,
 	Spacer,
+	style,
 	Text,
 	type TUI,
 	truncateToWidth,
@@ -103,12 +104,10 @@ function renderToolFrame(
 	const outerWidth = Math.max(20, width);
 	const contentWidth = Math.max(1, outerWidth - 2); // "│ " + content
 
-	const borderColor = opts.tone === "error" ? "error" : "toolTitle";
-	const topColor = opts.tone === "error" ? "error" : "toolTitle";
-	const labelColor = opts.tone === "error" ? "error" : "toolTitle";
-	const statusColor = opts.tone === "error" ? "error" : opts.tone === "pending" ? "warning" : "success";
-	const border = (s: string) => theme.fg(borderColor, s);
-
+	const borderColor = opts.tone === "error" ? "toolError" : opts.tone === "pending" ? "toolRunning" : "toolSuccess";
+	const topColor = borderColor;
+	const labelColor = opts.tone === "error" ? "toolError" : "surfaceTitle";
+	const statusColor = opts.tone === "error" ? "toolError" : opts.tone === "pending" ? "toolRunning" : "toolSuccess";
 	const leftStyled = theme.fg(labelColor, theme.bold(`• ${opts.label}`));
 	const rightStyled = theme.fg(statusColor, opts.status);
 	const gap = Math.max(1, outerWidth - visibleWidth(leftStyled) - visibleWidth(rightStyled));
@@ -118,20 +117,25 @@ function renderToolFrame(
 	const sourceLines = trimOuterBlankLines(contentLines);
 	const bodyLines = (sourceLines.length > 0 ? sourceLines : [""]).map((line) => {
 		const clipped = truncateToWidth(line, contentWidth, "");
-		return border("│ ") + clipped;
+		return clipped;
 	});
 
-	return [
-		theme.fg(topColor, "─".repeat(outerWidth)),
-		headerRow + " ".repeat(headerPad),
-		...bodyLines,
-	];
+	return style()
+		.border("rule")
+		.borderColor((line) => theme.fg(line.startsWith("─") ? topColor : borderColor, line))
+		.title(headerRow + " ".repeat(headerPad))
+		.render(bodyLines, outerWidth);
 }
 
 const COMPACT_ARG_VALUE_LIMIT = 60;
 const GENERIC_OUTPUT_PREVIEW_LINES = 10;
 const GENERIC_ARGS_JSON_PREVIEW_LINES = 10;
 
+function formatElapsed(ms: number): string {
+	if (ms < 1000) return `${ms}ms`;
+	return `${Math.max(1, Math.round(ms / 1000))}s`;
+}
+
 /**
  * Format tool args for the generic-renderer fallback. Produces a one-line
  * `k=v, k=v` summary when every value is a primitive that fits inline; falls
@@ -200,6 +204,8 @@ export class ToolExecutionComponent extends Container {
 	private toolDefinition?: ToolDefinition;
 	private ui: TUI;
 	private cwd: string;
+	private readonly startedAt = Date.now();
+	private endedAt: number | undefined;
 	private result?: {
 		content: Array<{ type: string; text?: string; data?: string; mimeType?: string }>;
 		isError: boolean;
@@ -434,6 +440,9 @@ export class ToolExecutionComponent extends Container {
 	): void {
 		this.result = result;
 		this.isPartial = isPartial;
+		if (!isPartial) {
+			this.endedAt = this.endedAt ?? Date.now();
+		}
 		if (this.normalizedToolName === "write" && !isPartial) {
 			const rawPath = str(this.args?.file_path ?? this.args?.path);
 			const fileContent = str(this.args?.content);
@@ -456,6 +465,7 @@ export class ToolExecutionComponent extends Container {
 	markHistoricalNoResult(): void {
 		if (this.result) return; // real result already set, nothing to do
 		this.isPartial = false;
+		this.endedAt = this.endedAt ?? Date.now();
 		this.result = {
 			content: [],
 			isError: false,
@@ -468,6 +478,7 @@ export class ToolExecutionComponent extends Container {
 	 */
 	completeWithError(message?: string): void {
 		this.isPartial = false;
+		this.endedAt = this.endedAt ?? Date.now();
 		if (this.result) {
 			let content = this.result.content;
 			if (message) {
@@ -538,14 +549,23 @@ export class ToolExecutionComponent extends Container {
 		}
 		const frameWidth = Math.max(20, width);
 		const contentWidth = Math.max(1, frameWidth - 4);
-		const lines = super.render(contentWidth);
 		const frameTone: ToolFrameTone =
 			this.result?.isError ? "error" : this.isPartial || !this.result ? "pending" : "success";
-		const frameStatus = this.isPartial || !this.result ? "Running" : this.result.isError ? "Error" : "Done";
+		const elapsed = formatElapsed((this.endedAt ?? Date.now()) - this.startedAt);
+		const frameStatus = `${this.isPartial || !this.result ? "Running" : this.result.isError ? "Error" : "Done"} · ${elapsed}`;
 		const parsed = parseMcpToolName(this.toolName);
 		const frameLabel = parsed
 			? `Tool ${parsed.server}·${parsed.tool}`
 			: `Tool ${prettifyToolName(this.toolName, this.toolDefinition?.label) || "unknown"}`;
+		if (this.shouldRenderCompactSuccess()) {
+			const availableWidth = Math.max(1, frameWidth - 2);
+			const summaryWidth = Math.max(1, availableWidth - visibleWidth(frameStatus) - 1);
+			const summary = truncateToWidth(this.getCompactSummary(frameLabel), summaryWidth, "");
+			const gap = Math.max(1, availableWidth - visibleWidth(summary) - visibleWidth(frameStatus));
+			const line = `${theme.fg("toolSuccess", summary)}${" ".repeat(gap)}${theme.fg("toolSuccess", frameStatus)}`;
+			return ["", ...style().border("minimal").borderColor((text) => theme.fg("toolSuccess", text)).render([line], frameWidth)];
+		}
+		const lines = super.render(contentWidth);
 		const framed = renderToolFrame(lines, frameWidth, {
 			label: frameLabel,
 			status: frameStatus,
@@ -554,6 +574,16 @@ export class ToolExecutionComponent extends Container {
 		return framed.length > 0 ? ["", ...framed] : framed;
 	}
 
+	private shouldRenderCompactSuccess(): boolean {
+		if (this.expanded || this.isPartial || !this.result || this.result.isError) return false;
+		const hasImages = this.result.content?.some((block) => block.type === "image") ?? false;
+		return !hasImages && this.getTextOutput().trim().length === 0;
+	}
+
+	private getCompactSummary(frameLabel: string): string {
+		return `${frameLabel} Completed`;
+	}
+
 	private updateDisplay(): void {
 		// Tool body now uses transparent background; status is conveyed in the frame header.
 		const bgFn = (text: string) => text;
@@ -619,8 +649,13 @@ export class ToolExecutionComponent extends Container {
 			// Render result component if we have a result
 			if (this.result && this.toolDefinition.renderResult) {
 				try {
+					const rendererResult = {
+						content: this.result.content as any,
+						details: this.result.details,
+						isError: this.result.isError,
+					};
 					const resultComponent = this.toolDefinition.renderResult(
-						{ content: this.result.content as any, details: this.result.details },
+						rendererResult,
 						{ expanded: this.expanded, isPartial: this.isPartial },
 						theme,
 					);

package/packages/pi-coding-agent/src/modes/interactive/controllers/chat-controller.test.ts

@@ -1,7 +1,8 @@
 import assert from "node:assert/strict";
 import test from "node:test";
 
-import { findLatestPinnableText } from "./chat-controller.js";
+import { findLatestPinnableText, handleAgentEvent } from "./chat-controller.js";
+import { initTheme } from "../theme/theme.js";
 
 test("findLatestPinnableText: empty content returns empty string", () => {
 	assert.equal(findLatestPinnableText([]), "");
@@ -69,3 +70,44 @@ test("findLatestPinnableText: thinking blocks are not pinnable", () => {
 	];
 	assert.equal(findLatestPinnableText(blocks), "");
 });
+
+test("handleAgentEvent: agent_start clears stale adaptive blocking error", async () => {
+	initTheme("dark", false);
+	let cleared = false;
+	let requestedRender = false;
+	const host = {
+		isInitialized: true,
+		clearBlockingError: () => {
+			cleared = true;
+		},
+		retryEscapeHandler: undefined,
+		retryLoader: undefined,
+		loadingAnimation: undefined,
+		statusContainer: {
+			clear() {},
+			addChild() {},
+		},
+		ui: {
+			requestRender() {
+				requestedRender = true;
+			},
+		},
+		defaultEditor: {},
+		footer: {
+			invalidate() {},
+		},
+		settingsManager: {
+			getTimestampFormat() {
+				return "date-time-iso";
+			},
+		},
+		defaultWorkingMessage: "Working...",
+		pendingWorkingMessage: undefined,
+	} as any;
+
+	await handleAgentEvent(host, { type: "agent_start" } as any);
+	host.loadingAnimation?.stop();
+
+	assert.equal(cleared, true);
+	assert.equal(requestedRender, true);
+});

package/packages/pi-coding-agent/src/modes/interactive/controllers/chat-controller.ts

@@ -177,6 +177,7 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
 					return;
 			}
 		case "agent_start":
+			host.clearBlockingError();
 			if (host.retryEscapeHandler) {
 				host.defaultEditor.onEscape = host.retryEscapeHandler;
 				host.retryEscapeHandler = undefined;

package/packages/pi-coding-agent/src/modes/interactive/controllers/input-controller.test.ts

@@ -49,6 +49,7 @@ function createMockHost() {
 		isInitialized: true,
 		loadingAnimation: undefined,
 		pendingWorkingMessage: undefined,
+		clearBlockingError: () => {},
 		defaultWorkingMessage: "Working...",
 		streamingComponent: undefined,
 		streamingMessage: undefined,

package/packages/pi-coding-agent/src/modes/interactive/interactive-mode-state.ts

@@ -20,6 +20,7 @@ export interface InteractiveModeStateHost {
 	isInitialized: boolean;
 	loadingAnimation?: any;
 	pendingWorkingMessage?: string;
+	clearBlockingError(): void;
 	defaultWorkingMessage: string;
 	streamingComponent?: any;
 	streamingMessage?: any;
@@ -37,4 +38,3 @@ export interface InteractiveModeStateHost {
 }
 
 export type InteractiveModeEvent = AgentSessionEvent;
-