@herbertgao/pi-extensions 2026.9.20 → 2026.10.1

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

@@ -290,7 +290,7 @@ function renderWriteOverwriteGuardRows(
 	return renderSingleDiffRow(buildWriteOverwriteGuardText(guard, width), "warning", width, theme);
 }
 
-/** Folded write with `writeDiffCollapsedLines: 0`: `↳ created • click to show more`. */
+/** Folded write with `writeDiffCollapsedLines: 0`: `↳ created · click to show more`. */
 function renderWriteCollapsedHintLine(
 	wasOverwrite: boolean,
 	width: number,
@@ -304,7 +304,7 @@ function renderWriteCollapsedHintLine(
 	}
 	const actionLabel = headerLabel?.trim() || (wasOverwrite ? "overwritten" : "created");
 	const clickLabel = showMoreHintText();
-	const candidates = [`↳ ${actionLabel} • ${clickLabel}`, `↳ ${actionLabel}`, actionLabel, "…"];
+	const candidates = [`↳ ${actionLabel} · ${clickLabel}`, `↳ ${actionLabel}`, actionLabel, "…"];
 	let text = candidates[candidates.length - 1] ?? "…";
 	for (const candidate of candidates) {
 		if (visibleWidth(candidate) <= safeWidth) {

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

@@ -1,5 +1,6 @@
 import { createWriteToolDefinition, type ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { truncateToWidth } from "@earendil-works/pi-tui";
+import { Text, truncateToWidth } from "@earendil-works/pi-tui";
+import { textFromResult } from "../result.ts";
 import {
 	renderEditDiffResult,
 	renderWriteDiffResult,
@@ -7,7 +8,13 @@ import {
 } from "./diff-renderer.ts";
 import { DEFAULT_TOOL_DISPLAY_CONFIG } from "../../../config/config.ts";
 import { patchRegistry, WRITE_OWNERSHIP_SLOT } from "../../../utils/patch-keys.ts";
-import { executeWriteWithMetadata, WriteExecutionMetadataStore } from "./write-execution.ts";
+import {
+	capturePreviousContent,
+	executeWriteWithMetadata,
+	WriteExecutionMetadataStore,
+} from "./write-execution.ts";
+
+const WRITE_METADATA_OBSERVER = Symbol.for("herbertgao.pi.writeMetadataObserver");
 
 function resultText(result: any): string {
 	const blocks = Array.isArray(result?.content) ? result.content : [];
@@ -45,18 +52,41 @@ export function renderRichToolResult(
 	if (options?.isPartial || options?.isError || context?.isError) return undefined;
 	const expanded = options?.expanded === true || context?.expanded === true;
 	const filePath = context?.args?.file_path ?? context?.args?.path;
-	if (toolName === "edit") {
-		return renderEditDiffResult(
-			result?.details,
-			{
-				expanded,
-				filePath,
-				isHovered: options?.isHovered,
-				invalidate: () => context?.invalidate?.(),
+	const withFollowUp = (component: any) => {
+		if (!expanded || !context?.args?.then_run) return component;
+		const content = Array.isArray(result?.content)
+			? result.content.filter(
+					(block: any) =>
+						block?.type === "text" &&
+						typeof block.text === "string" &&
+						block.text.startsWith("[then_run:succeeded]"),
+				)
+			: [];
+		if (!content.length) return component;
+		const followUp = new Text(theme.fg("toolOutput", textFromResult({ content })), 0, 0);
+		return {
+			...component,
+			render: (width: number) => [...component.render(width), ...followUp.render(width)],
+			invalidate() {
+				component.invalidate?.();
+				followUp.invalidate();
 			},
-			displayConfig,
-			theme,
-			resultText(result),
+		};
+	};
+	if (toolName === "edit") {
+		return withFollowUp(
+			renderEditDiffResult(
+				result?.details,
+				{
+					expanded,
+					filePath,
+					isHovered: options?.isHovered,
+					invalidate: () => context?.invalidate?.(),
+				},
+				displayConfig,
+				theme,
+				resultText(result),
+			),
 		);
 	}
 	if (toolName !== "write") return undefined;
@@ -65,32 +95,38 @@ export function renderRichToolResult(
 
 	const metadata = writeMetadata.get(context?.toolCallId);
 	if (!metadata) {
-		return unavailableComponent("execution metadata is unavailable", theme);
+		return withFollowUp(unavailableComponent("execution metadata is unavailable", theme));
 	}
 	if (metadata.diffUnavailableReason) {
-		return unavailableComponent(metadata.diffUnavailableReason, theme);
+		return withFollowUp(unavailableComponent(metadata.diffUnavailableReason, theme));
 	}
-	return renderWriteDiffResult(
-		typeof context?.args?.content === "string" ? context.args.content : undefined,
-		{
-			expanded,
-			filePath,
-			previousContent: metadata.previousContent,
-			fileExistedBeforeWrite: metadata.fileExistedBeforeWrite,
-			isHovered: options?.isHovered,
-			invalidate: () => context?.invalidate?.(),
-		},
-		displayConfig,
-		theme,
-		resultText(result),
+	return withFollowUp(
+		renderWriteDiffResult(
+			typeof context?.args?.content === "string" ? context.args.content : undefined,
+			{
+				expanded,
+				filePath,
+				previousContent: metadata.previousContent,
+				fileExistedBeforeWrite: metadata.fileExistedBeforeWrite,
+				isHovered: options?.isHovered,
+				invalidate: () => context?.invalidate?.(),
+			},
+			displayConfig,
+			theme,
+			resultText(result),
+		),
 	);
 }
 
-/** write 被其他扩展占用时的来源，用于提示冲突。 */
-export type ExternalWriteOwner = { source: string; path: string };
+/** write 被其他扩展占用时的来源及可选元数据协作入口。 */
+export type ExternalWriteOwner = {
+	source: string;
+	path: string;
+	installMetadataObserver?: unknown;
+};
 
 type WriteOwnershipState = {
-	/** write 是否由本插件执行；undefined 表示尚未确认，按拥有处理以保持既有行为。 */
+	/** write 的执行元数据是否归本插件；undefined 表示尚未确认，按拥有处理。 */
 	owned?: boolean;
 };
 
@@ -99,8 +135,8 @@ function writeOwnership(): WriteOwnershipState {
 }
 
 /**
- * write 是否由本插件执行。只有注册过 write override 才有执行元数据，
- * 否则渲染层要放行给普通结果行，避免每张卡降级成 "diff unavailable"。
+ * write 的执行元数据是否归本插件（自有 write 或协作扩展提供）。
+ * 否则渲染层放行给普通结果行，避免每张卡降级成 "diff unavailable"。
  */
 export function ownsWriteTool(): boolean {
 	return writeOwnership().owned !== false;
@@ -114,7 +150,11 @@ function findExternalWriteOwner(pi: ExtensionAPI): ExternalWriteOwner | undefine
 		const sourceInfo = write?.sourceInfo;
 		const source = sourceInfo?.source;
 		if (!write || typeof source !== "string" || source === "builtin") return undefined;
-		return { source, path: typeof sourceInfo?.path === "string" ? sourceInfo.path : "" };
+		return {
+			source,
+			path: typeof sourceInfo?.path === "string" ? sourceInfo.path : "",
+			installMetadataObserver: write.annotations?.[WRITE_METADATA_OBSERVER],
+		};
 	} catch {
 		// getAllTools 在扩展运行时绑定前不可用。
 		return undefined;
@@ -131,6 +171,20 @@ export function installWriteOverride(
 	const state = writeOwnership();
 	const external = findExternalWriteOwner(pi);
 	if (external) {
+		const installObserver = external.installMetadataObserver;
+		if (
+			typeof installObserver === "function" &&
+			installObserver(async (toolCallId: string, path: string, write: () => Promise<void>) => {
+				store.delete(toolCallId);
+				const metadata = await capturePreviousContent(path);
+				await write();
+				store.set(toolCallId, metadata);
+			}) === true
+		) {
+			// 协作扩展保留工具执行，本插件只接收队列内捕获的写入元数据。
+			state.owned = true;
+			return store;
+		}
 		// 让位：执行与 diff 都归对方，渲染层据 owned=false 走普通结果行。
 		state.owned = false;
 		onExternalOwner?.(external);

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

@@ -71,13 +71,14 @@ export function buildCollapsedDiffHintText(
 				? `${options.hiddenHunks} ${pluralize(options.hiddenHunks, "hunk")}`
 				: undefined;
 
+		// 括号去掉：与工具卡的同名提示一致，只用小圆点连接
 		const candidates = [
-			`… (${[remainingText, hiddenHunksText, showMoreHintText()].filter(Boolean).join(" • ")})`,
-			`… (${[remainingText, hiddenHunksText].filter(Boolean).join(" • ")})`,
-			`… (${[shortRemainingText, shortHiddenHunksText].filter(Boolean).join(" • ")})`,
+			`… ${[remainingText, hiddenHunksText, showMoreHintText()].filter(Boolean).join(" · ")}`,
+			`… ${[remainingText, hiddenHunksText].filter(Boolean).join(" · ")}`,
+			`… ${[shortRemainingText, shortHiddenHunksText].filter(Boolean).join(" · ")}`,
 			options.hiddenHunks > 0
-				? `… (+${options.remainingLines} • +${options.hiddenHunks}h)`
-				: `… (+${options.remainingLines})`,
+				? `… +${options.remainingLines} · +${options.hiddenHunks}h`
+				: `… +${options.remainingLines}`,
 			"…",
 		];
 

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

@@ -37,7 +37,7 @@ export class WriteExecutionMetadataStore {
 	}
 }
 
-async function capturePreviousContent(absolutePath: string): Promise<WriteExecutionMeta> {
+export async function capturePreviousContent(absolutePath: string): Promise<WriteExecutionMeta> {
 	let info;
 	try {
 		info = await lstat(absolutePath);

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

@@ -6,7 +6,14 @@ import {
 	visibleWidth,
 	type Component,
 } from "@earendil-works/pi-tui";
+import { config } from "../../config/config.ts";
 import { TOOL_LOADING_INTERVAL_MS, toolLoadingIcon } from "../../utils/tool-loading-icon.ts";
+import {
+	CODEMODE_TOOL_NAME,
+	codemodeCalls,
+	codemodeOutputLineCount,
+	codemodeSummaryParts,
+} from "./codemode.ts";
 import { getToolMouseTui } from "../mouse/scroll.ts";
 import { mcpToolTitle } from "./mcp-title.ts";
 import { collapseHintText, isToolTuiFullscreen, showMoreHintText } from "./show-more-hint.ts";
@@ -192,6 +199,20 @@ function toolSummary(tool: any): ToolCallSummary {
 	});
 }
 
+/**
+ * codemode 的折叠行：有结果就报该次调用的统计（与单卡汇总行同一套口径），
+ * 免得一张卡里几行长代码预览互相看不出区别。还没结果时退回代码预览。
+ */
+function codemodeResultSummary(tool: any): ToolCallSummary | undefined {
+	if (toolName(tool) !== CODEMODE_TOOL_NAME || !tool?.result) return undefined;
+	const parts = codemodeSummaryParts(
+		codemodeCalls(tool.result),
+		codemodeOutputLineCount(tool.result),
+		tool?.isPartial === true,
+	);
+	return { main: `${toolTitle(tool)} ${parts.join(" · ")}`, detail: "" };
+}
+
 function toolNameList(tools: any[]): string {
 	const counts = new Map<string, number>();
 	for (const tool of tools) counts.set(toolName(tool), (counts.get(toolName(tool)) ?? 0) + 1);
@@ -216,6 +237,8 @@ type ExpandedGroupCache = {
 	hover: boolean;
 	theme: unknown;
 	fullscreen: boolean;
+	/** 背景槽位参与命中判断：改配置后已展开的分组不能继续用旧底色。 */
+	bgSlot: string;
 	paints: readonly unknown[];
 	lines: string[];
 };
@@ -362,7 +385,7 @@ export class ToolGroupComponent extends Container {
 				const color = key === "pending" ? "accent" : key;
 				return `${fg(color, String(counts[key]))} ${label}`;
 			})
-			.join(` ${fg("dim", "•")} `);
+			.join(` ${fg("dim", "·")} `);
 		const names = new Set(this.children.map(toolName));
 		const label = names.size === 1 ? toolTitle(this.children[0]) : "Multiple Tools";
 		const overall: ToolStatus = counts.error ? "error" : counts.pending ? "pending" : "success";
@@ -371,10 +394,10 @@ export class ToolGroupComponent extends Container {
 		)
 			scheduleGroupAnimation(this.patch);
 		const overallColor = overall === "pending" ? "accent" : overall;
-		const nameList = names.size > 1 ? ` ${fg("dim", `• ${toolNameList(this.children)}`)}` : "";
+		const nameList = names.size > 1 ? ` ${fg("dim", `· ${toolNameList(this.children)}`)}` : "";
 		// 圆点保持 dim；hover 只高亮可点击文字。
 		const hintText = this._expanded ? collapseHintText() : showMoreHintText();
-		const hint = `${fg("dim", "•")} ${fg(this.hintHovered ? "text" : "dim", hintText)}`;
+		const hint = `${fg("dim", "·")} ${fg(this.hintHovered ? "text" : "dim", hintText)}`;
 		// 行尾提示承载折叠分组的可点击区（collapsedHintHitbox 依赖行尾短语）。
 		// 空间不足时先省略工具名列表，再截断计数尾部，提示最后让位；
 		// 极窄视口连“圆点+标题+计数”都放不下时才回退整行截断。
@@ -403,6 +426,7 @@ export class ToolGroupComponent extends Container {
 				expandedHit.hover === this.hintHovered &&
 				expandedHit.theme === this.patch.theme &&
 				expandedHit.fullscreen === isToolTuiFullscreen() &&
+				expandedHit.bgSlot === config.expandedCardBackground &&
 				expandedHit.paints.length === childPaints.length &&
 				expandedHit.paints.every((paint, index) => paint === childPaints[index])
 			) {
@@ -417,7 +441,7 @@ export class ToolGroupComponent extends Container {
 			const branch = index === total - 1 ? "└" : "├";
 			const continuation = index === total - 1 ? "  " : "│ ";
 			if (!this._expanded) {
-				const summary = toolSummary(tool);
+				const summary = codemodeResultSummary(tool) ?? toolSummary(tool);
 				const prefix = ` ${fg("dim", branch)} ${fg(color, statusIcon(toolStatus))} `;
 				const detail = fg("dim", summary.detail);
 				// 与单工具卡标题同宽，宽屏右侧留白一致
@@ -451,8 +475,8 @@ export class ToolGroupComponent extends Container {
 			}
 		}
 		if (this._expanded) {
-			// 展开面板统一用 user message 背景色（ccstyle 约定），不按状态区分。
-			const backgroundSlot = "userMessageBg";
+			// 展开面板统一一个背景槽位（ccstyle 约定），不按状态区分。
+			const backgroundSlot = config.expandedCardBackground;
 			for (const line of expandedLines) {
 				lines.push(paddedBackgroundRow(theme, backgroundSlot, line, width));
 			}
@@ -462,6 +486,7 @@ export class ToolGroupComponent extends Container {
 				hover: this.hintHovered,
 				theme: this.patch.theme,
 				fullscreen: isToolTuiFullscreen(),
+				bgSlot: backgroundSlot,
 				paints: childPaints ?? [],
 				lines,
 			};

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

@@ -78,15 +78,15 @@ function renderCcstyle(component: any, kind: DisplayKind): void {
 	const title = theme.fg("toolTitle", kind.title(component));
 	if (!component.expanded) {
 		const hovered = component.hintHovered === true;
-		const hint = `${theme.fg("dim", " • ")}${theme.fg(hovered ? "text" : "dim", showMoreHintText())}`;
+		const hint = `${theme.fg("dim", " · ")}${theme.fg(hovered ? "text" : "dim", showMoreHintText())}`;
 		component.addChild(new Text(`${icon} ${title}${hint}`, 0, 0));
 		return;
 	}
-	// 展开卡与 tool 一致：userMessageBg + 上下左右 1 格
+	// 展开卡与 tool 一致：同一个展开卡背景 + 上下左右 1 格
 	component.paddingX = 1;
 	component.paddingY = 1;
 	if (typeof theme.bg === "function" && typeof component.setBgFn === "function") {
-		component.setBgFn((text: string) => theme.bg("userMessageBg", text));
+		component.setBgFn((text: string) => theme.bg(config.expandedCardBackground, text));
 	}
 	component.addChild(new Text(`${icon} ${title}`, 0, 0));
 	component.addChild(new Spacer(1));

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

@@ -255,6 +255,9 @@ export function toolCallSummary(
 		const code = typeof args.code === "string" && args.code ? clip(args.code) : "";
 		return code ? { main: title, detail: "", payload: code } : { main: title, detail: "" };
 	}
+	// 内置 codemode：标题只报工具名。脚本很长，塞进行首既挤又读不出重点；
+	// 要看代码展开 Input，要看跑了什么看子调用行。
+	if (name === "codemode") return { main: title, detail: "" };
 
 	const value = (fallback: string, ...keys: string[]) => {
 		const found = keys.map((key) => args[key]).find((item) => typeof item === "string" && item);