@axhub/genie 0.2.5 → 0.2.6

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

@@ -45,7 +45,9 @@ 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');

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);
+}