fix(lifecycle): tighten disposal boundaries

Author: kitlangton

packages/opencode/src/project/instance-runtime.ts

@@ -3,11 +3,11 @@ import { type InstanceContext } from "./instance-context"
 import { InstanceStore, type LoadInput } from "./instance-store"
 import { Effect, Layer } from "effect"
 
-// Bridge for Promise/ALS callers that cannot yet yield InstanceStore.Service.
-// This keeps InstanceStore itself low-level while still giving legacy Hono and
-// CLI paths the production bootstrap implementation. Delete this module once
-// those callers are migrated to Effect boundaries that provide InstanceStore
-// directly, like the HttpApi middleware does.
+// Production InstanceStore wiring plus a bridge for Promise/ALS callers that
+// cannot yet yield InstanceStore.Service. This keeps InstanceStore itself
+// low-level while still giving legacy Hono and CLI paths the production
+// bootstrap implementation. Delete the Promise helpers once those callers are
+// migrated to Effect boundaries that provide InstanceStore directly.
 // Keep the bootstrap implementation import lazy: Instance is imported broadly,
 // and importing the app bootstrap graph at module load can trigger ESM cycles.
 export const layer = Layer.unwrap(

packages/opencode/src/server/global-lifecycle.ts

@@ -1,8 +1,11 @@
 import { GlobalBus } from "@/bus/global"
 import { InstanceStore } from "@/project/instance-store"
+import * as Log from "@opencode-ai/core/util/log"
 import { Effect } from "effect"
 import { Event } from "./event"
 
+const log = Log.create({ service: "server" })
+
 export const emitGlobalDisposed = Effect.sync(() =>
   GlobalBus.emit("event", {
     directory: "global",
@@ -17,9 +20,18 @@ export const disposeAllInstancesAndEmitGlobalDisposed = Effect.fn(
   "Server.disposeAllInstancesAndEmitGlobalDisposed",
 )(function* (options?: { swallowErrors?: boolean }) {
   const store = yield* InstanceStore.Service
-  const dispose = store.disposeAll()
-  yield* (options?.swallowErrors ? dispose.pipe(Effect.catch(() => Effect.void)) : dispose)
-  yield* emitGlobalDisposed
+  yield* Effect.gen(function* () {
+    yield* (options?.swallowErrors
+      ? store.disposeAll().pipe(
+          Effect.catchCause((cause) =>
+            Effect.sync(() => {
+              log.warn("global disposal failed", { cause })
+            }),
+          ),
+        )
+      : store.disposeAll())
+    yield* emitGlobalDisposed
+  }).pipe(Effect.uninterruptible)
 })
 
 export * as GlobalLifecycle from "./global-lifecycle"

packages/opencode/src/server/routes/instance/config.ts

@@ -1,8 +1,7 @@
 import { Hono } from "hono"
 import { describeRoute, validator, resolver } from "hono-openapi"
-import z from "zod"
 import { Config } from "@/config/config"
-import { Instance } from "@/project/instance"
+import { InstanceState } from "@/effect/instance-state"
 import { InstanceStore } from "@/project/instance-store"
 import { Provider } from "@/provider/provider"
 import { errors } from "../../error"
@@ -59,7 +58,7 @@ export const ConfigRoutes = lazy(() =>
           const cfg = yield* Config.Service
           const store = yield* InstanceStore.Service
           yield* cfg.update(config)
-          yield* store.dispose(Instance.current)
+          yield* store.dispose(yield* InstanceState.context)
           return config
         }),
     )

packages/opencode/src/server/routes/instance/index.ts

@@ -25,7 +25,6 @@ import { ExperimentalRoutes } from "./experimental"
 import { ProviderRoutes } from "./provider"
 import { EventRoutes } from "./event"
 import { SyncRoutes } from "./sync"
-import { InstanceMiddleware } from "./middleware"
 import { jsonRequest } from "./trace"
 
 export const InstanceRoutes = (upgrade: UpgradeWebSocket): Hono => {

packages/opencode/test/config/tui.test.ts

@@ -2,7 +2,6 @@ import { afterEach, beforeEach, expect, test } from "bun:test"
 import path from "path"
 import fs from "fs/promises"
 import { provideTestInstance, tmpdir } from "../fixture/fixture"
-import { Instance } from "../../src/project/instance"
 import { InstanceRuntime } from "@/project/instance-runtime"
 import { TuiConfig } from "../../src/cli/cmd/tui/config/tui"
 import { Config } from "@/config/config"

packages/opencode/test/plugin/auth-override.test.ts

@@ -91,7 +91,7 @@ describe("plugin.auth-override", () => {
     expect(copilot.length).toBe(1)
     expect(copilot[0].label).toBe("Test Override Auth")
     expect(plainMethods[ProviderID.make("github-copilot")][0].label).not.toBe("Test Override Auth")
-  }, 30000) // Increased timeout for plugin installation
+  }, 30000)
 })
 
 const file = path.join(import.meta.dir, "../../src/plugin/index.ts")