refactor(instance): remove legacy runtime fallback (#27757)

packages/opencode/src/control-plane/adapters/worktree.ts

@@ -1,7 +1,6 @@
 import { Effect, Schema } from "effect"
 import { InstanceRef, WorkspaceRef } from "@/effect/instance-ref"
-import { WorkspaceContext } from "../workspace-context"
-import { type WorkspaceAdapter, WorkspaceInfo } from "../types"
+import { type WorkspaceAdapter, type WorkspaceAdapterContext, WorkspaceInfo } from "../types"
 
 const WorktreeConfig = Schema.Struct({
   name: WorkspaceInfo.fields.name,
@@ -11,26 +10,31 @@ const WorktreeConfig = Schema.Struct({
 const decodeWorktreeConfig = Schema.decodeUnknownSync(WorktreeConfig)
 
 async function loadWorktree() {
-  const [{ AppRuntime }, { Instance }, { Worktree }] = await Promise.all([
+  const [{ AppRuntime }, { Worktree }] = await Promise.all([
     import("@/effect/app-runtime"),
-    import("@/project/instance"),
     import("@/worktree"),
   ])
-  return { AppRuntime, Instance, Worktree }
+  return { AppRuntime, Worktree }
 }
 
+function requireInstance(context: WorkspaceAdapterContext | undefined) {
+  if (!context?.instance) throw new Error("Worktree adapter requires an instance context")
+  return context.instance
+}
+
+const provideContext = <A, E, R>(effect: Effect.Effect<A, E, R>, context: WorkspaceAdapterContext | undefined) =>
+  effect.pipe(
+    Effect.provideService(InstanceRef, requireInstance(context)),
+    Effect.provideService(WorkspaceRef, context?.workspaceID),
+  )
+
 export const WorktreeAdapter: WorkspaceAdapter = {
   name: "Worktree",
   description: "Create a git worktree",
-  async configure(info) {
-    const { AppRuntime, Instance, Worktree } = await loadWorktree()
-    const ctx = Instance.current
-    const workspaceID = WorkspaceContext.workspaceID
+  async configure(info, context) {
+    const { AppRuntime, Worktree } = await loadWorktree()
     const next = await AppRuntime.runPromise(
-      Worktree.Service.use((svc) => svc.makeWorktreeInfo({ detached: true })).pipe(
-        Effect.provideService(InstanceRef, ctx),
-        Effect.provideService(WorkspaceRef, workspaceID),
-      ),
+      provideContext(Worktree.Service.use((svc) => svc.makeWorktreeInfo({ detached: true })), context),
     )
     return {
       ...info,
@@ -38,32 +42,27 @@ export const WorktreeAdapter: WorkspaceAdapter = {
       directory: next.directory,
     }
   },
-  async create(info) {
-    const { AppRuntime, Instance, Worktree } = await loadWorktree()
-    const ctx = Instance.current
-    const workspaceID = WorkspaceContext.workspaceID
+  async create(info, _env, _from, context) {
+    const { AppRuntime, Worktree } = await loadWorktree()
     const config = decodeWorktreeConfig(info)
     await AppRuntime.runPromise(
-      Worktree.Service.use((svc) =>
-        svc.createFromInfo({
-          name: config.name,
-          directory: config.directory,
-          ...(config.branch ? { branch: config.branch } : {}),
-        }),
-      ).pipe(Effect.provideService(InstanceRef, ctx), Effect.provideService(WorkspaceRef, workspaceID)),
+      provideContext(
+        Worktree.Service.use((svc) =>
+          svc.createFromInfo({
+            name: config.name,
+            directory: config.directory,
+            ...(config.branch ? { branch: config.branch } : {}),
+          }),
+        ),
+        context,
+      ),
     )
   },
-  async list() {
-    const { AppRuntime, Instance, Worktree } = await loadWorktree()
-    const ctx = Instance.current
-    const workspaceID = WorkspaceContext.workspaceID
+  async list(context) {
+    const { AppRuntime, Worktree } = await loadWorktree()
+    const ctx = requireInstance(context)
     return (
-      await AppRuntime.runPromise(
-        Worktree.Service.use((svc) => svc.list()).pipe(
-          Effect.provideService(InstanceRef, ctx),
-          Effect.provideService(WorkspaceRef, workspaceID),
-        ),
-      )
+      await AppRuntime.runPromise(provideContext(Worktree.Service.use((svc) => svc.list()), context))
     ).map((info) => ({
       type: "worktree",
       name: info.name,
@@ -72,16 +71,11 @@ export const WorktreeAdapter: WorkspaceAdapter = {
       projectID: ctx.project.id,
     }))
   },
-  async remove(info) {
-    const { AppRuntime, Instance, Worktree } = await loadWorktree()
-    const ctx = Instance.current
-    const workspaceID = WorkspaceContext.workspaceID
+  async remove(info, context) {
+    const { AppRuntime, Worktree } = await loadWorktree()
     const config = decodeWorktreeConfig(info)
     await AppRuntime.runPromise(
-      Worktree.Service.use((svc) => svc.remove({ directory: config.directory })).pipe(
-        Effect.provideService(InstanceRef, ctx),
-        Effect.provideService(WorkspaceRef, workspaceID),
-      ),
+      provideContext(Worktree.Service.use((svc) => svc.remove({ directory: config.directory })), context),
     )
   },
   target(info) {