@trim21/personal-pi-extensions 0.0.386 → 0.0.389

package/package.json

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

package/src/claude-code/common.ts

@@ -18,6 +18,10 @@ import { Value } from "typebox/value";
 const fileSnapshotSchema = Type.Object({
   digest: Type.String(),
   textEditable: Type.Boolean(),
+  // 以下字段仅 Read 写入，供同范围重复读取 dedup；Edit/Write 不写，
+  // 覆盖记录后 offset 缺省 → 不再 dedup，强制重新 Read（对齐 CC readFileState）
+  offset: Type.Optional(Type.Number()),
+  limit: Type.Optional(Type.Number()),
 });
 
 export type FileSnapshot = Static<typeof fileSnapshotSchema>;

package/src/claude-code/edit-utils.ts

@@ -114,3 +114,12 @@ export function preserveQuoteStyle(
   if (hasSingleQuotes) result = applyCurlySingleQuotes(result);
   return result;
 }
+
+/**
+ * patch 显示用：把行首 tab 转成 2 空格（对齐 Claude Code 的
+ * convertLeadingTabsToSpaces）。仅用于 details 里展示的 diff，不影响写盘内容。
+ */
+export function convertLeadingTabsToSpaces(content: string): string {
+  if (!content.includes("\t")) return content;
+  return content.replaceAll(/^\t+/gm, (tabs) => "  ".repeat(tabs.length));
+}

package/src/claude-code/files.ts

@@ -1,5 +1,5 @@
 import { createHash } from "node:crypto";
-import { constants, readFileSync } from "node:fs";
+import { constants, readFileSync, type Stats } from "node:fs";
 import { access, mkdir, readFile, realpath, stat, writeFile } from "node:fs/promises";
 import { dirname, extname } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -26,10 +26,14 @@ import {
   snapshotsEqual,
   throwIfAborted,
 } from "./common.js";
-import { findActualString, preserveQuoteStyle } from "./edit-utils.js";
+import { convertLeadingTabsToSpaces, findActualString, preserveQuoteStyle } from "./edit-utils.js";
 
 const SAMPLE_BYTES = 4096;
 
+/** 同范围重复读取、文件未变时返回的 stub（对齐 Claude Code 的 file_unchanged）。 */
+export const FILE_UNCHANGED_STUB =
+  "File unchanged since last read. The content from the earlier Read tool_result in this conversation is still current — refer to that instead of re-reading.";
+
 /** Read 全读时的文件大小上限（对齐 Claude Code 的 256KB）。 */
 const MAX_READ_SIZE_BYTES = 0.25 * 1024 * 1024;
 /** Read 输出 token 粗估上限（对齐 Claude Code 的 25K tokens；无 tokenizer，按 4 字符/token 估算）。 */
@@ -75,8 +79,11 @@ function snapshotOf(content: Uint8Array | string, textEditable = true): FileSnap
   return { digest: createHash("sha256").update(content).digest("hex"), textEditable };
 }
 
-async function assertReadableFile(filePath: string): Promise<Awaited<ReturnType<typeof stat>>> {
+async function assertReadableFile(filePath: string): Promise<Stats> {
   const value = await stat(filePath);
+  if (value.isDirectory()) {
+    throw new Error(`EISDIR: illegal operation on a directory, read '${filePath}'`);
+  }
   if (!value.isFile()) throw new Error(`File not found: ${filePath}`);
   await access(filePath, constants.R_OK);
   return value;
@@ -130,8 +137,10 @@ export function formatReadOutput(
       totalLines,
     };
   }
+  // offset=0 时从第一行开始、行号从 0 起（对齐 Claude Code 的 lineOffset 语义）
+  const startIndex = offset === 0 ? 0 : offset - 1;
   const selected =
-    limit === undefined ? lines.slice(offset - 1) : lines.slice(offset - 1, offset - 1 + limit);
+    limit === undefined ? lines.slice(startIndex) : lines.slice(startIndex, startIndex + limit);
   const text = selected.map((line, index) => `${offset + index}\t${line}`).join("\n");
   return { text, totalLines };
 }
@@ -247,9 +256,9 @@ export function registerFileTools(
       const filePath = requireAbsolutePath(params.file_path);
       if (
         params.offset !== undefined &&
-        (!Number.isSafeInteger(params.offset) || params.offset < 1)
+        (!Number.isSafeInteger(params.offset) || params.offset < 0)
       ) {
-        throw new Error("offset must be a positive integer");
+        throw new Error("offset must be a non-negative integer");
       }
       if (params.limit !== undefined && (!Number.isSafeInteger(params.limit) || params.limit < 1)) {
         throw new Error("limit must be a positive integer");
@@ -289,7 +298,23 @@ export function registerFileTools(
         return { content, details: { reads: { [key]: snapshot } } };
       }
 
+      const offset = params.offset ?? 1;
+      const limit = params.limit;
+      const key = await readStateKey(filePath);
       const buffer = await readFile(filePath);
+
+      // 同范围 + checksum 未变 → 返回 stub 而非重发内容（对齐 CC readFileState；
+      // 复用 reads 里的 sha256，比 mtime 可靠，无时间片粒度问题）
+      const previous = state.reads.get(key);
+      if (
+        previous !== undefined &&
+        previous.offset !== undefined &&
+        previous.offset === offset &&
+        previous.limit === limit &&
+        snapshotsEqual(previous, snapshotOf(buffer))
+      ) {
+        return { content: [{ type: "text", text: FILE_UNCHANGED_STUB }], details: {} };
+      }
       if (isBinary(buffer.subarray(0, SAMPLE_BYTES)))
         throw new Error(`Cannot read binary file: ${filePath}`);
       // 全读（limit 未传）时受字节上限约束（对齐 Claude Code）
@@ -299,7 +324,7 @@ export function registerFileTools(
         );
       }
       const text = buffer.toString("utf8");
-      const formatted = formatReadOutput(text, params.offset ?? 1, params.limit);
+      const formatted = formatReadOutput(text, offset, limit);
       // 输出 token 粗估上限（无 tokenizer，4 字符/token），对读取范围生效
       const estimatedTokens = Math.ceil(formatted.text.length / 4);
       if (estimatedTokens > MAX_READ_TOKENS) {
@@ -307,8 +332,7 @@ export function registerFileTools(
           `File content (${estimatedTokens} tokens) exceeds maximum allowed tokens (${MAX_READ_TOKENS}). Use offset and limit parameters to read specific portions of the file, or search for specific content instead of reading the whole file.`,
         );
       }
-      const snapshot = snapshotOf(buffer);
-      const key = await readStateKey(filePath);
+      const snapshot = { ...snapshotOf(buffer), offset, limit };
       state.reads.set(key, snapshot);
       // LSP warm-up 是后台任务，失败不影响读取
       void service.touchFile(filePath, ctx.cwd).catch(() => {
@@ -388,7 +412,7 @@ export function registerFileTools(
           const snapshot = snapshotOf(newString);
           const key = await readStateKey(filePath);
           state.reads.set(key, snapshot);
-          const diff = generateDiffString("", newString);
+          const diff = generateDiffString("", convertLeadingTabsToSpaces(newString));
           throwIfAborted(signal);
           const diagnosticText = await service.lspDiagnosticsForFile(filePath, ctx.cwd, {
             notify: (message, level) => ctx.ui.notify(message, level),
@@ -398,7 +422,7 @@ export function registerFileTools(
             `The file ${filePath} has been updated successfully.`,
             {
               diff: diff.diff,
-              patch: generateUnifiedPatch(filePath, "", newString),
+              patch: generateUnifiedPatch(filePath, "", convertLeadingTabsToSpaces(newString)),
               firstChangedLine: diff.firstChangedLine,
               reads: { [key]: snapshot },
             },
@@ -459,15 +483,30 @@ export function registerFileTools(
           );
         }
         const actualNewString = preserveQuoteStyle(oldString, actualOldString, newString);
+        // 删除场景（new_string 为空）：old_string 不以换行结尾且文件里是
+        // "old_string\n" 时连换行一起删，避免留下空行（对齐 Claude Code
+        // applyEditToFile 的 stripTrailingNewline 语义）
+        let searchString = actualOldString;
+        if (
+          actualNewString === "" &&
+          !actualOldString.endsWith("\n") &&
+          normalized.includes(actualOldString + "\n")
+        ) {
+          searchString = actualOldString + "\n";
+        }
         // split/join 与函数替换：replacement 含 $ 时不会触发 $& 等特殊语义
         const updated = replaceAll
-          ? normalized.split(actualOldString).join(actualNewString)
-          : normalized.replace(actualOldString, () => actualNewString);
+          ? normalized.split(searchString).join(actualNewString)
+          : normalized.replace(searchString, () => actualNewString);
         const restored = lineEnding === "\r\n" ? updated.replaceAll("\n", "\r\n") : updated;
         await writeFile(filePath, restored, "utf8");
         const snapshot = snapshotOf(restored);
         state.reads.set(key, snapshot);
-        const diff = generateDiffString(original, restored);
+        // patch/diff 仅供显示：前导 tab 转空格，避免 UI 渲染错位（对齐 Claude Code）
+        const diff = generateDiffString(
+          convertLeadingTabsToSpaces(original),
+          convertLeadingTabsToSpaces(restored),
+        );
         const text = replaceAll
           ? `The file ${filePath} has been updated. All occurrences were successfully replaced.`
           : `The file ${filePath} has been updated successfully.`;
@@ -479,7 +518,11 @@ export function registerFileTools(
           text,
           {
             diff: diff.diff,
-            patch: generateUnifiedPatch(filePath, original, restored),
+            patch: generateUnifiedPatch(
+              filePath,
+              convertLeadingTabsToSpaces(original),
+              convertLeadingTabsToSpaces(restored),
+            ),
             firstChangedLine: diff.firstChangedLine,
             reads: { [key]: snapshot },
           },

package/src/claude-code/glob.ts

@@ -153,7 +153,7 @@ export function registerGlobTool(pi: ExtensionAPI): void {
         : filenames;
       return {
         content: [{ type: "text", text: lines.length > 0 ? lines.join("\n") : "No files found" }],
-        details: { count: filenames.length },
+        details: undefined,
       };
     },
   });

package/src/claude-code/grep.ts

@@ -284,7 +284,7 @@ export function registerGrepTool(pi: ExtensionAPI): void {
 
       if (mode === "files_with_matches") {
         if (stdout === "") {
-          return { content: [{ type: "text", text: "No files found" }], details: { matches: 0 } };
+          return { content: [{ type: "text", text: "No files found" }], details: undefined };
         }
         const sorted = await sortFilesByMtime(stdout);
         const { lines, appliedLimit, appliedOffset } = pageGrepOutput(sorted, offset, headLimit);
@@ -293,7 +293,10 @@ export function registerGrepTool(pi: ExtensionAPI): void {
         const text = truncateOutput(
           `Found ${filenames.length} ${filenames.length === 1 ? "file" : "files"}${limitInfo ? ` ${limitInfo}` : ""}\n${filenames.join("\n")}`,
         );
-        return { content: [{ type: "text", text }], details: { matches: filenames.length } };
+        return {
+          content: [{ type: "text", text }],
+          details: undefined,
+        };
       }
 
       if (mode === "count") {