refactor(tui): align plugin with flat TuiPluginApi and updated slot/route contracts

Author: Tarquinen

index.ts

@@ -18,6 +18,8 @@ import {
 } from "./lib/hooks"
 import { configureClientAuth, isSecureMode } from "./lib/auth"
 
+const id = "opencode-dynamic-context-pruning"
+
 let tuiPlugin: Record<string, unknown> = {}
 try {
     tuiPlugin = (await import("./tui/index")).default
@@ -138,6 +140,7 @@ const server: Plugin = (async (ctx) => {
 }) satisfies Plugin
 
 export default {
+    id,
     server,
     ...tuiPlugin,
 }

tui/data/context.ts

@@ -38,7 +38,7 @@ export const createPlaceholderContextSnapshot = (
 function cleanBlockSummary(raw: string): string {
     return raw
         .replace(/^\s*\[Compressed conversation section\]\s*/i, "")
-        .replace(/\s*<dcp-message-id>b\d+<\/dcp-message-id>\s*$/i, "")
+        .replace(/\s*b\d+<\/dcp-message-id>\s*$/i, "")
         .trim()
 }
 
@@ -73,9 +73,11 @@ const loadContextSnapshot = async (
     }
 
     const messagesResult = await client.session.messages({ sessionID })
-    const messages = Array.isArray(messagesResult.data)
-        ? (messagesResult.data as WithParts[])
-        : ([] as WithParts[])
+    const rawMessages =
+        messagesResult && typeof messagesResult === "object" && "data" in messagesResult
+            ? messagesResult.data
+            : messagesResult
+    const messages = Array.isArray(rawMessages) ? (rawMessages as WithParts[]) : ([] as WithParts[])
 
     const { state, persisted } = await buildState(sessionID, messages, logger)
     const [{ breakdown, messageStatuses }, aggregated] = await Promise.all([

tui/dcp-probe.tsx

@@ -2,7 +2,7 @@
 import type { TuiPlugin } from "@opencode-ai/plugin/tui"
 import { getConfigForDirectory } from "../lib/config"
 import { Logger } from "../lib/logger"
-import { createSidebarTopSlot } from "./slots/sidebar-top"
+import { createSidebarContentSlot } from "./slots/sidebar-content"
 import { createSummaryRoute } from "./routes/summary"
 import { NAMES } from "./shared/names"
 
@@ -22,10 +22,13 @@ const tui: TuiPlugin = async (api) => {
     api.route.register([createSummaryRoute(api)])
 
     if (config.tui.sidebar) {
-        api.slots.register(createSidebarTopSlot(api, NAMES, logger))
+        api.slots.register(createSidebarContentSlot(api, NAMES, logger))
     }
 }
 
+const id = "opencode-dynamic-context-pruning"
+
 export default {
+    id,
     tui,
 }

tui/index.tsx

@@ -1,6 +1,6 @@
 {
     "$schema": "https://json.schemastore.org/package.json",
-    "name": "dcp-tui-probe-local",
+    "name": "dcp-tui-local",
     "private": true,
     "type": "module",
     "dependencies": {

tui/package.json

@@ -1,7 +1,7 @@
 /** @jsxImportSource @opentui/solid */
 import { createMemo, createSignal, For, Show } from "solid-js"
 import { useKeyboard } from "@opentui/solid"
-import type { TuiApi } from "@opencode-ai/plugin/tui"
+import type { TuiPluginApi } from "@opencode-ai/plugin/tui"
 import { getPalette, type DcpPalette } from "../shared/theme"
 import { LABEL, NAMES } from "../shared/names"
 
@@ -23,6 +23,9 @@ interface ParsedSummary {
     sections: CollapsibleSection[]
 }
 
+// These patterns must stay in sync with the exact headings produced by
+// lib/compress (compactSummary output). If compression wording changes,
+// update these patterns accordingly.
 const SECTION_HEADINGS: { pattern: RegExp; label: string }[] = [
     {
         pattern: /\n*The following user messages were sent in this conversation verbatim:/,
@@ -99,13 +102,9 @@ function CollapsibleSectionRow(props: { section: CollapsibleSection; palette: Dc
     )
 }
 
-function SummaryScreen(props: { api: TuiApi }) {
-    const params = createMemo(() => {
-        const current = props.api.route.current
-        return ("params" in current ? current.params : {}) as SummaryRouteParams
-    })
+function SummaryScreen(props: { api: TuiPluginApi; params: SummaryRouteParams }) {
     const palette = createMemo(() => getPalette(props.api.theme.current as Record<string, unknown>))
-    const parsed = createMemo(() => parseSummary(params().summary || ""))
+    const parsed = createMemo(() => parseSummary(props.params.summary || ""))
 
     const keys = props.api.keybind.create({ close: "escape" })
 
@@ -116,7 +115,7 @@ function SummaryScreen(props: { api: TuiApi }) {
         if (!matched) return
         evt.preventDefault()
         evt.stopPropagation()
-        const sessionID = params().sessionID
+        const sessionID = props.params.sessionID
         if (sessionID) {
             props.api.route.navigate("session", { sessionID })
         } else {
@@ -139,7 +138,7 @@ function SummaryScreen(props: { api: TuiApi }) {
                     </text>
                 </box>
                 <text fg={palette().accent}>
-                    <b>{params().topic || "Compression Summary"}</b>
+                    <b>{props.params.topic || "Compression Summary"}</b>
                 </text>
             </box>
 
@@ -168,7 +167,9 @@ function SummaryScreen(props: { api: TuiApi }) {
     )
 }
 
-export const createSummaryRoute = (api: TuiApi) => ({
+export const createSummaryRoute = (api: TuiPluginApi) => ({
     name: NAMES.routes.summary,
-    render: () => <SummaryScreen api={api} />,
+    render: (input: { params?: Record<string, unknown> }) => (
+        <SummaryScreen api={api} params={(input.params ?? {}) as SummaryRouteParams} />
+    ),
 })

tui/routes/summary.tsx

@@ -467,7 +467,7 @@ const SidebarContext = (props: {
     )
 }
 
-export const createSidebarTopSlot = (
+export const createSidebarContentSlot = (
     api: DcpTuiApi,
     names: DcpRouteNames,
     logger: Logger,

tui/slots/sidebar-top.tsx tui/slots/sidebar-content.tsxtui/slots/sidebar-top.tsx renamed to tui/slots/sidebar-content.tsx

@@ -81,16 +81,16 @@ declare module "@opencode-ai/plugin/tui" {
     }
 
     export type TuiDialogProps = {
-        size?: "medium" | "large"
+        size?: "medium" | "large" | "xlarge"
         onClose: () => void
         children?: JSX.Element
     }
 
     export type TuiDialogStack = {
         replace: (render: () => JSX.Element, onClose?: () => void) => void
         clear: () => void
-        setSize: (size: "medium" | "large") => void
-        readonly size: "medium" | "large"
+        setSize: (size: "medium" | "large" | "xlarge") => void
+        readonly size: "medium" | "large" | "xlarge"
         readonly depth: number
         readonly open: boolean
     }
@@ -247,9 +247,17 @@ declare module "@opencode-ai/plugin/tui" {
         mcp: () => ReadonlyArray<TuiSidebarMcpItem>
     }
 
-    // Inlined: Pick<PluginConfig, "$schema" | "theme" | "keybinds" | "plugin"> & NonNullable<PluginConfig["tui"]>
+    // Upstream: Pick<PluginConfig, "$schema" | "theme" | "keybinds" | "plugin"> & NonNullable<PluginConfig["tui"]> & { plugin_enabled?: Record<string, boolean> }
     // PluginConfig (opencode.json schema) is not re-exported by @opencode-ai/plugin at installed version.
-    type TuiConfigView = Record<string, unknown>
+    // Approximation using known TUI-native config keys:
+    type TuiConfigView = {
+        $schema?: string
+        theme?: string
+        keybinds?: Record<string, string>
+        plugin?: Record<string, unknown>
+        plugin_enabled?: Record<string, boolean>
+        [key: string]: unknown
+    }
 
     type Frozen<Value> = Value extends (...args: never[]) => unknown
         ? Value
@@ -263,37 +271,6 @@ declare module "@opencode-ai/plugin/tui" {
         readonly version: string
     }
 
-    export type TuiApi = {
-        app: TuiApp
-        command: {
-            register: (cb: () => TuiCommand[]) => () => void
-            trigger: (value: string) => void
-        }
-        route: {
-            register: (routes: TuiRouteDefinition[]) => () => void
-            navigate: (name: string, params?: Record<string, unknown>) => void
-            readonly current: TuiRouteCurrent
-        }
-        ui: {
-            Dialog: (props: TuiDialogProps) => JSX.Element
-            DialogAlert: (props: TuiDialogAlertProps) => JSX.Element
-            DialogConfirm: (props: TuiDialogConfirmProps) => JSX.Element
-            DialogPrompt: (props: TuiDialogPromptProps) => JSX.Element
-            DialogSelect: <Value = unknown>(props: TuiDialogSelectProps<Value>) => JSX.Element
-            toast: (input: TuiToast) => void
-            dialog: TuiDialogStack
-        }
-        keybind: {
-            match: (key: string, evt: ParsedKey) => boolean
-            print: (key: string) => string
-            create: (defaults: TuiKeybindMap, overrides?: Record<string, unknown>) => TuiKeybindSet
-        }
-        readonly tuiConfig: Frozen<TuiConfigView>
-        kv: TuiKV
-        state: TuiState
-        theme: TuiTheme
-    }
-
     export type TuiSidebarMcpItem = {
         name: string
         status: McpStatus["status"]
@@ -356,7 +333,7 @@ declare module "@opencode-ai/plugin/tui" {
     export type TuiPluginState = "first" | "updated" | "same"
 
     export type TuiPluginEntry = {
-        name: string
+        id: string
         source: "file" | "npm" | "internal"
         spec: string
         target: string
@@ -374,21 +351,84 @@ declare module "@opencode-ai/plugin/tui" {
         state: TuiPluginState
     }
 
+    export type TuiPluginStatus = {
+        id: string
+        source: "file" | "npm" | "internal"
+        spec: string
+        target: string
+        enabled: boolean
+        active: boolean
+    }
+
+    export type TuiPluginInstallOptions = {
+        global?: boolean
+    }
+
+    export type TuiPluginInstallResult =
+        | {
+              ok: true
+              dir: string
+              tui: boolean
+          }
+        | {
+              ok: false
+              message: string
+              missing?: boolean
+          }
+
     export type TuiWorkspace = {
         current: () => string | undefined
         set: (workspaceID?: string) => void
     }
 
-    export type TuiHostPluginApi<Renderer = CliRenderer> = TuiApi & {
+    // Flat TuiPluginApi matching upstream spec from PR #19347.
+    // Previous local shim split this into TuiApi -> TuiHostPluginApi -> TuiPluginApi;
+    // the upstream API is a single flat type.
+    export type TuiPluginApi<Renderer = CliRenderer> = {
+        app: TuiApp
+        command: {
+            register: (cb: () => TuiCommand[]) => () => void
+            trigger: (value: string) => void
+        }
+        route: {
+            register: (routes: TuiRouteDefinition[]) => () => void
+            navigate: (name: string, params?: Record<string, unknown>) => void
+            readonly current: TuiRouteCurrent
+        }
+        ui: {
+            Dialog: (props: TuiDialogProps) => JSX.Element
+            DialogAlert: (props: TuiDialogAlertProps) => JSX.Element
+            DialogConfirm: (props: TuiDialogConfirmProps) => JSX.Element
+            DialogPrompt: (props: TuiDialogPromptProps) => JSX.Element
+            DialogSelect: <Value = unknown>(props: TuiDialogSelectProps<Value>) => JSX.Element
+            toast: (input: TuiToast) => void
+            dialog: TuiDialogStack
+        }
+        keybind: {
+            match: (key: string, evt: ParsedKey) => boolean
+            print: (key: string) => string
+            create: (defaults: TuiKeybindMap, overrides?: Record<string, unknown>) => TuiKeybindSet
+        }
+        readonly tuiConfig: Frozen<TuiConfigView>
+        kv: TuiKV
+        state: TuiState
+        theme: TuiTheme
         client: ReturnType<typeof createOpencodeClientV2>
         scopedClient: (workspaceID?: string) => ReturnType<typeof createOpencodeClientV2>
         workspace: TuiWorkspace
         event: TuiEventBus
         renderer: Renderer
-    }
-
-    export type TuiPluginApi<Renderer = CliRenderer> = TuiHostPluginApi<Renderer> & {
         slots: TuiSlots
+        plugins: {
+            list: () => ReadonlyArray<TuiPluginStatus>
+            activate: (id: string) => Promise<boolean>
+            deactivate: (id: string) => Promise<boolean>
+            add: (spec: string) => Promise<boolean>
+            install: (
+                spec: string,
+                options?: TuiPluginInstallOptions,
+            ) => Promise<TuiPluginInstallResult>
+        }
         lifecycle: TuiLifecycle
     }