@trim21/personal-pi-extensions 0.0.279 → 0.0.281

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trim21/personal-pi-extensions",
-  "version": "0.0.279",
+  "version": "0.0.281",
   "type": "module",
   "description": "Custom pi coding-agent extensions: bwrap sandbox, workspace guard, opencode edit, and more",
   "keywords": [

package/src/claude-code/files.ts

@@ -7,6 +7,7 @@ import { fileURLToPath } from "node:url";
 import type { ImageContent, TextContent } from "@earendil-works/pi-ai";
 import {
   type ExtensionAPI,
+  type ExtensionContext,
   generateDiffString,
   generateUnifiedPatch,
   withFileMutationQueue,
@@ -16,6 +17,8 @@ import { Type } from "typebox";
 import { guardWriteAccess } from "../lib/write-guard.js";
 import {
   type ClaudeCodeState,
+  createClaudeCodeState,
+  deserializeReads,
   didYouMean,
   type FileSnapshot,
   requireAbsolutePath,
@@ -528,3 +531,53 @@ export function registerFileTools(pi: ExtensionAPI, state: ClaudeCodeState): voi
     },
   });
 }
+
+/** 会更新 reads state 并随 details 持久化快照的工具名。 */
+const FILE_TOOL_NAMES = new Set(["Read", "Edit", "Write"]);
+
+/**
+ * 从当前分支的历史工具结果重建已读记账。先清空再重放，保证 state 只反映
+ * 当前分支：rewind / fork / resume 后，被抛弃分支上的 Read 不再残留。
+ */
+function restoreFileReads(
+  state: ClaudeCodeState,
+  sessionManager: ExtensionContext["sessionManager"],
+): void {
+  state.reads.clear();
+  for (const entry of sessionManager.getBranch()) {
+    if (entry.type !== "message" || entry.message.role !== "toolResult") continue;
+    if (!FILE_TOOL_NAMES.has(entry.message.toolName)) continue;
+    const details = entry.message.details as { reads?: unknown } | undefined;
+    if (!details?.reads) continue;
+    for (const [filePath, snapshot] of deserializeReads(details.reads)) {
+      state.reads.set(filePath, snapshot);
+    }
+  }
+}
+
+/**
+ * 独立扩展入口：files.ts 可单独经 `-e claude-code/files.ts` 加载（spawn-agent
+ * 子代理把 Read/Edit/Write 工具名映射到本文件），无需经 index.ts。reads
+ * state 归本文件所有：扩展实例内创建，并随 session 事件从历史分支恢复，
+ * 与主进程 index.ts 聚合加载时的行为一致。
+ */
+export default function claudeCodeFileTools(pi: ExtensionAPI): void {
+  const state = createClaudeCodeState();
+
+  // 扩展实例在进程启动 / /reload / /new / /resume / /fork 时重建，内存里的
+  // 已读记账随之丢失。这里从当前分支的历史工具结果里恢复：digest 是当时的值，
+  // 若文件在此期间被外部修改，Edit/Write 时的指纹对比仍会要求重新 Read，
+  // 防呆语义不因重建而弱化。
+  pi.on("session_start", (_event, ctx) => {
+    restoreFileReads(state, ctx.sessionManager);
+  });
+
+  // rewind / 树内跳转走 navigateTree → branch()，只发 session_tree 不发
+  // session_start，扩展实例也不重建。这里同样重放当前分支，丢弃被抛弃分支
+  // 的记账，避免 state 与当前分支脱节。
+  pi.on("session_tree", (_event, ctx) => {
+    restoreFileReads(state, ctx.sessionManager);
+  });
+
+  registerFileTools(pi, state);
+}

package/src/claude-code/glob.ts

@@ -154,3 +154,8 @@ export function registerGlobTool(pi: ExtensionAPI): void {
     },
   });
 }
+
+// 独立扩展入口：spawn-agent 子代理声明 `Glob` 工具时按本文件 `-e` 加载，
+// 无需经 index.ts / search.ts 聚合。registerGlobTool 本身就是 (pi) => void，
+// 可直接作为扩展 factory。
+export default registerGlobTool;

package/src/claude-code/grep.ts

@@ -342,3 +342,8 @@ export function registerGrepTool(pi: ExtensionAPI): void {
     },
   });
 }
+
+// 独立扩展入口：spawn-agent 子代理声明 `Grep` 工具时按本文件 `-e` 加载，
+// 无需经 index.ts / search.ts 聚合。registerGrepTool 本身就是 (pi) => void，
+// 可直接作为扩展 factory。
+export default registerGrepTool;

package/src/claude-code/index.ts

@@ -1,53 +1,19 @@
-import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 
-import { type ClaudeCodeState, createClaudeCodeState, deserializeReads } from "./common.js";
-import { registerFileTools } from "./files.js";
+import claudeCodeFileTools from "./files.js";
 import { registerSearchTools } from "./search.js";
 import { registerSessionTools } from "./session-tools.js";
 import { registerShellTools } from "./shell.js";
 
-/** 会更新 reads state 并随 details 持久化快照的工具名。 */
-const FILE_TOOL_NAMES = new Set(["Read", "Edit", "Write"]);
-
 /**
- * 从当前分支的历史工具结果重建已读记账。先清空再重放，保证 state 只反映
- * 当前分支：rewind / fork / resume 后，被抛弃分支上的 Read 不再残留。
+ * Claude Code 风格工具集入口：聚合 files / search / shell / session 四组工具。
+ *
+ * reads state 的创建与 session 恢复归 files.ts 所有（见其 default export），
+ * 本文件不再持有 state；spawn-agent 子代理按工具名直接 `-e` 加载各模块文件
+ * （files.ts / grep.ts / glob.ts 均为独立扩展入口）。
  */
-function restoreReads(
-  state: ClaudeCodeState,
-  sessionManager: ExtensionContext["sessionManager"],
-): void {
-  state.reads.clear();
-  for (const entry of sessionManager.getBranch()) {
-    if (entry.type !== "message" || entry.message.role !== "toolResult") continue;
-    if (!FILE_TOOL_NAMES.has(entry.message.toolName)) continue;
-    const details = entry.message.details as { reads?: unknown } | undefined;
-    if (!details?.reads) continue;
-    for (const [filePath, snapshot] of deserializeReads(details.reads)) {
-      state.reads.set(filePath, snapshot);
-    }
-  }
-}
-
 export default function claudeCodeTools(pi: ExtensionAPI): void {
-  const state = createClaudeCodeState();
-
-  // 扩展实例在进程启动 / /reload / /new / /resume / /fork 时重建，内存里的
-  // 已读记账随之丢失。这里从当前分支的历史工具结果里恢复：digest 是当时的值，
-  // 若文件在此期间被外部修改，Edit/Write 时的指纹对比仍会要求重新 Read，
-  // 防呆语义不因重建而弱化。
-  pi.on("session_start", (_event, ctx) => {
-    restoreReads(state, ctx.sessionManager);
-  });
-
-  // rewind / 树内跳转走 navigateTree → branch()，只发 session_tree 不发
-  // session_start，扩展实例也不重建。这里同样重放当前分支，丢弃被抛弃分支
-  // 的记账，避免 state 与当前分支脱节。
-  pi.on("session_tree", (_event, ctx) => {
-    restoreReads(state, ctx.sessionManager);
-  });
-
-  registerFileTools(pi, state);
+  claudeCodeFileTools(pi);
   registerSearchTools(pi);
   registerShellTools(pi);
   registerSessionTools(pi);

package/src/spawn-agent.ts

@@ -12,7 +12,9 @@
  * `onUpdate`, the same channel the built-in bash tool uses for live output.
  * Progress is a rolling log: `tool: <name>` lines for tool calls and
  * `text: <content>` lines for completed text blocks, keeping the last
- * `MAX_PROGRESS_LINES` lines.
+ * `MAX_PROGRESS_LINES` lines. Consecutive tool calls are merged into a
+ * single `tool:` line (`read x 2, glob`), so a burst of tool calls does
+ * not flood the window; any text block starts a new line.
  *
  * Security default: without an explicit `tools:` in the frontmatter, the
  * subagent only gets read-only tools (read/grep/find/ls) — no bash/write/edit.
@@ -345,12 +347,44 @@ export async function runAgent(
     });
 
     let logLines: string[] = [];
+    // 工具调用行合并:连续的 tool_execution_start 事件合并在同一 `tool:` 行
+    // (如 `tool: read x 2, glob`),相同工具名连续出现时计为 `name x N`,
+    // 不同名按调用顺序罗列;任何非工具行都会打断合并。
+    let toolLineSegments: string[] = [];
+    let toolLine: { name: string; count: number } | undefined;
+
+    const toolSegment = (name: string, count: number) => (count > 1 ? `${name} x ${count}` : name);
 
     const pushLogLine = (line: string) => {
       logLines.push(line);
       if (logLines.length > MAX_PROGRESS_LINES) {
         logLines = logLines.slice(-MAX_PROGRESS_LINES);
       }
+      // 任何非工具行都会打断工具调用合并,下一批调用另起一行。
+      toolLine = undefined;
+    };
+
+    const appendToolLine = (name: string) => {
+      const firstInBatch = toolLine === undefined;
+      if (toolLine === undefined) {
+        toolLineSegments = [];
+        toolLine = { name, count: 1 };
+      } else if (toolLine.name === name) {
+        toolLine.count++;
+      } else {
+        toolLineSegments.push(toolSegment(toolLine.name, toolLine.count));
+        toolLine = { name, count: 1 };
+      }
+      const line = `tool: ${[...toolLineSegments, toolSegment(toolLine.name, toolLine.count)].join(", ")}`;
+      if (firstInBatch) {
+        logLines.push(line);
+        if (logLines.length > MAX_PROGRESS_LINES) {
+          logLines = logLines.slice(-MAX_PROGRESS_LINES);
+        }
+      } else {
+        logLines[logLines.length - 1] = line;
+      }
+      emitUpdate();
     };
 
     const emitUpdate = () => {
@@ -431,9 +465,7 @@ export async function runAgent(
           break;
         }
         case "tool_execution_start": {
-          pushLogLine(`tool: ${event.toolName}`);
-          emitUpdate();
-
+          appendToolLine(event.toolName);
           break;
         }
         case "message_end": {