@cortexkit/aft-opencode 0.56.1 → 0.57.0

package/src/tui-compiled/v2-status.ts

@@ -22,7 +22,6 @@ export type AftSidebarSummary = {
   semantic: string;
   health: string;
 };
-
 function healthSummary(bar: StatusBar | undefined): string {
   if (!bar) return "health pending";
   const stale = bar.tier2_stale ? "~" : "";
@@ -33,6 +32,14 @@ function healthSummary(bar: StatusBar | undefined): string {
   );
 }
 
+/**
+ * A one-line-per-field digest of the status snapshot.
+ *
+ * This is no longer what the sidebar draws: the sidebar now renders the shared
+ * panel in ./sidebar-view, which labels each section and reuses the status
+ * wording ./sidebar.tsx established. The digest is still pinned by
+ * test/tui/v2-status.test.ts.
+ */
 export function summarizeAftSidebar(status: AftStatusSnapshot | null): AftSidebarSummary {
   if (!status || status.cache_role === "not_initialized") {
     return {

package/src/tui-compiled/v2.tsx

@@ -1,17 +1,109 @@
 import { createComponent as _$createComponent } from "opentui:runtime-module:%40opentui%2Fsolid";
-import { createTextNode as _$createTextNode } from "opentui:runtime-module:%40opentui%2Fsolid";
-import { insertNode as _$insertNode } from "opentui:runtime-module:%40opentui%2Fsolid";
-import { memo as _$memo } from "opentui:runtime-module:%40opentui%2Fsolid";
-import { setProp as _$setProp } from "opentui:runtime-module:%40opentui%2Fsolid";
 import { insert as _$insert } from "opentui:runtime-module:%40opentui%2Fsolid";
 import { createElement as _$createElement } from "opentui:runtime-module:%40opentui%2Fsolid";
 /** @jsxImportSource @opentui/solid */
 // @ts-nocheck
 
 import { createEffect, createSignal, onCleanup } from "opentui:runtime-module:solid-js";
+import { version as packageVersion } from "../../package.json";
 import { coerceAftStatus, formatStatusDialogMessage } from "../shared/status";
 import { AftRpc } from "./aft-rpc";
-import { formatAftStatusSegment, summarizeAftSidebar } from "./v2-status";
+import { AftSidebarPanel, createSidebarPreferences } from "./sidebar-view";
+import { formatAftStatusSegment } from "./v2-status";
+
+/**
+ * The colour tokens the sidebar needs out of the host's `ResolvedTheme` — the
+ * type `Context.theme` carries, exported by `@opencode/theme/tui`. That
+ * package is an optional peer of `@opencode/plugin` and is not installed
+ * alongside this plugin, so the shape is written out here instead of imported;
+ * the key names are the theme package's own. They are nested token groups,
+ * unlike the flat colour names the slot-plugin host in ./sidebar.tsx reads.
+ * Every level is optional so a host that ships a partial theme degrades to the
+ * fallback palette below instead of throwing during a render.
+ *
+ * What a host really hands over is recorded, token for token, in
+ * test/load-matrix/ga-host-theme.json; that record is what this type and the
+ * mapping below are written against, and the load matrix compares it to a live
+ * host on every run.
+ */
+
+/**
+ * One step of a hue scale. The steps are ordered by how far the shade stands
+ * off the page rather than by lightness: 100 contrasts with the page most and
+ * 900 blends into it, in both theme modes. So the host's dark theme resolves
+ * accent 100 to its lightest purple and its light theme resolves accent 100 to
+ * its darkest orange, and a step chosen for one mode keeps its role in the
+ * other.
+ */
+
+/**
+ * The accent shade the AFT badge is filled with. A low step is what keeps the
+ * fill standing off the page in both theme modes (see GaHueStep), and 200 is
+ * the step the host itself draws its own accent-coloured UI in.
+ */
+const BADGE_ACCENT_STEP = "200";
+// Last resort for a host that declares a theme mode but hands over no resolved
+// theme. Inheriting the terminal default instead is what made the panel white
+// on white in light mode, so there has to be a legible colour for every role
+// even when the theme is missing.
+const FALLBACK_PALETTES = {
+  dark: {
+    text: "#e6edf3",
+    textMuted: "#9198a1",
+    success: "#3fb950",
+    warning: "#d29922",
+    error: "#f85149",
+    accent: "#1f6feb",
+    background: "#0d1117",
+    border: "#3d444d"
+  },
+  light: {
+    text: "#1f2328",
+    textMuted: "#59636e",
+    success: "#1a7f37",
+    warning: "#9a6700",
+    error: "#cf222e",
+    accent: "#0969da",
+    background: "#ffffff",
+    border: "#d1d9e0"
+  }
+};
+
+/**
+ * Host theme → the panel's palette. The host resolves its theme for the active
+ * mode before handing it over, so light mode arrives as light colours here;
+ * what matters is that every text line asks for one of them instead of
+ * inheriting the terminal default.
+ *
+ * `success` falls back to the accent exactly as ./sidebar.tsx's mapping does.
+ */
+export function resolveV2Palette(theme, themeMode) {
+  const fallback = FALLBACK_PALETTES[themeMode === "light" ? "light" : "dark"];
+  if (!theme) return {
+    ...fallback
+  };
+
+  // The accent comes out of the hue scales, not out of `background.action`.
+  // The action groups describe how the host paints a button, and this theme
+  // paints one as bare text: its `background.action.primary.base` is a fully
+  // transparent colour. Filling the badge with that drew no badge at all, and
+  // nothing caught it, because a present-but-transparent colour never reaches
+  // the fallback below.
+  const accent = theme.hue?.accent?.[BADGE_ACCENT_STEP] ?? fallback.accent;
+  const feedback = theme.text?.feedback;
+  return {
+    text: theme.text?.base ?? fallback.text,
+    textMuted: theme.text?.muted ?? fallback.textMuted,
+    success: feedback?.success?.base ?? accent,
+    warning: feedback?.warning?.base ?? fallback.warning,
+    error: feedback?.error?.base ?? fallback.error,
+    accent,
+    background: theme.background?.base ?? fallback.background,
+    // This theme has one border colour; ./sidebar.tsx's host distinguishes an
+    // active one, and the panel only ever draws the active border.
+    border: theme.border?.base ?? fallback.border
+  };
+}
 function eventMatchesSession(eventSessionID, sessionID) {
   return eventSessionID === undefined || eventSessionID === sessionID;
 }
@@ -81,37 +173,25 @@ function FooterStatus(props) {
 }
 function SidebarStatus(props) {
   const status = useAftStatus(props.context, props.rpc, () => props.sessionID);
-  const summary = () => summarizeAftSidebar(status());
-  return (() => {
-    var _el$2 = _$createElement("box"),
-      _el$3 = _$createElement("text"),
-      _el$4 = _$createElement("b"),
-      _el$5 = _$createElement("text"),
-      _el$6 = _$createTextNode(`Search: `),
-      _el$7 = _$createElement("text"),
-      _el$8 = _$createTextNode(`Semantic: `),
-      _el$9 = _$createElement("text"),
-      _el$0 = _$createTextNode(`Health: `);
-    _$insertNode(_el$2, _el$3);
-    _$insertNode(_el$2, _el$5);
-    _$insertNode(_el$2, _el$7);
-    _$insertNode(_el$2, _el$9);
-    _$setProp(_el$2, "width", "100%");
-    _$setProp(_el$2, "flexDirection", "column");
-    _$insertNode(_el$3, _el$4);
-    _$insert(_el$4, () => summary().title);
-    _$insert(_el$3, (() => {
-      var _c$ = _$memo(() => !!summary().version);
-      return () => _c$() ? ` v${summary().version}` : "";
-    })(), null);
-    _$insertNode(_el$5, _el$6);
-    _$insert(_el$5, () => summary().search, null);
-    _$insertNode(_el$7, _el$8);
-    _$insert(_el$7, () => summary().semantic, null);
-    _$insertNode(_el$9, _el$0);
-    _$insert(_el$9, () => summary().health, null);
-    return _el$2;
-  })();
+  const preferences = createSidebarPreferences();
+  return _$createComponent(AftSidebarPanel, {
+    get palette() {
+      return resolveV2Palette(props.context.theme, props.context.themeMode);
+    },
+    get snapshot() {
+      return status();
+    },
+    get prefs() {
+      return preferences.prefs();
+    },
+    get collapsed() {
+      return preferences.collapsed();
+    },
+    get onToggleCollapsed() {
+      return preferences.toggleCollapsed;
+    },
+    pluginVersion: packageVersion
+  });
 }
 function activeSessionID(context) {
   const route = context.ui.router.current();
@@ -131,10 +211,56 @@ async function showStatusDialog(context, rpc, sessionID) {
     });
   }
 }
+
+// `keymap.layer` is a Solid primitive, not a plain registration call: it reads
+// the host's keymap context and creates a layer owned by the component that
+// calls it. The host hands that primitive to plugins unbound, and it runs the
+// plugin's `setup` from a detached async continuation, outside both the Solid
+// owner and the provider tree — so calling it from `setup` throws
+// "Keymap.Provider is missing" and takes the whole TUI feature down with it.
+// Rendering this component instead puts the call inside the provider tree,
+// which is where the contract allows it. The component renders nothing; it
+// exists only to own the layer, and is mounted through the `app` slot below.
+function AftStatusCommands(props) {
+  props.context.keymap.layer(() => ({
+    // A layer without a mode is limited to the host's base input mode, and the
+    // command palette runs as a dialog, which switches the mode away from base.
+    // "global" opts out of that limit so the palette entry stays reachable
+    // while the palette itself is open.
+    mode: "global",
+    commands: [{
+      id: "aft.status",
+      title: "AFT: Status",
+      description: "Show AFT status, index health, and cache usage",
+      group: "AFT",
+      palette: true,
+      // The host dispatches slash entries unless `arguments: true` is set;
+      // omitting it prevents this text from remaining in the prompt or being
+      // submitted to the model.
+      slash: {
+        name: "aft-status"
+      },
+      run: () => showStatusDialog(props.context, props.rpc, activeSessionID(props.context))
+    }],
+    bindings: []
+  }));
+  return null;
+}
 export async function setupV2Tui(context) {
   const rpc = context.client.rpc(AftRpc);
   const controller = new AbortController();
-  const slotCleanups = [context.ui.slot({
+  const slotCleanups = [
+  // `app` is the one slot the host keeps mounted for the whole TUI session,
+  // independent of the current route, so a command owned by a component
+  // rendered here stays reachable everywhere the palette and slash
+  // completion are.
+  context.ui.slot({
+    append: "app",
+    render: () => _$createComponent(AftStatusCommands, {
+      context: context,
+      rpc: rpc
+    })
+  }), context.ui.slot({
     append: "prompt.footer.status",
     render: input => _$createComponent(FooterStatus, {
       context: context,
@@ -156,23 +282,6 @@ export async function setupV2Tui(context) {
   const stopDialogEvents = rpc.events.on("showStatusDialog", event => showStatusDialog(context, rpc, event.data.sessionID ?? activeSessionID(context)), {
     signal: controller.signal
   });
-  context.keymap.layer(() => ({
-    commands: [{
-      id: "aft.status",
-      title: "AFT: Status",
-      description: "Show AFT status, index health, and cache usage",
-      group: "AFT",
-      palette: true,
-      // V2's KeymapCommand contract (plugin/tui/context.ts:379-385) dispatches
-      // slash entries unless `arguments: true`; omitting it prevents this text
-      // from remaining in the prompt or being submitted to the model.
-      slash: {
-        name: "aft-status"
-      },
-      run: () => showStatusDialog(context, rpc, activeSessionID(context))
-    }],
-    bindings: []
-  }));
   return () => {
     controller.abort();
     stopDialogEvents();

package/tui.js

@@ -0,0 +1,7 @@
+// Root TUI entrypoint for directory-path plugin loading.
+//
+// OpenCode 2 resolves the TUI feature at `<dir>/tui` when the plugin target is
+// a directory, the same literal join it uses for `server` and `index`, and
+// with the same silent skip when the file is absent — the sidebar simply never
+// appears. See index.js for why the exports map does not cover this shape.
+export { default } from "./src/entry/tui.mjs";