@herbertgao/pi-extensions 2026.9.18 → 2026.9.20

package/node_modules/@herbertgao/pi-cc-extensions/extensions/feature/agent-summary/core.ts

@@ -2,13 +2,14 @@
  * Agent 回合摘要：统计一次 agent 运行的工具使用并格式化成摘要文本。
  *
  * 分类：bash / read / edit / write / other（精确工具名；MCP 风格名归 other）。
- * 计数：bash 按调用次数；read/edit/write 按非空 path/file_path 去重；other 按调用次数。
+ * 计数：bash/powershell 按调用次数；read/edit/write 按非空 path/file_path 去重；other 按调用次数。
  * 失败单独累计；另记回合耗时。
  *
  * 呈现：`summaryLine` 纯文本，`summaryMarkdown` Markdown（可 box 引用块）。
  */
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { formatDuration } from "../../utils/format.ts";
 
 /** 工具分类。 */
 export type AgentToolCategory = "bash" | "read" | "edit" | "write" | "other";
@@ -38,6 +39,7 @@ function nonEmptyString(value: unknown): value is string {
 }
 
 function toolPath(args?: Record<string, unknown> | null): string | undefined {
+	// path 为空字符串时回退 file_path 别名，避免该文件不被计入去重集合。
 	if (nonEmptyString(args?.path)) return args.path;
 	return nonEmptyString(args?.file_path) ? args.file_path : undefined;
 }
@@ -98,18 +100,6 @@ export class AgentRunSummary {
 	}
 }
 
-/** 毫秒 → "1h 2m 3s"/"2m 3s"/"3s"；低于 1 秒返回 ""（省略）。 */
-export function formatDuration(ms: number): string {
-	const totalSec = Math.floor(ms / 1000);
-	if (totalSec < 1) return "";
-	const hours = Math.floor(totalSec / 3600);
-	const minutes = Math.floor((totalSec % 3600) / 60);
-	const seconds = totalSec % 60;
-	if (hours > 0) return `${hours}h ${minutes}m ${seconds}s`;
-	if (minutes > 0) return `${minutes}m ${seconds}s`;
-	return `${seconds}s`;
-}
-
 const plural = (count: number) => (count === 1 ? "" : "s");
 
 /** 输出顺序：bash → read → edit → write → other → failed。 */
@@ -124,24 +114,8 @@ function summaryParts(data: AgentSummaryData): string[] {
 	return parts;
 }
 
-/** 纯文本摘要行：句首大写 + 可选耗时。 */
-export function summaryLine(data: AgentSummaryData): string {
-	const parts = summaryParts(data);
-	if (parts.length === 0) return "";
-	const text = parts.join(", ");
-	const capitalized = text[0].toUpperCase() + text.slice(1);
-	const duration = formatDuration(data.durationMs);
-	return duration ? `${capitalized} · ${duration}` : capitalized;
-}
-
-/**
- * Markdown 摘要行。
- * `box` 为 true：引用块 `> *斜体*`；false：整体加粗。
- * `colors`：仅数字染色（success / failed）。
- */
 export function summaryMarkdown(
 	data: AgentSummaryData,
-	box = false,
 	colors: { success: string; failed: string } = { success: "", failed: "" },
 ): string {
 	const parts = summaryParts(data);
@@ -158,7 +132,7 @@ export function summaryMarkdown(
 		.join(", ");
 	const duration = formatDuration(data.durationMs);
 	const line = duration ? `${text} · ${duration}` : text;
-	return box ? `> *${line}*` : `**${line}**`;
+	return `> *${line}*`;
 }
 
 /**
@@ -170,8 +144,7 @@ export function summaryMarkdown(
 export function bindAgentSummary(
 	pi: ExtensionAPI,
 	onSummary: (data: AgentSummaryData) => void,
-	minToolCount = 2,
-): () => void {
+): void {
 	let summary = new AgentRunSummary();
 	pi.on("agent_start", async () => {
 		summary = new AgentRunSummary();
@@ -183,9 +156,6 @@ export function bindAgentSummary(
 		summary.recordToolResult(event.isError === true);
 	});
 	pi.on("agent_end", async () => {
-		if (summary.toolCount >= minToolCount) onSummary(summary.snapshot());
+		if (summary.toolCount >= 2) onSummary(summary.snapshot());
 	});
-	return () => {
-		summary = new AgentRunSummary();
-	};
 }

package/node_modules/@herbertgao/pi-cc-extensions/extensions/feature/agent-summary/index.ts

@@ -2,7 +2,7 @@
  * Agent 回合摘要展示：agent_end 时把本回合工具统计写入会话条目，
  * 由 entry renderer 渲染为 markdown 引用块 `> [!TIP] *斜体内容*`。
  *
- * 统计复用 ./core.ts（bash/read/edit/write/other）。
+ * 统计复用 ./core.ts（bash|powershell/read/edit/write/other）。
  * appendEntry 不进 LLM 上下文，只显示在聊天区。
  * 引用块文字色取主题 mdQuote（cc 主题下为 muted 灰），内容用 *斜体* 语法。
  */
@@ -16,7 +16,7 @@ export const AGENT_SUMMARY_ENTRY_TYPE = "agent-summary";
 
 export default function (pi: ExtensionAPI): void {
 	pi.registerEntryRenderer(AGENT_SUMMARY_ENTRY_TYPE, (entry, _options, theme) => {
-		const line = summaryMarkdown(entry.data as AgentSummaryData, true, {
+		const line = summaryMarkdown(entry.data as AgentSummaryData, {
 			success: theme.getFgAnsi("success"),
 			failed: theme.getFgAnsi("error"),
 		});

package/node_modules/@herbertgao/pi-cc-extensions/extensions/feature/compact-thinking.ts

@@ -18,16 +18,19 @@ import {
 	wrapTextWithAnsi,
 } from "@earendil-works/pi-tui";
 import { Box, Markdown, Spacer, Text, type Component } from "@earendil-works/pi-tui";
-import { isToolTuiFullscreen } from "../renderer/show-more-hint.ts";
+import { isToolTuiFullscreen } from "../renderer/tool/show-more-hint.ts";
 import {
 	animateCompactThinkingText,
 	formatThoughtDuration,
 	styleCompactThinkingText,
 } from "../renderer/compact-mode.ts";
 import { refreshMountedTranscript } from "../renderer/transcript-refresh.ts";
-// 保持导出兼容：渲染函数已并入 renderer/compact-mode.ts，这里 re-export。
-export { animateCompactThinkingText, formatThoughtDuration, styleCompactThinkingText };
-
+import {
+	COMPACT_THINKING_OWNER,
+	COMPACT_THINKING_PATCH_KEY,
+	patchRegistry,
+	PROTOTYPE_ORIGINAL_KEY,
+} from "../utils/patch-keys.ts";
 // pi-tui 类型声明中 TUI 的 re-export 解析失败，本地用最小结构化类型（只用到 requestRender）。
 type RenderTui = { requestRender(force?: boolean): void };
 
@@ -112,8 +115,6 @@ const config: CompactThinkingConfig = {
 };
 
 const DURATION_ENTRY_TYPE = "compact-thinking-duration";
-const COMPACT_THINKING_PATCH_KEY = Symbol.for("pi.ccstyle.compact-thinking-update");
-const PROTOTYPE_ORIGINAL_KEY = Symbol.for("pi.ccstyle.prototype-original");
 
 /** 当前激活 session 的只读查询委托（compact 渲染层使用）。 */
 type ThinkingDurationQuery = (messageTimestamp: number) => number | undefined;
@@ -203,12 +204,8 @@ type ExpandedWrapEntry = { text: string; lines: string[] };
 const expandedWrapCache = new Map<string, ExpandedWrapEntry>();
 export const THINKING_EXPANDED_WRAP_CACHE_MAX = 64;
 
-export function thinkingRunKey(messageTimestamp: number, runStartIndex: number): string {
-	return `${messageTimestamp}:${runStartIndex}`;
-}
-
 function expandedWrapKey(messageTimestamp: number, runStartIndex: number, width: number): string {
-	return `${thinkingRunKey(messageTimestamp, runStartIndex)}:${width}`;
+	return `${messageTimestamp}:${runStartIndex}:${width}`;
 }
 
 function wrapExpandedThinking(
@@ -236,9 +233,11 @@ function wrapExpandedThinking(
 }
 
 function evictExpandedWraps(messageTimestamp: number, runStartIndex: number): void {
-	const prefix = `${thinkingRunKey(messageTimestamp, runStartIndex)}:`;
 	for (const key of expandedWrapCache.keys()) {
-		if (key.startsWith(prefix)) expandedWrapCache.delete(key);
+		const [ts, run] = key.split(":");
+		if (Number(ts) === messageTimestamp && Number(run) === runStartIndex) {
+			expandedWrapCache.delete(key);
+		}
 	}
 }
 
@@ -322,9 +321,9 @@ function hiddenPreviewHint(
 	return undefined;
 }
 
-const expandedThinking = new Set<string>();
+const expandedThinking = new Set<number>();
 
-/** 折叠预览 + 展开全文。fullscreen 点击 hint 展开、双击整块收起，对齐工具卡。 */
+/** 折叠预览 + 展开全文。fullscreen 点击 hint 展开、展开卡单击整块收起（拖动选择文本时不收起）。 */
 export class ThinkingPreviewBlock implements Component {
 	private heading: string;
 	private text: string;
@@ -361,7 +360,7 @@ export class ThinkingPreviewBlock implements Component {
 		this.runStartIndex = runStartIndex;
 		this.style = style;
 		this.theme = theme;
-		this._expanded = expandedThinking.has(thinkingRunKey(messageTimestamp, runStartIndex));
+		this._expanded = expandedThinking.has(messageTimestamp);
 	}
 
 	private paint(color: string, text: string): string {
@@ -377,10 +376,9 @@ export class ThinkingPreviewBlock implements Component {
 	setExpanded(expanded: boolean): void {
 		if (this._expanded !== expanded) this.collapsedMemo = undefined;
 		this._expanded = expanded;
-		const key = thinkingRunKey(this.messageTimestamp, this.runStartIndex);
-		if (expanded) expandedThinking.add(key);
+		if (expanded) expandedThinking.add(this.messageTimestamp);
 		else {
-			expandedThinking.delete(key);
+			expandedThinking.delete(this.messageTimestamp);
 			evictExpandedWraps(this.messageTimestamp, this.runStartIndex);
 		}
 	}
@@ -632,6 +630,7 @@ function compactThinking(pi: ExtensionAPI) {
 	) {
 		const component = this as AssistantMessageComponentLike;
 		const self = this as unknown as AssistantInternals;
+		// isStreaming 丢失 → mermaid 流式误渲染来回闪。
 		self.isStreaming = isStreaming ?? self.isStreaming;
 		self.lastMessage = message;
 		latestComponent = component;
@@ -1044,8 +1043,6 @@ type CompactThinkingOwner = {
 	stop(event?: any, ctx?: any): void;
 };
 
-const COMPACT_THINKING_OWNER = Symbol.for("pi.ccstyle.compact-thinking-owner");
-
 type UpstreamHandler = (event: any, ctx: any) => void;
 
 export function installCompactThinking(
@@ -1053,10 +1050,6 @@ export function installCompactThinking(
 	initialConfig: CompactThinkingConfig,
 ): CompactThinkingController {
 	const owner = {};
-	const host = globalThis as typeof globalThis & {
-		[COMPACT_THINKING_OWNER]?: CompactThinkingOwner;
-	};
-
 	let session: { event: any; ctx: any } | undefined;
 	let active = false;
 	// Stable pi.on wrappers delegate here so activate/reload never double-binds.
@@ -1092,7 +1085,8 @@ export function installCompactThinking(
 		const shutdown = delegates.get("session_shutdown");
 		delegates.clear();
 		shutdown?.(event ?? session?.event ?? {}, ctx ?? session?.ctx ?? { mode: "rpc", ui: {} });
-		if (host[COMPACT_THINKING_OWNER]?.owner === owner) delete host[COMPACT_THINKING_OWNER];
+		if (patchRegistry.get<CompactThinkingOwner>(COMPACT_THINKING_OWNER)?.owner === owner)
+			patchRegistry.delete(COMPACT_THINKING_OWNER);
 	};
 
 	const activate = (event: any, ctx: any) => {
@@ -1100,7 +1094,7 @@ export function installCompactThinking(
 		// TUI prototype patch or kill its thinking ticker.
 		if (ctx?.mode !== "tui") return;
 
-		host[COMPACT_THINKING_OWNER]?.stop(event, ctx);
+		patchRegistry.get<CompactThinkingOwner>(COMPACT_THINKING_OWNER)?.stop(event, ctx);
 		session = { event, ctx };
 
 		// 配置统一由 claude-code-style 管控，加载时覆盖库默认值。
@@ -1125,7 +1119,7 @@ export function installCompactThinking(
 		} as unknown as ExtensionAPI);
 
 		active = true;
-		host[COMPACT_THINKING_OWNER] = { owner, stop };
+		patchRegistry.install(COMPACT_THINKING_OWNER, { owner, stop });
 	};
 
 	pi.on("session_start", (event, ctx) => {
@@ -1133,7 +1127,8 @@ export function installCompactThinking(
 		activate(event, ctx);
 	});
 	pi.on("session_shutdown", (event, ctx) => {
-		if (host[COMPACT_THINKING_OWNER]?.owner === owner) stop(event, ctx);
+		if (patchRegistry.get<CompactThinkingOwner>(COMPACT_THINKING_OWNER)?.owner === owner)
+			stop(event, ctx);
 		session = undefined;
 	});