gsd-pi 2.80.0-dev.4ea7d80e7 → 2.80.0-dev.7582bf37a

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

@@ -1,5 +1,7 @@
 import assert from "node:assert/strict";
 import test from "node:test";
+import { Container } from "@gsd/pi-tui";
+import stripAnsi from "strip-ansi";
 
 import { findLatestPinnableText, handleAgentEvent } from "./chat-controller.js";
 import { initTheme } from "../theme/theme.js";
@@ -111,3 +113,76 @@ test("handleAgentEvent: agent_start clears stale adaptive blocking error", async
 	assert.equal(cleared, true);
 	assert.equal(requestedRender, true);
 });
+
+test("handleAgentEvent: standalone completed tool events roll up incrementally", async () => {
+	initTheme("dark", false);
+	const chatContainer = new Container();
+	let renderCount = 0;
+	const host = {
+		isInitialized: true,
+		footer: { invalidate() {} },
+		settingsManager: {
+			getTimestampFormat() {
+				return "date-time-iso";
+			},
+			getShowImages() {
+				return false;
+			},
+		},
+		getRegisteredToolDefinition() {
+			return undefined;
+		},
+		chatContainer,
+		pendingTools: new Map(),
+		ui: {
+			requestRender() {
+				renderCount++;
+			},
+		},
+	} as any;
+
+	for (const [toolCallId, toolName] of [
+		["read-1", "read"],
+		["read-2", "read"],
+		["edit-1", "edit"],
+	] as const) {
+		const target =
+			toolName === "edit"
+				? {
+						kind: "file",
+						action: "edit",
+						inputPath: `src/${toolCallId}.txt`,
+						resolvedPath: `/tmp/project/src/${toolCallId}.txt`,
+						line: 10,
+					}
+				: {
+						kind: "file",
+						action: "read",
+						inputPath: `src/${toolCallId}.txt`,
+						resolvedPath: `/tmp/project/src/${toolCallId}.txt`,
+					};
+		await handleAgentEvent(host, {
+			type: "tool_execution_start",
+			toolCallId,
+			toolName,
+			args: { path: `src/${toolCallId}.txt` },
+		} as any);
+		await handleAgentEvent(host, {
+			type: "tool_execution_end",
+			toolCallId,
+			toolName,
+			result: { content: [], details: { target }, isError: false },
+			isError: false,
+		} as any);
+	}
+
+	const rendered = stripAnsi(chatContainer.render(100).join("\n"));
+	assert.match(rendered, /Context reads · 2 files\s+success · \d+(ms|s)/);
+	assert.match(rendered, /src\/read-1\.txt/);
+	assert.match(rendered, /src\/read-2\.txt/);
+	assert.match(rendered, /File changes · 1 file, 1 edit\s+success · \d+(ms|s)/);
+	assert.match(rendered, /src\/edit-1\.txt:10/);
+	assert.doesNotMatch(rendered, /^\s*│?\s*read\s+success ·/m);
+	assert.doesNotMatch(rendered, /^\s*│?\s*edit\s+success ·/m);
+	assert.ok(renderCount > 0);
+});

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

@@ -28,7 +28,8 @@ type RenderedSegment =
 		contentType: "text" | "thinking";
 		component: AssistantMessageComponent;
 	}
-	| { kind: "tool"; contentIndex: number; component: ToolExecutionComponent };
+	| { kind: "tool"; contentIndex: number; component: ToolExecutionComponent }
+	| { kind: "tool-summary"; component: ToolPhaseSummaryComponent; phases: ToolExecutionPhase[] };
 
 let renderedSegments: RenderedSegment[] = [];
 // When providers reuse one assistant lifecycle across internal sub-turns,
@@ -112,29 +113,53 @@ function mergeToolPhases(phases: ToolExecutionPhase[]): ToolExecutionPhase[] {
 		if (previous?.label === phase.label) {
 			previous.count += phase.count;
 			previous.durationMs += phase.durationMs;
+			previous.targets = mergeTargets(previous.targets, phase.targets);
+			if (previous.actionLabel !== phase.actionLabel) {
+				previous.actionLabel = undefined;
+			}
 		} else {
-			merged.push({ ...phase });
+			merged.push({ ...phase, targets: phase.targets ? [...phase.targets] : undefined });
 		}
 	}
 	return merged;
 }
 
+function mergeTargets(existing: string[] | undefined, incoming: string[] | undefined): string[] | undefined {
+	if (!existing && !incoming) return undefined;
+	const seen = new Set<string>();
+	const merged: string[] = [];
+	for (const target of [...(existing ?? []), ...(incoming ?? [])]) {
+		if (!target || seen.has(target)) continue;
+		seen.add(target);
+		merged.push(target);
+	}
+	return merged;
+}
+
 function replaceCompactToolRowsWithPhaseSummary(
 	host: InteractiveModeStateHost & { ui: { requestRender: () => void } },
 ): void {
 	let changed = false;
 	const nextRenderedSegments: RenderedSegment[] = [];
-	let rollupRun: Array<{ seg: Extract<RenderedSegment, { kind: "tool" }>; phase: ToolExecutionPhase }> = [];
+	let rollupRun: Array<{
+		seg: Extract<RenderedSegment, { kind: "tool" | "tool-summary" }>;
+		phases: ToolExecutionPhase[];
+	}> = [];
 
 	const flushRollupRun = () => {
-		if (rollupRun.length < 2) {
+		const actionCount = rollupRun.reduce(
+			(total, item) => total + item.phases.reduce((sum, phase) => sum + phase.count, 0),
+			0,
+		);
+		if (actionCount < 2) {
 			nextRenderedSegments.push(...rollupRun.map((item) => item.seg));
 			rollupRun = [];
 			return;
 		}
 
 		const firstIndex = Math.max(0, host.chatContainer.children.indexOf(rollupRun[0].seg.component));
-		const summary = new ToolPhaseSummaryComponent(mergeToolPhases(rollupRun.map((item) => item.phase)));
+		const phases = mergeToolPhases(rollupRun.flatMap((item) => item.phases));
+		const summary = new ToolPhaseSummaryComponent(phases);
 
 		for (const { seg } of rollupRun) {
 			host.chatContainer.removeChild(seg.component);
@@ -149,13 +174,18 @@ function replaceCompactToolRowsWithPhaseSummary(
 		}
 
 		changed = true;
+		nextRenderedSegments.push({ kind: "tool-summary", component: summary, phases });
 		rollupRun = [];
 	};
 
 	for (const seg of renderedSegments) {
 		const phase = seg.kind === "tool" ? seg.component.getRollupPhase() : null;
 		if (seg.kind === "tool" && phase) {
-			rollupRun.push({ seg, phase });
+			rollupRun.push({ seg, phases: [phase] });
+			continue;
+		}
+		if (seg.kind === "tool-summary") {
+			rollupRun.push({ seg, phases: seg.component.getPhases() });
 			continue;
 		}
 
@@ -409,6 +439,7 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
 							details: externalToolResult.details,
 							isError: externalToolResult.isError,
 						});
+						replaceCompactToolRowsWithPhaseSummary(host);
 					}
 				}
 
@@ -843,7 +874,6 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
 					host.streamingComponent.setShowMetadata(true);
 					host.streamingComponent.updateContent(host.streamingMessage);
 				}
-				replaceCompactToolRowsWithPhaseSummary(host);
 
 				if (host.streamingMessage.stopReason === "aborted" || host.streamingMessage.stopReason === "error") {
 					if (!errorMessage) {
@@ -862,6 +892,7 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
 					for (const [, component] of host.pendingTools.entries()) {
 						component.setArgsComplete();
 					}
+					replaceCompactToolRowsWithPhaseSummary(host);
 				}
 				host.streamingComponent = undefined;
 				host.streamingMessage = undefined;
@@ -912,7 +943,7 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
 			const component = host.pendingTools.get(event.toolCallId);
 			if (component) {
 				component.updateResult({ ...event.result, isError: event.isError });
-				host.pendingTools.delete(event.toolCallId);
+				replaceCompactToolRowsWithPhaseSummary(host);
 				host.ui.requestRender();
 			}
 			break;

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

@@ -1,3 +1,6 @@
+// Project/App: GSD-2
+// File Purpose: Interactive TUI mode and session UI rendering.
+// GSD2 - Interactive TUI mode for coding-agent sessions.
 /**
  * Interactive mode for the coding agent.
  * Handles TUI rendering and user interaction, delegating business logic to AgentSession.
@@ -212,6 +215,14 @@ export function renderExtensionNotifyInChat(
 	return { rendered: true, statusSpacer: spacer, statusText };
 }
 
+export function renderBlockingErrorBanner(container: Container, message: string | undefined): void {
+	container.clear();
+	if (message === undefined) return;
+
+	container.addChild(new Spacer(1));
+	container.addChild(new Text(theme.fg("error", `Error: ${message}`), 1, 0));
+}
+
 /**
  * Options for InteractiveMode initialization.
  */
@@ -250,6 +261,7 @@ export class InteractiveMode {
 	private adaptiveLayout: AdaptiveLayoutComponent;
 	private statusContainer: Container;
 	private pinnedMessageContainer: Container;
+	private blockingErrorContainer: Container;
 	private defaultEditor: CustomEditor;
 	private editor: EditorComponent;
 	private autocompleteProvider: CombinedAutocompleteProvider | undefined;
@@ -380,6 +392,7 @@ export class InteractiveMode {
 		}));
 		this.statusContainer = new Container();
 		this.pinnedMessageContainer = new Container();
+		this.blockingErrorContainer = new Container();
 		this.widgetContainerAbove = new Container();
 		this.widgetContainerBelow = new Container();
 		this.keybindings = KeybindingsManager.create();
@@ -587,6 +600,7 @@ export class InteractiveMode {
 		this.ui.addChild(this.pendingMessagesContainer);
 		this.ui.addChild(this.statusContainer);
 		this.ui.addChild(this.pinnedMessageContainer);
+		this.ui.addChild(this.blockingErrorContainer);
 		this.renderWidgets(); // Initialize with default spacer
 		this.ui.addChild(this.widgetContainerAbove);
 		this.ui.addChild(this.editorContainer);
@@ -1378,6 +1392,9 @@ export class InteractiveMode {
 				})();
 			},
 			getSystemPrompt: () => this.session.systemPrompt,
+			setCompactionThresholdOverride: (percent) => {
+				this.session.settingsManager.setCompactionThresholdOverride(percent);
+			},
 		});
 
 		// Set up the extension shortcut handler on the default editor
@@ -1888,6 +1905,10 @@ export class InteractiveMode {
 	 * Show a notification for extensions.
 	 */
 	private showExtensionNotify(message: string, type?: ExtensionNotifyType): void {
+		if (type === "error") {
+			this.lastBlockingError = message;
+			renderBlockingErrorBanner(this.blockingErrorContainer, this.lastBlockingError);
+		}
 		const result = renderExtensionNotifyInChat(this.chatContainer, message, type);
 		if (!result.rendered) {
 			return;
@@ -2894,6 +2915,7 @@ export class InteractiveMode {
 
 	showError(errorMessage: string): void {
 		this.lastBlockingError = errorMessage;
+		renderBlockingErrorBanner(this.blockingErrorContainer, this.lastBlockingError);
 		this.chatContainer.addChild(new Spacer(1));
 		this.chatContainer.addChild(new Text(theme.fg("error", `Error: ${errorMessage}`), 1, 0));
 		this.ui.requestRender();
@@ -2901,6 +2923,8 @@ export class InteractiveMode {
 
 	clearBlockingError(): void {
 		this.lastBlockingError = undefined;
+		renderBlockingErrorBanner(this.blockingErrorContainer, undefined);
+		this.ui.requestRender();
 	}
 
 	showWarning(warningMessage: string): void {

package/packages/pi-coding-agent/src/resources/extensions/memory/storage-safety-guard.test.ts

@@ -0,0 +1,31 @@
+import assert from "node:assert/strict";
+import { lstatSync, mkdtempSync, readFileSync, rmSync, symlinkSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import test from "node:test";
+import { MemoryStorage } from "./storage.js";
+
+test("MemoryStorage replaces a symlinked DB path instead of overwriting the symlink target", async (t) => {
+	const dir = mkdtempSync(join(tmpdir(), "memory-storage-atomic-"));
+	t.after(() => rmSync(dir, { recursive: true, force: true }));
+
+	const canaryPath = join(dir, "canary.txt");
+	const dbPath = join(dir, "memory.db");
+	const canaryStorage = await MemoryStorage.create(canaryPath);
+	canaryStorage.close();
+	const originalCanary = readFileSync(canaryPath);
+	symlinkSync(canaryPath, dbPath);
+
+	const storage = await MemoryStorage.create(dbPath);
+	storage.upsertThreads([{
+		threadId: "thread-1",
+		filePath: join(dir, "thread.jsonl"),
+		fileSize: 1,
+		fileMtime: 1,
+		cwd: dir,
+	}]);
+	storage.close();
+
+	assert.deepEqual(readFileSync(canaryPath), originalCanary);
+	assert.equal(lstatSync(dbPath).isSymbolicLink(), false, "atomic snapshot write should replace the symlink");
+});

package/packages/pi-coding-agent/src/resources/extensions/memory/storage.ts

@@ -9,8 +9,9 @@
 
 import initSqlJs, { type Database as SqlJsDatabase } from "sql.js";
 import { randomUUID } from "crypto";
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
+import { existsSync, mkdirSync, readFileSync } from "fs";
 import { dirname } from "path";
+import { atomicWriteDbSnapshotSync } from "../../../core/db-snapshot.js";
 
 export interface ThreadRow {
 	thread_id: string;
@@ -74,7 +75,7 @@ export class MemoryStorage {
 
 	private persist(): void {
 		const data = this.db.export();
-		writeFileSync(this.dbPath, Buffer.from(data));
+		atomicWriteDbSnapshotSync(this.dbPath, data);
 	}
 
 	private schedulePersist(): void {