@cortexkit/opencode-magic-context 0.44.4 → 0.45.0

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

@@ -11,6 +11,7 @@ import { For, Show, createEffect, createMemo, createSignal, on, onCleanup } from
 import packageJson from "../../../package.json";
 import { badgeTextColor } from "../badge-contrast";
 import { loadSidebarSnapshot } from "../data/context-db";
+import { directoryForSession } from "../data/session-directory";
 import { formatThresholdPercent } from "../../shared/format-threshold";
 import { renderUserFacingFailure } from "../../shared/user-facing-codes";
 import { compactionOffSidebarRows, nativeCompactionContextLabel } from "../compaction-off";
@@ -563,7 +564,7 @@ const SidebarContent = props => {
     const sid = props.sessionID();
     if (!sid) return;
     const sequence = ++snapshotRequestSequence;
-    const directory = props.api.state.path.directory ?? "";
+    const directory = directoryForSession(props.api.state.session?.get?.(sid)?.directory, props.api.state.path.directory ?? "");
     void loadSidebarSnapshot(sid, directory).then(data => {
       // Guard against a session switch while this load was in flight:
       // painting session A's snapshot into the now-active session B shows
@@ -623,7 +624,7 @@ const SidebarContent = props => {
       return;
     }
     const sequence = ++snapshotRequestSequence;
-    const directory = props.api.state.path.directory ?? "";
+    const directory = directoryForSession(props.api.state.session?.get?.(sid)?.directory, props.api.state.path.directory ?? "");
     void loadSidebarSnapshot(sid, directory).then(data => {
       if (!recompActive || recompSessionId !== sid || props.sessionID() !== sid || sequence !== snapshotRequestSequence) return;
       const phase = data?.recompProgress?.phase;

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

@@ -1,8 +1,10 @@
-import { afterEach, expect, test } from "bun:test";
-import { mkdtempSync, rmSync } from "node:fs";
+import { afterEach, expect, spyOn, test } from "bun:test";
+import { rmSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { resolve } from "node:path";
 import { Host } from "@opencode/plugin/host";
+import * as logger from "../../shared/logger";
+import { createTestTempDirFromPath } from "../../shared/test-temp-dir";
 import { setupWithJsx } from "./index";
 import type { V2SidebarState, V2SlotClaim, V2TuiContext } from "./types";
 
@@ -177,11 +179,8 @@ test("GA 2.0.5 keeps the sidebar when the app-slot keymap registration also fail
             throw new Error("Keymap.Provider is missing");
         },
     });
-    const warnings: string[] = [];
-    const originalWarn = console.warn;
-    console.warn = (...args: unknown[]) => {
-        warnings.push(args.map(String).join(" "));
-    };
+    // The gap is recorded in the plugin log; the TUI host drops console output.
+    const logged = spyOn(logger, "log");
     try {
         const cleanup = await setupWithJsx(fixture.context, (type, props) => ({ type, props }));
         expect(fixture.claims.map((claim) => claim.append)).toEqual(["sidebar.content", "app"]);
@@ -191,11 +190,11 @@ test("GA 2.0.5 keeps the sidebar when the app-slot keymap registration also fail
         appClaim.render({});
         expect(fixture.layers).toHaveLength(0);
         expect(
-            warnings.filter((line) => line.includes("keymap.layer is unavailable")),
+            logged.mock.calls.filter(([line]) => line.includes("keymap.layer is unavailable")),
         ).toHaveLength(1);
         cleanup();
     } finally {
-        console.warn = originalWarn;
+        logged.mockRestore();
     }
 });
 
@@ -225,7 +224,7 @@ test("OpenCode 1.18.30 TUI loader projection executes unchanged sidebar registra
     expect(plugin.server).toBeUndefined();
     expect(typeof plugin.setup).toBe("function");
 
-    const directory = mkdtempSync(resolve(tmpdir(), "mc-v1-tui-union-"));
+    const directory = createTestTempDirFromPath(resolve(tmpdir(), "mc-v1-tui-union-"));
     temporary.push(directory);
     const fixture = v1Api(directory);
     const previousCompactionOverride = process.env.OPENCODE_DISABLE_AUTOCOMPACT;

package/src/v2/tui/index.ts

@@ -1,7 +1,10 @@
 import { jsx } from "@opentui/solid/jsx-runtime";
 import { COMPACTION_ENABLED_PATH } from "../../config/agent-disable";
 import { flushLogger, log } from "../../shared/logger";
+import { pluginPackageVersion } from "../../shared/plugin-package-version";
 import type { SidebarSnapshot, StatusDetail } from "../../shared/rpc-types";
+import { buildUnavailableStatusView } from "../../shared/status-view";
+import { statusVersionNotice } from "../../shared/status-view-check";
 import { compactionOffSidebarRows, nativeCompactionContextLabel } from "../../tui/compaction-off";
 import {
     type CommandRpcResult,
@@ -15,14 +18,16 @@ import {
     requestFlush,
     requestRecomp,
     requestWrapup,
+    type StatusDetailResult,
 } from "../../tui/data/context-db";
 import {
     type SocketNotification,
     startNotificationSocket,
     stopNotificationSocket,
 } from "../../tui/data/notification-socket";
+import { directoryForSession } from "../../tui/data/session-directory";
 import { eventSessionID } from "./events";
-import { mountV1Sidebar, type V1SidebarMount } from "./sidebar-mount";
+import { mountV1Sidebar, sessionDirectory, type V1SidebarMount } from "./sidebar-mount";
 import { mountV1StatusDialog, type V1StatusDialogMount } from "./status-dialog-mount";
 import type { V2KeymapLayer, V2SidebarState, V2TuiContext } from "./types";
 
@@ -83,7 +88,24 @@ export function sidebarText(snapshot: SidebarSnapshot | undefined): string {
  *
  * Exported for test access.
  */
-export function statusText(detail: StatusDetail): string {
+export function statusText(
+    detail: Pick<
+        StatusDetail,
+        | "contextLimit"
+        | "usagePercentage"
+        | "inputTokens"
+        | "compaction_enabled"
+        | "historianRunning"
+        | "compartmentCount"
+        | "memoryBlockCount"
+        | "memoryCount"
+        | "pendingOpsCount"
+        | "configGeneration"
+        | "configAdoptedAt"
+        | "configReloadFailure"
+        | "lastTransformError"
+    >,
+): string {
     const context =
         detail.contextLimit > 0
             ? `${detail.usagePercentage.toFixed(1)}% (${compactTokens(detail.inputTokens)}/${compactTokens(detail.contextLimit)} tokens)`
@@ -114,6 +136,35 @@ export function statusText(detail: StatusDetail): string {
     ].join("\n");
 }
 
+/**
+ * Plain-text status for one checked result: the status lines above, or the
+ * "status unavailable" view as text when there is no usable snapshot. A
+ * server/UI version difference is named first in both cases.
+ *
+ * Exported for test access.
+ */
+export function statusTextFor(status: StatusDetailResult): string {
+    if (status.state === "unavailable") {
+        const view = buildUnavailableStatusView(status.reason, status.versions, {
+            version: pluginPackageVersion() ?? "unknown",
+        });
+        return [
+            `${view.headline.left.text}: ${view.headline.right.text}`,
+            ...view.sections.flatMap((section) =>
+                section.rows.map((row) => `${row.label}: ${row.value}`),
+            ),
+            ...view.warnings.map((warning) => warning.text),
+        ].join("\n");
+    }
+    const notice = statusVersionNotice(status.versions);
+    const text = statusText({
+        ...status.source,
+        historianRunning: status.extras.historianRunning,
+        lastTransformError: status.extras.lastTransformError,
+    });
+    return notice ? `${notice}\n${text}` : text;
+}
+
 function currentSessionID(context: V2TuiContext): string | null {
     const route = context.ui.router.current();
     return route.type === "session" && route.sessionID ? route.sessionID : null;
@@ -129,6 +180,11 @@ export async function setupWithJsx(context: V2TuiContext, jsx: JsxFactory): Prom
         { initial: { snapshots: {} } },
     );
 
+    // The TUI can show a session from another directory than the one it
+    // started in; session-scoped calls go to that session's own server.
+    const directoryOf = (sessionID: string): string =>
+        directoryForSession(sessionDirectory(context, sessionID), directory);
+
     const refresh = async (sessionID: string, force = false): Promise<void> => {
         if (!sessionID || inflight.has(sessionID)) return;
         const now = Date.now();
@@ -136,7 +192,7 @@ export async function setupWithJsx(context: V2TuiContext, jsx: JsxFactory): Prom
         refreshedAt.set(sessionID, now);
         inflight.add(sessionID);
         try {
-            const snapshot = await loadSidebarSnapshot(sessionID, directory);
+            const snapshot = await loadSidebarSnapshot(sessionID, directoryOf(sessionID));
             updateSidebar((draft) => {
                 draft.snapshots[sessionID] = snapshot;
             });
@@ -151,31 +207,26 @@ export async function setupWithJsx(context: V2TuiContext, jsx: JsxFactory): Prom
             context.ui.toast.show({ message: "No active session", variant: "warning" });
             return false;
         }
-        const result = await loadStatusDetail(target, directory);
+        const result = await loadStatusDetail(target, directoryOf(target));
         if (currentSessionID(context) !== target) return false;
-        if (!result.ok) {
-            context.ui.toast.show({
-                message: "Magic Context status is unavailable",
-                variant: "warning",
-            });
-            return false;
-        }
+        // A result without a usable snapshot still opens the dialog, which then
+        // names why the status is unavailable.
         const mounted = statusDialog;
         if (mounted) {
             try {
-                mounted.show(result.detail);
+                mounted.show(result);
                 return true;
             } catch (error) {
                 // A component that throws while opening would leave the host
                 // with a dead dialog surface. Degrade to the text dialog for the
                 // rest of this TUI session and say so once.
                 statusDialog = null;
-                console.warn("[magic-context] v2 status dialog failed; using text", error);
+                log("[magic-context] v2 status dialog failed; using text", error);
             }
         }
         await context.ui.dialog.alert({
             title: "Magic Context status",
-            message: statusText(result.detail),
+            message: statusTextFor(result),
         });
         return true;
     };
@@ -185,7 +236,7 @@ export async function setupWithJsx(context: V2TuiContext, jsx: JsxFactory): Prom
             context.ui.toast.show({ message: "No active session", variant: "warning" });
             return false;
         }
-        const count = await getCompartmentCount(target, directory);
+        const count = await getCompartmentCount(target, directoryOf(target));
         if (currentSessionID(context) !== target) return false;
         if (!count.ok) {
             context.ui.toast.show({ message: "Unable to load recomp details", variant: "error" });
@@ -202,7 +253,7 @@ export async function setupWithJsx(context: V2TuiContext, jsx: JsxFactory): Prom
             label: { confirm: "Run recomp", cancel: "Cancel" },
         });
         if (!confirmed) return true;
-        const requested = await requestRecomp(target);
+        const requested = await requestRecomp(target, directoryOf(target));
         context.ui.toast.show({
             message: requested
                 ? "Recomp requested; historian will start shortly"
@@ -252,7 +303,7 @@ export async function setupWithJsx(context: V2TuiContext, jsx: JsxFactory): Prom
                     // the rest of this TUI session and say so once.
                     mountedSidebar = null;
                     mounted.dispose();
-                    console.warn("[magic-context] v2 sidebar component failed; using text", error);
+                    log("[magic-context] v2 sidebar component failed; using text", error);
                 }
             }
             void refresh(input.sessionID);
@@ -411,8 +462,8 @@ export async function setupWithJsx(context: V2TuiContext, jsx: JsxFactory): Prom
             // The accepted layer is the only place that knows which slash commands
             // this host actually got, so report them from it. Anything missing here
             // is missing from the host's command palette too. It goes to the
-            // diagnostic log as well as the console because a TUI host owns the
-            // screen and drops plugin console output.
+            // diagnostic log because a TUI host owns the screen and drops plugin
+            // console output.
             const registered = `registered slash commands: ${buildKeymapLayer()
                 .commands.map((command) => command.slash.name)
                 .join(" ")}`;
@@ -421,7 +472,6 @@ export async function setupWithJsx(context: V2TuiContext, jsx: JsxFactory): Prom
             // killed before the next buffer flush would otherwise leave no record
             // of which commands this host received.
             flushLogger();
-            console.info(`[magic-context] ${registered}`);
             return true;
         } catch (error) {
             if (!(error instanceof Error) || error.message !== "Keymap.Provider is missing")
@@ -438,11 +488,11 @@ export async function setupWithJsx(context: V2TuiContext, jsx: JsxFactory): Prom
                 try {
                     registered = registerKeymapLayer();
                 } catch (error) {
-                    console.warn("[magic-context] keymap.layer registration failed", error);
+                    log("[magic-context] keymap.layer registration failed", error);
                 }
                 if (!registered && !keymapGapLogged) {
                     keymapGapLogged = true;
-                    console.warn(
+                    log(
                         "[magic-context] OpenCode 2 keymap.layer is unavailable; /ctx-status, /ctx-recomp, /ctx-dream, /ctx-flush, /ctx-embed and /ctx-wrapup were not registered",
                     );
                 }
@@ -501,9 +551,14 @@ export async function setupWithJsx(context: V2TuiContext, jsx: JsxFactory): Prom
 
     startNotificationSocket({
         getSessionId: () => currentSessionID(context),
+        // Follow the shown session's own server, whose commands push its dialogs.
+        getSessionDirectory: () => {
+            const sessionID = currentSessionID(context);
+            return sessionID ? directoryOf(sessionID) : null;
+        },
         onNotification: handleNotification,
     });
-    console.info("[magic-context] @cortexkit/opencode-magic-context v2 TUI setup");
+    log("[magic-context] @cortexkit/opencode-magic-context v2 TUI setup");
 
     return () => {
         unregisterSlot();

package/src/v2/tui/load-compiled-sidebar.d.mts

@@ -28,7 +28,11 @@ export interface V1Event {
 
 /** The slice of OpenCode 1's `TuiPluginApi` the sidebar component actually uses. */
 export interface V1SidebarApi {
-    readonly state: { readonly path: { readonly directory: string } };
+    readonly state: {
+        readonly path: { readonly directory: string };
+        /** The shown session's own directory, so the sidebar asks that directory's server. */
+        readonly session: { get(sessionID: string): { readonly directory?: string } | undefined };
+    };
     readonly renderer: { requestRender(): void };
     readonly event: { on(type: string, handler: (event: V1Event) => void): () => void };
 }

package/src/v2/tui/load-compiled-status-dialog.d.mts

@@ -1,5 +1,5 @@
 /** Typed view of load-compiled-status-dialog.mjs; see that file for why it is untyped JS. */
-import type { StatusDetail } from "../../shared/rpc-types";
+import type { StatusDetailResult } from "../../tui/data/context-db";
 import type { V1Theme } from "./load-compiled-sidebar.d.mts";
 
 /** The slice of OpenCode 1's `TuiPluginApi` the status dialog component reads. */
@@ -10,7 +10,8 @@ export interface V1StatusDialogApi {
 export interface CompiledStatusDialog {
     StatusDialog(props: {
         readonly api: V1StatusDialogApi;
-        readonly s: StatusDetail;
+        /** Checked status result from `loadStatusDetail`, never a raw RPC reply. */
+        readonly status: StatusDetailResult;
     }): unknown;
 }
 

package/src/v2/tui/session-directory.test.ts

@@ -0,0 +1,53 @@
+import { expect, test } from "bun:test";
+import { directoryForSession } from "../../tui/data/session-directory";
+import { sessionDirectory } from "./sidebar-mount";
+import type { V2TuiContext } from "./types";
+
+function contextWithSessions(
+    sessions: Record<string, string> | undefined,
+    throws = false,
+): V2TuiContext {
+    return {
+        renderer: { requestRender() {} },
+        data: {
+            listen: () => () => {},
+            location: { default: () => ({ directory: "/home/user" }) },
+            ...(sessions === undefined
+                ? {}
+                : {
+                      session: {
+                          get: (sessionID: string) => {
+                              if (throws) throw new Error("session store not ready");
+                              const directory = sessions[sessionID];
+                              return directory ? { location: { directory } } : undefined;
+                          },
+                      },
+                  }),
+        },
+    } as unknown as V2TuiContext;
+}
+
+test("OpenCode 2 session calls use the session's own directory", () => {
+    const context = contextWithSessions({ ses_project: "/home/user/Pictures/project" });
+    expect(directoryForSession(sessionDirectory(context, "ses_project"), "/home/user")).toBe(
+        "/home/user/Pictures/project",
+    );
+});
+
+test("an unknown session, a host without session data, or a failing lookup use the startup directory", () => {
+    expect(
+        directoryForSession(sessionDirectory(contextWithSessions({}), "ses_x"), "/home/user"),
+    ).toBe("/home/user");
+    expect(
+        directoryForSession(
+            sessionDirectory(contextWithSessions(undefined), "ses_x"),
+            "/home/user",
+        ),
+    ).toBe("/home/user");
+    expect(
+        directoryForSession(
+            sessionDirectory(contextWithSessions({ ses_x: "/p" }, true), "ses_x"),
+            "/home/user",
+        ),
+    ).toBe("/home/user");
+});

package/src/v2/tui/sidebar-mount.ts

@@ -82,9 +82,27 @@ export function isMissingOpenTuiRuntime(error: unknown): boolean {
     );
 }
 
+/**
+ * The directory of the Magic Context server that owns `sessionID` on this host,
+ * or undefined while the host has not loaded the session (the caller then uses
+ * its startup directory). See `directoryForSession`.
+ */
+export function sessionDirectory(context: V2TuiContext, sessionID: string): string | undefined {
+    try {
+        return context.data.session?.get(sessionID)?.location?.directory;
+    } catch {
+        return undefined;
+    }
+}
+
 function createV1Api(context: V2TuiContext, directory: string): V1SidebarApi {
     return {
-        state: { path: { directory } },
+        state: {
+            path: { directory },
+            session: {
+                get: (sessionID) => ({ directory: sessionDirectory(context, sessionID) }),
+            },
+        },
         renderer: { requestRender: () => context.renderer.requestRender() },
         event: {
             // OpenCode 1's event names ("message.updated", "session.updated",

package/src/v2/tui/status-dialog-mount.ts

@@ -10,10 +10,10 @@
  * of this package.
  *
  * Unlike the sidebar, this component fetches nothing: the caller passes the
- * status snapshot it already loaded over RPC, so no second data layer is
+ * checked status result it already loaded over RPC, so no second data layer is
  * initialised here.
  */
-import type { StatusDetail } from "../../shared/rpc-types";
+import type { StatusDetailResult } from "../../tui/data/context-db";
 import {
     type CompiledStatusDialog,
     loadCompiledStatusDialog,
@@ -22,8 +22,11 @@ import { flattenTheme, isMissingOpenTuiRuntime } from "./sidebar-mount";
 import type { V2TuiContext } from "./types";
 
 export interface V1StatusDialogMount {
-    /** Replaces the host's dialog surface with the status view for one snapshot. */
-    show(detail: StatusDetail): void;
+    /**
+     * Replaces the host's dialog surface with the status view for one checked
+     * result: the status itself, or the view naming why it is unavailable.
+     */
+    show(status: StatusDetailResult): void;
 }
 
 /**
@@ -44,7 +47,7 @@ export async function mountV1StatusDialog(
         return null;
     }
     return {
-        show: (detail) => {
+        show: (status) => {
             context.ui.dialog.show?.(() =>
                 compiled.StatusDialog({
                     // Read through getters so a theme change repaints: the
@@ -61,8 +64,8 @@ export async function mountV1StatusDialog(
                             },
                         };
                     },
-                    get s() {
-                        return detail;
+                    get status() {
+                        return status;
                     },
                 }),
             );

package/src/v2/tui/types.ts

@@ -57,6 +57,16 @@ export interface V2TuiContext {
     readonly data: {
         readonly listen: (handler: (event: { details: unknown }) => void) => () => void;
         readonly location: { default(): V2TuiLocation };
+        /**
+         * `Context.data.session` on GA 2.0.x. `location.directory` is the
+         * directory whose Magic Context server owns the session. Optional so a
+         * host without it falls back to the startup directory.
+         */
+        readonly session?: {
+            get(
+                sessionID: string,
+            ): { readonly location?: { readonly directory?: string } } | undefined;
+        };
     };
     readonly keymap: {
         readonly layer: (

package/dist/features/builtin-commands/commands.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../../src/features/builtin-commands/commands.ts"],"names":[],"mappings":"AAIA,wBAAgB,8BAA8B,CAAC,iBAAiB,UAAO;;;;;;;;;;;;;;;;;;;;;;;;;EAqCtE;AAED,MAAM,MAAM,8BAA8B,GAAG,MAAM,UAAU,CACzD,OAAO,8BAA8B,CACxC,CAAC"}

package/dist/features/builtin-commands/types.d.ts

@@ -1,3 +0,0 @@
-import type { Config } from "@opencode-ai/sdk";
-export type BuiltinCommandConfig = NonNullable<Config["command"]>;
-//# sourceMappingURL=types.d.ts.map

package/dist/features/builtin-commands/types.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/features/builtin-commands/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C,MAAM,MAAM,oBAAoB,GAAG,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC"}