@axhub/genie 0.2.4 → 0.2.6

package/server/cli.js

@@ -817,6 +817,10 @@ function showVersion() {
     console.log(`${packageJson.version}`);
 }
 
+function getManualUpdateCommand(packageName = packageJson.name || '@axhub/genie') {
+    return `npm install -g ${packageName}@latest`;
+}
+
 // Compare semver versions, returns true if v1 > v2
 function isNewerVersion(v1, v2) {
     const parts1 = v1.split('.').map(Number);
@@ -838,7 +842,7 @@ async function checkForUpdates(silent = false) {
 
         if (isNewerVersion(latestVersion, currentVersion)) {
             console.log(`\n${c.warn('[UPDATE]')} New version available: ${c.bright(latestVersion)} (current: ${currentVersion})`);
-            console.log(`         Run ${c.bright('axhub-genie update')} to update\n`);
+            console.log(`         Run ${c.bright(getManualUpdateCommand(packageName))} to update\n`);
             return { hasUpdate: true, latestVersion, currentVersion };
         } else if (!silent) {
             console.log(`${c.ok('[OK]')} You are on the latest version (${currentVersion})`);
@@ -867,11 +871,11 @@ async function updatePackage() {
         }
 
         console.log(`${c.info('[INFO]')} Updating from ${currentVersion} to ${latestVersion}...`);
-        execSync(`npm update -g ${packageName}`, { stdio: 'inherit' });
+        execSync(getManualUpdateCommand(packageName), { stdio: 'inherit' });
         console.log(`${c.ok('[OK]')} Update complete! Restart axhub-genie to use the new version.`);
     } catch (e) {
         console.error(`${c.error('[ERROR]')} Update failed: ${e.message}`);
-        console.log(`${c.tip('[TIP]')} Try running manually: npm update -g ${packageJson.name || '@axhub/genie'}`);
+        console.log(`${c.tip('[TIP]')} Try running manually: ${getManualUpdateCommand()}`);
     }
 }
 

package/server/external-agent/service.js

@@ -5,6 +5,7 @@ import { queryClaudeSDK } from '../claude-sdk.js';
 import { queryCodex } from '../openai-codex.js';
 import { queryGemini } from '../gemini-cli.js';
 import { queryOpencode } from '../opencode-cli.js';
+import { detectProviderInstallationStatus } from '../routes/cli-auth.js';
 import {
   buildAgentCallbackPayload,
   createAgentCallbackEventId,
@@ -38,6 +39,29 @@ function getDeprecatedGitHubFields(body) {
   return deprecatedFields.filter((field) => body[field] !== undefined);
 }
 
+async function ensureProviderInstalled(provider) {
+  const status = await detectProviderInstallationStatus(provider);
+  if (status?.installed) {
+    return status;
+  }
+
+  const installHint = typeof status?.installHint === 'string' && status.installHint.trim()
+    ? status.installHint.trim()
+    : null;
+  const reason = typeof status?.reason === 'string' && status.reason.trim()
+    ? status.reason.trim()
+    : null;
+
+  const messageParts = [`Provider "${provider}" is not installed.`];
+  if (installHint) {
+    messageParts.push(installHint);
+  } else if (reason) {
+    messageParts.push(reason);
+  }
+
+  throw createRequestError(messageParts.join(' '), 400);
+}
+
 export function buildSessionNavigation(sessionId) {
   const normalizedSessionId = typeof sessionId === 'string' && sessionId.trim() ? sessionId.trim() : null;
   const sessionPath = normalizedSessionId ? `/session/${normalizedSessionId}` : null;
@@ -484,6 +508,7 @@ export async function runExternalAgentRequest({
   let callbackResult = null;
 
   try {
+    await ensureProviderInstalled(normalized.provider);
     await ensureProjectPathExists(finalProjectPath);
 
     try {

package/server/index.js

@@ -83,7 +83,16 @@ import http from 'http';
 import cors from 'cors';
 import { promises as fsPromises } from 'fs';
 import { spawn } from 'child_process';
-import pty from 'node-pty';
+// node-pty is lazy-loaded to avoid native module fd manipulation at startup.
+// Eagerly importing it can corrupt the file descriptor table in npx contexts,
+// causing subsequent spawn() calls (e.g. Claude SDK) to fail with EBADF.
+let _pty = null;
+async function getPty() {
+  if (!_pty) {
+    _pty = (await import('node-pty')).default;
+  }
+  return _pty;
+}
 import fetch from 'node-fetch';
 import mime from 'mime-types';
 
@@ -258,6 +267,7 @@ async function setupProjectsWatcher() {
     const claudeProjectsPath = path.join(os.homedir(), '.claude', 'projects');
     const codexSessionsPath = path.join(os.homedir(), '.codex', 'sessions');
     const watchRoots = [claudeProjectsPath, codexSessionsPath];
+    const shouldUsePollingWatcher = process.platform === 'darwin';
 
     if (projectsWatcher) {
         projectsWatcher.close();
@@ -279,6 +289,11 @@ async function setupProjectsWatcher() {
             ignoreInitial: true, // Don't fire events for existing files on startup
             followSymlinks: false,
             depth: 10, // Reasonable depth limit
+            // On macOS, native watching on these session directories can corrupt
+            // later child_process.spawn calls and surface as EBADF across providers.
+            // Polling avoids the bad watcher backend while keeping session refreshes.
+            usePolling: shouldUsePollingWatcher,
+            interval: shouldUsePollingWatcher ? 500 : undefined,
             awaitWriteFinish: {
                 stabilityThreshold: 100, // Wait 100ms for file to stabilize
                 pollInterval: 50
@@ -551,7 +566,7 @@ app.post('/api/system/update', authenticateToken, async (req, res) => {
         console.log('Starting system update from directory:', projectRoot);
 
         const npmCommand = getNpmCommand();
-        const updateArgs = ['update', '-g', UPDATE_PACKAGE_NAME];
+        const updateArgs = ['install', '-g', `${UPDATE_PACKAGE_NAME}@latest`];
 
         // Run npm global update command
         const child = spawn(npmCommand, updateArgs, {
@@ -1343,6 +1358,7 @@ function handleShellConnection(ws) {
                     const termRows = data.rows || 24;
                     console.log('📐 Using terminal dimensions:', termCols, 'x', termRows);
 
+                    const pty = await getPty();
                     shellProcess = pty.spawn(shell, shellArgs, {
                         name: 'xterm-256color',
                         cols: termCols,
@@ -2103,13 +2119,18 @@ async function startServer() {
         // Check if running in production mode (dist folder exists)
         const distIndexPath = path.join(__dirname, '../dist/index.html');
         const isProduction = fs.existsSync(distIndexPath);
+        const runtimeEnvironment = resolveRuntimeEnvironment(isProduction);
+        const frontendMode = isProduction ? 'BUILT DIST' : 'VITE DEV SERVER';
 
         // Log Claude implementation mode
         console.log(`${c.info('[INFO]')} Using Claude Agents SDK for Claude integration`);
-        console.log(`${c.info('[INFO]')} Running in ${c.bright(isProduction ? 'PRODUCTION' : 'DEVELOPMENT')} mode`);
+        console.log(`${c.info('[INFO]')} Runtime environment: ${c.bright(String(runtimeEnvironment).toUpperCase())}`);
+        console.log(`${c.info('[INFO]')} Frontend source: ${c.bright(frontendMode)}`);
 
         if (!isProduction) {
             console.log(`${c.warn('[WARN]')} Note: Requests will be proxied to Vite dev server at ${c.dim('http://localhost:' + (process.env.VITE_PORT || 5173))}`);
+        } else {
+            console.log(`${c.info('[INFO]')} Serving frontend assets from ${c.dim(path.join(__dirname, '../dist'))}`);
         }
 
         server.listen(PORT, '0.0.0.0', async () => {

package/server/openai-codex.js

@@ -15,7 +15,7 @@
 
 import { Codex } from '@openai/codex-sdk';
 import { parseCodexTurnUsage } from './utils/codexTokenUsage.js';
-import { getCodexPathOverride } from './utils/codexPath.js';
+import { getCodexPathOverride, getCodexProcessEnv } from './utils/codexPath.js';
 import { cleanupMaterializedImages, materializeImagesToTempFiles } from './utils/agentImages.js';
 import { resolveWorkingDirectory } from './utils/defaultWorkingDirectory.js';
 
@@ -363,7 +363,8 @@ export async function queryCodex(command, options = {}, ws) {
   try {
     // Initialize Codex SDK
     codex = new Codex({
-      codexPathOverride: getCodexPathOverride()
+      codexPathOverride: getCodexPathOverride(),
+      env: getCodexProcessEnv()
     });
 
     // Thread options with sandbox and approval settings
@@ -669,11 +670,18 @@ export function getActiveCodexSessions() {
  */
 function sendMessage(ws, data) {
   try {
-    if (ws.isSSEStreamWriter || ws.isWebSocketWriter) {
-      // Writer handles stringification (SSEStreamWriter or WebSocketWriter)
+    const isStructuredWriter = !!(
+      ws?.isSSEStreamWriter ||
+      ws?.isWebSocketWriter ||
+      typeof ws?.setSessionId === 'function' ||
+      typeof ws?.getSessionId === 'function'
+    );
+
+    if (isStructuredWriter) {
+      // Internal writers expect plain objects and handle serialization themselves.
       ws.send(data);
     } else if (typeof ws.send === 'function') {
-      // Raw WebSocket - stringify here
+      // Raw WebSocket clients expect a serialized payload.
       ws.send(JSON.stringify(data));
     }
   } catch (error) {

package/server/routes/codex.js

@@ -1,10 +1,10 @@
 import express from 'express';
-import { spawn } from 'child_process';
 import { promises as fs } from 'fs';
 import path from 'path';
 import os from 'os';
 import TOML from '@iarna/toml';
 import { getCodexSessions, getCodexSessionMessages, deleteCodexSession } from '../projects.js';
+import { spawnCommand } from '../utils/spawnCommand.js';
 
 const router = express.Router();
 
@@ -100,7 +100,7 @@ router.delete('/sessions/:sessionId', async (req, res) => {
 router.get('/mcp/cli/list', async (req, res) => {
   try {
     const respond = createCliResponder(res);
-    const proc = spawn('codex', ['mcp', 'list'], { stdio: ['pipe', 'pipe', 'pipe'] });
+    const proc = spawnCommand('codex', ['mcp', 'list'], { stdio: ['pipe', 'pipe', 'pipe'] });
 
     let stdout = '';
     let stderr = '';
@@ -151,7 +151,7 @@ router.post('/mcp/cli/add', async (req, res) => {
     }
 
     const respond = createCliResponder(res);
-    const proc = spawn('codex', cliArgs, { stdio: ['pipe', 'pipe', 'pipe'] });
+    const proc = spawnCommand('codex', cliArgs, { stdio: ['pipe', 'pipe', 'pipe'] });
 
     let stdout = '';
     let stderr = '';
@@ -185,7 +185,7 @@ router.delete('/mcp/cli/remove/:name', async (req, res) => {
     const { name } = req.params;
 
     const respond = createCliResponder(res);
-    const proc = spawn('codex', ['mcp', 'remove', name], { stdio: ['pipe', 'pipe', 'pipe'] });
+    const proc = spawnCommand('codex', ['mcp', 'remove', name], { stdio: ['pipe', 'pipe', 'pipe'] });
 
     let stdout = '';
     let stderr = '';
@@ -219,7 +219,7 @@ router.get('/mcp/cli/get/:name', async (req, res) => {
     const { name } = req.params;
 
     const respond = createCliResponder(res);
-    const proc = spawn('codex', ['mcp', 'get', name], { stdio: ['pipe', 'pipe', 'pipe'] });
+    const proc = spawnCommand('codex', ['mcp', 'get', name], { stdio: ['pipe', 'pipe', 'pipe'] });
 
     let stdout = '';
     let stderr = '';

package/server/routes/mcp.js

@@ -2,13 +2,9 @@ import express from 'express';
 import { promises as fs } from 'fs';
 import path from 'path';
 import os from 'os';
-import { fileURLToPath } from 'url';
-import { dirname } from 'path';
-import { spawn } from 'child_process';
+import { spawnCommand } from '../utils/spawnCommand.js';
 
 const router = express.Router();
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
 
 // Claude CLI command routes
 
@@ -16,12 +12,8 @@ const __dirname = dirname(__filename);
 router.get('/cli/list', async (req, res) => {
   try {
     console.log('📋 Listing MCP servers using Claude CLI');
-    
-    const { spawn } = await import('child_process');
-    const { promisify } = await import('util');
-    const exec = promisify(spawn);
-    
-    const process = spawn('claude', ['mcp', 'list'], {
+
+    const process = spawnCommand('claude', ['mcp', 'list'], {
       stdio: ['pipe', 'pipe', 'pipe']
     });
     
@@ -59,11 +51,9 @@ router.get('/cli/list', async (req, res) => {
 router.post('/cli/add', async (req, res) => {
   try {
     const { name, type = 'stdio', command, args = [], url, headers = {}, env = {}, scope = 'user', projectPath } = req.body;
-    
+
     console.log(`➕ Adding MCP server using Claude CLI (${scope} scope):`, name);
-    
-    const { spawn } = await import('child_process');
-    
+
     let cliArgs = ['mcp', 'add'];
     
     // Add scope flag
@@ -105,8 +95,8 @@ router.post('/cli/add', async (req, res) => {
       spawnOptions.cwd = projectPath;
       console.log('📁 Running in project directory:', projectPath);
     }
-    
-    const process = spawn('claude', cliArgs, spawnOptions);
+
+    const process = spawnCommand('claude', cliArgs, spawnOptions);
     
     let stdout = '';
     let stderr = '';
@@ -142,9 +132,9 @@ router.post('/cli/add', async (req, res) => {
 router.post('/cli/add-json', async (req, res) => {
   try {
     const { name, jsonConfig, scope = 'user', projectPath } = req.body;
-    
+
     console.log('➕ Adding MCP server using JSON format:', name);
-    
+
     // Validate and parse JSON config
     let parsedConfig;
     try {
@@ -178,8 +168,6 @@ router.post('/cli/add-json', async (req, res) => {
       });
     }
     
-    const { spawn } = await import('child_process');
-    
     // Build the command: claude mcp add-json --scope <scope> <name> '<json>'
     const cliArgs = ['mcp', 'add-json', '--scope', scope, name];
     
@@ -198,8 +186,8 @@ router.post('/cli/add-json', async (req, res) => {
       spawnOptions.cwd = projectPath;
       console.log('📁 Running in project directory:', projectPath);
     }
-    
-    const process = spawn('claude', cliArgs, spawnOptions);
+
+    const process = spawnCommand('claude', cliArgs, spawnOptions);
     
     let stdout = '';
     let stderr = '';
@@ -247,11 +235,9 @@ router.delete('/cli/remove/:name', async (req, res) => {
       actualName = serverName;
       actualScope = actualScope || prefix; // Use prefix as scope if not provided in query
     }
-    
+
     console.log('🗑️ Removing MCP server using Claude CLI:', actualName, 'scope:', actualScope);
-    
-    const { spawn } = await import('child_process');
-    
+
     // Build command args based on scope
     let cliArgs = ['mcp', 'remove'];
     
@@ -267,7 +253,7 @@ router.delete('/cli/remove/:name', async (req, res) => {
     
     console.log('🔧 Running Claude CLI command:', 'claude', cliArgs.join(' '));
     
-    const process = spawn('claude', cliArgs, {
+    const process = spawnCommand('claude', cliArgs, {
       stdio: ['pipe', 'pipe', 'pipe']
     });
     
@@ -305,12 +291,10 @@ router.delete('/cli/remove/:name', async (req, res) => {
 router.get('/cli/get/:name', async (req, res) => {
   try {
     const { name } = req.params;
-    
+
     console.log('📄 Getting MCP server details using Claude CLI:', name);
-    
-    const { spawn } = await import('child_process');
-    
-    const process = spawn('claude', ['mcp', 'get', name], {
+
+    const process = spawnCommand('claude', ['mcp', 'get', name], {
       stdio: ['pipe', 'pipe', 'pipe']
     });
     
@@ -549,4 +533,4 @@ function parseClaudeGetOutput(output) {
   }
 }
 
-export default router;
+export default router;

package/server/session-core/providerDiscovery.js

@@ -1,4 +1,3 @@
-import { spawn } from 'child_process';
 import { promises as fs } from 'fs';
 import path from 'path';
 import os from 'os';
@@ -10,6 +9,7 @@ import {
   checkOpencodeCredentials
 } from '../routes/cli-auth.js';
 import { listOpencodeModels } from '../opencode-cli.js';
+import { spawnCommand } from '../utils/spawnCommand.js';
 import {
   CLAUDE_MODELS,
   CODEX_MODELS,  GEMINI_MODELS,
@@ -36,7 +36,7 @@ function runCommand(command, args = [], options = {}) {
     };
 
     try {
-      child = spawn(command, args, {
+      child = spawnCommand(command, args, {
         cwd: options.cwd || process.cwd(),
         stdio: ['ignore', 'pipe', 'pipe'],
         env: { ...process.env, ...(options.env || {}) }

package/server/utils/codexPath.js

@@ -4,6 +4,16 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
+function getCodexSdkRoot() {
+  try {
+    const sdkEntryUrl = import.meta.resolve('@openai/codex-sdk');
+    const sdkEntryPath = fileURLToPath(sdkEntryUrl);
+    return path.resolve(path.dirname(sdkEntryPath), '..');
+  } catch {
+    return path.join(__dirname, '..', '..', 'node_modules', '@openai', 'codex-sdk');
+  }
+}
+
 export function getBundledCodexPath() {
   const { platform, arch } = process;
   let targetTriple = null;
@@ -25,12 +35,7 @@ export function getBundledCodexPath() {
 
   const binaryName = platform === 'win32' ? 'codex.exe' : 'codex';
   return path.join(
-    __dirname,
-    '..',
-    '..',
-    'node_modules',
-    '@openai',
-    'codex-sdk',
+    getCodexSdkRoot(),
     'vendor',
     targetTriple,
     'codex',
@@ -40,8 +45,28 @@ export function getBundledCodexPath() {
 
 export function getCodexPathOverride() {
   if (process.platform === 'win32') {
-    return path.join(__dirname, '..', 'bin', 'codex-sdk-wrapper.cmd');
+    // The SDK uses child_process.spawn() directly. Handing it a .cmd wrapper
+    // is brittle on Windows, so point it at the bundled executable instead.
+    return getBundledCodexPath();
   }
 
   return path.join(__dirname, '..', 'bin', 'codex-sdk-wrapper.js');
 }
+
+export function getCodexProcessEnv(baseEnv = process.env) {
+  const env = {};
+
+  for (const [key, value] of Object.entries(baseEnv || {})) {
+    if (value !== undefined) {
+      env[key] = value;
+    }
+  }
+
+  // Hosted Node environments can leak IPC-related variables into children.
+  // If a Node-based helper inherits them, startup may fail with EBADF.
+  delete env.NODE_CHANNEL_FD;
+  delete env.NODE_UNIQUE_ID;
+  delete env.ELECTRON_RUN_AS_NODE;
+
+  return env;
+}

package/server/utils/spawnCommand.js

@@ -0,0 +1,7 @@
+import { spawn as nodeSpawn } from 'child_process';
+import crossSpawn from 'cross-spawn';
+
+export function spawnCommand(command, args = [], options = {}) {
+  const spawnImpl = process.platform === 'win32' ? crossSpawn : nodeSpawn;
+  return spawnImpl(command, args, options);
+}