Force worktrees to inherit project

packages/opencode/src/project/instance.ts

@@ -19,16 +19,31 @@ const disposal = {
 }
 
 export const Instance = {
-  async provide<R>(input: { directory: string; init?: () => Promise<any>; fn: () => R }): Promise<R> {
+  async provide<R>(input: {
+    directory: string
+    project?: Project.Info
+    init?: () => Promise<any>
+    fn: () => R
+  }): Promise<R> {
     let existing = cache.get(input.directory)
     if (!existing) {
-      Log.Default.info("creating instance", { directory: input.directory })
+      debugger;
+      Log.Default.info("creating instance", { directory: input.directory, project: input.project })
       existing = iife(async () => {
-        const { project, sandbox } = await Project.fromDirectory(input.directory)
-        const ctx = {
-          directory: input.directory,
-          worktree: sandbox,
-          project,
+        let ctx
+        if (input.project) {
+          ctx = {
+            directory: input.directory,
+            worktree: input.directory,
+            project: input.project,
+          }
+        } else {
+          const { project, sandbox } = await Project.fromDirectory(input.directory)
+          ctx = {
+            directory: input.directory,
+            worktree: sandbox,
+            project,
+          }
         }
         await context.provide(ctx, async () => {
           await input.init?.()

packages/opencode/src/worktree/index.ts

@@ -377,6 +377,8 @@ export namespace Worktree {
 
         const booted = await Instance.provide({
           directory: info.directory,
+          // worktrees should inherit the same project as the local project
+          project: Instance.project,
           init: InstanceBootstrap,
           fn: () => undefined,
         })
@@ -411,7 +413,7 @@ export namespace Worktree {
         await runStartScripts(info.directory, { projectID, extra })
       }
 
-      void start().catch((error) => {
+      return start().catch((error) => {
         log.error("worktree start task failed", { directory: info.directory, error })
       })
     }