tool: edit - adding rangeEdit

Author: spoons-and-mirrors

packages/opencode/src/tool/edit.ts

@@ -24,6 +24,12 @@ export const EditTool = Tool.define("edit", {
     oldString: z.string().describe("The text to replace"),
     newString: z.string().describe("The text to replace it with (must be different from oldString)"),
     replaceAll: z.boolean().optional().describe("Replace all occurrences of oldString (default false)"),
+    range: z
+      .string()
+      .optional()
+      .describe(
+        "Line range in format 'start:end' (e.g., '140:233') - inclusive of both start and end lines. When provided, restricts oldString matching to the range. Ensures strong match performance.",
+      ),
   }),
   async execute(params, ctx) {
     if (!params.filePath) {
@@ -73,7 +79,28 @@ export const EditTool = Tool.define("edit", {
       if (stats.isDirectory()) throw new Error(`Path is a directory, not a file: ${filePath}`)
       await FileTime.assert(ctx.sessionID, filePath)
       contentOld = await file.text()
-      contentNew = replace(contentOld, params.oldString, params.newString, params.replaceAll)
+
+      const rangeEdit = (content: string, rangeStr: string) => {
+        const match = rangeStr.match(/^(\d+):(\d+)$/)
+        if (!match) {
+          throw new Error("Invalid range format. Use 'start:end', e.g., '140:233'")
+        }
+        const start = parseInt(match[1], 10) - 1
+        const end = parseInt(match[2], 10) - 1
+        const lines = content.split("\n")
+        if (start < 0 || end >= lines.length || start > end) {
+          throw new Error(`Range out of bounds: file has ${lines.length} lines, got ${rangeStr}`)
+        }
+        const before = lines.slice(0, start)
+        const target = lines.slice(start, end + 1).join("\n")
+        const after = lines.slice(end + 1)
+        const replaced = replace(target, params.oldString, params.newString, params.replaceAll)
+        return [...before, ...replaced.split("\n"), ...after].join("\n")
+      }
+
+      contentNew = params.range
+        ? rangeEdit(contentOld, params.range)
+        : replace(contentOld, params.oldString, params.newString, params.replaceAll)
 
       diff = trimDiff(createTwoFilesPatch(filePath, filePath, contentOld, contentNew))
       if (agent.permission.edit === "ask") {
@@ -621,6 +648,6 @@ export function replace(content: string, oldString: string, newString: string, r
     throw new Error("oldString not found in content")
   }
   throw new Error(
-    "oldString found multiple times and requires more code context to uniquely identify the intended match",
+    "oldString found multiple times. Either use the `range` parameter or provide more code context to uniquely identify the intended match. You can also use `replaceAll`: true to replace all instances of oldString (make sure this is intentional).",
   )
 }

packages/opencode/src/tool/edit.txt

@@ -6,6 +6,8 @@ Usage:
 - ALWAYS prefer editing existing files in the codebase. NEVER write new files unless explicitly required.
 - Only use emojis if the user explicitly requests it. Avoid adding emojis to files unless asked.
 - Use `replaceAll` for replacing and renaming strings across the file. This parameter is useful if you want to rename a variable for instance.
+- Use `range` to specify a line range (e.g., '140:233') when `oldString` appears multiple times in the file. The range restricts the search and replacement to only those lines, allowing you to disambiguate which occurrence to replace.
 
 CRITICAL:
 - ALWAYS MAKE SURE TO SUPPLY SUFFICIENT CONTEXT TO UNIQUELY IDENTIFY `oldString` OTHERWISE THE EDIT WILL FAIL
+- SPECIFYING THE RANGE OF THE EDIT WILL ENSURE BETTER `oldString` MATCHING