From 50a52bf0f1a4ab28f805249651810fcf18b4ff70 Mon Sep 17 00:00:00 2001
From: Kit Langton <kit.langton@gmail.com>
Date: Thu, 16 Apr 2026 11:26:57 -0400
Subject: [PATCH] refactor: switch plugin siblings to self-reexport imports

---
 packages/opencode/src/cli/cmd/tui/plugin/runtime.ts         | 4 ++--
 packages/opencode/src/plugin/github-copilot/index.ts        | 1 -
 packages/opencode/src/plugin/github-copilot/models.ts       | 1 +
 packages/opencode/src/plugin/index.ts                       | 2 --
 packages/opencode/src/plugin/loader.ts                      | 1 +
 packages/opencode/src/plugin/meta.ts                        | 1 +
 packages/opencode/test/plugin/github-copilot-models.test.ts | 2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/plugin/runtime.ts b/packages/opencode/src/cli/cmd/tui/plugin/runtime.ts
index 0bcbcc2ef4..af37ffbd76 100644
--- a/packages/opencode/src/cli/cmd/tui/plugin/runtime.ts
+++ b/packages/opencode/src/cli/cmd/tui/plugin/runtime.ts
@@ -24,8 +24,8 @@ import {
   type PluginPackage,
   type PluginSource,
 } from "@/plugin/shared"
-import { PluginLoader } from "@/plugin"
-import { PluginMeta } from "@/plugin"
+import { PluginLoader } from "@/plugin/loader"
+import { PluginMeta } from "@/plugin/meta"
 import { installPlugin as installModulePlugin, patchPluginConfig, readPluginManifest } from "@/plugin/install"
 import { hasTheme, upsertTheme } from "../context/theme"
 import { Global } from "@/global"
diff --git a/packages/opencode/src/plugin/github-copilot/index.ts b/packages/opencode/src/plugin/github-copilot/index.ts
index 6c55632858..e69de29bb2 100644
--- a/packages/opencode/src/plugin/github-copilot/index.ts
+++ b/packages/opencode/src/plugin/github-copilot/index.ts
@@ -1 +0,0 @@
-export * as CopilotModels from "./models"
diff --git a/packages/opencode/src/plugin/github-copilot/models.ts b/packages/opencode/src/plugin/github-copilot/models.ts
index 56b747b581..6e23dde98f 100644
--- a/packages/opencode/src/plugin/github-copilot/models.ts
+++ b/packages/opencode/src/plugin/github-copilot/models.ts
@@ -142,3 +142,4 @@ export async function get(
 
   return result
 }
+export * as CopilotModels from "./models"
diff --git a/packages/opencode/src/plugin/index.ts b/packages/opencode/src/plugin/index.ts
index b64c13efab..20f38c41c2 100644
--- a/packages/opencode/src/plugin/index.ts
+++ b/packages/opencode/src/plugin/index.ts
@@ -1,3 +1 @@
 export * as Plugin from "./plugin"
-export * as PluginMeta from "./meta"
-export * as PluginLoader from "./loader"
diff --git a/packages/opencode/src/plugin/loader.ts b/packages/opencode/src/plugin/loader.ts
index 6d577594fe..f428b20303 100644
--- a/packages/opencode/src/plugin/loader.ts
+++ b/packages/opencode/src/plugin/loader.ts
@@ -170,3 +170,4 @@ export async function loadExternal<R = Loaded>(input: Input<R>): Promise<R[]> {
   for (const item of out) if (item !== undefined) ready.push(item)
   return ready
 }
+export * as PluginLoader from "./loader"
diff --git a/packages/opencode/src/plugin/meta.ts b/packages/opencode/src/plugin/meta.ts
index b113329967..82c0f1d261 100644
--- a/packages/opencode/src/plugin/meta.ts
+++ b/packages/opencode/src/plugin/meta.ts
@@ -184,3 +184,4 @@ export async function list(): Promise<Store> {
   const file = storePath()
   return Flock.withLock(lock(file), async () => read(file))
 }
+export * as PluginMeta from "./meta"
diff --git a/packages/opencode/test/plugin/github-copilot-models.test.ts b/packages/opencode/test/plugin/github-copilot-models.test.ts
index c6395d065b..f118a62b2f 100644
--- a/packages/opencode/test/plugin/github-copilot-models.test.ts
+++ b/packages/opencode/test/plugin/github-copilot-models.test.ts
@@ -1,5 +1,5 @@
 import { afterEach, expect, mock, test } from "bun:test"
-import { CopilotModels } from "@/plugin/github-copilot"
+import { CopilotModels } from "../../src/plugin/github-copilot/models"
 import { CopilotAuthPlugin } from "@/plugin/github-copilot/copilot"
 
 const originalFetch = globalThis.fetch