pi-cc-extensions 0.8.53 → 0.8.55

package/extensions/{utils/agent-summary.ts → feature/agent-summary/core.ts}

@@ -1,26 +1,26 @@
 /**
  * Agent 回合摘要：统计一次 agent 运行的工具使用并格式化成摘要文本。
  *
- * 统计口径参考已删除的 compact-style（ea64df0 "sunset fixed-editor and compact
- * mode"）：read 按文件去重、edit/write 按文件去重、bash 计命令数、其余工具计数、
- * 失败计数、回合耗时。与旧实现一致，`read`/`edit`/`write` 只认精确的工具名
- * （MCP 风格 `server__read` 归入 other）。
+ * 分类：bash / read / edit / write / other（精确工具名；MCP 风格名归 other）。
+ * 计数：bash 按调用次数；read/edit/write 按非空 path/file_path 去重；other 按调用次数。
+ * 失败单独累计；另记回合耗时。
  *
- * 呈现：`summaryLine` 输出纯文本（旧格式），`summaryMarkdown` 输出 Markdown
- * 增强版——加粗统计词，box 模式包 `> [!TIP]` 提示框（由 markdown-enhance 渲染
- * 成带图标的表格框），供当前 Markdown 渲染管线使用。
+ * 呈现：`summaryLine` 纯文本，`summaryMarkdown` Markdown（可 box 引用块）。
  */
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { formatDuration } from "../../utils/format.ts";
+export { formatDuration };
 
-/** 工具分类，与旧 compact-style 统计口径一致。 */
-export type AgentToolCategory = "read" | "edit" | "bash" | "other";
+/** 工具分类。 */
+export type AgentToolCategory = "bash" | "read" | "edit" | "write" | "other";
 
 /** 一次 agent 回合的统计快照。 */
 export type AgentSummaryData = {
+	commands: number;
 	reads: number;
 	edits: number;
-	commands: number;
+	writes: number;
 	others: number;
 	failed: number;
 	durationMs: number;
@@ -28,9 +28,10 @@ export type AgentSummaryData = {
 
 export function classifyTool(toolName: string): AgentToolCategory {
 	const base = toolName.split(".").pop() ?? toolName;
-	if (base === "read") return "read";
-	if (base === "edit" || base === "write") return "edit";
 	if (base === "bash") return "bash";
+	if (base === "read") return "read";
+	if (base === "edit") return "edit";
+	if (base === "write") return "write";
 	return "other";
 }
 
@@ -38,12 +39,18 @@ function nonEmptyString(value: unknown): value is string {
 	return typeof value === "string" && value.length > 0;
 }
 
+function toolPath(args?: Record<string, unknown> | null): string | undefined {
+	const path = args?.path ?? args?.file_path;
+	return nonEmptyString(path) ? path : undefined;
+}
+
 /** 累积一次 agent 回合的工具统计；agent_start 时新建实例。 */
 export class AgentRunSummary {
 	toolCount = 0;
+	commandCount = 0;
 	readFiles = new Set<string>();
 	editFiles = new Set<string>();
-	commandCount = 0;
+	writeFiles = new Set<string>();
 	otherCount = 0;
 	failedCount = 0;
 
@@ -56,16 +63,19 @@ export class AgentRunSummary {
 	/** tool_execution_start 时调用。 */
 	recordToolStart(toolName: string, args?: Record<string, unknown> | null): void {
 		this.toolCount++;
-		const path = args?.path ?? args?.file_path;
+		const path = toolPath(args);
 		switch (classifyTool(toolName)) {
+			case "bash":
+				this.commandCount++;
+				break;
 			case "read":
-				if (nonEmptyString(path)) this.readFiles.add(path);
+				if (path) this.readFiles.add(path);
 				break;
 			case "edit":
-				if (nonEmptyString(path)) this.editFiles.add(path);
+				if (path) this.editFiles.add(path);
 				break;
-			case "bash":
-				this.commandCount++;
+			case "write":
+				if (path) this.writeFiles.add(path);
 				break;
 			default:
 				this.otherCount++;
@@ -79,9 +89,10 @@ export class AgentRunSummary {
 
 	snapshot(now = Date.now()): AgentSummaryData {
 		return {
+			commands: this.commandCount,
 			reads: this.readFiles.size,
 			edits: this.editFiles.size,
-			commands: this.commandCount,
+			writes: this.writeFiles.size,
 			others: this.otherCount,
 			failed: this.failedCount,
 			durationMs: now - this.startedAt,
@@ -89,31 +100,21 @@ 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。 */
 function summaryParts(data: AgentSummaryData): string[] {
 	const parts: string[] = [];
+	if (data.commands) parts.push(`ran ${data.commands} command${plural(data.commands)}`);
 	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.writes) parts.push(`wrote ${data.writes} file${plural(data.writes)}`);
 	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;
 }
 
-/** 纯文本摘要行（旧 compact-style 格式）："Read 3 files, edited 2 files · 42s"。 */
+/** 纯文本摘要行：句首大写 + 可选耗时。 */
 export function summaryLine(data: AgentSummaryData): string {
 	const parts = summaryParts(data);
 	if (parts.length === 0) return "";
@@ -125,13 +126,8 @@ export function summaryLine(data: AgentSummaryData): string {
 
 /**
  * Markdown 摘要行。
- * `box` 为 true：markdown 引用块 `> *斜体内容*`（渲染为引用，主题 mdQuote=muted 即灰色，
- * 内容斜体）。entry renderer 场景直接用。
- * `box` 为 false：整体加粗单行。
- * `colors`：成功/失败计数的 ANSI 前缀，取自主题（`theme.getFgAnsi("success")` /
- * `theme.getFgAnsi("error")`），缺省不染色。仅数字染色：成功计数的数字染
- * success 色、failed 计数的数字染 error 色，文本与时长不染色。颜色 span 以
- * `\x1b[0m` 复位，引用块渲染器会在复位后重贴引用样式，后续文本不受影响。
+ * `box` 为 true：引用块 `> *斜体*`；false：整体加粗。
+ * `colors`：仅数字染色（success / failed）。
  */
 export function summaryMarkdown(
 	data: AgentSummaryData,
@@ -140,12 +136,10 @@ export function summaryMarkdown(
 ): string {
 	const parts = summaryParts(data);
 	if (parts.length === 0) return "";
-	// 仅首段动词大写（与纯文本版“句首大写”一致）
 	const capitalizeFirst = (part: string, first: boolean) => {
 		const verb = part.match(/^[a-z]+/)?.[0] ?? "";
 		return first && verb ? verb[0].toUpperCase() + verb.slice(1) + part.slice(verb.length) : part;
 	};
-	// 仅染数字：`Read 2 files` → `Read <色>2</色> files`
 	const paintNumber = (code: string, part: string) =>
 		code ? part.replace(/(\d+)/, `${code}$1\x1b[0m`) : part;
 	const text = parts
@@ -159,11 +153,9 @@ export function summaryMarkdown(
 
 /**
  * 绑定 pi 事件到摘要统计：
- * - agent_start 重置统计
- * - tool_execution_start / tool_execution_end 累计
- * - agent_end 时回调快照（工具数 < minToolCount 不回调：单工具行本身已是摘要）
- *
- * 返回取消函数：清除当前统计引用（pi.on 不支持解绑，取消后不再产生回调）。
+ * - agent_start 重置
+ * - tool_execution_start / end 累计
+ * - agent_end 回调（toolCount < minToolCount 跳过）
  */
 export function bindAgentSummary(
 	pi: ExtensionAPI,

package/extensions/feature/{agent-summary.ts → agent-summary/index.ts}

@@ -2,7 +2,7 @@
  * Agent 回合摘要展示：agent_end 时把本回合工具统计写入会话条目，
  * 由 entry renderer 渲染为 markdown 引用块 `> [!TIP] *斜体内容*`。
  *
- * 统计复用 utils/agent-summary.ts（口径同旧 compact-style，ea64df0 删除）。
+ * 统计复用 ./core.ts（bash/read/edit/write/other）。
  * appendEntry 不进 LLM 上下文，只显示在聊天区。
  * 引用块文字色取主题 mdQuote（cc 主题下为 muted 灰），内容用 *斜体* 语法。
  */
@@ -10,11 +10,7 @@
 import { Markdown } from "@earendil-works/pi-tui";
 import { getMarkdownTheme } from "@earendil-works/pi-coding-agent";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import {
-	bindAgentSummary,
-	summaryMarkdown,
-	type AgentSummaryData,
-} from "../utils/agent-summary.ts";
+import { bindAgentSummary, summaryMarkdown, type AgentSummaryData } from "./core.ts";
 
 export const AGENT_SUMMARY_ENTRY_TYPE = "agent-summary";
 

package/extensions/feature/compact-thinking.ts

@@ -94,7 +94,7 @@ type AssistantInternals = {
 };
 
 type PatchedPrototype = typeof AssistantMessageComponent.prototype & {
-	updateContent: (message: AssistantMessage) => void;
+	updateContent: (message: AssistantMessage, isStreaming?: boolean) => void;
 };
 
 // 配置由 claude-code-style 管控（installCompactThinking 注入初始值，
@@ -334,9 +334,14 @@ function compactThinking(pi: ExtensionAPI) {
 		);
 	}
 
-	prototype.updateContent = function patchedUpdateContent(message: AssistantMessage) {
+	prototype.updateContent = function patchedUpdateContent(
+		message: AssistantMessage,
+		isStreaming?: boolean,
+	) {
 		const component = this as AssistantMessageComponentLike;
 		const self = this as unknown as AssistantInternals;
+		// isStreaming 丢失 → mermaid 流式误渲染来回闪。
+		self.isStreaming = isStreaming ?? self.isStreaming;
 		self.lastMessage = message;
 		latestComponent = component;
 		latestComponentTimestamp = message.timestamp;
@@ -344,7 +349,7 @@ function compactThinking(pi: ExtensionAPI) {
 		// Visible mode is intentionally untouched: Shift+Tab restores Pi's exact
 		// built-in Thinking Markdown renderer, including every OpenAI summary stage.
 		if (!self.hideThinkingBlock) {
-			originalUpdateContent.call(this, message);
+			originalUpdateContent.call(this, message, self.isStreaming);
 			return;
 		}
 

package/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/extensions/feature/{agent-autocomplete.ts → reference/subagent.ts}

@@ -184,7 +184,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/extensions/feature/{pi-startup-header.ts → shell/startup-header.ts}

@@ -1,8 +1,8 @@
 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";
+import { ansi16ToRgb, ansi256ToRgb } from "../../utils/ansi-color.ts";
 type Rgb = [number, number, number];
 type StyledPart = {
 	raw: string;
@@ -40,25 +40,6 @@ const PALETTE_SPAN = 0.25;
 // 行间相位偏移：小步累加 → 整体左上暗→右下亮的对角渐变
 const LOGO_ROW_PHASE_STEP = 0.08;
 
-const ANSI_16_RGB_TABLE: Rgb[] = [
-	[0, 0, 0],
-	[128, 0, 0],
-	[0, 128, 0],
-	[128, 128, 0],
-	[0, 0, 128],
-	[128, 0, 128],
-	[0, 128, 128],
-	[192, 192, 192],
-	[128, 128, 128],
-	[255, 0, 0],
-	[0, 255, 0],
-	[255, 255, 0],
-	[0, 0, 255],
-	[255, 0, 255],
-	[0, 255, 255],
-	[255, 255, 255],
-];
-
 function stripAnsi(text: string): string {
 	return text.replace(ANSI_PATTERN, "");
 }
@@ -104,27 +85,6 @@ function applyTruecolor(rgb: Rgb, text: string): string {
 	return `\x1b[38;2;${red};${green};${blue}m${text}${ANSI_RESET}`;
 }
 
-function ansi16ToRgb(index: number): Rgb {
-	return ANSI_16_RGB_TABLE[index] ?? [255, 255, 255];
-}
-
-function ansi256ToRgb(index: number): Rgb {
-	if (index < 16) return ansi16ToRgb(index);
-
-	if (index >= 232) {
-		const gray = 8 + (index - 232) * 10;
-		return [gray, gray, gray];
-	}
-
-	const cubeIndex = index - 16;
-	const redIndex = Math.floor(cubeIndex / 36);
-	const greenIndex = Math.floor((cubeIndex % 36) / 6);
-	const blueIndex = cubeIndex % 6;
-	const values = [0, 95, 135, 175, 215, 255];
-
-	return [values[redIndex]!, values[greenIndex]!, values[blueIndex]!];
-}
-
 function parseTruecolorAnsi(ansi: string): Rgb | undefined {
 	const match = ansi.match(/38;2;(\d+);(\d+);(\d+)/);
 	if (!match) return undefined;

package/extensions/feature/{working-message.ts → shell/working-message.ts}

@@ -1,19 +1,10 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { formatDuration } from "../../utils/format.ts";
 
 const REFRESH_INTERVAL_MS = 1_000;
 /** Elapsed time is only shown once the turn has run this long. */
 const SHOW_TIMER_AFTER_MS = 3_000;
 
-function formatDuration(ms: number): string {
-	const totalSec = Math.floor(ms / 1000);
-	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`;
-}
-
 function formatCount(value: number): string {
 	return new Intl.NumberFormat("en-US").format(value);
 }
@@ -91,7 +82,10 @@ export default function (pi: ExtensionAPI): void {
 		const tokens = tokenCount();
 		const parts: string[] = [];
 		if (tokens > 0) parts.push(`↓ ${formatCount(tokens)} tokens`);
-		if (elapsed >= SHOW_TIMER_AFTER_MS || tokens > 0) parts.push(formatDuration(elapsed));
+		if (elapsed >= SHOW_TIMER_AFTER_MS || tokens > 0) {
+			// formatDuration 低于 1 秒返回 ""，此处回退 "0s" 保持计时器连续跳动。
+			parts.push(formatDuration(elapsed) || "0s");
+		}
 		return parts.length ? `Working... (${parts.join(" · ")})` : "";
 	}
 

package/extensions/index.ts

@@ -1,45 +1,35 @@
 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";
-import {
-	installCompactThinking,
-	type CompactThinkingController,
-} from "./feature/compact-thinking.ts";
+import { config } from "./config/config.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 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";
+import sessionReference from "./feature/reference/index.ts";
+import { installCompactThinking } from "./feature/compact-thinking.ts";
+
+// renderer
+import claudeCodeStyle, { getCompactThinkingConfig } from "./renderer/index.ts";
+import markdownEnhance from "./renderer/markdown-enhance.ts";
 
 export default function (pi: ExtensionAPI): void {
-	piAliases(pi);
+	// shell chrome
+	if (config.enableAliases) piAliases(pi);
 	piStartupHeader(pi);
+	if (config.enableWorkingMessage) workingMessage(pi);
+
+	// render stack：thinking controller 直接交给 style 作 query
 	markdownEnhance(pi);
-	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);
-		},
-	};
-	claudeCodeStyle(pi, undefined, compactThinkingBridge);
-	compactThinking = installCompactThinking(pi, getCompactThinkingConfig());
-	workingMessage(pi);
-	context(pi);
-	sessionReference(pi);
-	agentAutocomplete(pi);
-	agentSummary(pi);
+	claudeCodeStyle(pi, undefined, installCompactThinking(pi, getCompactThinkingConfig()));
+
+	// features
+	if (config.enableContextCommand) context(pi);
+	if (config.enableSessionReference) sessionReference(pi);
+	if (config.enableSubagentAutocomplete) agentAutocomplete(pi);
+	if (config.enableAgentSummary) agentSummary(pi);
 }