feat(worktree): support configurable plugin strategies (#47358)

packages/server/src/handlers/worktree.ts

@@ -1,32 +1,32 @@
 import { Git } from "@opencode-ai/core/git"
 import { Worktree } from "@opencode-ai/core/worktree"
+import { Plugin } from "@opencode-ai/core/plugin"
 import { WorktreeError } from "@opencode-ai/protocol/groups/worktree"
 import { Effect } from "effect"
 import { HttpApiBuilder, HttpApiSchema } from "effect/unstable/httpapi"
 import { Api } from "../api"
 
 export const WorktreeHandler = HttpApiBuilder.group(Api, "server.worktree", (handlers) =>
-  Effect.gen(function* () {
-    const worktrees = yield* Worktree.Service
-
-    return handlers
-      .handle("worktree.list", (ctx) => worktrees.list(ctx.params.projectID))
-      .handle("worktree.create", (ctx) =>
-        badRequest(worktrees.create({ ...ctx.payload, projectID: ctx.params.projectID })),
-      )
-      .handle("worktree.remove", (ctx) =>
-        badRequest(worktrees.remove({ ...ctx.payload, projectID: ctx.params.projectID })).pipe(
-          Effect.as(HttpApiSchema.NoContent.make()),
-        ),
-      )
-      .handle("worktree.refresh", (ctx) =>
-        badRequest(worktrees.refresh({ projectID: ctx.params.projectID })).pipe(
-          Effect.as(HttpApiSchema.NoContent.make()),
-        ),
-      )
-  }),
+  handlers
+    .handle("worktree.list", () => run((worktrees) => worktrees.list()))
+    .handle("worktree.create", (ctx) => run((worktrees) => worktrees.create(ctx.payload)))
+    .handle("worktree.remove", (ctx) =>
+      run((worktrees) => worktrees.remove(ctx.payload)).pipe(Effect.as(HttpApiSchema.NoContent.make())),
+    )
+    .handle("worktree.refresh", () =>
+      run((worktrees) => worktrees.refresh()).pipe(Effect.as(HttpApiSchema.NoContent.make())),
+    ),
 )
 
+function run<A>(action: (service: Worktree.Interface) => Effect.Effect<A, Worktree.Error>) {
+  return Effect.gen(function* () {
+    const plugins = yield* Plugin.Service
+    const worktrees = yield* Worktree.Service
+    yield* plugins.awaitActivation
+    return yield* action(worktrees)
+  }).pipe(badRequest)
+}
+
 function badRequest<A, R>(effect: Effect.Effect<A, Worktree.Error, R>) {
   return effect.pipe(
     Effect.mapError(
@@ -35,7 +35,10 @@ function badRequest<A, R>(effect: Effect.Effect<A, Worktree.Error, R>) {
           name: "WorktreeError",
           data: {
             message: message(error),
-            forceRequired: error instanceof Git.WorktreeError ? error.forceRequired : undefined,
+            forceRequired:
+              error instanceof Git.WorktreeError || error instanceof Worktree.OperationError
+                ? error.forceRequired
+                : undefined,
           },
         }),
     ),
@@ -51,5 +54,6 @@ function message(error: Worktree.Error) {
   if (error instanceof Worktree.DirectoryUnavailableError) return `Worktree directory unavailable: ${error.directory}`
   if (error instanceof Worktree.InvalidDirectoryError) return `Invalid worktree directory: ${error.directory}`
   if (error instanceof Worktree.StrategyUnavailableError) return `Worktree strategy unavailable: ${error.strategy}`
+  if (error instanceof Worktree.UnsupportedLocationError) return "Worktree operations only support local locations"
   return error.message
 }

packages/server/src/routes.ts

@@ -30,7 +30,6 @@ import { PluginUpdate } from "@opencode-ai/core/plugin/update"
 import { SdkPlugins } from "@opencode-ai/core/plugin/sdk"
 import { WellKnown } from "@opencode-ai/core/wellknown"
 import { Workspace } from "@opencode-ai/core/workspace"
-import { Worktree } from "@opencode-ai/core/worktree"
 import { Watcher } from "@opencode-ai/core/filesystem/watcher"
 import { HttpRouter } from "effect/unstable/http"
 import { HttpApiBuilder } from "effect/unstable/httpapi"
@@ -56,7 +55,6 @@ const applicationServiceNodes = [
   httpClient,
   Job.node,
   Project.node,
-  Worktree.node,
   Session.node,
   Instance.node,
   SessionTransfer.node,