Merge branch 'main' into feat/windows-drive-switcher

Resolve conflict in electron-builder.yml: keep both icon resources
(from PR) and afterPack hook (from main).

electron-builder.yml

@@ -33,6 +33,7 @@ extraResources:
   - from: build/
     to: .
     filter: ["icon.*"]
+afterPack: scripts/after-pack.js
 asarUnpack:
   - "**/*.node"
   - "**/better-sqlite3/**"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "codepilot",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "private": true,
   "main": "dist-electron/main.js",
   "scripts": {

scripts/after-pack.js

@@ -0,0 +1,70 @@
+/**
+ * electron-builder afterPack hook.
+ *
+ * After @electron/rebuild recompiles native modules for Electron's ABI,
+ * copy the rebuilt better_sqlite3.node into the standalone resources
+ * (which still has the system-Node version from `next build`).
+ */
+const fs = require('fs');
+const path = require('path');
+
+module.exports = async function afterPack(context) {
+  const appOutDir = context.appOutDir;
+
+  // Source: the rebuilt .node file in the project's node_modules
+  const rebuiltSource = path.join(
+    process.cwd(),
+    'node_modules',
+    'better-sqlite3',
+    'build',
+    'Release',
+    'better_sqlite3.node'
+  );
+
+  if (!fs.existsSync(rebuiltSource)) {
+    console.warn('[afterPack] Rebuilt better_sqlite3.node not found at', rebuiltSource);
+    return;
+  }
+
+  // Find all better_sqlite3.node files inside the standalone resources
+  const resourcesDir = path.join(appOutDir, 'CodePilot.app', 'Contents', 'Resources');
+  // On macOS the structure is: <appOutDir>/CodePilot.app/Contents/Resources/standalone/...
+  // But appOutDir might already point to the .app parent, so try both
+  const searchRoots = [
+    path.join(resourcesDir, 'standalone'),
+    path.join(appOutDir, 'Contents', 'Resources', 'standalone'),
+  ];
+
+  let replaced = 0;
+
+  function walkAndReplace(dir) {
+    if (!fs.existsSync(dir)) return;
+    const entries = fs.readdirSync(dir, { withFileTypes: true });
+    for (const entry of entries) {
+      const fullPath = path.join(dir, entry.name);
+      if (entry.isDirectory()) {
+        walkAndReplace(fullPath);
+      } else if (entry.name === 'better_sqlite3.node') {
+        console.log(`[afterPack] Replacing ${fullPath}`);
+        fs.copyFileSync(rebuiltSource, fullPath);
+        replaced++;
+      }
+    }
+  }
+
+  for (const root of searchRoots) {
+    walkAndReplace(root);
+  }
+
+  if (replaced > 0) {
+    console.log(`[afterPack] Replaced ${replaced} better_sqlite3.node file(s) with Electron-compatible build`);
+  } else {
+    console.warn('[afterPack] No better_sqlite3.node files found in standalone resources');
+    // List the resources dir for debugging
+    for (const root of searchRoots) {
+      if (fs.existsSync(root)) {
+        console.log(`[afterPack] Contents of ${root}:`, fs.readdirSync(root).slice(0, 20));
+      }
+    }
+  }
+};