@herbertgao/pi-extensions 2026.8.1 → 2026.8.3

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/mouse/layout.ts

@@ -0,0 +1,144 @@
+import { visibleWidth } from "@earendil-works/pi-tui";
+import { isCompactAssistantComponent } from "../compact-mode.ts";
+import { ToolGroupComponent } from "../tool/grouping.ts";
+import { isToolExecutionComponent, stripTerminalSequencesPreservingLayout } from "./packets.ts";
+import { getScrollButtonWidget } from "./scroll.ts";
+
+export type ComponentRowHit = {
+	component: any;
+	row: number;
+	/** 内部工具命中时所属的展开 group；普通卡点击仍折叠整个 group。 */
+	group?: ToolGroupComponent;
+};
+
+/** 行内 [click to show more] 提示的命中列区间（1-based，含两端）。 */
+export function collapsedHintHitbox(line: string): { startCol: number; endCol: number } | null {
+	const plain = stripTerminalSequencesPreservingLayout(line);
+	const match = /(\([^()\n]* \/ click\)|click to show more|to show more)(?=\)?\s*$)/.exec(plain);
+	if (!match?.[1]) return null;
+	const startCol = visibleWidth(plain.slice(0, match.index)) + 1;
+	return { startCol, endCol: startCol + visibleWidth(match[1]) - 1 };
+}
+
+/** 布局树点查询：返回 (x,y) 处最深含行 leaf box（屏幕行 → 组件局部行）。 */
+export function fullscreenLeafAt(
+	layout: any,
+	x: number,
+	y: number,
+): { box: any; localRow: number } | null {
+	const root = layout?.root;
+	if (!root) return null;
+	let best: { box: any; localRow: number } | null = null;
+	let bestDepth = -1;
+	const visit = (box: any, depth: number) => {
+		if (!box) return;
+		const clip = box.clip;
+		if (!clip || x < clip.x || x >= clip.x + clip.width || y < clip.y || y >= clip.y + clip.height)
+			return;
+		const isLeaf = !Array.isArray(box.children) || box.children.length === 0;
+		if (
+			isLeaf &&
+			y >= box.rect.y &&
+			y < box.rect.y + Math.max(1, box.rect.height) &&
+			depth > bestDepth
+		) {
+			best = { box, localRow: Math.max(0, y - box.rect.y) };
+			bestDepth = depth;
+		}
+		for (const child of box.children ?? []) visit(child, depth + 1);
+	};
+	visit(root, 0);
+	return best;
+}
+
+/** leaf 自身不带 scrollView；内容宽度由最近的 scroll 祖先决定。 */
+export function fullscreenContentWidth(box: any, terminalWidth: number): number {
+	for (let current = box; current; current = current.parent) {
+		if (typeof current.scrollView?.getContentWidth === "function") {
+			return Math.max(1, current.scrollView.getContentWidth(terminalWidth));
+		}
+	}
+	return terminalWidth;
+}
+
+/** 点击列是否为官方滚动条列（放行官方拖动）。 */
+export function isScrollbarColumnAt(layout: any, x: number): boolean {
+	let hit = false;
+	const visit = (box: any) => {
+		if (hit || !box) return;
+		if (box.scrollView?.isScrollbarVisible && x === box.rect.x + box.rect.width - 1) {
+			hit = true;
+			return;
+		}
+		for (const child of box.children ?? []) visit(child);
+	};
+	visit(layout?.root);
+	return hit;
+}
+
+/**
+ * 布局 leaf box 的组件通常是容器（documentContainer/dock 容器等），工具卡与
+ * widget 在其 children 内。按局部行遍历组件树，定位实际命中的子组件。
+ */
+export function componentAtLocalRow(
+	component: any,
+	localRow: number,
+	width: number,
+): ComponentRowHit | null {
+	if (component instanceof ToolGroupComponent) {
+		// 展开的 group：头两行（空行 + 头行）归 group，其余行映射到内部工具。
+		const child = component.childAtRow(localRow, width);
+		return child ? { ...child, group: component } : { component, row: localRow };
+	}
+	if (isToolExecutionComponent(component)) {
+		return { component, row: localRow };
+	}
+	if (isCompactAssistantComponent(component)) {
+		// compact 摘要行整体作为可展开卡片（折叠摘要 / 展开内容）。
+		return { component, row: localRow };
+	}
+	if (component === getScrollButtonWidget()) {
+		return { component, row: localRow };
+	}
+	if (!Array.isArray(component.children)) return null;
+	let offset = 0;
+	for (const child of component.children) {
+		let lines: string[] = [];
+		try {
+			const rendered = child.render?.(width);
+			if (Array.isArray(rendered)) lines = rendered.map((line) => String(line));
+		} catch {
+			lines = [];
+		}
+		if (localRow < offset + lines.length) {
+			return (
+				componentAtLocalRow(child, localRow - offset, width) ?? {
+					component: child,
+					row: localRow - offset,
+				}
+			);
+		}
+		offset += lines.length;
+	}
+	return null;
+}
+
+/** fullscreen single-expand：group 作为整体，不继续递归其内部工具。 */
+export function collectFullscreenToolCards(
+	component: any,
+	out: any[],
+	seen = new Set<any>(),
+): void {
+	if (!component || typeof component !== "object" || seen.has(component)) return;
+	seen.add(component);
+	if (
+		isToolExecutionComponent(component) ||
+		component instanceof ToolGroupComponent ||
+		isCompactAssistantComponent(component)
+	) {
+		out.push(component);
+		return;
+	}
+	if (!Array.isArray(component.children)) return;
+	for (const child of component.children) collectFullscreenToolCards(child, out, seen);
+}

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/mouse/packets.ts

@@ -0,0 +1,143 @@
+import type { ExpandedToolIoView, ToolIoSection } from "../tool/result.ts";
+
+/** SGR 鼠标协议包（code;col;row + M/m 终结符）。 */
+export type SgrMousePacket = {
+	code: number;
+	col: number;
+	row: number;
+	final: "M" | "m";
+};
+
+/** Final painted placement of one outermost tool/group row after parent layout. */
+export type FrameToolPlacement = {
+	component: any;
+	componentRow: number;
+	lineIndex: number;
+	/** Marker-stripped final line text as painted after parent layout. */
+	finalLine: string;
+	view?: ExpandedToolIoView;
+	section?: ToolIoSection;
+};
+
+/** Zero-width APC row marker (like pi CURSOR_MARKER); stripped before terminal output. */
+const TOOL_FRAME_MARKER_RE = /\x1b_cc:t(\d+):(\d+)\x07/g;
+const TOOL_VIEW_MARKER_RE = /\x1b_cc:v(\d+):([io])\x07/g;
+export const toolFrameMarker = (id: number, row: number) => `\x1b_cc:t${id}:${row}\x07`;
+
+/**
+ * 解析整段终端输入为 SGR 鼠标包序列；数据必须完全由连续 SGR 包组成
+ * （夹杂其他字节返回 null，交由常规输入链处理）。
+ */
+export function parseSgrMousePackets(data: string): SgrMousePacket[] | null {
+	const pattern = /\x1b\[<(\d+);(\d+);(\d+)([Mm])/g;
+	const packets: SgrMousePacket[] = [];
+	let offset = 0;
+
+	for (const match of data.matchAll(pattern)) {
+		if (match.index !== offset) return null;
+		offset = match.index + match[0].length;
+		packets.push({
+			code: Number(match[1]),
+			col: Number(match[2]),
+			row: Number(match[3]),
+			final: match[4] as "M" | "m",
+		});
+	}
+
+	return packets.length > 0 && offset === data.length ? packets : null;
+}
+
+/** 是否为左键按下（排除修饰键、32 表示 motion 事件）。 */
+export function isSgrLeftPress(packet: SgrMousePacket): boolean {
+	const baseButton = packet.code & ~(4 | 8 | 16 | 32);
+	return packet.final === "M" && baseButton === 0 && (packet.code & 32) === 0;
+}
+
+/** 仅剥离终端序列、保留原布局（换行/空白不动），用于命中区间计算。 */
+export function stripTerminalSequencesPreservingLayout(value: string): string {
+	return value
+		.replace(/\x1b\][^\x07]*(?:\x07|\x1b\\)/g, "")
+		.replace(/\x1b\[[0-?]*[ -/]*[@-~]/g, "");
+}
+
+/** 剥离终端序列并折叠空白（用于纯文本比较）。 */
+export function stripTerminalSequences(value: string): string {
+	return stripTerminalSequencesPreservingLayout(value).replace(/\s+/g, " ").trim();
+}
+
+/** 工具执行组件识别（toolCallId + setExpanded + render）。 */
+export function isToolExecutionComponent(value: any): boolean {
+	return Boolean(
+		value &&
+			typeof value === "object" &&
+			typeof value.toolCallId === "string" &&
+			typeof value.setExpanded === "function" &&
+			typeof value.render === "function",
+	);
+}
+
+/** 深度收集组件树中的工具执行组件（含 getMountedRoots 分支）。 */
+export function collectToolComponents(component: any, tools: any[], seen = new Set<any>()): void {
+	if (!component || typeof component !== "object" || seen.has(component)) return;
+	seen.add(component);
+	if (isToolExecutionComponent(component)) {
+		tools.push(component);
+		return;
+	}
+	if (Array.isArray(component.children)) {
+		for (const child of component.children) collectToolComponents(child, tools, seen);
+	}
+	try {
+		const mounted = component.getMountedRoots?.();
+		if (Array.isArray(mounted)) {
+			for (const root of mounted) collectToolComponents(root, tools, seen);
+		}
+	} catch {
+		// renderer 切换中的惰性 Proxy 可能暂时没有 mounted roots。
+	}
+}
+
+/** 剥离一行中的零宽帧/视图 marker。 */
+export function stripToolFrameMarkers(line: string): string {
+	return line.replace(TOOL_FRAME_MARKER_RE, "").replace(TOOL_VIEW_MARKER_RE, "");
+}
+
+/**
+ * 从渲染行中提取工具帧 placement（component/componentRow/lineIndex/finalLine
+ * 及其所属视图与 section），同时返回剥离 marker 后的行。
+ */
+export function extractToolFramePlacements(
+	lines: string[],
+	idToComponent: Map<number, any>,
+	idToView: Map<number, ExpandedToolIoView>,
+): { lines: string[]; placements: FrameToolPlacement[] } {
+	const placements: FrameToolPlacement[] = [];
+	const cleaned = lines.map((line, lineIndex) => {
+		const toolMatches = [...line.matchAll(TOOL_FRAME_MARKER_RE)];
+		const viewMatches = [...line.matchAll(TOOL_VIEW_MARKER_RE)];
+		const finalLine = stripToolFrameMarkers(line);
+		let view: ExpandedToolIoView | undefined;
+		let section: ToolIoSection | undefined;
+		for (const match of viewMatches) {
+			const candidate = idToView.get(Number(match[1]));
+			if (!candidate) continue;
+			view = candidate;
+			section = match[2] === "i" ? "input" : "output";
+			break;
+		}
+		for (const match of toolMatches) {
+			const component = idToComponent.get(Number(match[1]));
+			if (!component) continue;
+			placements.push({
+				component,
+				componentRow: Number(match[2]),
+				lineIndex,
+				finalLine,
+				view,
+				section,
+			});
+		}
+		return finalLine;
+	});
+	return { lines: cleaned, placements };
+}

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/mouse/scroll.ts

@@ -0,0 +1,195 @@
+import {
+	getKeybindings,
+	matchesKey,
+	truncateToWidth,
+	visibleWidth,
+	type Keybinding,
+} from "@earendil-works/pi-tui";
+import { config } from "../../config/config.ts";
+import { isLazyProxyTui } from "../../utils/fullscreen-detect.ts";
+import { parseSgrMousePackets } from "./packets.ts";
+
+const ZENTUI_PAGE_UP_INPUT = /^\x1b\[5;9(?::[12])?~$|^\x1b\[57421;9(?::[12])?u$|^\x1b\[1;6A$/;
+const ZENTUI_PAGE_DOWN_INPUT = /^\x1b\[6;9(?::[12])?~$|^\x1b\[57422;9(?::[12])?u$|^\x1b\[1;6B$/;
+const SCROLL_BOTTOM_SHORTCUT = "ctrl+end";
+
+/**
+ * 当前安装的 tui 宿主。宿主放本模块（滚动按钮/调度依赖它），
+ * 由 mouse-interaction 经 setToolMouseTui 维护；跨模块一律经绑定/setter 访问。
+ *
+ * 状态镜像到 globalThis（Symbol 槽）：jiti 转译下经 re-export 链读取的
+ * 模块级 let 绑定是初始值快照（死绑定，实测恒 null），函数调用才是活引用。
+ * 跨模块读取一律用 getToolMouseTui()，避免拿到加载时的快照。
+ */
+const TOOL_MOUSE_TUI_SLOT = Symbol.for("pi.ccstyle.tool-mouse-tui");
+(globalThis as any)[TOOL_MOUSE_TUI_SLOT] ??= null;
+export function getToolMouseTui(): any {
+	return (globalThis as any)[TOOL_MOUSE_TUI_SLOT];
+}
+export function setToolMouseTui(tui: any): void {
+	(globalThis as any)[TOOL_MOUSE_TUI_SLOT] = tui;
+}
+
+// 滚动按钮状态同 toolMouseTui：镜像到 globalThis（Symbol 槽），跨模块读取
+// 一律用 getter（jiti 转译下模块级 let 绑定是初始值快照）。
+const SCROLL_BUTTON_STATE_SLOT = Symbol.for("pi.ccstyle.scroll-button-state");
+type ScrollButtonState = { visible: boolean; hovered: boolean; widget: any };
+function scrollButtonState(): ScrollButtonState {
+	const host = globalThis as any;
+	return (host[SCROLL_BUTTON_STATE_SLOT] ??= { visible: false, hovered: false, widget: null });
+}
+export function getScrollButtonVisible(): boolean {
+	return scrollButtonState().visible;
+}
+export function getScrollButtonHovered(): boolean {
+	return scrollButtonState().hovered;
+}
+export function getScrollButtonWidget(): any {
+	return scrollButtonState().widget;
+}
+export function setScrollButtonVisible(visible: boolean): void {
+	scrollButtonState().visible = visible;
+}
+
+/** 返回是否发生变化（调用方据此决定是否需要重渲染）。 */
+export function setScrollButtonHovered(hovered: boolean): boolean {
+	if (hovered === scrollButtonState().hovered) return false;
+	scrollButtonState().hovered = hovered;
+	return true;
+}
+
+export function setScrollButtonWidget(widget: any): void {
+	scrollButtonState().widget = widget;
+}
+
+/** teardown 全量清零（visible/hovered/widget/sync 调度）。 */
+export function resetScrollButtonState(): void {
+	scrollButtonState().visible = false;
+	scrollButtonState().hovered = false;
+	scrollButtonState().widget = null;
+	scrollButtonSyncScheduled = false;
+}
+
+let scrollButtonSyncScheduled = false;
+
+export function toolMouseInteractionActive(): boolean {
+	if (config.mode === "off") return false;
+	if (isLazyProxyTui(getToolMouseTui())) return true;
+	return true;
+}
+
+/** 惰性 Proxy 官方 fullscreen（TuiAltScreen）判定。 */
+export function fullscreenLazyTui(tui: any): boolean {
+	return isLazyProxyTui(tui) && tui.mode === "fullscreen";
+}
+
+/** 官方 fullscreen：是否已跟随 transcript 底部（按钮隐藏条件）。 */
+export function isFullscreenAtBottom(tui: any): boolean {
+	const following = tui.isFollowingOutput ?? tui.getPrimaryScrollView?.()?.isFollowingEnd ?? true;
+	return Boolean(following);
+}
+
+function formatShortcut(shortcut: string): string {
+	return shortcut
+		.split("+")
+		.map((part) =>
+			part.length <= 1 ? part.toUpperCase() : `${part[0]?.toUpperCase() ?? ""}${part.slice(1)}`,
+		)
+		.join("+");
+}
+
+export function isScrollBottomInput(data: string): boolean {
+	return matchesKey(data, SCROLL_BOTTOM_SHORTCUT);
+}
+
+function isScrollNavigationInput(data: string): boolean {
+	if (
+		matchesKey(data, "pageUp") ||
+		matchesKey(data, "pageDown") ||
+		ZENTUI_PAGE_UP_INPUT.test(data) ||
+		ZENTUI_PAGE_DOWN_INPUT.test(data) ||
+		// 官方 fullscreen viewport 的可滚动键（half-page/prompt/top/bottom）。
+		[
+			"tui.altScreen.pageUp",
+			"tui.altScreen.pageDown",
+			"tui.altScreen.halfPageUp",
+			"tui.altScreen.halfPageDown",
+			"tui.altScreen.previousPrompt",
+			"tui.altScreen.nextPrompt",
+			"tui.altScreen.top",
+			"tui.altScreen.bottom",
+		].some((key) => getKeybindings().matches(data, key as Keybinding))
+	) {
+		return true;
+	}
+	const packets = parseSgrMousePackets(data);
+	return Boolean(
+		packets?.some((packet) => {
+			const baseButton = packet.code & ~(4 | 8 | 16 | 32);
+			return packet.final === "M" && (baseButton === 64 || baseButton === 65);
+		}),
+	);
+}
+
+function isAtTranscriptBottom(tui: any): boolean {
+	// 惰性 Proxy fullscreen：官方 viewport 以 isFollowingOutput 判定是否在底部。
+	if (fullscreenLazyTui(tui)) return isFullscreenAtBottom(tui);
+	return true;
+}
+
+export function hideScrollButton(tui: any): void {
+	const changed = getScrollButtonVisible() || getScrollButtonHovered();
+	setScrollButtonVisible(false);
+	setScrollButtonHovered(false);
+	if (changed) tui.requestRender?.();
+}
+
+export function scheduleScrollButtonSync(tui: any, data: string): void {
+	if (
+		!fullscreenLazyTui(tui) ||
+		!toolMouseInteractionActive() ||
+		!isScrollNavigationInput(data) ||
+		scrollButtonSyncScheduled
+	)
+		return;
+	scrollButtonSyncScheduled = true;
+	const previousLines = tui.previousLines;
+	const check = (attempt: number) => {
+		scrollButtonSyncScheduled = false;
+		if (getToolMouseTui() !== tui) return;
+		// Pi renders on its own frame timer. Inspect the resulting viewport before
+		// showing the button so empty or non-scrollable transcripts never flash it.
+		const rendered = tui.previousLines !== previousLines;
+		// fullscreen 下 isFollowingOutput 是即时状态，无需等待官方帧渲染。
+		if (!rendered && attempt < 4 && !fullscreenLazyTui(tui)) {
+			scrollButtonSyncScheduled = true;
+			const timer = setTimeout(() => check(attempt + 1), 16);
+			if (typeof timer === "object" && timer !== null && "unref" in timer) {
+				(timer as { unref: () => void }).unref();
+			}
+			return;
+		}
+		const nextVisible = !isAtTranscriptBottom(tui);
+		if (nextVisible !== getScrollButtonVisible()) {
+			setScrollButtonVisible(nextVisible);
+			tui.requestRender?.();
+		}
+	};
+	process.nextTick(() => check(0));
+}
+
+export function updateScrollButtonFromInput(tui: any, data: string): void {
+	if (!fullscreenLazyTui(tui) || !toolMouseInteractionActive()) return;
+	if (matchesKey(data, "enter") || matchesKey(data, "return")) hideScrollButton(tui);
+}
+
+export function renderScrollButton(width: number, theme: any): string[] {
+	if (!getScrollButtonVisible() || !fullscreenLazyTui(getToolMouseTui())) return [];
+	const shortcut = formatShortcut(SCROLL_BOTTOM_SHORTCUT);
+	const label = theme.fg(
+		getScrollButtonHovered() ? "text" : "accent",
+		`[ ↓ Back to bottom · ${shortcut} ]`,
+	);
+	const leftPad = Math.max(0, Math.floor((width - visibleWidth(label)) / 2));
+	return [`${" ".repeat(leftPad)}${truncateToWidth(label, width, "…")}`];
+}

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/{tool-diff → tool/diff}/ansi-utils.ts

@@ -1,4 +1,5 @@
 const ANSI_SGR_PATTERN = /\x1b\[([0-9;]*)m/g;
+const ANSI_SGR_WITH_COLON_PATTERN = /\x1b\[([0-9;:]*)m/g;
 const STYLE_RESET_PARAMS = [39, 22, 23, 24, 25, 27, 28, 29, 59] as const;
 
 export { ANSI_SGR_PATTERN, STYLE_RESET_PARAMS };
@@ -108,6 +109,60 @@ export function filterSgrSequences(text: string, filter: (params: number[]) => n
 	});
 }
 
+function isValidColonForeground(segment: string): boolean {
+	const params = segment.split(":");
+	const isByte = (value: string | undefined) =>
+		value !== undefined && /^\d+$/.test(value) && Number(value) <= 255;
+	if (params[0] !== "38") return false;
+	if (params[1] === "5") return params.length === 3 && isByte(params[2]);
+	return (
+		params[1] === "2" &&
+		params.length === 6 &&
+		(params[2] === "" || /^\d+$/.test(params[2] ?? "")) &&
+		params.slice(3).every(isByte)
+	);
+}
+
+function sanitizeColonSgr(rawParams: string): string {
+	const segments = rawParams.split(";");
+	const sanitized: string[] = [];
+	for (let index = 0; index < segments.length; index++) {
+		const segment = segments[index] ?? "";
+		if (segment.includes(":")) {
+			const code = Number.parseInt(segment, 10);
+			if (code !== 48 && (code !== 38 || isValidColonForeground(segment))) {
+				sanitized.push(segment);
+			}
+			continue;
+		}
+		const param = Number.parseInt(segment, 10);
+		if (!Number.isFinite(param)) continue;
+		if (param === 0) {
+			sanitized.push(...STYLE_RESET_PARAMS.map(String));
+			continue;
+		}
+		if (param === 49 || (param >= 40 && param <= 47) || (param >= 100 && param <= 107)) {
+			continue;
+		}
+		if (param === 38 || param === 48) {
+			const mode = Number.parseInt(segments[index + 1] ?? "", 10);
+			const advance = mode === 5 ? 2 : mode === 2 ? 4 : 0;
+			if (advance > 0) {
+				if (param === 38) sanitized.push(...segments.slice(index, index + advance + 1));
+				index += advance;
+				continue;
+			}
+		}
+		sanitized.push(segment);
+	}
+	return sanitized.length > 0 ? `\x1b[${sanitized.join(";")}m` : "";
+}
+
 export function sanitizeAnsiForThemedOutput(text: string): string {
-	return filterSgrSequences(text, stripBackgroundSgrParams);
+	if (!text || !text.includes("\x1b[")) return text;
+	return text.replace(ANSI_SGR_WITH_COLON_PATTERN, (sequence, rawParams: string) =>
+		rawParams.includes(":")
+			? sanitizeColonSgr(rawParams)
+			: filterSgrSequences(sequence, stripBackgroundSgrParams),
+	);
 }

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/{tool-diff → tool/diff}/diff-renderer.ts

@@ -30,11 +30,11 @@ import {
 	resolveDiffPresentationMode,
 	type DiffPresentationMode,
 } from "./diff-presentation.ts";
-import { sanitizeToolResultText } from "../../utils/tool-result-sanitize.ts";
+import { sanitizeToolResultText } from "../../../utils/tool-result-sanitize.ts";
 import { pluralize, sanitizeAnsiForThemedOutput } from "./render-utils.ts";
 import { splitWriteContentLines } from "./write-display-utils.ts";
 import { MAX_HL_CHARS, shikiHighlightCache } from "./shiki-highlight.ts";
-import { showMoreHintText } from "../show-more-hint.ts";
+import { showMoreHintText } from "../../show-more-hint.ts";
 import {
 	DEFAULT_TOOL_DISPLAY_CONFIG,
 	type DiffIndicatorMode,
@@ -2653,7 +2653,7 @@ export function renderEditDiffResult(
 			return cache.set(safeWidth, options.expanded, mode, configKey, hovered, clampedLines);
 		},
 		invalidate: cache.invalidate,
-	};
+	} as Component;
 }
 
 function renderWriteHeader(
@@ -3079,5 +3079,5 @@ export function renderWriteDiffResult(
 			return cache.set(safeWidth, options.expanded, mode, configKey, hovered, finalLines);
 		},
 		invalidate: cache.invalidate,
-	};
+	} as Component;
 }

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/{tool-diff → tool/diff}/line-width-safety.ts

@@ -1,6 +1,6 @@
 import { normalizeDiffRenderWidth } from "./diff-presentation.ts";
 import { pluralize } from "./render-utils.ts";
-import { showMoreHintText } from "../show-more-hint.ts";
+import { showMoreHintText } from "../../show-more-hint.ts";
 
 export interface WidthMeasurementOps {
 	measure(text: string): number;

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/tool/diff/write-display-utils.ts

@@ -0,0 +1,12 @@
+export function splitWriteContentLines(content: string): string[] {
+	if (!content) {
+		return [];
+	}
+
+	const normalized = content.replace(/\r\n?/g, "\n");
+	const lines = normalized.split("\n");
+	if (lines.length > 0 && lines[lines.length - 1] === "") {
+		lines.pop();
+	}
+	return lines;
+}

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/{tool-diff → tool/diff}/write-execution.ts

@@ -94,13 +94,12 @@ export async function executeWriteWithMetadata(
 			await mkdir(dirname(absolutePath), { recursive: true });
 			throwIfAborted();
 			await writeFile(absolutePath, params.content, "utf8");
-			throwIfAborted();
 			store.set(toolCallId, metadata);
 			return {
 				content: [
 					{
 						type: "text",
-						text: `Successfully wrote ${params.content.length} bytes to ${params.path}`,
+						text: `Successfully wrote ${Buffer.byteLength(params.content, "utf8")} bytes to ${params.path}`,
 					},
 				],
 				details: undefined,

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/{tool-grouping.ts → tool/grouping.ts}

@@ -1,8 +1,14 @@
 import { AssistantMessageComponent, ToolExecutionComponent } from "@earendil-works/pi-coding-agent";
-import { Container, Spacer, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
-import { TOOL_LOADING_INTERVAL_MS, toolLoadingIcon } from "../utils/tool-loading-icon.ts";
-import { sanitizeToolResultText } from "../utils/tool-result-sanitize.ts";
-import { showMoreHintText } from "./show-more-hint.ts";
+import {
+	Container,
+	Spacer,
+	truncateToWidth,
+	visibleWidth,
+	type Component,
+} from "@earendil-works/pi-tui";
+import { TOOL_LOADING_INTERVAL_MS, toolLoadingIcon } from "../../utils/tool-loading-icon.ts";
+import { sanitizeToolResultText } from "../../utils/tool-result-sanitize.ts";
+import { showMoreHintText } from "../show-more-hint.ts";
 
 const PATCH_KEY = Symbol.for("pi.ccstyle.tool-grouping-patch");
 const PARENT_KEY = Symbol.for("pi.ccstyle.tool-grouping-parent");
@@ -95,7 +101,7 @@ function stripLeadingStatusIcon(line: string): string {
 	);
 }
 
-function stripBackgroundAnsi(line: string): string {
+export function stripBackgroundAnsi(line: string): string {
 	return line.replace(/\x1b\[(?:4[0-9]|10[0-7]|48(?:(?:;|:)[0-9]+)+|49)m/g, "");
 }
 
@@ -120,15 +126,25 @@ function stripLeadingSpaces(line: string, count: number): string {
 	return ansi + line.slice(offset);
 }
 
-function paddedBackgroundRow(theme: any, slot: string, content: string, width: number): string {
+/** 生成一行铺满 width 的 slot 背景行；bgAnsiOverride 可替换背景 ANSI（用于提亮等）。 */
+export function paddedBackgroundRow(
+	theme: any,
+	slot: string,
+	content: string,
+	width: number,
+	bgAnsiOverride?: string,
+): string {
 	const innerWidth = Math.max(0, width - 2);
 	const clipped = truncateToWidth(stripBackgroundAnsi(content), innerWidth, "");
 	const row = ` ${clipped}${" ".repeat(Math.max(0, innerWidth - visibleWidth(clipped)))} `;
-	if (typeof theme?.bg !== "function") return row;
 	const bgAnsi =
-		theme.getBgAnsi?.(slot) ?? theme.bg(slot, "").match(/^\x1b\[[0-?]*[ -/]*[@-~]/)?.[0] ?? "";
+		bgAnsiOverride ||
+		(typeof theme?.bg === "function"
+			? theme.getBgAnsi?.(slot) || theme.bg(slot, "").match(/^\x1b\[[0-?]*[ -/]*[@-~]/)?.[0] || ""
+			: "");
 	const stable = bgAnsi ? row.replace(/\x1b\[(?:0)?m/g, (reset) => reset + bgAnsi) : row;
-	return theme.bg(slot, stable);
+	if (!bgAnsi) return typeof theme?.bg === "function" ? theme.bg(slot, stable) : row;
+	return `${bgAnsi}${stable}\x1b[49m`;
 }
 
 function oneLine(value: unknown, max = 96): string {
@@ -285,7 +301,8 @@ export class ToolGroupComponent extends Container {
 
 	setExpanded(expanded: boolean): void {
 		this._expanded = expanded;
-		for (const tool of this.children) tool.setExpanded?.(expanded);
+		for (const tool of this.children)
+			(tool as Component & { setExpanded?: (expanded: boolean) => void }).setExpanded?.(expanded);
 	}
 
 	setHintHovered(hovered: boolean): void {