use forkScoped + Fiber.join for lazy init (match old Instance.state behavior)

packages/opencode/src/effect/instances.ts

@@ -35,7 +35,7 @@ export type InstanceServices =
 // runPromiseInstance -> Instances.get, which always runs inside Instance.provide.
 // This should go away once the old Instance type is removed and lookup can load
 // the full context directly.
-function lookup(_key: string) {
+function lookup(_key: string): Layer.Layer<InstanceServices> {
   const ctx = Layer.sync(InstanceContext, () => InstanceContext.of(Instance.current))
   return Layer.mergeAll(
     Layer.fresh(Question.layer),

packages/opencode/src/plugin/index.ts

@@ -11,7 +11,7 @@ import { Session } from "../session"
 import { NamedError } from "@opencode-ai/util/error"
 import { CopilotAuthPlugin } from "./copilot"
 import { gitlabAuthPlugin as GitlabAuthPlugin } from "@gitlab/opencode-gitlab-auth"
-import { Effect, Layer, ServiceMap } from "effect"
+import { Effect, Fiber, Layer, ServiceMap } from "effect"
 import { InstanceContext } from "@/effect/instance-context"
 import { runPromiseInstance } from "@/effect/runtime"
 
@@ -43,91 +43,99 @@ export namespace Plugin {
       const instance = yield* InstanceContext
       const hooks: Hooks[] = []
 
-      yield* Effect.promise(async () => {
-        const client = createOpencodeClient({
-          baseUrl: "http://localhost:4096",
-          directory: instance.directory,
-          headers: Flag.OPENCODE_SERVER_PASSWORD
-            ? {
-                Authorization: `Basic ${Buffer.from(`${Flag.OPENCODE_SERVER_USERNAME ?? "opencode"}:${Flag.OPENCODE_SERVER_PASSWORD}`).toString("base64")}`,
-              }
-            : undefined,
-          fetch: async (...args) => Server.Default().fetch(...args),
-        })
-        const config = await Config.get()
-        const input: PluginInput = {
-          client,
-          project: instance.project,
-          worktree: instance.worktree,
-          directory: instance.directory,
-          get serverUrl(): URL {
-            return Server.url ?? new URL("http://localhost:4096")
-          },
-          $: Bun.$,
-        }
-
-        for (const plugin of INTERNAL_PLUGINS) {
-          log.info("loading internal plugin", { name: plugin.name })
-          const init = await plugin(input).catch((err) => {
-            log.error("failed to load internal plugin", { name: plugin.name, error: err })
+      const load = Effect.fn("Plugin.load")(function* () {
+        yield* Effect.promise(async () => {
+          const client = createOpencodeClient({
+            baseUrl: "http://localhost:4096",
+            directory: instance.directory,
+            headers: Flag.OPENCODE_SERVER_PASSWORD
+              ? {
+                  Authorization: `Basic ${Buffer.from(`${Flag.OPENCODE_SERVER_USERNAME ?? "opencode"}:${Flag.OPENCODE_SERVER_PASSWORD}`).toString("base64")}`,
+                }
+              : undefined,
+            fetch: async (...args) => Server.Default().fetch(...args),
           })
-          if (init) hooks.push(init)
-        }
-
-        let plugins = config.plugin ?? []
-        if (plugins.length) await Config.waitForDependencies()
-
-        for (let plugin of plugins) {
-          // ignore old codex plugin since it is supported first party now
-          if (plugin.includes("opencode-openai-codex-auth") || plugin.includes("opencode-copilot-auth")) continue
-          log.info("loading plugin", { path: plugin })
-          if (!plugin.startsWith("file://")) {
-            const lastAtIndex = plugin.lastIndexOf("@")
-            const pkg = lastAtIndex > 0 ? plugin.substring(0, lastAtIndex) : plugin
-            const version = lastAtIndex > 0 ? plugin.substring(lastAtIndex + 1) : "latest"
-            plugin = await BunProc.install(pkg, version).catch((err) => {
-              const cause = err instanceof Error ? err.cause : err
-              const detail = cause instanceof Error ? cause.message : String(cause ?? err)
-              log.error("failed to install plugin", { pkg, version, error: detail })
-              Bus.publish(Session.Event.Error, {
-                error: new NamedError.Unknown({
-                  message: `Failed to install plugin ${pkg}@${version}: ${detail}`,
-                }).toObject(),
-              })
-              return ""
-            })
-            if (!plugin) continue
+          const config = await Config.get()
+          const input: PluginInput = {
+            client,
+            project: instance.project,
+            worktree: instance.worktree,
+            directory: instance.directory,
+            get serverUrl(): URL {
+              return Server.url ?? new URL("http://localhost:4096")
+            },
+            $: Bun.$,
           }
-          // Prevent duplicate initialization when plugins export the same function
-          // as both a named export and default export (e.g., `export const X` and `export default X`).
-          // Object.entries(mod) would return both entries pointing to the same function reference.
-          await import(plugin)
-            .then(async (mod) => {
-              const seen = new Set<PluginInstance>()
-              for (const [_name, fn] of Object.entries<PluginInstance>(mod)) {
-                if (seen.has(fn)) continue
-                seen.add(fn)
-                hooks.push(await fn(input))
-              }
+
+          for (const plugin of INTERNAL_PLUGINS) {
+            log.info("loading internal plugin", { name: plugin.name })
+            const init = await plugin(input).catch((err) => {
+              log.error("failed to load internal plugin", { name: plugin.name, error: err })
             })
-            .catch((err) => {
-              const message = err instanceof Error ? err.message : String(err)
-              log.error("failed to load plugin", { path: plugin, error: message })
-              Bus.publish(Session.Event.Error, {
-                error: new NamedError.Unknown({
-                  message: `Failed to load plugin ${plugin}: ${message}`,
-                }).toObject(),
+            if (init) hooks.push(init)
+          }
+
+          let plugins = config.plugin ?? []
+          if (plugins.length) await Config.waitForDependencies()
+
+          for (let plugin of plugins) {
+            // ignore old codex plugin since it is supported first party now
+            if (plugin.includes("opencode-openai-codex-auth") || plugin.includes("opencode-copilot-auth")) continue
+            log.info("loading plugin", { path: plugin })
+            if (!plugin.startsWith("file://")) {
+              const lastAtIndex = plugin.lastIndexOf("@")
+              const pkg = lastAtIndex > 0 ? plugin.substring(0, lastAtIndex) : plugin
+              const version = lastAtIndex > 0 ? plugin.substring(lastAtIndex + 1) : "latest"
+              plugin = await BunProc.install(pkg, version).catch((err) => {
+                const cause = err instanceof Error ? err.cause : err
+                const detail = cause instanceof Error ? cause.message : String(cause ?? err)
+                log.error("failed to install plugin", { pkg, version, error: detail })
+                Bus.publish(Session.Event.Error, {
+                  error: new NamedError.Unknown({
+                    message: `Failed to install plugin ${pkg}@${version}: ${detail}`,
+                  }).toObject(),
+                })
+                return ""
               })
-            })
-        }
+              if (!plugin) continue
+            }
+            // Prevent duplicate initialization when plugins export the same function
+            // as both a named export and default export (e.g., `export const X` and `export default X`).
+            // Object.entries(mod) would return both entries pointing to the same function reference.
+            await import(plugin)
+              .then(async (mod) => {
+                const seen = new Set<PluginInstance>()
+                for (const [_name, fn] of Object.entries<PluginInstance>(mod)) {
+                  if (seen.has(fn)) continue
+                  seen.add(fn)
+                  hooks.push(await fn(input))
+                }
+              })
+              .catch((err) => {
+                const message = err instanceof Error ? err.message : String(err)
+                log.error("failed to load plugin", { path: plugin, error: message })
+                Bus.publish(Session.Event.Error, {
+                  error: new NamedError.Unknown({
+                    message: `Failed to load plugin ${plugin}: ${message}`,
+                  }).toObject(),
+                })
+              })
+          }
+        })
       })
 
+      const loadFiber = yield* load().pipe(
+        Effect.catchCause(() => Effect.void),
+        Effect.forkScoped,
+      )
+
       const trigger = Effect.fn("Plugin.trigger")(function* <
         Name extends Exclude<keyof Required<Hooks>, "auth" | "event" | "tool">,
         Input = Parameters<Required<Hooks>[Name]>[0],
         Output = Parameters<Required<Hooks>[Name]>[1],
       >(name: Name, input: Input, output: Output) {
         if (!name) return output
+        yield* Fiber.join(loadFiber)
         yield* Effect.promise(async () => {
           for (const hook of hooks) {
             const fn = hook[name]
@@ -142,10 +150,12 @@ export namespace Plugin {
       })
 
       const list = Effect.fn("Plugin.list")(function* () {
+        yield* Fiber.join(loadFiber)
         return hooks
       })
 
       const init = Effect.fn("Plugin.init")(function* () {
+        yield* Fiber.join(loadFiber)
         yield* Effect.promise(async () => {
           const config = await Config.get()
           for (const hook of hooks) {
@@ -173,7 +183,7 @@ export namespace Plugin {
     return runPromiseInstance(Service.use((svc) => svc.trigger(name, input, output)))
   }
 
-  export async function list() {
+  export async function list(): Promise<Hooks[]> {
     return runPromiseInstance(Service.use((svc) => svc.list()))
   }