pi-cc-extensions 0.8.52 → 0.8.53

package/extensions/feature/compact-thinking.ts

@@ -18,6 +18,7 @@ import {
 	formatThoughtDuration,
 	styleCompactThinkingText,
 } from "../renderer/compact-mode.ts";
+import { refreshMountedTranscript } from "../renderer/transcript-refresh.ts";
 // 保持导出兼容：渲染函数已并入 renderer/compact-mode.ts，这里 re-export。
 export { animateCompactThinkingText, formatThoughtDuration, styleCompactThinkingText };
 
@@ -286,7 +287,6 @@ function compactThinking(pi: ExtensionAPI) {
 	};
 
 	const completedDurations = new Map<number, Map<number, number>>();
-	const renderedComponents = new Set<AssistantMessageComponentLike>();
 	const streamingComponents = new Set<AssistantMessageComponentLike>();
 	let activeThinking: ActiveThinking | undefined;
 	let activeTheme: Theme | undefined;
@@ -298,14 +298,6 @@ function compactThinking(pi: ExtensionAPI) {
 	let compactSummaryActive = false;
 	let patchInstalled = true;
 
-	function refreshRenderedComponents() {
-		for (const component of renderedComponents) {
-			const self = component as unknown as AssistantInternals;
-			if (self.lastMessage) self.updateContent(self.lastMessage);
-		}
-		activeTui?.requestRender(true);
-	}
-
 	function thinkingStyle(text: string) {
 		return styleCompactThinkingText(text, activeTheme);
 	}
@@ -346,7 +338,6 @@ function compactThinking(pi: ExtensionAPI) {
 		const component = this as AssistantMessageComponentLike;
 		const self = this as unknown as AssistantInternals;
 		self.lastMessage = message;
-		renderedComponents.add(component);
 		latestComponent = component;
 		latestComponentTimestamp = message.timestamp;
 
@@ -455,8 +446,10 @@ function compactThinking(pi: ExtensionAPI) {
 					(durationText ? thinkingStyle(` · ${durationText}`) : "");
 			} else {
 				// Completed compact blocks use one provider-independent status line.
+				// 无时长记录（中断流/旧会话/entry 缺失或索引错位）时不回退到加载文案
+				// "Thinking..."：改用摘要标题或中性 "Thought"。
 				heading = thinkingStyle(
-					durationText ? `Thought for ${durationText}` : self.hiddenThinkingLabel || "Thinking...",
+					durationText ? `Thought for ${durationText}` : (latestSummary?.title ?? "Thought"),
 				);
 			}
 			self.contentContainer.addChild(new Text(heading, self.outputPad, 0));
@@ -696,20 +689,24 @@ function compactThinking(pi: ExtensionAPI) {
 
 		// An empty widget gives the animation loop access to requestRender without
 		// enabling terminal mouse reporting or intercepting native scrollback input.
+		// setWidget 的 factory 同步执行，此刻补丁已安装。
 		ctx.ui.setWidget(WIDGET_ID, (tui) => {
 			activeTui = tui;
 			return { render: () => [], invalidate() {} };
 		});
 
-		// On resume, Pi may construct the chat before session_start is emitted.
-		// Rebuild those already-rendered components now that persisted durations
-		// and the active theme are available.
-		refreshRenderedComponents();
+		// pi 在 reload/resume 时先于 session_start 用原始原型重建聊天组件
+		// （rebuildChatFromMessages / renderCurrentSessionState）。由共享的
+		// refreshMountedTranscript 扫描挂载树重绘这些组件，恢复 compact 渲染、
+		// 持久化时长与工具调用显示。
+		refreshMountedTranscript(activeTui);
+		activeTui?.requestRender(true);
 	});
 
 	pi.on("session_tree", (_event, ctx) => {
 		restoreDurationEntries(ctx.sessionManager.getBranch(), completedDurations);
-		refreshRenderedComponents();
+		refreshMountedTranscript(activeTui);
+		activeTui?.requestRender(true);
 	});
 
 	pi.on("session_shutdown", (_event, ctx) => {
@@ -726,7 +723,6 @@ function compactThinking(pi: ExtensionAPI) {
 		latestComponent = undefined;
 		latestComponentTimestamp = undefined;
 		completedDurations.clear();
-		renderedComponents.clear();
 		streamingComponents.clear();
 		if (ctx.mode === "tui") ctx.ui.setWidget(WIDGET_ID, undefined);
 

package/extensions/feature/markdown-enhance.ts

@@ -129,6 +129,18 @@ function linkifyUrls(markdown: string): string {
 	return out.join("\n");
 }
 
+// ============================================================================
+// 圈数字 → 半角括号
+// ============================================================================
+
+// Nerd Font 补丁字形（U+2460-U+2473）ink 超界，DirectWrite 下渲染会压住相邻字符；
+// 转成 ASCII "(n)" 后任何字体下宽度一致。U+2460-U+2473 连续，差值即序号。
+const CIRCLED_RE = /[①-⑳]/g;
+
+function deCircled(markdown: string): string {
+	return markdown.replace(CIRCLED_RE, (ch) => `(${ch.codePointAt(0)! - 0x2460 + 1})`);
+}
+
 // ============================================================================
 // 注册
 // ============================================================================
@@ -140,6 +152,8 @@ export default function (pi: ExtensionAPI): void {
 		const { messageType, isStreaming = false } = context ?? {};
 		// 与官方推荐一致：thinking 块与流式中间态不转换
 		if (messageType === "assistant-thinking" || isStreaming) return markdown;
+		// 0. 圈数字转半角括号（Nerd Font 补丁字形缺陷规避）
+		markdown = deCircled(markdown);
 		// 1. Mermaid 方言渲染
 		markdown = renderDiagrams(markdown, context);
 		// 2. GitHub 风格提示框

package/extensions/renderer/compact-mode.ts

@@ -22,6 +22,7 @@ import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import { config, getToolDisplayConfig } from "../config/config.ts";
 import { toolLoadingIcon } from "../utils/tool-loading-icon.ts";
 import { sanitizeToolResultText } from "../utils/tool-result-sanitize.ts";
+import { refreshTranscriptComponent } from "./transcript-refresh.ts";
 import { getMessageDisplayTheme } from "./message-display.ts";
 import { showMoreHintText } from "./show-more-hint.ts";
 import {
@@ -927,15 +928,15 @@ function refreshTrackedComponents(): void {
 	for (const component of [...trackedAssistantComponents]) {
 		try {
 			if (config.mode !== "compact") detachAssistantExpansion(component);
-			if (component.lastMessage) component.updateContent?.(component.lastMessage);
-			else component.invalidate?.();
+			refreshTranscriptComponent(component);
 		} catch {
 			trackedAssistantComponents.delete(component);
 		}
 	}
 	for (const component of [...trackedToolComponents]) {
 		try {
-			component.updateDisplay?.();
+			// 共享实现负责 updateDisplay；invalidate 属于 compact-mode 的跟踪语义。
+			refreshTranscriptComponent(component);
 			component.invalidate?.();
 		} catch {
 			trackedToolComponents.delete(component);

package/extensions/renderer/transcript-refresh.ts

@@ -0,0 +1,91 @@
+import type { AssistantMessage } from "@earendil-works/pi-ai";
+import { AssistantMessageComponent, ToolExecutionComponent } from "@earendil-works/pi-coding-agent";
+
+// pi-coding-agent 类型声明中 AssistantMessageComponent 仅能以 value 形式使用，
+// updateContent/lastMessage 用结构化类型访问。
+type TranscriptComponentInternals = {
+	lastMessage?: AssistantMessage;
+	updateContent(message: AssistantMessage): void;
+	invalidate?(): void;
+};
+
+/**
+ * 重绘单个已构造的组件：assistant 用最新消息重渲染（compact thinking），
+ * tool 强制 updateDisplay（其内容可能仍在旧 shell 容器中）。
+ * 不吞异常——由调用方决定如何处理失败。
+ */
+export function refreshTranscriptComponent(value: unknown): boolean {
+	if (!value || typeof value !== "object") return false;
+	if (value instanceof AssistantMessageComponent) {
+		const self = value as unknown as TranscriptComponentInternals;
+		if (self.lastMessage) self.updateContent(self.lastMessage);
+		else self.invalidate?.();
+		return true;
+	}
+	if (value instanceof ToolExecutionComponent) {
+		// updateDisplay 是私有方法，但它是 resume 后让内容回到正确
+		// shell 容器的唯一入口（原型链已含全局工具渲染补丁）。
+		(value as unknown as { updateDisplay(): void }).updateDisplay();
+		return true;
+	}
+	return false;
+}
+
+/**
+ * 扫描挂载树，重绘所有已构造的 assistant/tool 组件。
+ * 用于 reload/resume/compaction 后"pi 用原始原型重建、补丁事后才装"的场景。
+ * 遍历 value.children 与 value.getMountedRoots?.()（seen 集合防环），
+ * 单个组件失败用 try/catch 隔离，不影响其余组件。
+ */
+// compact-mode 把补丁暴露在此 Symbol 上（见 compact-mode.ts），避免循环依赖。
+const COMPACT_MODE_PATCH_KEY = Symbol.for("pi.ccstyle.compact-mode-patch");
+
+/**
+ * 补丁链序不变量：compact 模式下 compact-mode 必须位于 compact-thinking
+ * 外层（round 摘要才能聚合工具统计）。resume/reload 后若无新消息，
+ * message_update 触发的重新认领不会执行，这里在任何重绘前先断言一次。
+ * 断言幂等：链序已正确时无操作；mode=on 时也安全（外层走 pass-through）。
+ */
+function assertCompactModeOutermost(): void {
+	try {
+		const patch = (globalThis as any)[COMPACT_MODE_PATCH_KEY];
+		if (typeof patch?.assertAssistantOwnership === "function") {
+			patch.assertAssistantOwnership();
+		}
+	} catch {
+		// 无 compact-mode 补丁或断言失败时跳过，扫描仍会执行。
+	}
+}
+
+export function refreshMountedTranscript(tui?: unknown): void {
+	if (!tui || typeof (tui as any).getMountedRoots !== "function") return;
+	// 先修正链序再重绘：扫描触发 updateContent 时 compact-mode 已在外层。
+	assertCompactModeOutermost();
+	const seen = new Set<object>();
+	const visit = (value: any): void => {
+		if (!value || typeof value !== "object" || seen.has(value)) return;
+		seen.add(value);
+		if (Array.isArray(value)) {
+			for (const child of value) visit(child);
+			return;
+		}
+		try {
+			refreshTranscriptComponent(value);
+		} catch {
+			// 单个组件失败不阻断其余组件；后续 session_tree/重绘再试。
+		}
+		const children = value.children;
+		if (Array.isArray(children)) {
+			for (const child of children) visit(child);
+		}
+		try {
+			const mounted = value.getMountedRoots?.();
+			if (Array.isArray(mounted)) {
+				for (const root of mounted) visit(root);
+			}
+		} catch {
+			// 惰性 Proxy / 未挂载容器没有 mounted roots。
+		}
+	};
+	visit(tui);
+}

package/extensions/utils/agent-summary.ts

@@ -107,8 +107,8 @@ function summaryParts(data: AgentSummaryData): string[] {
 	const parts: string[] = [];
 	if (data.reads) parts.push(`read ${data.reads} file${plural(data.reads)}`);
 	if (data.edits) parts.push(`edited ${data.edits} file${plural(data.edits)}`);
-	if (data.commands) parts.push(`ran ${data.commands} command${plural(data.commands)}`);
 	if (data.others) parts.push(`${data.others} other tool${plural(data.others)}`);
+	if (data.commands) parts.push(`ran ${data.commands} command${plural(data.commands)}`);
 	if (data.failed) parts.push(`${data.failed} failed`);
 	return parts;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-cc-extensions",
-	"version": "0.8.52",
+	"version": "0.8.53",
 	"license": "MIT",
 	"description": "A Pi productivity suite with Claude Code-style UI, context inspection, and agent/session references",
 	"type": "module",