refactor(core): consolidate tool architecture

packages/core/src/plugin.ts

@@ -1,46 +1,43 @@
-export * as PluginV2 from "./plugin"
+export * as Plugin from "./plugin"
+export { Event, ID, Info } from "@opencode-ai/schema/plugin"
 
-import type { Plugin } from "@opencode-ai/plugin/v2/effect/plugin"
-import { Event, ID, type Info } from "@opencode-ai/schema/plugin"
+import { Plugin } from "@opencode-ai/schema/plugin"
 import { makeLocationNode } from "@opencode-ai/util/effect/app-node"
 import { App } from "./app"
 import { Context, Effect, Exit, Layer, Scope, Semaphore } from "effect"
-import { AgentV2 } from "./agent"
+import { Agent } from "./agent"
 import { AISDK } from "./aisdk"
 import { Catalog } from "./catalog"
-import { CommandV2 } from "./command"
-import { EventV2 } from "./event"
+import { Command } from "./command"
+import { Bus } from "./bus"
 import { Integration } from "./integration"
 import { Location } from "./location"
 import { PluginHost } from "./plugin/host"
 import { PluginRuntime } from "./plugin/runtime"
 import { WebSearch } from "./websearch"
 import { Reference } from "./reference"
-import { SkillV2 } from "./skill"
+import { Skill } from "./skill"
 import { State } from "./state"
-import { ToolRegistry } from "./tool/registry"
-import { ToolHooks } from "./tool/hooks"
+import { Tool } from "./tool"
 import { PluginHooks } from "./plugin/hooks"
 
 export interface Interface {
   readonly activate: (plugins: readonly Versioned[]) => Effect.Effect<void>
-  readonly list: () => Effect.Effect<Info[]>
+  readonly list: () => Effect.Effect<Plugin.Info[]>
 }
 
-export interface Versioned extends Plugin {
-  readonly version: string
-}
+export type Versioned = import("@opencode-ai/plugin/effect/plugin").Plugin & { readonly version: string }
 
-export class Service extends Context.Service<Service, Interface>()("@opencode/v2/Plugin") {}
+export class Service extends Context.Service<Service, Interface>()("@opencode/Plugin") {}
 
 const layer = Layer.effect(
   Service,
   Effect.gen(function* () {
-    const events = yield* EventV2.Service
+    const bus = yield* Bus.Service
     const scope = yield* Scope.make()
-    const active = new Map<typeof ID.Type, { readonly plugin: Versioned; readonly scope: Scope.Closeable }>()
+    const active = new Map<Plugin.ID, { readonly plugin: Versioned; readonly scope: Scope.Closeable }>()
     const lock = Semaphore.makeUnsafe(1)
-    let host: Parameters<Plugin["effect"]>[0]
+    let host: Parameters<import("@opencode-ai/plugin/effect/plugin").Plugin["effect"]>[0]
 
     const load = Effect.fnUntraced(function* (plugin: Versioned) {
       const child = yield* Scope.fork(scope)
@@ -49,7 +46,7 @@ const layer = Layer.effect(
         inherit,
         Effect.updateContext((_context: Context.Context<never>) => Context.make(Scope.Scope, child)),
         Effect.withSpan("Plugin.load", { attributes: { "plugin.id": plugin.id } }),
-        Effect.andThen(events.publish(Event.Added, { id: ID.make(plugin.id) })),
+        Effect.andThen(bus.publish(Plugin.Event.Added, { id: Plugin.ID.make(plugin.id) })),
         Effect.onExit((exit) => (Exit.isFailure(exit) ? Scope.close(child, exit) : Effect.void)),
         Effect.exit,
       )
@@ -62,8 +59,8 @@ const layer = Layer.effect(
     })
 
     const activate = Effect.fn("Plugin.activate")(function* (plugins: readonly Versioned[]) {
-      const definitions = plugins.map((plugin) => ({ ...plugin, id: ID.make(plugin.id) }))
-      const ids = new Set<typeof ID.Type>()
+      const definitions = plugins.map((plugin) => ({ ...plugin, id: Plugin.ID.make(plugin.id) }))
+      const ids = new Set<Plugin.ID>()
       for (const definition of definitions) {
         if (ids.has(definition.id)) yield* Effect.die(new Error(`Duplicate plugin ID: ${definition.id}`))
         ids.add(definition.id)
@@ -118,7 +115,7 @@ const layer = Layer.effect(
               })
             }),
           )
-          yield* events.publish(Event.Updated, {})
+          yield* bus.publish(Plugin.Event.Updated, {})
         }),
       )
     })
@@ -145,18 +142,17 @@ export const node = makeLocationNode({
   service: Service,
   layer,
   deps: [
-    EventV2.node,
+    Bus.node,
     App.node,
-    AgentV2.node,
+    Agent.node,
     AISDK.node,
     Catalog.node,
-    CommandV2.node,
+    Command.node,
     Integration.node,
     Location.node,
     Reference.node,
-    SkillV2.node,
-    ToolRegistry.toolsNode,
-    ToolHooks.node,
+    Skill.node,
+    Tool.node,
     PluginHooks.node,
     PluginRuntime.node,
     WebSearch.node,