feat: bundle agent-server into a single CJS file for production to resolve ESM/asar pathing issues

Author: grantiguess

.github/workflows/release.yml

@@ -32,6 +32,9 @@ jobs:
       - name: Install dependencies
         run: npm ci
 
+      - name: Bundle agent server
+        run: npm run bundle:agent
+
       - name: Build and Release
         uses: samuelmeuli/action-electron-builder@v1
         env:

.gitignore

@@ -11,6 +11,7 @@ node_modules
 dist
 dist-ssr
 dist-electron
+agent-server.bundle.cjs
 *.local
 
 # Editor directories and files

electron-builder.json

@@ -10,26 +10,10 @@
     "dist/**/*",
     "electron/**/*",
     "package.json",
-    "agent-server.js",
-    "wizard-server.js",
-    "src/wizard/**/*",
-    "src/services/**/*",
-    "src/utils/**/*",
-    "src/ai/palettes.js",
-    "src/constants.js",
-    "src/core/**/*"
+    "agent-server.bundle.cjs"
   ],
   "asarUnpack": [
-    "package.json",
-    "agent-server.js",
-    "wizard-server.js",
-    "src/wizard/**/*",
-    "src/services/**/*",
-    "src/utils/**/*",
-    "src/ai/palettes.js",
-    "src/constants.js",
-    "src/core/**/*",
-    "node_modules/**/*"
+    "agent-server.bundle.cjs"
   ],
   "mac": {
     "entitlements": "entitlements.mac.plist",

electron/main.cjs

@@ -61,14 +61,17 @@ function startAgentServer() {
     return;
   }
 
-  // agent-server.js uses ESM imports, which don't work from inside asar archives.
-  // Both script and cwd must point to app.asar.unpacked/ where all files
-  // (including node_modules) are extracted as real files on disk.
-  let agentServerPath = path.join(__dirname, '..', 'agent-server.js');
+  // In production: use the pre-bundled CJS file from app.asar.unpacked/
+  // (single file, no ESM/asar issues, no node_modules needed)
+  // In dev: use the original ESM source (system Node.js handles ESM fine)
+  let agentServerPath;
   let agentCwd = path.join(__dirname, '..');
   if (app.isPackaged) {
-    agentServerPath = agentServerPath.replace('app.asar', 'app.asar.unpacked');
+    agentServerPath = path.join(__dirname, '..', 'agent-server.bundle.cjs')
+      .replace('app.asar', 'app.asar.unpacked');
     agentCwd = agentCwd.replace('app.asar', 'app.asar.unpacked');
+  } else {
+    agentServerPath = path.join(__dirname, '..', 'agent-server.js');
   }
 
   if (!fsSync.existsSync(agentServerPath)) {

package.json

@@ -25,10 +25,11 @@
     "bump-version": "node scripts/bump-version.js",
     "dev": "vite",
     "electron:dev": "concurrently -k \"npm run oauth\" \"npm run dev\" \"wait-on http://localhost:4001 && cross-env NODE_ENV=development electron .\"",
-    "electron:build": "npm run build && electron-builder",
-    "electron:build:mac": "npm run build && electron-builder --mac",
-    "electron:build:win": "npm run build && electron-builder --win",
-    "electron:build:linux": "npm run build && electron-builder --linux",
+    "bundle:agent": "esbuild agent-server.js --bundle --platform=node --format=cjs --outfile=agent-server.bundle.cjs",
+    "electron:build": "npm run build && npm run bundle:agent && electron-builder",
+    "electron:build:mac": "npm run build && npm run bundle:agent && electron-builder --mac",
+    "electron:build:win": "npm run build && npm run bundle:agent && electron-builder --win",
+    "electron:build:linux": "npm run build && npm run bundle:agent && electron-builder --linux",
     "free:4000": "node scripts/free-port-4000.js",
     "build": "vite build",
     "lint": "eslint .",

src/services/queue/Queue.js

@@ -5,8 +5,9 @@ import fs from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+// Safe for both ESM and CJS (esbuild bundle) contexts
+const __filename = import.meta.url ? fileURLToPath(import.meta.url) : '';
+const __dirname = __filename ? path.dirname(__filename) : '';
 
 function ensureDir(dirPath) {
   if (!fs.existsSync(dirPath)) {
@@ -23,7 +24,9 @@ function randomId(prefix = 'q') {
 }
 
 class QueueManager {
-  constructor(journalRoot = path.resolve(__dirname, '../../../data/queues')) {
+  constructor(journalRoot = __dirname
+    ? path.resolve(__dirname, '../../../data/queues')
+    : path.join(process.cwd(), 'data', 'queues')) {
     this.journalRoot = journalRoot;
     ensureDir(this.journalRoot);
     // Map<string, { items: Array, inflight: Map<leaseId,itemId>, byId: Map, metrics: {} }>

src/wizard/AgentLoop.js

@@ -13,8 +13,9 @@ import { selectToolsForTurn } from './tools/schemas.js';
 import { WIZARD_SYSTEM_PROMPT } from '../services/agent/WizardPrompt.js';
 import { NODE_DEFAULT_COLOR } from '../constants.js';
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+// Safe for both ESM and CJS (esbuild bundle) contexts
+const __filename = import.meta.url ? fileURLToPath(import.meta.url) : '';
+const __dirname = __filename ? path.dirname(__filename) : process.cwd();
 
 // Load system prompt
 let SYSTEM_PROMPT = WIZARD_SYSTEM_PROMPT;

wizard-server.js

@@ -16,6 +16,7 @@ import { getToolDefinitions, executeTool } from './src/wizard/tools/index.js';
 import { callLLM } from './src/wizard/LLMClient.js';
 import { debugLogSync } from './src/utils/debugLogger.js';
 import { enrichBatch, enrichSingle } from './src/wizard/services/wikipediaEnrichment.js';
+import SchedulerModule from './src/services/orchestrator/Scheduler.js';
 
 const app = express();
 
@@ -72,18 +73,8 @@ let scheduler = null;
 async function ensureSchedulerStarted() {
   if (!scheduler) {
     try {
-      // #region agent log
-      debugLogSync('wizard-server.js:scheduler:IMPORT_START', 'Importing scheduler', {}, 'debug-session', 'E');
-      // #endregion
-      const mod = await import('./src/services/orchestrator/Scheduler.js');
-      scheduler = mod.default;
-      // #region agent log
-      debugLogSync('wizard-server.js:scheduler:IMPORT_OK', 'Scheduler imported', { hasDefault: !!mod.default }, 'debug-session', 'E');
-      // #endregion
+      scheduler = SchedulerModule;
     } catch (e) {
-      // #region agent log
-      debugLogSync('wizard-server.js:scheduler:IMPORT_FAIL', 'Scheduler import failed', { error: e.message }, 'debug-session', 'E');
-      // #endregion
       console.warn('[Wizard] Failed to load scheduler:', e.message);
       return;
     }