Merge branch 'dev' into kit/effectify-plugin

Replace the legacy Instance.state() lazy-init pattern with the standard
Effect service pattern (Interface, Service class, Layer, promise facades).
Register Plugin.Service in InstanceServices and add its layer to the
instance lookup.

packages/opencode/specs/effect-migration.md

@@ -126,9 +126,9 @@ Done now:
 
 Still open and likely worth migrating:
 
-- [ ] `Plugin`
+- [x] `Plugin`
 - [ ] `ToolRegistry`
-- [x] `Pty`
+- [ ] `Pty`
 - [ ] `Worktree`
 - [ ] `Installation`
 - [ ] `Bus`

packages/opencode/src/bus/bus-event.ts

@@ -1,5 +1,5 @@
 import z from "zod"
-import type { ZodType } from "zod"
+import type { ZodObject, ZodRawShape } from "zod"
 import { Log } from "../util/log"
 
 export namespace BusEvent {
@@ -9,7 +9,7 @@ export namespace BusEvent {
 
   const registry = new Map<string, Definition>()
 
-  export function define<Type extends string, Properties extends ZodType>(type: Type, properties: Properties) {
+  export function define<Type extends string, Properties extends ZodObject<ZodRawShape>>(type: Type, properties: Properties) {
     const result = {
       type,
       properties,

packages/opencode/src/bus/global.ts

@@ -4,7 +4,7 @@ export const GlobalBus = new EventEmitter<{
   event: [
     {
       directory?: string
-      payload: any
+      payload: { type: string; properties: Record<string, unknown> }
     },
   ]
 }>()

packages/opencode/src/control-plane/workspace.ts

@@ -124,7 +124,7 @@ export namespace Workspace {
       await parseSSE(res.body, stop, (event) => {
         GlobalBus.emit("event", {
           directory: space.id,
-          payload: event,
+          payload: event as { type: string; properties: Record<string, unknown> },
         })
       })
       // Wait 250ms and retry if SSE connection fails

packages/opencode/src/effect/instances.ts

@@ -4,13 +4,13 @@ import { FileTime } from "@/file/time-service"
 import { FileWatcher } from "@/file/watcher"
 import { Format } from "@/format/service"
 import { Permission } from "@/permission/service"
-import { Pty } from "@/pty"
 import { Instance } from "@/project/instance"
 import { Vcs } from "@/project/vcs"
 import { ProviderAuth } from "@/provider/auth-service"
 import { Question } from "@/question/service"
 import { Skill } from "@/skill/service"
 import { Snapshot } from "@/snapshot/service"
+import { Plugin } from "@/plugin"
 import { InstanceContext } from "./instance-context"
 import { registerDisposer } from "./instance-registry"
 
@@ -25,9 +25,9 @@ export type InstanceServices =
   | FileTime.Service
   | Format.Service
   | File.Service
-  | Pty.Service
   | Skill.Service
   | Snapshot.Service
+  | Plugin.Service
 
 // NOTE: LayerMap only passes the key (directory string) to lookup, but we need
 // the full instance context (directory, worktree, project). We read from the
@@ -46,9 +46,9 @@ function lookup(_key: string) {
     FileTime.layer,
     Format.layer,
     File.layer,
-    Pty.layer,
     Skill.defaultLayer,
     Snapshot.defaultLayer,
+    Plugin.layer,
   ).pipe(Layer.provide(ctx))
 }
 

packages/opencode/src/effect/runtime.ts

@@ -20,10 +20,6 @@ export function runPromiseInstance<A, E>(effect: Effect.Effect<A, E, InstanceSer
   return runtime.runPromise(effect.pipe(Effect.provide(Instances.get(Instance.directory))))
 }
 
-export function runSyncInstance<A, E>(effect: Effect.Effect<A, E, InstanceServices>) {
-  return runtime.runSync(effect.pipe(Effect.provide(Instances.get(Instance.directory))))
-}
-
 export function disposeRuntime() {
   return runtime.dispose()
 }

packages/opencode/src/plugin/index.ts

@@ -1,28 +1,52 @@
 import type { Hooks, PluginInput, Plugin as PluginInstance } from "@opencode-ai/plugin"
-import { Config } from "../config/config"
 import { Bus } from "../bus"
 import { Log } from "../util/log"
 import { createOpencodeClient } from "@opencode-ai/sdk"
-import { Server } from "../server/server"
 import { BunProc } from "../bun"
-import { Instance } from "../project/instance"
 import { Flag } from "../flag/flag"
-import { CodexAuthPlugin } from "./codex"
-import { Session } from "../session"
 import { NamedError } from "@opencode-ai/util/error"
-import { CopilotAuthPlugin } from "./copilot"
+import { Effect, Layer, ServiceMap } from "effect"
-import { gitlabAuthPlugin as GitlabAuthPlugin } from "opencode-gitlab-auth"
+import { InstanceContext } from "@/effect/instance-context"
 
 export namespace Plugin {
   const log = Log.create({ service: "plugin" })
 
-  // Built-in plugins that are directly imported (not installed from npm)
+  export interface Interface {
-  const INTERNAL_PLUGINS: PluginInstance[] = [CodexAuthPlugin, CopilotAuthPlugin, GitlabAuthPlugin]
+    readonly trigger: <
+      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,
+    ) => Effect.Effect<Output>
+    readonly list: () => Effect.Effect<Hooks[]>
+    readonly init: () => Effect.Effect<void>
+  }
 
-  const state = Instance.state(async () => {
+  export class Service extends ServiceMap.Service<Service, Interface>()("@opencode/Plugin") {}
+
+  export const layer = Layer.effect(
+    Service,
+    Effect.gen(function* () {
+      const instance = yield* InstanceContext
+      const hooks: Hooks[] = []
+      let task: Promise<void> | undefined
+
+      const load = Effect.fn("Plugin.load")(function* () {
+        yield* Effect.promise(async () => {
+          const [{ Config }, { Server }, codex, copilot, gitlab] = await Promise.all([
+            import("../config/config"),
+            import("../server/server"),
+            import("./codex"),
+            import("./copilot"),
+            import("opencode-gitlab-auth"),
+          ])
+          const internal: PluginInstance[] = [codex.CodexAuthPlugin, copilot.CopilotAuthPlugin, gitlab.gitlabAuthPlugin]
           const client = createOpencodeClient({
             baseUrl: "http://localhost:4096",
-      directory: Instance.directory,
+            directory: instance.directory,
             headers: Flag.OPENCODE_SERVER_PASSWORD
               ? {
                   Authorization: `Basic ${Buffer.from(`${Flag.OPENCODE_SERVER_USERNAME ?? "opencode"}:${Flag.OPENCODE_SERVER_PASSWORD}`).toString("base64")}`,
@@ -31,19 +55,18 @@ export namespace Plugin {
             fetch: async (...args) => Server.Default().fetch(...args),
           })
           const config = await Config.get()
-    const hooks: Hooks[] = []
           const input: PluginInput = {
             client,
-      project: Instance.project,
+            project: instance.project,
-      worktree: Instance.worktree,
+            worktree: instance.worktree,
-      directory: Instance.directory,
+            directory: instance.directory,
             get serverUrl(): URL {
               return Server.url ?? new URL("http://localhost:4096")
             },
             $: Bun.$,
           }
 
-    for (const plugin of INTERNAL_PLUGINS) {
+          for (const plugin of internal) {
             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 })
@@ -66,11 +89,13 @@ export namespace Plugin {
                 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 })
+                void import("../session").then(({ Session }) =>
                   Bus.publish(Session.Event.Error, {
                     error: new NamedError.Unknown({
                       message: `Failed to install plugin ${pkg}@${version}: ${detail}`,
                     }).toObject(),
-          })
+                  }),
+                )
                 return ""
               })
               if (!plugin) continue
@@ -90,27 +115,36 @@ export namespace Plugin {
               .catch((err) => {
                 const message = err instanceof Error ? err.message : String(err)
                 log.error("failed to load plugin", { path: plugin, error: message })
+                void import("../session").then(({ Session }) =>
                   Bus.publish(Session.Event.Error, {
                     error: new NamedError.Unknown({
                       message: `Failed to load plugin ${plugin}: ${message}`,
                     }).toObject(),
-          })
+                  }),
+                )
               })
           }
-
+        })
-    return {
-      hooks,
-      input,
-    }
       })
 
-  export async function trigger<
+      const ensure = Effect.fn("Plugin.ensure")(function* () {
+        yield* Effect.promise(() => {
+          task ??= Effect.runPromise(
+            load().pipe(Effect.catchCause((cause) => Effect.sync(() => log.error("init failed", { cause })))),
+          )
+          return task
+        })
+      })
+
+      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): Promise<Output> {
+      >(name: Name, input: Input, output: Output) {
         if (!name) return output
-    for (const hook of await state().then((x) => x.hooks)) {
+        yield* ensure()
+        yield* Effect.promise(async () => {
+          for (const hook of hooks) {
             const fn = hook[name]
             if (!fn) continue
             // @ts-expect-error if you feel adventurous, please fix the typing, make sure to bump the try-counter if you
@@ -118,27 +152,55 @@ export namespace Plugin {
             // try-counter: 2
             await fn(input, output)
           }
+        })
         return output
-  }
+      })
 
-  export async function list() {
+      const list = Effect.fn("Plugin.list")(function* () {
-    return state().then((x) => x.hooks)
+        yield* ensure()
-  }
+        return hooks
+      })
 
-  export async function init() {
+      const init = Effect.fn("Plugin.init")(function* () {
-    const hooks = await state().then((x) => x.hooks)
+        yield* ensure()
+        yield* Effect.promise(async () => {
+          const { Config } = await import("../config/config")
           const config = await Config.get()
           for (const hook of hooks) {
-      // @ts-expect-error this is because we haven't moved plugin to sdk v2
+            await (hook as any).config?.(config)
-      await hook.config?.(config)
           }
           Bus.subscribeAll(async (input) => {
-      const hooks = await state().then((x) => x.hooks)
             for (const hook of hooks) {
               hook["event"]?.({
                 event: input,
               })
             }
           })
+        })
+      })
+
+      return Service.of({ trigger, list, init })
+    }),
+  ).pipe(Layer.fresh)
+
+  async function run<A, E>(effect: Effect.Effect<A, E, Service>) {
+    const { runPromiseInstance } = await import("@/effect/runtime")
+    return runPromiseInstance(effect)
+  }
+
+  export async function trigger<
+    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): Promise<Output> {
+    return run(Service.use((svc) => svc.trigger(name, input, output)))
+  }
+
+  export async function list(): Promise<Hooks[]> {
+    return run(Service.use((svc) => svc.list()))
+  }
+
+  export async function init() {
+    return run(Service.use((svc) => svc.init()))
   }
 }

packages/opencode/src/provider/auth-service.ts

@@ -1,4 +1,4 @@
-import type { AuthOuathResult } from "@opencode-ai/plugin"
+import type { AuthOuathResult, Hooks } from "@opencode-ai/plugin"
 import { NamedError } from "@opencode-ai/util/error"
 import * as Auth from "@/auth/effect"
 import { ProviderID } from "./schema"
@@ -6,6 +6,8 @@ import { Array as Arr, Effect, Layer, Record, Result, ServiceMap, Struct } from
 import z from "zod"
 
 export namespace ProviderAuth {
+  type Hook = NonNullable<Hooks["auth"]>
+
   export const Method = z
     .object({
       type: z.union([z.literal("oauth"), z.literal("api")]),
@@ -105,20 +107,26 @@ export namespace ProviderAuth {
     Service,
     Effect.gen(function* () {
       const auth = yield* Auth.Auth.Service
-      const hooks = yield* Effect.promise(async () => {
+      let hooks: Record<ProviderID, Hook> | undefined
-        const mod = await import("../plugin")
-        const plugins = await mod.Plugin.list()
-        return Record.fromEntries(
-          Arr.filterMap(plugins, (x) =>
-            x.auth?.provider !== undefined
-              ? Result.succeed([ProviderID.make(x.auth.provider), x.auth] as const)
-              : Result.failVoid,
-          ),
-        )
-      })
       const pending = new Map<ProviderID, AuthOuathResult>()
 
+      const load = Effect.fn("ProviderAuth.load")(function* () {
+        if (hooks) return hooks
+        hooks = yield* Effect.promise(async () => {
+          const mod = await import("../plugin")
+          const plugins = await mod.Plugin.list()
+          const result = {} as Record<ProviderID, Hook>
+          for (const item of plugins) {
+            if (item.auth?.provider === undefined) continue
+            result[ProviderID.make(item.auth.provider)] = item.auth
+          }
+          return result
+        })
+        return hooks
+      })
+
       const methods = Effect.fn("ProviderAuth.methods")(function* () {
+        const hooks = yield* load()
         return Record.map(hooks, (item) =>
           item.methods.map(
             (method): Method => ({
@@ -152,6 +160,7 @@ export namespace ProviderAuth {
         method: number
         inputs?: Record<string, string>
       }) {
+        const hooks = yield* load()
         const method = hooks[input.providerID].methods[input.method]
         if (method.type !== "oauth") return
 
@@ -178,6 +187,7 @@ export namespace ProviderAuth {
         method: number
         code?: string
       }) {
+        yield* load()
         const match = pending.get(input.providerID)
         if (!match) return yield* Effect.fail(new OauthMissing({ providerID: input.providerID }))
         if (match.method === "code" && !input.code) {

packages/opencode/src/pty/index.ts

@@ -1,12 +1,13 @@
 import { BusEvent } from "@/bus/bus-event"
 import { Bus } from "@/bus"
-import { InstanceContext } from "@/effect/instance-context"
 import { type IPty } from "bun-pty"
 import z from "zod"
 import { Log } from "../util/log"
+import { Instance } from "../project/instance"
 import { lazy } from "@opencode-ai/util/lazy"
+import { Shell } from "@/shell/shell"
+import { Plugin } from "@/plugin"
 import { PtyID } from "./schema"
-import { Effect, Layer, ServiceMap } from "effect"
 
 export namespace Pty {
   const log = Log.create({ service: "pty" })
@@ -89,31 +90,9 @@ export namespace Pty {
     subscribers: Map<unknown, Socket>
   }
 
-  export interface Interface {
+  const state = Instance.state(
-    readonly list: () => Effect.Effect<Info[]>
+    () => new Map<PtyID, ActiveSession>(),
-    readonly get: (id: PtyID) => Effect.Effect<Info | undefined>
+    async (sessions) => {
-    readonly create: (input: CreateInput) => Effect.Effect<Info>
-    readonly update: (id: PtyID, input: UpdateInput) => Effect.Effect<Info | undefined>
-    readonly remove: (id: PtyID) => Effect.Effect<void>
-    readonly resize: (id: PtyID, cols: number, rows: number) => Effect.Effect<void>
-    readonly write: (id: PtyID, data: string) => Effect.Effect<void>
-    readonly connect: (
-      id: PtyID,
-      ws: Socket,
-      cursor?: number,
-    ) => Effect.Effect<{ onMessage: (message: string | ArrayBuffer) => void; onClose: () => void } | undefined>
-  }
-
-  export class Service extends ServiceMap.Service<Service, Interface>()("@opencode/Pty") {}
-
-  export const layer = Layer.effect(
-    Service,
-    Effect.gen(function* () {
-      const instance = yield* InstanceContext
-      const sessions = new Map<PtyID, ActiveSession>()
-
-      yield* Effect.addFinalizer(() =>
-        Effect.sync(() => {
       for (const session of sessions.values()) {
         try {
           session.process.kill()
@@ -121,41 +100,24 @@ export namespace Pty {
         for (const [key, ws] of session.subscribers.entries()) {
           try {
             if (ws.data === key) ws.close()
-              } catch {}
+          } catch {
+            // ignore
+          }
         }
       }
       sessions.clear()
-        }),
+    },
   )
 
-      const removeSession = (id: PtyID) => {
+  export function list() {
-        const session = sessions.get(id)
+    return Array.from(state().values()).map((s) => s.info)
-        if (!session) return
-        sessions.delete(id)
-        log.info("removing session", { id })
-        try {
-          session.process.kill()
-        } catch {}
-        for (const [key, ws] of session.subscribers.entries()) {
-          try {
-            if (ws.data === key) ws.close()
-          } catch {}
-        }
-        session.subscribers.clear()
-        Bus.publish(Event.Deleted, { id: session.info.id })
   }
 
-      const list = Effect.fn("Pty.list")(function* () {
+  export function get(id: PtyID) {
-        return Array.from(sessions.values()).map((s) => s.info)
+    return state().get(id)?.info
-      })
+  }
 
-      const get = Effect.fn("Pty.get")(function* (id: PtyID) {
+  export async function create(input: CreateInput) {
-        return sessions.get(id)?.info
-      })
-
-      const create = Effect.fn("Pty.create")(function* (input: CreateInput) {
-        return yield* Effect.promise(async () => {
-          const [{ Shell }, { Plugin }] = await Promise.all([import("@/shell/shell"), import("@/plugin")])
     const id = PtyID.ascending()
     const command = input.command || Shell.preferred()
     const args = input.args || []
@@ -163,7 +125,7 @@ export namespace Pty {
       args.push("-l")
     }
 
-          const cwd = input.cwd || instance.directory
+    const cwd = input.cwd || Instance.directory
     const shellEnv = await Plugin.trigger("shell.env", { cwd }, { env: {} })
     const env = {
       ...process.env,
@@ -204,8 +166,9 @@ export namespace Pty {
       cursor: 0,
       subscribers: new Map(),
     }
-          sessions.set(id, session)
+    state().set(id, session)
-          ptyProcess.onData((chunk) => {
+    ptyProcess.onData(
+      Instance.bind((chunk) => {
         session.cursor += chunk.length
 
         for (const [key, ws] of session.subscribers.entries()) {
@@ -213,10 +176,12 @@ export namespace Pty {
             session.subscribers.delete(key)
             continue
           }
+
           if (ws.data !== key) {
             session.subscribers.delete(key)
             continue
           }
+
           try {
             ws.send(chunk)
           } catch {
@@ -229,21 +194,23 @@ export namespace Pty {
         const excess = session.buffer.length - BUFFER_LIMIT
         session.buffer = session.buffer.slice(excess)
         session.bufferCursor += excess
-          })
+      }),
-          ptyProcess.onExit(({ exitCode }) => {
+    )
+    ptyProcess.onExit(
+      Instance.bind(({ exitCode }) => {
         if (session.info.status === "exited") return
         log.info("session exited", { id, exitCode })
         session.info.status = "exited"
         Bus.publish(Event.Exited, { id, exitCode })
-            removeSession(id)
+        remove(id)
-          })
+      }),
+    )
     Bus.publish(Event.Created, { info })
     return info
-        })
+  }
-      })
 
-      const update = Effect.fn("Pty.update")(function* (id: PtyID, input: UpdateInput) {
+  export async function update(id: PtyID, input: UpdateInput) {
-        const session = sessions.get(id)
+    const session = state().get(id)
     if (!session) return
     if (input.title) {
       session.info.title = input.title
@@ -253,35 +220,54 @@ export namespace Pty {
     }
     Bus.publish(Event.Updated, { info: session.info })
     return session.info
-      })
+  }
 
-      const remove = Effect.fn("Pty.remove")(function* (id: PtyID) {
+  export async function remove(id: PtyID) {
-        removeSession(id)
+    const session = state().get(id)
-      })
+    if (!session) return
+    state().delete(id)
+    log.info("removing session", { id })
+    try {
+      session.process.kill()
+    } catch {}
+    for (const [key, ws] of session.subscribers.entries()) {
+      try {
+        if (ws.data === key) ws.close()
+      } catch {
+        // ignore
+      }
+    }
+    session.subscribers.clear()
+    Bus.publish(Event.Deleted, { id: session.info.id })
+  }
 
-      const resize = Effect.fn("Pty.resize")(function* (id: PtyID, cols: number, rows: number) {
+  export function resize(id: PtyID, cols: number, rows: number) {
-        const session = sessions.get(id)
+    const session = state().get(id)
     if (session && session.info.status === "running") {
       session.process.resize(cols, rows)
     }
-      })
+  }
 
-      const write = Effect.fn("Pty.write")(function* (id: PtyID, data: string) {
+  export function write(id: PtyID, data: string) {
-        const session = sessions.get(id)
+    const session = state().get(id)
     if (session && session.info.status === "running") {
       session.process.write(data)
     }
-      })
+  }
 
-      const connect = Effect.fn("Pty.connect")(function* (id: PtyID, ws: Socket, cursor?: number) {
+  export function connect(id: PtyID, ws: Socket, cursor?: number) {
-        const session = sessions.get(id)
+    const session = state().get(id)
     if (!session) {
       ws.close()
       return
     }
     log.info("client connected to session", { id })
 
+    // Use ws.data as the unique key for this connection lifecycle.
+    // If ws.data is undefined, fallback to ws object.
     const connectionKey = ws.data && typeof ws.data === "object" ? ws.data : ws
+
+    // Optionally cleanup if the key somehow exists
     session.subscribers.delete(connectionKey)
     session.subscribers.set(connectionKey, ws)
 
@@ -331,55 +317,5 @@ export namespace Pty {
         cleanup()
       },
     }
-      })
-
-      return Service.of({ list, get, create, update, remove, resize, write, connect })
-    }),
-  )
-
-  function runtime() {
-    return require("@/effect/runtime") as typeof import("@/effect/runtime")
-  }
-
-  function run<A, E>(effect: Effect.Effect<A, E, Service>) {
-    return runtime().runPromiseInstance(effect)
-  }
-
-  function runSync<A, E>(effect: Effect.Effect<A, E, Service>) {
-    return runtime().runSyncInstance(effect)
-  }
-
-  // Sync facades
-  export function list() {
-    return runSync(Service.use((svc) => svc.list()))
-  }
-
-  export function get(id: PtyID) {
-    return runSync(Service.use((svc) => svc.get(id)))
-  }
-
-  export function resize(id: PtyID, cols: number, rows: number) {
-    runSync(Service.use((svc) => svc.resize(id, cols, rows)))
-  }
-
-  export function write(id: PtyID, data: string) {
-    runSync(Service.use((svc) => svc.write(id, data)))
-  }
-
-  export function connect(id: PtyID, ws: Socket, cursor?: number) {
-    return runSync(Service.use((svc) => svc.connect(id, ws, cursor)))
-  }
-
-  // Async facades
-  export async function create(input: CreateInput) {
-    return run(Service.use((svc) => svc.create(input)))
-  }
-
-  export async function update(id: PtyID, input: UpdateInput) {
-    return run(Service.use((svc) => svc.update(id, input)))
-  }
-
-  export async function remove(id: PtyID) {
-    return run(Service.use((svc) => svc.remove(id)))
   }
 }

packages/opencode/test/file/watcher.test.ts

@@ -16,7 +16,7 @@ const describeWatcher = FileWatcher.hasNativeBinding() && !process.env.CI ? desc
 // Helpers
 // ---------------------------------------------------------------------------
 
-type BusUpdate = { directory?: string; payload: { type: string; properties: WatcherEvent } }
+type BusUpdate = { directory?: string; payload: { type: string; properties: Record<string, unknown> } }
 type WatcherEvent = { file: string; event: "add" | "change" | "unlink" }
 
 /** Run `body` with a live FileWatcher service. */
@@ -40,18 +40,18 @@ function listen(directory: string, check: (evt: WatcherEvent) => boolean, hit: (
     if (done) return
     if (evt.directory !== directory) return
     if (evt.payload.type !== FileWatcher.Event.Updated.type) return
-    if (!check(evt.payload.properties)) return
+    const props = evt.payload.properties as WatcherEvent
-    hit(evt.payload.properties)
+    if (!check(props)) return
+    hit(props)
   }
 
-  function cleanup() {
+  GlobalBus.on("event", on)
+
+  return () => {
     if (done) return
     done = true
     GlobalBus.off("event", on)
   }
-
-  GlobalBus.on("event", on)
-  return cleanup
 }
 
 function wait(directory: string, check: (evt: WatcherEvent) => boolean) {