@herbertgao/pi-extensions 2026.9.19 → 2026.10.0

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/tool/result.ts

@@ -1,32 +1,39 @@
 import { Text, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
-import { posix, win32 } from "node:path";
 import { inspect } from "node:util";
 import { config } from "../../config/config.ts";
-import { showMoreHintText } from "../show-more-hint.ts";
+import { createCodeBlockHighlighter } from "./diff/diff-highlight.ts";
+import { showMoreHintText } from "./show-more-hint.ts";
 import { TOOL_LOADING_INTERVAL_MS, toolLoadingIcon } from "../../utils/tool-loading-icon.ts";
+import { getToolMouseTui } from "../mouse/scroll.ts";
 import { sanitizeToolResultText } from "../../utils/tool-result-sanitize.ts";
 
+const TOOL_VIEWPORT_WIDTH_RATIO = 0.8;
+/** 宽屏右侧留白上限：比例留白超过这么多列时改用固定留白。 */
+const TOOL_VIEWPORT_MAX_GUTTER = 24;
+
 export function toolViewportWidth(width: number): number {
-	return Math.max(1, Math.floor(width));
+	return Math.max(
+		1,
+		Math.floor(width * TOOL_VIEWPORT_WIDTH_RATIO),
+		Math.floor(width) - TOOL_VIEWPORT_MAX_GUTTER,
+	);
 }
 
-/** 与默认工具结果相同的一级缩进包装。 */
+/** 与默认工具结果相同的一级缩进包装。子组件只扣始终加上的 1 列；↳ 行多出的 2 列由 truncateToWidth 吃掉。 */
 export function insetComponent(component: any): any {
-	return {
+	const wrapped: Record<string, unknown> = {
 		render: (width: number) =>
 			component.render(Math.max(1, width - 1)).map((line: string) => {
 				const nestedMarker = line.replace(/^((?:\x1b\[[0-?]*[ -/]*[@-~])*)↳/, "$1  ↳");
-				return ` ${nestedMarker}`;
+				return truncateToWidth(` ${nestedMarker}`, Math.max(0, width), "");
 			}),
 		invalidate: () => component.invalidate?.(),
 	};
-}
-
-export function oneLine(value: unknown, max = 4096): string {
-	const text = sanitizeToolResultText(String(value ?? ""))
-		.replace(/\s+/g, " ")
-		.trim();
-	return text.length > max ? `${text.slice(0, max - 1)}…` : text;
+	// 内层 diff 声明的 remainder 行：鼠标层只能看到这个包装组件。
+	if (typeof component.isCollapsedHintLine === "function") {
+		wrapped.isCollapsedHintLine = (line: string) => component.isCollapsedHintLine(line);
+	}
+	return wrapped;
 }
 
 function rawTextFromResult(result: any): string {
@@ -72,14 +79,11 @@ function hasExpandableResult(text: string): boolean {
 	return countLines(text) > 1;
 }
 
-function toolIcon(_name: string): string {
-	return "●";
-}
-
 const activeAnimationContexts = new Set<any>();
 let sharedAnimationTimer: ReturnType<typeof setTimeout> | null = null;
 
 function clearAnimation(context: any) {
+	if (context?.state) context.state.ccstyleAnimationLight = false;
 	if (!context?.state?.ccstyleAnimationScheduled) return;
 	context.state.ccstyleAnimationScheduled = false;
 	activeAnimationContexts.delete(context);
@@ -92,6 +96,7 @@ function clearAnimation(context: any) {
 export function clearAllAnimations() {
 	for (const ctx of activeAnimationContexts) {
 		ctx.state.ccstyleAnimationScheduled = false;
+		ctx.state.ccstyleAnimationLight = false;
 	}
 	activeAnimationContexts.clear();
 	if (sharedAnimationTimer) {
@@ -100,8 +105,15 @@ export function clearAllAnimations() {
 	}
 }
 
-export function scheduleAnimation(context: any, intervalMs = TOOL_LOADING_INTERVAL_MS) {
+export function scheduleAnimation(
+	context: any,
+	options: { light?: boolean; intervalMs?: number } = {},
+) {
 	const state = (context.state ??= {});
+	// light：调用方自己在 render() 内重取 loading 帧，定时器只需请求重绘；
+	// 否则定时器走 context.invalidate()（compact 摘要等靠它重建）。
+	// 每次调用都按本次 options 写入，避免上次 light 残留后非 light 调用仍跳过 invalidate。
+	state.ccstyleAnimationLight = Boolean(options.light);
 	if (state.ccstyleAnimationScheduled) return;
 	state.ccstyleAnimationScheduled = true;
 	activeAnimationContexts.add(context);
@@ -110,11 +122,16 @@ export function scheduleAnimation(context: any, intervalMs = TOOL_LOADING_INTERV
 			sharedAnimationTimer = null;
 			const contexts = Array.from(activeAnimationContexts);
 			activeAnimationContexts.clear();
+			const tui = getToolMouseTui();
+			const canRequestRender = typeof tui?.requestRender === "function";
+			let lightFrames = false;
 			for (const ctx of contexts) {
 				ctx.state.ccstyleAnimationScheduled = false;
-				ctx.invalidate?.();
+				if (ctx.state.ccstyleAnimationLight && canRequestRender) lightFrames = true;
+				else ctx.invalidate?.();
 			}
-		}, intervalMs);
+			if (lightFrames) tui.requestRender();
+		}, options.intervalMs ?? TOOL_LOADING_INTERVAL_MS);
 	}
 }
 
@@ -127,7 +144,8 @@ type ToolVisualState = "pending" | "success" | "error";
 export function settledIcon(name: string, state: ToolVisualState | undefined): string {
 	if (state === "success") return "✓";
 	if (state === "error") return "✗";
-	return toolIcon(name);
+	// toolIcon(name) 曾恒返回 "●"，已内联；name 保留以稳定导出签名。
+	return "●";
 }
 
 export function setToolVisualState(context: any, visualState: ToolVisualState) {
@@ -213,8 +231,8 @@ export class ExpandedToolResultText {
 	}
 }
 
-/** Affordance next to truncated Input/Output headers — click opens full preview. */
-export const SHOW_MORE_LABEL = "• click to show more";
+/** 截断体末行 `… +N more lines` 旁的展开提示，点击打开全量预览。 */
+export const SHOW_MORE_LABEL = "· click to show more";
 
 export type ToolIoSection = "input" | "output";
 
@@ -232,6 +250,8 @@ const EXPANDED_TOOL_IO_VIEW_GENERATION = Symbol("ccstyle-expanded-tool-io-view")
  *   └ Output  click to show more
  *     result line…
  *
+ * flushLeft=true（仅 mode=on 展开卡）：去掉树线前导空格，由外层 Box(1,1) 提供 1 格 padding。
+ *
  * Reused across re-renders via context.lastComponent when possible.
  */
 export class ExpandedToolIoView {
@@ -247,16 +267,31 @@ export class ExpandedToolIoView {
 	private hoveredSection: ToolIoSection | null = null;
 	/** Which sections currently show the show-more affordance (after last render). */
 	private truncated: { input: boolean; output: boolean } = { input: false, output: false };
-	/** 0-based body/footer line indexes that carry show-more after last render. */
+	/** 0-based header line indexes that carry show-more after last render. */
 	private showMoreHeaderRows: { input?: number; output?: number } = {};
+	/** Input 里的代码块（codemode 的 `code`）：着色行覆盖默认 dim/muted 样式。 */
+	private inputCode?:
+		| {
+				startLine: number;
+				language: string;
+				standalone: boolean;
+				code: string;
+				theme: unknown;
+				rows: () => string[];
+		  }
+		| undefined;
+
+	/** flushLeft：贴左渲染（mode=on 展开卡）；默认 false 保留前导空格（compact 等共用路径）。 */
+	private flushLeft: boolean;
 
 	constructor(
 		theme: any,
 		inputBody: string,
 		outputBody: string,
 		isError: boolean,
-		maxOutputLines = config.expandedPreviewMaxLines,
-		maxInputLines = config.expandedPreviewMaxLines,
+		maxOutputLines = config.expandedOutputMaxLines,
+		maxInputLines = config.expandedInputMaxLines,
+		flushLeft = false,
 	) {
 		this.theme = theme;
 		this.inputBody = inputBody;
@@ -264,6 +299,7 @@ export class ExpandedToolIoView {
 		this.isError = isError;
 		this.maxOutputLines = Math.max(1, maxOutputLines);
 		this.maxInputLines = Math.max(1, maxInputLines);
+		this.flushLeft = flushLeft;
 	}
 
 	setContent(
@@ -272,16 +308,19 @@ export class ExpandedToolIoView {
 		isError: boolean,
 		maxOutputLines?: number,
 		maxInputLines?: number,
+		flushLeft?: boolean,
 	): void {
 		const nextOut =
 			maxOutputLines !== undefined ? Math.max(1, maxOutputLines) : this.maxOutputLines;
 		const nextIn = maxInputLines !== undefined ? Math.max(1, maxInputLines) : this.maxInputLines;
+		const nextFlush = flushLeft !== undefined ? flushLeft : this.flushLeft;
 		if (
 			this.inputBody === inputBody &&
 			this.outputBody === outputBody &&
 			this.isError === isError &&
 			this.maxOutputLines === nextOut &&
-			this.maxInputLines === nextIn
+			this.maxInputLines === nextIn &&
+			this.flushLeft === nextFlush
 		) {
 			return;
 		}
@@ -290,6 +329,7 @@ export class ExpandedToolIoView {
 		this.isError = isError;
 		this.maxOutputLines = nextOut;
 		this.maxInputLines = nextIn;
+		this.flushLeft = nextFlush;
 		this.invalidate();
 	}
 
@@ -297,6 +337,57 @@ export class ExpandedToolIoView {
 		return this.inputBody;
 	}
 
+	/**
+	 * 登记 Input 里的代码块：同步 cli-highlight 打底，shiki 异步升级，落地后
+	 * 经 invalidate 重画。同一份代码与主题只建一次（视图按宽度缓存行）。
+	 */
+	setInputCode(block: InputCodeBlock | undefined): void {
+		if (!block) {
+			if (this.inputCode) {
+				this.inputCode = undefined;
+				this.invalidate();
+			}
+			return;
+		}
+		if (this.inputCode?.code === block.code && this.inputCode.theme === this.theme) {
+			this.inputCode.startLine = block.startLine;
+			this.inputCode.standalone = block.standalone;
+			return;
+		}
+		this.inputCode = {
+			startLine: block.startLine,
+			language: block.language,
+			standalone: block.standalone,
+			code: block.code,
+			theme: this.theme,
+			rows: createCodeBlockHighlighter(block.code, block.language, this.theme, () => {
+				// 视图自己的行缓存 + 外层工具卡（清 paint 缓存并 requestRender）
+				this.invalidate();
+				invalidateIoView(this);
+			}),
+		};
+		this.invalidate();
+	}
+
+	/**
+	 * 整段 Input 就是代码块时给出语言与代码，供全量预览包一层围栏（弹框按 Markdown
+	 * 渲染，围栏代码块由 pi 的 highlightCode 着色）。混了别的字段时返回 undefined。
+	 */
+	getInputCodeFence(): { language: string; code: string } | undefined {
+		const block = this.inputCode;
+		return block?.standalone ? { language: block.language, code: block.code } : undefined;
+	}
+
+	/** 代码块里某一源行的着色内容（已剥掉行首缩进）；不在块内时为 undefined。 */
+	private inputCodeLine(sourceIndex: number): string | undefined {
+		const block = this.inputCode;
+		if (!block) return undefined;
+		const offset = sourceIndex - block.startLine;
+		if (offset < 0) return undefined;
+		const rows = block.rows();
+		return offset < rows.length ? rows[offset] : undefined;
+	}
+
 	getOutputBody(): string {
 		return this.outputBody.trim() ? this.outputBody : "Done";
 	}
@@ -307,10 +398,14 @@ export class ExpandedToolIoView {
 		this.invalidate();
 	}
 
-	/** True when the plain footer line is a truncated section with show-more. */
+	getHoveredSection(): ToolIoSection | null {
+		return this.hoveredSection;
+	}
+
+	/** True when the plain truncation footer carries show-more. Input 续行带 │，Output 不带。 */
 	matchShowMoreLine(plainLine: string): ToolIoSection | null {
 		const line = plainLine.replace(/\x1b\[[0-9;]*m/g, "");
-		if (!line.includes(` • ${showMoreHintText()}`) || !/\+\d+ more lines/.test(line)) return null;
+		if (!line.includes(` · ${showMoreHintText()}`) || !/\+\d+ more lines/.test(line)) return null;
 		if (this.truncated.input && line.includes("│")) return "input";
 		if (this.truncated.output) return "output";
 		return null;
@@ -331,7 +426,7 @@ export class ExpandedToolIoView {
 	/** Column range (1-based, visible cells) of show-more on a rendered header, if present. */
 	showMoreHitbox(plainLine: string): { startCol: number; endCol: number } | null {
 		const line = plainLine.replace(/\x1b\[[0-9;]*m/g, "");
-		const label = ` • ${showMoreHintText()}`;
+		const label = ` · ${showMoreHintText()}`;
 		const idx = line.lastIndexOf(label);
 		if (idx < 0) return null;
 		const before = line.slice(0, idx);
@@ -347,7 +442,9 @@ export class ExpandedToolIoView {
 
 		const theme = this.theme;
 		const safeWidth = Math.max(1, Math.floor(width));
-		const rail = " │ ";
+		// flushLeft：贴左（外层 Box 负责 1 格 pad）；否则保留 1 格前导空格（compact 共用）
+		const lead = this.flushLeft ? "" : " ";
+		const rail = `${lead}│ `;
 		const railWidth = visibleWidth(rail);
 		const bodyWidth = toolViewportWidth(safeWidth);
 		const contentWidth = Math.max(1, bodyWidth - railWidth);
@@ -357,7 +454,7 @@ export class ExpandedToolIoView {
 		this.showMoreHeaderRows = {};
 
 		const pushHeader = (corner: "├" | "└", label: string) => {
-			const mark = theme.fg("dim", ` ${corner} `);
+			const mark = theme.fg("dim", `${lead}${corner} `);
 			const title = theme.fg(
 				"accent",
 				typeof theme.bold === "function" ? theme.bold(label) : label,
@@ -366,20 +463,13 @@ export class ExpandedToolIoView {
 		};
 
 		const pushRailLine = (styledContent: string, continued = true) => {
-			const prefix = continued ? rail : "   ";
+			// 续行 rail；Output 正文相对 └ 缩进 2 格（+ 可选 lead）
+			const prefix = continued ? rail : `${lead}  `;
 			lines.push(truncateToWidth(theme.fg("dim", prefix) + styledContent, safeWidth, ""));
 		};
 
 		const pushBlankRail = () => {
-			lines.push(truncateToWidth(theme.fg("dim", " │"), safeWidth, ""));
-		};
-
-		/** Style `key: value` input rows — dim keys, readable values. */
-		const styleInputLine = (rawLine: string): string => {
-			const match = rawLine.match(/^([A-Za-z_][\w.-]*)(:\s*)(.*)$/);
-			if (!match) return theme.fg("muted", rawLine);
-			const [, key, sep, rest] = match;
-			return theme.fg("dim", key + sep) + theme.fg("muted", rest ?? "");
+			lines.push(truncateToWidth(theme.fg("dim", `${lead}│`), safeWidth, ""));
 		};
 
 		const pushBody = (
@@ -393,8 +483,13 @@ export class ExpandedToolIoView {
 			}
 			const sourceLines = raw.split("\n");
 			const wrapped: string[] = [];
-			for (const source of sourceLines) {
-				const styled = opts.input ? styleInputLine(source) : theme.fg(bodyColor, source);
+			for (const [index, source] of sourceLines.entries()) {
+				if (opts.input) {
+					// 代码块的行用着色版本（已剥缩进），其余走默认 dim/muted
+					wrapped.push(...wrapInputLine(source, contentWidth, theme, this.inputCodeLine(index)));
+					continue;
+				}
+				const styled = theme.fg(bodyColor, source);
 				const parts = wrapTextWithAnsi(styled, contentWidth);
 				if (parts.length === 0) wrapped.push(styled);
 				else wrapped.push(...parts);
@@ -407,8 +502,9 @@ export class ExpandedToolIoView {
 			if (truncated) {
 				const hidden = Math.max(0, wrapped.length - visible.length);
 				if (hidden > 0) {
+					// hover 只高亮文字，圆点保持 dim（与 group hint 一致）。
 					const more =
-						theme.fg("dim", " •") +
+						theme.fg("dim", " ·") +
 						theme.fg(
 							this.hoveredSection === opts.section ? "text" : "dim",
 							` ${showMoreHintText()}`,
@@ -423,9 +519,18 @@ export class ExpandedToolIoView {
 		const hasInput = this.inputBody.trim().length > 0;
 		const outputText = this.getOutputBody();
 
+		// Decide show-more from the same truncation rules as pushBody.
 		const inputWouldTruncate =
 			hasInput &&
-			bodyExceedsLineLimit(this.inputBody, this.maxInputLines, contentWidth, true, theme);
+			bodyExceedsLineLimit(
+				this.inputBody,
+				this.maxInputLines,
+				contentWidth,
+				true,
+				theme,
+				bodyColor,
+				(inputIndex: number) => this.inputCodeLine(inputIndex),
+			);
 		const outputWouldTruncate = bodyExceedsLineLimit(
 			outputText,
 			this.maxOutputLines,
@@ -447,11 +552,19 @@ export class ExpandedToolIoView {
 			pushBlankRail();
 			this.truncated.output = outputWouldTruncate;
 			pushHeader("└", "Output");
-			pushBody(outputText, { limit: this.maxOutputLines, continued: false, section: "output" });
+			pushBody(outputText, {
+				limit: this.maxOutputLines,
+				continued: false,
+				section: "output",
+			});
 		} else {
 			this.truncated.output = outputWouldTruncate;
 			pushHeader("└", "Output");
-			pushBody(outputText, { limit: this.maxOutputLines, continued: false, section: "output" });
+			pushBody(outputText, {
+				limit: this.maxOutputLines,
+				continued: false,
+				section: "output",
+			});
 		}
 
 		this.cachedWidth = width;
@@ -477,6 +590,40 @@ export function isExpandedToolIoView(value: unknown): value is ExpandedToolIoVie
 	);
 }
 
+/** Input 行着色：`key: value` 拆成 dim 键 + muted 值，其余整行 muted。 */
+function styleInputSourceLine(line: string, theme: any): string {
+	const match = line.match(/^([A-Za-z_][\w.-]*)(:\s*)(.*)$/);
+	if (!match) return theme.fg("muted", line);
+	const [, key, sep, rest] = match;
+	return theme.fg("dim", key + sep) + theme.fg("muted", rest ?? "");
+}
+
+/**
+ * 折一行 Input 源码。不带 styledBody 时与改动前完全一致（其他工具不受影响）；
+ * 代码块（styledBody = 已着色且已剥缩进的行）续行跟着源码前导缩进：顶到 rail
+ * 会被读成新的一行，所以缩进先剥掉、折行宽度相应扣减，再给每一行加回去。
+ * 行数判断（bodyExceedsLineLimit）与实际渲染共用这一套，展开提示才对得上。
+ */
+function wrapInputLine(
+	source: string,
+	contentWidth: number,
+	theme: any,
+	styledBody?: string,
+): string[] {
+	if (styledBody === undefined) {
+		const styled = styleInputSourceLine(source, theme);
+		const parts = wrapTextWithAnsi(styled, contentWidth);
+		return parts.length ? parts : [styled];
+	}
+	const lead = /^[ \t]*/.exec(source)?.[0] ?? "";
+	const leadWidth = visibleWidth(lead);
+	const parts = wrapTextWithAnsi(styledBody, Math.max(1, contentWidth - leadWidth));
+	const rows = parts.length ? parts : [styledBody];
+	if (!leadWidth) return rows;
+	const prefix = theme.fg("muted", lead);
+	return rows.map((row) => prefix + row);
+}
+
 /** True when body needs truncation at the given line limit (source lines or wrapped rows). */
 function bodyExceedsLineLimit(
 	body: string,
@@ -485,23 +632,18 @@ function bodyExceedsLineLimit(
 	asInput: boolean,
 	theme: any,
 	bodyColor = "toolOutput",
+	/** 代码块的源行取着色内容，行数判断与实际渲染保持同一套规则。 */
+	codeLine?: (sourceIndex: number) => string | undefined,
 ): boolean {
 	const raw = body.replace(/\t/g, "   ").replace(/\n+$/, "");
 	if (!raw.trim()) return false;
 	const sourceLines = raw.split("\n");
 	if (sourceLines.length > limit) return true;
 	let total = 0;
-	for (const source of sourceLines) {
-		let styled: string;
-		if (asInput) {
-			const match = source.match(/^([A-Za-z_][\w.-]*)(:\s*)(.*)$/);
-			styled = match
-				? theme.fg("dim", match[1] + match[2]) + theme.fg("muted", match[3] ?? "")
-				: theme.fg("muted", source);
-		} else {
-			styled = theme.fg(bodyColor, source);
-		}
-		const parts = wrapTextWithAnsi(styled, contentWidth);
+	for (const [index, source] of sourceLines.entries()) {
+		const parts = asInput
+			? wrapInputLine(source, contentWidth, theme, codeLine?.(index))
+			: wrapTextWithAnsi(theme.fg(bodyColor, source), contentWidth);
 		total += Math.max(1, parts.length);
 		if (total > limit) return true;
 	}
@@ -558,123 +700,42 @@ export function middleTruncateToWidth(text: string, width: number): string {
 	return `${left}…${right}`;
 }
 
-export type ToolCallSummary = {
-	main: string;
-	detail: string;
-	/** 路径摘要保留结构，供最终渲染按实际宽度优先保留文件名。 */
-	path?: { prefix: string; value: string };
+/**
+ * 展开卡 Input 的代码块：源行起始下标（相对 text）+ 语言 + 剥掉行首缩进的代码。
+ * standalone = 整段 Input 就是这块代码（没有 `code:` 标签），全量预览可以整段包围栏。
+ */
+export type InputCodeBlock = {
+	startLine: number;
+	language: string;
+	code: string;
+	standalone: boolean;
 };
 
-function pathApi(value: string) {
-	if (posix.isAbsolute(value)) return posix;
-	if (win32.isAbsolute(value)) return win32;
-	return undefined;
-}
-
-/** cwd 内绝对路径转相对路径；cwd 外路径保持不变。 */
-export function displayPath(value: unknown, cwd?: string): string {
-	const text = oneLine(value, 4096);
-	const base = cwd ? oneLine(cwd, 4096) : "";
-	const api = pathApi(text);
-	if (!api || !base || !api.isAbsolute(base)) return text;
-	const relative = api.relative(base, text);
-	if (!relative) return api.basename(text) || ".";
-	if (relative === ".." || relative.startsWith(`..${api.sep}`) || api.isAbsolute(relative)) {
-		return text;
-	}
-	return relative;
-}
+export type ToolInputBody = { text: string; codeBlock?: InputCodeBlock };
 
-function headToWidth(text: string, width: number, ellipsis = ""): string {
-	if (visibleWidth(text) <= width) return text;
-	if (width <= 0) return "";
-	const suffix = visibleWidth(ellipsis) <= width ? ellipsis : "";
-	const contentWidth = width - visibleWidth(suffix);
-	let head = "";
-	for (const char of Array.from(text)) {
-		if (visibleWidth(head + char) > contentWidth) break;
-		head += char;
-	}
-	return head + suffix;
-}
-
-function tailToWidth(text: string, width: number): string {
-	if (width <= 0) return "";
-	let tail = "";
-	for (const char of Array.from(text).reverse()) {
-		if (visibleWidth(char + tail) > width) break;
-		tail = char + tail;
-	}
-	return tail;
-}
-
-/** 中间截断路径：目录保留开头，末尾优先完整保留文件名。 */
-export function truncatePathToWidth(path: string, width: number): string {
-	if (visibleWidth(path) <= width) return path;
-	if (width <= 1) return width === 1 ? "…" : "";
-	const separatorIndex = Math.max(path.lastIndexOf("/"), path.lastIndexOf("\\"));
-	const filename = separatorIndex >= 0 ? path.slice(separatorIndex + 1) : path;
-	const filenameWidth = visibleWidth(filename);
-	if (separatorIndex >= 0 && filenameWidth + 1 <= width) {
-		const separator = path[separatorIndex]!;
-		const suffix = `${separator}${filename}`;
-		const prefixWidth = width - visibleWidth(suffix) - 1;
-		const prefix = headToWidth(path.slice(0, separatorIndex), Math.max(0, prefixWidth));
-		return `${prefix}…${prefix ? suffix : filename}`;
-	}
-	const leftWidth = Math.max(1, Math.floor((width - 1) * 0.45));
-	const rightWidth = Math.max(0, width - leftWidth - 1);
-	return `${headToWidth(filename, leftWidth)}…${tailToWidth(filename, rightWidth)}`;
-}
-
-/** 路径展示的统一入口：相对化后按当前可用宽度中间截断。 */
-export function formatDisplayPath(value: unknown, cwd: string | undefined, width: number): string {
-	return truncatePathToWidth(displayPath(value, cwd), Math.max(0, Math.floor(width)));
-}
-
-/** 按最终终端宽度渲染摘要；路径摘要不会再被整行头部截断。 */
-export function fitToolCallSummary(summary: ToolCallSummary, width: number): string {
-	if (!summary.path) return headTruncateToWidth(summary.main, width);
-	const prefix = summary.path.prefix;
-	const pathWidth = Math.max(0, width - visibleWidth(prefix) - 1);
-	if (pathWidth <= 0) return headTruncateToWidth(prefix, width);
-	return `${prefix} ${truncatePathToWidth(summary.path.value, pathWidth)}`;
-}
-
-export function pathSummary(
-	prefix: string,
-	value: unknown,
-	cwd: string | undefined,
-	detail = "",
-): ToolCallSummary {
-	const path = displayPath(value, cwd);
-	return {
-		main: `${prefix} ${path}`,
-		detail,
-		path: { prefix, value: path },
-	};
-}
+/** 按字段名判定可着色的入参：codemode / mcpscript 的 `code` 都是 JS 脚本。 */
+const INPUT_CODE_LANGUAGES: Record<string, string> = { code: "javascript" };
 
 /** Pretty-print tool call args for the expanded Input section. */
-export function formatToolInputArgs(args: unknown, maxChars = 8_000): string {
-	if (args === undefined || args === null) return "";
+export function formatToolInputBody(args: unknown, maxChars = 8_000): ToolInputBody {
+	if (args === undefined || args === null) return { text: "" };
 	if (typeof args !== "object") {
 		const text = sanitizeToolResultText(String(args));
-		return text.length > maxChars ? `${text.slice(0, maxChars)}…` : text;
+		return { text: text.length > maxChars ? `${text.slice(0, maxChars)}…` : text };
 	}
 	if (Array.isArray(args)) {
 		try {
 			const json = JSON.stringify(args, null, 2);
-			return json.length > maxChars ? `${json.slice(0, maxChars)}…` : json;
+			return { text: json.length > maxChars ? `${json.slice(0, maxChars)}…` : json };
 		} catch {
-			return sanitizeToolResultText(String(args));
+			return { text: sanitizeToolResultText(String(args)) };
 		}
 	}
 
 	const entries = Object.entries(args as Record<string, unknown>).filter(
 		([, value]) => value !== undefined,
 	);
-	if (entries.length === 0) return "";
+	if (entries.length === 0) return { text: "" };
 
 	// Stable, human-first field order for common tools.
 	const preferred = [
@@ -700,13 +761,30 @@ export function formatToolInputArgs(args: unknown, maxChars = 8_000): string {
 	});
 
 	const lines: string[] = [];
+	let codeBlock: InputCodeBlock | undefined;
 	for (const [rawKey, value] of entries) {
 		const key = sanitizeToolResultText(rawKey);
 		if (typeof value === "string") {
 			const safeValue = sanitizeToolResultText(value);
 			if (safeValue.includes("\n")) {
-				lines.push(`${key}:`);
-				for (const line of safeValue.replace(/\t/g, "   ").split("\n")) {
+				const expanded = safeValue.replace(/\t/g, "   ");
+				const language = INPUT_CODE_LANGUAGES[key];
+				// 只有一个 code 字段时（codemode 等）整块 Input 就是脚本，`code:` 标签是噪音
+				const standaloneCode = Boolean(language) && entries.length === 1;
+				if (!standaloneCode) lines.push(`${key}:`);
+				if (language) {
+					// 缩进由 wrapInputLine 负责，着色只喂剥掉行首缩进的正文
+					codeBlock = {
+						startLine: lines.length,
+						language,
+						code: expanded
+							.split("\n")
+							.map((line) => line.replace(/^[ \t]*/, ""))
+							.join("\n"),
+						standalone: standaloneCode,
+					};
+				}
+				for (const line of expanded.split("\n")) {
 					lines.push(`  ${line}`);
 				}
 			} else {
@@ -731,7 +809,13 @@ export function formatToolInputArgs(args: unknown, maxChars = 8_000): string {
 		}
 	}
 	const text = lines.join("\n");
-	return text.length > maxChars ? `${text.slice(0, maxChars)}…` : text;
+	// 截断后的行号与着色行不再对齐，这时只给纯文本
+	if (text.length > maxChars) return { text: `${text.slice(0, maxChars)}…` };
+	return codeBlock ? { text, codeBlock } : { text };
+}
+
+export function formatToolInputArgs(args: unknown, maxChars = 8_000): string {
+	return formatToolInputBody(args, maxChars).text;
 }
 
 export function hasExpandableDetail(outputText: string, args: unknown): boolean {
@@ -746,8 +830,10 @@ export function renderExpandedToolResult(
 	lastComponent?: unknown,
 	args?: unknown,
 	context?: any,
+	/** mode=on 展开卡贴左；compact 等保持默认前导空格 */
+	flushLeft = false,
 ): ExpandedToolIoView | ExpandedToolResultText | Text {
-	const inputBody = formatToolInputArgs(args);
+	const { text: inputBody, codeBlock } = formatToolInputBody(args);
 	const outputBody = body;
 	const maxOutputLines = config.expandedOutputMaxLines;
 	const maxInputLines = config.expandedInputMaxLines;
@@ -756,7 +842,14 @@ export function renderExpandedToolResult(
 	if (inputBody.trim() || outputBody.trim()) {
 		let view: ExpandedToolIoView;
 		if (isExpandedToolIoView(lastComponent)) {
-			lastComponent.setContent(inputBody, outputBody, isError, maxOutputLines, maxInputLines);
+			lastComponent.setContent(
+				inputBody,
+				outputBody,
+				isError,
+				maxOutputLines,
+				maxInputLines,
+				flushLeft,
+			);
 			view = lastComponent;
 		} else {
 			view = new ExpandedToolIoView(
@@ -766,8 +859,10 @@ export function renderExpandedToolResult(
 				isError,
 				maxOutputLines,
 				maxInputLines,
+				flushLeft,
 			);
 		}
+		view.setInputCode(codeBlock);
 		if (context) rememberIoView(context, view);
 		return view;
 	}
@@ -803,7 +898,7 @@ function frameViewId(view: ExpandedToolIoView): number | null {
 function withIoViewMarkers(view: ExpandedToolIoView, lines: string[]): string[] {
 	const id = frameViewId(view);
 	if (id === null) return lines;
-	// Mark by exact recorded show-more row from render — never scan body text heuristically.
+	// Mark by exact header row from render — never scan body text for Input/Output labels.
 	const marked = lines.slice();
 	for (const { section, line } of view.showMoreHeaderLineIndexes()) {
 		if (line < 0 || line >= marked.length) continue;