gsd-pi 2.80.0-dev.3065f7bfa → 2.80.0-dev.488219eb6

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

@@ -146,24 +146,43 @@ test("handleAgentEvent: standalone completed tool events roll up incrementally",
 		["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: `/tmp/${toolCallId}.txt` },
+			args: { path: `src/${toolCallId}.txt` },
 		} as any);
 		await handleAgentEvent(host, {
 			type: "tool_execution_end",
 			toolCallId,
 			toolName,
-			result: { content: [], isError: false },
+			result: { content: [], details: { target }, isError: false },
 			isError: false,
 		} as any);
 	}
 
 	const rendered = stripAnsi(chatContainer.render(100).join("\n"));
-	assert.match(rendered, /Context reads 2 actions\s+success · \d+(ms|s)/);
-	assert.match(rendered, /File changes 1 action\s+success · \d+(ms|s)/);
-	assert.doesNotMatch(rendered, /\bread\s+success ·/);
+	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

@@ -113,13 +113,29 @@ 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 {

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);
@@ -1891,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;
@@ -2897,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();
@@ -2904,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

@@ -1,14 +1,31 @@
 import assert from "node:assert/strict";
-import { readFileSync } from "node:fs";
+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 persists sql.js snapshots through the atomic DB snapshot writer", () => {
-	const src = readFileSync(
-		join(process.cwd(), "packages", "pi-coding-agent", "src", "resources", "extensions", "memory", "storage.ts"),
-		"utf-8",
-	);
+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 }));
 
-	assert.match(src, /atomicWriteDbSnapshotSync\(/, "storage must use atomic DB snapshot writes");
-	assert.doesNotMatch(src, /writeFileSync\(this\.dbPath/, "direct live DB overwrite is forbidden");
+	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");
 });