@herbertgao/pi-extensions 2026.8.1 → 2026.8.3

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

@@ -13,6 +13,14 @@ import {
 } from "@earendil-works/pi-coding-agent";
 import { getKeybindings } from "@earendil-works/pi-tui";
 import { Markdown, Spacer, Text, type Component } from "@earendil-works/pi-tui";
+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 };
 
 // pi-tui 类型声明中 TUI 的 re-export 解析失败，本地用最小结构化类型（只用到 requestRender）。
 type RenderTui = { requestRender(force?: boolean): void };
@@ -146,70 +154,6 @@ function restoreDurationEntries(
 	}
 }
 
-function formatThoughtDuration(durationMs: number) {
-	if (durationMs < 1_000) {
-		return `${Math.max(1, Math.round(durationMs))}ms`;
-	}
-
-	const totalSeconds = Math.max(1, Math.round(durationMs / 1_000));
-	const minutes = Math.floor(totalSeconds / 60);
-	const seconds = totalSeconds % 60;
-	if (minutes === 0) return `${seconds}s`;
-	return seconds === 0 ? `${minutes}m` : `${minutes}m ${seconds}s`;
-}
-
-export { formatThoughtDuration };
-
-type CompactThinkingTheme = Pick<Theme, "fg" | "italic" | "bold">;
-
-/** 与 compact-thinking 主渲染器共用的静态文字样式。 */
-export function styleCompactThinkingText(
-	text: string,
-	theme: CompactThinkingTheme | undefined,
-	bold = false,
-): string {
-	if (!theme) return text;
-	const colored = typeof theme.fg === "function" ? theme.fg("thinkingText", text) : text;
-	const weighted = bold && typeof theme.bold === "function" ? theme.bold(colored) : colored;
-	return typeof theme.italic === "function" ? theme.italic(weighted) : weighted;
-}
-
-/** 与 compact-thinking 主渲染器共用的活动思考扫光动画。 */
-export function animateCompactThinkingText(
-	text: string,
-	theme: CompactThinkingTheme | undefined,
-	animationFrame: number,
-	boldBase = false,
-): string {
-	if (!theme) return text;
-	const characters = Array.from(text);
-	if (characters.length === 0) return "";
-	const highlightWidth = Math.max(1, Math.min(5, Math.ceil(characters.length * 0.28)));
-	const start = (animationFrame % (characters.length + highlightWidth)) - highlightWidth;
-	const end = start + highlightWidth;
-	const before = characters.slice(0, Math.max(0, start)).join("");
-	const highlighted = characters
-		.slice(Math.max(0, start), Math.min(characters.length, end))
-		.join("");
-	const after = characters.slice(Math.max(0, end)).join("");
-	const highlightedColored =
-		highlighted && typeof theme.fg === "function" ? theme.fg("text", highlighted) : highlighted;
-	const highlightedWeighted =
-		highlightedColored && typeof theme.bold === "function"
-			? theme.bold(highlightedColored)
-			: highlightedColored;
-	const highlightedText =
-		highlightedWeighted && typeof theme.italic === "function"
-			? theme.italic(highlightedWeighted)
-			: highlightedWeighted;
-
-	return (
-		styleCompactThinkingText(before, theme, boldBase) +
-		highlightedText +
-		styleCompactThinkingText(after, theme, boldBase)
-	);
-}
-
 function getThinkingToggleHint() {
 	const keys = getKeybindings().getKeys("app.thinking.toggle");
 	return keys.length > 0 ? `${keys.join("/")} to expand` : undefined;
@@ -343,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;
@@ -355,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);
 	}
@@ -403,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;
 
@@ -512,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));
@@ -684,7 +620,7 @@ function compactThinking(pi: ExtensionAPI) {
 					content?.type === "toolCall" &&
 					(content.name === "Agent" ||
 						content.name === "Agents" ||
-						content.args?.subagent_type != null),
+						content.arguments?.subagent_type != null),
 			)
 		);
 	}
@@ -728,7 +664,9 @@ function compactThinking(pi: ExtensionAPI) {
 	// OpenAI-compatible providers may not close reasoning until the response ends.
 	pi.on("tool_execution_start", (event: any) => {
 		if (event.toolName === "Agent" || event.toolName === "Agents") {
-			resumeAgentThinking(latestComponent?.lastMessage ?? undefined);
+			const lastMessage = (latestComponent as unknown as { lastMessage?: AssistantMessage })
+				?.lastMessage;
+			resumeAgentThinking(lastMessage);
 		} else {
 			finishThinking();
 		}
@@ -751,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) => {
@@ -781,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/node_modules/@herbertgao/pi-cc-extensions/extensions/feature/context.ts

@@ -639,7 +639,7 @@ export default function contextUsageExtension(pi: ExtensionAPI) {
 				);
 
 				if (!action) break;
-				const preview = previewByKey.get(action);
+				const preview = previewByKey.get(action as PreviewKey);
 				if (!preview) continue;
 
 				await showTextPreview(ctx, preview.title, preview.content);

package/node_modules/@herbertgao/pi-cc-extensions/extensions/feature/{session-reference.ts → reference/index.ts}

@@ -20,7 +20,7 @@ import {
 	sessionTitle,
 	type ReferenceSessionInfo,
 	type ReferenceSource,
-} from "./session-reference-core.ts";
+} from "./session.ts";
 
 const MAX_SESSION_SUGGESTIONS = 3;
 const MAX_FILE_SUGGESTIONS = 7;

package/node_modules/@herbertgao/pi-cc-extensions/extensions/feature/{agent-autocomplete.ts → reference/subagent.ts}

@@ -23,8 +23,8 @@ const MAX_SUGGESTIONS = 2;
 const AGENT_NAME_PATTERN = /(?:^|[\t ])@((?:[^\s:@][^\s:]*)?)$/;
 
 function getAgentDir(): string {
-	const override = process.env.PI_CODING_AGENT_DIR;
-	return join(override ? override : homedir(), ".pi", "agent", "agents");
+	const root = process.env.PI_CODING_AGENT_DIR ?? join(homedir(), ".pi", "agent");
+	return join(root, "agents");
 }
 
 function parseFrontmatter(content: string): Record<string, string> {
@@ -41,23 +41,34 @@ function parseFrontmatter(content: string): Record<string, string> {
 function loadAgents(): AgentInfo[] {
 	const dir = getAgentDir();
 	if (!existsSync(dir)) return [];
+	let files: string[];
+	try {
+		files = readdirSync(dir);
+	} catch {
+		return [];
+	}
 
-	return readdirSync(dir)
-		.filter((f) => f.endsWith(".md"))
-		.map((file) => {
+	const agents: AgentInfo[] = [];
+	for (const file of files) {
+		if (!file.endsWith(".md")) continue;
+		try {
 			const filePath = join(dir, file);
 			const content = readFileSync(filePath, "utf-8");
 			const fm = parseFrontmatter(content);
 			const name = file.replace(/\.md$/, "");
-			return {
+			agents.push({
 				name,
 				displayName: fm.display_name || name,
 				description: fm.description || "",
 				model: fm.model,
 				thinking: fm.thinking,
 				filePath,
-			};
-		});
+			});
+		} catch {
+			// One unreadable agent file must not break autocomplete or prompt submission.
+		}
+	}
+	return agents;
 }
 
 export function createAgentAutocompleteProvider(
@@ -184,7 +195,6 @@ export default function agentAutocompleteExtension(pi: ExtensionAPI): void {
 
 		const agentMap = new Map(agents.map((a) => [a.name, a]));
 		const agentList = mentions.map((n) => `"${n}" (${agentMap.get(n)!.displayName})`).join(", ");
-		const agentTypes = mentions.map((n) => `"${n}"`).join(" | ");
 
 		return {
 			systemPrompt:

package/node_modules/@herbertgao/pi-cc-extensions/extensions/feature/{pi-startup-header.ts → shell/startup-header.ts}

@@ -1,7 +1,7 @@
 import { VERSION, type AppKeybinding } from "@earendil-works/pi-coding-agent";
 import { getKeybindings } from "@earendil-works/pi-tui";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { config } from "../config/config.ts";
+import { config } from "../../config/config.ts";
 
 type Rgb = [number, number, number];
 type StyledPart = {

package/node_modules/@herbertgao/pi-cc-extensions/extensions/feature/{working-message.ts → shell/working-message.ts}

@@ -87,7 +87,10 @@ export default function (pi: ExtensionAPI): void {
 	}
 
 	function buildWorkingMessage(): string {
-		const elapsed = Date.now() - (agentStartTime || turnStartTime);
+		if (!turnActive) return "";
+		const startedAt = agentStartTime || turnStartTime;
+		if (!startedAt) return "";
+		const elapsed = Date.now() - startedAt;
 		const tokens = tokenCount();
 		const parts: string[] = [];
 		if (tokens > 0) parts.push(`↓ ${formatCount(tokens)} tokens`);
@@ -185,7 +188,7 @@ export default function (pi: ExtensionAPI): void {
 		} else if (evt.type === "done") {
 			resetResponseTracking(evt.message);
 		} else if (evt.type === "error") {
-			resetResponseTracking(evt.error);
+			resetResponseTracking();
 		} else {
 			updateProviderUsage(evt.partial);
 		}

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

@@ -1,43 +1,47 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import agentAutocomplete from "./feature/agent-autocomplete.ts";
-import agentSummary from "./feature/agent-summary.ts";
-import claudeCodeStyle, { getCompactThinkingConfig } from "./renderer/index.ts";
+
+// shell
+import piAliases from "./feature/shell/aliases.ts";
+import piStartupHeader from "./feature/shell/startup-header.ts";
+import workingMessage from "./feature/shell/working-message.ts";
+
+// feature
+import agentAutocomplete from "./feature/reference/subagent.ts";
+import agentSummary from "./feature/agent-summary/index.ts";
+import context from "./feature/context.ts";
+import sessionReference from "./feature/reference/index.ts";
 import {
 	installCompactThinking,
 	type CompactThinkingController,
 } from "./feature/compact-thinking.ts";
-import context from "./feature/context.ts";
-import markdownEnhance from "./feature/markdown-enhance.ts";
-import piAliases from "./feature/pi-aliases.ts";
-import piStartupHeader from "./feature/pi-startup-header.ts";
-import sessionReference from "./feature/session-reference.ts";
-import workingMessage from "./feature/working-message.ts";
+
+// renderer
+import claudeCodeStyle, { getCompactThinkingConfig } from "./renderer/index.ts";
+import markdownEnhance from "./renderer/markdown-enhance.ts";
 
 export default function (pi: ExtensionAPI): void {
+	// shell chrome
 	piAliases(pi);
 	piStartupHeader(pi);
-	markdownEnhance(pi);
+	workingMessage(pi);
+
+	// Renderer 必须先注册 lifecycle handler，shutdown 时才能先解开外层 compact
+	// patch；bridge 让稍后安装的 thinking controller 仍可直接供 renderer query。
 	let compactThinking: CompactThinkingController | undefined;
-	const compactThinkingBridge: CompactThinkingController = {
-		updateConfig(next) {
-			compactThinking?.updateConfig(next);
-		},
-		getMessageThinkingDurationMs(messageTimestamp) {
-			return compactThinking?.getMessageThinkingDurationMs?.(messageTimestamp);
-		},
-		isMessageThinkingActive(messageTimestamp) {
-			return compactThinking?.isMessageThinkingActive?.(messageTimestamp) ?? false;
-		},
-		getThinkingAnimationFrame() {
-			return compactThinking?.getThinkingAnimationFrame?.() ?? 0;
-		},
-		setCompactSummaryActive(active) {
-			compactThinking?.setCompactSummaryActive?.(active);
-		},
+	const compactThinkingQuery: CompactThinkingController = {
+		updateConfig: (next) => compactThinking?.updateConfig(next),
+		getMessageThinkingDurationMs: (timestamp) =>
+			compactThinking?.getMessageThinkingDurationMs?.(timestamp),
+		isMessageThinkingActive: (timestamp) =>
+			compactThinking?.isMessageThinkingActive?.(timestamp) ?? false,
+		getThinkingAnimationFrame: () => compactThinking?.getThinkingAnimationFrame?.() ?? 0,
+		setCompactSummaryActive: (active) => compactThinking?.setCompactSummaryActive?.(active),
 	};
-	claudeCodeStyle(pi, undefined, compactThinkingBridge);
+	markdownEnhance(pi);
+	claudeCodeStyle(pi, undefined, compactThinkingQuery);
 	compactThinking = installCompactThinking(pi, getCompactThinkingConfig());
-	workingMessage(pi);
+
+	// features
 	context(pi);
 	sessionReference(pi);
 	agentAutocomplete(pi);