fix: preserve workspace on HttpApi instance lifecycle events

packages/opencode/src/server/routes/instance/httpapi/lifecycle.ts

@@ -1,32 +1,60 @@
+import type { WorkspaceID } from "@/control-plane/schema"
+import { WorkspaceContext } from "@/control-plane/workspace-context"
+import { WorkspaceRef } from "@/effect/instance-ref"
 import { Instance, type InstanceContext } from "@/project/instance"
 import { Effect } from "effect"
 import { HttpEffect, HttpMiddleware, HttpServerRequest } from "effect/unstable/http"
 
-const disposeAfterResponse = new WeakMap<object, InstanceContext>()
+type MarkedInstance = {
+  ctx: InstanceContext
+  workspaceID?: WorkspaceID
+}
+
+const disposeAfterResponse = new WeakMap<object, MarkedInstance>()
 
 export const markInstanceForDisposal = (ctx: InstanceContext) =>
-  HttpEffect.appendPreResponseHandler((request, response) =>
-    Effect.sync(() => {
-      disposeAfterResponse.set(request.source, ctx)
-      return response
-    }),
-  )
+  Effect.gen(function* () {
+    const workspaceID = yield* WorkspaceRef
+    return yield* HttpEffect.appendPreResponseHandler((request, response) =>
+      Effect.sync(() => {
+        disposeAfterResponse.set(request.source, { ctx, workspaceID })
+        return response
+      }),
+    )
+  })
 
 export const markInstanceForReload = (ctx: InstanceContext, next: Parameters<typeof Instance.reload>[0]) =>
-  HttpEffect.appendPreResponseHandler((_request, response) =>
-    Effect.as(
-      Effect.uninterruptible(Effect.promise(() => Instance.restore(ctx, () => Instance.reload(next)))),
-      response,
-    ),
-  )
+  Effect.gen(function* () {
+    const workspaceID = yield* WorkspaceRef
+    return yield* HttpEffect.appendPreResponseHandler((_request, response) =>
+      Effect.as(
+        Effect.uninterruptible(
+          Effect.promise(() =>
+            WorkspaceContext.provide({
+              workspaceID,
+              fn: () => Instance.restore(ctx, () => Instance.reload(next)),
+            }),
+          ),
+        ),
+        response,
+      ),
+    )
+  })
 
 export const disposeMiddleware: HttpMiddleware.HttpMiddleware = (effect) =>
   Effect.gen(function* () {
     const response = yield* effect
     const request = yield* HttpServerRequest.HttpServerRequest
-    const ctx = disposeAfterResponse.get(request.source)
-    if (!ctx) return response
+    const marked = disposeAfterResponse.get(request.source)
+    if (!marked) return response
     disposeAfterResponse.delete(request.source)
-    yield* Effect.uninterruptible(Effect.promise(() => Instance.restore(ctx, () => Instance.dispose())))
+    yield* Effect.uninterruptible(
+      Effect.promise(() =>
+        WorkspaceContext.provide({
+          workspaceID: marked.workspaceID,
+          fn: () => Instance.restore(marked.ctx, () => Instance.dispose()),
+        }),
+      ),
+    )
     return response
   })