fix(opencode): accept absolute Windows paths in apply_patch

Hona · Hona · commit 77a1ef2f52e9 · 2026-02-04T14:42:21.000+10:00
diff --git a/packages/opencode/src/tool/apply_patch.ts b/packages/opencode/src/tool/apply_patch.ts
@@ -57,8 +57,14 @@ export const ApplyPatchTool = Tool.define("apply_patch", {
 
     let totalDiff = ""
 
+    const resolvePatchPath = (input: string) => {
+      const normalized = path.toPosix(input)
+      if (path.isAbsolute(normalized)) return normalized
+      return path.resolve(Instance.directory, normalized)
+    }
+
     for (const hunk of hunks) {
-      const filePath = path.resolve(Instance.directory, hunk.path)
+      const filePath = resolvePatchPath(hunk.path)
       await assertExternalDirectory(ctx, filePath)
 
       switch (hunk.type) {
@@ -116,7 +122,7 @@ export const ApplyPatchTool = Tool.define("apply_patch", {
             if (change.removed) deletions += change.count || 0
           }
 
-          const movePath = hunk.move_path ? path.resolve(Instance.directory, hunk.move_path) : undefined
+          const movePath = hunk.move_path ? resolvePatchPath(hunk.move_path) : undefined
           await assertExternalDirectory(ctx, movePath)
 
           fileChanges.push({
diff --git a/packages/opencode/test/tool/apply_patch.test.ts b/packages/opencode/test/tool/apply_patch.test.ts
@@ -259,6 +259,26 @@ describe("tool.apply_patch freeform", () => {
     })
   })
 
+  test("accepts absolute Windows paths with backslashes", async () => {
+    if (process.platform !== "win32") return
+
+    await using fixture = await tmpdir()
+    const { ctx } = makeCtx()
+
+    await Instance.provide({
+      directory: fixture.path,
+      fn: async () => {
+        const target = path.join(fixture.path, "abs.txt")
+        await fs.writeFile(target, "before\n", "utf-8")
+
+        const patchText = `*** Begin Patch\n*** Update File: ${target}\n@@\n-before\n+after\n*** End Patch`
+        await execute({ patchText }, ctx)
+
+        expect(await fs.readFile(target, "utf-8")).toBe("after\n")
+      },
+    })
+  })
+
   test("adds file overwriting existing file", async () => {
     await using fixture = await tmpdir()
     const { ctx } = makeCtx()
