fix Node 26 native module repair

Author: SawyerHood

apps/connect/package.json

@@ -23,7 +23,7 @@
     "@types/node": "^22.0.0",
     "@types/ws": "^8.18.1",
     "better-sqlite3": "12.10.0",
-    "tsx": "^4.21.0",
+    "tsx": "^4.23.1",
     "typescript": "npm:@typescript/typescript6@^6.0.2",
     "typescript-7": "npm:typescript@^7.0.2",
     "wrangler": "^4.100.0",

apps/desktop/package.json

@@ -39,7 +39,7 @@
     "electron-builder": "^26.8.1",
     "esbuild": "^0.28.0",
     "rimraf": "^6.1.0",
-    "tsx": "^4.21.0",
+    "tsx": "^4.23.1",
     "typescript": "npm:@typescript/typescript6@^6.0.2",
     "typescript-7": "npm:typescript@^7.0.2",
     "vitest": "^4.1.1",

apps/host-daemon/package.json

@@ -62,7 +62,7 @@
     "@types/semver": "^7.7.1",
     "esbuild": "^0.28.0",
     "hono": "^4.7.0",
-    "tsx": "^4.21.0",
+    "tsx": "^4.23.1",
     "typescript": "npm:@typescript/typescript6@^6.0.2",
     "typescript-7": "npm:typescript@^7.0.2"
   }

apps/server/package.json

@@ -62,7 +62,7 @@
     "@types/node": "^22.0.0",
     "@types/semver": "^7.7.0",
     "@types/ws": "^8.18.1",
-    "tsx": "^4.21.0",
+    "tsx": "^4.23.1",
     "typescript": "npm:@typescript/typescript6@^6.0.2",
     "typescript-7": "npm:typescript@^7.0.2",
     "vitest": "^4.1.1",

package.json

@@ -47,7 +47,7 @@
     "esbuild": "^0.28.0",
     "prettier": "^3.8.3",
     "rimraf": "^6.1.0",
-    "tsx": "^4.21.0",
+    "tsx": "^4.23.1",
     "turbo": "^2.4.0",
     "typescript": "npm:@typescript/typescript6@^6.0.2",
     "typescript-7": "npm:typescript@^7.0.2",

packages/agent-runtime/package.json

@@ -48,7 +48,7 @@
     "@bb/test-helpers": "workspace:*",
     "@bb/tsconfig": "workspace:*",
     "@types/node": "^22.0.0",
-    "tsx": "^4.21.0",
+    "tsx": "^4.23.1",
     "typescript": "npm:@typescript/typescript6@^6.0.2",
     "typescript-7": "npm:typescript@^7.0.2",
     "vitest": "^4.1.1"

packages/scripts/test/ensure-native-modules.test.mjs

@@ -66,6 +66,14 @@ function createEnsureOptions(fakeRequire, execFileSync) {
     ],
     createRequire: () => fakeRequire,
     execFileSync,
+    verifyRepairedNativeModule(name) {
+      try {
+        verifyNativeModule(name, fakeRequire);
+        return null;
+      } catch (err) {
+        return err instanceof Error ? err.message : String(err);
+      }
+    },
     log: vi.fn(),
   };
 }
@@ -247,6 +255,27 @@ describe("ensure-native-modules", () => {
     expect(fake.state.constructorCalls).toBe(3);
   });
 
+  it("rebuilds when Node reports that the native module did not self-register", () => {
+    const registrationError = new Error(
+      "Module did not self-register: '/tmp/better_sqlite3.node'",
+    );
+    const fake = createBetterSqliteRequire(registrationError);
+    const execFileSync = vi.fn((nodePath, args) => {
+      if (args[0] === "/tmp/fake-node-modules/node-gyp/bin/node-gyp.js") {
+        fake.clearConstructorError();
+      }
+    });
+
+    expect(() =>
+      ensureNativeModules(
+        createEnsureOptions(fake.requireModule, execFileSync),
+      ),
+    ).not.toThrow();
+
+    expect(execFileSync).toHaveBeenCalledTimes(2);
+    expect(fake.state.constructorCalls).toBe(3);
+  });
+
   it("exits non-zero when the post-rebuild instantiation still fails", () => {
     const result = spawnSync(
       process.execPath,
@@ -278,6 +307,9 @@ describe("ensure-native-modules", () => {
             modules: [{ name: "better-sqlite3", resolveFrom: "packages/db/package.json" }],
             createRequire,
             execFileSync() {},
+            verifyRepairedNativeModule() {
+              return "Wrong native binary NODE_MODULE_VERSION";
+            },
             log() {},
           });
         `,

pnpm-lock.yaml

@@ -51,8 +51,10 @@ export function verifyNativeModule(name, requireModule) {
 }
 
 function shouldRebuildNativeModule(errorMessage) {
-  return /NODE_MODULE_VERSION|Could not locate the bindings file/.test(
-    errorMessage,
+  return (
+    /NODE_MODULE_VERSION|Could not locate the bindings file|Module did not self-register/.test(
+      errorMessage,
+    )
   );
 }
 
@@ -67,11 +69,38 @@ function getRepairableNativeModuleError(name, requireModule) {
   }
 }
 
+function getRepairedNativeModuleError(name, pkgJsonPath) {
+  try {
+    // A failed dlopen remains cached for the life of the process. Verify a
+    // replacement binary in a fresh process so the old handle cannot poison it.
+    execFileSync(
+      process.execPath,
+      [
+        "--input-type=module",
+        "--eval",
+        `import { createRequire } from "node:module";
+const requireModule = createRequire(${JSON.stringify(pkgJsonPath)});
+const NativeModule = requireModule(${JSON.stringify(name)});
+const instance = new NativeModule(":memory:");
+instance.close();`,
+      ],
+      { stdio: ["ignore", "pipe", "pipe"] },
+    );
+    return null;
+  } catch (err) {
+    const message = formatChildProcessFailure(err);
+    if (!shouldRebuildNativeModule(message)) throw err;
+    return message;
+  }
+}
+
 export function ensureNativeModules({
   repoRoot = defaultRepoRoot,
   modules = nativeModules,
   createRequire: createRequireImpl = createRequire,
   execFileSync: execFileSyncImpl = execFileSync,
+  verifyRepairedNativeModule: verifyRepairedNativeModuleImpl =
+    getRepairedNativeModuleError,
   log = console.log,
 } = {}) {
   for (const { name, resolveFrom } of modules) {
@@ -108,9 +137,9 @@ export function ensureNativeModules({
         );
       }
 
-      const prebuildVerifyError = getRepairableNativeModuleError(
+      const prebuildVerifyError = verifyRepairedNativeModuleImpl(
         name,
-        requireModule,
+        pkgJsonPath,
       );
       if (prebuildVerifyError === null) {
         if (!prebuildInstalled) {
@@ -147,9 +176,9 @@ export function ensureNativeModules({
         },
       );
 
-      const rebuildVerifyError = getRepairableNativeModuleError(
+      const rebuildVerifyError = verifyRepairedNativeModuleImpl(
         name,
-        requireModule,
+        pkgJsonPath,
       );
       if (rebuildVerifyError !== null) {
         throw new Error(

scripts/ensure-native-modules.mjs

@@ -21,7 +21,7 @@
     "@bb/tsconfig": "workspace:*",
     "@types/node": "^22.0.0",
     "rimraf": "^6.1.0",
-    "tsx": "^4.21.0",
+    "tsx": "^4.23.1",
     "typescript": "npm:@typescript/typescript6@^6.0.2",
     "typescript-7": "npm:typescript@^7.0.2",
     "vitest": "^4.1.1"