refactor: switch Plugin to direct self-reexport imports

packages/opencode/src/agent/agent.ts

@@ -17,7 +17,7 @@ import { Permission } from "@/permission"
 import { mergeDeep, pipe, sortBy, values } from "remeda"
 import { Global } from "@/global"
 import path from "path"
-import { Plugin } from "@/plugin"
+import { Plugin } from "@/plugin/plugin"
 import { Skill } from "../skill"
 import { Effect, Context, Layer } from "effect"
 import { InstanceState } from "@/effect"

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

@@ -1,31 +1,33 @@
 import z from "zod"
 import type { ZodType } from "zod"
 
-export type Definition = ReturnType<typeof define>
+export namespace BusEvent {
+  export type Definition = ReturnType<typeof define>
 
-const registry = new Map<string, Definition>()
+  const registry = new Map<string, Definition>()
 
-export function define<Type extends string, Properties extends ZodType>(type: Type, properties: Properties) {
-  const result = {
-    type,
-    properties,
+  export function define<Type extends string, Properties extends ZodType>(type: Type, properties: Properties) {
+    const result = {
+      type,
+      properties,
+    }
+    registry.set(type, result)
+    return result
   }
-  registry.set(type, result)
-  return result
-}
 
-export function payloads() {
-  return registry
-    .entries()
-    .map(([type, def]) => {
-      return z
-        .object({
-          type: z.literal(type),
-          properties: def.properties,
-        })
-        .meta({
-          ref: `Event.${def.type}`,
-        })
-    })
-    .toArray()
+  export function payloads() {
+    return registry
+      .entries()
+      .map(([type, def]) => {
+        return z
+          .object({
+            type: z.literal(type),
+            properties: def.properties,
+          })
+          .meta({
+            ref: `Event.${def.type}`,
+          })
+      })
+      .toArray()
+  }
 }

packages/opencode/src/bus/bus.ts

@@ -2,7 +2,7 @@ import z from "zod"
 import { Effect, Exit, Layer, PubSub, Scope, Context, Stream } from "effect"
 import { EffectBridge } from "@/effect"
 import { Log } from "../util"
-import * as BusEvent from "./bus-event"
+import { BusEvent } from "./bus-event"
 import { GlobalBus } from "./global"
 import { InstanceState } from "@/effect"
 import { makeRuntime } from "@/effect/run-service"

packages/opencode/src/bus/index.ts

@@ -1,2 +1 @@
 export * as Bus from "./bus"
-export * as BusEvent from "./bus-event"

packages/opencode/src/cli/cmd/providers.ts

@@ -9,7 +9,7 @@ import path from "path"
 import os from "os"
 import { Config } from "../../config"
 import { Global } from "../../global"
-import { Plugin } from "../../plugin"
+import { Plugin } from "../../plugin/plugin"
 import { Instance } from "../../project/instance"
 import type { Hooks } from "@opencode-ai/plugin"
 import { Process } from "../../util"

packages/opencode/src/cli/cmd/tui/event.ts

@@ -1,4 +1,4 @@
-import { BusEvent } from "@/bus"
+import { BusEvent } from "@/bus/bus-event"
 import { SessionID } from "@/session/schema"
 import z from "zod"
 

packages/opencode/src/command/command.ts

@@ -1,4 +1,4 @@
-import { BusEvent } from "@/bus"
+import { BusEvent } from "@/bus/bus-event"
 import { InstanceState } from "@/effect"
 import { EffectBridge } from "@/effect"
 import type { InstanceContext } from "@/project/instance"

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

@@ -3,7 +3,7 @@ import { setTimeout as sleep } from "node:timers/promises"
 import { fn } from "@/util/fn"
 import { Database, asc, eq, inArray } from "@/storage"
 import { Project } from "@/project"
-import { BusEvent } from "@/bus"
+import { BusEvent } from "@/bus/bus-event"
 import { GlobalBus } from "@/bus/global"
 import { SyncEvent } from "@/sync"
 import { EventTable } from "@/sync/event.sql"

packages/opencode/src/effect/app-runtime.ts

@@ -14,7 +14,7 @@ import { File } from "@/file"
 import { FileWatcher } from "@/file/watcher"
 import { Storage } from "@/storage"
 import { Snapshot } from "@/snapshot"
-import { Plugin } from "@/plugin"
+import { Plugin } from "@/plugin/plugin"
 import { Provider } from "@/provider"
 import { ProviderAuth } from "@/provider"
 import { Agent } from "@/agent/agent"

packages/opencode/src/effect/bootstrap-runtime.ts

@@ -1,7 +1,7 @@
 import { Layer, ManagedRuntime } from "effect"
 import { memoMap } from "./run-service"
 
-import { Plugin } from "@/plugin"
+import { Plugin } from "@/plugin/plugin"
 import { LSP } from "@/lsp"
 import { FileWatcher } from "@/file/watcher"
 import { Format } from "@/format"

packages/opencode/src/file/file.ts

@@ -1,4 +1,4 @@
-import { BusEvent } from "@/bus"
+import { BusEvent } from "@/bus/bus-event"
 import { InstanceState } from "@/effect"
 
 import { AppFileSystem } from "@opencode-ai/shared/filesystem"

packages/opencode/src/file/watcher.ts

@@ -6,7 +6,7 @@ import { readdir } from "fs/promises"
 import path from "path"
 import z from "zod"
 import { Bus } from "@/bus"
-import { BusEvent } from "@/bus"
+import { BusEvent } from "@/bus/bus-event"
 import { InstanceState } from "@/effect"
 import { Flag } from "@/flag/flag"
 import { Git } from "@/git"

packages/opencode/src/ide/ide.ts

@@ -1,4 +1,4 @@
-import { BusEvent } from "@/bus"
+import { BusEvent } from "@/bus/bus-event"
 import z from "zod"
 import { NamedError } from "@opencode-ai/shared/util/error"
 import { Log } from "../util"

packages/opencode/src/installation/installation.ts

@@ -5,7 +5,7 @@ import { withTransientReadRetry } from "@/util/effect-http-client"
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process"
 import path from "path"
 import z from "zod"
-import { BusEvent } from "@/bus"
+import { BusEvent } from "@/bus/bus-event"
 import { Flag } from "../flag/flag"
 import { Log } from "../util"
 

packages/opencode/src/lsp/client.ts

@@ -1,4 +1,4 @@
-import { BusEvent } from "@/bus"
+import { BusEvent } from "@/bus/bus-event"
 import { Bus } from "@/bus"
 import path from "path"
 import { pathToFileURL, fileURLToPath } from "url"

packages/opencode/src/lsp/lsp.ts

@@ -1,4 +1,4 @@
-import { BusEvent } from "@/bus"
+import { BusEvent } from "@/bus/bus-event"
 import { Bus } from "@/bus"
 import { Log } from "../util"
 import * as LSPClient from "./client"

packages/opencode/src/mcp/mcp.ts

@@ -21,7 +21,7 @@ import { AppFileSystem } from "@opencode-ai/shared/filesystem"
 import { McpOAuthProvider } from "./oauth-provider"
 import { McpOAuthCallback } from "./oauth-callback"
 import { McpAuth } from "./auth"
-import { BusEvent } from "../bus"
+import { BusEvent } from "../bus/bus-event"
 import { Bus } from "@/bus"
 import { TuiEvent } from "@/cli/cmd/tui/event"
 import open from "open"

packages/opencode/src/permission/permission.ts

@@ -1,5 +1,5 @@
 import { Bus } from "@/bus"
-import { BusEvent } from "@/bus"
+import { BusEvent } from "@/bus/bus-event"
 import { Config } from "@/config"
 import { InstanceState } from "@/effect"
 import { ProjectID } from "@/project/schema"

packages/opencode/src/plugin/index.ts

@@ -1 +0,0 @@
-export * as Plugin from "./plugin"

packages/opencode/src/plugin/plugin.ts

@@ -285,3 +285,5 @@ export const layer = Layer.effect(
 )
 
 export const defaultLayer = layer.pipe(Layer.provide(Bus.layer), Layer.provide(Config.defaultLayer))
+
+export * as Plugin from "./plugin"

packages/opencode/src/project/bootstrap.ts

@@ -1,4 +1,4 @@
-import { Plugin } from "../plugin"
+import { Plugin } from "../plugin/plugin"
 import { Format } from "../format"
 import { LSP } from "../lsp"
 import { File } from "../file"

packages/opencode/src/project/project.ts

@@ -4,7 +4,7 @@ import { ProjectTable } from "./project.sql"
 import { SessionTable } from "../session/session.sql"
 import { Log } from "../util"
 import { Flag } from "@/flag/flag"
-import { BusEvent } from "@/bus"
+import { BusEvent } from "@/bus/bus-event"
 import { GlobalBus } from "@/bus/global"
 import { which } from "../util/which"
 import { ProjectID } from "./schema"

packages/opencode/src/project/vcs.ts

@@ -2,7 +2,7 @@ import { Effect, Layer, Context, Stream, Scope } from "effect"
 import { formatPatch, structuredPatch } from "diff"
 import path from "path"
 import { Bus } from "@/bus"
-import { BusEvent } from "@/bus"
+import { BusEvent } from "@/bus/bus-event"
 import { InstanceState } from "@/effect"
 import { AppFileSystem } from "@opencode-ai/shared/filesystem"
 import { FileWatcher } from "@/file/watcher"

packages/opencode/src/provider/auth.ts

@@ -4,7 +4,7 @@ import { Auth } from "@/auth"
 import { InstanceState } from "@/effect"
 import { zod } from "@/util/effect-zod"
 import { withStatics } from "@/util/schema"
-import { Plugin } from "../plugin"
+import { Plugin } from "../plugin/plugin"
 import { ProviderID } from "./schema"
 import { Array as Arr, Effect, Layer, Record, Result, Context, Schema } from "effect"
 import z from "zod"

packages/opencode/src/provider/provider.ts

@@ -7,7 +7,7 @@ import { NoSuchModelError, type Provider as SDK } from "ai"
 import { Log } from "../util"
 import { Npm } from "../npm"
 import { Hash } from "@opencode-ai/shared/util/hash"
-import { Plugin } from "../plugin"
+import { Plugin } from "../plugin/plugin"
 import { NamedError } from "@opencode-ai/shared/util/error"
 import { type LanguageModelV3 } from "@ai-sdk/provider"
 import * as ModelsDev from "./models"

packages/opencode/src/pty/service.ts

@@ -1,4 +1,4 @@
-import { BusEvent } from "@/bus"
+import { BusEvent } from "@/bus/bus-event"
 import { Bus } from "@/bus"
 import { InstanceState } from "@/effect"
 import { Instance } from "@/project/instance"
@@ -7,7 +7,7 @@ import z from "zod"
 import { Log } from "../util"
 import { lazy } from "@opencode-ai/shared/util/lazy"
 import { Shell } from "@/shell/shell"
-import { Plugin } from "@/plugin"
+import { Plugin } from "@/plugin/plugin"
 import { PtyID } from "./schema"
 import { Effect, Layer, Context } from "effect"
 import { EffectBridge } from "@/effect"

packages/opencode/src/question/index.ts

@@ -1,6 +1,6 @@
 import { Deferred, Effect, Layer, Schema, Context } from "effect"
 import { Bus } from "@/bus"
-import { BusEvent } from "@/bus"
+import { BusEvent } from "@/bus/bus-event"
 import { InstanceState } from "@/effect"
 import { SessionID, MessageID } from "@/session/schema"
 import { zod } from "@/util/effect-zod"

packages/opencode/src/server/event.ts

@@ -1,4 +1,4 @@
-import { BusEvent } from "@/bus"
+import { BusEvent } from "@/bus/bus-event"
 import z from "zod"
 
 export const Event = {

packages/opencode/src/server/instance/event.ts

@@ -3,7 +3,7 @@ import { Hono } from "hono"
 import { describeRoute, resolver } from "hono-openapi"
 import { streamSSE } from "hono/streaming"
 import { Log } from "@/util"
-import { BusEvent } from "@/bus"
+import { BusEvent } from "@/bus/bus-event"
 import { Bus } from "@/bus"
 import { AsyncQueue } from "../../util/queue"
 

packages/opencode/src/server/instance/global.ts

@@ -3,7 +3,7 @@ import { describeRoute, resolver, validator } from "hono-openapi"
 import { streamSSE } from "hono/streaming"
 import { Effect } from "effect"
 import z from "zod"
-import { BusEvent } from "@/bus"
+import { BusEvent } from "@/bus/bus-event"
 import { SyncEvent } from "@/sync"
 import { GlobalBus } from "@/bus/global"
 import { AppRuntime } from "@/effect/app-runtime"

packages/opencode/src/session/compaction.ts

@@ -1,4 +1,4 @@
-import { BusEvent } from "@/bus"
+import { BusEvent } from "@/bus/bus-event"
 import { Bus } from "@/bus"
 import * as Session from "./session"
 import { SessionID, MessageID, PartID } from "./schema"
@@ -9,7 +9,7 @@ import { Token } from "../util"
 import { Log } from "../util"
 import { SessionProcessor } from "./processor"
 import { Agent } from "@/agent/agent"
-import { Plugin } from "@/plugin"
+import { Plugin } from "@/plugin/plugin"
 import { Config } from "@/config"
 import { NotFoundError } from "@/storage"
 import { ModelID, ProviderID } from "@/provider/schema"

packages/opencode/src/session/llm.ts

@@ -10,7 +10,7 @@ import { Config } from "@/config"
 import { Instance } from "@/project/instance"
 import type { Agent } from "@/agent/agent"
 import type { MessageV2 } from "./message-v2"
-import { Plugin } from "@/plugin"
+import { Plugin } from "@/plugin/plugin"
 import { SystemPrompt } from "./system"
 import { Flag } from "@/flag/flag"
 import { Permission } from "@/permission"

packages/opencode/src/session/message-v2.ts

@@ -1,4 +1,4 @@
-import { BusEvent } from "@/bus"
+import { BusEvent } from "@/bus/bus-event"
 import { SessionID, MessageID, PartID } from "./schema"
 import z from "zod"
 import { NamedError } from "@opencode-ai/shared/util/error"

packages/opencode/src/session/processor.ts

@@ -4,7 +4,7 @@ import { Agent } from "@/agent/agent"
 import { Bus } from "@/bus"
 import { Config } from "@/config"
 import { Permission } from "@/permission"
-import { Plugin } from "@/plugin"
+import { Plugin } from "@/plugin/plugin"
 import { Snapshot } from "@/snapshot"
 import * as Session from "./session"
 import { LLM } from "./llm"

packages/opencode/src/session/prompt.ts

@@ -15,7 +15,7 @@ import { Bus } from "../bus"
 import { ProviderTransform } from "../provider"
 import { SystemPrompt } from "./system"
 import { Instruction } from "./instruction"
-import { Plugin } from "../plugin"
+import { Plugin } from "../plugin/plugin"
 import PROMPT_PLAN from "../session/prompt/plan.txt"
 import BUILD_SWITCH from "../session/prompt/build-switch.txt"
 import MAX_STEPS from "../session/prompt/max-steps.txt"

packages/opencode/src/session/session.ts

@@ -1,6 +1,6 @@
 import { Slug } from "@opencode-ai/shared/util/slug"
 import path from "path"
-import { BusEvent } from "@/bus"
+import { BusEvent } from "@/bus/bus-event"
 import { Bus } from "@/bus"
 import { Decimal } from "decimal.js"
 import z from "zod"

packages/opencode/src/session/status.ts

@@ -1,4 +1,4 @@
-import { BusEvent } from "@/bus"
+import { BusEvent } from "@/bus/bus-event"
 import { Bus } from "@/bus"
 import { InstanceState } from "@/effect"
 import { SessionID } from "./schema"

packages/opencode/src/session/todo.ts

@@ -1,4 +1,4 @@
-import { BusEvent } from "@/bus"
+import { BusEvent } from "@/bus/bus-event"
 import { Bus } from "@/bus"
 import { SessionID } from "./schema"
 import { Effect, Layer, Context } from "effect"

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

@@ -3,7 +3,7 @@ import type { ZodObject } from "zod"
 import { Database, eq } from "@/storage"
 import { GlobalBus } from "@/bus/global"
 import { Bus as ProjectBus } from "@/bus"
-import { BusEvent } from "@/bus"
+import { BusEvent } from "@/bus/bus-event"
 import { Instance } from "@/project/instance"
 import { EventSequenceTable, EventTable } from "./event.sql"
 import { WorkspaceContext } from "@/control-plane/workspace-context"

packages/opencode/src/tool/bash.ts

@@ -16,7 +16,7 @@ import { Shell } from "@/shell/shell"
 
 import { BashArity } from "@/permission/arity"
 import * as Truncate from "./truncate"
-import { Plugin } from "@/plugin"
+import { Plugin } from "@/plugin/plugin"
 import { Effect, Stream } from "effect"
 import { ChildProcess } from "effect/unstable/process"
 import { ChildProcessSpawner } from "effect/unstable/process/ChildProcessSpawner"

packages/opencode/src/tool/registry.ts

@@ -16,7 +16,7 @@ import * as Tool from "./tool"
 import { Config } from "../config"
 import { type ToolContext as PluginToolContext, type ToolDefinition } from "@opencode-ai/plugin"
 import z from "zod"
-import { Plugin } from "../plugin"
+import { Plugin } from "../plugin/plugin"
 import { Provider } from "../provider"
 import { ProviderID, type ModelID } from "../provider/schema"
 import { WebSearchTool } from "./websearch"

packages/opencode/src/worktree/worktree.ts

@@ -10,7 +10,7 @@ import type { ProjectID } from "../project/schema"
 import { Log } from "../util"
 import { Slug } from "@opencode-ai/shared/util/slug"
 import { errorMessage } from "../util/error"
-import { BusEvent } from "@/bus"
+import { BusEvent } from "@/bus/bus-event"
 import { GlobalBus } from "@/bus/global"
 import { Git } from "@/git"
 import { Effect, Layer, Path, Scope, Context, Stream } from "effect"

packages/opencode/test/bus/bus-effect.test.ts

@@ -2,7 +2,7 @@ import { describe, expect } from "bun:test"
 import { Deferred, Effect, Layer, Stream } from "effect"
 import z from "zod"
 import { Bus } from "../../src/bus"
-import { BusEvent } from "../../src/bus"
+import { BusEvent } from "../../src/bus/bus-event"
 import { Instance } from "../../src/project/instance"
 import * as CrossSpawnSpawner from "../../src/effect/cross-spawn-spawner"
 import { provideInstance, provideTmpdirInstance, tmpdirScoped } from "../fixture/fixture"

packages/opencode/test/bus/bus-integration.test.ts

@@ -1,7 +1,7 @@
 import { afterEach, describe, expect, test } from "bun:test"
 import z from "zod"
 import { Bus } from "../../src/bus"
-import { BusEvent } from "../../src/bus"
+import { BusEvent } from "../../src/bus/bus-event"
 import { Instance } from "../../src/project/instance"
 import { tmpdir } from "../fixture/fixture"
 

packages/opencode/test/bus/bus.test.ts

@@ -1,7 +1,7 @@
 import { afterEach, describe, expect, test } from "bun:test"
 import z from "zod"
 import { Bus } from "../../src/bus"
-import { BusEvent } from "../../src/bus"
+import { BusEvent } from "../../src/bus/bus-event"
 import { Instance } from "../../src/project/instance"
 import { tmpdir } from "../fixture/fixture"
 

packages/opencode/test/session/compaction.test.ts

@@ -12,7 +12,7 @@ import { Token } from "../../src/util"
 import { Instance } from "../../src/project/instance"
 import { Log } from "../../src/util"
 import { Permission } from "../../src/permission"
-import { Plugin } from "../../src/plugin"
+import { Plugin } from "../../src/plugin/plugin"
 import { provideTmpdirInstance, tmpdir } from "../fixture/fixture"
 import { Session as SessionNs } from "../../src/session"
 import { MessageV2 } from "../../src/session/message-v2"

packages/opencode/test/session/processor-effect.test.ts

@@ -7,7 +7,7 @@ import { Agent as AgentSvc } from "../../src/agent/agent"
 import { Bus } from "../../src/bus"
 import { Config } from "../../src/config"
 import { Permission } from "../../src/permission"
-import { Plugin } from "../../src/plugin"
+import { Plugin } from "../../src/plugin/plugin"
 import { Provider } from "../../src/provider"
 import { ModelID, ProviderID } from "../../src/provider/schema"
 import { Session } from "../../src/session"

packages/opencode/test/session/prompt-effect.test.ts

@@ -11,7 +11,7 @@ import { FileTime } from "../../src/file/time"
 import { LSP } from "../../src/lsp"
 import { MCP } from "../../src/mcp"
 import { Permission } from "../../src/permission"
-import { Plugin } from "../../src/plugin"
+import { Plugin } from "../../src/plugin/plugin"
 import { Provider as ProviderSvc } from "../../src/provider"
 import { Env } from "../../src/env"
 import { ModelID, ProviderID } from "../../src/provider/schema"

packages/opencode/test/session/snapshot-tool-race.test.ts

@@ -37,7 +37,7 @@ import { FileTime } from "../../src/file/time"
 import { LSP } from "../../src/lsp"
 import { MCP } from "../../src/mcp"
 import { Permission } from "../../src/permission"
-import { Plugin } from "../../src/plugin"
+import { Plugin } from "../../src/plugin/plugin"
 import { Provider as ProviderSvc } from "../../src/provider"
 import { Env } from "../../src/env"
 import { Question } from "../../src/question"

packages/opencode/test/tool/bash.test.ts

@@ -13,7 +13,7 @@ import { Truncate } from "../../src/tool"
 import { SessionID, MessageID } from "../../src/session/schema"
 import * as CrossSpawnSpawner from "../../src/effect/cross-spawn-spawner"
 import { AppFileSystem } from "@opencode-ai/shared/filesystem"
-import { Plugin } from "../../src/plugin"
+import { Plugin } from "../../src/plugin/plugin"
 
 const runtime = ManagedRuntime.make(
   Layer.mergeAll(

packages/opencode/test/tool/edit.test.ts

@@ -11,7 +11,7 @@ import { AppFileSystem } from "@opencode-ai/shared/filesystem"
 import { Format } from "../../src/format"
 import { Agent } from "../../src/agent/agent"
 import { Bus } from "../../src/bus"
-import { BusEvent } from "../../src/bus"
+import { BusEvent } from "../../src/bus/bus-event"
 import { Truncate } from "../../src/tool"
 import { SessionID, MessageID } from "../../src/session/schema"