From 72c4deb90c655a9dbae8541c2deb3b21e1106dfc Mon Sep 17 00:00:00 2001
From: Sebastian Herrlinger <hasta84@gmail.com>
Date: Wed, 4 Mar 2026 21:43:32 +0100
Subject: [PATCH] naming stuff

---
 packages/opencode/src/cli/cmd/tui/plugin.ts | 45 ++++++++++-----------
 packages/opencode/src/config/tui.ts         |  6 +--
 packages/opencode/src/plugin/index.ts       | 10 ++---
 3 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/packages/opencode/src/cli/cmd/tui/plugin.ts b/packages/opencode/src/cli/cmd/tui/plugin.ts
index fad524e9f9..44d918afeb 100644
--- a/packages/opencode/src/cli/cmd/tui/plugin.ts
+++ b/packages/opencode/src/cli/cmd/tui/plugin.ts
@@ -22,39 +22,39 @@ function empty<K extends keyof TuiSlotMap>(_props: { name: K } & TuiSlotMap[K])
   return null
 }
 
-function record(value: unknown): value is Record<string, unknown> {
+function isRecord(value: unknown): value is Record<string, unknown> {
   if (!value || typeof value !== "object") return false
   if (Array.isArray(value)) return false
   return true
 }
 
-function plugin(value: unknown): value is SolidPlugin<TuiSlotMap, TuiSlotContext> {
-  if (!record(value)) return false
+function isTuiSlotPlugin(value: unknown): value is SolidPlugin<TuiSlotMap, TuiSlotContext> {
+  if (!isRecord(value)) return false
   if (typeof value.id !== "string") return false
-  if (!record(value.slots)) return false
+  if (!isRecord(value.slots)) return false
   return true
 }
 
-function pick(value: unknown) {
-  if (plugin(value)) return value
-  if (!record(value)) return
-  if (!plugin(value.slots)) return
+function getTuiSlotPlugin(value: unknown) {
+  if (isTuiSlotPlugin(value)) return value
+  if (!isRecord(value)) return
+  if (!isTuiSlotPlugin(value.slots)) return
   return value.slots
 }
 
-function themes(value: unknown) {
-  if (!record(value) || !("themes" in value)) return
-  if (!record(value.themes)) return
+function getThemes(value: unknown) {
+  if (!isRecord(value) || !("themes" in value)) return
+  if (!isRecord(value.themes)) return
   return value.themes
 }
 
-function run<Renderer>(value: unknown): value is TuiPluginFn<Renderer> {
+function isTuiPlugin<Renderer>(value: unknown): value is TuiPluginFn<Renderer> {
   return typeof value === "function"
 }
 
-function tui<Renderer>(value: unknown) {
-  if (!record(value) || !("tui" in value)) return
-  if (!run<Renderer>(value.tui)) return
+function getTuiPlugin<Renderer>(value: unknown) {
+  if (!isRecord(value) || !("tui" in value)) return
+  if (!isTuiPlugin<Renderer>(value.tui)) return
   return value.tui
 }
 
@@ -87,8 +87,7 @@ export namespace TuiPlugin {
 
     return {
       register(pluginSlot) {
-        if (!plugin(pluginSlot)) return () => {}
-        console.error("[tui.slot] register", pluginSlot.id)
+        if (!isTuiSlotPlugin(pluginSlot)) return () => {}
         return reg.register(pluginSlot)
       },
     }
@@ -146,15 +145,15 @@ export namespace TuiPlugin {
               continue
             }
 
-            const theme = themes(entry)
+            const theme = getThemes(entry)
             if (theme) registerThemes(theme)
 
-            const plugin = pick(entry)
-            if (plugin) input.slots.register(plugin)
+            const slotPlugin = getTuiSlotPlugin(entry)
+            if (slotPlugin) input.slots.register(slotPlugin)
 
-            const run = tui<Renderer>(entry)
-            if (!run) continue
-            await run(input, Config.pluginOptions(item))
+            const tuiPlugin = getTuiPlugin<Renderer>(entry)
+            if (!tuiPlugin) continue
+            await tuiPlugin(input, Config.pluginOptions(item))
           }
         }
       },
diff --git a/packages/opencode/src/config/tui.ts b/packages/opencode/src/config/tui.ts
index eb4418221b..5e8c212a18 100644
--- a/packages/opencode/src/config/tui.ts
+++ b/packages/opencode/src/config/tui.ts
@@ -100,7 +100,7 @@ export namespace TuiConfig {
     await Promise.all(deps)
   }
 
-  function record(value: unknown): value is Record<string, unknown> {
+  function isRecord(value: unknown): value is Record<string, unknown> {
     if (!value || typeof value !== "object") return false
     if (Array.isArray(value)) return false
     return true
@@ -117,14 +117,14 @@ export namespace TuiConfig {
 
   async function load(text: string, configFilepath: string): Promise<Info> {
     const raw = await ConfigPaths.parseText(text, configFilepath, "empty")
-    if (!record(raw)) return {}
+    if (!isRecord(raw)) return {}
 
     // Flatten a nested "tui" key so users who wrote `{ "tui": { ... } }` inside tui.json
     // (mirroring the old opencode.json shape) still get their settings applied.
     const normalized = (() => {
       const copy = { ...raw }
       if (!("tui" in copy)) return copy
-      if (!record(copy.tui)) {
+      if (!isRecord(copy.tui)) {
         delete copy.tui
         return copy
       }
diff --git a/packages/opencode/src/plugin/index.ts b/packages/opencode/src/plugin/index.ts
index 22b49d2288..fe8e01e1a2 100644
--- a/packages/opencode/src/plugin/index.ts
+++ b/packages/opencode/src/plugin/index.ts
@@ -76,14 +76,14 @@ export namespace Plugin {
       return installed
     }
 
-    function plugin(value: unknown): value is PluginInstance {
+    function isServerPlugin(value: unknown): value is PluginInstance {
       return typeof value === "function"
     }
 
-    function pick(value: unknown) {
-      if (plugin(value)) return value
+    function getServerPlugin(value: unknown) {
+      if (isServerPlugin(value)) return value
       if (!value || typeof value !== "object" || !("server" in value)) return
-      if (!plugin(value.server)) return
+      if (!isServerPlugin(value.server)) return
       return value.server
     }
 
@@ -113,7 +113,7 @@ export namespace Plugin {
       for (const entry of Object.values(mod)) {
         if (seen.has(entry)) continue
         seen.add(entry)
-        const server = pick(entry)
+        const server = getServerPlugin(entry)
         if (!server) continue
         const init = await server(input, Config.pluginOptions(item)).catch((err) => {
           const message = err instanceof Error ? err.message : String(err)