@cortexkit/opencode-magic-context 0.42.5 → 0.42.6

package/src/shared/prompt-surface-a1-golden.md

@@ -1,11 +1,11 @@
 # Magic Context agent-facing surface (exported from source)
 
-Generated by `packages/plugin/scripts/export-agent-surface.ts` at 2026-09-11.
+Generated by `packages/plugin/scripts/export-agent-surface.ts` at 2026-09-17.
 Token counts are Claude BPE estimates on the raw text.
 
 ## 1. System-prompt guidance section
 
-### PRIMARY full (reduce=on, memory=on, dreamer=on, temporal=on) — 8752 chars, ~2008 tokens
+### PRIMARY full (reduce=on, memory=on, dreamer=on, temporal=on) — 8697 chars, ~1998 tokens
 
 ```markdown
 ## Magic Context
@@ -23,7 +23,7 @@ Because of this:
 Reduction prompts are routine housekeeping to keep the session fast and cheap — act on them as light maintenance, never as scarcity warnings. Keep individual operations efficient, but never let context size change *what* work you take on or *how thoroughly* you do it.
 
 Messages and tool outputs are tagged with §N§ identifiers (e.g., §1§, §42§).
-Use `ctx_reduce` to mark spent tagged content as discardable and reclaim space. Marking is NOT an immediate delete — it queues the content, which stays fully visible until space is actually needed (as soon as the next turn if you're already under pressure, much later if not), so mark a tool output as soon as you're done with it rather than hoarding the call for the end of the turn. The newest token-mass window stays protected until displaced. Syntax: "3-5", "1,2,9", or "1-5,8,12-15".
+Use `ctx_reduce` to mark spent tagged content as discardable and reclaim space. Marking QUEUES content for release. It stays fully visible to you until it is actually released, which may be the next turn or many turns later. Mark a tool output as soon as you're done with it rather than hoarding the call for the end of the turn. The newest token-mass window stays protected until displaced. Syntax: "3-5", "1,2,9", or "1-5,8,12-15".
 Do not announce or narrate `ctx_reduce` drops — just call the tool silently. Saying "I'll drop these outputs" wastes tokens the user does not care about.
 Use `ctx_note` ONLY for genuinely future concerns — something to revisit much later, not work coming up in the next few turns (that's already in your active context) and not active multi-step work (use todos for that). Magic Context preserves your full context across both compaction and restarts, so an upcoming restart or "let's come back to this later" is never a reason to take a note — nothing is lost either way. Notes you do take survive compression and resurface at natural work boundaries (after commits, historian runs, todo completion).
 Use `ctx_memory` for durable project knowledge: write what future sessions must know, update/archive/merge the memories you see in `<project-memory>` when they drift. Memories persist across sessions and every new session starts with them.
@@ -71,7 +71,7 @@ Example: `ctx_note(action="write", content="Implement X because Y", surface_cond
 Prefer many small targeted operations over one large blanket operation, and keep the working set tidy as routine maintenance.
 ```
 
-### PRIMARY memory-off (reduce=on, memory=off) — 7717 chars, ~1749 tokens
+### PRIMARY memory-off (reduce=on, memory=off) — 7662 chars, ~1739 tokens
 
 ```markdown
 ## Magic Context
@@ -89,7 +89,7 @@ Because of this:
 Reduction prompts are routine housekeeping to keep the session fast and cheap — act on them as light maintenance, never as scarcity warnings. Keep individual operations efficient, but never let context size change *what* work you take on or *how thoroughly* you do it.
 
 Messages and tool outputs are tagged with §N§ identifiers (e.g., §1§, §42§).
-Use `ctx_reduce` to mark spent tagged content as discardable and reclaim space. Marking is NOT an immediate delete — it queues the content, which stays fully visible until space is actually needed (as soon as the next turn if you're already under pressure, much later if not), so mark a tool output as soon as you're done with it rather than hoarding the call for the end of the turn. The newest token-mass window stays protected until displaced. Syntax: "3-5", "1,2,9", or "1-5,8,12-15".
+Use `ctx_reduce` to mark spent tagged content as discardable and reclaim space. Marking QUEUES content for release. It stays fully visible to you until it is actually released, which may be the next turn or many turns later. Mark a tool output as soon as you're done with it rather than hoarding the call for the end of the turn. The newest token-mass window stays protected until displaced. Syntax: "3-5", "1,2,9", or "1-5,8,12-15".
 Do not announce or narrate `ctx_reduce` drops — just call the tool silently. Saying "I'll drop these outputs" wastes tokens the user does not care about.
 Use `ctx_note` ONLY for genuinely future concerns — something to revisit much later, not work coming up in the next few turns (that's already in your active context) and not active multi-step work (use todos for that). Magic Context preserves your full context across both compaction and restarts, so an upcoming restart or "let's come back to this later" is never a reason to take a note — nothing is lost either way. Notes you do take survive compression and resurface at natural work boundaries (after commits, historian runs, todo completion).
 Use `ctx_search` to search across project memories, indexed git commits, and this session's full conversation history (including compacted parts) from one query.
@@ -185,7 +185,7 @@ Older tool calls may show `[dropped §N§]` sentinels; that is normal context ma
 
 ## 2. Tool surface (description + parameters as serialized to the provider)
 
-### ctx_reduce — description ~318 tokens, params ~31 tokens (total ~349)
+### ctx_reduce — description ~304 tokens, params ~31 tokens (total ~335)
 
 **Description:**
 
@@ -193,7 +193,7 @@ Older tool calls may show `[dropped §N§]` sentinels; that is normal context ma
 Mark spent tagged content as discardable to reclaim context space. This is NOT an immediate delete. Use §N§ identifiers visible in the conversation. The `drop` param accepts ranges: "3-5", "1,2,9", "1-5,8".
 
 How it works:
-- Marking QUEUES content for release. It stays fully visible to you until context space is actually needed — which may be as soon as the next turn if you are already under pressure, or many turns later if not. So mark spent outputs as soon as you finish with them; don't hoard the call for the end of the turn.
+- Marking QUEUES content for release. It stays fully visible to you until it is actually released, which may be the next turn or many turns later. Mark spent outputs as soon as you finish with them; don't hoard the call for the end of the turn.
 - The newest tags are protected: marking one just queues it until it ages out of the recent window, so marking recent output is harmless.
 - When content is finally released it becomes a short placeholder, and re-running the tool is the only way to get it back. So mark only what you are genuinely DONE with — the test is "have I extracted what I need from this?", not "is it safe / do I have time before it drops?".
 
@@ -254,7 +254,7 @@ Two recovery modes for finer detail:
 }
 ```
 
-### ctx_note — description ~392 tokens, params ~378 tokens (total ~770)
+### ctx_note — description ~387 tokens, params ~359 tokens (total ~746)
 
 **Description:**
 
@@ -266,7 +266,7 @@ Use a note when something matters LATER but not in the next few steps: "revisit
 Actions:
 - write: save a note (content). Add surface_condition to make it a smart note (below).
 - read: list notes, newest first. Default: latest active session notes + ready smart notes; page older ones with limit/offset, or inspect other states with filter.
-- update: change a note by note_id. dismiss: retire one by note_id or 1–50 by note_ids; provide exactly one.
+- update: change one note (note_ids=[N]). dismiss: retire 1–50 notes (note_ids=[...]).
 
 Smart notes: pass surface_condition and the note stays hidden until a background checker confirms the condition — using ONLY externally verifiable signals (GitHub state via gh, files on disk, git history, web pages). It cannot see this conversation, so the condition must be checkable from outside:
 ✓ "When PR #42 in cortexkit/magic-context is merged"
@@ -318,12 +318,8 @@ Example: ctx_note(action="write", content="Re-run the perf benchmark once the bo
     "description": "Skip this many newest notes for read — page older ones (default: 0)",
     "type": "number"
   },
-  "note_id": {
-    "description": "Note ID (required for 'dismiss' and 'update' actions).",
-    "type": "number"
-  },
   "note_ids": {
-    "description": "One to fifty note ids for 'dismiss' only; do not combine with note_id.",
+    "description": "Note ids: exactly one for 'update', one to fifty for 'dismiss'. Ignored by 'write' and 'read'.",
     "minItems": 1,
     "maxItems": 50,
     "type": "array",
@@ -465,8 +461,8 @@ The hash handler persists the MD5 of `output.system.join("\\n")`. The values bel
 
 | Variant | Guidance bytes | MD5 system-prompt hash |
 |---|---:|---|
-| PRIMARY full | 8816 | `e8a75373e85edefedf7a5c8c19af3926` |
-| PRIMARY memory-off | 7775 | `402c342a3ff283375c47a1735d03aa1a` |
+| PRIMARY full | 8759 | `f513711009bd420fe07b2672ce30d279` |
+| PRIMARY memory-off | 7718 | `6834a01be9891fa5461e996f281ba63d` |
 | PRIMARY reduce-off | 6526 | `7e5d386d94abe4f101bfd6d891ec183b` |
 | SUBAGENT minimal | 705 | `1c09c70b742f79274c501dd8f7eff1fc` |
 

package/src/shared/prompt-surface-runtime.test.ts

@@ -148,6 +148,26 @@ describe("prompt-surface runtime", () => {
         );
     });
 
+    it("honors model routes for tool text when a model key is supplied", () => {
+        const runtime = createPromptSurfaceRuntime({
+            userConfigDirectory: tempDir(),
+            warn: () => undefined,
+        });
+        const config = {
+            default: "full" as const,
+            models: { "provider/light": "light" as const },
+        };
+        const processScoped = runtime.resolveRegistration(config);
+        const perModel = runtime.resolveRegistration(config, "provider/light");
+
+        expect(processScoped.preset).toBe("full");
+        expect(processScoped.descriptionFor("ctx_search", "Full search")).toBe("Full search");
+        expect(perModel.preset).toBe("light");
+        expect(perModel.descriptionFor("ctx_search", "Full search")).toBe(
+            LIGHT_TOOL_DESCRIPTIONS.ctx_search,
+        );
+    });
+
     it("serves built-in light descriptions without a fallback notice", () => {
         const warnings: string[] = [];
         const runtime = createPromptSurfaceRuntime({

package/src/shared/prompt-surface-runtime.ts

@@ -80,6 +80,7 @@ export interface PromptSurfaceRegistrationSelection {
 export interface PromptSurfaceRuntime {
     resolveRegistration: (
         config: PromptSurfaceConfig | undefined,
+        modelKey?: string,
     ) => PromptSurfaceRegistrationSelection;
     resolveGuidance: (
         config: PromptSurfaceConfig | undefined,
@@ -184,11 +185,12 @@ export function createPromptSurfaceRuntime(
     };
 
     return {
-        resolveRegistration(config) {
-            // OpenCode and Pi expose one immutable provider tool map per host
-            // registration. Model routes are intentionally ignored here: only the
-            // registration owner's default and user-tier overrides can choose text.
-            const { preset } = resolvePromptSurface(config, undefined);
+        resolveRegistration(config, modelKey) {
+            // OpenCode 1.x and Pi expose one immutable provider tool map per host
+            // registration, so callers omit modelKey and only the default preset
+            // can choose text. OpenCode 2 rewrites draft.tools per request and
+            // passes the draft model so the same resolver honors model routes.
+            const { preset } = resolvePromptSurface(config, modelKey);
 
             const overrides = config?.tool_descriptions ?? {};
             for (const [toolId, description] of Object.entries(overrides)) {

package/src/tui/entry.mjs

@@ -33,4 +33,14 @@ if (!mod) {
     }
 }
 
-export default mod.default;
+const v1 = mod.default;
+
+async function setup(context) {
+    const v2 = await import("../v2/tui/index.ts");
+    return v2.setup(context);
+}
+
+// OpenCode 1.18.30's TUI loader reads only id/server/tui and ignores setup
+// (packages/opencode/src/plugin/shared.ts:272-304). OpenCode 2.0.3 validates
+// id/setup and ignores tui, so one object safely serves both package loaders.
+export default { id: v1.id, tui: v1.tui, setup };

package/src/v2/tui/host-contract.test.ts

@@ -0,0 +1,202 @@
+import { afterEach, expect, test } from "bun:test";
+import { mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { resolve } from "node:path";
+import { Host } from "@opencode/plugin/host";
+import { setupWithJsx } from "./index";
+import type { V2SidebarState, V2TuiContext } from "./types";
+
+const temporary: string[] = [];
+afterEach(() => {
+    for (const directory of temporary.splice(0))
+        rmSync(directory, { recursive: true, force: true });
+});
+
+function v2Context() {
+    const claims: Array<{ render: (input: { sessionID: string }) => unknown }> = [];
+    const layers: Array<ReturnType<Parameters<V2TuiContext["keymap"]["layer"]>[0]>> = [];
+    const cleanups: Array<() => void> = [];
+    const state: V2SidebarState = { snapshots: {} };
+    const context: V2TuiContext = {
+        location: { directory: process.cwd() },
+        renderer: { requestRender() {} },
+        data: {
+            listen(handler) {
+                void handler;
+                const cleanup = () => {};
+                cleanups.push(cleanup);
+                return cleanup;
+            },
+            location: { default: () => ({ directory: process.cwd() }) },
+        },
+        keymap: { layer: (input) => layers.push(input()) },
+        storage: {
+            memory: <Value extends object>(_key: string, options: { initial: Value }) => [
+                options.initial,
+                (mutation: (draft: Value) => void) => mutation(options.initial),
+            ],
+        },
+        ui: {
+            router: { current: () => ({ type: "session", sessionID: "ses-v2-tui" }) },
+            slot: (claim) => {
+                claims.push(claim);
+                return () => {};
+            },
+            toast: { show() {} },
+            dialog: {
+                async alert() {},
+                async confirm() {
+                    return false;
+                },
+            },
+        },
+    };
+    return { context, claims, layers, state };
+}
+
+function v1Api(directory: string) {
+    let slot:
+        | { slots: { sidebar_content: (ctx: unknown, value: unknown) => unknown }; dispose(): void }
+        | undefined;
+    const disposals: Array<() => void | Promise<void>> = [];
+    const color = "#ffffff";
+    const api = {
+        state: {
+            path: { directory },
+            session: { messages: () => [] },
+        },
+        route: { current: { name: "session", params: { sessionID: "ses-v1-tui" } } },
+        slots: { register: (value: typeof slot) => (slot = value) },
+        keymap: { registerLayer() {} },
+        command: { register() {} },
+        event: { on: () => () => {} },
+        renderer: { requestRender() {} },
+        lifecycle: { onDispose: (cleanup: () => void | Promise<void>) => disposals.push(cleanup) },
+        theme: {
+            current: {
+                primary: color,
+                secondary: color,
+                accent: color,
+                error: color,
+                warning: color,
+                success: color,
+                info: color,
+                text: color,
+                textMuted: color,
+                background: "#000000",
+                backgroundPanel: "#000000",
+                backgroundElement: "#000000",
+                backgroundMenu: "#000000",
+                border: color,
+                borderActive: color,
+                borderSubtle: color,
+            },
+        },
+        ui: {
+            toast() {},
+            dialog: { replace() {}, clear() {} },
+            DialogAlert: () => null,
+            DialogConfirm: () => null,
+            DialogPrompt: () => null,
+            DialogSelect: () => null,
+        },
+    };
+    return {
+        api,
+        slot: () => slot,
+        dispose: async () => Promise.all(disposals.map((cleanup) => cleanup())),
+    };
+}
+
+test("GA 2.0.5 resolves ./tui and executes the union setup contract", async () => {
+    const packageRoot = resolve(import.meta.dir, "../../..");
+    const entrypoints = Host.resolve({
+        name: "@cortexkit/opencode-magic-context",
+        directory: packageRoot,
+    });
+    expect(entrypoints.tui).toContain("src/tui/entry.mjs");
+    const loaded = (await Host.load(entrypoints.tui!)) as {
+        default: {
+            id: string;
+            tui: unknown;
+            setup: (context: V2TuiContext) => Promise<() => void>;
+        };
+    };
+    expect(typeof loaded.default.setup).toBe("function");
+    const fixture = v2Context();
+    const cleanup = await setupWithJsx(fixture.context, (type, props) => ({ type, props }));
+    expect(fixture.claims).toHaveLength(1);
+    expect(fixture.claims[0]!.render({ sessionID: "ses-v2-tui" })).toEqual({
+        type: "text",
+        props: { children: expect.stringContaining("Magic Context") },
+    });
+    expect(fixture.layers[0]!.commands.map((command) => command.slash.name)).toEqual([
+        "ctx-status",
+        "ctx-recomp",
+    ]);
+    cleanup();
+});
+
+test("GA 2.0.5 records its unbound keymap.layer gap without losing the sidebar", async () => {
+    const fixture = v2Context();
+    Object.assign(fixture.context.keymap, {
+        layer: () => {
+            throw new Error("Keymap.Provider is missing");
+        },
+    });
+    const cleanup = await setupWithJsx(fixture.context, (type, props) => ({ type, props }));
+    expect(fixture.claims).toHaveLength(1);
+    expect(fixture.layers).toHaveLength(0);
+    cleanup();
+});
+
+test("OpenCode 1.18.30 TUI loader projection executes unchanged sidebar registration", async () => {
+    // v1.18.30 packages/opencode/src/plugin/shared.ts:272-304 reads only id,
+    // server and tui, rejects a simultaneous server+tui pair, and returns the
+    // object without validating unrelated keys. `setup` is therefore invisible
+    // to the pinned v1 TUI loader while this test executes the selected tui().
+    const packageRoot = resolve(import.meta.dir, "../../..");
+    const entrypoints = Host.resolve({
+        name: "@cortexkit/opencode-magic-context",
+        directory: packageRoot,
+    });
+    const loaded = (await Host.load(entrypoints.tui!)) as {
+        default: {
+            id: string;
+            tui: (api: unknown, options?: unknown, meta?: unknown) => Promise<void>;
+            setup: unknown;
+            server?: unknown;
+        };
+    };
+    const plugin = loaded.default;
+    expect({ id: plugin.id, tui: plugin.tui }).toEqual({
+        id: "opencode-magic-context",
+        tui: expect.any(Function),
+    });
+    expect(plugin.server).toBeUndefined();
+    expect(typeof plugin.setup).toBe("function");
+
+    const directory = mkdtempSync(resolve(tmpdir(), "mc-v1-tui-union-"));
+    temporary.push(directory);
+    const fixture = v1Api(directory);
+    const previousCompactionOverride = process.env.OPENCODE_DISABLE_AUTOCOMPACT;
+    process.env.OPENCODE_DISABLE_AUTOCOMPACT = "1";
+    try {
+        await plugin.tui(fixture.api, undefined, {
+            state: "first",
+            id: plugin.id,
+            source: "file",
+            spec: "fixture",
+            target: entrypoints.tui,
+        });
+    } finally {
+        if (previousCompactionOverride === undefined)
+            delete process.env.OPENCODE_DISABLE_AUTOCOMPACT;
+        else process.env.OPENCODE_DISABLE_AUTOCOMPACT = previousCompactionOverride;
+    }
+    const slot = fixture.slot();
+    expect(slot).toBeDefined();
+    expect(typeof slot!.slots.sidebar_content).toBe("function");
+    await fixture.dispose();
+    slot!.dispose();
+}, 15_000);

package/src/v2/tui/index.ts

@@ -0,0 +1,270 @@
+import { jsx } from "@opentui/solid/jsx-runtime";
+import type { SidebarSnapshot, StatusDetail } from "../../shared/rpc-types";
+import {
+    closeRpc,
+    getCompartmentCount,
+    initRpcClient,
+    loadSidebarSnapshot,
+    loadStatusDetail,
+    requestRecomp,
+} from "../../tui/data/context-db";
+import {
+    type SocketNotification,
+    startNotificationSocket,
+    stopNotificationSocket,
+} from "../../tui/data/notification-socket";
+import type { V2SidebarState, V2TuiContext } from "./types";
+
+const SIDEBAR_REFRESH_MS = 1_000;
+const inflight = new Set<string>();
+const refreshedAt = new Map<string, number>();
+
+function compactTokens(value: number): string {
+    if (value >= 1_000_000) return `${(value / 1_000_000).toFixed(1)}M`;
+    if (value >= 1_000) return `${Math.round(value / 1_000)}K`;
+    return String(value);
+}
+
+function sidebarText(snapshot: SidebarSnapshot | undefined): string {
+    if (!snapshot) return "Magic Context · loading…";
+    const pressure =
+        snapshot.contextLimit > 0
+            ? `${snapshot.usagePercentage.toFixed(1)}% · ${compactTokens(snapshot.inputTokens)}/${compactTokens(snapshot.contextLimit)}`
+            : `${compactTokens(snapshot.inputTokens)} tokens`;
+    const historian = snapshot.historianRunning ? "running" : "idle";
+    return [
+        "Magic Context",
+        `Context ${pressure}`,
+        `Historian ${historian} · C:${snapshot.compartmentCount}`,
+        `Memories ${snapshot.memoryBlockCount}/${snapshot.memoryCount} · Q:${snapshot.pendingOpsCount}`,
+        ...(snapshot.lastTransformError ? [`Warning: ${snapshot.lastTransformError}`] : []),
+    ].join("\n");
+}
+
+function statusText(detail: StatusDetail): string {
+    const context =
+        detail.contextLimit > 0
+            ? `${detail.usagePercentage.toFixed(1)}% (${compactTokens(detail.inputTokens)}/${compactTokens(detail.contextLimit)} tokens)`
+            : `${compactTokens(detail.inputTokens)} tokens`;
+    return [
+        `Context: ${context}`,
+        `Historian: ${detail.historianRunning ? "running" : "idle"}`,
+        `Compartments: ${detail.compartmentCount}`,
+        `Memories: ${detail.memoryBlockCount} injected / ${detail.memoryCount} stored`,
+        `Pending reductions: ${detail.pendingOpsCount}`,
+        `Harness: opencode2`,
+        ...(detail.lastTransformError ? [`Warning: ${detail.lastTransformError}`] : []),
+    ].join("\n");
+}
+
+function currentSessionID(context: V2TuiContext): string | null {
+    const route = context.ui.router.current();
+    return route.type === "session" && route.sessionID ? route.sessionID : null;
+}
+
+function eventSessionID(event: unknown): string | undefined {
+    if (typeof event !== "object" || event === null) return undefined;
+    const record = event as Record<string, unknown>;
+    const data =
+        typeof record.data === "object" && record.data !== null
+            ? (record.data as Record<string, unknown>)
+            : record;
+    for (const key of ["sessionID", "sessionId", "id"]) {
+        if (typeof data[key] === "string") return data[key];
+    }
+    const info = data.info;
+    if (typeof info === "object" && info !== null) {
+        const nested = info as Record<string, unknown>;
+        if (typeof nested.sessionID === "string") return nested.sessionID;
+        if (typeof nested.id === "string") return nested.id;
+    }
+    return undefined;
+}
+
+type JsxFactory = (type: string, props: Record<string, unknown>) => unknown;
+
+export async function setupWithJsx(context: V2TuiContext, jsx: JsxFactory): Promise<() => void> {
+    const directory = context.location?.directory ?? context.data.location.default().directory;
+    initRpcClient(directory);
+    const [sidebar, updateSidebar] = context.storage.memory<V2SidebarState>(
+        "magic-context.sidebar.v2",
+        { initial: { snapshots: {} } },
+    );
+
+    const refresh = async (sessionID: string, force = false): Promise<void> => {
+        if (!sessionID || inflight.has(sessionID)) return;
+        const now = Date.now();
+        if (!force && now - (refreshedAt.get(sessionID) ?? 0) < SIDEBAR_REFRESH_MS) return;
+        refreshedAt.set(sessionID, now);
+        inflight.add(sessionID);
+        try {
+            const snapshot = await loadSidebarSnapshot(sessionID, directory);
+            updateSidebar((draft) => {
+                draft.snapshots[sessionID] = snapshot;
+            });
+            context.renderer.requestRender();
+        } finally {
+            inflight.delete(sessionID);
+        }
+    };
+
+    const showStatus = async (diagnostics = false, target = currentSessionID(context)) => {
+        if (!target) {
+            context.ui.toast.show({ message: "No active session", variant: "warning" });
+            return false;
+        }
+        const result = await loadStatusDetail(target, directory);
+        if (currentSessionID(context) !== target) return false;
+        if (!result.ok) {
+            context.ui.toast.show({
+                message: "Magic Context status is unavailable",
+                variant: "warning",
+            });
+            return false;
+        }
+        await context.ui.dialog.alert({
+            title: diagnostics ? "Magic Context diagnostics" : "Magic Context status",
+            message: statusText(result.detail),
+        });
+        return true;
+    };
+
+    const showRecomp = async (target = currentSessionID(context)) => {
+        if (!target) {
+            context.ui.toast.show({ message: "No active session", variant: "warning" });
+            return false;
+        }
+        const count = await getCompartmentCount(target, directory);
+        if (currentSessionID(context) !== target) return false;
+        if (!count.ok) {
+            context.ui.toast.show({ message: "Unable to load recomp details", variant: "error" });
+            return false;
+        }
+        const confirmed = await context.ui.dialog.confirm({
+            title: "Recomp confirmation",
+            message: [
+                count.count === 0
+                    ? "This session has no compartments yet; recomp will build them from raw history."
+                    : `This session has ${count.count} compartments.`,
+                "Recomp rebuilds compressed history and can consume significant tokens.",
+            ].join("\n\n"),
+            label: { confirm: "Run recomp", cancel: "Cancel" },
+        });
+        if (!confirmed) return true;
+        const requested = await requestRecomp(target);
+        context.ui.toast.show({
+            message: requested
+                ? "Recomp requested; historian will start shortly"
+                : "Recomp request failed",
+            variant: requested ? "info" : "error",
+        });
+        if (requested) void refresh(target, true);
+        return requested;
+    };
+
+    const unregisterSlot = context.ui.slot({
+        append: "sidebar.content",
+        render: ({ sessionID }) => {
+            void refresh(sessionID);
+            return jsx("text", { children: sidebarText(sidebar.snapshots[sessionID]) });
+        },
+    });
+
+    try {
+        context.keymap.layer(() => ({
+            mode: "global",
+            commands: [
+                {
+                    id: "magic-context.status",
+                    title: "Magic Context: Status",
+                    group: "Magic Context",
+                    palette: true,
+                    slash: { name: "ctx-status", arguments: true },
+                    run: async (input) => {
+                        await showStatus(input?.trim().toLowerCase() === "diagnostics");
+                    },
+                },
+                {
+                    id: "magic-context.recomp",
+                    title: "Magic Context: Recomp",
+                    group: "Magic Context",
+                    palette: true,
+                    slash: { name: "ctx-recomp" },
+                    run: async () => {
+                        await showRecomp();
+                    },
+                },
+            ],
+        }));
+    } catch (error) {
+        if (!(error instanceof Error) || error.message !== "Keymap.Provider is missing")
+            throw error;
+        console.warn(
+            "[magic-context] OpenCode 2.0.5 keymap.layer is unavailable during plugin setup; /ctx-status and /ctx-recomp were not registered",
+        );
+    }
+
+    const stopListening = context.data.listen(({ details }) => {
+        const sessionID = eventSessionID(details);
+        if (sessionID) void refresh(sessionID, true);
+    });
+
+    const handleNotification = async (notification: SocketNotification): Promise<boolean> => {
+        const target = notification.sessionId ?? currentSessionID(context);
+        if (notification.sessionId && notification.sessionId !== currentSessionID(context))
+            return false;
+        if (notification.type === "toast") {
+            const payload = notification.payload;
+            context.ui.toast.show({
+                title: typeof payload.title === "string" ? payload.title : undefined,
+                message: String(payload.message ?? ""),
+                variant:
+                    payload.variant === "success" ||
+                    payload.variant === "warning" ||
+                    payload.variant === "error"
+                        ? payload.variant
+                        : "info",
+                duration: typeof payload.duration === "number" ? payload.duration : undefined,
+            });
+            return true;
+        }
+        if (notification.type !== "action") return false;
+        if (notification.payload.action === "show-status-dialog") {
+            return showStatus(notification.payload.diagnostics === true, target);
+        }
+        if (notification.payload.action === "show-recomp-dialog") return showRecomp(target);
+        if (notification.payload.action === "refresh-sidebar" && target) {
+            await refresh(target, true);
+            return true;
+        }
+        if (notification.payload.action === "show-result-dialog") {
+            await context.ui.dialog.alert({
+                title: String(notification.payload.title ?? "Magic Context"),
+                message: String(notification.payload.message ?? ""),
+            });
+            return true;
+        }
+        return false;
+    };
+
+    startNotificationSocket({
+        getSessionId: () => currentSessionID(context),
+        onNotification: handleNotification,
+    });
+    console.info("[magic-context] @cortexkit/opencode-magic-context v2 TUI setup");
+
+    return () => {
+        unregisterSlot();
+        stopListening();
+        stopNotificationSocket();
+        closeRpc();
+        inflight.clear();
+        refreshedAt.clear();
+    };
+}
+
+export async function setup(context: V2TuiContext): Promise<() => void> {
+    return setupWithJsx(context, jsx);
+}
+
+export default { id: "opencode-magic-context", setup };