opencode-gbk-tools 0.1.18 → 0.1.21

package/dist/opencode-tools/gbk_edit.js

@@ -16333,7 +16333,7 @@ function buildGbkLineDiffPreview(filePath, encoding, beforeText, afterText) {
       lines.push(`${ANSI_GREEN}+${after}${ANSI_RESET}`);
     }
   }
-  return lines.join("\n");
+  return "\n" + lines.join("\n");
 }
 function toSafeNumber(value) {
   return typeof value === "bigint" ? Number(value) : value;
@@ -16357,10 +16357,10 @@ function assertInsertArguments(input) {
     throw createGbkError("GBK_INVALID_ARGUMENT", "content \u4E0D\u80FD\u4E3A\u7A7A");
   }
   if (input.replaceAll !== void 0) {
-    throw createGbkError("GBK_INVALID_ARGUMENT", "\u63D2\u5165\u6A21\u5F0F\u4E0D\u652F\u6301 replaceAll");
+    throw createGbkError("GBK_INVALID_ARGUMENT", "\u63D2\u5165\u6A21\u5F0F\u4E0D\u652F\uFFFD\uFFFD? replaceAll");
   }
   if (input.startLine !== void 0 || input.endLine !== void 0 || input.startAnchor !== void 0 || input.endAnchor !== void 0) {
-    throw createGbkError("GBK_INVALID_ARGUMENT", "\u63D2\u5165\u6A21\u5F0F\u4E0D\u652F\u6301 startLine/endLine/startAnchor/endAnchor");
+    throw createGbkError("GBK_INVALID_ARGUMENT", "\u63D2\u5165\u6A21\u5F0F\u4E0D\u652F\uFFFD\uFFFD? startLine/endLine/startAnchor/endAnchor");
   }
 }
 function findOccurrenceIndex(text, token, occurrence) {
@@ -16384,9 +16384,9 @@ function findOccurrenceIndex(text, token, occurrence) {
     searchFrom = index + token.length;
   }
   if (count === 0) {
-    throw createGbkError("GBK_NO_MATCH", `\u672A\u627E\u5230\u951A\u70B9: ${token}`);
+    throw createGbkError("GBK_NO_MATCH", `\u672A\u627E\u5230\u951A\uFFFD\uFFFD?: ${token}`);
   }
-  throw createGbkError("GBK_NO_MATCH", `\u951A\u70B9 ${token} \u53EA\u627E\u5230 ${count} \u5904\uFF0C\u65E0\u6CD5\u4F7F\u7528\u7B2C ${occurrence} \u5904`);
+  throw createGbkError("GBK_NO_MATCH", `\u951A\u70B9 ${token} \u53EA\u627E\uFFFD\uFFFD? ${count} \u5904\uFF0C\u65E0\u6CD5\u4F7F\u7528\uFFFD\uFFFD? ${occurrence} \u5904`);
 }
 function insertByAnchor(text, mode, anchor, content, occurrence, ifExists, newlineStyle) {
   const alignedContent = newlineStyle === "crlf" ? content.replace(/\r\n/g, "\n").replace(/\n/g, "\r\n") : newlineStyle === "lf" ? content.replace(/\r\n/g, "\n") : content;
@@ -16395,7 +16395,7 @@ function insertByAnchor(text, mode, anchor, content, occurrence, ifExists, newli
   const alreadyExists = mode === "insertAfter" ? text.slice(insertionPoint, insertionPoint + alignedContent.length) === alignedContent : text.slice(Math.max(0, insertionPoint - alignedContent.length), insertionPoint) === alignedContent;
   if (alreadyExists) {
     if (ifExists === "error") {
-      throw createGbkError("GBK_INVALID_ARGUMENT", "\u63D2\u5165\u4F4D\u7F6E\u5DF2\u5B58\u5728\u76F8\u540C\u5185\u5BB9");
+      throw createGbkError("GBK_INVALID_ARGUMENT", "\u63D2\u5165\u4F4D\u7F6E\u5DF2\u5B58\u5728\u76F8\u540C\u5185\uFFFD\uFFFD?");
     }
     if (ifExists === "skip") {
       return {
@@ -16436,7 +16436,7 @@ function normalizeOptionalPositiveInteger(value, name) {
 }
 function assertNotBinary(buffer) {
   if (buffer.includes(0)) {
-    throw createGbkError("GBK_BINARY_FILE", "\u7591\u4F3C\u4E8C\u8FDB\u5236\u6587\u4EF6\uFF0C\u65E0\u6CD5\u6309 GBK \u6587\u672C\u5904\u7406");
+    throw createGbkError("GBK_BINARY_FILE", "\u7591\u4F3C\u4E8C\u8FDB\u5236\u6587\u4EF6\uFF0C\u65E0\u6CD5\uFFFD\uFFFD? GBK \u6587\u672C\u5904\u7406");
   }
 }
 function detectNewlineStyle(text) {
@@ -16517,14 +16517,14 @@ function applyAnchors(text, startAnchor, endAnchor) {
   if (startAnchor) {
     const found = text.indexOf(startAnchor);
     if (found === -1) {
-      throw createGbkError("GBK_NO_MATCH", `\u672A\u627E\u5230\u8D77\u59CB\u951A\u70B9: ${startAnchor}`);
+      throw createGbkError("GBK_NO_MATCH", `\u672A\u627E\u5230\u8D77\u59CB\u951A\uFFFD\uFFFD?: ${startAnchor}`);
     }
     rangeStart = found + startAnchor.length;
   }
   if (endAnchor) {
     const found = text.indexOf(endAnchor, rangeStart);
     if (found === -1) {
-      throw createGbkError("GBK_NO_MATCH", `\u672A\u627E\u5230\u7ED3\u675F\u951A\u70B9: ${endAnchor}`);
+      throw createGbkError("GBK_NO_MATCH", `\u672A\u627E\u5230\u7ED3\u675F\u951A\uFFFD\uFFFD?: ${endAnchor}`);
     }
     rangeEnd = found;
   }
@@ -16577,9 +16577,9 @@ function getNearestContext(content, oldString) {
 }
 function buildNoMatchMessage(content, oldString) {
   return [
-    "\u672A\u627E\u5230\u9700\u8981\u66FF\u6362\u7684\u6587\u672C\u3002",
-    "oldString \u5FC5\u987B\u4E0E\u6587\u4EF6\u5B9E\u9645\u5185\u5BB9\u5B8C\u5168\u5BF9\u5E94\uFF0C\u6216\u4EC5\u5728\u6362\u884C/\u5C3E\u968F\u7A7A\u884C\u4E0A\u5B58\u5728\u8F7B\u5FAE\u5DEE\u5F02\u3002",
-    "\u6700\u63A5\u8FD1\u7684\u4E0A\u4E0B\u6587\uFF1A",
+    "\u672A\u627E\u5230\u9700\u8981\u66FF\u6362\u7684\u6587\u672C\uFFFD\uFFFD?",
+    "oldString \u5FC5\u987B\u4E0E\u6587\u4EF6\u5B9E\u9645\u5185\u5BB9\u5B8C\u5168\u5BF9\u5E94\uFF0C\u6216\u4EC5\u5728\u6362\uFFFD\uFFFD?/\u5C3E\u968F\u7A7A\u884C\u4E0A\u5B58\u5728\u8F7B\u5FAE\u5DEE\u5F02\uFFFD\uFFFD?",
+    "\u6700\u63A5\u8FD1\u7684\u4E0A\u4E0B\u6587\uFFFD\uFFFD?",
     getNearestContext(content, oldString)
   ].join("\n");
 }
@@ -16636,6 +16636,8 @@ function matchLooseBlock(contentLines, oldLines, newLines, newlineStyle, content
       break;
     }
     if (oldIndex === oldLines.length) {
+      const matchedLines = contentLines.slice(start, contentIndex);
+      const matchedOriginal = matchedLines.join("\n");
       const replacedNormalized = [
         ...contentLines.slice(0, start),
         ...newLines,
@@ -16643,6 +16645,7 @@ function matchLooseBlock(contentLines, oldLines, newLines, newlineStyle, content
       ].join("\n");
       return {
         occurrencesBefore: 1,
+        matchedOriginal,
         content: newlineStyle === "crlf" ? replacedNormalized.replace(/\n/g, "\r\n") : replacedNormalized
       };
     }
@@ -16699,10 +16702,10 @@ async function resolveReadableGbkFile(input) {
   try {
     stat = await fs2.stat(candidatePath);
   } catch (error45) {
-    throw createGbkError("GBK_FILE_NOT_FOUND", `\u6587\u4EF6\u4E0D\u5B58\u5728: ${candidatePath}`, error45);
+    throw createGbkError("GBK_FILE_NOT_FOUND", `\u6587\u4EF6\u4E0D\u5B58\uFFFD\uFFFD?: ${candidatePath}`, error45);
   }
   if (stat.isDirectory()) {
-    throw createGbkError("GBK_IS_DIRECTORY", `\u76EE\u6807\u8DEF\u5F84\u662F\u76EE\u5F55: ${candidatePath}`);
+    throw createGbkError("GBK_IS_DIRECTORY", `\u76EE\u6807\u8DEF\u5F84\u662F\u76EE\uFFFD\uFFFD?: ${candidatePath}`);
   }
   return {
     filePath: candidatePath,
@@ -16899,7 +16902,7 @@ function replaceScopedTextContent(scopeText, oldString, newString, replaceAll, n
   } else if (occurrencesBefore === 0) {
     throw createGbkError("GBK_NO_MATCH", buildNoMatchMessage(scopeText, oldString));
   } else if (occurrencesBefore > 1) {
-    throw createGbkError("GBK_MULTIPLE_MATCHES", `\u627E\u5230\u591A\u4E2A\u5339\u914D\u9879: ${oldString}`);
+    throw createGbkError("GBK_MULTIPLE_MATCHES", `\u627E\u5230\u591A\u4E2A\u5339\u914D\uFFFD\uFFFD?: ${oldString}`);
   }
   const alignedNewString = alignTextToNewlineStyle(newString, newlineStyle);
   return {
@@ -17004,7 +17007,7 @@ async function replaceLargeGbkFileByAnchor(input) {
         const alreadyExists = input.mode === "insertAfter" ? after.startsWith(alignedContent) : before.endsWith(alignedContent);
         if (alreadyExists) {
           if (input.ifExists === "error") {
-            throw createGbkError("GBK_INVALID_ARGUMENT", "\u63D2\u5165\u4F4D\u7F6E\u5DF2\u5B58\u5728\u76F8\u540C\u5185\u5BB9");
+            throw createGbkError("GBK_INVALID_ARGUMENT", "\u63D2\u5165\u4F4D\u7F6E\u5DF2\u5B58\u5728\u76F8\u540C\u5185\uFFFD\uFFFD?");
           }
           if (input.ifExists === "skip") {
             skipped = true;
@@ -17051,7 +17054,7 @@ async function replaceLargeGbkFileByAnchor(input) {
         const alreadyExists = input.mode === "insertAfter" ? after.startsWith(alignedContent) : before.endsWith(alignedContent);
         if (alreadyExists) {
           if (input.ifExists === "error") {
-            throw createGbkError("GBK_INVALID_ARGUMENT", "\u63D2\u5165\u4F4D\u7F6E\u5DF2\u5B58\u5728\u76F8\u540C\u5185\u5BB9");
+            throw createGbkError("GBK_INVALID_ARGUMENT", "\u63D2\u5165\u4F4D\u7F6E\u5DF2\u5B58\u5728\u76F8\u540C\u5185\uFFFD\uFFFD?");
           }
           if (input.ifExists === "skip") {
             skipped = true;
@@ -17065,10 +17068,10 @@ async function replaceLargeGbkFileByAnchor(input) {
       }
     }
     if (!inserted && totalMatches === 0) {
-      throw createGbkError("GBK_NO_MATCH", `\u672A\u627E\u5230\u951A\u70B9: ${input.anchor}`);
+      throw createGbkError("GBK_NO_MATCH", `\u672A\u627E\u5230\u951A\uFFFD\uFFFD?: ${input.anchor}`);
     }
     if (!inserted && totalMatches > 0) {
-      throw createGbkError("GBK_NO_MATCH", `\u951A\u70B9 ${input.anchor} \u53EA\u627E\u5230 ${totalMatches} \u5904\uFF0C\u65E0\u6CD5\u4F7F\u7528\u7B2C ${input.occurrence} \u5904`);
+      throw createGbkError("GBK_NO_MATCH", `\u951A\u70B9 ${input.anchor} \u53EA\u627E\uFFFD\uFFFD? ${totalMatches} \u5904\uFF0C\u65E0\u6CD5\u4F7F\u7528\uFFFD\uFFFD? ${input.occurrence} \u5904`);
     }
     await finalizeInserted();
     await handle.close();
@@ -17131,10 +17134,10 @@ async function replaceLargeGbkFileText(input) {
     });
     await flushText("", true);
     if (occurrencesBefore === 0) {
-      throw createGbkError("GBK_NO_MATCH", `\u672A\u627E\u5230\u8981\u66FF\u6362\u7684\u5185\u5BB9: ${input.oldString}`);
+      throw createGbkError("GBK_NO_MATCH", `\u672A\u627E\u5230\u8981\u66FF\u6362\u7684\u5185\uFFFD\uFFFD?: ${input.oldString}`);
     }
     if (!input.replaceAll && occurrencesBefore > 1) {
-      throw createGbkError("GBK_MULTIPLE_MATCHES", `\u627E\u5230\u591A\u4E2A\u5339\u914D\u9879: ${input.oldString}`);
+      throw createGbkError("GBK_MULTIPLE_MATCHES", `\u627E\u5230\u591A\u4E2A\u5339\u914D\uFFFD\uFFFD?: ${input.oldString}`);
     }
     await handle.close();
     const mode = typeof input.stat.mode === "bigint" ? Number(input.stat.mode) : input.stat.mode;
@@ -17272,7 +17275,7 @@ async function replaceGbkFileText(input) {
         occurrencesBefore: loose.occurrencesBefore,
         bytesRead: current.bytesRead,
         bytesWritten: buffer2.byteLength,
-        diffPreview: buildGbkLineDiffPreview(current.filePath, current.encoding, effectiveOldString, input.newString ?? "")
+        diffPreview: buildGbkLineDiffPreview(current.filePath, current.encoding, loose.matchedOriginal, input.newString ?? "")
       };
     }
   }
@@ -17283,7 +17286,7 @@ async function replaceGbkFileText(input) {
   } else if (occurrencesBefore === 0) {
     throw createGbkError("GBK_NO_MATCH", buildNoMatchMessage(scope.selectedText, effectiveOldString));
   } else if (occurrencesBefore > 1) {
-    throw createGbkError("GBK_MULTIPLE_MATCHES", `\u627E\u5230\u591A\u4E2A\u5339\u914D\u9879: ${effectiveOldString}`);
+    throw createGbkError("GBK_MULTIPLE_MATCHES", `\u627E\u5230\u591A\u4E2A\u5339\u914D\uFFFD\uFFFD?: ${effectiveOldString}`);
   }
   const fileNewlineStyle = detectNewlineStyle(current.content);
   const alignedNewString = fileNewlineStyle === "crlf" ? input.newString.replace(/\r\n/g, "\n").replace(/\n/g, "\r\n") : fileNewlineStyle === "lf" ? input.newString.replace(/\r\n/g, "\n") : input.newString;
@@ -17374,7 +17377,8 @@ Insert mode:
         diffPreview
       }
     });
-    return JSON.stringify({ ...result, diffPreview: diffPreview || void 0 }, null, 2);
+    if (diffPreview) return diffPreview;
+    return JSON.stringify(result, null, 2);
   }
 });
 export {

package/dist/opencode-tools/gbk_read.js

@@ -16329,7 +16329,7 @@ function normalizeOptionalPositiveInteger(value, name) {
 }
 function assertNotBinary(buffer) {
   if (buffer.includes(0)) {
-    throw createGbkError("GBK_BINARY_FILE", "\u7591\u4F3C\u4E8C\u8FDB\u5236\u6587\u4EF6\uFF0C\u65E0\u6CD5\u6309 GBK \u6587\u672C\u5904\u7406");
+    throw createGbkError("GBK_BINARY_FILE", "\u7591\u4F3C\u4E8C\u8FDB\u5236\u6587\u4EF6\uFF0C\u65E0\u6CD5\uFFFD\uFFFD? GBK \u6587\u672C\u5904\u7406");
   }
 }
 function splitLinesWithNumbers(text, offset = 1, limit = 2e3) {
@@ -16420,10 +16420,10 @@ async function resolveReadableGbkFile(input) {
   try {
     stat = await fs2.stat(candidatePath);
   } catch (error45) {
-    throw createGbkError("GBK_FILE_NOT_FOUND", `\u6587\u4EF6\u4E0D\u5B58\u5728: ${candidatePath}`, error45);
+    throw createGbkError("GBK_FILE_NOT_FOUND", `\u6587\u4EF6\u4E0D\u5B58\uFFFD\uFFFD?: ${candidatePath}`, error45);
   }
   if (stat.isDirectory()) {
-    throw createGbkError("GBK_IS_DIRECTORY", `\u76EE\u6807\u8DEF\u5F84\u662F\u76EE\u5F55: ${candidatePath}`);
+    throw createGbkError("GBK_IS_DIRECTORY", `\u76EE\u6807\u8DEF\u5F84\u662F\u76EE\uFFFD\uFFFD?: ${candidatePath}`);
   }
   return {
     filePath: candidatePath,

package/dist/opencode-tools/gbk_search.js

@@ -16313,7 +16313,7 @@ function assertEncodingSupported(encoding) {
 }
 function assertNotBinary(buffer) {
   if (buffer.includes(0)) {
-    throw createGbkError("GBK_BINARY_FILE", "\u7591\u4F3C\u4E8C\u8FDB\u5236\u6587\u4EF6\uFF0C\u65E0\u6CD5\u6309 GBK \u6587\u672C\u5904\u7406");
+    throw createGbkError("GBK_BINARY_FILE", "\u7591\u4F3C\u4E8C\u8FDB\u5236\u6587\u4EF6\uFF0C\u65E0\u6CD5\uFFFD\uFFFD? GBK \u6587\u672C\u5904\u7406");
   }
 }
 async function resolveReadableGbkFile(input) {
@@ -16324,10 +16324,10 @@ async function resolveReadableGbkFile(input) {
   try {
     stat = await fs2.stat(candidatePath);
   } catch (error45) {
-    throw createGbkError("GBK_FILE_NOT_FOUND", `\u6587\u4EF6\u4E0D\u5B58\u5728: ${candidatePath}`, error45);
+    throw createGbkError("GBK_FILE_NOT_FOUND", `\u6587\u4EF6\u4E0D\u5B58\uFFFD\uFFFD?: ${candidatePath}`, error45);
   }
   if (stat.isDirectory()) {
-    throw createGbkError("GBK_IS_DIRECTORY", `\u76EE\u6807\u8DEF\u5F84\u662F\u76EE\u5F55: ${candidatePath}`);
+    throw createGbkError("GBK_IS_DIRECTORY", `\u76EE\u6807\u8DEF\u5F84\u662F\u76EE\uFFFD\uFFFD?: ${candidatePath}`);
   }
   return {
     filePath: candidatePath,

package/dist/opencode-tools/gbk_write.js

@@ -16370,10 +16370,10 @@ async function writeGbkFile(input) {
   try {
     const stat = await fs2.stat(candidatePath);
     if (stat.isDirectory()) {
-      throw createGbkError("GBK_IS_DIRECTORY", `\u76EE\u6807\u8DEF\u5F84\u662F\u76EE\u5F55: ${candidatePath}`);
+      throw createGbkError("GBK_IS_DIRECTORY", `\u76EE\u6807\u8DEF\u5F84\u662F\u76EE\uFFFD\uFFFD?: ${candidatePath}`);
     }
     if (!overwrite) {
-      throw createGbkError("GBK_FILE_EXISTS", `\u76EE\u6807\u6587\u4EF6\u5DF2\u5B58\u5728: ${candidatePath}`);
+      throw createGbkError("GBK_FILE_EXISTS", `\u76EE\u6807\u6587\u4EF6\u5DF2\u5B58\uFFFD\uFFFD?: ${candidatePath}`);
     }
   } catch (error45) {
     if (error45 instanceof Error && "code" in error45) {

package/dist/opencode-tools/text_edit.js

@@ -16603,7 +16603,7 @@ function buildLineDiffPreview(filePath, encoding, beforeText, afterText) {
       lines.push(`${ANSI_GREEN}+${after}${ANSI_RESET}`);
     }
   }
-  return lines.join("\n");
+  return "\n" + lines.join("\n");
 }
 function buildInsertOutput(text, mode, anchor, content, occurrence, ifExists, newlineStyle) {
   const alignedContent = alignTextToNewlineStyle(content, newlineStyle);
@@ -17034,7 +17034,8 @@ var text_edit_default = tool({
         diffPreview
       }
     });
-    return JSON.stringify({ ...result, diffPreview: diffPreview || void 0 }, null, 2);
+    if (diffPreview) return diffPreview;
+    return JSON.stringify(result, null, 2);
   }
 });
 export {

package/dist/plugin/index.js

@@ -16334,7 +16334,7 @@ function buildGbkLineDiffPreview(filePath, encoding, beforeText, afterText) {
       lines.push(`${ANSI_GREEN}+${after}${ANSI_RESET}`);
     }
   }
-  return lines.join("\n");
+  return "\n" + lines.join("\n");
 }
 function toSafeNumber(value) {
   return typeof value === "bigint" ? Number(value) : value;
@@ -16358,10 +16358,10 @@ function assertInsertArguments(input) {
     throw createGbkError("GBK_INVALID_ARGUMENT", "content \u4E0D\u80FD\u4E3A\u7A7A");
   }
   if (input.replaceAll !== void 0) {
-    throw createGbkError("GBK_INVALID_ARGUMENT", "\u63D2\u5165\u6A21\u5F0F\u4E0D\u652F\u6301 replaceAll");
+    throw createGbkError("GBK_INVALID_ARGUMENT", "\u63D2\u5165\u6A21\u5F0F\u4E0D\u652F\uFFFD\uFFFD? replaceAll");
   }
   if (input.startLine !== void 0 || input.endLine !== void 0 || input.startAnchor !== void 0 || input.endAnchor !== void 0) {
-    throw createGbkError("GBK_INVALID_ARGUMENT", "\u63D2\u5165\u6A21\u5F0F\u4E0D\u652F\u6301 startLine/endLine/startAnchor/endAnchor");
+    throw createGbkError("GBK_INVALID_ARGUMENT", "\u63D2\u5165\u6A21\u5F0F\u4E0D\u652F\uFFFD\uFFFD? startLine/endLine/startAnchor/endAnchor");
   }
 }
 function findOccurrenceIndex(text, token, occurrence) {
@@ -16385,9 +16385,9 @@ function findOccurrenceIndex(text, token, occurrence) {
     searchFrom = index + token.length;
   }
   if (count === 0) {
-    throw createGbkError("GBK_NO_MATCH", `\u672A\u627E\u5230\u951A\u70B9: ${token}`);
+    throw createGbkError("GBK_NO_MATCH", `\u672A\u627E\u5230\u951A\uFFFD\uFFFD?: ${token}`);
   }
-  throw createGbkError("GBK_NO_MATCH", `\u951A\u70B9 ${token} \u53EA\u627E\u5230 ${count} \u5904\uFF0C\u65E0\u6CD5\u4F7F\u7528\u7B2C ${occurrence} \u5904`);
+  throw createGbkError("GBK_NO_MATCH", `\u951A\u70B9 ${token} \u53EA\u627E\uFFFD\uFFFD? ${count} \u5904\uFF0C\u65E0\u6CD5\u4F7F\u7528\uFFFD\uFFFD? ${occurrence} \u5904`);
 }
 function insertByAnchor(text, mode, anchor, content, occurrence, ifExists, newlineStyle) {
   const alignedContent = newlineStyle === "crlf" ? content.replace(/\r\n/g, "\n").replace(/\n/g, "\r\n") : newlineStyle === "lf" ? content.replace(/\r\n/g, "\n") : content;
@@ -16396,7 +16396,7 @@ function insertByAnchor(text, mode, anchor, content, occurrence, ifExists, newli
   const alreadyExists = mode === "insertAfter" ? text.slice(insertionPoint, insertionPoint + alignedContent.length) === alignedContent : text.slice(Math.max(0, insertionPoint - alignedContent.length), insertionPoint) === alignedContent;
   if (alreadyExists) {
     if (ifExists === "error") {
-      throw createGbkError("GBK_INVALID_ARGUMENT", "\u63D2\u5165\u4F4D\u7F6E\u5DF2\u5B58\u5728\u76F8\u540C\u5185\u5BB9");
+      throw createGbkError("GBK_INVALID_ARGUMENT", "\u63D2\u5165\u4F4D\u7F6E\u5DF2\u5B58\u5728\u76F8\u540C\u5185\uFFFD\uFFFD?");
     }
     if (ifExists === "skip") {
       return {
@@ -16437,7 +16437,7 @@ function normalizeOptionalPositiveInteger(value, name) {
 }
 function assertNotBinary(buffer) {
   if (buffer.includes(0)) {
-    throw createGbkError("GBK_BINARY_FILE", "\u7591\u4F3C\u4E8C\u8FDB\u5236\u6587\u4EF6\uFF0C\u65E0\u6CD5\u6309 GBK \u6587\u672C\u5904\u7406");
+    throw createGbkError("GBK_BINARY_FILE", "\u7591\u4F3C\u4E8C\u8FDB\u5236\u6587\u4EF6\uFF0C\u65E0\u6CD5\uFFFD\uFFFD? GBK \u6587\u672C\u5904\u7406");
   }
 }
 function splitLinesWithNumbers(text, offset = 1, limit = 2e3) {
@@ -16567,14 +16567,14 @@ function applyAnchors(text, startAnchor, endAnchor) {
   if (startAnchor) {
     const found = text.indexOf(startAnchor);
     if (found === -1) {
-      throw createGbkError("GBK_NO_MATCH", `\u672A\u627E\u5230\u8D77\u59CB\u951A\u70B9: ${startAnchor}`);
+      throw createGbkError("GBK_NO_MATCH", `\u672A\u627E\u5230\u8D77\u59CB\u951A\uFFFD\uFFFD?: ${startAnchor}`);
     }
     rangeStart = found + startAnchor.length;
   }
   if (endAnchor) {
     const found = text.indexOf(endAnchor, rangeStart);
     if (found === -1) {
-      throw createGbkError("GBK_NO_MATCH", `\u672A\u627E\u5230\u7ED3\u675F\u951A\u70B9: ${endAnchor}`);
+      throw createGbkError("GBK_NO_MATCH", `\u672A\u627E\u5230\u7ED3\u675F\u951A\uFFFD\uFFFD?: ${endAnchor}`);
     }
     rangeEnd = found;
   }
@@ -16627,9 +16627,9 @@ function getNearestContext(content, oldString) {
 }
 function buildNoMatchMessage(content, oldString) {
   return [
-    "\u672A\u627E\u5230\u9700\u8981\u66FF\u6362\u7684\u6587\u672C\u3002",
-    "oldString \u5FC5\u987B\u4E0E\u6587\u4EF6\u5B9E\u9645\u5185\u5BB9\u5B8C\u5168\u5BF9\u5E94\uFF0C\u6216\u4EC5\u5728\u6362\u884C/\u5C3E\u968F\u7A7A\u884C\u4E0A\u5B58\u5728\u8F7B\u5FAE\u5DEE\u5F02\u3002",
-    "\u6700\u63A5\u8FD1\u7684\u4E0A\u4E0B\u6587\uFF1A",
+    "\u672A\u627E\u5230\u9700\u8981\u66FF\u6362\u7684\u6587\u672C\uFFFD\uFFFD?",
+    "oldString \u5FC5\u987B\u4E0E\u6587\u4EF6\u5B9E\u9645\u5185\u5BB9\u5B8C\u5168\u5BF9\u5E94\uFF0C\u6216\u4EC5\u5728\u6362\uFFFD\uFFFD?/\u5C3E\u968F\u7A7A\u884C\u4E0A\u5B58\u5728\u8F7B\u5FAE\u5DEE\u5F02\uFFFD\uFFFD?",
+    "\u6700\u63A5\u8FD1\u7684\u4E0A\u4E0B\u6587\uFFFD\uFFFD?",
     getNearestContext(content, oldString)
   ].join("\n");
 }
@@ -16686,6 +16686,8 @@ function matchLooseBlock(contentLines, oldLines, newLines, newlineStyle, content
       break;
     }
     if (oldIndex === oldLines.length) {
+      const matchedLines = contentLines.slice(start, contentIndex);
+      const matchedOriginal = matchedLines.join("\n");
       const replacedNormalized = [
         ...contentLines.slice(0, start),
         ...newLines,
@@ -16693,6 +16695,7 @@ function matchLooseBlock(contentLines, oldLines, newLines, newlineStyle, content
       ].join("\n");
       return {
         occurrencesBefore: 1,
+        matchedOriginal,
         content: newlineStyle === "crlf" ? replacedNormalized.replace(/\n/g, "\r\n") : replacedNormalized
       };
     }
@@ -16749,10 +16752,10 @@ async function resolveReadableGbkFile(input) {
   try {
     stat = await fs2.stat(candidatePath);
   } catch (error45) {
-    throw createGbkError("GBK_FILE_NOT_FOUND", `\u6587\u4EF6\u4E0D\u5B58\u5728: ${candidatePath}`, error45);
+    throw createGbkError("GBK_FILE_NOT_FOUND", `\u6587\u4EF6\u4E0D\u5B58\uFFFD\uFFFD?: ${candidatePath}`, error45);
   }
   if (stat.isDirectory()) {
-    throw createGbkError("GBK_IS_DIRECTORY", `\u76EE\u6807\u8DEF\u5F84\u662F\u76EE\u5F55: ${candidatePath}`);
+    throw createGbkError("GBK_IS_DIRECTORY", `\u76EE\u6807\u8DEF\u5F84\u662F\u76EE\uFFFD\uFFFD?: ${candidatePath}`);
   }
   return {
     filePath: candidatePath,
@@ -16957,7 +16960,7 @@ function replaceScopedTextContent(scopeText, oldString, newString, replaceAll, n
   } else if (occurrencesBefore === 0) {
     throw createGbkError("GBK_NO_MATCH", buildNoMatchMessage(scopeText, oldString));
   } else if (occurrencesBefore > 1) {
-    throw createGbkError("GBK_MULTIPLE_MATCHES", `\u627E\u5230\u591A\u4E2A\u5339\u914D\u9879: ${oldString}`);
+    throw createGbkError("GBK_MULTIPLE_MATCHES", `\u627E\u5230\u591A\u4E2A\u5339\u914D\uFFFD\uFFFD?: ${oldString}`);
   }
   const alignedNewString = alignTextToNewlineStyle(newString, newlineStyle);
   return {
@@ -17062,7 +17065,7 @@ async function replaceLargeGbkFileByAnchor(input) {
         const alreadyExists = input.mode === "insertAfter" ? after.startsWith(alignedContent) : before.endsWith(alignedContent);
         if (alreadyExists) {
           if (input.ifExists === "error") {
-            throw createGbkError("GBK_INVALID_ARGUMENT", "\u63D2\u5165\u4F4D\u7F6E\u5DF2\u5B58\u5728\u76F8\u540C\u5185\u5BB9");
+            throw createGbkError("GBK_INVALID_ARGUMENT", "\u63D2\u5165\u4F4D\u7F6E\u5DF2\u5B58\u5728\u76F8\u540C\u5185\uFFFD\uFFFD?");
           }
           if (input.ifExists === "skip") {
             skipped = true;
@@ -17109,7 +17112,7 @@ async function replaceLargeGbkFileByAnchor(input) {
         const alreadyExists = input.mode === "insertAfter" ? after.startsWith(alignedContent) : before.endsWith(alignedContent);
         if (alreadyExists) {
           if (input.ifExists === "error") {
-            throw createGbkError("GBK_INVALID_ARGUMENT", "\u63D2\u5165\u4F4D\u7F6E\u5DF2\u5B58\u5728\u76F8\u540C\u5185\u5BB9");
+            throw createGbkError("GBK_INVALID_ARGUMENT", "\u63D2\u5165\u4F4D\u7F6E\u5DF2\u5B58\u5728\u76F8\u540C\u5185\uFFFD\uFFFD?");
           }
           if (input.ifExists === "skip") {
             skipped = true;
@@ -17123,10 +17126,10 @@ async function replaceLargeGbkFileByAnchor(input) {
       }
     }
     if (!inserted && totalMatches === 0) {
-      throw createGbkError("GBK_NO_MATCH", `\u672A\u627E\u5230\u951A\u70B9: ${input.anchor}`);
+      throw createGbkError("GBK_NO_MATCH", `\u672A\u627E\u5230\u951A\uFFFD\uFFFD?: ${input.anchor}`);
     }
     if (!inserted && totalMatches > 0) {
-      throw createGbkError("GBK_NO_MATCH", `\u951A\u70B9 ${input.anchor} \u53EA\u627E\u5230 ${totalMatches} \u5904\uFF0C\u65E0\u6CD5\u4F7F\u7528\u7B2C ${input.occurrence} \u5904`);
+      throw createGbkError("GBK_NO_MATCH", `\u951A\u70B9 ${input.anchor} \u53EA\u627E\uFFFD\uFFFD? ${totalMatches} \u5904\uFF0C\u65E0\u6CD5\u4F7F\u7528\uFFFD\uFFFD? ${input.occurrence} \u5904`);
     }
     await finalizeInserted();
     await handle.close();
@@ -17189,10 +17192,10 @@ async function replaceLargeGbkFileText(input) {
     });
     await flushText("", true);
     if (occurrencesBefore === 0) {
-      throw createGbkError("GBK_NO_MATCH", `\u672A\u627E\u5230\u8981\u66FF\u6362\u7684\u5185\u5BB9: ${input.oldString}`);
+      throw createGbkError("GBK_NO_MATCH", `\u672A\u627E\u5230\u8981\u66FF\u6362\u7684\u5185\uFFFD\uFFFD?: ${input.oldString}`);
     }
     if (!input.replaceAll && occurrencesBefore > 1) {
-      throw createGbkError("GBK_MULTIPLE_MATCHES", `\u627E\u5230\u591A\u4E2A\u5339\u914D\u9879: ${input.oldString}`);
+      throw createGbkError("GBK_MULTIPLE_MATCHES", `\u627E\u5230\u591A\u4E2A\u5339\u914D\uFFFD\uFFFD?: ${input.oldString}`);
     }
     await handle.close();
     const mode = typeof input.stat.mode === "bigint" ? Number(input.stat.mode) : input.stat.mode;
@@ -17407,7 +17410,7 @@ async function replaceGbkFileText(input) {
         occurrencesBefore: loose.occurrencesBefore,
         bytesRead: current.bytesRead,
         bytesWritten: buffer2.byteLength,
-        diffPreview: buildGbkLineDiffPreview(current.filePath, current.encoding, effectiveOldString, input.newString ?? "")
+        diffPreview: buildGbkLineDiffPreview(current.filePath, current.encoding, loose.matchedOriginal, input.newString ?? "")
       };
     }
   }
@@ -17418,7 +17421,7 @@ async function replaceGbkFileText(input) {
   } else if (occurrencesBefore === 0) {
     throw createGbkError("GBK_NO_MATCH", buildNoMatchMessage(scope.selectedText, effectiveOldString));
   } else if (occurrencesBefore > 1) {
-    throw createGbkError("GBK_MULTIPLE_MATCHES", `\u627E\u5230\u591A\u4E2A\u5339\u914D\u9879: ${effectiveOldString}`);
+    throw createGbkError("GBK_MULTIPLE_MATCHES", `\u627E\u5230\u591A\u4E2A\u5339\u914D\uFFFD\uFFFD?: ${effectiveOldString}`);
   }
   const fileNewlineStyle = detectNewlineStyle(current.content);
   const alignedNewString = fileNewlineStyle === "crlf" ? input.newString.replace(/\r\n/g, "\n").replace(/\n/g, "\r\n") : fileNewlineStyle === "lf" ? input.newString.replace(/\r\n/g, "\n") : input.newString;
@@ -17551,10 +17554,10 @@ async function writeGbkFile(input) {
   try {
     const stat = await fs2.stat(candidatePath);
     if (stat.isDirectory()) {
-      throw createGbkError("GBK_IS_DIRECTORY", `\u76EE\u6807\u8DEF\u5F84\u662F\u76EE\u5F55: ${candidatePath}`);
+      throw createGbkError("GBK_IS_DIRECTORY", `\u76EE\u6807\u8DEF\u5F84\u662F\u76EE\uFFFD\uFFFD?: ${candidatePath}`);
     }
     if (!overwrite) {
-      throw createGbkError("GBK_FILE_EXISTS", `\u76EE\u6807\u6587\u4EF6\u5DF2\u5B58\u5728: ${candidatePath}`);
+      throw createGbkError("GBK_FILE_EXISTS", `\u76EE\u6807\u6587\u4EF6\u5DF2\u5B58\uFFFD\uFFFD?: ${candidatePath}`);
     }
   } catch (error45) {
     if (error45 instanceof Error && "code" in error45) {
@@ -17670,7 +17673,8 @@ Insert mode:
         diffPreview
       }
     });
-    return JSON.stringify({ ...result, diffPreview: diffPreview || void 0 }, null, 2);
+    if (diffPreview) return diffPreview;
+    return JSON.stringify(result, null, 2);
   }
 });
 
@@ -18077,7 +18081,7 @@ function buildLineDiffPreview(filePath, encoding, beforeText, afterText) {
       lines.push(`${ANSI_GREEN2}+${after}${ANSI_RESET2}`);
     }
   }
-  return lines.join("\n");
+  return "\n" + lines.join("\n");
 }
 function buildInsertOutput(text, mode, anchor, content, occurrence, ifExists, newlineStyle) {
   const alignedContent = alignTextToNewlineStyle2(content, newlineStyle);
@@ -18779,7 +18783,8 @@ var text_edit_default = tool({
         diffPreview
       }
     });
-    return JSON.stringify({ ...result, diffPreview: diffPreview || void 0 }, null, 2);
+    if (diffPreview) return diffPreview;
+    return JSON.stringify(result, null, 2);
   }
 });
 

package/dist/plugins/opencode-gbk-tools.js

@@ -16334,7 +16334,7 @@ function buildGbkLineDiffPreview(filePath, encoding, beforeText, afterText) {
       lines.push(`${ANSI_GREEN}+${after}${ANSI_RESET}`);
     }
   }
-  return lines.join("\n");
+  return "\n" + lines.join("\n");
 }
 function toSafeNumber(value) {
   return typeof value === "bigint" ? Number(value) : value;
@@ -16358,10 +16358,10 @@ function assertInsertArguments(input) {
     throw createGbkError("GBK_INVALID_ARGUMENT", "content \u4E0D\u80FD\u4E3A\u7A7A");
   }
   if (input.replaceAll !== void 0) {
-    throw createGbkError("GBK_INVALID_ARGUMENT", "\u63D2\u5165\u6A21\u5F0F\u4E0D\u652F\u6301 replaceAll");
+    throw createGbkError("GBK_INVALID_ARGUMENT", "\u63D2\u5165\u6A21\u5F0F\u4E0D\u652F\uFFFD\uFFFD? replaceAll");
   }
   if (input.startLine !== void 0 || input.endLine !== void 0 || input.startAnchor !== void 0 || input.endAnchor !== void 0) {
-    throw createGbkError("GBK_INVALID_ARGUMENT", "\u63D2\u5165\u6A21\u5F0F\u4E0D\u652F\u6301 startLine/endLine/startAnchor/endAnchor");
+    throw createGbkError("GBK_INVALID_ARGUMENT", "\u63D2\u5165\u6A21\u5F0F\u4E0D\u652F\uFFFD\uFFFD? startLine/endLine/startAnchor/endAnchor");
   }
 }
 function findOccurrenceIndex(text, token, occurrence) {
@@ -16385,9 +16385,9 @@ function findOccurrenceIndex(text, token, occurrence) {
     searchFrom = index + token.length;
   }
   if (count === 0) {
-    throw createGbkError("GBK_NO_MATCH", `\u672A\u627E\u5230\u951A\u70B9: ${token}`);
+    throw createGbkError("GBK_NO_MATCH", `\u672A\u627E\u5230\u951A\uFFFD\uFFFD?: ${token}`);
   }
-  throw createGbkError("GBK_NO_MATCH", `\u951A\u70B9 ${token} \u53EA\u627E\u5230 ${count} \u5904\uFF0C\u65E0\u6CD5\u4F7F\u7528\u7B2C ${occurrence} \u5904`);
+  throw createGbkError("GBK_NO_MATCH", `\u951A\u70B9 ${token} \u53EA\u627E\uFFFD\uFFFD? ${count} \u5904\uFF0C\u65E0\u6CD5\u4F7F\u7528\uFFFD\uFFFD? ${occurrence} \u5904`);
 }
 function insertByAnchor(text, mode, anchor, content, occurrence, ifExists, newlineStyle) {
   const alignedContent = newlineStyle === "crlf" ? content.replace(/\r\n/g, "\n").replace(/\n/g, "\r\n") : newlineStyle === "lf" ? content.replace(/\r\n/g, "\n") : content;
@@ -16396,7 +16396,7 @@ function insertByAnchor(text, mode, anchor, content, occurrence, ifExists, newli
   const alreadyExists = mode === "insertAfter" ? text.slice(insertionPoint, insertionPoint + alignedContent.length) === alignedContent : text.slice(Math.max(0, insertionPoint - alignedContent.length), insertionPoint) === alignedContent;
   if (alreadyExists) {
     if (ifExists === "error") {
-      throw createGbkError("GBK_INVALID_ARGUMENT", "\u63D2\u5165\u4F4D\u7F6E\u5DF2\u5B58\u5728\u76F8\u540C\u5185\u5BB9");
+      throw createGbkError("GBK_INVALID_ARGUMENT", "\u63D2\u5165\u4F4D\u7F6E\u5DF2\u5B58\u5728\u76F8\u540C\u5185\uFFFD\uFFFD?");
     }
     if (ifExists === "skip") {
       return {
@@ -16437,7 +16437,7 @@ function normalizeOptionalPositiveInteger(value, name) {
 }
 function assertNotBinary(buffer) {
   if (buffer.includes(0)) {
-    throw createGbkError("GBK_BINARY_FILE", "\u7591\u4F3C\u4E8C\u8FDB\u5236\u6587\u4EF6\uFF0C\u65E0\u6CD5\u6309 GBK \u6587\u672C\u5904\u7406");
+    throw createGbkError("GBK_BINARY_FILE", "\u7591\u4F3C\u4E8C\u8FDB\u5236\u6587\u4EF6\uFF0C\u65E0\u6CD5\uFFFD\uFFFD? GBK \u6587\u672C\u5904\u7406");
   }
 }
 function splitLinesWithNumbers(text, offset = 1, limit = 2e3) {
@@ -16567,14 +16567,14 @@ function applyAnchors(text, startAnchor, endAnchor) {
   if (startAnchor) {
     const found = text.indexOf(startAnchor);
     if (found === -1) {
-      throw createGbkError("GBK_NO_MATCH", `\u672A\u627E\u5230\u8D77\u59CB\u951A\u70B9: ${startAnchor}`);
+      throw createGbkError("GBK_NO_MATCH", `\u672A\u627E\u5230\u8D77\u59CB\u951A\uFFFD\uFFFD?: ${startAnchor}`);
     }
     rangeStart = found + startAnchor.length;
   }
   if (endAnchor) {
     const found = text.indexOf(endAnchor, rangeStart);
     if (found === -1) {
-      throw createGbkError("GBK_NO_MATCH", `\u672A\u627E\u5230\u7ED3\u675F\u951A\u70B9: ${endAnchor}`);
+      throw createGbkError("GBK_NO_MATCH", `\u672A\u627E\u5230\u7ED3\u675F\u951A\uFFFD\uFFFD?: ${endAnchor}`);
     }
     rangeEnd = found;
   }
@@ -16627,9 +16627,9 @@ function getNearestContext(content, oldString) {
 }
 function buildNoMatchMessage(content, oldString) {
   return [
-    "\u672A\u627E\u5230\u9700\u8981\u66FF\u6362\u7684\u6587\u672C\u3002",
-    "oldString \u5FC5\u987B\u4E0E\u6587\u4EF6\u5B9E\u9645\u5185\u5BB9\u5B8C\u5168\u5BF9\u5E94\uFF0C\u6216\u4EC5\u5728\u6362\u884C/\u5C3E\u968F\u7A7A\u884C\u4E0A\u5B58\u5728\u8F7B\u5FAE\u5DEE\u5F02\u3002",
-    "\u6700\u63A5\u8FD1\u7684\u4E0A\u4E0B\u6587\uFF1A",
+    "\u672A\u627E\u5230\u9700\u8981\u66FF\u6362\u7684\u6587\u672C\uFFFD\uFFFD?",
+    "oldString \u5FC5\u987B\u4E0E\u6587\u4EF6\u5B9E\u9645\u5185\u5BB9\u5B8C\u5168\u5BF9\u5E94\uFF0C\u6216\u4EC5\u5728\u6362\uFFFD\uFFFD?/\u5C3E\u968F\u7A7A\u884C\u4E0A\u5B58\u5728\u8F7B\u5FAE\u5DEE\u5F02\uFFFD\uFFFD?",
+    "\u6700\u63A5\u8FD1\u7684\u4E0A\u4E0B\u6587\uFFFD\uFFFD?",
     getNearestContext(content, oldString)
   ].join("\n");
 }
@@ -16686,6 +16686,8 @@ function matchLooseBlock(contentLines, oldLines, newLines, newlineStyle, content
       break;
     }
     if (oldIndex === oldLines.length) {
+      const matchedLines = contentLines.slice(start, contentIndex);
+      const matchedOriginal = matchedLines.join("\n");
       const replacedNormalized = [
         ...contentLines.slice(0, start),
         ...newLines,
@@ -16693,6 +16695,7 @@ function matchLooseBlock(contentLines, oldLines, newLines, newlineStyle, content
       ].join("\n");
       return {
         occurrencesBefore: 1,
+        matchedOriginal,
         content: newlineStyle === "crlf" ? replacedNormalized.replace(/\n/g, "\r\n") : replacedNormalized
       };
     }
@@ -16749,10 +16752,10 @@ async function resolveReadableGbkFile(input) {
   try {
     stat = await fs2.stat(candidatePath);
   } catch (error45) {
-    throw createGbkError("GBK_FILE_NOT_FOUND", `\u6587\u4EF6\u4E0D\u5B58\u5728: ${candidatePath}`, error45);
+    throw createGbkError("GBK_FILE_NOT_FOUND", `\u6587\u4EF6\u4E0D\u5B58\uFFFD\uFFFD?: ${candidatePath}`, error45);
   }
   if (stat.isDirectory()) {
-    throw createGbkError("GBK_IS_DIRECTORY", `\u76EE\u6807\u8DEF\u5F84\u662F\u76EE\u5F55: ${candidatePath}`);
+    throw createGbkError("GBK_IS_DIRECTORY", `\u76EE\u6807\u8DEF\u5F84\u662F\u76EE\uFFFD\uFFFD?: ${candidatePath}`);
   }
   return {
     filePath: candidatePath,
@@ -16957,7 +16960,7 @@ function replaceScopedTextContent(scopeText, oldString, newString, replaceAll, n
   } else if (occurrencesBefore === 0) {
     throw createGbkError("GBK_NO_MATCH", buildNoMatchMessage(scopeText, oldString));
   } else if (occurrencesBefore > 1) {
-    throw createGbkError("GBK_MULTIPLE_MATCHES", `\u627E\u5230\u591A\u4E2A\u5339\u914D\u9879: ${oldString}`);
+    throw createGbkError("GBK_MULTIPLE_MATCHES", `\u627E\u5230\u591A\u4E2A\u5339\u914D\uFFFD\uFFFD?: ${oldString}`);
   }
   const alignedNewString = alignTextToNewlineStyle(newString, newlineStyle);
   return {
@@ -17062,7 +17065,7 @@ async function replaceLargeGbkFileByAnchor(input) {
         const alreadyExists = input.mode === "insertAfter" ? after.startsWith(alignedContent) : before.endsWith(alignedContent);
         if (alreadyExists) {
           if (input.ifExists === "error") {
-            throw createGbkError("GBK_INVALID_ARGUMENT", "\u63D2\u5165\u4F4D\u7F6E\u5DF2\u5B58\u5728\u76F8\u540C\u5185\u5BB9");
+            throw createGbkError("GBK_INVALID_ARGUMENT", "\u63D2\u5165\u4F4D\u7F6E\u5DF2\u5B58\u5728\u76F8\u540C\u5185\uFFFD\uFFFD?");
           }
           if (input.ifExists === "skip") {
             skipped = true;
@@ -17109,7 +17112,7 @@ async function replaceLargeGbkFileByAnchor(input) {
         const alreadyExists = input.mode === "insertAfter" ? after.startsWith(alignedContent) : before.endsWith(alignedContent);
         if (alreadyExists) {
           if (input.ifExists === "error") {
-            throw createGbkError("GBK_INVALID_ARGUMENT", "\u63D2\u5165\u4F4D\u7F6E\u5DF2\u5B58\u5728\u76F8\u540C\u5185\u5BB9");
+            throw createGbkError("GBK_INVALID_ARGUMENT", "\u63D2\u5165\u4F4D\u7F6E\u5DF2\u5B58\u5728\u76F8\u540C\u5185\uFFFD\uFFFD?");
           }
           if (input.ifExists === "skip") {
             skipped = true;
@@ -17123,10 +17126,10 @@ async function replaceLargeGbkFileByAnchor(input) {
       }
     }
     if (!inserted && totalMatches === 0) {
-      throw createGbkError("GBK_NO_MATCH", `\u672A\u627E\u5230\u951A\u70B9: ${input.anchor}`);
+      throw createGbkError("GBK_NO_MATCH", `\u672A\u627E\u5230\u951A\uFFFD\uFFFD?: ${input.anchor}`);
     }
     if (!inserted && totalMatches > 0) {
-      throw createGbkError("GBK_NO_MATCH", `\u951A\u70B9 ${input.anchor} \u53EA\u627E\u5230 ${totalMatches} \u5904\uFF0C\u65E0\u6CD5\u4F7F\u7528\u7B2C ${input.occurrence} \u5904`);
+      throw createGbkError("GBK_NO_MATCH", `\u951A\u70B9 ${input.anchor} \u53EA\u627E\uFFFD\uFFFD? ${totalMatches} \u5904\uFF0C\u65E0\u6CD5\u4F7F\u7528\uFFFD\uFFFD? ${input.occurrence} \u5904`);
     }
     await finalizeInserted();
     await handle.close();
@@ -17189,10 +17192,10 @@ async function replaceLargeGbkFileText(input) {
     });
     await flushText("", true);
     if (occurrencesBefore === 0) {
-      throw createGbkError("GBK_NO_MATCH", `\u672A\u627E\u5230\u8981\u66FF\u6362\u7684\u5185\u5BB9: ${input.oldString}`);
+      throw createGbkError("GBK_NO_MATCH", `\u672A\u627E\u5230\u8981\u66FF\u6362\u7684\u5185\uFFFD\uFFFD?: ${input.oldString}`);
     }
     if (!input.replaceAll && occurrencesBefore > 1) {
-      throw createGbkError("GBK_MULTIPLE_MATCHES", `\u627E\u5230\u591A\u4E2A\u5339\u914D\u9879: ${input.oldString}`);
+      throw createGbkError("GBK_MULTIPLE_MATCHES", `\u627E\u5230\u591A\u4E2A\u5339\u914D\uFFFD\uFFFD?: ${input.oldString}`);
     }
     await handle.close();
     const mode = typeof input.stat.mode === "bigint" ? Number(input.stat.mode) : input.stat.mode;
@@ -17407,7 +17410,7 @@ async function replaceGbkFileText(input) {
         occurrencesBefore: loose.occurrencesBefore,
         bytesRead: current.bytesRead,
         bytesWritten: buffer2.byteLength,
-        diffPreview: buildGbkLineDiffPreview(current.filePath, current.encoding, effectiveOldString, input.newString ?? "")
+        diffPreview: buildGbkLineDiffPreview(current.filePath, current.encoding, loose.matchedOriginal, input.newString ?? "")
       };
     }
   }
@@ -17418,7 +17421,7 @@ async function replaceGbkFileText(input) {
   } else if (occurrencesBefore === 0) {
     throw createGbkError("GBK_NO_MATCH", buildNoMatchMessage(scope.selectedText, effectiveOldString));
   } else if (occurrencesBefore > 1) {
-    throw createGbkError("GBK_MULTIPLE_MATCHES", `\u627E\u5230\u591A\u4E2A\u5339\u914D\u9879: ${effectiveOldString}`);
+    throw createGbkError("GBK_MULTIPLE_MATCHES", `\u627E\u5230\u591A\u4E2A\u5339\u914D\uFFFD\uFFFD?: ${effectiveOldString}`);
   }
   const fileNewlineStyle = detectNewlineStyle(current.content);
   const alignedNewString = fileNewlineStyle === "crlf" ? input.newString.replace(/\r\n/g, "\n").replace(/\n/g, "\r\n") : fileNewlineStyle === "lf" ? input.newString.replace(/\r\n/g, "\n") : input.newString;
@@ -17551,10 +17554,10 @@ async function writeGbkFile(input) {
   try {
     const stat = await fs2.stat(candidatePath);
     if (stat.isDirectory()) {
-      throw createGbkError("GBK_IS_DIRECTORY", `\u76EE\u6807\u8DEF\u5F84\u662F\u76EE\u5F55: ${candidatePath}`);
+      throw createGbkError("GBK_IS_DIRECTORY", `\u76EE\u6807\u8DEF\u5F84\u662F\u76EE\uFFFD\uFFFD?: ${candidatePath}`);
     }
     if (!overwrite) {
-      throw createGbkError("GBK_FILE_EXISTS", `\u76EE\u6807\u6587\u4EF6\u5DF2\u5B58\u5728: ${candidatePath}`);
+      throw createGbkError("GBK_FILE_EXISTS", `\u76EE\u6807\u6587\u4EF6\u5DF2\u5B58\uFFFD\uFFFD?: ${candidatePath}`);
     }
   } catch (error45) {
     if (error45 instanceof Error && "code" in error45) {
@@ -17670,7 +17673,8 @@ Insert mode:
         diffPreview
       }
     });
-    return JSON.stringify({ ...result, diffPreview: diffPreview || void 0 }, null, 2);
+    if (diffPreview) return diffPreview;
+    return JSON.stringify(result, null, 2);
   }
 });
 
@@ -18077,7 +18081,7 @@ function buildLineDiffPreview(filePath, encoding, beforeText, afterText) {
       lines.push(`${ANSI_GREEN2}+${after}${ANSI_RESET2}`);
     }
   }
-  return lines.join("\n");
+  return "\n" + lines.join("\n");
 }
 function buildInsertOutput(text, mode, anchor, content, occurrence, ifExists, newlineStyle) {
   const alignedContent = alignTextToNewlineStyle2(content, newlineStyle);
@@ -18779,7 +18783,8 @@ var text_edit_default = tool({
         diffPreview
       }
     });
-    return JSON.stringify({ ...result, diffPreview: diffPreview || void 0 }, null, 2);
+    if (diffPreview) return diffPreview;
+    return JSON.stringify(result, null, 2);
   }
 });
 

package/dist/release-manifest.json

@@ -1,12 +1,12 @@
 {
   "manifestVersion": 1,
   "packageName": "opencode-gbk-tools",
-  "packageVersion": "0.1.18",
+  "packageVersion": "0.1.19",
   "artifacts": [
     {
       "relativePath": "plugins/opencode-gbk-tools.js",
       "kind": "plugin",
-      "expectedHash": "c03ae5d53eef0adc0eb6791908c5a9c776af47f8e9e6f8191acb3a43736fa770",
+      "expectedHash": "481836ea0b68a3b872d46346cfa1bc270966d57d566b66846df882aa4885972e",
       "hashAlgorithm": "sha256"
     }
   ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-gbk-tools",
-  "version": "0.1.18",
+  "version": "0.1.21",
   "description": "Auto-encoding text tools plus GBK/GB18030 tools for OpenCode",
   "type": "module",
   "main": "./dist/plugin/index.js",