From f7ab6beaf350bad0b3ad14c164d96ad5b181be72 Mon Sep 17 00:00:00 2001
From: Adam <2363879+adamdotdevin@users.noreply.github.com>
Date: Thu, 4 Sep 2025 06:09:06 -0500
Subject: [PATCH] fix: worktree file/content never includes patch

---
 packages/opencode/src/file/index.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/opencode/src/file/index.ts b/packages/opencode/src/file/index.ts
index fd846444..81f2251a 100644
--- a/packages/opencode/src/file/index.ts
+++ b/packages/opencode/src/file/index.ts
@@ -124,10 +124,9 @@ export namespace File {
       .catch(() => "")
       .then((x) => x.trim())
     if (project.vcs === "git") {
-      const rel = path.relative(Instance.worktree, full)
-      const diff = await $`git diff ${rel}`.cwd(Instance.worktree).quiet().nothrow().text()
+      const diff = await $`git diff ${file}`.cwd(Instance.directory).quiet().nothrow().text()
       if (diff.trim()) {
-        const original = await $`git show HEAD:${rel}`.cwd(Instance.worktree).quiet().nothrow().text()
+        const original = await $`git show HEAD:${file}`.cwd(Instance.directory).quiet().nothrow().text()
         const patch = createPatch(file, original, content, "old", "new", {
           context: Infinity,
         })