@trim21/personal-pi-extensions 0.0.385 → 0.0.388

package/package.json

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

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

@@ -26,7 +26,7 @@ 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;
 
@@ -388,7 +388,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 +398,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 +459,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 +494,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

@@ -88,9 +88,13 @@ export async function globFiles(
     stdout = result.stdout;
   } catch (error) {
     if (signal?.aborted) throwIfAborted(signal);
-    throw new Error(`ripgrep failed: ${error instanceof Error ? error.message : String(error)}`, {
-      cause: error,
-    });
+    // rg exit code 1 = 搜索完成但无匹配，对齐 Claude Code 的 ripGrep（正常空结果）
+    const code = (error as { code?: unknown }).code;
+    if (code === 1) return { files: [], truncated: false };
+    const detail =
+      (error as { stderr?: string }).stderr?.trim() ||
+      (error instanceof Error ? error.message : String(error));
+    throw new Error(`ripgrep failed: ${detail}`, { cause: error });
   }
   // rg 输出相对 searchDir 的路径，转成绝对路径
   const lines = stdout ? stdout.replace(/\n$/, "").split("\n") : [];
@@ -149,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") {