@linxiraos/pi-tui 1.2.1 → 1.3.1

package/src/tools/ast-grep.ts

@@ -1,3 +1,4 @@
+import { isRecord, sanitizeText } from "@linxiraos/pi-utils";
 import type { Component } from "../tui";
 import { Text } from "../components/text";
 import type { Theme } from "../theme/theme";
@@ -13,13 +14,11 @@ import {
 	toPathList,
 } from "../render/render-utils";
 import { classifyGroupedLines, describeGroupedOutput, groupLineIndicesByBlank } from "./grouped-file-output";
-import { getLanguageFromPath } from "../lang-from-path";
 import { code, compact, node, span } from "../native/describe";
 import type { NativeChild } from "../native/node";
 import { errorText, noteText, resultText, toolHead } from "./native-view";
 import type { OutputMeta } from "./output-meta";
-import { tuiText, tuiTextFmt } from "../i18n";
-import type { RenderResultOptions, ToolRenderer, NativeToolView } from "./renderer";
+import type { NativeToolView, RenderResultContextOptions, RenderResultOptions, ToolRenderer } from "./renderer";
 
 /** Display metadata returned by ast-grep. */
 export interface AstGrepToolDetails {
@@ -61,8 +60,7 @@ export const astGrepToolRenderer = {
 	renderCall(args: AstGrepRenderArgs, _options: RenderResultOptions, uiTheme: Theme): Component {
 		const meta: string[] = [];
 		const scopePaths = toPathList(args.path ?? args.paths);
-		if (scopePaths.length)
-			meta.push(tuiTextFmt("gpInLabelFmt", `in ${scopePaths.join(", ")}`, scopePaths.join(", ")));
+		if (scopePaths.length) meta.push(`in ${scopePaths.join(", ")}`);
 		if (args.skip !== undefined && args.skip > 0) meta.push(`skip:${args.skip}`);
 
 		const description = args.pat ?? "?";
@@ -72,15 +70,14 @@ export const astGrepToolRenderer = {
 
 	renderResult(
 		result: { content: Array<{ type: string; text?: string }>; details?: AstGrepToolDetails; isError?: boolean },
-		options: RenderResultOptions,
+		options: RenderResultContextOptions,
 		uiTheme: Theme,
 		args?: AstGrepRenderArgs,
 	): Component {
 		const details = result.details;
 
 		if (result.isError) {
-			const errorText =
-				result.content?.find(c => c.type === "text")?.text || tuiText("glUnknownError", "Unknown error");
+			const errorText = result.content?.find(c => c.type === "text")?.text || "Unknown error";
 			return new Text(formatErrorMessage(errorText, uiTheme), 0, 0);
 		}
 
@@ -91,33 +88,23 @@ export const astGrepToolRenderer = {
 
 		if (matchCount === 0) {
 			const description = args?.pat;
-			const meta = [tuiText("agrpZeroMatches", "0 matches")];
-			if (details?.scopePath) meta.push(tuiTextFmt("gpInLabelFmt", `in ${details.scopePath}`, details.scopePath));
-			if (filesSearched > 0) meta.push(tuiTextFmt("agrpSearchedFmt", `searched ${filesSearched}`, filesSearched));
+			const meta = ["0 matches"];
+			if (details?.scopePath) meta.push(`in ${details.scopePath}`);
+			if (filesSearched > 0) meta.push(`searched ${filesSearched}`);
 			const header = renderStatusLine({ icon: "warning", title: "AST Grep", description, meta }, uiTheme);
-			const lines = [header, formatEmptyMessage(tuiText("agrpNoMatches", "No matches found"), uiTheme)];
+			const lines = [header, formatEmptyMessage("No matches found", uiTheme)];
 			if (details?.parseErrors?.length) {
-				lines.push(
-					uiTheme.fg(
-						"warning",
-						tuiText("agrpMisScoped", "Query may be mis-scoped; narrow `path` before concluding absence"),
-					),
-				);
+				lines.push(uiTheme.fg("warning", "Query may be mis-scoped; narrow `path` before concluding absence"));
 				appendParseErrorsBulletList(lines, details.parseErrors, uiTheme, details.parseErrorsTotal);
 			}
 			return new Text(lines.join("\n"), 0, 0);
 		}
 
-		const matchMeta =
-			matchCount === 1
-				? tuiText("agrpMatchOne", "1 match")
-				: tuiTextFmt("agrpMatchManyFmt", "%d matches", matchCount);
-		const fileMeta =
-			fileCount === 1 ? tuiText("agrpFileOne", "1 file") : tuiTextFmt("agrpFileManyFmt", "%d files", fileCount);
-		const meta = [matchMeta, fileMeta];
-		if (details?.scopePath) meta.push(tuiTextFmt("gpInLabelFmt", `in ${details.scopePath}`, details.scopePath));
-		meta.push(tuiTextFmt("agrpSearchedFmt", `searched ${filesSearched}`, filesSearched));
-		if (limitReached) meta.push(uiTheme.fg("warning", tuiText("tLimitReached", "limit reached")));
+		const summaryParts = [formatCount("match", matchCount), formatCount("file", fileCount)];
+		const meta = [...summaryParts];
+		if (details?.scopePath) meta.push(`in ${details.scopePath}`);
+		meta.push(`searched ${filesSearched}`);
+		if (limitReached) meta.push(uiTheme.fg("warning", "limit reached"));
 		const description = args?.pat;
 		const header = renderStatusLine(
 			{
@@ -136,6 +123,20 @@ export const astGrepToolRenderer = {
 		// Resolve hyperlinks over the whole output so nested directory headers
 		// reconstruct across the blank-line groups the tree list collapses by.
 		const contexts = classifyGroupedLines(allLines, details?.cwd ?? details?.searchPath, details?.searchPath);
+		// The displayed lines are sanitized, but OSC 8 destinations must retain the
+		// original path bytes. Only substitute targets for headers already linked
+		// by the sanitized output; never let raw text create additional links.
+		const rawDetails = options.renderContext?.rawDetails;
+		const rawContent =
+			isRecord(rawDetails) && typeof rawDetails.displayContent === "string" ? rawDetails.displayContent : undefined;
+		const rawLines = rawContent?.split("\n");
+		const rawCwd = isRecord(rawDetails) && typeof rawDetails.cwd === "string" ? rawDetails.cwd : undefined;
+		const rawSearchPath =
+			isRecord(rawDetails) && typeof rawDetails.searchPath === "string" ? rawDetails.searchPath : undefined;
+		const rawContexts =
+			rawContent !== undefined && rawLines?.length === allLines.length && sanitizeText(rawContent) === textContent
+				? classifyGroupedLines(rawLines, rawCwd ?? rawSearchPath, rawSearchPath)
+				: undefined;
 		// Style lazily: the collapsed tree list only renders the first few groups,
 		// so a large result never styles/hyperlinks rows nobody sees.
 		const styledLines: (string | undefined)[] = Array.from({ length: allLines.length }, () => undefined);
@@ -144,13 +145,18 @@ export const astGrepToolRenderer = {
 			if (cached !== undefined) return cached;
 			const line = allLines[index]!;
 			const ctx = contexts[index]!;
+			const rawContext = rawContexts?.[index];
+			const target =
+				ctx.headerPath && rawContext?.kind === ctx.kind && rawContext.depth === ctx.depth
+					? (rawContext.headerPath ?? ctx.headerPath)
+					: ctx.headerPath;
 			let styled: string;
 			if (ctx.kind === "dir") {
 				const accent = uiTheme.fg("accent", line);
-				styled = ctx.headerPath ? fileHyperlink(ctx.headerPath, accent) : accent;
+				styled = target ? fileHyperlink(target, accent) : accent;
 			} else if (ctx.kind === "file") {
 				const tinted = uiTheme.fg(ctx.depth === 1 ? "accent" : "dim", line);
-				styled = ctx.headerPath ? fileHyperlink(ctx.headerPath, tinted) : tinted;
+				styled = target ? fileHyperlink(target, tinted) : tinted;
 			} else {
 				styled = uiTheme.fg(line.startsWith("  meta:") ? "dim" : "toolOutput", line);
 			}
@@ -174,9 +180,7 @@ export const astGrepToolRenderer = {
 
 		const extraLines: string[] = [];
 		if (limitReached) {
-			extraLines.push(
-				uiTheme.fg("warning", tuiText("agrpLimitNarrowPath", "limit reached; narrow path or increase limit")),
-			);
+			extraLines.push(uiTheme.fg("warning", "limit reached; narrow path or use skip"));
 		}
 		if (details?.parseErrors?.length) {
 			extraLines.push(
@@ -274,8 +278,8 @@ export const astGrepToolRenderer = {
 		return {
 			head,
 			body: compact<NativeChild>([
-				...describeGroupedOutput(kept, { lang: getLanguageFromPath }),
-				limitReached && noteText("limit reached; narrow path or increase limit", "warning"),
+				...describeGroupedOutput(kept),
+				limitReached && noteText("limit reached; narrow path or use skip", "warning"),
 				parseNote,
 			]),
 			preview: { lines: COLLAPSED_MATCH_LIMIT },

package/src/tools/bash.d.ts

@@ -18,6 +18,8 @@ export interface BashToolDetails {
     requestedTimeoutSeconds?: number;
     timeoutDisabled?: boolean;
     wallTimeMs?: number;
+    /** False when no wall-time footer was emitted; absent on older results. */
+    wallTimeNoticeEmitted?: boolean;
     /** Exit code of a command that ran to completion but failed (non-zero). */
     exitCode?: number;
     /** True when the command was killed by its timeout deadline (not a failure). */
@@ -31,12 +33,15 @@ export interface BashToolDetails {
         timedOut: boolean;
         pid?: number;
     };
+    /** Background job behind the call; `cancelled`: killed (`proc://<id>/kill`) before it finished. */
     async?: {
-        state: "running" | "completed" | "failed";
+        state: "running" | "completed" | "failed" | "cancelled";
         jobId: string;
         type: "bash";
     };
 }
+/** Minimum duration for a model-facing wall-time notice; shorter runs keep timing only in details. */
+export declare const WALL_TIME_NOTICE_MIN_MS = 1000;
 /** Formats the model-facing command duration notice. */
 export declare function formatWallTimeNotice(wallTimeMs: number): string;
 /** Formats the model-facing command exit status notice. */

package/src/tools/bash.ts

@@ -62,6 +62,8 @@ export interface BashToolDetails {
 	requestedTimeoutSeconds?: number;
 	timeoutDisabled?: boolean;
 	wallTimeMs?: number;
+	/** False when no wall-time footer was emitted; absent on older results. */
+	wallTimeNoticeEmitted?: boolean;
 	/** Exit code of a command that ran to completion but failed (non-zero). */
 	exitCode?: number;
 	/** True when the command was killed by its timeout deadline (not a failure). */
@@ -75,8 +77,9 @@ export interface BashToolDetails {
 		timedOut: boolean;
 		pid?: number;
 	};
+	/** Background job behind the call; `cancelled`: killed (`proc://<id>/kill`) before it finished. */
 	async?: {
-		state: "running" | "completed" | "failed";
+		state: "running" | "completed" | "failed" | "cancelled";
 		jobId: string;
 		type: "bash";
 	};
@@ -208,6 +211,9 @@ function formatWallTimeSeconds(wallTimeMs: number): string {
 	return (wallTimeMs / 1000).toFixed(2);
 }
 
+/** Minimum duration for a model-facing wall-time notice; shorter runs keep timing only in details. */
+export const WALL_TIME_NOTICE_MIN_MS = 1000;
+
 /** Formats the model-facing command duration notice. */
 export function formatWallTimeNotice(wallTimeMs: number): string {
 	return `Wall time: ${formatWallTimeSeconds(wallTimeMs)} seconds`;
@@ -318,7 +324,7 @@ function stripBashNotices(
 			? strippedOutput
 			: stripTrailingNotice(strippedOutput, formatExitCodeNotice(details.exitCode));
 	const withoutWall =
-		details?.wallTimeMs === undefined
+		details?.wallTimeMs === undefined || details.wallTimeNoticeEmitted === false
 			? withoutExit
 			: stripTrailingNotice(withoutExit, formatWallTimeNotice(details.wallTimeMs));
 	return stripRawOutputArtifactNotice(withoutWall);
@@ -426,9 +432,9 @@ function shellRunState(
 	cancelled: boolean,
 ): RunState {
 	if (cancelled) return "cancelled";
+	if (details?.async?.state === "running") return "background";
 	if (isPartial) return "running";
 	if (details?.timedOut === true) return "timed-out";
-	if (details?.async?.state === "running") return "background";
 	if (isError || (details?.exitCode !== undefined && details.exitCode !== 0)) return "failed";
 	return "done";
 }
@@ -677,13 +683,13 @@ export function createShellRenderer<TArgs>(config: ShellRendererConfig<TArgs>) {
 			const command = formatBashCommandText(toBashRenderArgs(args, config));
 			const previewLines = renderContext?.previewLines ?? BASH_DEFAULT_PREVIEW_LINES;
 			const state = shellRunState(details, isError, isPartial, options.cancelled === true);
-			// Settled: the measured wall time wins. A background job outlives the call: its run time is unknown here.
-			const elapsedMs =
-				state === "background"
+			// Live (a running call, or a parked job still streaming): the call's clock. Settled: the
+			// measured wall time wins. A frozen background snapshot's run time is unknown here.
+			const elapsedMs = isPartial
+				? options.elapsedMs
+				: state === "background"
 					? undefined
-					: isPartial
-						? options.elapsedMs
-						: (details?.wallTimeMs ?? options.elapsedMs);
+					: (details?.wallTimeMs ?? options.elapsedMs);
 			const meta = details?.meta;
 			const box = runBox(
 				[

package/src/tools/debug.ts

@@ -10,6 +10,7 @@ import {
 	replaceTabs,
 	TRUNCATE_LENGTHS,
 	truncateToWidth,
+	clipCollapsed,
 } from "../render/render-utils";
 import type { NativeToolView, RenderResultOptions, ToolRenderer, ToolRenderResult } from "./renderer";
 import { ansi, kv } from "../native/describe";
@@ -210,7 +211,7 @@ export const debugToolRenderer = {
 			const previewLimit = options.expanded ? PREVIEW_LIMITS.EXPANDED_LINES : PREVIEW_LIMITS.COLLAPSED_LINES;
 			const displayedLines = rawLines
 				.slice(0, previewLimit)
-				.map(line => truncateToWidth(line, TRUNCATE_LENGTHS.LINE));
+				.map(line => clipCollapsed(line, TRUNCATE_LENGTHS.LINE, options.expanded));
 			const remaining = rawLines.length - displayedLines.length;
 			if (remaining > 0) {
 				displayedLines.push(

package/src/tools/default-renderer.ts

@@ -7,7 +7,7 @@ import type { Theme } from "../theme/theme";
 import { formatOutputPaneLines, styleToolOutputLine } from "../render/output-pane";
 import { renderStatusLine, type StatusLineOptions } from "../render/status-line";
 import { plainToolCard, type ToolCardPhase } from "../render/tool-card";
-import { truncateToWidth } from "../render/render-utils";
+import { clipCollapsed } from "../render/render-utils";
 import {
 	describeJsonTree,
 	formatArgsInline,
@@ -133,7 +133,8 @@ function buildDefaultToolBody(input: DefaultToolRenderInput, uiTheme: Theme, con
 							expanded: options.expanded,
 							collapsedMaxLines: 4,
 							expandedMaxLines: 12,
-							styleLine: line => truncateToWidth(styleToolOutputLine(line, uiTheme), contentWidth),
+							styleLine: line =>
+								clipCollapsed(styleToolOutputLine(line, uiTheme), contentWidth, options.expanded),
 							showExpandHintWhenUncapped: true,
 						},
 						uiTheme,

package/src/tools/edit.d.ts

@@ -133,6 +133,8 @@ export interface EditRenderContext {
     renderDiff?: (diffText: string, options?: {
         filePath?: string;
     }) => string;
+    /** Unsanitized result metadata, used only for filesystem link targets. */
+    rawDetails?: unknown;
 }
 /** Render replacement text until a computed diff preview is available. */
 export declare function renderStreamingFallback(editMode: EditMode, args: unknown, theme: Theme): string;

package/src/tools/edit.ts

@@ -198,6 +198,8 @@ export interface EditRenderContext {
 	editStreamingFallback?: string;
 	/** Function to render diff text with syntax highlighting */
 	renderDiff?: (diffText: string, options?: { filePath?: string }) => string;
+	/** Unsanitized result metadata, used only for filesystem link targets. */
+	rawDetails?: unknown;
 }
 
 /**
@@ -297,7 +299,7 @@ function truncateEditTitlePath(displayPath: string, maxWidth: number | undefined
 }
 
 function formatEditTitlePath(pathValue: string, maxWidth?: number): string {
-	return truncateEditTitlePath(replaceTabs(shortenPath(pathValue)), maxWidth);
+	return truncateEditTitlePath(replaceTabs(shortenPath(sanitizeText(pathValue))), maxWidth);
 }
 
 function formatEditPathDisplay(
@@ -357,6 +359,7 @@ function renderEditHeader(
 		rename?: string;
 		firstChangedLine?: number;
 		linkPath?: string;
+		renameLinkPath?: string;
 		statsSuffix?: string;
 		extraSuffix?: string;
 		title?: string;
@@ -367,6 +370,7 @@ function renderEditHeader(
 		rename: options.rename,
 		firstChangedLine: options.firstChangedLine,
 		linkPath: options.linkPath,
+		renameLinkPath: options.renameLinkPath,
 	};
 	const formatted = formatEditDescription(options.rawPath, uiTheme, descriptionOptions);
 	const suffix = `${options.statsSuffix ?? ""}${options.extraSuffix ?? ""}`;
@@ -402,7 +406,14 @@ function renderEditHeader(
  */
 function renderInlineEditRow(
 	uiTheme: Theme,
-	opts: { op?: Operation; rename?: string; rawPath: string; linkPath?: string; pending: boolean },
+	opts: {
+		op?: Operation;
+		rename?: string;
+		rawPath: string;
+		linkPath?: string;
+		renameLinkPath?: string;
+		pending: boolean;
+	},
 ): Component {
 	const isDelete = opts.op === "delete";
 	return new WidthAwareText(
@@ -417,6 +428,7 @@ function renderInlineEditRow(
 				rawPath: opts.rawPath,
 				rename: opts.rename,
 				linkPath: opts.linkPath,
+				renameLinkPath: opts.renameLinkPath,
 			}),
 		0,
 		0,
@@ -481,6 +493,21 @@ interface StreamingDiffTail {
 	hidden: boolean;
 }
 
+/**
+ * Visual rows a raw diff line occupies once `renderDiff` gives it a code-frame
+ * gutter and `wrapEditRendererLine` hangs its continuations beneath it.
+ * Canonical `+12|` rows render a padded `max(3, digits) + 1` gutter plus `│`;
+ * rows already carrying a `│` rail keep their own prefix. Content wraps at the
+ * width left after that gutter; unnumbered rows wrap whole.
+ */
+function streamingDiffLineRows(rawLine: string, innerWidth: number): number {
+	const numbered = /^([+\-\s]\s*(\d+)[|│])(.*)$/s.exec(rawLine) ?? /^([+\-\s]\s*(\d+)\s)(.*)$/s.exec(rawLine);
+	if (!numbered) return Math.max(1, wrapTextWithAnsi(replaceTabs(rawLine), innerWidth).length);
+	const gutterWidth = Math.max(visibleWidth(numbered[1]!), Math.max(3, numbered[2]!.length) + 2);
+	const contentWidth = Math.max(1, innerWidth - gutterWidth);
+	return Math.max(1, wrapTextWithAnsi(replaceTabs(numbered[3] ?? ""), contentWidth).length);
+}
+
 /**
  * Select the trailing physical lines that fit the live preview budget.
  *
@@ -500,7 +527,7 @@ function sliceStreamingDiffTail(diff: string, innerWidth: number, budget: number
 	while (cursor >= 0) {
 		const newline = cursor > 0 ? diff.lastIndexOf("\n", cursor - 1) : -1;
 		const lineStart = newline + 1;
-		const lineRows = Math.max(1, wrapTextWithAnsi(replaceTabs(diff.slice(lineStart, cursor)), innerWidth).length);
+		const lineRows = streamingDiffLineRows(diff.slice(lineStart, cursor), innerWidth);
 		if (visualRows > 0 && visualRows + lineRows > rowLimit) break;
 		visualRows += lineRows;
 		start = lineStart;
@@ -1142,7 +1169,10 @@ export const editToolRenderer = {
 				while (bodyLines.length > 0 && bodyLines[0].trim() === "") bodyLines.shift();
 				return {
 					header,
-					sections: bodyLines.length > 0 ? [{ content: bodyLines }] : [],
+					sections:
+						bodyLines.length > 0
+							? [{ content: bodyLines.flatMap(line => wrapEditRendererLine(line, Math.max(1, width - 2))) }]
+							: [],
 					phase: applyPatchError ? "error" : "pending",
 					borderColor: applyPatchError ? "error" : "borderMuted",
 					contentPaddingLeft: 0,
@@ -1192,7 +1222,7 @@ export const editToolRenderer = {
 				diffText = args.previewDiff ?? args.diff ?? "";
 				body.push(editDiff(diffText, rawPath));
 			} else if (args.diff || args.newText || args.patch) {
-				body.push(code(args.diff ?? args.newText ?? args.patch ?? "", { lang: getLanguageFromPath(rawPath) }));
+				body.push(code(args.diff ?? args.newText ?? args.patch ?? "", { path: rawPath || undefined }));
 			} else if (renderContext?.editDiffPreview) {
 				const preview = renderContext.editDiffPreview;
 				if ("error" in preview && preview.error) body.push(errorText(preview.error));
@@ -1230,8 +1260,18 @@ export const editToolRenderer = {
 			let added = 0;
 			let removed = 0;
 			// Files are borderless sections inside the one tool frame.
-			const body: NativeChild[] = perFileResults.map(fileResult => {
-				const file = editFileParts({ content: [], details: fileResult, isError: fileResult.isError }, options);
+			const body: NativeChild[] = perFileResults.map((fileResult, index) => {
+				const rawDetails = options.renderContext?.rawDetails;
+				const rawPerFile =
+					rawDetails && typeof rawDetails === "object" && "perFileResults" in rawDetails
+						? rawDetails.perFileResults
+						: undefined;
+				const file = editFileParts(
+					{ content: [], details: fileResult, isError: fileResult.isError },
+					options,
+					undefined,
+					Array.isArray(rawPerFile) ? rawPerFile[index] : undefined,
+				);
 				added += file.added;
 				removed += file.removed;
 				return fileDiffSection(file, file.body, {
@@ -1304,13 +1344,13 @@ function editToolHead(facts: EditHeadFacts): NativeToolHead {
 	const multi = (facts.files ?? 0) > 1;
 	const meta = compact([
 		diffStatsMeta(facts.added, facts.removed),
-		!multi && facts.rename ? `→ ${displayPath(facts.rename)}` : undefined,
+		!multi && facts.rename ? `→ ${displayPath(sanitizeText(facts.rename))}` : undefined,
 	]);
 	const badge = facts.diagnostics && diagnosticsBadge(facts.diagnostics);
 	const target = multi
 		? `${facts.files} files`
 		: facts.path
-			? `${displayPath(facts.path)}${facts.line ? `:${facts.line}` : ""}`
+			? `${displayPath(sanitizeText(facts.path))}${facts.line ? `:${facts.line}` : ""}`
 			: undefined;
 	return {
 		title: multi ? "Edit" : getOperationTitle(facts.op),
@@ -1322,9 +1362,9 @@ function editToolHead(facts: EditHeadFacts): NativeToolHead {
 	};
 }
 
-/** A file's diff: hunks highlighted by the path's language, no path header (the head or section names the file). */
+/** A file's diff: Tern highlights the hunks by the file's grammar and draws no path header (the head or section names the file). */
 function editDiff(diffText: string, filePath: string): NativeNode {
-	return nativeDiff(diffText, { lang: filePath ? getLanguageFromPath(filePath) : undefined });
+	return nativeDiff(diffText, { path: filePath || undefined });
 }
 
 /** One file's edit result for native views: head facts plus its body (diff or error, then diagnostics). */
@@ -1337,6 +1377,15 @@ interface EditFileParts extends Omit<EditHeadFacts, "diagnostics"> {
 	body: NativeChild[];
 }
 
+/** Raw metadata paths are reserved for link targets; visible content comes from sanitized details. */
+function rawEditPaths(value: unknown): { path?: string; sourcePath?: string } {
+	if (value === null || typeof value !== "object" || Array.isArray(value)) return {};
+	return {
+		path: "path" in value && typeof value.path === "string" ? value.path : undefined,
+		sourcePath: "sourcePath" in value && typeof value.sourcePath === "string" ? value.sourcePath : undefined,
+	};
+}
+
 function editFileParts(
 	result: {
 		content: Array<{ type: string; text?: string }>;
@@ -1345,8 +1394,10 @@ function editFileParts(
 	},
 	options: RenderResultOptions & { renderContext?: EditRenderContext },
 	args?: EditRenderArgs,
+	rawFileDetails?: unknown,
 ): EditFileParts {
 	const details = result.details;
+	const rawPaths = rawEditPaths(rawFileDetails ?? options.renderContext?.rawDetails);
 	const isError = result.isError ?? (details && "isError" in details ? details.isError : false) ?? false;
 	const firstEdit = Array.isArray(args?.edits) ? args.edits[0] : undefined;
 	const firstHashlineInputEntry = getHashlineInputRenderSummary(args ?? {}, options.renderContext?.editMode)
@@ -1373,7 +1424,7 @@ function editFileParts(
 	const firstChangedLine =
 		(editDiffPreview && "firstChangedLine" in editDiffPreview ? editDiffPreview.firstChangedLine : undefined) ||
 		(details && !isError ? details.firstChangedLine : undefined);
-	const shownPath = displayPath(detailPath ?? rawPath);
+	const shownPath = displayPath(sanitizeText(detailPath ?? rawPath));
 	const body: NativeChild[] = [];
 	if (isError) {
 		const displayErrorText = details && "displayErrorText" in details ? details.displayErrorText : undefined;
@@ -1392,10 +1443,10 @@ function editFileParts(
 	const stats = diffText ? getDiffStats(diffText) : undefined;
 	return {
 		op,
-		path: rawPath,
+		path: sanitizeText(rawPath),
 		line: firstChangedLine,
-		rename,
-		resolvedPath: detailPath,
+		rename: rename === undefined ? undefined : sanitizeText(rename),
+		resolvedPath: rawPaths.path ?? detailPath,
 		added: stats?.added ?? 0,
 		removed: stats?.removed ?? 0,
 		isError: Boolean(isError),
@@ -1415,6 +1466,7 @@ function renderSingleFileResult(
 	args?: EditRenderArgs,
 ): Component {
 	const details = result.details;
+	const rawPaths = rawEditPaths(options.renderContext?.rawDetails);
 	const isError = result.isError ?? (details && "isError" in details ? details.isError : false);
 	const edits = Array.isArray(args?.edits) ? args.edits : undefined;
 	const firstEdit = edits?.[0];
@@ -1449,8 +1501,17 @@ function renderSingleFileResult(
 	// container. Errors, no-ops, creates, move-with-edits, and anything with
 	// diagnostics keep the framed block below.
 	if (!isError && !details?.diff && !details?.diagnostics && (op === "delete" || rename)) {
-		const linkPath = details && "path" in details ? details.path : undefined;
-		return renderInlineEditRow(uiTheme, { op, rename, rawPath, linkPath, pending: false });
+		const linkPath = rename
+			? (rawPaths.sourcePath ?? moveSource ?? rawPaths.path ?? detailPath)
+			: (rawPaths.path ?? detailPath);
+		return renderInlineEditRow(uiTheme, {
+			op,
+			rename,
+			rawPath,
+			linkPath,
+			renameLinkPath: rename ? (rawPaths.path ?? detailPath) : undefined,
+			pending: false,
+		});
 	}
 
 	const renderFallbackDiff = (diffText: string, diffOptions?: { filePath?: string }): string =>
@@ -1481,7 +1542,9 @@ function renderSingleFileResult(
 			const firstChangedLine =
 				(editDiffPreview && "firstChangedLine" in editDiffPreview ? editDiffPreview.firstChangedLine : undefined) ||
 				(details && !isError ? details.firstChangedLine : undefined);
-			const linkPath = details && "path" in details ? details.path : undefined;
+			const linkPath = rename
+				? (rawPaths.sourcePath ?? moveSource ?? rawPaths.path ?? detailPath)
+				: (rawPaths.path ?? detailPath);
 
 			// Change stats ride inline on the header bar next to the path.
 			const previewDiff = editDiffPreview && !("error" in editDiffPreview) ? editDiffPreview.diff : undefined;
@@ -1499,6 +1562,7 @@ function renderSingleFileResult(
 				rename,
 				firstChangedLine,
 				linkPath,
+				renameLinkPath: rename ? (rawPaths.path ?? detailPath) : undefined,
 				statsSuffix,
 			});
 			const innerWidth = Math.max(1, width - 2);
@@ -1523,7 +1587,11 @@ function renderSingleFileResult(
 				// (Delete / `src → dst`); only a true no-op needs an explanatory
 				// body so an empty card isn't mistaken for a stalled edit.
 				if (op !== "delete" && op !== "create" && !rename) {
-					const noChangePath = linkPath ? shortenPath(linkPath) : rawPath ? shortenPath(rawPath) : "";
+					const noChangePath = detailPath
+						? shortenPath(detailPath)
+						: rawPath
+							? shortenPath(sanitizeText(rawPath))
+							: "";
 					body = uiTheme.fg("dim", `No changes were made${noChangePath ? ` to ${noChangePath}` : ""}.`);
 				}
 			} else if (editDiffPreview) {
@@ -1575,8 +1643,19 @@ function renderMultiFileResult(
 	options: RenderResultOptions & { renderContext?: EditRenderContext },
 	uiTheme: Theme,
 ): Component {
-	const fileComponents = perFileResults.map(fileResult =>
-		renderSingleFileResult({ content: [], details: fileResult, isError: fileResult.isError }, options, uiTheme),
+	const rawDetails = options.renderContext?.rawDetails;
+	const rawPerFile =
+		rawDetails && typeof rawDetails === "object" && "perFileResults" in rawDetails
+			? rawDetails.perFileResults
+			: undefined;
+	const fileComponents = perFileResults.map((fileResult, index) =>
+		renderSingleFileResult(
+			{ content: [], details: fileResult, isError: fileResult.isError },
+			Array.isArray(rawPerFile)
+				? { ...options, renderContext: { ...options.renderContext, rawDetails: rawPerFile[index] } }
+				: options,
+			uiTheme,
+		),
 	);
 	const remaining = Math.max(0, totalFiles - perFileResults.length);