@cortexkit/opencode-magic-context 0.40.1 → 0.41.1

package/src/shared/test-temp-dir.ts

@@ -0,0 +1,165 @@
+import { mkdtempSync, readdirSync, rmSync, statSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { basename, dirname, join, resolve } from "node:path";
+
+const STALE_TEMP_DIR_AGE_MS = 60 * 60 * 1000;
+
+// Keep this list narrow: startup cleanup must never turn into a shared /tmp purge.
+export const TEST_TEMP_DIR_PREFIXES = [
+    "mc-plugin-test-xdg-pid-",
+    "mc-pi-test-xdg-",
+    "mc-conflict-",
+    "mc-conflict-fixer-",
+    "mc-config-secret-",
+    "pi-reasoning-replay-",
+    "pi-session-api-test-",
+    "pi-symlink-test-",
+    "pi-running-vs-stale-",
+    "pi-dist-metadata-",
+    "pi-traversal-",
+    "pi-source-mode-",
+    "pi-source-missing-",
+    "pi-nonprefixed-",
+    "pi-default-cond-",
+    "pi-array-exports-",
+    "pi-extensionless-",
+    "pi-tsx-source-",
+    "pi-guidance-",
+    "pi-system-v2-",
+    "pi-no-guidance-",
+    "pi-guidance-dedup-",
+    "pi-noreduce-",
+    "pi-language-baseline-",
+    "pi-language-unset-",
+    "pi-language-set-",
+    "pi-a1-guidance-",
+    "pi-prompt-epoch-",
+    "pi-embedding-bootstrap-",
+    "pi-embedding-home-",
+    "magic-context-pi-latch-test-",
+    "magic-context-pi-index-test-",
+    "mc-test-temp-dir-helper-",
+] as const;
+
+export type TestTempDirPrefix = (typeof TEST_TEMP_DIR_PREFIXES)[number];
+
+type AfterAll = (callback: () => void) => void;
+type SweepOptions = {
+    tempDir?: string;
+    nowMs?: number;
+    staleAgeMs?: number;
+};
+
+const registeredTempDirs = new Set<string>();
+let lifecycleCleanupInstalled = false;
+
+function hasRecognizedPrefix(name: string): boolean {
+    return TEST_TEMP_DIR_PREFIXES.some((prefix) => name.startsWith(prefix));
+}
+
+function isRegisteredTempDir(directory: string): boolean {
+    const resolvedDirectory = resolve(directory);
+    return (
+        registeredTempDirs.has(resolvedDirectory) &&
+        dirname(resolvedDirectory) === resolve(tmpdir()) &&
+        hasRecognizedPrefix(basename(resolvedDirectory))
+    );
+}
+
+/**
+ * Creates a test-owned root under the system temp directory. The returned cleanup
+ * only removes roots made by this module, so an accidental path cannot delete an
+ * unrelated temp directory.
+ */
+export function createTestTempDir(
+    prefix: TestTempDirPrefix,
+    nameSuffix = "",
+): { dir: string; cleanup: () => void } {
+    const dir = resolve(mkdtempSync(join(tmpdir(), `${prefix}${nameSuffix}`)));
+    registeredTempDirs.add(dir);
+    return { dir, cleanup: () => cleanupTestTempDir(dir) };
+}
+
+/** Removes one registered test root and forgets it even when best-effort removal fails. */
+export function cleanupTestTempDir(directory: string): void {
+    const resolvedDirectory = resolve(directory);
+    if (!isRegisteredTempDir(resolvedDirectory)) return;
+
+    registeredTempDirs.delete(resolvedDirectory);
+    try {
+        rmSync(resolvedDirectory, {
+            recursive: true,
+            force: true,
+            maxRetries: 10,
+            retryDelay: 100,
+        });
+    } catch {
+        // A process can still hold a file open on Windows. The next startup sweep retries it.
+    }
+}
+
+/** Removes every root registered by this process. Safe to call more than once. */
+export function cleanupRegisteredTestTempDirs(): void {
+    for (const directory of [...registeredTempDirs]) cleanupTestTempDir(directory);
+}
+
+/**
+ * Runs a callback with a fresh root and removes that root even when the callback throws.
+ * This keeps small fixture builders from forgetting a failure-path cleanup.
+ */
+export function withTestTempDir<T>(
+    prefix: TestTempDirPrefix,
+    callback: (directory: string) => T,
+): T {
+    const { dir, cleanup } = createTestTempDir(prefix);
+    try {
+        return callback(dir);
+    } finally {
+        cleanup();
+    }
+}
+
+/**
+ * Installs both Bun's normal suite cleanup and an exit fallback for aborted runs.
+ * The callback is passed in so this utility remains usable from the test preload
+ * without making production code import bun:test.
+ */
+export function installTestTempDirCleanup(afterAll: AfterAll): void {
+    if (lifecycleCleanupInstalled) return;
+    lifecycleCleanupInstalled = true;
+    afterAll(cleanupRegisteredTestTempDirs);
+    process.once("exit", cleanupRegisteredTestTempDirs);
+}
+
+/**
+ * Removes only old, recognized test roots from one temp directory. The scan does
+ * one directory read, ignores non-directories, and leaves fresh roots and every
+ * unrecognized name alone so concurrently running tools stay isolated.
+ */
+export function sweepStaleTestTempDirs({
+    tempDir = tmpdir(),
+    nowMs = Date.now(),
+    staleAgeMs = STALE_TEMP_DIR_AGE_MS,
+}: SweepOptions = {}): string[] {
+    let entries: Array<{ isDirectory(): boolean; name: string }>;
+    try {
+        entries = readdirSync(tempDir, { withFileTypes: true });
+    } catch {
+        return [];
+    }
+
+    const removed: string[] = [];
+    for (const entry of entries) {
+        if (!entry.isDirectory() || !hasRecognizedPrefix(entry.name)) continue;
+
+        const directory = join(tempDir, entry.name);
+        try {
+            if (nowMs - statSync(directory).mtimeMs <= staleAgeMs) continue;
+            rmSync(directory, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
+            removed.push(directory);
+        } catch {
+            // Temp cleanup is best-effort; a later test run retries busy directories.
+        }
+    }
+    return removed;
+}

package/src/shared/write-transaction-timing.ts

@@ -0,0 +1,25 @@
+import { log } from "./logger";
+
+/**
+ * A one-second threshold catches transactions that can noticeably hold back
+ * sibling writers without turning normal SQLite work into log noise.
+ */
+export const SLOW_WRITE_TRANSACTION_THRESHOLD_MS = 1_000;
+
+/**
+ * Log a slow write only after its COMMIT has completed. The timing diagnostic is
+ * deliberately best-effort so it can never change the transaction's behavior.
+ */
+export function logSlowWriteTransaction(
+    site: string,
+    startedAt: number,
+    thresholdMs = SLOW_WRITE_TRANSACTION_THRESHOLD_MS,
+): void {
+    try {
+        const durationMs = performance.now() - startedAt;
+        if (durationMs < thresholdMs) return;
+        log(`[magic-context] slow write transaction: site=${site} held=${durationMs.toFixed(1)}ms`);
+    } catch {
+        // Timing diagnostics must never make a committed write appear to fail.
+    }
+}

package/src/tui/data/context-db.test.ts

@@ -4,9 +4,17 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { MagicContextRpcServer } from "../../shared/rpc-server";
 import type { SidebarSnapshot } from "../../shared/rpc-types";
-import { closeRpc, getCompartmentCount, initRpcClient, loadSidebarSnapshot } from "./context-db";
+import {
+    closeRpc,
+    getCompartmentCount,
+    initRpcClient,
+    loadSidebarSnapshot,
+    loadStatusDetail,
+} from "./context-db";
 
 const originalXdgDataHome = process.env.XDG_DATA_HOME;
+const originalTestDataDir = process.env.MAGIC_CONTEXT_TEST_DATA_DIR;
+const originalStorageDir = process.env.MAGIC_CONTEXT_STORAGE_DIR;
 const tempDirs: string[] = [];
 const servers: MagicContextRpcServer[] = [];
 
@@ -18,12 +26,19 @@ afterEach(() => {
     }
     if (originalXdgDataHome === undefined) delete process.env.XDG_DATA_HOME;
     else process.env.XDG_DATA_HOME = originalXdgDataHome;
+    if (originalTestDataDir === undefined) delete process.env.MAGIC_CONTEXT_TEST_DATA_DIR;
+    else process.env.MAGIC_CONTEXT_TEST_DATA_DIR = originalTestDataDir;
+    if (originalStorageDir === undefined) delete process.env.MAGIC_CONTEXT_STORAGE_DIR;
+    else process.env.MAGIC_CONTEXT_STORAGE_DIR = originalStorageDir;
 });
 
 function makeDataHome(): string {
     const dir = mkdtempSync(join(tmpdir(), "mc-context-db-"));
     tempDirs.push(dir);
     process.env.XDG_DATA_HOME = dir;
+    // The shared resolver gives test isolation priority. Keep both values
+    // aligned so the RPC client and fixture server exercise one directory.
+    process.env.MAGIC_CONTEXT_TEST_DATA_DIR = dir;
     return dir;
 }
 
@@ -96,6 +111,21 @@ describe("TUI context RPC data", () => {
         expect((await loadSidebarSnapshot(sessionId, directory)).inputTokens).toBe(0);
     });
 
+    test("does not turn a status authority failure into an empty session", async () => {
+        const dataHome = makeDataHome();
+        const directory = "/repo-status-error";
+        const server = await startServer(dataHome, directory, () => ({}));
+        server.handle("status-detail", async () => ({
+            error: "Rust module status unavailable; canonical session state was not read",
+        }));
+        initRpcClient(directory);
+
+        expect(await loadStatusDetail("ses_rust", directory)).toEqual({
+            ok: false,
+            error: "Rust module status unavailable; canonical session state was not read",
+        });
+    });
+
     test("distinguishes a real zero compartment count from an RPC failure", async () => {
         const dataHome = makeDataHome();
         const directory = "/repo-count";

package/src/tui/data/context-db.ts

@@ -2,8 +2,7 @@
  * TUI data layer — pure RPC client, no direct SQLite access.
  * All data is fetched from the server plugin via HTTP RPC.
  */
-import os from "node:os";
-import path from "node:path";
+import { getMagicContextStorageDir } from "../../shared/data-path";
 import { MagicContextRpcClient } from "../../shared/rpc-client";
 import type { EmbedDetail, SidebarSnapshot, StatusDetail } from "../../shared/rpc-types";
 
@@ -12,18 +11,9 @@ export type { EmbedDetail, SidebarSnapshot, StatusDetail };
 let rpcClient: MagicContextRpcClient | null = null;
 let rpcGeneration = 0;
 
-function getStorageDir(): string {
-    // Plugin v0.16+ uses the shared cortexkit/magic-context path so OpenCode
-    // and Pi can share state. The TUI just needs to point its RPC client at
-    // the same storage directory the server plugin uses for the lock-file
-    // discovery convention.
-    const dataDir = process.env.XDG_DATA_HOME ?? path.join(os.homedir(), ".local", "share");
-    return path.join(dataDir, "cortexkit", "magic-context");
-}
-
 /** Initialize the RPC client. Call once on TUI startup. */
 export function initRpcClient(directory: string): void {
-    const storageDir = getStorageDir();
+    const storageDir = getMagicContextStorageDir();
     // Bump the generation before replacing the client so late notification
     // responses from a disposed client are ignored (the WS socket observes the
     // new generation and abandons its in-flight connect).
@@ -172,63 +162,26 @@ export async function loadSidebarSnapshot(
     }
 }
 
-/** Fetch full status detail from the server via RPC. */
+export type StatusDetailResult = { ok: true; detail: StatusDetail } | { ok: false; error: string };
+
+/** Fetch full status detail without presenting transport failure as an empty session. */
 export async function loadStatusDetail(
     sessionId: string,
     directory: string,
     modelKey?: string,
-): Promise<StatusDetail> {
-    const emptyDetail: StatusDetail = {
-        ...EMPTY_SNAPSHOT,
-        sessionId,
-        activeProfile: null,
-        tagCounter: 0,
-        activeTags: 0,
-        droppedTags: 0,
-        totalTags: 0,
-        activeBytes: 0,
-        lastResponseTime: 0,
-        lastNudgeTokens: 0,
-        lastTransformError: null,
-        isSubagent: false,
-        pendingOps: [],
-        contextLimit: 0,
-        cacheTtlMs: 0,
-        cacheRemainingMs: 0,
-        cacheExpired: false,
-        cacheNeverExpires: false,
-        executeThreshold: 65,
-        executeThresholdMode: "percentage",
-        protectedTagCount: 20,
-        historyBudgetPercentage: 0.15,
-        historyBlockTokens: 0,
-        compressionBudget: null,
-        compressionUsage: null,
-        toastDurationMs: 5000,
-        loggerDiagnostics: {
-            swallowedWriteCount: 0,
-            lastErrorMessage: null,
-            lastErrorTime: null,
-        },
-        storage_versions: {
-            context_db_schema_version: null,
-            plugin_supported_version: 0,
-        },
-    };
-
-    if (!rpcClient) return emptyDetail;
+): Promise<StatusDetailResult> {
+    if (!rpcClient) return { ok: false, error: "RPC client is not initialized" };
     try {
         const result = await rpcClient.call<StatusDetail>("status-detail", {
             sessionId,
             directory,
             modelKey,
         });
-        if ((result as unknown as Record<string, unknown>).error) {
-            return emptyDetail;
-        }
-        return result;
-    } catch {
-        return emptyDetail;
+        const error = (result as unknown as Record<string, unknown>).error;
+        if (typeof error === "string") return { ok: false, error };
+        return { ok: true, detail: result };
+    } catch (error) {
+        return { ok: false, error: error instanceof Error ? error.message : String(error) };
     }
 }
 
@@ -262,12 +215,15 @@ export async function loadEmbedDetail(sessionId: string, directory: string): Pro
 export type CompartmentCountResult = { ok: true; count: number } | { ok: false; error: string };
 
 /** Get compartment count without making transport failure look like a real zero. */
-export async function getCompartmentCount(sessionId: string): Promise<CompartmentCountResult> {
+export async function getCompartmentCount(
+    sessionId: string,
+    directory?: string,
+): Promise<CompartmentCountResult> {
     if (!rpcClient) return { ok: false, error: "RPC client is not initialized" };
     try {
         const result = await rpcClient.call<{ count?: number; error?: string }>(
             "compartment-count",
-            { sessionId },
+            { sessionId, directory },
         );
         if (typeof result.error === "string") return { ok: false, error: result.error };
         if (typeof result.count !== "number" || !Number.isFinite(result.count)) {

package/src/tui/index.tsx

@@ -12,6 +12,7 @@ import { closeRpc, dismissUpgradeReminder, getAnnouncement, getCompartmentCount,
 import { startNotificationSocket, stopNotificationSocket, type SocketNotification } from "./data/notification-socket"
 import { formatThresholdPercent } from "../shared/format-threshold"
 import { formatTailHygiene } from "../shared/tail-hygiene-status"
+import { RUST_MODE_HOST_PATHS_LINE } from "../shared/rust-mode-status"
 import { formatWindowDerivationLine } from "../shared/window-geometry"
 import { compactionOffSidebarRows, nativeCompactionContextLabel } from "./compaction-off"
 import { isCompactionEnabled } from "../config/agent-disable"
@@ -321,6 +322,13 @@ const StatusDialog = (props: { api: TuiPluginApi; s: StatusDetail }) => {
                 )
             })()}
 
+            {s().hostBackendsModuleSide && (
+                <box marginTop={1} width="100%" flexDirection="column">
+                    <text fg={t().text}><b>Rust Mode</b></text>
+                    <text fg={t().textMuted}>{RUST_MODE_HOST_PATHS_LINE}</text>
+                </box>
+            )}
+
             <box flexDirection="row" width="100%" marginTop={1} gap={4}>
                 {compactionOff() ? (
                     <box flexDirection="column" flexGrow={1} flexBasis={0}>
@@ -344,8 +352,24 @@ const StatusDialog = (props: { api: TuiPluginApi; s: StatusDetail }) => {
                     <>
                         <box flexDirection="column" flexGrow={1} flexBasis={0}>
                             <text fg={t().text}><b>Tags</b></text>
-                            <R t={t()} l="Active" v={`${s().activeTags} (~${fmtBytes(s().activeBytes)})`} />
-                            <R t={t()} l="Dropped" v={String(s().droppedTags)} />
+                            <R
+                                t={t()}
+                                l="Active"
+                                v={
+                                    s().tagCountsAuthoritative === false
+                                        ? "n/a (module total only)"
+                                        : `${s().activeTags} (~${fmtBytes(s().activeBytes)})`
+                                }
+                            />
+                            <R
+                                t={t()}
+                                l="Dropped"
+                                v={
+                                    s().tagCountsAuthoritative === false
+                                        ? "n/a (module total only)"
+                                        : String(s().droppedTags)
+                                }
+                            />
                             <R t={t()} l="Total" v={String(s().totalTags)} fg={t().textMuted} />
                             <box marginTop={1}>
                                 <text fg={t().text}><b>Pending Queue</b></text>
@@ -459,7 +483,7 @@ async function showRecompDialog(api: TuiPluginApi, targetSessionId = getSessionI
         return false
     }
 
-    const countResult = await getCompartmentCount(sessionId)
+    const countResult = await getCompartmentCount(sessionId, api.state.path.directory ?? "")
     // Ack only after the dialog is actually shown for the same active session;
     // route switches while the RPC detail load is in flight must leave it pending.
     if (getSessionId(api) !== sessionId) return false
@@ -588,10 +612,17 @@ async function showStatusDialog(api: TuiPluginApi, targetSessionId = getSessionI
 
     const directory = api.state.path.directory ?? ""
     const modelKey = getModelKeyFromMessages(api, sessionId)
-    const detail = await loadStatusDetail(sessionId, directory, modelKey)
+    const result = await loadStatusDetail(sessionId, directory, modelKey)
     if (getSessionId(api) !== sessionId) return false
+    if (!result.ok) {
+        showToast(api, {
+            message: `Status unavailable: ${result.error}`,
+            variant: "warning",
+        })
+        return false
+    }
 
-    api.ui.dialog.replace(() => <StatusDialog api={api} s={detail} />)
+    api.ui.dialog.replace(() => <StatusDialog api={api} s={result.detail} />)
     return true
 }
 

package/src/tui-compiled/data/context-db.ts

@@ -2,8 +2,7 @@
  * TUI data layer — pure RPC client, no direct SQLite access.
  * All data is fetched from the server plugin via HTTP RPC.
  */
-import os from "node:os";
-import path from "node:path";
+import { getMagicContextStorageDir } from "../../shared/data-path";
 import { MagicContextRpcClient } from "../../shared/rpc-client";
 import type { EmbedDetail, SidebarSnapshot, StatusDetail } from "../../shared/rpc-types";
 
@@ -12,18 +11,9 @@ export type { EmbedDetail, SidebarSnapshot, StatusDetail };
 let rpcClient: MagicContextRpcClient | null = null;
 let rpcGeneration = 0;
 
-function getStorageDir(): string {
-    // Plugin v0.16+ uses the shared cortexkit/magic-context path so OpenCode
-    // and Pi can share state. The TUI just needs to point its RPC client at
-    // the same storage directory the server plugin uses for the lock-file
-    // discovery convention.
-    const dataDir = process.env.XDG_DATA_HOME ?? path.join(os.homedir(), ".local", "share");
-    return path.join(dataDir, "cortexkit", "magic-context");
-}
-
 /** Initialize the RPC client. Call once on TUI startup. */
 export function initRpcClient(directory: string): void {
-    const storageDir = getStorageDir();
+    const storageDir = getMagicContextStorageDir();
     // Bump the generation before replacing the client so late notification
     // responses from a disposed client are ignored (the WS socket observes the
     // new generation and abandons its in-flight connect).
@@ -172,63 +162,26 @@ export async function loadSidebarSnapshot(
     }
 }
 
-/** Fetch full status detail from the server via RPC. */
+export type StatusDetailResult = { ok: true; detail: StatusDetail } | { ok: false; error: string };
+
+/** Fetch full status detail without presenting transport failure as an empty session. */
 export async function loadStatusDetail(
     sessionId: string,
     directory: string,
     modelKey?: string,
-): Promise<StatusDetail> {
-    const emptyDetail: StatusDetail = {
-        ...EMPTY_SNAPSHOT,
-        sessionId,
-        activeProfile: null,
-        tagCounter: 0,
-        activeTags: 0,
-        droppedTags: 0,
-        totalTags: 0,
-        activeBytes: 0,
-        lastResponseTime: 0,
-        lastNudgeTokens: 0,
-        lastTransformError: null,
-        isSubagent: false,
-        pendingOps: [],
-        contextLimit: 0,
-        cacheTtlMs: 0,
-        cacheRemainingMs: 0,
-        cacheExpired: false,
-        cacheNeverExpires: false,
-        executeThreshold: 65,
-        executeThresholdMode: "percentage",
-        protectedTagCount: 20,
-        historyBudgetPercentage: 0.15,
-        historyBlockTokens: 0,
-        compressionBudget: null,
-        compressionUsage: null,
-        toastDurationMs: 5000,
-        loggerDiagnostics: {
-            swallowedWriteCount: 0,
-            lastErrorMessage: null,
-            lastErrorTime: null,
-        },
-        storage_versions: {
-            context_db_schema_version: null,
-            plugin_supported_version: 0,
-        },
-    };
-
-    if (!rpcClient) return emptyDetail;
+): Promise<StatusDetailResult> {
+    if (!rpcClient) return { ok: false, error: "RPC client is not initialized" };
     try {
         const result = await rpcClient.call<StatusDetail>("status-detail", {
             sessionId,
             directory,
             modelKey,
         });
-        if ((result as unknown as Record<string, unknown>).error) {
-            return emptyDetail;
-        }
-        return result;
-    } catch {
-        return emptyDetail;
+        const error = (result as unknown as Record<string, unknown>).error;
+        if (typeof error === "string") return { ok: false, error };
+        return { ok: true, detail: result };
+    } catch (error) {
+        return { ok: false, error: error instanceof Error ? error.message : String(error) };
     }
 }
 
@@ -262,12 +215,15 @@ export async function loadEmbedDetail(sessionId: string, directory: string): Pro
 export type CompartmentCountResult = { ok: true; count: number } | { ok: false; error: string };
 
 /** Get compartment count without making transport failure look like a real zero. */
-export async function getCompartmentCount(sessionId: string): Promise<CompartmentCountResult> {
+export async function getCompartmentCount(
+    sessionId: string,
+    directory?: string,
+): Promise<CompartmentCountResult> {
     if (!rpcClient) return { ok: false, error: "RPC client is not initialized" };
     try {
         const result = await rpcClient.call<{ count?: number; error?: string }>(
             "compartment-count",
-            { sessionId },
+            { sessionId, directory },
         );
         if (typeof result.error === "string") return { ok: false, error: result.error };
         if (typeof result.count !== "number" || !Number.isFinite(result.count)) {