@herbertgao/pi-extensions 2026.9.18 → 2026.9.20

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

@@ -1,4 +1,4 @@
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { ToolExecutionComponent, type ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import type { CompactThinkingController } from "../feature/compact-thinking.ts";
 import { installToolGrouping, type ToolGroupingHooks } from "./tool/grouping.ts";
 import {
@@ -12,14 +12,14 @@ import {
 	installToolExpandedBackground,
 	type DefaultModeHooks,
 } from "./default-mode.ts";
-import { isLazyProxyTui } from "../utils/fullscreen-detect.ts";
+import { installMainScreenDoRenderPatch, isLazyProxyTui } from "../utils/fullscreen-detect.ts";
 import { showCcstylePanel } from "../config/panel.ts";
 import {
 	config,
 	formatConfigStatus,
 	normalizeConfig,
-	saveConfig,
 	setConfig,
+	updateConfig,
 	type CompactStyleMode,
 	type Config,
 } from "../config/config.ts";
@@ -27,19 +27,19 @@ import {
 	installToolMouseInteraction,
 	resetToolHoverState,
 	scheduleSessionRender,
-	setHoveredToolGroup,
-	setHoveredToolIo,
 	teardownToolMouseInteraction,
 	TOOL_MOUSE_DISABLE,
 } from "./mouse/interaction.ts";
-import { getToolMouseTui } from "./mouse/scroll.ts";
+import { getToolMouseTui, noteNewTranscriptItem } from "./mouse/scroll.ts";
+import { setHoveredToolGroup, setHoveredToolIo } from "./mouse/hover.ts";
 import { clearAllAnimations } from "./tool/result.ts";
 import { installWriteOverride, WriteExecutionMetadataStore } from "./tool/diff/index.ts";
 import {
 	installMessageDisplayRendering,
 	refreshMessageDisplays,
 	setMessageDisplayTheme,
-} from "./message-display.ts";
+} from "./tool/message-display.ts";
+import { GLOBAL_TOOL_RENDER_PATCH, patchRegistry } from "../utils/patch-keys.ts";
 
 /**
  * Claude Code Style for pi — 装配入口。
@@ -49,8 +49,6 @@ import {
  * 共用        → tool-grouping / message-display / mouse / write override
  */
 
-const GLOBAL_COMPACTION_RENDER_PATCH = Symbol.for("pi.ccstyle.compaction-render-patch");
-
 let compactModeHooks: CompactModeHooks | undefined;
 
 function refreshCurrentTranscript(ctx?: any, toolGrouping?: ToolGroupingHooks): void {
@@ -69,8 +67,7 @@ function syncCompactMode(ctx: any): void {
 }
 
 function applyStyleMode(mode: CompactStyleMode, ctx: any, toolGrouping?: ToolGroupingHooks): void {
-	config.mode = mode;
-	saveConfig();
+	updateConfig({ mode });
 	if (mode === "off") {
 		// Native rendering：清 hover/click，关闭鼠标上报以恢复终端默认滚轮。
 		resetToolHoverState();
@@ -96,18 +93,6 @@ function applyStyleMode(mode: CompactStyleMode, ctx: any, toolGrouping?: ToolGro
 	ctx.ui.notify(`Claude Code style: ${mode}`, "info");
 }
 
-type LegacyCompactionRenderPatch = {
-	enabled?: () => boolean;
-};
-
-/** Disable the pre-native compaction monkey patch left alive by /reload. */
-function deactivateLegacyCompactionRendering() {
-	const patch = (globalThis as any)[GLOBAL_COMPACTION_RENDER_PATCH] as
-		| LegacyCompactionRenderPatch
-		| undefined;
-	if (patch) patch.enabled = () => false;
-}
-
 export default function (
 	pi: ExtensionAPI,
 	configOverride?: Partial<Config>,
@@ -132,6 +117,12 @@ export default function (
 		// 渲染层（工具样式/分组）是原型与组件级 patch，fullscreen 官方布局
 		// 同样渲染这些组件，因此两种模式都安装。
 		if (installation) return installation;
+		// reload 接管：上一代 global tool patch 断开后，其 mode() 闭包仍读旧模块
+		// config（应为 off）；先固定为 off，避免陈旧回调继续参与渲染决策。
+		const staleGlobalPatch = patchRegistry.get<{ mode: () => string }>(GLOBAL_TOOL_RENDER_PATCH);
+		if (staleGlobalPatch) staleGlobalPatch.mode = () => "off";
+		// regular 主屏的差分渲染补丁：视口上方变化不再触发清回滚的 fullRender。
+		installMainScreenDoRenderPatch();
 		const defaultMode = installDefaultMode(writeExecutionMetadata);
 		const toolGrouping = installToolGrouping(() => config.mode === "on");
 		const compactMode = installCompactMode({
@@ -142,7 +133,6 @@ export default function (
 		const disposeMessageDisplay = installMessageDisplayRendering();
 		// 展开背景必须在 compact-mode 之后装，shutdown 时先于 compact 释放。
 		const disposeToolExpandedBackground = installToolExpandedBackground();
-		deactivateLegacyCompactionRendering();
 		installation = {
 			defaultMode,
 			toolGrouping,
@@ -206,6 +196,13 @@ export default function (
 		}
 	});
 
+	// 回到底部按钮的累计计数：离开底部期间每落一块内容 +1。
+	pi.on("message_start", async (event) => {
+		const role = event.message?.role;
+		// toolResult 不单独成块（渲染在工具卡内），跳过以免与工具卡重复计数。
+		if (role === "user" || role === "assistant" || role === "custom") noteNewTranscriptItem();
+	});
+
 	pi.on("tool_execution_end", async (event) => {
 		if (config.mode !== "compact") return;
 		// Agent 等工具收尾后延迟刷新，让 compact-thinking 先落最终态。
@@ -215,11 +212,19 @@ export default function (
 		}, 0);
 	});
 
-	pi.on("session_start", async (_event, ctx) => {
-		// 延迟到 session_start 注册 write override：加载阶段 getAllTools 不可用且其他扩展
-		// 尚未注册工具，无法检测外部 write 所有者（如 pi-spark），直接注册会与对方撞名。
-		// session_start 时所有扩展已加载完毕，installWriteOverride 内部会检测并让位。
-		installWriteOverride(pi, writeExecutionMetadata);
+	pi.on("session_start", async (event, ctx) => {
+		// 延后一拍再确认 write 归属：其他扩展同样在各自的 session_start 里注册工具，
+		// 本 handler 执行时可能还看不到对方，此时注册会与对方撞名（注册表先到先得），
+		// 对方的 write 会被静默丢弃。等所有 session_start 跑完，检测结果才是权威的。
+		setTimeout(() => {
+			installWriteOverride(pi, writeExecutionMetadata, (owner) => {
+				// 冲突可见：对方接管 write 后本插件不再提供富 diff。
+				ctx.ui?.notify?.(
+					`ccstyle: write 工具已被 ${owner.path || owner.source} 占用，富 diff 已让位`,
+					"warning",
+				);
+			});
+		}, 0);
 		const hooks = ensureTuiInstallation(ctx);
 		// 鼠标交互独立于渲染层：fullscreen 渲染层让位（hooks undefined）但
 		// 工具点击/回到底部适配仍需安装；保持在渲染层安装之后以维持原顺序。
@@ -236,7 +241,7 @@ export default function (
 		scheduleSessionRender(() => hooks.toolGrouping.refresh(getToolMouseTui()));
 	});
 
-	pi.on("session_compact", async (_event, ctx) => {
+	pi.on("session_compact", async (event, ctx) => {
 		const hooks = ensureTuiInstallation(ctx);
 		// Compaction rebuilds the transcript without session_start. Rebind after
 		// other TUI extensions may have replaced the root input dispatcher.
@@ -251,7 +256,7 @@ export default function (
 		});
 	});
 
-	pi.on("session_tree", async (_event, ctx) => {
+	pi.on("session_tree", async (event, ctx) => {
 		// 会话树重建后在当前帧和下一帧各同步一次，替换旧组件引用。
 		if (ctx?.mode !== "tui" || !ctx?.hasUI) return;
 		syncCompactMode(ctx);
@@ -260,6 +265,7 @@ export default function (
 
 	pi.on("tool_execution_start", async (_event, ctx) => {
 		installation?.toolGrouping.setTheme(ctx.ui.theme);
+		noteNewTranscriptItem();
 	});
 
 	pi.on("session_shutdown", async () => {
@@ -268,20 +274,13 @@ export default function (
 		// 但 onTerminalInput 监听与 handleViewportInput 包装仍需释放。
 		teardownToolMouseInteraction(mouseOwner);
 		const current = installation;
-		if (!current) return;
-		if (!current.defaultMode.isOwner()) {
-			// Replacement installers already disposed these owner-aware patches.
-			// Drop only this stale runtime's closure; global teardown belongs to the owner.
-			installation = undefined;
-			return;
-		}
+		if (!current || !current.defaultMode.isOwner()) return;
 		current.defaultMode.shutdown();
 		current.toolGrouping.shutdown();
 		current.disposeToolExpandedBackground();
 		current.compactMode.shutdown();
 		compactModeHooks = undefined;
 		current.disposeMessageDisplay();
-		deactivateLegacyCompactionRendering();
 		clearAllAnimations();
 		installation = undefined;
 	});
@@ -290,11 +289,13 @@ export default function (
 // ---- 对外导出：入口/测试实际消费的符号 ----
 export { getCompactThinkingConfig } from "../config/config.ts";
 export {
-	humanizeMcpToolName,
-	isMcpToolDefinition,
 	preservesOriginalRenderer,
 	shouldRenderRichDiff,
 } from "./default-mode.ts";
+export {
+	isMcpToolDefinition,
+	mcpToolTitle,
+} from "./tool/mcp-title.ts";
 export {
 	ExpandedToolIoView,
 	ExpandedToolResultText,

package/node_modules/@herbertgao/pi-cc-extensions/extensions/renderer/markdown-enhance.ts

@@ -69,7 +69,9 @@ function renderAdmonition(lines: string[], i: number): { output: string[]; next:
 		j++;
 	}
 	while (body.length > 0 && body[body.length - 1].trim() === "") body.pop();
+	// 内容合并为一行，作为引用块正文
 	const content = body.join(" ").trim();
+	// 保留引用块形态（pi 渲染为左侧竖线），标签加粗
 	return {
 		output: [`> **${style.icon} ${style.label}**${content ? ` ${content}` : ""}`, ""],
 		next: j,
@@ -83,10 +85,13 @@ function renderAdmonition(lines: string[], i: number): { output: string[]; next:
 const URL_RE = /(?<!<)(?<!\]\()https?:\/\/[^\s<>'"|，。；：！？、」』】（）【】《》『』「」]+/g;
 const TRIM_URL_RE = /[.,;:!?】」』"'》）}]+$/;
 
-/** 去掉 URL 尾部标点；括号按平衡保留（如 Wikipedia 链接含括号）。 */
+/**
+ * 去掉 URL 尾部标点；括号按平衡保留（如 Wikipedia 链接含括号、
+ * IPv6 地址含 [::1]），尾部不成对的 ] 与 ) 会截掉。
+ */
 function trimUrl(url: string): string {
 	let t = url.replace(TRIM_URL_RE, "");
-	while (true) {
+	for (;;) {
 		if (t.endsWith(")") && (t.match(/\(/g)?.length ?? 0) < (t.match(/\)/g)?.length ?? 0)) {
 			t = t.slice(0, -1);
 		} else if (t.endsWith("]") && (t.match(/\[/g)?.length ?? 0) < (t.match(/\]/g)?.length ?? 0)) {
@@ -296,6 +301,7 @@ export default function (pi: ExtensionAPI): void {
 	// 所以三个转换合并为一次注册，内部按序链式执行。
 	pi.registerMarkdownTransformer((markdown, context) => {
 		const { messageType, isStreaming = false } = context ?? {};
+		// thinking 保持原文；普通回复即使流式中也先关闭跨行链接的空白点击区。
 		if (messageType === "assistant-thinking") return markdown;
 		markdown = normalizeMultilineLinks(markdown);
 		if (isStreaming) return markdown;

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

@@ -1,5 +1,6 @@
 import { ThinkingPreviewBlock } from "../../feature/compact-thinking.ts";
 import { setHoveredCompactAssistant } from "../compact-mode.ts";
+import { patchRegistry, TOOL_HOVER_STATE_KEY } from "../../utils/patch-keys.ts";
 import {
 	isExpandedToolIoView,
 	invalidateIoView,
@@ -10,8 +11,6 @@ import type { ToolGroupComponent } from "../tool/grouping.ts";
 import { componentAtLocalRow, type ComponentRowHit } from "./layout.ts";
 import { setScrollButtonHovered } from "./scroll.ts";
 
-const TOOL_HOVER_STATE_KEY = Symbol.for("pi.ccstyle.tool-hover-state");
-
 type SharedToolHoverState = { toolCallId: string | null };
 
 /**
@@ -19,14 +18,10 @@ type SharedToolHoverState = { toolCallId: string | null };
  * 测试依赖该跨实例语义。
  */
 export function sharedToolHoverState(): SharedToolHoverState {
-	const host = globalThis as any;
-	return (host[TOOL_HOVER_STATE_KEY] ??= { toolCallId: null });
+	return patchRegistry.ensure(TOOL_HOVER_STATE_KEY, () => ({ toolCallId: null }));
 }
 
-export let hoveredToolCallId: string | null = sharedToolHoverState().toolCallId;
-
 export function setHoveredToolCallId(toolCallId: string | null): void {
-	hoveredToolCallId = toolCallId;
 	sharedToolHoverState().toolCallId = toolCallId;
 }