opencode-gbk-tools 0.1.6 → 0.1.7

package/dist/opencode-tools/gbk_edit.js

@@ -16457,14 +16457,14 @@ function buildNoMatchMessage(content, oldString) {
     getNearestContext(content, oldString)
   ].join("\n");
 }
-function tryLooseBlockReplace(content, oldString, newString) {
-  const normalizedContent = normalizeNewlines(content);
-  const contentLines = splitNormalizedLines(content);
-  const oldLines = trimTrailingEmptyLines(splitNormalizedLines(oldString));
-  const newLines = splitNormalizedLines(newString);
-  if (oldLines.length === 0) {
-    return null;
-  }
+function hasLineNumberPrefixes(lines) {
+  const nonEmpty = lines.filter((l) => l.trim().length > 0);
+  return nonEmpty.length > 0 && nonEmpty.every((l) => /^\d+: /.test(l));
+}
+function stripLineNumberPrefixes(lines) {
+  return lines.map((l) => l.replace(/^\d+: /, ""));
+}
+function matchLooseBlock(contentLines, oldLines, newLines, newlineStyle, content) {
   for (let start = 0; start < contentLines.length; start += 1) {
     let contentIndex = start;
     let oldIndex = 0;
@@ -16494,12 +16494,32 @@ function tryLooseBlockReplace(content, oldString, newString) {
       ].join("\n");
       return {
         occurrencesBefore: 1,
-        content: detectNewlineStyle(content) === "crlf" ? replacedNormalized.replace(/\n/g, "\r\n") : replacedNormalized
+        content: newlineStyle === "crlf" ? replacedNormalized.replace(/\n/g, "\r\n") : replacedNormalized
       };
     }
   }
   return null;
 }
+function tryLooseBlockReplace(content, oldString, newString) {
+  const contentLines = splitNormalizedLines(content);
+  const oldLines = trimTrailingEmptyLines(splitNormalizedLines(oldString));
+  const newLines = splitNormalizedLines(newString);
+  const newlineStyle = detectNewlineStyle(content);
+  if (oldLines.length === 0) {
+    return null;
+  }
+  const result = matchLooseBlock(contentLines, oldLines, newLines, newlineStyle, content);
+  if (result !== null) {
+    return result;
+  }
+  if (hasLineNumberPrefixes(oldLines)) {
+    const strippedOldLines = trimTrailingEmptyLines(stripLineNumberPrefixes(oldLines));
+    if (strippedOldLines.length > 0) {
+      return matchLooseBlock(contentLines, strippedOldLines, newLines, newlineStyle, content);
+    }
+  }
+  return null;
+}
 function countOccurrences(text, target) {
   if (target.length === 0) {
     throw createGbkError("GBK_EMPTY_OLD_STRING", "oldString \u4E0D\u80FD\u4E3A\u7A7A");
@@ -16725,12 +16745,22 @@ var gbk_edit_default = tool({
 Reads the FULL file content regardless of file size \u2014 not limited by gbk_read's line window.
 Safe to use on files with more than 2000 lines.
 
+CRITICAL \u2014 do NOT include line number prefixes in oldString or newString:
+gbk_read output looks like "3787: SENDMSG 0 content". The "3787: " is a navigation prefix, NOT file content.
+oldString must be the raw file content: "SENDMSG 0 content" (no line number prefix).
+Including line numbers in oldString will cause GBK_NO_MATCH even if the content exists.
+
+Recommended workflow for large files (when gbk_read returned truncated=true):
+1. gbk_search(pattern) \u2192 find exact lineNumber
+2. gbk_read(offset=<lineNumber>, limit=20) \u2192 get the exact block (strip "N: " prefixes)
+3. gbk_edit(oldString=<content without prefixes>, newString=<new content>)
+
 For large files, use 'startLine'/'endLine' or 'startAnchor'/'endAnchor' to narrow the search scope
 and avoid false matches. Scoped edits also improve performance on very large files.`,
   args: {
     filePath: tool.schema.string().describe("Target file path"),
-    oldString: tool.schema.string().describe("Exact text to replace (must match file content, not gbk_read output with line numbers)"),
-    newString: tool.schema.string().describe("Replacement text"),
+    oldString: tool.schema.string().describe("Exact text to replace \u2014 raw file content only, no 'N: ' line number prefixes from gbk_read output"),
+    newString: tool.schema.string().describe("Replacement text \u2014 raw content only, no line number prefixes"),
     replaceAll: tool.schema.boolean().optional().describe("Replace all occurrences (default: false, requires unique match)"),
     startLine: tool.schema.union([tool.schema.number().int().positive(), tool.schema.literal(-1)]).optional().describe("Restrict edit scope to 1-based start line (inclusive)"),
     endLine: tool.schema.union([tool.schema.number().int().positive(), tool.schema.literal(-1)]).optional().describe("Restrict edit scope to 1-based end line (inclusive)"),

package/dist/opencode-tools/gbk_read.js

@@ -16609,14 +16609,23 @@ var gbk_read_default = tool({
 Returns up to 'limit' lines (default 2000) starting from 'offset'.
 When the file has more lines than the window, 'truncated' is true and 'totalLines' shows the full count.
 
-IMPORTANT: If 'truncated' is true, the returned content is incomplete.
-DO NOT use the returned content as 'oldString' for gbk_edit on a truncated file.
-To edit content beyond the visible window, use gbk_edit with 'startLine'/'endLine' to target the exact range,
-or read the specific range first with 'offset' set to the desired line number.`,
+IMPORTANT \u2014 line number format: each output line is prefixed with "N: " (e.g. "3787: content").
+These prefixes are for navigation only. Strip them before using any line as 'oldString' in gbk_edit.
+
+IMPORTANT \u2014 do NOT use large limits to read the whole file:
+- Setting limit=40000 or similar to "read everything" is WRONG. It produces an enormous response
+  that is unreliable to process and may be truncated by the protocol.
+- To find content in a large file, use gbk_search instead.
+- To read a specific section, set offset=<lineNumber> and limit=<small number like 10-30>.
+
+Workflow when truncated=true:
+1. gbk_search(pattern) \u2192 get exact lineNumber
+2. gbk_read(offset=<lineNumber>, limit=20) \u2192 get the exact block
+3. gbk_edit(oldString=<exact content without line prefixes>) \u2192 edit reliably`,
   args: {
     filePath: tool.schema.string().describe("Target file path"),
     offset: tool.schema.union([tool.schema.number().int().positive(), tool.schema.literal(-1)]).optional().describe("1-based start line (default: 1)"),
-    limit: tool.schema.union([tool.schema.number().int().positive(), tool.schema.literal(-1)]).optional().describe("Number of lines to read (default: 2000). Use -1 to apply the default."),
+    limit: tool.schema.union([tool.schema.number().int().positive(), tool.schema.literal(-1)]).optional().describe("Number of lines to read (default: 2000, max recommended: 200). Use -1 to apply the default."),
     tail: tool.schema.boolean().optional().describe("Read last N lines instead of offset-based window"),
     encoding: tool.schema.enum(["gbk", "gb18030"]).optional().describe("Text encoding (default: gbk)"),
     allowExternal: tool.schema.boolean().optional().describe("Allow paths outside workspace root")

package/dist/plugin/index.js

@@ -16508,14 +16508,14 @@ function buildNoMatchMessage(content, oldString) {
     getNearestContext(content, oldString)
   ].join("\n");
 }
-function tryLooseBlockReplace(content, oldString, newString) {
-  const normalizedContent = normalizeNewlines(content);
-  const contentLines = splitNormalizedLines(content);
-  const oldLines = trimTrailingEmptyLines(splitNormalizedLines(oldString));
-  const newLines = splitNormalizedLines(newString);
-  if (oldLines.length === 0) {
-    return null;
-  }
+function hasLineNumberPrefixes(lines) {
+  const nonEmpty = lines.filter((l) => l.trim().length > 0);
+  return nonEmpty.length > 0 && nonEmpty.every((l) => /^\d+: /.test(l));
+}
+function stripLineNumberPrefixes(lines) {
+  return lines.map((l) => l.replace(/^\d+: /, ""));
+}
+function matchLooseBlock(contentLines, oldLines, newLines, newlineStyle, content) {
   for (let start = 0; start < contentLines.length; start += 1) {
     let contentIndex = start;
     let oldIndex = 0;
@@ -16545,12 +16545,32 @@ function tryLooseBlockReplace(content, oldString, newString) {
       ].join("\n");
       return {
         occurrencesBefore: 1,
-        content: detectNewlineStyle(content) === "crlf" ? replacedNormalized.replace(/\n/g, "\r\n") : replacedNormalized
+        content: newlineStyle === "crlf" ? replacedNormalized.replace(/\n/g, "\r\n") : replacedNormalized
       };
     }
   }
   return null;
 }
+function tryLooseBlockReplace(content, oldString, newString) {
+  const contentLines = splitNormalizedLines(content);
+  const oldLines = trimTrailingEmptyLines(splitNormalizedLines(oldString));
+  const newLines = splitNormalizedLines(newString);
+  const newlineStyle = detectNewlineStyle(content);
+  if (oldLines.length === 0) {
+    return null;
+  }
+  const result = matchLooseBlock(contentLines, oldLines, newLines, newlineStyle, content);
+  if (result !== null) {
+    return result;
+  }
+  if (hasLineNumberPrefixes(oldLines)) {
+    const strippedOldLines = trimTrailingEmptyLines(stripLineNumberPrefixes(oldLines));
+    if (strippedOldLines.length > 0) {
+      return matchLooseBlock(contentLines, strippedOldLines, newLines, newlineStyle, content);
+    }
+  }
+  return null;
+}
 function countOccurrences(text, target) {
   if (target.length === 0) {
     throw createGbkError("GBK_EMPTY_OLD_STRING", "oldString \u4E0D\u80FD\u4E3A\u7A7A");
@@ -17025,12 +17045,22 @@ var gbk_edit_default = tool({
 Reads the FULL file content regardless of file size \u2014 not limited by gbk_read's line window.
 Safe to use on files with more than 2000 lines.
 
+CRITICAL \u2014 do NOT include line number prefixes in oldString or newString:
+gbk_read output looks like "3787: SENDMSG 0 content". The "3787: " is a navigation prefix, NOT file content.
+oldString must be the raw file content: "SENDMSG 0 content" (no line number prefix).
+Including line numbers in oldString will cause GBK_NO_MATCH even if the content exists.
+
+Recommended workflow for large files (when gbk_read returned truncated=true):
+1. gbk_search(pattern) \u2192 find exact lineNumber
+2. gbk_read(offset=<lineNumber>, limit=20) \u2192 get the exact block (strip "N: " prefixes)
+3. gbk_edit(oldString=<content without prefixes>, newString=<new content>)
+
 For large files, use 'startLine'/'endLine' or 'startAnchor'/'endAnchor' to narrow the search scope
 and avoid false matches. Scoped edits also improve performance on very large files.`,
   args: {
     filePath: tool.schema.string().describe("Target file path"),
-    oldString: tool.schema.string().describe("Exact text to replace (must match file content, not gbk_read output with line numbers)"),
-    newString: tool.schema.string().describe("Replacement text"),
+    oldString: tool.schema.string().describe("Exact text to replace \u2014 raw file content only, no 'N: ' line number prefixes from gbk_read output"),
+    newString: tool.schema.string().describe("Replacement text \u2014 raw content only, no line number prefixes"),
     replaceAll: tool.schema.boolean().optional().describe("Replace all occurrences (default: false, requires unique match)"),
     startLine: tool.schema.union([tool.schema.number().int().positive(), tool.schema.literal(-1)]).optional().describe("Restrict edit scope to 1-based start line (inclusive)"),
     endLine: tool.schema.union([tool.schema.number().int().positive(), tool.schema.literal(-1)]).optional().describe("Restrict edit scope to 1-based end line (inclusive)"),
@@ -17052,14 +17082,23 @@ var gbk_read_default = tool({
 Returns up to 'limit' lines (default 2000) starting from 'offset'.
 When the file has more lines than the window, 'truncated' is true and 'totalLines' shows the full count.
 
-IMPORTANT: If 'truncated' is true, the returned content is incomplete.
-DO NOT use the returned content as 'oldString' for gbk_edit on a truncated file.
-To edit content beyond the visible window, use gbk_edit with 'startLine'/'endLine' to target the exact range,
-or read the specific range first with 'offset' set to the desired line number.`,
+IMPORTANT \u2014 line number format: each output line is prefixed with "N: " (e.g. "3787: content").
+These prefixes are for navigation only. Strip them before using any line as 'oldString' in gbk_edit.
+
+IMPORTANT \u2014 do NOT use large limits to read the whole file:
+- Setting limit=40000 or similar to "read everything" is WRONG. It produces an enormous response
+  that is unreliable to process and may be truncated by the protocol.
+- To find content in a large file, use gbk_search instead.
+- To read a specific section, set offset=<lineNumber> and limit=<small number like 10-30>.
+
+Workflow when truncated=true:
+1. gbk_search(pattern) \u2192 get exact lineNumber
+2. gbk_read(offset=<lineNumber>, limit=20) \u2192 get the exact block
+3. gbk_edit(oldString=<exact content without line prefixes>) \u2192 edit reliably`,
   args: {
     filePath: tool.schema.string().describe("Target file path"),
     offset: tool.schema.union([tool.schema.number().int().positive(), tool.schema.literal(-1)]).optional().describe("1-based start line (default: 1)"),
-    limit: tool.schema.union([tool.schema.number().int().positive(), tool.schema.literal(-1)]).optional().describe("Number of lines to read (default: 2000). Use -1 to apply the default."),
+    limit: tool.schema.union([tool.schema.number().int().positive(), tool.schema.literal(-1)]).optional().describe("Number of lines to read (default: 2000, max recommended: 200). Use -1 to apply the default."),
     tail: tool.schema.boolean().optional().describe("Read last N lines instead of offset-based window"),
     encoding: tool.schema.enum(["gbk", "gb18030"]).optional().describe("Text encoding (default: gbk)"),
     allowExternal: tool.schema.boolean().optional().describe("Allow paths outside workspace root")

package/dist/release-manifest.json

@@ -1,18 +1,18 @@
 {
   "manifestVersion": 1,
   "packageName": "opencode-gbk-tools",
-  "packageVersion": "0.1.6",
+  "packageVersion": "0.1.7",
   "artifacts": [
     {
       "relativePath": "tools/gbk_edit.js",
       "kind": "tool",
-      "expectedHash": "3d0eb2fab5e3eca869923c2a3cc00e58ed429a4be4dbed22d13e5a5343bd5acc",
+      "expectedHash": "783a97cc6f7d1378f0b841ce0c6809e93db104aa192a64f72878ce6d432c997e",
       "hashAlgorithm": "sha256"
     },
     {
       "relativePath": "tools/gbk_read.js",
       "kind": "tool",
-      "expectedHash": "799c53835bfe7237c5bf1e4858a67d20fffe00f90958ef48b72877cb95c1c07f",
+      "expectedHash": "90c0c3ca519000bcc1fc65f84615a5a280866a45104d08678f3ed92dbfda9f45",
       "hashAlgorithm": "sha256"
     },
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-gbk-tools",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "GBK/GB18030 custom tools and agent for OpenCode",
   "type": "module",
   "license": "MIT",