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

package/packages/pi-coding-agent/src/core/tools/tool-target-metadata.test.ts

@@ -0,0 +1,127 @@
+// GSD-2 - Behavior coverage for tool target metadata.
+
+import assert from "node:assert/strict";
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import test from "node:test";
+
+import { createEditTool } from "./edit.js";
+import { createFindTool } from "./find.js";
+import { createGrepTool } from "./grep.js";
+import { createLsTool } from "./ls.js";
+import { createReadTool } from "./read.js";
+import { createWriteTool } from "./write.js";
+
+test("read metadata records resolved path without changing output text", async () => {
+	const cwd = mkdtempSync(join(tmpdir(), "gsd-read-target-"));
+	try {
+		const filePath = join(cwd, "fixture.txt");
+		writeFileSync(filePath, "one\ntwo\nthree\n", "utf8");
+
+		const result = await createReadTool(cwd).execute("read-1", {
+			path: "fixture.txt",
+			offset: 2,
+			limit: 1,
+		});
+
+		assert.equal(result.details?.target?.resolvedPath, filePath);
+		assert.deepEqual(result.details?.target?.range, { start: 2, end: 2 });
+		assert.equal(result.content[0]?.type, "text");
+		assert.match(result.content[0]?.text ?? "", /^two/);
+		assert.equal((result.content[0]?.text ?? "").includes(filePath), false);
+
+		const zeroOffsetResult = await createReadTool(cwd).execute("read-zero-offset", {
+			path: "fixture.txt",
+			offset: 0,
+			limit: 1,
+		});
+
+		assert.deepEqual(zeroOffsetResult.details?.target?.range, { start: 1, end: 1 });
+	} finally {
+		rmSync(cwd, { recursive: true, force: true });
+	}
+});
+
+test("write metadata records resolved path without changing output text", async () => {
+	const cwd = mkdtempSync(join(tmpdir(), "gsd-write-target-"));
+	try {
+		const filePath = join(cwd, "out.txt");
+		const result = await createWriteTool(cwd).execute("write-1", {
+			path: "out.txt",
+			content: "hello",
+		});
+
+		assert.equal(result.details?.target?.resolvedPath, filePath);
+		assert.equal(result.content[0]?.type, "text");
+		assert.equal(result.content[0]?.text, "Successfully wrote 5 bytes to out.txt");
+	} finally {
+		rmSync(cwd, { recursive: true, force: true });
+	}
+});
+
+test("edit metadata records first changed line and resolved path", async () => {
+	const cwd = mkdtempSync(join(tmpdir(), "gsd-edit-target-"));
+	try {
+		const filePath = join(cwd, "edit.txt");
+		writeFileSync(filePath, "alpha\nbeta\ngamma\n", "utf8");
+
+		const result = await createEditTool(cwd).execute("edit-1", {
+			path: "edit.txt",
+			oldText: "beta",
+			newText: "delta",
+		});
+
+		assert.equal(result.details?.target?.resolvedPath, filePath);
+		assert.equal(result.details?.target?.line, 2);
+		assert.equal(result.details?.firstChangedLine, 2);
+	} finally {
+		rmSync(cwd, { recursive: true, force: true });
+	}
+});
+
+test("list and find metadata record resolved targets", async () => {
+	const cwd = mkdtempSync(join(tmpdir(), "gsd-search-target-"));
+	try {
+		const srcPath = join(cwd, "src");
+		const filePath = join(srcPath, "needle.txt");
+		mkdirSync(srcPath);
+		writeFileSync(filePath, "needle\n", "utf8");
+
+		const lsResult = await createLsTool(cwd).execute("ls-1", { path: "src" });
+		assert.equal(lsResult.details?.target?.resolvedPath, srcPath);
+
+		const findResult = await createFindTool(cwd, {
+			operations: {
+				exists: () => true,
+				glob: async () => [filePath],
+			},
+		}).execute("find-1", { path: "src", pattern: "needle" });
+		assert.equal(findResult.details?.target?.resolvedPath, srcPath);
+		assert.equal(findResult.details?.target?.pattern, "needle");
+	} finally {
+		rmSync(cwd, { recursive: true, force: true });
+	}
+});
+
+test("grep metadata records resolved search target", async () => {
+	const cwd = mkdtempSync(join(tmpdir(), "gsd-grep-target-"));
+	try {
+		const srcPath = join(cwd, "src");
+		mkdirSync(srcPath);
+		writeFileSync(join(srcPath, "needle.txt"), "needle\n", "utf8");
+
+		const result = await createGrepTool(cwd).execute("grep-1", {
+			path: "src",
+			pattern: "needle",
+			literal: true,
+		});
+
+		assert.equal(result.details?.target?.resolvedPath, srcPath);
+		assert.equal(result.details?.target?.pattern, "needle");
+		assert.equal(result.content[0]?.type, "text");
+		assert.match(result.content[0]?.text ?? "", /needle\.txt:1: needle/);
+	} finally {
+		rmSync(cwd, { recursive: true, force: true });
+	}
+});

package/packages/pi-coding-agent/src/core/tools/tool-target.ts

@@ -0,0 +1,48 @@
+// GSD-2 - Shared target metadata for tool output rendering.
+
+export type ToolTargetKind = "file" | "directory" | "search" | "command";
+
+export type ToolTargetAction = "read" | "write" | "edit" | "list" | "find" | "grep" | "bash";
+
+export interface ToolTargetRange {
+	start: number;
+	end?: number;
+}
+
+export interface ToolTargetMetadata {
+	kind: ToolTargetKind;
+	action: ToolTargetAction;
+	inputPath?: string;
+	resolvedPath?: string;
+	pattern?: string;
+	glob?: string;
+	line?: number;
+	range?: ToolTargetRange;
+}
+
+export function createToolTarget(target: ToolTargetMetadata): ToolTargetMetadata {
+	return target;
+}
+
+export function createReadFileTarget(
+	inputPath: string,
+	resolvedPath: string,
+	offset?: number,
+	limit?: number,
+): ToolTargetMetadata {
+	const effectiveOffset = Math.max(1, offset ?? 1);
+
+	return createToolTarget({
+		kind: "file",
+		action: "read",
+		inputPath,
+		resolvedPath,
+		range:
+			offset !== undefined || limit !== undefined
+				? {
+						start: effectiveOffset,
+						end: limit !== undefined ? effectiveOffset + Math.max(0, limit - 1) : undefined,
+					}
+				: undefined,
+	});
+}

package/packages/pi-coding-agent/src/core/tools/write.ts

@@ -4,6 +4,7 @@ import { mkdir as fsMkdir, writeFile as fsWriteFile } from "fs/promises";
 import { dirname } from "path";
 import { notifyFileChanged } from "../lsp/client.js";
 import { resolveToCwd } from "./path-utils.js";
+import { createToolTarget, type ToolTargetMetadata } from "./tool-target.js";
 
 const writeSchema = Type.Object({
 	path: Type.String({ description: "Path to the file to write (relative or absolute)" }),
@@ -12,6 +13,10 @@ const writeSchema = Type.Object({
 
 export type WriteToolInput = Static<typeof writeSchema>;
 
+export interface WriteToolDetails {
+	target?: ToolTargetMetadata;
+}
+
 /**
  * Pluggable operations for the write tool.
  * Override these to delegate file writing to remote systems (e.g., SSH).
@@ -50,7 +55,7 @@ export function createWriteTool(cwd: string, options?: WriteToolOptions): AgentT
 			const absolutePath = resolveToCwd(path, cwd);
 			const dir = dirname(absolutePath);
 
-			return new Promise<{ content: Array<{ type: "text"; text: string }>; details: undefined }>(
+			return new Promise<{ content: Array<{ type: "text"; text: string }>; details: WriteToolDetails | undefined }>(
 				(resolve, reject) => {
 					// Check if already aborted
 					if (signal?.aborted) {
@@ -98,7 +103,14 @@ export function createWriteTool(cwd: string, options?: WriteToolOptions): AgentT
 
 							resolve({
 								content: [{ type: "text", text: `Successfully wrote ${content.length} bytes to ${path}` }],
-								details: undefined,
+								details: {
+									target: createToolTarget({
+										kind: "file",
+										action: "write",
+										inputPath: path,
+										resolvedPath: absolutePath,
+									}),
+								},
 							});
 						} catch (error: any) {
 							// Clean up abort handler

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

@@ -113,10 +113,124 @@ describe("ToolExecutionComponent", () => {
 		assert.deepEqual(component.getRollupPhase()?.label, "Other tool actions");
 	});
 
+	test("renders compact read rows with target metadata", () => {
+		const rendered = renderToolCollapsed(
+			"read",
+			{ path: "src/Inspector.tsx" },
+			{
+				content: [{ type: "text", text: "source" }],
+				isError: false,
+				details: {
+					target: {
+						kind: "file",
+						action: "read",
+						inputPath: "src/Inspector.tsx",
+						resolvedPath: "/tmp/project/src/Inspector.tsx",
+						range: { start: 4, end: 12 },
+					},
+				},
+			},
+		);
+
+		assert.match(rendered, /read .*src\/Inspector\.tsx:4-12/);
+		assert.doesNotMatch(rendered, /source/);
+	});
+
+	test("renders compact edit rows with target metadata", () => {
+		const rendered = renderToolCollapsed(
+			"edit",
+			{ path: "src/Inspector.tsx" },
+			{
+				content: [{ type: "text", text: "Updated src/Inspector.tsx" }],
+				isError: false,
+				details: {
+					target: {
+						kind: "file",
+						action: "edit",
+						inputPath: "src/Inspector.tsx",
+						resolvedPath: "/tmp/project/src/Inspector.tsx",
+						line: 42,
+					},
+				},
+			},
+		);
+
+		assert.match(rendered, /edit .*src\/Inspector\.tsx:42/);
+		assert.doesNotMatch(rendered, /Updated src\/Inspector\.tsx/);
+	});
+
+	test("renders compact write rows with target metadata", () => {
+		const rendered = renderToolCollapsed(
+			"write",
+			{ path: "src/output.ts", content: "ok" },
+			{
+				content: [{ type: "text", text: "Successfully wrote 2 bytes to src/output.ts" }],
+				isError: false,
+				details: {
+					target: {
+						kind: "file",
+						action: "write",
+						inputPath: "src/output.ts",
+						resolvedPath: "/tmp/project/src/output.ts",
+					},
+				},
+			},
+		);
+
+		assert.match(rendered, /write .*src\/output\.ts/);
+		assert.doesNotMatch(rendered, /Successfully wrote/);
+	});
+
+	test("renders compact bash rows with command preview", () => {
+		const rendered = renderToolCollapsed(
+			"bash",
+			{ command: "npm run typecheck -- --watch false" },
+			{ content: [{ type: "text", text: "ok" }], isError: false, details: { cwd: "/tmp/project" } },
+		);
+
+		assert.match(rendered, /bash npm run typecheck -- --watch false/);
+		assert.doesNotMatch(rendered, /\bok\b/);
+	});
+
+	test("keeps failed tools expanded and error visible", () => {
+		const rendered = renderToolCollapsed(
+			"edit",
+			{ path: "src/Inspector.tsx" },
+			{
+				content: [{ type: "text", text: "Could not find target text" }],
+				isError: true,
+				details: {
+					target: {
+						kind: "file",
+						action: "edit",
+						inputPath: "src/Inspector.tsx",
+						resolvedPath: "/tmp/project/src/Inspector.tsx",
+					},
+				},
+			},
+		);
+
+		assert.match(rendered, /Could not find target text/);
+		assert.match(rendered, /edit/);
+	});
+
 	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: "Context reads",
+				count: 4,
+				durationMs: 6,
+				actionLabel: "read",
+				targets: ["/tmp/project/src/a.ts", "/tmp/project/src/b.ts"],
+			},
+			{
+				label: "File changes",
+				count: 3,
+				durationMs: 5,
+				actionLabel: "edit",
+				targets: ["/tmp/project/src/Inspector.tsx:42", "/tmp/project/src/CompareView.tsx:8"],
+			},
 			{ label: "Requirement writes", count: 4, durationMs: 4 },
 			{ label: "Memory lookups", count: 4, durationMs: 4 },
 			{ label: "Finalization", count: 1, durationMs: 1 },
@@ -124,7 +238,10 @@ describe("ToolExecutionComponent", () => {
 		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, /Context reads · 2 files\s+success · 6ms/);
+		assert.match(rendered, /src\/a\.ts/);
+		assert.match(rendered, /File changes · 2 files, 3 edits\s+success · 5ms/);
+		assert.match(rendered, /src\/Inspector\.tsx:42/);
 		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/);

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

@@ -1,3 +1,5 @@
+// Project/App: GSD-2
+// File Purpose: Runtime tests for TUI tool cards, success notifications, and blocking errors.
 // GSD2 TUI Tests - Runtime coverage for tool-card cleanup and success notification rendering.
 // Runtime regression tests for the post-compaction tool-card cleanup and the
 // green-bordered success-notification rendering. Replaces the source-grep
@@ -18,7 +20,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 { renderBlockingErrorBanner, renderExtensionNotifyInChat, shouldRenderExtensionNotifyInChat } from "../interactive-mode.js";
 import { DynamicBorder } from "./dynamic-border.js";
 import { ToolExecutionComponent } from "./tool-execution.js";
 
@@ -58,6 +60,34 @@ describe("Extension warning notifications", () => {
 	});
 });
 
+describe("Blocking error banner", () => {
+	it("keeps full error notifications renderable outside chat history", () => {
+		const banner = new Container();
+		const message = [
+			"Pre-execution checks failed: 3 blocking issues found",
+			"  - [file] lib/types.ts: Task T01 references 'lib/types.ts'",
+			"See .gsd/milestones/M001/slices/S02/S02-PRE-EXEC-VERIFY.json for full details.",
+		].join("\n");
+
+		renderBlockingErrorBanner(banner, message);
+
+		const rendered = banner.render(140).map(stripAnsi).join("\n");
+		assert.match(rendered, /Error: Pre-execution checks failed: 3 blocking issues found/);
+		assert.match(rendered, /Task T01 references 'lib\/types\.ts'/);
+		assert.match(rendered, /S02-PRE-EXEC-VERIFY\.json/);
+	});
+
+	it("clears the sticky banner when the blocking error is cleared", () => {
+		const banner = new Container();
+
+		renderBlockingErrorBanner(banner, "Provider failed");
+		assert.match(banner.render(80).map(stripAnsi).join("\n"), /Provider failed/);
+
+		renderBlockingErrorBanner(banner, undefined);
+		assert.equal(banner.render(80).map(stripAnsi).join("\n"), "");
+	});
+});
+
 interface MockTui {
 	renderCount: number;
 	requestRender(): void;

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

@@ -111,9 +111,10 @@ function renderToolFrame(
 	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));
+	const titleWidth = Math.max(1, outerWidth - 4);
+	const gap = Math.max(1, titleWidth - visibleWidth(leftStyled) - visibleWidth(rightStyled));
 	const headerRow = `${leftStyled}${" ".repeat(gap)}${rightStyled}`;
-	const headerPad = Math.max(0, outerWidth - visibleWidth(headerRow));
+	const headerPad = Math.max(0, titleWidth - visibleWidth(headerRow));
 
 	const sourceLines = trimOuterBlankLines(contentLines);
 	const bodyLines = (sourceLines.length > 0 ? sourceLines : [""]).map((line) => {
@@ -122,7 +123,7 @@ function renderToolFrame(
 	});
 
 	return style()
-		.border("rule")
+		.border("rounded")
 		.borderColor((line) => theme.fg(line.startsWith("─") ? topColor : borderColor, line))
 		.title(headerRow + " ".repeat(headerPad))
 		.render(bodyLines, outerWidth);
@@ -157,6 +158,22 @@ export type ToolExecutionPhase = {
 	label: string;
 	count: number;
 	durationMs: number;
+	targets?: string[];
+	actionLabel?: string;
+};
+
+type ToolTargetMetadata = {
+	kind?: string;
+	action?: string;
+	inputPath?: string;
+	resolvedPath?: string;
+	pattern?: string;
+	glob?: string;
+	line?: number;
+	range?: {
+		start?: number;
+		end?: number;
+	};
 };
 
 function formatElapsed(ms: number): string {
@@ -164,6 +181,104 @@ function formatElapsed(ms: number): string {
 	return `${Math.max(1, Math.round(ms / 1000))}s`;
 }
 
+function formatCommandPreview(command: string): string {
+	return truncateToWidth(command.replace(/\s+/g, " ").trim(), 64, "");
+}
+
+function appendLineOrRange(displayPath: string | undefined, target: ToolTargetMetadata): string | undefined {
+	if (!displayPath) return undefined;
+	if (typeof target.line === "number" && Number.isFinite(target.line)) {
+		return `${displayPath}:${target.line}`;
+	}
+	const start = target.range?.start;
+	if (typeof start === "number" && Number.isFinite(start)) {
+		const end = target.range?.end;
+		const suffix =
+			typeof end === "number" && Number.isFinite(end) && end !== start
+				? `${start}-${end}`
+				: `${start}`;
+		return `${displayPath}:${suffix}`;
+	}
+	return displayPath;
+}
+
+function formatToolTarget(target: ToolTargetMetadata): string | undefined {
+	const path = target.resolvedPath || target.inputPath;
+	const displayPath = path ? shortenPath(path) : undefined;
+	if (target.kind === "search") {
+		const searchTarget = displayPath ?? target.inputPath ?? ".";
+		const label = target.pattern ? `${target.pattern} in ${searchTarget}` : searchTarget;
+		return target.glob ? `${label} (${target.glob})` : label;
+	}
+	return appendLineOrRange(displayPath, target);
+}
+
+function formatArgsPathTarget(path: string | null, args: Record<string, unknown>): string | undefined {
+	if (!path) return undefined;
+	const start = typeof args.offset === "number" ? args.offset : undefined;
+	const limit = typeof args.limit === "number" ? args.limit : undefined;
+	const range =
+		start !== undefined || limit !== undefined
+			? {
+					start: start ?? 1,
+					end: limit !== undefined ? (start ?? 1) + Math.max(0, limit - 1) : undefined,
+				}
+			: undefined;
+	return appendLineOrRange(shortenPath(path), { range });
+}
+
+function stripLineSuffix(target: string): string {
+	return target.replace(/:\d+(?:-\d+)?$/, "");
+}
+
+function uniqueTargets(targets: string[] | undefined): string[] {
+	const seen = new Set<string>();
+	const unique: string[] = [];
+	for (const target of targets ?? []) {
+		if (!target || seen.has(target)) continue;
+		seen.add(target);
+		unique.push(target);
+	}
+	return unique;
+}
+
+function summarizePhaseLabel(phase: ToolExecutionPhase): string {
+	const phaseTargets = uniqueTargets(phase.targets);
+	const baseTargets = uniqueTargets(phaseTargets.map(stripLineSuffix));
+	if (phase.label === "File changes" && baseTargets.length > 0) {
+		const fileWord = baseTargets.length === 1 ? "file" : "files";
+		const actionWord =
+			phase.actionLabel === "write"
+				? phase.count === 1
+					? "write"
+					: "writes"
+				: phase.actionLabel === undefined
+					? phase.count === 1
+						? "action"
+						: "actions"
+					: phase.count === 1
+						? "edit"
+						: "edits";
+		return `${phase.label} · ${baseTargets.length} ${fileWord}, ${phase.count} ${actionWord}`;
+	}
+	if (phase.label === "Context reads" && baseTargets.length > 0) {
+		const fileWord = baseTargets.length === 1 ? "file" : "files";
+		return `${phase.label} · ${baseTargets.length} ${fileWord}`;
+	}
+	if (phase.label === "Setup / shell" && phaseTargets.length > 0) {
+		return `${phase.label} · ${phase.count} ${phase.count === 1 ? "command" : "commands"}`;
+	}
+	return `${phase.label} ${phase.count} ${phase.count === 1 ? "action" : "actions"}`;
+}
+
+function summarizePhaseTargets(phase: ToolExecutionPhase, width: number): string | undefined {
+	const phaseTargets = uniqueTargets(phase.targets);
+	if (phaseTargets.length === 0) return undefined;
+	const shown = phaseTargets.slice(0, 3);
+	const suffix = phaseTargets.length > shown.length ? ` +${phaseTargets.length - shown.length} more` : "";
+	return truncateToWidth(shown.join(" · ") + suffix, width, "");
+}
+
 /**
  * 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
@@ -607,10 +722,13 @@ export class ToolExecutionComponent extends Container {
 		if (!this.shouldRenderCompactSuccess()) return null;
 		const label = this.getPhaseLabel();
 		const endedAt = this.endedAt ?? Date.now();
+		const target = this.getCompactTarget();
 		return {
 			label,
 			count: 1,
 			durationMs: Math.max(0, endedAt - this.startedAt),
+			targets: target ? [target] : undefined,
+			actionLabel: this.getCompactAction(),
 		};
 	}
 
@@ -631,7 +749,52 @@ export class ToolExecutionComponent extends Container {
 	}
 
 	private getCompactSummary(frameLabel: string): string {
-		return frameLabel;
+		if (this.normalizedToolName === "bash") {
+			const command = str(this.args?.command);
+			return command ? `bash ${formatCommandPreview(command)}` : frameLabel;
+		}
+		const target = this.getCompactTarget();
+		return target ? `${this.getCompactAction()} ${target}` : frameLabel;
+	}
+
+	private getCompactAction(): string {
+		const target = this.getTargetMetadata();
+		if (target?.action) return target.action === "list" ? "ls" : target.action;
+		return this.normalizedToolName;
+	}
+
+	private getTargetMetadata(): ToolTargetMetadata | undefined {
+		const target = this.result?.details?.target;
+		return target && typeof target === "object" ? target : undefined;
+	}
+
+	private getCompactTarget(): string | undefined {
+		const metadata = this.getTargetMetadata();
+		const metadataTarget = metadata ? formatToolTarget(metadata) : undefined;
+		if (metadataTarget) return metadataTarget;
+
+		const path = str(this.args?.file_path ?? this.args?.path);
+		if (path === null) return undefined;
+		if (this.normalizedToolName === "read" || this.normalizedToolName === "hashline_read") {
+			return formatArgsPathTarget(path, this.args);
+		}
+		if (this.normalizedToolName === "write" || this.normalizedToolName === "edit") {
+			return path ? shortenPath(path) : undefined;
+		}
+		if (this.normalizedToolName === "ls") {
+			return shortenPath(path || ".");
+		}
+		if (this.normalizedToolName === "find") {
+			const pattern = str(this.args?.pattern);
+			return pattern ? `${pattern} in ${shortenPath(path || ".")}` : shortenPath(path || ".");
+		}
+		if (this.normalizedToolName === "grep") {
+			const pattern = str(this.args?.pattern);
+			const glob = str(this.args?.glob);
+			const label = pattern ? `${pattern} in ${shortenPath(path || ".")}` : shortenPath(path || ".");
+			return glob ? `${label} (${glob})` : label;
+		}
+		return undefined;
 	}
 
 	private updateDisplay(): void {
@@ -861,6 +1024,10 @@ export class ToolExecutionComponent extends Container {
 			// Truncation warnings
 			const truncation = this.result.details?.truncation;
 			const fullOutputPath = this.result.details?.fullOutputPath;
+			const cwd = this.result.details?.cwd;
+			if (this.expanded && typeof cwd === "string" && cwd.length > 0) {
+				this.contentBox.addChild(new Text(`\n${theme.fg("muted", `cwd ${shortenPath(cwd)}`)}`, 0, 0));
+			}
 			if (truncation?.truncated || fullOutputPath) {
 				const warnings: string[] = [];
 				if (fullOutputPath) {
@@ -1288,19 +1455,21 @@ export class ToolPhaseSummaryComponent extends Container {
 	}
 
 	getPhases(): ToolExecutionPhase[] {
-		return this.phases.map((phase) => ({ ...phase }));
+		return this.phases.map((phase) => ({ ...phase, targets: phase.targets ? [...phase.targets] : undefined }));
 	}
 
 	override render(width: number): string[] {
 		const frameWidth = Math.max(20, width);
-		const rows = this.phases.map((phase) => {
-			const left = `${phase.label} ${phase.count} ${phase.count === 1 ? "action" : "actions"}`;
+		const rows = this.phases.flatMap((phase) => {
+			const left = summarizePhaseLabel(phase);
 			const right = `success · ${formatElapsed(phase.durationMs)}`;
 			const contentWidth = Math.max(1, frameWidth - 2);
 			const leftWidth = Math.max(1, contentWidth - visibleWidth(right) - 1);
 			const leftText = truncateToWidth(left, leftWidth, "");
 			const gap = Math.max(1, contentWidth - visibleWidth(leftText) - visibleWidth(right));
-			return `${theme.fg("toolSuccess", leftText)}${" ".repeat(gap)}${theme.fg("toolSuccess", right)}`;
+			const summaryRow = `${theme.fg("toolSuccess", leftText)}${" ".repeat(gap)}${theme.fg("toolSuccess", right)}`;
+			const targetRow = summarizePhaseTargets(phase, contentWidth);
+			return targetRow ? [summaryRow, theme.fg("muted", targetRow)] : [summaryRow];
 		});
 
 		return ["", ...style().border("minimal").borderColor((text) => theme.fg("toolSuccess", text)).render(rows, frameWidth)];