@cortexkit/opencode-magic-context 0.16.1 → 0.16.3

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;;;;;;qBAmD04E,CAAC;;;;;;;;;;;;qBAAkZ,CAAC;mBAAyB,CAAC;iBAAuB,CAAC;iBAAuB,CAAC;0BAAc,CAAC;uBAAiB,CAAC;;;;;;0BAAy7nB,CAAC;;;;;;EADn0tB"}
+{"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;;;;;;qBAqDyvJ,CAAC;;;;;;;;;;;;qBAArnE,CAAC;mBAAyB,CAAC;iBAAuB,CAAC;iBAAuB,CAAC;0BAAc,CAAC;uBAAiB,CAAC;;;;;;0BAA62pB,CAAC;;;;;;EAD/lvB"}

package/dist/shared/native-binding.d.ts

@@ -0,0 +1,87 @@
+/**
+ * Native-binding resolver for Electron-runtime mismatches.
+ *
+ * Why this module exists
+ * ----------------------
+ * `better-sqlite3` uses raw v8/nan bindings, so its compiled `.node` file is
+ * locked to a specific NODE_MODULE_VERSION (Node-API ABI revision). When
+ * OpenCode Desktop (Electron 41 → ABI 145) loads a plugin whose `node_modules`
+ * was populated by `bun install` / `npm install` under a different runtime,
+ * the fetched prebuild is for `node-vNNN` (e.g. ABI 137 for Node 22) and
+ * Electron refuses to load it with:
+ *
+ *   The module '...better_sqlite3.node' was compiled against a different
+ *   Node.js version using NODE_MODULE_VERSION 137. This version of Node.js
+ *   requires NODE_MODULE_VERSION 145.
+ *
+ * `onnxruntime-node` (used by `@huggingface/transformers` for local
+ * embeddings) is N-API v3 and is ABI-stable across runtimes, so it does NOT
+ * have this problem. Only `better-sqlite3` is affected.
+ *
+ * What this does
+ * --------------
+ * On plugin load, before constructing any `Database`:
+ *
+ *  1. If we are NOT running under Electron (`process.versions.electron` is
+ *     unset), return null. Bun uses `bun:sqlite` and never reaches this code;
+ *     Pi/Node-CLI install matching Node-vNNN prebuilds via npm, which work
+ *     natively against the on-disk binary.
+ *
+ *  2. If we ARE on Electron, locate the `.node` file path that
+ *     `better-sqlite3`'s default `bindings()` lookup would try first. Probe
+ *     its ABI by attempting a sandboxed `process.dlopen`. If it succeeds
+ *     (Electron-compatible), return null — the default lookup will work.
+ *
+ *  3. Otherwise, look for a cached Electron prebuild at
+ *     `<XDG_CACHE_HOME>/cortexkit/native-bindings/better-sqlite3/v<version>/electron-v<abi>-<platform>-<arch>/better_sqlite3.node`.
+ *     Download it from the `WiseLibs/better-sqlite3` GitHub release if
+ *     missing, extract with `nanotar` (pure-JS, ~45 KB, zero deps), validate
+ *     the ABI, and return the absolute path.
+ *
+ * The caller (`sqlite.ts`) then passes this path through `better-sqlite3`'s
+ * documented `nativeBinding` constructor option:
+ *
+ *   new Database(filename, { nativeBinding: <our cached path> })
+ *
+ * `better-sqlite3` calls `require()` directly on that path, bypassing the
+ * normal `bindings()` lookup chain. This is a first-class API the maintainer
+ * added for exactly this kind of cross-runtime extension scenario — see
+ * `node_modules/better-sqlite3/lib/database.js` `nativeBinding` handling.
+ *
+ * Why we don't replace the on-disk binary
+ * ---------------------------------------
+ * An earlier iteration copied the cached Electron binary over the in-tree
+ * `node_modules/.../better_sqlite3.node`. That worked but mutates a shared
+ * resource: in monorepo dev setups (or any case where multiple runtimes
+ * share one `node_modules`), a Pi process opening the plugin from the same
+ * workspace would then load the Electron-ABI binary and fail. Returning a
+ * separate cached path keeps the on-disk file untouched so each runtime
+ * sees the binary it needs.
+ *
+ * Failure modes
+ * -------------
+ * If GitHub is unreachable (corporate firewall, offline laptop, rate limit)
+ * AND no cached binary exists, this throws. The caller (sqlite.ts →
+ * openDatabase) surfaces a `storage unavailable` error and Magic Context
+ * disables itself for the run. The user can connect to the network and
+ * restart, or wait for a cached binary from a previous successful launch.
+ */
+/**
+ * Resolve the absolute path to a `better-sqlite3` `.node` binary that the
+ * current runtime can load.
+ *
+ *   - Returns `null` outside Electron (Bun uses `bun:sqlite`; Pi/Node CLI
+ *     loads matching prebuilds from `node_modules` natively).
+ *   - Returns `null` on Electron when the on-disk binary already matches
+ *     the runtime's ABI (rare but possible — a future OpenCode build that
+ *     post-install-rebuilds for Electron would hit this fast path).
+ *   - Returns the cached/downloaded prebuild path on Electron when the
+ *     on-disk binary's ABI doesn't match.
+ *
+ * The returned path is suitable as the `nativeBinding` option to
+ * `new Database(filename, { nativeBinding })`. better-sqlite3 calls `require()`
+ * directly on it, bypassing the default `bindings()` lookup chain — this is
+ * a documented public API in better-sqlite3, not an internal hack.
+ */
+export declare function resolveBetterSqliteNativeBinding(): Promise<string | null>;
+//# sourceMappingURL=native-binding.d.ts.map

package/dist/shared/native-binding.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"native-binding.d.ts","sourceRoot":"","sources":["../../src/shared/native-binding.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmEG;AA2IH;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,gCAAgC,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAuF/E"}

package/dist/shared/sqlite.d.ts

@@ -25,18 +25,6 @@
  * is either rewritten to common-subset patterns or hidden behind the helpers
  * in `./sqlite-helpers.ts`.
  */
-/**
- * Database constructor compatible with both bun:sqlite and better-sqlite3.
- *
- * The TypeScript type intentionally references @types/better-sqlite3 because
- * its definitions are richer than @types/bun's bun:sqlite types and bun:sqlite
- * is a structural superset for the API surface we use. Calls written against
- * this type work correctly under both runtimes at runtime.
- *
- * @types/better-sqlite3 uses `export = Database` (CommonJS interop), which
- * surfaces in TypeScript as `import Database = require("better-sqlite3")`.
- * We capture the DatabaseConstructor type from the namespace re-export.
- */
 import type BetterSqlite3 from "better-sqlite3";
 export declare const Database: typeof BetterSqlite3;
 /** Instance type alias used by helpers and storage modules. */

package/dist/shared/sqlite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sqlite.d.ts","sourceRoot":"","sources":["../../src/shared/sqlite.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAmCH;;;;;;;;;;;GAWG;AACH,OAAO,KAAK,aAAa,MAAM,gBAAgB,CAAC;AAEhD,eAAO,MAAM,QAAQ,EAAE,OAAO,aAA4B,CAAC;AAE3D,+DAA+D;AAC/D,MAAM,MAAM,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAC;AAE9C;;;;;;;;;GASG;AACH,MAAM,MAAM,SAAS,GAAG,aAAa,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,CAAC"}
+{"version":3,"file":"sqlite.d.ts","sourceRoot":"","sources":["../../src/shared/sqlite.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAMH,OAAO,KAAK,aAAa,MAAM,gBAAgB,CAAC;AAsFhD,eAAO,MAAM,QAAQ,EAAE,OAAO,aAA4B,CAAC;AAE3D,+DAA+D;AAC/D,MAAM,MAAM,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAC;AAE9C;;;;;;;;;GASG;AACH,MAAM,MAAM,SAAS,GAAG,aAAa,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cortexkit/opencode-magic-context",
-	"version": "0.16.1",
+	"version": "0.16.3",
 	"type": "module",
 	"description": "OpenCode plugin for Magic Context — cross-session memory and context management",
 	"main": "dist/index.js",
@@ -46,6 +46,7 @@
 		"ai-tokenizer": "^1.0.6",
 		"better-sqlite3": "^12.9.0",
 		"comment-json": "^4.2.5",
+		"nanotar": "^0.3.0",
 		"zod": "^4.1.8"
 	},
 	"devDependencies": {

package/src/shared/conflict-detector.ts

@@ -365,7 +365,7 @@ export function formatConflictShort(result: ConflictResult): string {
         "",
         ...result.reasons.map((r) => `• ${r}`),
         "",
-        "Fix: run `bunx --bun @cortexkit/opencode-magic-context@latest doctor`",
+        "Fix: run `npx @cortexkit/opencode-magic-context@latest doctor`",
     ];
     return lines.join("\n");
 }

package/src/shared/native-binding.ts

@@ -0,0 +1,311 @@
+/**
+ * Native-binding resolver for Electron-runtime mismatches.
+ *
+ * Why this module exists
+ * ----------------------
+ * `better-sqlite3` uses raw v8/nan bindings, so its compiled `.node` file is
+ * locked to a specific NODE_MODULE_VERSION (Node-API ABI revision). When
+ * OpenCode Desktop (Electron 41 → ABI 145) loads a plugin whose `node_modules`
+ * was populated by `bun install` / `npm install` under a different runtime,
+ * the fetched prebuild is for `node-vNNN` (e.g. ABI 137 for Node 22) and
+ * Electron refuses to load it with:
+ *
+ *   The module '...better_sqlite3.node' was compiled against a different
+ *   Node.js version using NODE_MODULE_VERSION 137. This version of Node.js
+ *   requires NODE_MODULE_VERSION 145.
+ *
+ * `onnxruntime-node` (used by `@huggingface/transformers` for local
+ * embeddings) is N-API v3 and is ABI-stable across runtimes, so it does NOT
+ * have this problem. Only `better-sqlite3` is affected.
+ *
+ * What this does
+ * --------------
+ * On plugin load, before constructing any `Database`:
+ *
+ *  1. If we are NOT running under Electron (`process.versions.electron` is
+ *     unset), return null. Bun uses `bun:sqlite` and never reaches this code;
+ *     Pi/Node-CLI install matching Node-vNNN prebuilds via npm, which work
+ *     natively against the on-disk binary.
+ *
+ *  2. If we ARE on Electron, locate the `.node` file path that
+ *     `better-sqlite3`'s default `bindings()` lookup would try first. Probe
+ *     its ABI by attempting a sandboxed `process.dlopen`. If it succeeds
+ *     (Electron-compatible), return null — the default lookup will work.
+ *
+ *  3. Otherwise, look for a cached Electron prebuild at
+ *     `<XDG_CACHE_HOME>/cortexkit/native-bindings/better-sqlite3/v<version>/electron-v<abi>-<platform>-<arch>/better_sqlite3.node`.
+ *     Download it from the `WiseLibs/better-sqlite3` GitHub release if
+ *     missing, extract with `nanotar` (pure-JS, ~45 KB, zero deps), validate
+ *     the ABI, and return the absolute path.
+ *
+ * The caller (`sqlite.ts`) then passes this path through `better-sqlite3`'s
+ * documented `nativeBinding` constructor option:
+ *
+ *   new Database(filename, { nativeBinding: <our cached path> })
+ *
+ * `better-sqlite3` calls `require()` directly on that path, bypassing the
+ * normal `bindings()` lookup chain. This is a first-class API the maintainer
+ * added for exactly this kind of cross-runtime extension scenario — see
+ * `node_modules/better-sqlite3/lib/database.js` `nativeBinding` handling.
+ *
+ * Why we don't replace the on-disk binary
+ * ---------------------------------------
+ * An earlier iteration copied the cached Electron binary over the in-tree
+ * `node_modules/.../better_sqlite3.node`. That worked but mutates a shared
+ * resource: in monorepo dev setups (or any case where multiple runtimes
+ * share one `node_modules`), a Pi process opening the plugin from the same
+ * workspace would then load the Electron-ABI binary and fail. Returning a
+ * separate cached path keeps the on-disk file untouched so each runtime
+ * sees the binary it needs.
+ *
+ * Failure modes
+ * -------------
+ * If GitHub is unreachable (corporate firewall, offline laptop, rate limit)
+ * AND no cached binary exists, this throws. The caller (sqlite.ts →
+ * openDatabase) surfaces a `storage unavailable` error and Magic Context
+ * disables itself for the run. The user can connect to the network and
+ * restart, or wait for a cached binary from a previous successful launch.
+ */
+
+import { existsSync, mkdirSync, writeFileSync } from "node:fs";
+import { createRequire } from "node:module";
+import * as path from "node:path";
+import { parseTarGzip } from "nanotar";
+import { getCacheDir } from "./data-path";
+import { log } from "./logger";
+
+const PREFIX = "[native-binding]";
+
+function logInfo(message: string): void {
+    log(`${PREFIX} ${message}`);
+}
+
+function logWarn(message: string): void {
+    log(`${PREFIX} WARN ${message}`);
+}
+
+/**
+ * Result of probing a `.node` file's ABI by attempting a sandboxed `dlopen`.
+ *
+ * - `ok: true` means the runtime accepted the binary; the on-disk file is
+ *   already Electron-compatible and we don't need to do anything.
+ * - `ok: false` carries the parsed `actual` ABI for diagnostics (or `null`
+ *   if the error message didn't match any known shape).
+ */
+type ProbeResult = { ok: true } | { ok: false; expected: string; actual: string | null };
+
+function probeAbi(binaryPath: string): ProbeResult {
+    const expected = process.versions.modules;
+    try {
+        // Throwaway sandbox: process.dlopen runs the module's init function
+        // against `sandbox.exports`. On ABI mismatch it throws BEFORE init
+        // runs, so the binary is NOT loaded into process memory in the
+        // failure case. On success the binary IS loaded (Node refcounts
+        // these, so a second dlopen by the real `require()` is cheap).
+        const sandbox = { exports: {} as Record<string, unknown> };
+        process.dlopen(sandbox, binaryPath);
+        return { ok: true };
+    } catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        const pair = message.match(/NODE_MODULE_VERSION (\d+).*NODE_MODULE_VERSION (\d+)/s);
+        if (pair?.[1] && pair[2]) {
+            return { ok: false, expected: pair[2], actual: pair[1] };
+        }
+        const single = message.match(/NODE_MODULE_VERSION[ =:]+(\d+)/);
+        if (single?.[1]) {
+            return { ok: false, expected, actual: single[1] };
+        }
+        // Couldn't parse — log raw message so we can refine the regex if a
+        // future runtime emits a different shape.
+        logWarn(`could not parse ABI from dlopen error: ${message}`);
+        return { ok: false, expected, actual: null };
+    }
+}
+
+/**
+ * Locate the on-disk path `better-sqlite3` ships its `.node` file at, plus
+ * the package version. Returns null if better-sqlite3 isn't resolvable —
+ * that's a broken install we let propagate naturally through the dynamic
+ * import in sqlite.ts.
+ */
+function resolveBetterSqlite3OnDisk(
+    requireFn: NodeRequire,
+): { binaryPath: string; pkgVersion: string } | null {
+    try {
+        const pkgJsonPath = requireFn.resolve("better-sqlite3/package.json");
+        const pkgDir = path.dirname(pkgJsonPath);
+        const pkgJson = requireFn(pkgJsonPath) as { version: string };
+        const binaryPath = path.join(pkgDir, "build", "Release", "better_sqlite3.node");
+        return { binaryPath, pkgVersion: pkgJson.version };
+    } catch (err) {
+        logWarn(
+            `could not resolve better-sqlite3 in node_modules: ${err instanceof Error ? err.message : String(err)}`,
+        );
+        return null;
+    }
+}
+
+/**
+ * Cache directory for downloaded native bindings. Keyed by
+ * `<pkgVersion>/electron-v<abi>-<platform>-<arch>` so a Magic Context update
+ * that bumps better-sqlite3 or an OpenCode update that bumps Electron both
+ * trigger a fresh download cleanly.
+ */
+function getCachedBinaryPath(pkgVersion: string, abi: string): string {
+    return path.join(
+        getCacheDir(),
+        "cortexkit",
+        "native-bindings",
+        "better-sqlite3",
+        `v${pkgVersion}`,
+        `electron-v${abi}-${process.platform}-${process.arch}`,
+        "better_sqlite3.node",
+    );
+}
+
+/**
+ * Download the Electron-targeted prebuild tarball from WiseLibs/better-sqlite3
+ * GitHub releases and extract the `.node` bytes. Throws on HTTP failure or
+ * if the tarball doesn't contain the expected file.
+ */
+async function downloadElectronPrebuild(pkgVersion: string, abi: string): Promise<Uint8Array> {
+    const filename = `better-sqlite3-v${pkgVersion}-electron-v${abi}-${process.platform}-${process.arch}.tar.gz`;
+    const url = `https://github.com/WiseLibs/better-sqlite3/releases/download/v${pkgVersion}/${filename}`;
+    logInfo(`downloading ${url}`);
+
+    const response = await fetch(url, {
+        redirect: "follow",
+        headers: { "User-Agent": "magic-context-plugin/native-binding" },
+    });
+    if (!response.ok) {
+        throw new Error(
+            `failed to download Electron prebuild (HTTP ${response.status} ${response.statusText}) from ${url}`,
+        );
+    }
+
+    const tarballBytes = new Uint8Array(await response.arrayBuffer());
+    logInfo(`downloaded ${(tarballBytes.length / 1024).toFixed(1)} KB; extracting`);
+
+    const files = await parseTarGzip(tarballBytes);
+    const nodeFile = files.find((f) => f.name.endsWith("better_sqlite3.node"));
+    if (!nodeFile?.data) {
+        const names = files.map((f) => f.name).join(", ");
+        throw new Error(
+            `Electron prebuild tarball did not contain better_sqlite3.node; got: [${names}]`,
+        );
+    }
+    return nodeFile.data instanceof Uint8Array ? nodeFile.data : new Uint8Array(nodeFile.data);
+}
+
+/**
+ * Singleton promise so concurrent callers (multiple plugin init paths in the
+ * same process) only do the check + download once. Reset to null after
+ * completion so a future call can retry on transient failures.
+ */
+let inFlight: Promise<string | null> | null = null;
+
+/**
+ * Resolve the absolute path to a `better-sqlite3` `.node` binary that the
+ * current runtime can load.
+ *
+ *   - Returns `null` outside Electron (Bun uses `bun:sqlite`; Pi/Node CLI
+ *     loads matching prebuilds from `node_modules` natively).
+ *   - Returns `null` on Electron when the on-disk binary already matches
+ *     the runtime's ABI (rare but possible — a future OpenCode build that
+ *     post-install-rebuilds for Electron would hit this fast path).
+ *   - Returns the cached/downloaded prebuild path on Electron when the
+ *     on-disk binary's ABI doesn't match.
+ *
+ * The returned path is suitable as the `nativeBinding` option to
+ * `new Database(filename, { nativeBinding })`. better-sqlite3 calls `require()`
+ * directly on it, bypassing the default `bindings()` lookup chain — this is
+ * a documented public API in better-sqlite3, not an internal hack.
+ */
+export async function resolveBetterSqliteNativeBinding(): Promise<string | null> {
+    if (!process.versions.electron) {
+        return null;
+    }
+
+    if (inFlight) {
+        return inFlight;
+    }
+
+    const promise = (async () => {
+        const expected = process.versions.modules;
+        logInfo(
+            `Electron detected (v${process.versions.electron}, NODE_MODULE_VERSION ${expected}); verifying better-sqlite3 binding`,
+        );
+
+        const requireFn = createRequire(import.meta.url);
+        const resolved = resolveBetterSqlite3OnDisk(requireFn);
+        if (!resolved) {
+            return null;
+        }
+        const { binaryPath: diskPath, pkgVersion } = resolved;
+
+        // Fast path: if the on-disk binary already matches the runtime's
+        // ABI, we don't need to override the lookup at all. This handles
+        // any future OpenCode build that rebuilds native modules for
+        // Electron at install time, plus the case where the user manually
+        // ran `prebuild-install --runtime=electron`.
+        if (existsSync(diskPath)) {
+            const diskProbe = probeAbi(diskPath);
+            if (diskProbe.ok) {
+                logInfo(
+                    `on-disk binary already matches Electron ABI v${expected}; using default bindings() lookup`,
+                );
+                return null;
+            }
+            logInfo(
+                `on-disk binary ABI ${diskProbe.actual ?? "unknown"} != required ${expected}; will use Electron prebuild`,
+            );
+        } else {
+            logWarn(
+                `expected better-sqlite3 binary not found at ${diskPath}; will fetch Electron prebuild anyway`,
+            );
+        }
+
+        // Look for a cached Electron prebuild from a previous launch.
+        const cachedPath = getCachedBinaryPath(pkgVersion, expected);
+        if (existsSync(cachedPath)) {
+            const cachedProbe = probeAbi(cachedPath);
+            if (cachedProbe.ok) {
+                logInfo(`using cached Electron prebuild at ${cachedPath}`);
+                return cachedPath;
+            }
+            logWarn(
+                `cached binary at ${cachedPath} has wrong ABI (${cachedProbe.actual ?? "unknown"} != ${expected}); refetching`,
+            );
+        }
+
+        // Download fresh.
+        mkdirSync(path.dirname(cachedPath), { recursive: true });
+        const nodeFileBytes = await downloadElectronPrebuild(pkgVersion, expected);
+        writeFileSync(cachedPath, nodeFileBytes);
+        logInfo(
+            `cached Electron prebuild at ${cachedPath} (${(nodeFileBytes.length / 1024).toFixed(1)} KB)`,
+        );
+
+        // Validate the freshly downloaded binary before returning it — if
+        // the upstream tarball was malformed or for the wrong ABI, fail
+        // loudly here rather than letting the better-sqlite3 constructor
+        // throw a less actionable error later.
+        const finalProbe = probeAbi(cachedPath);
+        if (!finalProbe.ok) {
+            throw new Error(
+                `downloaded Electron prebuild has wrong ABI (${finalProbe.actual ?? "unknown"} != ${expected}); refusing to use`,
+            );
+        }
+
+        return cachedPath;
+    })();
+
+    inFlight = promise;
+    try {
+        return await promise;
+    } finally {
+        if (inFlight === promise) {
+            inFlight = null;
+        }
+    }
+}

package/src/shared/sqlite.ts

@@ -26,6 +26,12 @@
  * in `./sqlite-helpers.ts`.
  */
 
+// Type import only — better-sqlite3's runtime is loaded dynamically below.
+// @types/better-sqlite3 has richer definitions than @types/bun's bun:sqlite
+// types, and bun:sqlite is a structural superset for the API surface we use,
+// so calls typed against BetterSqlite3 work under both runtimes at runtime.
+import type BetterSqlite3 from "better-sqlite3";
+
 // Detect Bun via process.versions.bun. Both globalThis.Bun and
 // process.versions.bun are set by the Bun runtime, but process.versions
 // is a lower-level surface less likely to be sandboxed by host runtimes
@@ -50,6 +56,22 @@ const isBun = typeof process !== "undefined" && typeof process.versions?.bun ===
 // dynamic import — Pi's loader, esbuild, and bun build all accept it.
 const bunSpec = "bun:" + "sqlite";
 const betterSpec = "better-" + "sqlite3";
+
+// Under Electron, the npm-installed better-sqlite3 binary has the wrong ABI
+// (it's a Node prebuild but Electron embeds a different NODE_MODULE_VERSION).
+// resolveBetterSqliteNativeBinding() detects this and downloads + caches the
+// matching Electron prebuild, then returns its absolute path so we can pass
+// it to better-sqlite3 via the `nativeBinding` constructor option (a
+// documented public API). Returns null outside Electron OR when the on-disk
+// binary already matches the runtime ABI — in those cases the default
+// bindings() lookup just works.
+const electronNativeBinding = isBun
+    ? null
+    : await (async () => {
+          const mod = await import("./native-binding");
+          return mod.resolveBetterSqliteNativeBinding();
+      })();
+
 const sqliteModule = isBun
     ? await import(/* @vite-ignore */ bunSpec)
     : await import(/* @vite-ignore */ betterSpec);
@@ -57,21 +79,42 @@ const sqliteModule = isBun
 // Different export shapes between the two libraries:
 //   - bun:sqlite     → named export `Database`
 //   - better-sqlite3 → default export
-const DatabaseImpl = isBun ? sqliteModule.Database : sqliteModule.default;
+const RawDatabaseImpl = isBun ? sqliteModule.Database : sqliteModule.default;
 
-/**
- * Database constructor compatible with both bun:sqlite and better-sqlite3.
- *
- * The TypeScript type intentionally references @types/better-sqlite3 because
- * its definitions are richer than @types/bun's bun:sqlite types and bun:sqlite
- * is a structural superset for the API surface we use. Calls written against
- * this type work correctly under both runtimes at runtime.
- *
- * @types/better-sqlite3 uses `export = Database` (CommonJS interop), which
- * surfaces in TypeScript as `import Database = require("better-sqlite3")`.
- * We capture the DatabaseConstructor type from the namespace re-export.
- */
-import type BetterSqlite3 from "better-sqlite3";
+// When we resolved a non-default Electron-compatible native binding above,
+// transparently inject it into every `new Database(...)` call. This is the
+// public `nativeBinding` constructor option that better-sqlite3 ships
+// specifically for cross-runtime extension scenarios — it makes
+// better-sqlite3 `require()` the binary at the supplied path directly,
+// bypassing the default bindings() resolver.
+//
+// Subclassing keeps the call sites untouched: existing
+// `new Database(filename, { readonly: true })` invocations work as-is.
+// Callers can still override `nativeBinding` explicitly if they need to.
+//
+// The TypeScript type intentionally references @types/better-sqlite3 because
+// its definitions are richer than @types/bun's bun:sqlite types and bun:sqlite
+// is a structural superset for the API surface we use. Calls written against
+// this type work correctly under both runtimes at runtime.
+//
+// @types/better-sqlite3 uses `export = Database` (CommonJS interop), which
+// surfaces in TypeScript as `import Database = require("better-sqlite3")`.
+// We capture the DatabaseConstructor type from the namespace re-export.
+const DatabaseImpl: typeof BetterSqlite3 =
+    electronNativeBinding == null
+        ? (RawDatabaseImpl as typeof BetterSqlite3)
+        : (class DatabaseWithElectronBinding extends (RawDatabaseImpl as typeof BetterSqlite3) {
+              constructor(filename?: string | Buffer, options?: BetterSqlite3.Options) {
+                  // Type narrowing: the surrounding ternary already proved
+                  // electronNativeBinding is non-null in this branch, but
+                  // TypeScript can't follow that across the class boundary.
+                  const fallback = electronNativeBinding as string;
+                  super(filename, {
+                      ...options,
+                      nativeBinding: options?.nativeBinding ?? fallback,
+                  });
+              }
+          } as typeof BetterSqlite3);
 
 export const Database: typeof BetterSqlite3 = DatabaseImpl;
 

package/src/tui/index.tsx

@@ -103,7 +103,7 @@ function showConflictDialog(api: TuiPluginApi, directory: string, reasons: strin
                 }, 50)
             }}
             onCancel={() => {
-                api.ui.toast({ message: "Magic Context remains disabled. Run: bunx --bun @cortexkit/opencode-magic-context@latest doctor", variant: "warning", duration: 5000 })
+                api.ui.toast({ message: "Magic Context remains disabled. Run: npx @cortexkit/opencode-magic-context@latest doctor", variant: "warning", duration: 5000 })
             }}
         />
     ))
@@ -152,7 +152,7 @@ function showTuiSetupDialog(api: TuiPluginApi) {
                 }, 50)
             }}
             onCancel={() => {
-                api.ui.toast({ message: "You can add the sidebar later via: bunx --bun @cortexkit/opencode-magic-context@latest doctor", variant: "info", duration: 5000 })
+                api.ui.toast({ message: "You can add the sidebar later via: npx @cortexkit/opencode-magic-context@latest doctor", variant: "info", duration: 5000 })
             }}
         />
     ))