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

---
 packages/opencode/src/cli/cmd/tui/config/tui-schema.ts | 4 ++--
 packages/opencode/src/cli/cmd/tui/config/tui.ts        | 4 ++--
 packages/opencode/src/cli/cmd/tui/plugin/runtime.ts    | 2 +-
 packages/opencode/src/config/index.ts                  | 2 --
 packages/opencode/src/config/keybinds.ts               | 1 +
 packages/opencode/src/config/plugin.ts                 | 1 +
 packages/opencode/src/plugin/loader.ts                 | 2 +-
 packages/opencode/test/config/config.test.ts           | 2 +-
 packages/opencode/test/config/tui.test.ts              | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/config/tui-schema.ts b/packages/opencode/src/cli/cmd/tui/config/tui-schema.ts
index 97e6433267..66569efea5 100644
--- a/packages/opencode/src/cli/cmd/tui/config/tui-schema.ts
+++ b/packages/opencode/src/cli/cmd/tui/config/tui-schema.ts
@@ -1,6 +1,6 @@
 import z from "zod"
-import { ConfigPlugin } from "@/config"
-import { ConfigKeybinds } from "@/config"
+import { ConfigPlugin } from "@/config/plugin"
+import { ConfigKeybinds } from "@/config/keybinds"
 
 const KeybindOverride = z
   .object(
diff --git a/packages/opencode/src/cli/cmd/tui/config/tui.ts b/packages/opencode/src/cli/cmd/tui/config/tui.ts
index cac603e36f..6f2c161fb5 100644
--- a/packages/opencode/src/cli/cmd/tui/config/tui.ts
+++ b/packages/opencode/src/cli/cmd/tui/config/tui.ts
@@ -10,8 +10,8 @@ import { Global } from "@/global"
 import { AppFileSystem } from "@opencode-ai/shared/filesystem"
 import { Npm } from "@opencode-ai/shared/npm"
 import { CurrentWorkingDirectory } from "./cwd"
-import { ConfigPlugin } from "@/config"
-import { ConfigKeybinds } from "@/config"
+import { ConfigPlugin } from "@/config/plugin"
+import { ConfigKeybinds } from "@/config/keybinds"
 import { InstallationLocal, InstallationVersion } from "@/installation/version"
 import { makeRuntime } from "@/cli/effect/runtime"
 import { Filesystem, Log } from "@/util"
diff --git a/packages/opencode/src/cli/cmd/tui/plugin/runtime.ts b/packages/opencode/src/cli/cmd/tui/plugin/runtime.ts
index f2f64c8739..af37ffbd76 100644
--- a/packages/opencode/src/cli/cmd/tui/plugin/runtime.ts
+++ b/packages/opencode/src/cli/cmd/tui/plugin/runtime.ts
@@ -36,7 +36,7 @@ import { Flag } from "@/flag/flag"
 import { INTERNAL_TUI_PLUGINS, type InternalTuiPlugin } from "./internal"
 import { setupSlots, Slot as View } from "./slots"
 import type { HostPluginApi, HostSlots } from "./slots"
-import { ConfigPlugin } from "@/config"
+import { ConfigPlugin } from "@/config/plugin"
 
 type PluginLoad = {
   options: ConfigPlugin.Options | undefined
diff --git a/packages/opencode/src/config/index.ts b/packages/opencode/src/config/index.ts
index af58eb21e2..fbcca1aa9a 100644
--- a/packages/opencode/src/config/index.ts
+++ b/packages/opencode/src/config/index.ts
@@ -1,5 +1,3 @@
 export * as Config from "./config"
 export * as ConfigMarkdown from "./markdown"
 export * as ConfigPaths from "./paths"
-export * as ConfigKeybinds from "./keybinds"
-export * as ConfigPlugin from "./plugin"
diff --git a/packages/opencode/src/config/keybinds.ts b/packages/opencode/src/config/keybinds.ts
index 11b77e11fc..fdad79e208 100644
--- a/packages/opencode/src/config/keybinds.ts
+++ b/packages/opencode/src/config/keybinds.ts
@@ -160,3 +160,4 @@ export const Keybinds = z
   .meta({
     ref: "KeybindsConfig",
   })
+export * as ConfigKeybinds from "./keybinds"
diff --git a/packages/opencode/src/config/plugin.ts b/packages/opencode/src/config/plugin.ts
index 99a6e30ca2..d6af1bfe97 100644
--- a/packages/opencode/src/config/plugin.ts
+++ b/packages/opencode/src/config/plugin.ts
@@ -71,3 +71,4 @@ export function deduplicatePluginOrigins(plugins: Origin[]): Origin[] {
 
   return list.toReversed()
 }
+export * as ConfigPlugin from "./plugin"
diff --git a/packages/opencode/src/plugin/loader.ts b/packages/opencode/src/plugin/loader.ts
index 0433dafe9e..0245d311e0 100644
--- a/packages/opencode/src/plugin/loader.ts
+++ b/packages/opencode/src/plugin/loader.ts
@@ -8,7 +8,7 @@ import {
   type PluginPackage,
   type PluginSource,
 } from "./shared"
-import { ConfigPlugin } from "@/config"
+import { ConfigPlugin } from "@/config/plugin"
 import { InstallationVersion } from "@/installation/version"
 
 export namespace PluginLoader {
diff --git a/packages/opencode/test/config/config.test.ts b/packages/opencode/test/config/config.test.ts
index b224e39b94..262d6dfad9 100644
--- a/packages/opencode/test/config/config.test.ts
+++ b/packages/opencode/test/config/config.test.ts
@@ -25,7 +25,7 @@ import { Global } from "../../src/global"
 import { ProjectID } from "../../src/project/schema"
 import { Filesystem } from "../../src/util"
 import * as Network from "../../src/util/network"
-import { ConfigPlugin } from "@/config"
+import { ConfigPlugin } from "../../src/config/plugin"
 import { Npm } from "@opencode-ai/shared/npm"
 
 const emptyAccount = Layer.mock(Account.Service)({
diff --git a/packages/opencode/test/config/tui.test.ts b/packages/opencode/test/config/tui.test.ts
index 522eabd1bd..b9234c3ebc 100644
--- a/packages/opencode/test/config/tui.test.ts
+++ b/packages/opencode/test/config/tui.test.ts
@@ -10,7 +10,7 @@ import { Filesystem } from "../../src/util"
 import { AppRuntime } from "../../src/effect/app-runtime"
 import { Effect, Layer } from "effect"
 import { CurrentWorkingDirectory } from "@/cli/cmd/tui/config/cwd"
-import { ConfigPlugin } from "@/config"
+import { ConfigPlugin } from "../../src/config/plugin"
 
 const wintest = process.platform === "win32" ? test : test.skip
 const clear = (wait = false) => AppRuntime.runPromise(Config.Service.use((svc) => svc.invalidate(wait)))