@herbertgao/pi-extensions 2026.8.2 → 2026.8.3

package/README.md

@@ -14,15 +14,22 @@ The package bundles 11 active `@herbertgao/*` child packages, including `@herber
 - `@juicesharp/rpiv-ask-user-question@2.4.0`
 - `@narumitw/pi-btw@0.50.0`
 - `@pi-plugins/fast-mode@0.1.9`
-- `pi-mcp-adapter@2.21.2`
+- `pi-mcp-adapter@2.23.0`
 - `pi-lens@3.8.74`
-- `pi-web-access@0.18.0`
+- `pi-web-access@0.22.0`
+- `remote-pi@0.7.0`
 - `@czottmann/pi-automode@1.11.0`
 
 Pi loads their extensions and skills through `node_modules/` paths inside one package root. The upstream companions are pinned and bundled, not forked or renamed.
 
 Pi 0.84.1 or newer should use native `fullscreen` TUI mode. The deprecated `@herbertgao/pi-fixed-editor` legacy package is intentionally not bundled.
 
+### Remote Pi trust boundary
+
+Configure `REMOTE_PI_RELAY` to a private relay, preferably reachable only through Tailscale or another private network, **before** first running `/remote-pi`. TLS/Tailscale protects traffic in transit but the relay process can read routed content; `remote-pi@0.7.0` is not end-to-end encrypted.
+
+Known accepted `0.7.0` limitations: pairing URI/token data is persisted in Pi session data and may enter model context during its short validity window; local broker/supervisor IPC trusts processes running as the same OS user; cancelling first-time setup can retain its cwd lock until Pi exits. Do not use the public relay or run untrusted local processes if those boundaries are unacceptable.
+
 See the [repository README](https://github.com/HerbertGao/pi-extensions#readme) for the complete package list and provenance.
 
 ## License

package/node_modules/@herbertgao/pi-cc-extensions/README.en.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="./assets/readme/hero.svg" width="100%" alt="pi-cc-extensions: a productivity extension suite for Pi">
+  <img src="./assets/readme/hero.en.svg" width="100%" alt="pi-cc-extensions: a productivity extension suite for Pi">
 </p>
 
 <p align="center">
@@ -10,7 +10,7 @@
 </p>
 
 <p align="center">
-  Claude Code-style output, context inspection, and Agent / Session references.
+  Claude Code-style TUI output with some personal touches and handy utilities.
 </p>
 
 <p align="center">
@@ -37,11 +37,11 @@ Run `/reload` after installation.
 
 | Feature                      | Description                                                                                                                                       | Entry point |
 | ------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------- | ------------- |
-| Claude Code-style output     | Tool summaries, expand/collapse, rich edit/write diffs, and`on` / `compact` / `off` modes                                                         | `/ccstyle`  |
-| Fullscreen mouse interaction | Tool card/group click-to-toggle, previews, hover highlight, and a back-to-bottom button | `TUIMODE=fullscreen` or `--tui-mode fullscreen` |
+| Claude Code Output     | Tool summaries, expand/collapse, rich edit/write diffs, and `on` / `compact` / `off` modes                                                         | `/ccstyle`  |
+| Fullscreen mode          | Tool card/group click-to-toggle, previews, hover highlight, and a back-to-bottom button | `TUIMODE=fullscreen` or `--tui-mode fullscreen` |
 | Settings panel               | `Style / Diff / Thinking / Feature` tabs: startup header toggle and wheel step                                                                    | `/ccstyle`  |
 | Context inspection           | Usage breakdown and previews for the system prompt, tools, skills, and messages                                                                   | `/context`  |
-| Session references           | Search and inject effective context from previous Sessions or existing SubAgents                                                                  | `@session:` |
+| Session/Subagent references           | Search and inject effective context from previous Sessions or existing SubAgents                                                                  | `@` |
 | Theme                        | Bundled CC Dark and CC Light themes                                                                                                               | `/theme`    |
 
 ## Configuration
@@ -74,8 +74,6 @@ bun run typecheck
 ./test.bat # or pi -e .
 ```
 
-Run `/reload` after changing extensions.
-
 ## Compatibility
 
 - Node.js `>=22.19.0`, Pi `^0.84.0` (loaded through `pi.extensions` and `pi.themes` in the root `package.json`)
@@ -96,4 +94,4 @@ Run `/reload` after changing extensions.
 ## Credits
 
 - Derived from [`minuque/pi-cc-extensions`](https://github.com/minuque/pi-cc-extensions) under the MIT license.
-- Rich diffs are adapted from [`MasuRii/pi-tool-display`](https://github.com/MasuRii/pi-tool-display) (MIT). See [`extensions/tool-diff/ATTRIBUTION.md`](./extensions/tool-diff/ATTRIBUTION.md).
+- Rich diffs are adapted from [`MasuRii/pi-tool-display`](https://github.com/MasuRii/pi-tool-display) (MIT). See [`extensions/renderer/tool/diff/ATTRIBUTION.md`](./extensions/renderer/tool/diff/ATTRIBUTION.md).

package/node_modules/@herbertgao/pi-cc-extensions/README.md

@@ -10,7 +10,7 @@
 </p>
 
 <p align="center">
-  类 Claude Code TUI 输出风格、上下文检查，以及 Agent / Session 引用。
+  类 Claude Code TUI 输出风格，并融入了一些个人喜好，和一些实用小功能。
 </p>
 
 <p align="center">
@@ -37,11 +37,11 @@ pi install npm:@herbertgao/pi-cc-extensions
 
 | 功能                 | 说明                                                                                                     | 入口        |
 | ---------------------- | ---------------------------------------------------------------------------------------------------------- | ------------- |
-| Claude Code 风格输出 | 工具摘要、折叠展开、rich edit/write diff，以及`on` / `compact` / `off` 三种模式                          | `/ccstyle`  |
-| Fullscreen 鼠标交互  | 工具卡/group 点击展开与收起、预览、hover 高亮、回到底部按钮 | `TUIMODE=fullscreen` 或 `--tui-mode fullscreen` |
+| Claude Code UI | 工具摘要、折叠展开、rich edit/write diff，以及 `on` / `compact` / `off` 三种模式                          | `/ccstyle`  |
+| Fullscreen mode  | 工具卡/group 点击展开与收起、预览、hover 高亮、回到底部按钮 | `TUIMODE=fullscreen` 或 `--tui-mode fullscreen` |
 | 配置面板             | `Style / Diff / Thinking / Feature` 四页签，含启动头开关与滚轮步进                                       | `/ccstyle`  |
 | 上下文检查           | 查看上下文占用，并预览 System prompt、Tools、Skills 和消息内容                                           | `/context`  |
-| Session 引用         | 搜索并注入历史 Session 或现有 SubAgent 的有效上下文                                                      | `@session:` |
+| Session/Subagent 引用         | 搜索并注入历史 Session 或现有 SubAgent 的有效上下文                                                      | `@` |
 | 主题                 | 随包提供内置 CC Dark、CC Light 主题                                                                      | `/theme`    |
 
 ## 配置
@@ -74,8 +74,6 @@ bun run typecheck
 ./test.bat # or pi -e .
 ```
 
-修改扩展后执行 `/reload`。
-
 ## 兼容性
 
 - Node.js `>=22.19.0`，Pi `^0.84.0`（通过根目录 `package.json` 的 `pi.extensions` 和 `pi.themes` 加载）
@@ -96,4 +94,4 @@ bun run typecheck
 ## 致谢
 
 - 基于 MIT 许可的 [`minuque/pi-cc-extensions`](https://github.com/minuque/pi-cc-extensions) 衍生维护。
-- Rich diff 改编自 [`MasuRii/pi-tool-display`](https://github.com/MasuRii/pi-tool-display)（MIT）；详见 [`extensions/tool-diff/ATTRIBUTION.md`](./extensions/tool-diff/ATTRIBUTION.md)。
+- Rich diff 改编自 [`MasuRii/pi-tool-display`](https://github.com/MasuRii/pi-tool-display)（MIT）；详见 [`extensions/renderer/tool/diff/ATTRIBUTION.md`](./extensions/renderer/tool/diff/ATTRIBUTION.md)。

package/node_modules/@herbertgao/pi-cc-extensions/assets/readme/hero.en.svg

@@ -0,0 +1,101 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1200" height="400" viewBox="0 0 1200 400" role="img" aria-labelledby="title desc">
+  <title id="title">pi-cc-extensions
+  </title>
+  <desc id="desc">The Claude and Pi brand marks together connect three extension capabilities: Claude Code-style output, context inspection, and historical Session references.
+  </desc>
+  <defs>
+    <linearGradient id="panel" x1="0" y1="0" x2="1" y2="1">
+      <stop offset="0" stop-color="#0D131B"/>
+      <stop offset="1" stop-color="#090D12"/>
+    </linearGradient>
+  </defs>
+  <rect width="1200" height="400" rx="28" fill="url(#panel)"/>
+  <rect x="1" y="1" width="1198" height="398" rx="27" fill="none" stroke="#263241" stroke-width="2"/>
+  <g id="title-block" transform="translate(64 58)" font-family="-apple-system, BlinkMacSystemFont, 'Segoe UI', 'PingFang SC', sans-serif">
+    <g font-family="ui-monospace, SFMono-Regular, Menlo, Consolas, monospace" font-size="16" font-weight="600" letter-spacing="1.4">
+      <text x="0" y="0" fill="#66E3C4">PI EXTENSION
+      </text>
+    </g>
+    <text x="0" y="82" fill="#F4F7FA" font-size="54" font-weight="750" letter-spacing="-1.5">pi-cc-extensions
+    </text>
+    <text x="0" y="130" fill="#B8C3CF" font-size="23">Make Pi work like Claude Code 🙃
+    </text>
+    <g transform="translate(0 180)" font-family="ui-monospace, SFMono-Regular, Menlo, Consolas, monospace" font-size="17">
+      <rect width="488" height="58" rx="12" fill="#111923" stroke="#2B3948"/>
+      <text x="20" y="36" fill="#66E3C4">›
+      </text>
+      <text x="44" y="36" fill="#F4F7FA">/ccstyle
+      </text>
+      <text x="155" y="36" fill="#536172">·
+      </text>
+      <text x="178" y="36" fill="#7CC7FF">/context
+      </text>
+      <text x="292" y="36" fill="#536172">·
+      </text>
+      <text x="315" y="36" fill="#F2C879">@session:
+      </text>
+      <rect x="411" y="22" width="9" height="20" rx="2" fill="#66E3C4"/>
+    </g>
+    <g transform="translate(0 282)" font-family="ui-monospace, SFMono-Regular, Menlo, Consolas, monospace" font-size="15">
+      <circle cx="6" cy="-5" r="6" fill="#66E3C4"/>
+      <text x="22" y="0" fill="#8B9AAD">3 EXTENSIONS
+      </text>
+      <text x="160" y="0" fill="#3B4857">•
+      </text>
+      <text x="183" y="0" fill="#8B9AAD">TYPESCRIPT
+      </text>
+      <text x="303" y="0" fill="#3B4857">•
+      </text>
+      <text x="326" y="0" fill="#8B9AAD">NODE ≥ 22.19
+      </text>
+    </g>
+  </g>
+  <g id="extension-map" transform="translate(662 48)" font-family="-apple-system, BlinkMacSystemFont, 'Segoe UI', 'PingFang SC', sans-serif">
+    <g id="claude-pi-mark" transform="translate(0 0)">
+      <!-- Official Claude starburst vector; source: Anthropic Claude brand mark. -->
+        <path transform="translate(2 2) scale(.34)" fill="#D97757" d="m19.6 66.5 19.7-11 .3-1-.3-.5h-1l-3.3-.2-11.2-.3L14 53l-9.5-.5-2.4-.5L0 49l.2-1.5 2-1.3 2.9.2 6.3.5 9.5.6 6.9.4L38 49.1h1.6l.2-.7-.5-.4-.4-.4L29 41l-10.6-7-5.6-4.1-3-2-1.5-2-.6-4.2 2.7-3 3.7.3.9.2 3.7 2.9 8 6.1L37 36l1.5 1.2.6-.4.1-.3-.7-1.1L33 25l-6-10.4-2.7-4.3-.7-2.6c-.3-1-.4-2-.4-3l3-4.2L28 0l4.2.6L33.8 2l2.6 6 4.1 9.3L47 29.9l2 3.8 1 3.4.3 1h.7v-.5l.5-7.2 1-8.7 1-11.2.3-3.2 1.6-3.8 3-2L61 2.6l2 2.9-.3 1.8-1.1 7.7L59 27.1l-1.5 8.2h.9l1-1.1 4.1-5.4 6.9-8.6 3-3.5L77 13l2.3-1.8h4.3l3.1 4.7-1.4 4.9-4.4 5.6-3.7 4.7-5.3 7.1-3.2 5.7.3.4h.7l12-2.6 6.4-1.1 7.6-1.3 3.5 1.6.4 1.6-1.4 3.4-8.2 2-9.6 2-14.3 3.3-.2.1.2.3 6.4.6 2.8.2h6.8l12.6 1 3.3 2 1.9 2.7-.3 2-5.1 2.6-6.8-1.6-16-3.8-5.4-1.3h-.8v.4l4.6 4.5 8.3 7.5L89 80.1l.5 2.4-1.3 2-1.4-.2-9.2-7-3.6-3-8-6.8h-.5v.7l1.8 2.7 9.8 14.7.5 4.5-.7 1.4-2.6 1-2.7-.6-5.8-8-6-9-4.7-8.2-.5.4-2.9 30.2-1.3 1.5-3 1.2-2.5-2-1.4-3 1.4-6.2 1.6-8 1.3-6.4 1.2-7.9.7-2.6v-.2H49L43 72l-9 12.3-7.2 7.6-1.7.7-3-1.5.3-2.8L24 86l10-12.8 6-7.9 4-4.6-.1-.5h-.3L17.2 77.4l-4.7.6-2-2 .2-3 1-1 8-5.5Z"/>
+        <path d="M50 3V35" stroke="#3A4857" stroke-width="2"/>
+        <!-- Official Pi logo vectors; source: https://pi.dev/logo-auto.svg -->
+          <g transform="translate(52 -5) scale(.06)" fill="#F4F7FA">
+            <path fill-rule="evenodd" d="M165.29 165.29H517.36V400H400V517.36H282.65V634.72H165.29ZM282.65 282.65V400H400V282.65Z"/>
+            <path d="M517.36 400H634.72V634.72H517.36Z"/>
+          </g>
+          <text x="104" y="15" fill="#F4F7FA" font-family="ui-monospace, SFMono-Regular, Menlo, Consolas, monospace" font-size="15" font-weight="700" letter-spacing=".8">CLAUDE CODE UX
+          </text>
+          <text x="104" y="34" fill="#7F8D9C" font-family="ui-monospace, SFMono-Regular, Menlo, Consolas, monospace" font-size="13" letter-spacing="1.2">FOR PI
+          </text>
+        </g>
+        <g transform="translate(0 52)">
+          <rect width="474" height="82" rx="14" fill="#101821" stroke="#2C3A48"/>
+          <rect width="5" height="82" rx="2.5" fill="#66E3C4"/>
+          <text x="26" y="32" fill="#F4F7FA" font-family="ui-monospace, SFMono-Regular, Menlo, Consolas, monospace" font-size="18" font-weight="700">/ccstyle
+          </text>
+          <text x="26" y="59" fill="#8B9AAD" font-size="16">Tool summaries · Diffs · Status bar
+          </text>
+          <circle cx="438" cy="29" r="9" fill="#66E3C4" opacity=".18"/>
+          <path d="M434 29l3 3 6-7" fill="none" stroke="#66E3C4" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+        </g>
+        <g transform="translate(0 144)">
+          <rect width="474" height="82" rx="14" fill="#101821" stroke="#2C3A48"/>
+          <rect width="5" height="82" rx="2.5" fill="#7CC7FF"/>
+          <text x="26" y="32" fill="#F4F7FA" font-family="ui-monospace, SFMono-Regular, Menlo, Consolas, monospace" font-size="18" font-weight="700">/context
+          </text>
+          <text x="26" y="59" fill="#8B9AAD" font-size="16">Usage breakdown · Injected content preview
+          </text>
+          <g transform="translate(416 23)">
+            <rect width="42" height="14" rx="7" fill="#1C2B38"/>
+            <rect width="27" height="14" rx="7" fill="#7CC7FF"/>
+          </g>
+        </g>
+        <g transform="translate(0 236)">
+          <rect width="474" height="82" rx="14" fill="#101821" stroke="#2C3A48"/>
+          <rect width="5" height="82" rx="2.5" fill="#F2C879"/>
+          <text x="26" y="32" fill="#F4F7FA" font-family="ui-monospace, SFMono-Regular, Menlo, Consolas, monospace" font-size="18" font-weight="700">@session:
+          </text>
+          <text x="26" y="59" fill="#8B9AAD" font-size="16">History completion · Cross-session references
+          </text>
+          <text x="431" y="40" fill="#F2C879" font-family="ui-monospace, SFMono-Regular, Menlo, Consolas, monospace" font-size="26">@
+          </text>
+        </g>
+      </g>
+    </svg>

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

@@ -4,7 +4,7 @@ import {
 	type DiffIndicatorMode,
 	type DiffViewMode,
 	type ToolDisplayConfig,
-} from "../renderer/tool-diff/index.ts";
+} from "../renderer/tool/diff/index.ts";
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
@@ -86,22 +86,6 @@ export function pickPositiveNumber(value: unknown, fallback: number, min = 1): n
 	return Number.isFinite(n) ? Math.max(min, n) : fallback;
 }
 
-export function nearestPreset(value: number, presets: readonly string[]): string {
-	const numeric = presets.map((p) => Number(p));
-	let best = presets[0] ?? String(value);
-	let bestDist = Number.POSITIVE_INFINITY;
-	for (let i = 0; i < numeric.length; i++) {
-		const dist = Math.abs((numeric[i] ?? 0) - value);
-		if (dist < bestDist) {
-			bestDist = dist;
-			best = presets[i] ?? best;
-		}
-	}
-	// Prefer exact match when value is already a preset.
-	const exact = presets.find((p) => Number(p) === value);
-	return exact ?? best;
-}
-
 export function normalizeConfig(input: unknown): Config {
 	const source = (input && typeof input === "object" ? input : {}) as Record<string, unknown>;
 	const mode = source.mode;

package/node_modules/@herbertgao/pi-cc-extensions/extensions/config/panel.ts

@@ -7,9 +7,9 @@
 import { getSettingsListTheme } from "@earendil-works/pi-coding-agent";
 import { Input, SettingsList, matchesKey, truncateToWidth } from "@earendil-works/pi-tui";
 import type { CompactThinkingController } from "../feature/compact-thinking.ts";
-import { applyStartupHeader } from "../feature/pi-startup-header.ts";
-import type { ToolGroupingHooks } from "../renderer/tool-grouping.ts";
-import type { DiffIndicatorMode, DiffViewMode } from "../renderer/tool-diff/index.ts";
+import { applyStartupHeader } from "../feature/shell/startup-header.ts";
+import type { ToolGroupingHooks } from "../renderer/tool/grouping.ts";
+import type { DiffIndicatorMode, DiffViewMode } from "../renderer/tool/diff/index.ts";
 import {
 	config,
 	DEFAULT_CONFIG,
@@ -553,4 +553,6 @@ export async function showCcstylePanel(
 			},
 		};
 	});
+	// 面板卸下后主 transcript 重新挂载；再刷一次，吃掉打开期间扫树失败的切换。
+	hooks.refreshCurrentTranscript(ctx, toolGrouping);
 }

package/node_modules/@herbertgao/pi-cc-extensions/extensions/{utils/agent-summary.ts → feature/agent-summary/core.ts}

@@ -1,26 +1,24 @@
 /**
  * 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";
 
-/** 工具分类，与旧 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 +26,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 +37,18 @@ function nonEmptyString(value: unknown): value is string {
 	return typeof value === "string" && value.length > 0;
 }
 
+function toolPath(args?: Record<string, unknown> | null): string | undefined {
+	if (nonEmptyString(args?.path)) return args.path;
+	return nonEmptyString(args?.file_path) ? args.file_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 +61,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 +87,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,
@@ -103,17 +112,19 @@ export function formatDuration(ms: number): string {
 
 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 +136,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 +146,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 +163,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/node_modules/@herbertgao/pi-cc-extensions/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/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);