@herbertgao/pi-extensions 2026.9.19 → 2026.10.0

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

@@ -1,12 +1,20 @@
 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,
 	type DisplayConfigInput,
 } from "./diff-renderer.ts";
-import { DEFAULT_TOOL_DISPLAY_CONFIG } from "./types.ts";
-import { executeWriteWithMetadata, WriteExecutionMetadataStore } from "./write-execution.ts";
+import { DEFAULT_TOOL_DISPLAY_CONFIG } from "../../../config/config.ts";
+import { patchRegistry, WRITE_OWNERSHIP_SLOT } from "../../../utils/patch-keys.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 : [];
@@ -44,65 +52,97 @@ 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;
-	// Yield point: when another extension owns write there is no execution metadata; fall back to the plain result row.
+	// 让位点：write 归其他扩展时不提供富 diff，交回普通结果行。
 	if (!ownsWriteTool()) return undefined;
 
 	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),
+		),
 	);
 }
 
-/** Extension currently owning write, reported in the conflict notice. */
-export type ExternalWriteOwner = { source: string; path: string };
+/** write 被其他扩展占用时的来源及可选元数据协作入口。 */
+export type ExternalWriteOwner = {
+	source: string;
+	path: string;
+	installMetadataObserver?: unknown;
+};
 
-const WRITE_OWNERSHIP_SLOT = Symbol.for("pi.ccstyle.write-ownership");
-/** Parameters object of the write override registered by this module; identifies our own tool in getAllTools(). */
-let ownWriteParameters: unknown;
+type WriteOwnershipState = {
+	/** write 的执行元数据是否归本插件；undefined 表示尚未确认，按拥有处理。 */
+	owned?: boolean;
+};
 
-function writeOwnership(): { owned?: boolean } {
-	const slots = globalThis as any;
-	slots[WRITE_OWNERSHIP_SLOT] ??= {};
-	return slots[WRITE_OWNERSHIP_SLOT];
+function writeOwnership(): WriteOwnershipState {
+	return patchRegistry.ensure<WriteOwnershipState>(WRITE_OWNERSHIP_SLOT, () => ({}));
 }
 
-/** Whether this package executes write; unknown ownership keeps the existing rich-diff behavior. */
+/**
+ * write 的执行元数据是否归本插件（自有 write 或协作扩展提供）。
+ * 否则渲染层放行给普通结果行，避免每张卡降级成 "diff unavailable"。
+ */
 export function ownsWriteTool(): boolean {
 	return writeOwnership().owned !== false;
 }
 
+/** 当前占用 write 的其他扩展；builtin 或未注册时返回 undefined。 */
 function findExternalWriteOwner(pi: ExtensionAPI): ExternalWriteOwner | undefined {
 	try {
 		const tools = pi.getAllTools() as any[];
@@ -110,12 +150,13 @@ function findExternalWriteOwner(pi: ExtensionAPI): ExternalWriteOwner | undefine
 		const sourceInfo = write?.sourceInfo;
 		const source = sourceInfo?.source;
 		if (!write || typeof source !== "string" || source === "builtin") return undefined;
-		// Our own override from an earlier session_start in this runtime.
-		if (ownWriteParameters !== undefined && write.parameters === ownWriteParameters)
-			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 is unavailable before the extension runtime is bound.
+		// getAllTools 在扩展运行时绑定前不可用。
 		return undefined;
 	}
 }
@@ -123,20 +164,34 @@ function findExternalWriteOwner(pi: ExtensionAPI): ExternalWriteOwner | undefine
 export function installWriteOverride(
 	pi: ExtensionAPI,
 	store = new WriteExecutionMetadataStore(),
-	/** Called when another extension already owns write. */
+	/** write 已被其他扩展占用时回调一次，调用方据此提示冲突。 */
 	onExternalOwner?: (owner: ExternalWriteOwner) => void,
 ): WriteExecutionMetadataStore {
 	if (typeof (pi as any).registerTool !== "function") return store;
 	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);
 		return store;
 	}
 	state.owned = true;
 	const nativeWrite = createWriteToolDefinition(process.cwd()) as any;
-	ownWriteParameters = nativeWrite.parameters;
 	pi.registerTool({
 		...nativeWrite,
 		async execute(
@@ -157,6 +212,6 @@ export {
 	type ToolDisplayConfig,
 	type DiffViewMode,
 	type DiffIndicatorMode,
-} from "./types.ts";
+} from "../../../config/config.ts";
 export type { DisplayConfigInput } from "./diff-renderer.ts";
 export { WriteExecutionMetadataStore } from "./write-execution.ts";

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/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 { pluralize } from "./diff-text.ts";
+import { showMoreHintText } from "../show-more-hint.ts";
 
 export interface WidthMeasurementOps {
 	measure(text: string): number;
@@ -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);
@@ -94,6 +94,7 @@ export async function executeWriteWithMetadata(
 			await mkdir(dirname(absolutePath), { recursive: true });
 			throwIfAborted();
 			await writeFile(absolutePath, params.content, "utf8");
+			// 写入后不再检查 abort：文件已变更，必须如实报告成功
 			store.set(toolCallId, metadata);
 			return {
 				content: [