@cortexkit/opencode-magic-context 0.41.4 → 0.42.1

package/src/shared/write-transaction-attribution.test.ts

@@ -0,0 +1,241 @@
+import { afterAll, beforeAll, describe, expect, test } from "bun:test";
+import { mkdtempSync, readFileSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join, resolve } from "node:path";
+
+const repoRoot = resolve(import.meta.dir, "../../../../");
+const beginImmediate = /\b(?:[A-Za-z_$][\w$]*\.)?exec\("BEGIN IMMEDIATE"\)/g;
+
+const fencedSources: Array<{ path: string; sites: string[] }> = [
+    {
+        path: "packages/plugin/src/features/magic-context/smart-notes/storage.ts",
+        sites: ["smart_note_commit"],
+    },
+    {
+        path: "packages/plugin/src/hooks/magic-context/inject-compartments.ts",
+        sites: ["opencode_materialize_cache", "opencode_soft_refresh_cache"],
+    },
+    {
+        path: "packages/plugin/src/features/magic-context/message-index.ts",
+        sites: [
+            "message_index_incremental",
+            "message_index_reconcile",
+            "message_index_orphan_sweep",
+        ],
+    },
+    {
+        path: "packages/plugin/src/features/magic-context/storage-meta-persisted.ts",
+        sites: [
+            "storage_meta_wrapup_expiry_cleanup",
+            "storage_meta_wrapup_acquire",
+            "storage_meta_wrapup_update",
+            "storage_meta_wrapup_release",
+        ],
+    },
+    {
+        path: "packages/plugin/src/features/magic-context/context-authority.ts",
+        sites: ["authority_marker_capture", "authority_capture_check"],
+    },
+    {
+        path: "packages/plugin/src/features/magic-context/compartment-storage.ts",
+        sites: ["compartment_state_replace", "recomp_staging_promote"],
+    },
+    {
+        path: "packages/plugin/src/features/magic-context/project-embedding-registry.ts",
+        sites: ["embedding_identity_record", "embedding_stale_gc"],
+    },
+    {
+        path: "packages/plugin/src/features/magic-context/workspaces.ts",
+        sites: ["workspace_epoch_bump", "workspace_epoch_bump"],
+    },
+    {
+        // The chokepoint cannot import the logging chain (Node executes it
+        // directly), so it reports through the injected reporter instead.
+        path: "packages/plugin/src/shared/sqlite.ts",
+        sites: ["privileged_writer"],
+        reporterCall: "reportSlowPrivilegedWrite?.(",
+    },
+    {
+        path: "packages/plugin/src/features/magic-context/git-commits/sweep-coordinator.ts",
+        sites: ["git_sweep_lease"],
+    },
+    {
+        path: "packages/plugin/src/features/magic-context/session-project-backfill.ts",
+        sites: ["session_project_backfill"],
+    },
+    {
+        path: "packages/plugin/src/tools/ctx-memory/verification-recording.ts",
+        sites: ["ctx_memory_mutation"],
+    },
+    {
+        path: "packages/plugin/src/features/magic-context/storage-clone.ts",
+        sites: ["storage_clone_copy"],
+    },
+    {
+        path: "packages/plugin/src/hooks/magic-context/compartment-runner-recomp.ts",
+        sites: ["historian-publish:recomp"],
+    },
+    {
+        path: "packages/plugin/src/hooks/magic-context/compartment-runner-incremental.ts",
+        sites: ["historian-publish"],
+    },
+    {
+        path: "packages/plugin/src/features/magic-context/dreamer/lease.ts",
+        sites: ["lease_dynamic_site"],
+    },
+    {
+        path: "packages/pi-plugin/src/inject-compartments-pi.ts",
+        sites: ["pi_materialize_cache", "pi_soft_refresh_cache"],
+    },
+    {
+        path: "packages/pi-plugin/src/pi-historian-runner.ts",
+        sites: ["pi_historian_publish"],
+    },
+    {
+        path: "packages/pi-plugin/src/context-handler.ts",
+        sites: ["pi_compaction_queue"],
+    },
+];
+
+const nonBeginCoveredSites: Array<{ path: string; site: string }> = [
+    {
+        path: "packages/plugin/src/features/magic-context/message-index.ts",
+        site: "message_index_clear",
+    },
+    {
+        path: "packages/plugin/src/features/magic-context/message-fts-rowid-map.ts",
+        site: "message_fts_rowid_backfill",
+    },
+    {
+        path: "packages/plugin/src/hooks/magic-context/note-nudger.ts",
+        site: "note_nudge_trigger",
+    },
+    {
+        path: "packages/plugin/src/features/magic-context/user-memory/storage-user-memory.ts",
+        site: "user_memory_candidate_insert",
+    },
+];
+
+let scenarioRoot: string | null = null;
+let scenarioLogPath: string | null = null;
+
+const newlyCoveredSites = [
+    "opencode_materialize_cache",
+    "opencode_soft_refresh_cache",
+    "message_index_incremental",
+    "message_index_reconcile",
+    "message_index_orphan_sweep",
+    "message_index_clear",
+    "message_fts_rowid_backfill",
+    "storage_meta_wrapup_expiry_cleanup",
+    "storage_meta_wrapup_acquire",
+    "storage_meta_wrapup_update",
+    "storage_meta_wrapup_release",
+    "authority_marker_capture",
+    "authority_capture_check",
+    "compartment_state_replace",
+    "recomp_staging_promote",
+    "embedding_identity_record",
+    "embedding_stale_gc",
+    "workspace_epoch_bump",
+    "privileged_writer",
+    "git_sweep_lease",
+    "session_project_backfill",
+    "ctx_memory_mutation",
+    "storage_clone_copy",
+    "smart_note_commit",
+    "pi_materialize_cache",
+    "pi_soft_refresh_cache",
+    "pi_historian_publish",
+    "pi_compaction_queue",
+    "note_nudge_trigger",
+    "user_memory_candidate_insert",
+] as const;
+
+function sourceFor(relativePath: string): string {
+    return readFileSync(resolve(repoRoot, relativePath), "utf8");
+}
+
+function assertCoveredBeginImmediate(
+    source: string,
+    sites: string[],
+    reporterCall = "logSlowWriteTransaction(",
+): void {
+    const matches = [...source.matchAll(beginImmediate)];
+    expect(matches).toHaveLength(sites.length);
+    for (let index = 0; index < matches.length; index += 1) {
+        const match = matches[index];
+        const nextBegin = matches[index + 1]?.index ?? source.length;
+        const transactionRegion = source.slice(match.index, nextBegin);
+        expect(transactionRegion).toContain(reporterCall);
+        if (sites[index] === "lease_dynamic_site") {
+            expect(transactionRegion).toContain("logSlowWriteTransaction(site");
+        } else {
+            expect(transactionRegion).toContain(`"${sites[index]}"`);
+        }
+    }
+}
+
+describe("write transaction attribution fences", () => {
+    beforeAll(async () => {
+        scenarioRoot = mkdtempSync(join(tmpdir(), "magic-context-write-attribution-"));
+        scenarioLogPath = join(scenarioRoot, "transactions.log");
+        const scenario = `
+            const timing = await import(${JSON.stringify(new URL("./write-transaction-timing.ts", import.meta.url).href)});
+            const logger = await import(${JSON.stringify(new URL("./logger.ts", import.meta.url).href)});
+            for (const site of ${JSON.stringify(newlyCoveredSites)}) {
+                timing.logSlowWriteTransaction(site, 1_000, 1_000, 2_100);
+                timing.logSlowWriteTransaction(site, 2_000, 1_000, 2_100);
+            }
+            logger.flushLogger();
+        `;
+        const child = Bun.spawn({
+            cmd: ["bun", "--eval", scenario],
+            cwd: import.meta.dir,
+            env: {
+                ...process.env,
+                NODE_ENV: "production",
+                MAGIC_CONTEXT_LOG_PATH: scenarioLogPath,
+            },
+            stdout: "pipe",
+            stderr: "pipe",
+        });
+        const [exitCode, stderr] = await Promise.all([
+            child.exited,
+            new Response(child.stderr).text(),
+        ]);
+        expect(exitCode, stderr).toBe(0);
+    });
+
+    afterAll(() => {
+        if (scenarioRoot) rmSync(scenarioRoot, { recursive: true, force: true });
+        scenarioRoot = null;
+        scenarioLogPath = null;
+    });
+
+    test("lists every BEGIN IMMEDIATE writer and requires a covered site", () => {
+        for (const fencedSource of fencedSources) {
+            assertCoveredBeginImmediate(
+                sourceFor(fencedSource.path),
+                fencedSource.sites,
+                "reporterCall" in fencedSource ? fencedSource.reporterCall : undefined,
+            );
+        }
+        for (const coveredSite of nonBeginCoveredSites) {
+            expect(sourceFor(coveredSite.path)).toContain(
+                `logSlowWriteTransaction("${coveredSite.site}"`,
+            );
+        }
+    });
+
+    for (const site of newlyCoveredSites) {
+        test(`logs a slow and suppresses a sub-threshold transaction at site=${site}`, () => {
+            if (!scenarioLogPath) throw new Error("timing scenario did not start");
+            const lines = readFileSync(scenarioLogPath, "utf8")
+                .split("\n")
+                .filter((line) => line.includes(`site=${site}`));
+            expect(lines).toHaveLength(1);
+            expect(lines[0]).toContain("held=1100.0ms");
+        });
+    }
+});

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

@@ -14,9 +14,10 @@ export function logSlowWriteTransaction(
     site: string,
     startedAt: number,
     thresholdMs = SLOW_WRITE_TRANSACTION_THRESHOLD_MS,
+    completedAtMs = performance.now(),
 ): void {
     try {
-        const durationMs = performance.now() - startedAt;
+        const durationMs = completedAtMs - startedAt;
         if (durationMs < thresholdMs) return;
         log(`[magic-context] slow write transaction: site=${site} held=${durationMs.toFixed(1)}ms`);
     } catch {

package/src/tui/index.tsx

@@ -1,7 +1,9 @@
 /** @jsxImportSource @opentui/solid */
 // @ts-nocheck
-import { createMemo } from "solid-js"
+import { createMemo, createSignal } from "solid-js"
 import type { TuiPlugin, TuiPluginApi, TuiThemeCurrent } from "@opencode-ai/plugin/tui"
+import { renderUserStatusSummary, statusSummaryFromDetail } from "../shared/status-summary"
+import { renderUserFacingFailure, userFacingFailureCode } from '../shared/user-facing-codes';
 import {
     createSidebarContentSlot,
     kickRecompProgressRefresh,
@@ -138,10 +140,13 @@ const R = (props: { t: TuiThemeCurrent; l: string; v: string; fg?: string }) =>
     </box>
 )
 
-const StatusDialog = (props: { api: TuiPluginApi; s: StatusDetail }) => {
+const StatusDialog = (props: { api: TuiPluginApi; s: StatusDetail; diagnostics?: boolean }) => {
     const theme = createMemo(() => (props.api as any).theme.current)
+    const [diagnostics, setDiagnostics] = createSignal(props.diagnostics === true)
     const t = () => theme()
     const s = () => props.s
+    const summaryLines = () =>
+        renderUserStatusSummary(statusSummaryFromDetail(s()), "plain").split("\n").slice(1)
     const compactionOff = () => s().compaction_enabled === false
 
     // Prefer the RPC-provided model context limit (what the sidebar shows) so the
@@ -206,7 +211,7 @@ const StatusDialog = (props: { api: TuiPluginApi; s: StatusDetail }) => {
             segs.push({ label: "User Profile", tokens: d.profileTokens, color: COLORS.profile })
 
         if (d.conversationTokens > 0)
-            segs.push({ label: "Conversation*", tokens: d.conversationTokens, color: COLORS.conversation })
+            segs.push({ label: "Conversation", tokens: d.conversationTokens, color: COLORS.conversation })
         if (d.toolCallTokens > 0)
             segs.push({ label: "Tool Calls", tokens: d.toolCallTokens, color: COLORS.toolCalls })
         if (d.toolDefinitionTokens > 0)
@@ -230,6 +235,21 @@ const StatusDialog = (props: { api: TuiPluginApi; s: StatusDetail }) => {
                 <text fg={t().textMuted}>v{packageJson.version}</text>
             </box>
 
+            <box
+                width="100%"
+                justifyContent="flex-end"
+                onMouseDown={() => setDiagnostics(!diagnostics())}
+            >
+                <text fg={diagnostics() ? t().accent : t().textMuted}>
+                    {diagnostics() ? "[x]" : "[ ]"} Diagnostics
+                </text>
+            </box>
+
+            {!diagnostics() ? (
+                <box flexDirection="column" width="100%">
+                    {summaryLines().map((line) => <text>{line}</text>)}
+                </box>
+            ) : (<>
             {s().configParseFailures.map((failure) => (
                 <text fg={t().error}>{formatConfigParseStatusLine(failure)}</text>
             ))}
@@ -279,7 +299,7 @@ const StatusDialog = (props: { api: TuiPluginApi; s: StatusDetail }) => {
                         </box>
                     )
                 })}
-                <text fg={t().textMuted}>* Conversation includes Reasoning; hygiene excludes it</text>
+                <text fg={t().textMuted}>Conversation includes reasoning; hygiene excludes it</text>
                 {s().tailHygiene !== undefined && (
                     <R
                         t={t()}
@@ -438,7 +458,7 @@ const StatusDialog = (props: { api: TuiPluginApi; s: StatusDetail }) => {
             {/* Error (full width, conditional) */}
             {s().lastTransformError && (
                 <box marginTop={1} width="100%">
-                    <text fg={t().error}>⚠ {s().lastTransformError}</text>
+                    <text fg={t().error}>{renderUserFacingFailure("transform_update_failed")}</text>
                 </box>
             )}
 
@@ -451,12 +471,13 @@ const StatusDialog = (props: { api: TuiPluginApi; s: StatusDetail }) => {
                     fg={(s().loggerDiagnostics?.swallowedWriteCount ?? 0) > 0 ? t().error : t().textMuted}
                 />
                 {s().loggerDiagnostics?.lastErrorMessage && (
-                    <R t={t()} l="Last error" v={s().loggerDiagnostics.lastErrorMessage} fg={t().error} />
+                    <R t={t()} l="Warning" v={renderUserFacingFailure("status_unavailable")} fg={t().error} />
                 )}
                 {s().loggerDiagnostics?.lastErrorTime && (
                     <R t={t()} l="Last error time" v={s().loggerDiagnostics.lastErrorTime} fg={t().textMuted} />
                 )}
             </box>
+            </>)}
 
             {/* Footer */}
             <box marginTop={1} justifyContent="flex-end" width="100%">
@@ -515,7 +536,7 @@ async function showRecompDialog(api: TuiPluginApi, targetSessionId = getSessionI
                     ? "This session has no compartments yet — recomp will build them from raw history."
                     : `You have ${count} compartments.`,
                 "",
-                "Recomp will regenerate all compartments and facts from raw history.",
+                "Recomp will rebuild the compressed history from raw history. Saved memories are not changed.",
                 "This may take a long time and consume significant tokens.",
                 "",
                 "Proceed?",
@@ -617,7 +638,11 @@ function showUpgradeDialog(
     return true
 }
 
-async function showStatusDialog(api: TuiPluginApi, targetSessionId = getSessionId(api)): Promise<boolean> {
+async function showStatusDialog(
+    api: TuiPluginApi,
+    targetSessionId = getSessionId(api),
+    initialDiagnostics = false,
+): Promise<boolean> {
     const sessionId = targetSessionId
     if (!sessionId) {
         showToast(api, { message: "No active session", variant: "warning" })
@@ -629,14 +654,19 @@ async function showStatusDialog(api: TuiPluginApi, targetSessionId = getSessionI
     const result = await loadStatusDetail(sessionId, directory, modelKey)
     if (getSessionId(api) !== sessionId) return false
     if (!result.ok) {
+        console.error(
+            `[magic-context] status unavailable code=${userFacingFailureCode("status_unavailable")}: ${result.error}`,
+        )
         showToast(api, {
-            message: `Status unavailable: ${result.error}`,
+            message: renderUserFacingFailure("status_unavailable"),
             variant: "warning",
         })
         return false
     }
 
-    api.ui.dialog.replace(() => <StatusDialog api={api} s={result.detail} />)
+    api.ui.dialog.replace(() => (
+        <StatusDialog api={api} s={result.detail} diagnostics={initialDiagnostics} />
+    ))
     return true
 }
 
@@ -1125,7 +1155,10 @@ const tui: TuiPlugin = async (api, _options, meta) => {
         const stillActive = () =>
             getRpcGeneration() === generation && getSessionId(api) === requestedSessionId
         if (action === "show-status-dialog") {
-            return stillActive() && (await showStatusDialog(api, requestedSessionId))
+            return (
+                stillActive() &&
+                (await showStatusDialog(api, requestedSessionId, n.payload?.diagnostics === true))
+            )
         }
         if (action === "show-recomp-dialog") {
             return stillActive() && (await showRecompDialog(api, requestedSessionId))

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

@@ -5,7 +5,6 @@ import packageJson from "../../../package.json"
 import { badgeTextColor } from '../badge-contrast';
 import { loadSidebarSnapshot, type SidebarSnapshot } from "../data/context-db"
 import { formatThresholdPercent } from "../../shared/format-threshold"
-import { formatTailHygiene } from "../../shared/tail-hygiene-status"
 import { compactionOffSidebarRows, nativeCompactionContextLabel } from "../compaction-off"
 import {
     computeEffectiveOrder,
@@ -106,6 +105,16 @@ function compactTokens(value: number): string {
     return String(value)
 }
 
+/**
+ * Sidebar form of the tail-hygiene reading: the reclaimable share and the
+ * two masses it is computed from, in the same compact token unit as the
+ * breakdown rows so the value fits beside its label at sidebar width. The
+ * long, unit-spelled form stays in the status dialog.
+ */
+function hygieneValue(status: { severity: number; u: number; t: number }): string {
+    return `${(status.severity * 100).toFixed(1)}% · ${compactTokens(status.u)}/${compactTokens(status.t)}`
+}
+
 function relativeTime(ms: number): string {
     const diff = Date.now() - ms
     if (diff < 60_000) return "just now"
@@ -240,7 +249,7 @@ const TokenBreakdown = (props: {
             key: "conv",
             tokens: s.conversationTokens,
             color: COLORS.conversation,
-            label: "Conversation*",
+                label: "Conversation",
         })
 
         // Tool Calls = tool_use/tool_result/tool/tool-invocation parts in messages
@@ -321,7 +330,6 @@ const TokenBreakdown = (props: {
                             </box>
                         )
                     })}
-                    <text fg={props.theme.textMuted}>* includes Reasoning; hygiene excludes it</text>
                 </box>
             )}
         </box>
@@ -798,14 +806,11 @@ const SidebarContent = (props: {
                         </box>
                     )}
                     <TokenBreakdown theme={props.theme} snapshot={s()!} collapsed={collapsed()} />
-                    {!collapsed() && (
-                        <text fg={props.theme.textMuted}>Conversation includes reasoning estimates; hygiene excludes reasoning.</text>
-                    )}
                     {s()!.tailHygiene !== undefined && (
                         <StatRow
                             theme={props.theme}
                             label="Hygiene"
-                            value={formatTailHygiene(s()!.tailHygiene!)}
+                            value={hygieneValue(s()!.tailHygiene!)}
                             warning={!s()!.tailHygiene!.evaluable}
                         />
                     )}