@mndrk/agx 1.4.30 → 1.4.33

package/lib/cli/interactiveMenu.js

@@ -2,7 +2,7 @@
 'use strict';
 
 const fs = require('fs');
-const { spawn } = require('child_process');
+const execa = require('execa');
 
 const { c } = require('../ui/colors');
 const { prompt, loadConfig } = require('./configStore');
@@ -156,18 +156,19 @@ async function runInteractiveMenu() {
       if (item.id === 'chat') {
         if (selectedProvider === 'ollama') {
           const ollamaModel = config?.ollama?.model || 'llama3.2:3b';
-          const child = spawn('claude', ['--dangerously-skip-permissions', '--model', ollamaModel], {
+          const child = execa('claude', ['--dangerously-skip-permissions', '--model', ollamaModel], {
             stdio: 'inherit',
             env: {
               ...process.env,
               ANTHROPIC_AUTH_TOKEN: 'ollama',
               ANTHROPIC_BASE_URL: 'http://localhost:11434',
               ANTHROPIC_API_KEY: ''
-            }
+            },
+            reject: false,
           });
           child.on('close', (code) => process.exit(code || 0));
         } else {
-          const child = spawn(selectedProvider, [], { stdio: 'inherit' });
+          const child = execa(selectedProvider, [], { stdio: 'inherit', reject: false });
           child.on('close', (code) => process.exit(code || 0));
         }
       }
@@ -259,23 +260,24 @@ async function runInteractiveMenu() {
         console.log(`  ${c.cyan}0${c.reset}) Back\n`);
         const actionChoice = await prompt('Choice: ');
         if (actionChoice === '0') {
-          spawn(process.argv[0], [process.argv[1]], { stdio: 'inherit' }).on('close', (code) => process.exit(code || 0));
+          execa(process.argv[0], [process.argv[1]], { stdio: 'inherit', reject: false }).on('close', (code) => process.exit(code || 0));
           return;
         }
         if (actionChoice === '1') {
           if (item.id === 'ollama') {
             const ollamaModel = config?.ollama?.model || 'llama3.2:3b';
-            spawn('claude', ['--dangerously-skip-permissions', '--model', ollamaModel], {
+            execa('claude', ['--dangerously-skip-permissions', '--model', ollamaModel], {
               stdio: 'inherit',
               env: {
                 ...process.env,
                 ANTHROPIC_AUTH_TOKEN: 'ollama',
                 ANTHROPIC_BASE_URL: 'http://localhost:11434',
                 ANTHROPIC_API_KEY: ''
-              }
+              },
+              reject: false,
             }).on('close', (code) => process.exit(code || 0));
           } else {
-            spawn(item.id, [], { stdio: 'inherit' }).on('close', (code) => process.exit(code || 0));
+            execa(item.id, [], { stdio: 'inherit', reject: false }).on('close', (code) => process.exit(code || 0));
           }
         }
       } else if (item.id === 'daemon') {
@@ -288,7 +290,7 @@ async function runInteractiveMenu() {
         console.log(`  ${c.cyan}0${c.reset}) Back\n`);
         const dChoice = await prompt('Choice: ');
         if (dChoice === '0') {
-          spawn(process.argv[0], [process.argv[1]], { stdio: 'inherit' }).on('close', (code) => process.exit(code || 0));
+          execa(process.argv[0], [process.argv[1]], { stdio: 'inherit', reject: false }).on('close', (code) => process.exit(code || 0));
           return;
         }
         if (dChoice === '1') {

package/lib/cli/providers.js

@@ -2,7 +2,7 @@
 'use strict';
 
 const path = require('path');
-const { spawn, execSync } = require('child_process');
+const execa = require('execa');
 
 const { c } = require('../ui/colors');
 const { commandExists } = require('../proc/commandExists');
@@ -32,11 +32,11 @@ function printProviderStatus(providers) {
 
 function runInteractive(cmd, args = [], options = {}) {
   return new Promise((resolve) => {
-    const child = spawn(cmd, args, {
-      stdio: 'inherit',
-      shell: true,
-      ...options
-    });
+    // Support both: runInteractive('npm', ['i', ...]) and runInteractive('npm i ...')
+    const useCommand = !Array.isArray(args) || args.length === 0;
+    const child = useCommand
+      ? execa.command(String(cmd), { stdio: 'inherit', shell: true, reject: false, ...options })
+      : execa(cmd, args, { stdio: 'inherit', shell: false, reject: false, ...options });
     child.on('close', (code) => resolve(code === 0));
     child.on('error', () => resolve(false));
   });
@@ -44,8 +44,8 @@ function runInteractive(cmd, args = [], options = {}) {
 
 function runSilent(cmd) {
   try {
-    execSync(cmd, { stdio: 'ignore' });
-    return true;
+    const res = execa.commandSync(cmd, { stdio: 'ignore', shell: true, reject: false });
+    return res.exitCode === 0;
   } catch {
     return false;
   }
@@ -53,8 +53,12 @@ function runSilent(cmd) {
 
 function isOllamaRunning() {
   try {
-    execSync('curl -s http://localhost:11434/api/tags', { stdio: 'ignore', timeout: 2000 });
-    return true;
+    const res = execa.sync('curl', ['-s', 'http://localhost:11434/api/tags'], {
+      stdio: 'ignore',
+      timeout: 2000,
+      reject: false,
+    });
+    return res.exitCode === 0;
   } catch {
     return false;
   }
@@ -62,8 +66,9 @@ function isOllamaRunning() {
 
 function getOllamaModels() {
   try {
-    const result = execSync('ollama list 2>/dev/null', { encoding: 'utf8' });
-    const lines = result.trim().split('\n').slice(1);
+    const result = execa.sync('ollama', ['list'], { encoding: 'utf8', stderr: 'ignore', reject: false });
+    if (result.exitCode !== 0) return [];
+    const lines = String(result.stdout || '').trim().split('\n').slice(1);
     return lines.map((l) => l.split(/\s+/)[0]).filter(Boolean);
   } catch {
     return [];
@@ -137,10 +142,12 @@ async function loginProvider(provider) {
       const startIt = await prompt('Start it now? [Y/n]: ');
       if (startIt.toLowerCase() !== 'n') {
         console.log(`\n${c.cyan}Starting Ollama server in background...${c.reset}`);
-        spawn('ollama', ['serve'], {
+        const child = execa('ollama', ['serve'], {
           detached: true,
-          stdio: 'ignore'
-        }).unref();
+          stdio: 'ignore',
+          reject: false,
+        });
+        child.unref?.();
         await new Promise((r) => setTimeout(r, 2000));
         if (isOllamaRunning()) {
           console.log(`${c.green}✓${c.reset} Ollama server started!`);
@@ -200,9 +207,10 @@ async function runAgxModelSmokeTest({ provider, model }) {
   console.log(`${c.dim}$ agx ${provider} --model ${model} -y -p "say yes"${c.reset}\n`);
 
   return await new Promise((resolve) => {
-    const child = spawn(cmd, args, {
+    const child = execa(cmd, args, {
       stdio: ['ignore', 'pipe', 'pipe'],
       env: { ...process.env },
+      reject: false,
     });
 
     let stdout = '';
@@ -215,8 +223,8 @@ async function runAgxModelSmokeTest({ provider, model }) {
       return next.length > MAX_CAPTURE ? next.slice(-MAX_CAPTURE) : next;
     };
 
-    child.stdout.on('data', (d) => { stdout = append(stdout, String(d)); });
-    child.stderr.on('data', (d) => { stderr = append(stderr, String(d)); });
+    child.stdout?.on('data', (d) => { stdout = append(stdout, String(d)); });
+    child.stderr?.on('data', (d) => { stderr = append(stderr, String(d)); });
 
     const timer = setTimeout(() => {
       timedOut = true;
@@ -242,4 +250,3 @@ module.exports = {
   loginProvider,
   runAgxModelSmokeTest,
 };
-