@adhdev/daemon-core 0.9.82-rc.332 → 0.9.82-rc.333

package/dist/system/load-better-sqlite3.d.ts

@@ -0,0 +1,21 @@
+import type BetterSqlite3 from 'better-sqlite3';
+/**
+ * Load the `better-sqlite3` constructor in a way that survives every runtime the
+ * daemon ships in.
+ *
+ * The naive `typeof require === 'function' ? require : createRequire(import.meta.url)`
+ * is unsafe inside the daemon-cloud bundle: esbuild emits CJS output but, for any
+ * chunk that touches `import.meta.url`, it shims the local `require` with a stub
+ * that THROWS `Dynamic require of "..." is not supported`. That stub is still
+ * `typeof === 'function'`, so the ternary picks it and the call throws — it never
+ * reaches the `createRequire` fallback. The failure surfaced as `mesh_send_task`
+ * crashing the whole tool call instead of gracefully degrading.
+ *
+ * The robust approach is to ATTEMPT the real `require` and CATCH the esbuild stub's
+ * throw, then fall back to `createRequire`. We try multiple resolution bases so the
+ * load works whether the code runs as:
+ *   - a genuine CJS module (bare `require` works),
+ *   - an esbuild CJS bundle with the throwing `require` shim (createRequire(import.meta.url)),
+ *   - a pure ESM module where `require` is undefined (createRequire(import.meta.url)).
+ */
+export declare function loadBetterSqlite3(): typeof BetterSqlite3;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.9.82-rc.332",
+  "version": "0.9.82-rc.333",
   "description": "ADHDev daemon core — CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -46,7 +46,7 @@
   "author": "vilmire",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@adhdev/mesh-shared": "0.9.82-rc.332",
+    "@adhdev/mesh-shared": "0.9.82-rc.333",
     "@adhdev/session-host-core": "*",
     "@agentclientprotocol/sdk": "^0.16.1",
     "ajv": "^8.20.0",

package/src/mesh/mesh-runtime-store.ts

@@ -1,6 +1,6 @@
 import { existsSync, mkdirSync, readFileSync, renameSync, statSync } from 'fs';
 import { dirname, join } from 'path';
-import { createRequire } from 'module';
+import { loadBetterSqlite3 } from '../system/load-better-sqlite3.js';
 import { getLedgerDir } from './mesh-ledger.js';
 import { nodeSatisfiesRequiredTags } from './mesh-work-queue.js';
 import type { MeshTaskStatus, MeshWorkQueueEntry } from './mesh-work-queue.js';
@@ -11,10 +11,7 @@ let DatabaseCtor: typeof BetterSqlite3 | undefined;
 
 function loadDatabaseCtor(): typeof BetterSqlite3 {
     if (DatabaseCtor) return DatabaseCtor;
-    const runtimeRequire = typeof require === 'function'
-        ? require
-        : createRequire(import.meta.url);
-    DatabaseCtor = runtimeRequire('better-sqlite3') as typeof BetterSqlite3;
+    DatabaseCtor = loadBetterSqlite3() as typeof BetterSqlite3;
     return DatabaseCtor;
 }
 

package/src/providers/native-history/hermes-cli-transcript.ts

@@ -19,6 +19,7 @@
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import * as os from 'node:os';
+import { loadBetterSqlite3 } from '../../system/load-better-sqlite3.js';
 
 export interface NativeHistoryMessage {
     id: string;
@@ -61,8 +62,7 @@ function statMtimeMs(p: string): number {
 function openDb(): any | null {
     if (!fs.existsSync(HERMES_STATE_DB)) return null;
     try {
-        // eslint-disable-next-line @typescript-eslint/no-require-imports
-        const Database = require('better-sqlite3');
+        const Database = loadBetterSqlite3();
         return new Database(HERMES_STATE_DB, { readonly: true, fileMustExist: true });
     } catch {
         return null;

package/src/providers/spec/native-history-executor.ts

@@ -22,6 +22,7 @@ import * as fs from 'node:fs';
 import * as os from 'node:os';
 import * as path from 'node:path';
 import { LOG } from '../../logging/logger.js';
+import { loadBetterSqlite3 } from '../../system/load-better-sqlite3.js';
 import type {
     NativeHistoryConfig,
     NativeHistoryJsonlSource,
@@ -253,8 +254,7 @@ function executeSqlite(src: NativeHistorySqliteSource, input: NativeHistoryInput
 
     let Database: any;
     try {
-        // eslint-disable-next-line @typescript-eslint/no-require-imports
-        Database = require('better-sqlite3');
+        Database = loadBetterSqlite3();
     } catch { return null; }
 
     let db: any;

package/src/system/load-better-sqlite3.ts

@@ -0,0 +1,68 @@
+import { createRequire } from 'module';
+import type BetterSqlite3 from 'better-sqlite3';
+
+let cached: typeof BetterSqlite3 | undefined;
+
+/**
+ * Load the `better-sqlite3` constructor in a way that survives every runtime the
+ * daemon ships in.
+ *
+ * The naive `typeof require === 'function' ? require : createRequire(import.meta.url)`
+ * is unsafe inside the daemon-cloud bundle: esbuild emits CJS output but, for any
+ * chunk that touches `import.meta.url`, it shims the local `require` with a stub
+ * that THROWS `Dynamic require of "..." is not supported`. That stub is still
+ * `typeof === 'function'`, so the ternary picks it and the call throws — it never
+ * reaches the `createRequire` fallback. The failure surfaced as `mesh_send_task`
+ * crashing the whole tool call instead of gracefully degrading.
+ *
+ * The robust approach is to ATTEMPT the real `require` and CATCH the esbuild stub's
+ * throw, then fall back to `createRequire`. We try multiple resolution bases so the
+ * load works whether the code runs as:
+ *   - a genuine CJS module (bare `require` works),
+ *   - an esbuild CJS bundle with the throwing `require` shim (createRequire(import.meta.url)),
+ *   - a pure ESM module where `require` is undefined (createRequire(import.meta.url)).
+ */
+export function loadBetterSqlite3(): typeof BetterSqlite3 {
+    if (cached) return cached;
+
+    const errors: unknown[] = [];
+
+    // 1) Real CJS require, when present and not the esbuild throwing shim.
+    if (typeof require === 'function') {
+        try {
+            cached = require('better-sqlite3') as typeof BetterSqlite3;
+            return cached;
+        } catch (e) {
+            // Either the esbuild "Dynamic require is not supported" shim, or a
+            // genuine resolution failure. Fall through to createRequire.
+            errors.push(e);
+        }
+    }
+
+    // 2) createRequire anchored at this module's URL (works in ESM and in esbuild
+    //    CJS bundles, where import.meta.url is rewritten to a usable value).
+    try {
+        const metaUrl = typeof import.meta?.url === 'string' ? import.meta.url : undefined;
+        if (metaUrl) {
+            cached = createRequire(metaUrl)('better-sqlite3') as typeof BetterSqlite3;
+            return cached;
+        }
+    } catch (e) {
+        errors.push(e);
+    }
+
+    // 3) Last resort: createRequire anchored at the current working directory.
+    try {
+        cached = createRequire(`${process.cwd()}/__adhdev_better_sqlite3_loader__.js`)(
+            'better-sqlite3',
+        ) as typeof BetterSqlite3;
+        return cached;
+    } catch (e) {
+        errors.push(e);
+    }
+
+    const detail = errors
+        .map((e) => (e instanceof Error ? e.message : String(e)))
+        .join('; ');
+    throw new Error(`Failed to load better-sqlite3: ${detail}`);
+}