@cortexkit/opencode-magic-context 0.15.2 → 0.15.4

package/dist/plugin/hooks/create-session-hooks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-session-hooks.d.ts","sourceRoot":"","sources":["../../../src/plugin/hooks/create-session-hooks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAU7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAC;AACrF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAE9C,wBAAgB,kBAAkB,CAAC,IAAI,EAAE;IACrC,GAAG,EAAE,aAAa,CAAC;IACnB,YAAY,EAAE,wBAAwB,CAAC;IACvC,gBAAgB,EAAE,gBAAgB,CAAC;CACtC;;;;;;qBAmD4gD,CAAC;;;;;;;;;;;;qBAbz+C,CAAC;mBAAyB,CAAC;iBAChD,CAAX;iBAAuB,CAAC;0BAAc,CAAC;uBAAiB,CAAC;;;;;;0BAYi0nB,CAAC;;;;;;EAD/3nB"}
+{"version":3,"file":"create-session-hooks.d.ts","sourceRoot":"","sources":["../../../src/plugin/hooks/create-session-hooks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAU7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAC;AACrF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAE9C,wBAAgB,kBAAkB,CAAC,IAAI,EAAE;IACrC,GAAG,EAAE,aAAa,CAAC;IACnB,YAAY,EAAE,wBAAwB,CAAC;IACvC,gBAAgB,EAAE,gBAAgB,CAAC;CACtC;;;;;;qBAmDu0E,CAAC;;;;;;;;;;;;qBAAqd,CAAC;mBAAyB,CAAC;iBAAuB,CAAC;iBAAuB,CAAC;0BAAc,CAAC;uBAAiB,CAAC;;;;;;0BAAi+mB,CAAC;;;;;;EAD32sB"}

package/dist/plugin/rpc-handlers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rpc-handlers.d.ts","sourceRoot":"","sources":["../../src/plugin/rpc-handlers.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAMzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAIlF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AA0elE;;GAEG;AACH,wBAAgB,mBAAmB,CAC/B,SAAS,EAAE,qBAAqB,EAChC,IAAI,EAAE;IACF,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,kBAAkB,CAAC;IAC3B,MAAM,EAAE,OAAO,CAAC;IAChB,gBAAgB,EAAE,gBAAgB,CAAC;CACtC,GACF,IAAI,CA4GN"}
+{"version":3,"file":"rpc-handlers.d.ts","sourceRoot":"","sources":["../../src/plugin/rpc-handlers.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAMzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAQlF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAkflE;;GAEG;AACH,wBAAgB,mBAAmB,CAC/B,SAAS,EAAE,qBAAqB,EAChC,IAAI,EAAE;IACF,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,kBAAkB,CAAC;IAC3B,MAAM,EAAE,OAAO,CAAC;IAChB,gBAAgB,EAAE,gBAAgB,CAAC;CACtC,GACF,IAAI,CA8HN"}

package/dist/plugin/sidebar-snapshot-cache.d.ts

@@ -0,0 +1,19 @@
+import type { SidebarSnapshot } from "../shared/rpc-types";
+/**
+ * Apply the sticky-cache policy to a freshly built snapshot.
+ *
+ * Returns either the live snapshot (preferred) or a hybrid snapshot that
+ * preserves token-breakdown values from the previous good reading while keeping
+ * fresh DB-backed counts (compartmentCount, memoryCount, historian state, etc.)
+ * from the current build.
+ */
+export declare function applyStickySnapshotCache(sessionId: string, fresh: SidebarSnapshot): SidebarSnapshot;
+/**
+ * Drop the cached snapshot for a session. Wired to `session.deleted`.
+ */
+export declare function clearSidebarSnapshotCache(sessionId: string): void;
+/**
+ * Test helper — drop the entire cache.
+ */
+export declare function resetSidebarSnapshotCache(): void;
+//# sourceMappingURL=sidebar-snapshot-cache.d.ts.map

package/dist/plugin/sidebar-snapshot-cache.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sidebar-snapshot-cache.d.ts","sourceRoot":"","sources":["../../src/plugin/sidebar-snapshot-cache.ts"],"names":[],"mappings":"AA8BA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAY3D;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CACpC,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,eAAe,GACvB,eAAe,CAsCjB;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAEjE;AAED;;GAEG;AACH,wBAAgB,yBAAyB,IAAI,IAAI,CAEhD"}

package/dist/shared/conflict-detector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conflict-detector.d.ts","sourceRoot":"","sources":["../../src/shared/conflict-detector.ts"],"names":[],"mappings":"AAgBA,MAAM,WAAW,cAAc;IAC3B,8CAA8C;IAC9C,WAAW,EAAE,OAAO,CAAC;IACrB,+CAA+C;IAC/C,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,2DAA2D;IAC3D,SAAS,EAAE;QACP,cAAc,EAAE,OAAO,CAAC;QACxB,eAAe,EAAE,OAAO,CAAC;QACzB,SAAS,EAAE,OAAO,CAAC;QACnB,uBAAuB,EAAE,OAAO,CAAC;QACjC,uBAAuB,EAAE,OAAO,CAAC;QACjC,oBAAoB,EAAE,OAAO,CAAC;KACjC,CAAC;CACL;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,cAAc,CAyDjE;AA0LD;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CAWlE"}
+{"version":3,"file":"conflict-detector.d.ts","sourceRoot":"","sources":["../../src/shared/conflict-detector.ts"],"names":[],"mappings":"AAgBA,MAAM,WAAW,cAAc;IAC3B,8CAA8C;IAC9C,WAAW,EAAE,OAAO,CAAC;IACrB,+CAA+C;IAC/C,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,2DAA2D;IAC3D,SAAS,EAAE;QACP,cAAc,EAAE,OAAO,CAAC;QACxB,eAAe,EAAE,OAAO,CAAC;QACzB,SAAS,EAAE,OAAO,CAAC;QACnB,uBAAuB,EAAE,OAAO,CAAC;QACjC,uBAAuB,EAAE,OAAO,CAAC;QACjC,oBAAoB,EAAE,OAAO,CAAC;KACjC,CAAC;CACL;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,cAAc,CAyDjE;AAuPD;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CAWlE"}

package/dist/shared/rpc-types.d.ts

@@ -43,15 +43,6 @@ export interface SidebarSnapshot {
      * shows this as "Tool Definitions".
      */
     toolDefinitionTokens: number;
-    /**
-     * Residual catch-all: provider-side wrapping not captured elsewhere —
-     * the JSON envelope around the `tools` array, tool-choice fields,
-     * provider-specific cache-control markers, tokenizer imprecision, etc.
-     * Computed as `inputTokens − systemPromptTokens − messagesBlock −
-     * toolCallTokens − toolDefinitionTokens` and clamped to ≥ 0. Display
-     * layer shows this as "Overhead".
-     */
-    overheadTokens: number;
 }
 export interface StatusDetail extends SidebarSnapshot {
     tagCounter: number;

package/dist/shared/rpc-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rpc-types.d.ts","sourceRoot":"","sources":["../../src/shared/rpc-types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,WAAW,eAAe;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,gBAAgB,EAAE,MAAM,CAAC;IACzB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB;;;;OAIG;IACH,kBAAkB,EAAE,MAAM,CAAC;IAC3B;;;;OAIG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB;;;;;;;OAOG;IACH,oBAAoB,EAAE,MAAM,CAAC;IAC7B;;;;;;;OAOG;IACH,cAAc,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,YAAa,SAAQ,eAAe;IACjD,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACxD,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,EAAE,OAAO,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB;;;;OAIG;IACH,oBAAoB,EAAE,YAAY,GAAG,QAAQ,CAAC;IAC9C;;;OAGG;IACH,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,uBAAuB,EAAE,MAAM,CAAC;IAChC,cAAc,EAAE,MAAM,CAAC;IACvB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;CACnC;AAED,MAAM,WAAW,sBAAsB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB"}
+{"version":3,"file":"rpc-types.d.ts","sourceRoot":"","sources":["../../src/shared/rpc-types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,WAAW,eAAe;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,gBAAgB,EAAE,MAAM,CAAC;IACzB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB;;;;OAIG;IACH,kBAAkB,EAAE,MAAM,CAAC;IAC3B;;;;OAIG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB;;;;;;;OAOG;IACH,oBAAoB,EAAE,MAAM,CAAC;CAChC;AAED,MAAM,WAAW,YAAa,SAAQ,eAAe;IACjD,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACxD,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,EAAE,OAAO,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB;;;;OAIG;IACH,oBAAoB,EAAE,YAAY,GAAG,QAAQ,CAAC;IAC9C;;;OAGG;IACH,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,uBAAuB,EAAE,MAAM,CAAC;IAChC,cAAc,EAAE,MAAM,CAAC;IACvB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;CACnC;AAED,MAAM,WAAW,sBAAsB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB"}

package/dist/tui/data/context-db.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context-db.d.ts","sourceRoot":"","sources":["../../../src/tui/data/context-db.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAA0B,eAAe,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEpG,YAAY,EAAE,eAAe,EAAE,YAAY,EAAE,CAAC;AAS9C,2DAA2D;AAC3D,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAGrD;AAED,+BAA+B;AAC/B,wBAAgB,QAAQ,IAAI,IAAI,CAG/B;AA4BD,sDAAsD;AACtD,wBAAsB,mBAAmB,CACrC,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAClB,OAAO,CAAC,eAAe,CAAC,CAc1B;AAED,wDAAwD;AACxD,wBAAsB,gBAAgB,CAClC,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,QAAQ,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,YAAY,CAAC,CA4CvB;AAED,qCAAqC;AACrC,wBAAsB,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAQ5E;AAED,6CAA6C;AAC7C,wBAAsB,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAQvE;AAED,MAAM,WAAW,UAAU;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,yDAAyD;AACzD,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC,CAchE"}
+{"version":3,"file":"context-db.d.ts","sourceRoot":"","sources":["../../../src/tui/data/context-db.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAA0B,eAAe,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEpG,YAAY,EAAE,eAAe,EAAE,YAAY,EAAE,CAAC;AAS9C,2DAA2D;AAC3D,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAGrD;AAED,+BAA+B;AAC/B,wBAAgB,QAAQ,IAAI,IAAI,CAG/B;AA4ED,sDAAsD;AACtD,wBAAsB,mBAAmB,CACrC,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAClB,OAAO,CAAC,eAAe,CAAC,CA4B1B;AAED,wDAAwD;AACxD,wBAAsB,gBAAgB,CAClC,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,QAAQ,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,YAAY,CAAC,CA4CvB;AAED,qCAAqC;AACrC,wBAAsB,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAQ5E;AAED,6CAA6C;AAC7C,wBAAsB,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAQvE;AAED,MAAM,WAAW,UAAU;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,yDAAyD;AACzD,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC,CAchE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/opencode-magic-context",
-  "version": "0.15.2",
+  "version": "0.15.4",
   "type": "module",
   "description": "OpenCode plugin for Magic Context — cross-session memory and context management",
   "main": "dist/index.js",

package/src/shared/conflict-detector.test.ts

@@ -0,0 +1,189 @@
+/// <reference types="bun-types" />
+
+import { afterEach, beforeEach, describe, expect, it } from "bun:test";
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { detectConflicts } from "./conflict-detector";
+
+/**
+ * Regression tests for plugin-conflict detection. The previous substring-
+ * based matcher misclassified `oh-my-opencode-slim` and `opencode-dcp-fork`
+ * as the canonical plugins, causing magic-context to disable itself with
+ * a false-positive conflict warning. See issue #43.
+ */
+describe("detectConflicts", () => {
+    let projectDir: string;
+    let userConfigDir: string;
+    let originalEnv: Record<string, string | undefined>;
+
+    beforeEach(() => {
+        const root = mkdtempSync(join(tmpdir(), "mc-conflict-"));
+        projectDir = join(root, "project");
+        mkdirSync(projectDir, { recursive: true });
+        userConfigDir = join(root, "user-config", "opencode");
+        mkdirSync(userConfigDir, { recursive: true });
+
+        // Save and override every env var that affects config-path resolution.
+        // OPENCODE_CONFIG_DIR takes precedence over XDG_CONFIG_HOME, so we set
+        // it directly and clear XDG to fully isolate from any inherited or
+        // test-leaked state.
+        originalEnv = {
+            OPENCODE_CONFIG_DIR: process.env.OPENCODE_CONFIG_DIR,
+            XDG_CONFIG_HOME: process.env.XDG_CONFIG_HOME,
+            OPENCODE_DISABLE_AUTOCOMPACT: process.env.OPENCODE_DISABLE_AUTOCOMPACT,
+        };
+        process.env.OPENCODE_CONFIG_DIR = userConfigDir;
+        delete process.env.XDG_CONFIG_HOME;
+        // Disable auto-compaction default during tests so we isolate plugin
+        // detection from compaction detection.
+        process.env.OPENCODE_DISABLE_AUTOCOMPACT = "1";
+    });
+
+    afterEach(() => {
+        for (const [k, v] of Object.entries(originalEnv)) {
+            if (v === undefined) delete process.env[k];
+            else process.env[k] = v;
+        }
+        // Test directories live under tmpdir(); cleanup is best-effort.
+        rmSync(projectDir, { recursive: true, force: true });
+        rmSync(userConfigDir, { recursive: true, force: true });
+    });
+
+    function writeProjectConfig(plugins: string[]): void {
+        writeFileSync(join(projectDir, "opencode.json"), JSON.stringify({ plugin: plugins }));
+    }
+
+    // --- DCP detection ---
+
+    describe("DCP detection", () => {
+        it("matches the canonical @tarquinen/opencode-dcp package", () => {
+            writeProjectConfig(["@tarquinen/opencode-dcp"]);
+            const result = detectConflicts(projectDir);
+            expect(result.conflicts.dcpPlugin).toBe(true);
+        });
+
+        it("matches the canonical package with a version suffix", () => {
+            writeProjectConfig(["@tarquinen/opencode-dcp@latest"]);
+            const result = detectConflicts(projectDir);
+            expect(result.conflicts.dcpPlugin).toBe(true);
+        });
+
+        it("matches with a semver range suffix", () => {
+            writeProjectConfig(["@tarquinen/opencode-dcp@^3.1.0"]);
+            const result = detectConflicts(projectDir);
+            expect(result.conflicts.dcpPlugin).toBe(true);
+        });
+
+        it("does NOT match a fork with a different package name", () => {
+            writeProjectConfig(["@some-fork/opencode-dcp-fork"]);
+            const result = detectConflicts(projectDir);
+            expect(result.conflicts.dcpPlugin).toBe(false);
+        });
+
+        it("does NOT match a file:// path that contains 'opencode-dcp'", () => {
+            writeProjectConfig(["file:///home/user/work/opencode-dcp-fork"]);
+            const result = detectConflicts(projectDir);
+            expect(result.conflicts.dcpPlugin).toBe(false);
+        });
+    });
+
+    // --- OMO detection (the issue #43 case) ---
+
+    describe("OMO detection", () => {
+        it("matches the canonical oh-my-opencode package", () => {
+            writeProjectConfig(["oh-my-opencode"]);
+            const result = detectConflicts(projectDir);
+            // No OMO config = hooks default ACTIVE = all three flagged
+            expect(result.conflicts.omoPreemptiveCompaction).toBe(true);
+            expect(result.conflicts.omoContextWindowMonitor).toBe(true);
+            expect(result.conflicts.omoAnthropicRecovery).toBe(true);
+        });
+
+        it("matches the canonical oh-my-openagent package alias", () => {
+            writeProjectConfig(["oh-my-openagent"]);
+            const result = detectConflicts(projectDir);
+            expect(result.conflicts.omoPreemptiveCompaction).toBe(true);
+        });
+
+        it("matches a canonical OMO with a version suffix", () => {
+            writeProjectConfig(["oh-my-opencode@3.17.5", "oh-my-openagent@latest"]);
+            const result = detectConflicts(projectDir);
+            expect(result.conflicts.omoPreemptiveCompaction).toBe(true);
+            expect(result.conflicts.omoContextWindowMonitor).toBe(true);
+            expect(result.conflicts.omoAnthropicRecovery).toBe(true);
+        });
+
+        it("does NOT match oh-my-opencode-slim (issue #43)", () => {
+            writeProjectConfig(["oh-my-opencode-slim"]);
+            const result = detectConflicts(projectDir);
+            expect(result.hasConflict).toBe(false);
+            expect(result.conflicts.omoPreemptiveCompaction).toBe(false);
+            expect(result.conflicts.omoContextWindowMonitor).toBe(false);
+            expect(result.conflicts.omoAnthropicRecovery).toBe(false);
+        });
+
+        it("does NOT match oh-my-opencode-slim with a version suffix (issue #43)", () => {
+            writeProjectConfig(["oh-my-opencode-slim@latest", "oh-my-opencode-slim@1.0.3"]);
+            const result = detectConflicts(projectDir);
+            expect(result.hasConflict).toBe(false);
+        });
+
+        it("does NOT match a file:// path containing 'oh-my-opencode' (issue #43)", () => {
+            writeProjectConfig(["file:///home/user/workspace/oh-my-opencode-slim-dev"]);
+            const result = detectConflicts(projectDir);
+            expect(result.hasConflict).toBe(false);
+        });
+
+        it("does NOT match other forks under different package names", () => {
+            writeProjectConfig([
+                "oh-my-opencode-cli",
+                "@some-org/oh-my-opencode-fork",
+                "my-oh-my-opencode-customizations",
+            ]);
+            const result = detectConflicts(projectDir);
+            expect(result.hasConflict).toBe(false);
+        });
+
+        it("still detects canonical OMO when slim is also installed", () => {
+            // A user running both slim and the real OMO should still get
+            // the conflict warning for the real one.
+            writeProjectConfig(["oh-my-opencode-slim", "oh-my-opencode@latest"]);
+            const result = detectConflicts(projectDir);
+            expect(result.conflicts.omoPreemptiveCompaction).toBe(true);
+        });
+
+        it("respects disabled_hooks in project-level OMO config", () => {
+            writeProjectConfig(["oh-my-opencode"]);
+            // Use project-scoped OMO config to avoid relying on user
+            // config-path resolution, which can be leaked across files
+            // by `spyOn(getOpenCodeConfigPaths)` mocks in sibling tests.
+            writeFileSync(
+                join(projectDir, "oh-my-opencode.json"),
+                JSON.stringify({
+                    disabled_hooks: [
+                        "preemptive-compaction",
+                        "context-window-monitor",
+                        "anthropic-context-window-limit-recovery",
+                    ],
+                }),
+            );
+            const result = detectConflicts(projectDir);
+            expect(result.hasConflict).toBe(false);
+        });
+    });
+
+    // --- Combined / control cases ---
+
+    it("returns no conflicts for an empty plugin list", () => {
+        writeProjectConfig([]);
+        const result = detectConflicts(projectDir);
+        expect(result.hasConflict).toBe(false);
+    });
+
+    it("returns no conflicts for unrelated plugins", () => {
+        writeProjectConfig(["@cortexkit/opencode-magic-context@latest", "some-other-plugin"]);
+        const result = detectConflicts(projectDir);
+        expect(result.hasConflict).toBe(false);
+    });
+});

package/src/shared/conflict-detector.ts

@@ -167,9 +167,60 @@ function readUserCompaction(): { auto: boolean; prune: boolean; resolved: boolea
 
 // --- DCP detection ---
 
+/**
+ * Canonical npm package names that represent the conflicting plugin.
+ * Matched against the npm-style segment of each plugin entry, so:
+ *   - "@tarquinen/opencode-dcp"           ✓ direct match
+ *   - "@tarquinen/opencode-dcp@latest"    ✓ version suffix stripped
+ *   - "@tarquinen/opencode-dcp@^3.1.0"    ✓ semver suffix stripped
+ *   - "file:///path/to/opencode-dcp-fork" ✗ unrelated path
+ *
+ * forks/renames that don't ship the conflicting transform/system hooks are
+ * intentionally NOT matched.
+ */
+const DCP_PACKAGE_NAMES = new Set(["@tarquinen/opencode-dcp"]);
+
 function checkDcpPlugin(directory: string): boolean {
     const plugins = collectPluginEntries(directory);
-    return plugins.some((p) => p.includes("opencode-dcp"));
+    return plugins.some((p) => matchesPackageName(p, DCP_PACKAGE_NAMES));
+}
+
+/**
+ * Match a plugin entry against a set of canonical npm package names.
+ *
+ * A plugin entry can be:
+ *   - "pkg-name"
+ *   - "pkg-name@version"
+ *   - "@scope/pkg-name"
+ *   - "@scope/pkg-name@version"
+ *   - "file://..." or other URL/path forms (never matched here)
+ *
+ * For the canonical-name path we only match the exact package name (with
+ * optional version suffix). file:// paths and forks with different
+ * package names are intentionally NOT matched — even if a path string
+ * happens to contain a substring like "oh-my-opencode" (e.g. forks like
+ * "oh-my-opencode-slim" published under a different package name).
+ */
+function matchesPackageName(entry: string, canonicalNames: Set<string>): boolean {
+    // Skip URL/path forms — only npm-style entries can be canonically matched.
+    // (Local file:// checkouts of canonical plugins are rare; users running
+    // those need to ensure the path itself doesn't match a fork's name.)
+    if (
+        entry.startsWith("file:") ||
+        entry.startsWith("http:") ||
+        entry.startsWith("https:") ||
+        entry.startsWith("/") ||
+        entry.startsWith("./") ||
+        entry.startsWith("../")
+    ) {
+        return false;
+    }
+
+    // Strip version suffix: "@scope/pkg@1.2.3" → "@scope/pkg"
+    // Careful with scoped packages: the leading "@" is part of the name.
+    const lastAt = entry.lastIndexOf("@");
+    const nameOnly = lastAt > 0 ? entry.slice(0, lastAt) : entry;
+    return canonicalNames.has(nameOnly);
 }
 
 function collectPluginEntries(directory: string): string[] {
@@ -206,6 +257,21 @@ function collectPluginEntries(directory: string): string[] {
 
 // --- OMO hook detection ---
 
+/**
+ * Canonical OMO npm package names. The plugin publishes under both names as
+ * a versioned alias (latest 3.17.5 on npm at time of writing).
+ *
+ * Forks under a different package name (e.g. `oh-my-opencode-slim`,
+ * `oh-my-opencode-cli`, etc.) are intentionally NOT matched here — they
+ * don't ship the `preemptive-compaction`, `context-window-monitor`, or
+ * `anthropic-context-window-limit-recovery` hooks that conflict with
+ * Magic Context. See https://github.com/cortexkit/opencode-magic-context/issues/43.
+ *
+ * The legacy `@code-yeongyu/` scope is no longer used — both names are
+ * unscoped on npm.
+ */
+const OMO_PACKAGE_NAMES = new Set(["oh-my-opencode", "oh-my-openagent"]);
+
 function checkOmoHooks(directory: string): {
     preemptiveCompaction: boolean;
     contextWindowMonitor: boolean;
@@ -219,12 +285,7 @@ function checkOmoHooks(directory: string): {
 
     // First check if OMO is even installed
     const plugins = collectPluginEntries(directory);
-    const hasOmo = plugins.some(
-        (p) =>
-            p.includes("oh-my-opencode") ||
-            p.includes("oh-my-openagent") ||
-            p.includes("@code-yeongyu/"),
-    );
+    const hasOmo = plugins.some((p) => matchesPackageName(p, OMO_PACKAGE_NAMES));
     if (!hasOmo) return result;
 
     // Read OMO config to check disabled_hooks

package/src/shared/rpc-types.ts

@@ -44,15 +44,6 @@ export interface SidebarSnapshot {
      * shows this as "Tool Definitions".
      */
     toolDefinitionTokens: number;
-    /**
-     * Residual catch-all: provider-side wrapping not captured elsewhere —
-     * the JSON envelope around the `tools` array, tool-choice fields,
-     * provider-specific cache-control markers, tokenizer imprecision, etc.
-     * Computed as `inputTokens − systemPromptTokens − messagesBlock −
-     * toolCallTokens − toolDefinitionTokens` and clamped to ≥ 0. Display
-     * layer shows this as "Overhead".
-     */
-    overheadTokens: number;
 }
 
 export interface StatusDetail extends SidebarSnapshot {

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

@@ -51,26 +51,88 @@ const EMPTY_SNAPSHOT: SidebarSnapshot = {
     conversationTokens: 0,
     toolCallTokens: 0,
     toolDefinitionTokens: 0,
-    overheadTokens: 0,
 };
 
+/**
+ * Per-session client-side sticky cache. Mirrors the server-side cache in
+ * `sidebar-snapshot-cache.ts` but covers the cases the server can't:
+ *   - RPC call fails entirely (timeout, abort, parse error) → server is never reached
+ *   - RPC server is not yet up (port file missing, retries exhausted)
+ *   - Server returns an error envelope
+ *
+ * In all three cases the breakdown bar would otherwise disappear until the
+ * next successful refresh. With this cache, the client returns the most
+ * recent good snapshot for the same session so the UI stays stable through
+ * transient RPC blips. 5-minute staleness ceiling keeps it from showing
+ * obviously old data after long disconnects.
+ */
+interface CachedSnapshot {
+    snapshot: SidebarSnapshot;
+    cachedAt: number;
+}
+const STICKY_TTL_MS = 5 * 60 * 1000;
+const STICKY_MAX_ENTRIES = 100;
+const stickySidebarCache = new Map<string, CachedSnapshot>();
+
+function rememberSidebarSnapshot(snapshot: SidebarSnapshot): void {
+    if (!snapshot.sessionId || snapshot.inputTokens <= 0) return;
+    // LRU-style bound: drop the oldest entry once we hit the cap. With a
+    // 5-min TTL most stale entries time out naturally; this just prevents
+    // unbounded growth across many session switches in a long TUI session.
+    if (
+        stickySidebarCache.size >= STICKY_MAX_ENTRIES &&
+        !stickySidebarCache.has(snapshot.sessionId)
+    ) {
+        const firstKey = stickySidebarCache.keys().next().value;
+        if (firstKey) stickySidebarCache.delete(firstKey);
+    }
+    stickySidebarCache.set(snapshot.sessionId, {
+        snapshot,
+        cachedAt: Date.now(),
+    });
+}
+
+function recallSidebarSnapshot(sessionId: string, fallback: SidebarSnapshot): SidebarSnapshot {
+    const cached = stickySidebarCache.get(sessionId);
+    if (!cached) return fallback;
+    if (Date.now() - cached.cachedAt > STICKY_TTL_MS) {
+        stickySidebarCache.delete(sessionId);
+        return fallback;
+    }
+    return cached.snapshot;
+}
+
 /** Fetch sidebar snapshot from the server via RPC. */
 export async function loadSidebarSnapshot(
     sessionId: string,
     directory: string,
 ): Promise<SidebarSnapshot> {
-    if (!rpcClient) return { ...EMPTY_SNAPSHOT, sessionId };
+    const empty: SidebarSnapshot = { ...EMPTY_SNAPSHOT, sessionId };
+    if (!rpcClient) return recallSidebarSnapshot(sessionId, empty);
     try {
         const result = await rpcClient.call<SidebarSnapshot>("sidebar-snapshot", {
             sessionId,
             directory,
         });
         if ((result as unknown as Record<string, unknown>).error) {
-            return { ...EMPTY_SNAPSHOT, sessionId };
+            return recallSidebarSnapshot(sessionId, empty);
         }
+        // Trust successful server responses. The server has its own sticky
+        // sidebar cache (`sidebar-snapshot-cache.ts`) that handles transient
+        // zero-token windows by hybriding cached breakdown values into a
+        // fresh snapshot, AND clears that cache on `session.deleted`. If the
+        // server reaches us with `inputTokens === 0`, that's its considered
+        // answer — typically because the session was deleted, reverted, or
+        // is brand-new with no responses yet.
+        //
+        // Falling back to the client cache here would resurrect old token
+        // data for a deleted session (the client never sees `session.deleted`
+        // events, so its cache TTL is the only expiry). Sticky behavior is
+        // owned exclusively by the server side.
+        rememberSidebarSnapshot(result);
         return result;
     } catch {
-        return { ...EMPTY_SNAPSHOT, sessionId };
+        return recallSidebarSnapshot(sessionId, empty);
     }
 }
 

package/src/tui/index.tsx

@@ -219,7 +219,6 @@ const StatusDialog = (props: { api: TuiPluginApi; s: StatusDetail }) => {
         conversation: "#f87171",
         toolCalls: "#fb923c",
         toolDefs: "#f472b6",
-        overhead: "#9ca3af",
     }
 
     const breakdownSegments = () => {
@@ -257,8 +256,6 @@ const StatusDialog = (props: { api: TuiPluginApi; s: StatusDetail }) => {
             segs.push({ label: "Tool Calls", tokens: d.toolCallTokens, color: COLORS.toolCalls })
         if (d.toolDefinitionTokens > 0)
             segs.push({ label: "Tool Defs", tokens: d.toolDefinitionTokens, color: COLORS.toolDefs })
-        if (d.overheadTokens > 0)
-            segs.push({ label: "Overhead", tokens: d.overheadTokens, color: COLORS.overhead })
 
         return { segs, total }
     }

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

@@ -33,7 +33,6 @@ const COLORS = {
     conversation: "#f87171", // Red
     toolCalls: "#fb923c", // Orange
     toolDefs: "#f472b6", // Pink
-    overhead: "#9ca3af", // Gray — catch-all residual
 }
 
 interface TokenSegment {
@@ -130,20 +129,6 @@ const TokenBreakdown = (props: {
             })
         }
 
-        // Overhead = residual between input tokens and everything measured above.
-        // Captures provider-side JSON wrapping around the tools array,
-        // tool_choice/cache-control markers, and tokenizer imprecision. Before
-        // the first turn's tool.definition measurement lands, the real tool
-        // schema cost also shows up here.
-        if (s.overheadTokens > 0) {
-            result.push({
-                key: "overhead",
-                tokens: s.overheadTokens,
-                color: COLORS.overhead,
-                label: "Overhead",
-            })
-        }
-
         return result
     })
 

package/dist/plugin/tui-action-consumer.d.ts

@@ -1,15 +0,0 @@
-import type { MagicContextConfig } from "../config/schema/magic-context";
-import type { LiveSessionState } from "../hooks/magic-context/live-session-state";
-import type { PluginContext } from "./types";
-/**
- * Start a server-side consumer that polls plugin_messages for TUI→server
- * action messages and dispatches them. Currently handles:
- * - { command: "recomp" } — executes /ctx-recomp for the given session
- */
-export declare function startTuiActionConsumer(args: {
-    client: PluginContext["client"];
-    directory: string;
-    config: MagicContextConfig;
-    liveSessionState: LiveSessionState;
-}): (() => void) | undefined;
-//# sourceMappingURL=tui-action-consumer.d.ts.map

package/dist/plugin/tui-action-consumer.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"tui-action-consumer.d.ts","sourceRoot":"","sources":["../../src/plugin/tui-action-consumer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AASzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAGlF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAO7C;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE;IACzC,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,kBAAkB,CAAC;IAC3B,gBAAgB,EAAE,gBAAgB,CAAC;CACtC,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS,CAiF3B"}