@cortexkit/opencode-magic-context 0.21.5 → 0.21.7

package/src/tui/index.tsx

@@ -6,7 +6,8 @@ import { createMemo } from "solid-js"
 import type { TuiPlugin, TuiPluginApi, TuiThemeCurrent } from "@opencode-ai/plugin/tui"
 import { createSidebarContentSlot } from "./slots/sidebar-content"
 import packageJson from "../../package.json"
-import { closeRpc, consumeTuiMessages, getCompartmentCount, initRpcClient, loadStatusDetail, requestRecomp, type StatusDetail } from "./data/context-db"
+import { closeRpc, consumeTuiMessages, getAnnouncement, getCompartmentCount, initRpcClient, loadStatusDetail, markAnnounced, requestRecomp, type StatusDetail } from "./data/context-db"
+import { formatThresholdPercent } from "../shared/format-threshold"
 import { detectConflicts } from "../shared/conflict-detector"
 import { fixConflicts } from "../shared/conflict-fixer"
 import { readJsoncFile } from "../shared/jsonc-parser"
@@ -290,11 +291,16 @@ const StatusDialog = (props: { api: TuiPluginApi; s: StatusDetail }) => {
                 <text fg={t().textMuted}>v{packageJson.version}</text>
             </box>
 
-            {/* Context summary line */}
+            {/* Context summary line. Mirrors the sidebar header layout
+                ("47.5% / 65%   475K / 1.0M") so users can recognize the
+                same shape in the status dialog. The execute threshold tells
+                them how close they are to compaction triggering. */}
             <box flexDirection="row" justifyContent="space-between" width="100%">
-                <text fg={t().text}>Context</text>
                 <text fg={s().usagePercentage >= 80 ? t().error : s().usagePercentage >= 65 ? t().warning : t().accent}>
-                    <b>{s().usagePercentage.toFixed(1)}%</b> · {fmt(s().inputTokens)} / {contextLimit() > 0 ? fmt(contextLimit()) : "?"} tokens
+                    <b>{s().usagePercentage.toFixed(1)}%</b> / {formatThresholdPercent(s().executeThreshold)}%
+                </text>
+                <text fg={s().usagePercentage >= 80 ? t().error : s().usagePercentage >= 65 ? t().warning : t().accent}>
+                    {fmt(s().inputTokens)} / {contextLimit() > 0 ? fmt(contextLimit()) : "?"} tokens
                 </text>
             </box>
 
@@ -336,7 +342,7 @@ const StatusDialog = (props: { api: TuiPluginApi; s: StatusDetail }) => {
                     <R t={t()} l="Configured" v={s().cacheTtl} />
                     <R t={t()} l="Last response" v={s().lastResponseTime > 0 ? `${Math.round(elapsed() / 1000)}s ago` : "never"} />
                     <R t={t()} l="Remaining" v={s().cacheExpired ? "expired" : `${Math.round(s().cacheRemainingMs / 1000)}s`} fg={s().cacheExpired ? t().warning : t().textMuted} />
-                    <R t={t()} l="Auto-execute" v={s().cacheExpired ? "yes (expired)" : `at TTL or ≥${s().executeThreshold}%`} fg={t().textMuted} />
+                    <R t={t()} l="Auto-execute" v={s().cacheExpired ? "yes (expired)" : `at TTL or ≥${formatThresholdPercent(s().executeThreshold)}%`} fg={t().textMuted} />
                     <box marginTop={1}>
                         <text fg={t().text}><b>Memory</b></text>
                     </box>
@@ -346,7 +352,7 @@ const StatusDialog = (props: { api: TuiPluginApi; s: StatusDetail }) => {
                 {/* Right column */}
                 <box flexDirection="column" flexGrow={1} flexBasis={0}>
                     <text fg={t().text}><b>Rolling Nudges</b></text>
-                    <R t={t()} l="Execute threshold" v={`${s().executeThreshold}%`} />
+                    <R t={t()} l="Execute threshold" v={`${formatThresholdPercent(s().executeThreshold)}%`} />
                     <R t={t()} l="Nudge anchor" v={`${fmt(s().lastNudgeTokens)} tok`} />
                     <R t={t()} l="Interval" v={`${fmt(s().nudgeInterval)} tok`} fg={t().textMuted} />
                     <R t={t()} l="Next nudge after" v={`${fmt(s().nextNudgeAfter)} tok`} />
@@ -558,6 +564,63 @@ function registerCommandPaletteEntries(api: TuiPluginApi): void {
     // via RPC.
 }
 
+/**
+ * Show the one-shot "What's new" dialog on TUI startup if the server tells us
+ * to. The server is the source of truth: it has the version + features
+ * constants AND owns the persistence file. We just render and report back.
+ *
+ * Failure-tolerant by design — if the server isn't ready or the RPC fails,
+ * we silently skip (the next TUI launch will retry).
+ */
+/**
+ * URLs render as plain text. Modern terminals (iTerm2, kitty, WezTerm, Ghostty,
+ * recent macOS Terminal) auto-detect URLs and let users Cmd-click; older
+ * terminals require manual copy. We tried opentui's `<a href>` JSX intrinsic
+ * for application-level OSC 8 clickability, but it's a span-like element that
+ * forced text out of opentui's word-wrap mode, causing bullets to bleed past
+ * the dialog border. Pure-string children of `<text>` wrap correctly, so the
+ * AFT-style DialogAlert + plain string is the right surface here.
+ */
+async function showStartupAnnouncement(api: TuiPluginApi): Promise<void> {
+    try {
+        const ann = await getAnnouncement()
+        if (!ann.show || !ann.version || !ann.features || ann.features.length === 0) return
+
+        const title = `Magic Context v${ann.version}`
+        const lines: string[] = [
+            "What's new:",
+            "",
+            ...ann.features.map((line) => `  • ${line}`),
+        ]
+        if (ann.footer && ann.footer.trim().length > 0) {
+            // Blank-line separator keeps the persistent footer (Discord invite,
+            // etc.) visually distinct from the version-specific bullets.
+            lines.push("", ann.footer)
+        }
+        const message = lines.join("\n")
+
+        api.ui.dialog.replace(
+            () => (
+                <api.ui.DialogAlert
+                    title={title}
+                    message={message}
+                    onConfirm={() => {
+                        void markAnnounced()
+                    }}
+                />
+            ),
+            () => {
+                // User dismissed via Escape rather than confirming. Mark
+                // dismissed anyway — they saw the dialog, that's the contract.
+                void markAnnounced()
+            },
+        )
+    } catch {
+        // RPC not ready yet (port file missing or transient HTTP failure) —
+        // silently skip. The next TUI start re-checks.
+    }
+}
+
 const tui: TuiPlugin = async (api, _options, meta) => {
     // Initialize RPC client for server communication
     const directory = api.state.path.directory ?? ""
@@ -618,6 +681,12 @@ const tui: TuiPlugin = async (api, _options, meta) => {
         return
     }
 
+    // Show one-shot release announcement after conflict gate.
+    // Fire-and-forget: if the server isn't ready or RPC fails, the next TUI
+    // launch will retry. Dialog only appears once per ANNOUNCEMENT_VERSION
+    // (persisted via mark-announced RPC writing last_announced_version).
+    void showStartupAnnouncement(api)
+
     // Note: if TUI plugin is loaded, tui.json already has our entry.
     // But if the user added it manually and later removes it, or if they
     // use setup/doctor which handles tui.json, this code is already running.

package/src/tui/slots/sidebar-content.tsx

@@ -3,6 +3,7 @@ import { createEffect, createMemo, createSignal, on, onCleanup } from "solid-js"
 import type { TuiSlotPlugin, TuiPluginApi, TuiThemeCurrent } from "@opencode-ai/plugin/tui"
 import packageJson from "../../../package.json"
 import { loadSidebarSnapshot, type SidebarSnapshot } from "../data/context-db"
+import { formatThresholdPercent } from "../../shared/format-threshold"
 
 const SINGLE_BORDER = { type: "single" } as any
 const REFRESH_DEBOUNCE_MS = 150
@@ -47,7 +48,15 @@ const TokenBreakdown = (props: {
     theme: TuiThemeCurrent
     snapshot: SidebarSnapshot
 }) => {
-    const barWidth = 36
+    // Bar width is hardcoded because the @opencode-ai/plugin/tui slot API does
+    // not expose the rendered sidebar width to plugins. 24 chars is the safe
+    // floor that fits every realistic sidebar configuration we've observed —
+    // OpenCode TUI's sidebar narrows with the terminal, and 36 (the previous
+    // value) overflowed users' actual layouts (issue #90), wrapping the bar
+    // onto a second line. If/when the slot API surfaces a real width, this
+    // should become Math.max(20, providedWidth) like the Pi status dialog
+    // already does (`Math.max(20, innerWidth)`).
+    const barWidth = 24
 
     const segments = createMemo<TokenSegment[]>(() => {
         const s = props.snapshot
@@ -363,9 +372,21 @@ const SidebarContent = (props: {
             {s() && s()!.inputTokens > 0 && (
                 <box marginTop={1} flexDirection="column">
                     {(s()?.contextLimit ?? 0) > 0 && (
-                        <box width="100%" flexDirection="row" justifyContent="flex-end">
+                        <box width="100%" flexDirection="row" justifyContent="space-between">
+                            {/* Left: current usage vs the per-model execute
+                                threshold (the value Magic Context compares
+                                against when scheduling historian / drops).
+                                "47.5% / 65%" tells the user how close they
+                                are to the next compaction trigger. */}
                             <text fg={contextSummaryColor()}>
-                                <b>{s()!.usagePercentage.toFixed(1)}%</b> · {compactTokens(s()!.inputTokens)} / {compactTokens(s()!.contextLimit)}
+                                <b>{s()!.usagePercentage.toFixed(1)}%</b> / {formatThresholdPercent(s()!.executeThreshold)}%
+                            </text>
+                            {/* Right: absolute token usage vs the model's
+                                full context window (separate from the
+                                execute threshold so users still know how
+                                much headroom remains beyond compaction). */}
+                            <text fg={contextSummaryColor()}>
+                                {compactTokens(s()!.inputTokens)} / {compactTokens(s()!.contextLimit)}
                             </text>
                         </box>
                     )}