@trim21/personal-pi-extensions 0.1.639 → 0.1.641

package/README.md

@@ -137,7 +137,7 @@ bwrap 已集成进 bash 工具实现（opencode 风格 `bash` 位于 `src/openco
 写保护直接内置在各写工具（opencode 风格 `write`/`edit`、Claude Code 风格 `Write`/`Edit`）内部，通过 `src/lib/write-guard.ts` 的 `guardWriteAccess` 实现。读取工具（`read`、`ls`、`find`、`grep`）不受限制。
 
 - workspace 内或 `/tmp` 下的路径自动放行
-- 外部路径需通过确认对话框由用户审批（**Approve once** / **Block** / **Block with reason**），对话框内以 ```diff 代码块展示将要发生的变更预览（与 opencode-edit 共享匹配引擎，能定位时显示带行号的真实 patch，否则退化为参数 diff）
+- 外部路径需通过确认对话框由用户审批（**Approve once** / **Block** / **Block with reason**），对话框内以 ```diff 代码块展示将要发生的变更预览（定位由各写工具注入自己的匹配实现，能定位时显示带行号的真实 patch，否则退化为参数 diff）
 - headless（无 UI）会话直接拒绝外部写入；Windows 上不提供审批路径，工作区外写入一律拒绝
 - `/bwrap-deny-request` 生效期间外部写入按无理由拒绝处理（`user deny <tool>: blocked`）
 - 无需配置，随各写工具自动生效
@@ -253,7 +253,7 @@ opencode 风格工具集，随 `src/opencode/index.ts` 一次加载：`read` / `
 
 ### edit
 
-`edit` 使用 [opencode](https://github.com/anomalyco/opencode) 的 schema 和模糊匹配引擎。核心 replacer 和 `replace()` 函数复制自 opencode，匹配引擎位于 `src/opencode/edit-engine.ts`，与写保护审批弹窗（`src/lib/write-guard.ts`）的 diff 预览共享。唯一的有意差异是去掉了原版的转义规范化（EscapeNormalizedReplacer）：它会把源码里合法的 `\n`、`\t` 等转义序列当成模型多转义的产物做启发式反转义，可能改坏内容。
+`edit` 使用 [opencode](https://github.com/anomalyco/opencode) 的 schema 和模糊匹配引擎。核心 replacer 和 `replace()` 函数复制自 opencode，匹配引擎位于 `src/opencode/edit-engine.ts`；写保护审批弹窗（`src/lib/write-guard.ts`）的 diff 预览由调用方注入这套引擎，因此预览与落盘同语义。唯一的有意差异是去掉了原版的转义规范化（EscapeNormalizedReplacer）：它会把源码里合法的 `\n`、`\t` 等转义序列当成模型多转义的产物做启发式反转义，可能改坏内容。
 
 支持的匹配策略：
 

package/package.json

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

package/src/claude-code/files.ts

@@ -348,11 +348,25 @@ export function registerFileTools(
       await guardWriteAccess(ctx, {
         toolName: "Edit",
         absolutePath: filePath,
-        change: {
-          oldText: params.old_string,
-          newText: params.new_string,
-          replaceAll: params.replace_all,
-        },
+        // 审批预览必须与落盘同语义：这里注入本工具自己的精确匹配（空 old_string
+        // 是创建/填充文件，按整文件写入预览）
+        change:
+          params.old_string === ""
+            ? { kind: "write", newText: params.new_string }
+            : {
+                kind: "edit",
+                oldText: params.old_string,
+                newText: params.new_string,
+                apply: (content) => ({
+                  contentOld: content,
+                  contentNew: applyExactEdit(
+                    content,
+                    params.old_string,
+                    params.new_string,
+                    params.replace_all ?? false,
+                  ),
+                }),
+              },
         policy,
         signal,
       });
@@ -521,7 +535,7 @@ export function registerFileTools(
       await guardWriteAccess(ctx, {
         toolName: "Write",
         absolutePath: filePath,
-        change: { oldText: "", newText: params.content },
+        change: { kind: "write", newText: params.content },
         policy,
         signal,
       });

package/src/lib/lsp/rename-tool.ts

@@ -198,7 +198,14 @@ export function registerLspRenameTool(
         await guardWriteAccess(ctx, {
           toolName: "lsp-rename",
           absolutePath: fileEdit.path,
-          change: { oldText: fileEdit.oldText, newText: fileEdit.newText },
+          change: {
+            kind: "edit",
+            oldText: fileEdit.oldText,
+            newText: fileEdit.newText,
+            // LSP 编辑已在内存里展开成整文件的 old/new，落盘是覆盖写：预览直接用
+            // 这一对文本，不必再把整份旧内容交给匹配引擎去找
+            apply: () => ({ contentOld: fileEdit.oldText, contentNew: fileEdit.newText }),
+          },
           policy: options.policy,
           signal,
         });

package/src/lib/write-guard.ts

@@ -12,7 +12,9 @@
  *   outright, with the same error as the user picking "Block".
  *
  * Callers have already parsed their tool arguments, so the guard only takes the
- * resolved pieces: the raw target path and the pending change (oldText/newText).
+ * resolved pieces: the raw target path and the pending change. An edit carries
+ * the caller's own matching implementation, so the previewed diff comes from the
+ * same semantics that will write the file.
  */
 
 import { readFile } from "node:fs/promises";
@@ -20,7 +22,6 @@ import { basename, isAbsolute, relative, sep } from "node:path";
 
 import { generateUnifiedPatch } from "@earendil-works/pi-coding-agent";
 
-import { applyEdit, normalizeToLF } from "../opencode/edit-engine.js";
 import { fenceCodeBlock } from "./markdown.js";
 import type { RequestPolicy } from "./request-policy.js";
 
@@ -57,14 +58,46 @@ function wrapDiff(patch: string): string {
   return fenceCodeBlock(body, "diff");
 }
 
+/**
+ * 审批预览用的应用函数：把这次改动套到文件内容上，返回 diff 用的前后文本。
+ * 必须是该工具落盘时使用的同一套匹配实现——否则对话框展示的 diff 与实际写入
+ * 可能不一致。
+ */
+export type PendingChangeApply = (fileContent: string) => {
+  readonly contentOld: string;
+  readonly contentNew: string;
+};
+
+/** 整文件写入：预览是完整的增删 patch，不需要匹配实现。 */
+export interface FileWriteChange {
+  readonly kind: "write";
+  readonly newText: string;
+}
+
+/**
+ * 替换：`apply` 是调用方自己的匹配实现（精确匹配、模糊匹配，或已展开好的整文件
+ * 编辑）。匹配不上时抛错即可，写保护会退化为参数 diff。
+ */
+export interface FileEditChange {
+  readonly kind: "edit";
+  readonly oldText: string;
+  readonly newText: string;
+  readonly apply: PendingChangeApply;
+}
+
 /** The pending file change, described by the caller from already-parsed args. */
-export interface PendingChange {
-  /** Text to replace; empty for whole-file writes. */
-  oldText: string;
-  /** Replacement text. */
-  newText: string;
-  /** Replace all occurrences of oldText (edits only). */
-  replaceAll?: boolean;
+export type PendingChange = FileWriteChange | FileEditChange;
+
+/** 预览统一按 LF 渲染：CRLF 文件的 diff 每行都带 \r，在对话框里显示成乱码。 */
+function normalizeToLF(text: string): string {
+  return text.replaceAll("\r\n", "\n");
+}
+
+/** 参数 diff：调用方的匹配实现报告不出结果时的兜底形式。 */
+function parameterDiff(oldText: string, newText: string): string {
+  const removed = oldText.split("\n").map((line) => `-${line}`);
+  const added = newText.split("\n").map((line) => `+${line}`);
+  return [...removed, ...added].join("\n");
 }
 
 /**
@@ -75,35 +108,31 @@ export async function buildDiffPreview(
   resolvedPath: string,
   change: PendingChange,
 ): Promise<string | undefined> {
-  let oldContent = "";
+  let fileContent = "";
   try {
-    oldContent = await readFile(resolvedPath, "utf8");
+    fileContent = await readFile(resolvedPath, "utf8");
   } catch {
     // Unreadable or missing file: treat as empty so writes show as full additions.
   }
 
-  if (change.oldText === "") {
+  if (change.kind === "write") {
     // Whole-file write: show the full addition/replacement patch.
-    return wrapDiff(generateUnifiedPatch(basename(resolvedPath), oldContent, change.newText, 2));
+    return wrapDiff(generateUnifiedPatch(basename(resolvedPath), fileContent, change.newText, 2));
   }
 
-  // Edit: reuse the real matching engine to locate oldText, giving a
-  // line-numbered patch when it matches. Fall back to a parameter diff when the
-  // edit cannot be applied (oldText not found, ambiguous, or no file).
+  // 定位由调用方的匹配实现负责（与其落盘同语义）；匹配不上时退回参数 diff。
   try {
-    const applied = applyEdit(oldContent, change.oldText, change.newText, change.replaceAll);
+    const { contentOld, contentNew } = change.apply(fileContent);
     return wrapDiff(
       generateUnifiedPatch(
         basename(resolvedPath),
-        normalizeToLF(applied.contentOld),
-        normalizeToLF(applied.contentNew),
+        normalizeToLF(contentOld),
+        normalizeToLF(contentNew),
         2,
       ),
     );
   } catch {
-    const removed = change.oldText.split("\n").map((line) => `-${line}`);
-    const added = change.newText.split("\n").map((line) => `+${line}`);
-    return wrapDiff([...removed, ...added].join("\n"));
+    return wrapDiff(parameterDiff(change.oldText, change.newText));
   }
 }
 

package/src/opencode/files.ts

@@ -635,7 +635,20 @@ function registerEditTool(
       await guardWriteAccess(ctx, {
         toolName: "edit",
         absolutePath,
-        change: { oldText: oldString, newText: newString, replaceAll },
+        // 审批预览必须与落盘同语义：注入本工具自己的模糊匹配引擎（空 oldString
+        // 是创建新文件，按整文件写入预览）
+        change:
+          oldString === ""
+            ? { kind: "write", newText: newString }
+            : {
+                kind: "edit",
+                oldText: oldString,
+                newText: newString,
+                apply: (content) => {
+                  const applied = applyEdit(content, oldString, newString, replaceAll);
+                  return { contentOld: applied.contentOld, contentNew: applied.contentNew };
+                },
+              },
         policy,
         signal,
       });
@@ -800,7 +813,7 @@ function registerWriteTool(
       await guardWriteAccess(ctx, {
         toolName: "write",
         absolutePath,
-        change: { oldText: "", newText: content },
+        change: { kind: "write", newText: content },
         policy,
         signal,
       });