From bc9ff7e99f86d7b871a01cdc1dcab20a965f0b25 Mon Sep 17 00:00:00 2001
From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Date: Mon, 29 Sep 2025 22:21:54 -0500
Subject: [PATCH] fix: worktree cmd (#2870)

---
 packages/opencode/src/project/project.ts | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/opencode/src/project/project.ts b/packages/opencode/src/project/project.ts
index 37a03cc2..88134483 100644
--- a/packages/opencode/src/project/project.ts
+++ b/packages/opencode/src/project/project.ts
@@ -62,14 +62,12 @@ export namespace Project {
       await Storage.write<Info>(["project", "global"], project)
       return project
     }
-    worktree = path.dirname(
-      await $`git rev-parse --path-format=absolute --git-common-dir`
-        .quiet()
-        .nothrow()
-        .cwd(worktree)
-        .text()
-        .then((x) => x.trim()),
-    )
+    worktree = await $`git rev-parse --path-format=absolute --show-toplevel`
+      .quiet()
+      .nothrow()
+      .cwd(worktree)
+      .text()
+      .then((x) => x.trim())
     const project: Info = {
       id,
       worktree,