@trim21/personal-pi-extensions 0.0.269 → 0.0.271

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trim21/personal-pi-extensions",
-  "version": "0.0.269",
+  "version": "0.0.271",
   "type": "module",
   "description": "Custom pi coding-agent extensions: bwrap sandbox, workspace guard, opencode edit, and more",
   "keywords": [
@@ -23,9 +23,7 @@
     "format": "prettier --write .",
     "test": "vitest run",
     "test:coverage": "vitest run --coverage",
-    "prepack": "pnpm run copy",
-    "copy": "cp node_modules/@vscode/tree-sitter-wasm/wasm/tree-sitter-bash.wasm src/bwrap/tree-sitter-bash.wasm",
-    "prepare": "husky && pnpm run copy"
+    "prepare": "husky"
   },
   "peerDependencies": {
     "@earendil-works/pi-agent-core": ">=0.84.1",
@@ -40,7 +38,6 @@
     "@types/node": "^24.13.3",
     "@typescript/native": "npm:typescript@^7.0.2",
     "@vitest/coverage-v8": "^4.1.10",
-    "@vscode/tree-sitter-wasm": "^0.3.1",
     "eslint": "^10.8.1",
     "eslint-config-prettier": "10.1.8",
     "eslint-plugin-erasable-syntax-only": "0.4.2",
@@ -86,6 +83,7 @@
     "node": ">=24"
   },
   "dependencies": {
+    "@vscode/tree-sitter-wasm": "^0.3.1",
     "web-tree-sitter": "^0.26.12"
   }
 }

package/src/bwrap/approval-rules.ts

@@ -11,8 +11,9 @@
  * - opencode packages/opencode/src/tool/shell.ts（tree-sitter 命令提取）
  */
 import { readFileSync } from "node:fs";
+import { createRequire } from "node:module";
 
-import type { Node } from "web-tree-sitter";
+import { Language, type Node, Parser } from "web-tree-sitter";
 
 /** 解析后的单个命令：命令名 + 参数 + 原文 + 嵌套命令（命令替换里的）。 */
 export interface BashCommand {
@@ -43,22 +44,22 @@ interface BashParser {
 }
 
 /**
- * 延迟初始化 tree-sitter bash parser（wasm 加载开销大，只做一次）。
- * Node 环境：主 wasm 由 web-tree-sitter 按自身路径自动加载，
- * bash grammar 的 wasm 从同目录文件读入。
- *
- * tree-sitter-bash.wasm 不提交进 git：`pnpm install` 后的 prepare
- * 和发布前的 prepack 都会执行 `pnpm run copy`，从 devDependency
- * @vscode/tree-sitter-wasm（MIT）复制到本目录。
+ * 延迟初始化 tree-sitter bash parser：web-tree-sitter 是静态 import，
+ * 但 wasm 加载与 parser 构造只在首次调用时发生（Parser.init() 开销大）。
+ * bash grammar 的 wasm 在模块加载时从 runtime 依赖
+ * @vscode/tree-sitter-wasm（MIT）解析并读取一次。
  */
+const require = createRequire(import.meta.url);
+const BASH_WASM = readFileSync(
+  require.resolve("@vscode/tree-sitter-wasm/wasm/tree-sitter-bash.wasm"),
+);
+
 function createParserLoader(): () => Promise<BashParser> {
   let parserPromise: Promise<BashParser> | undefined;
   return function loadParser(): Promise<BashParser> {
     parserPromise ??= (async () => {
-      const { Language, Parser } = await import("web-tree-sitter");
       await Parser.init();
-      const bashWasm = readFileSync(new URL("tree-sitter-bash.wasm", import.meta.url));
-      const language = await Language.load(bashWasm);
+      const language = await Language.load(BASH_WASM);
       const parser = new Parser();
       parser.setLanguage(language);
       return { parse: (source: string) => parser.parse(source) };

package/src/claude-code/files.ts

@@ -1,6 +1,6 @@
 import { createHash } from "node:crypto";
 import { constants, readFileSync } from "node:fs";
-import { access, mkdir, readFile, stat, writeFile } from "node:fs/promises";
+import { access, mkdir, readFile, realpath, stat, writeFile } from "node:fs/promises";
 import { dirname, extname } from "node:path";
 import { fileURLToPath } from "node:url";
 
@@ -164,17 +164,44 @@ export function exactReplace(
   return content.slice(0, index) + newString + content.slice(index + oldString.length);
 }
 
-async function requireCurrentRead(state: ClaudeCodeState, filePath: string): Promise<void> {
-  const readSnapshot = state.reads.get(filePath);
+/**
+ * reads 记账 key：解析 symlink 后的真实路径，与 withFileMutationQueue 的队列
+ * key 对齐。文件尚不存在（Write 新建 / Edit 空 old_string 创建）时 realpath
+ * 抛 ENOENT，回退到已规范化路径。
+ */
+async function readStateKey(filePath: string): Promise<string> {
+  try {
+    return await realpath(filePath);
+  } catch (error) {
+    if (
+      error instanceof Error &&
+      "code" in error &&
+      (error.code === "ENOENT" || error.code === "ENOTDIR")
+    ) {
+      return filePath;
+    }
+    throw error;
+  }
+}
+
+/**
+ * 校验「已读且未变」。key 与 currentContent 由调用方提供：调用方每次工具调用
+ * 只 realpath / readFile 一次，避免重复 IO。
+ */
+function requireCurrentRead(
+  state: ClaudeCodeState,
+  key: string,
+  filePath: string,
+  currentContent: Uint8Array,
+): void {
+  const readSnapshot = state.reads.get(key);
   if (!readSnapshot) {
     throw new Error("File has not been read yet. Read it first before writing to it.");
   }
   if (!readSnapshot.textEditable) {
     throw new Error(`Cannot edit or overwrite a binary file with a text tool: ${filePath}`);
   }
-  const currentContent = await readFile(filePath);
-  const current = snapshotOf(currentContent);
-  if (!snapshotsEqual(readSnapshot, current)) {
+  if (!snapshotsEqual(readSnapshot, snapshotOf(currentContent))) {
     throw new Error(
       "File has been modified since read, either by the user or by a linter. Read it again before attempting to write it.",
     );
@@ -249,8 +276,9 @@ export function registerFileTools(pi: ExtensionAPI, state: ClaudeCodeState): voi
           { type: "image", data, mimeType: imageMime },
         ];
         const snapshot = snapshotOf(image, false);
-        state.reads.set(filePath, snapshot);
-        return { content, details: { reads: { [filePath]: snapshot } } };
+        const key = await readStateKey(filePath);
+        state.reads.set(key, snapshot);
+        return { content, details: { reads: { [key]: snapshot } } };
       }
 
       const buffer = await readFile(filePath);
@@ -272,10 +300,11 @@ export function registerFileTools(pi: ExtensionAPI, state: ClaudeCodeState): voi
         );
       }
       const snapshot = snapshotOf(buffer);
-      state.reads.set(filePath, snapshot);
+      const key = await readStateKey(filePath);
+      state.reads.set(key, snapshot);
       return {
         content: [{ type: "text", text: formatted.text }],
-        details: { reads: { [filePath]: snapshot } },
+        details: { reads: { [key]: snapshot } },
       };
     },
   });
@@ -343,12 +372,13 @@ export function registerFileTools(pi: ExtensionAPI, state: ClaudeCodeState): voi
           if (!exists) await mkdir(dirname(filePath), { recursive: true });
           await writeFile(filePath, newString, "utf8");
           const snapshot = snapshotOf(newString);
-          state.reads.set(filePath, snapshot);
+          const key = await readStateKey(filePath);
+          state.reads.set(key, snapshot);
           return {
             content: [
               { type: "text", text: `The file ${filePath} has been updated successfully.` },
             ],
-            details: { reads: { [filePath]: snapshot } } satisfies FileToolDetails,
+            details: { reads: { [key]: snapshot } } satisfies FileToolDetails,
           };
         }
         const replaceAll = params.replace_all ?? false;
@@ -365,9 +395,9 @@ export function registerFileTools(pi: ExtensionAPI, state: ClaudeCodeState): voi
             throw error;
           }
         }
-        let original: string;
+        let content: Buffer;
         try {
-          original = await readFile(filePath, "utf8");
+          content = await readFile(filePath);
         } catch (error) {
           if (error instanceof Error && "code" in error && error.code === "ENOENT") {
             const suggestion = await didYouMean(filePath, ctx.cwd);
@@ -383,9 +413,11 @@ export function registerFileTools(pi: ExtensionAPI, state: ClaudeCodeState): voi
             "File is a Jupyter Notebook. Use the NotebookEditTool to edit this file.",
           );
         }
-        await requireCurrentRead(state, filePath);
+        const key = await readStateKey(filePath);
+        requireCurrentRead(state, key, filePath, content);
         await access(filePath, constants.R_OK | constants.W_OK);
         throwIfAborted(signal);
+        const original = content.toString("utf8");
 
         // CRLF 规范化后匹配（old_string 不需要带 \r），写回时恢复原行尾
         const crlfCount = (original.match(/\r\n/g) ?? []).length;
@@ -410,7 +442,7 @@ export function registerFileTools(pi: ExtensionAPI, state: ClaudeCodeState): voi
         const restored = lineEnding === "\r\n" ? updated.replaceAll("\n", "\r\n") : updated;
         await writeFile(filePath, restored, "utf8");
         const snapshot = snapshotOf(restored);
-        state.reads.set(filePath, snapshot);
+        state.reads.set(key, snapshot);
         const diff = generateDiffString(original, restored);
         const text = replaceAll
           ? `The file ${filePath} has been updated. All occurrences were successfully replaced.`
@@ -421,7 +453,7 @@ export function registerFileTools(pi: ExtensionAPI, state: ClaudeCodeState): voi
             diff: diff.diff,
             patch: generateUnifiedPatch(filePath, original, restored),
             firstChangedLine: diff.firstChangedLine,
-            reads: { [filePath]: snapshot },
+            reads: { [key]: snapshot },
           } satisfies FileToolDetails,
         };
       });
@@ -457,11 +489,14 @@ export function registerFileTools(pi: ExtensionAPI, state: ClaudeCodeState): voi
       });
       return withFileMutationQueue(filePath, async () => {
         let original: string | undefined;
+        let key: string | undefined;
         try {
           const value = await stat(filePath);
           if (value.isFile()) {
-            await requireCurrentRead(state, filePath);
-            original = await readFile(filePath, "utf8");
+            const content = await readFile(filePath);
+            key = await readStateKey(filePath);
+            requireCurrentRead(state, key, filePath, content);
+            original = content.toString("utf8");
           }
         } catch (error) {
           if (!(error instanceof Error) || !("code" in error) || error.code !== "ENOENT") {
@@ -472,7 +507,9 @@ export function registerFileTools(pi: ExtensionAPI, state: ClaudeCodeState): voi
         await mkdir(dirname(filePath), { recursive: true });
         await writeFile(filePath, params.content, "utf8");
         const snapshot = snapshotOf(params.content);
-        state.reads.set(filePath, snapshot);
+        // 新建文件：writeFile 之后 realpath 才能解析；覆盖写则复用上面的 key
+        const resolvedKey = key ?? (await readStateKey(filePath));
+        state.reads.set(resolvedKey, snapshot);
         const diff = generateDiffString(original ?? "", params.content);
         const text =
           original === undefined
@@ -484,7 +521,7 @@ export function registerFileTools(pi: ExtensionAPI, state: ClaudeCodeState): voi
             diff: diff.diff,
             patch: generateUnifiedPatch(filePath, original ?? "", params.content),
             firstChangedLine: diff.firstChangedLine,
-            reads: { [filePath]: snapshot },
+            reads: { [resolvedKey]: snapshot },
           } satisfies FileToolDetails,
         };
       });

package/src/claude-code/index.ts

@@ -1,6 +1,6 @@
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 
-import { createClaudeCodeState, deserializeReads } from "./common.js";
+import { type ClaudeCodeState, createClaudeCodeState, deserializeReads } from "./common.js";
 import { registerFileTools } from "./files.js";
 import { registerSearchTools } from "./search.js";
 import { registerSessionTools } from "./session-tools.js";
@@ -9,6 +9,26 @@ import { registerShellTools } from "./shell.js";
 /** 会更新 reads state 并随 details 持久化快照的工具名。 */
 const FILE_TOOL_NAMES = new Set(["Read", "Edit", "Write"]);
 
+/**
+ * 从当前分支的历史工具结果重建已读记账。先清空再重放，保证 state 只反映
+ * 当前分支：rewind / fork / resume 后，被抛弃分支上的 Read 不再残留。
+ */
+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();
 
@@ -17,15 +37,14 @@ export default function claudeCodeTools(pi: ExtensionAPI): void {
   // 若文件在此期间被外部修改，Edit/Write 时的指纹对比仍会要求重新 Read，
   // 防呆语义不因重建而弱化。
   pi.on("session_start", (_event, ctx) => {
-    for (const entry of ctx.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);
-      }
-    }
+    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);