@openagents-org/agent-connector 0.2.9 → 0.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openagents-org/agent-connector",
-  "version": "0.2.9",
+  "version": "0.3.1",
   "description": "Agent management CLI and library for OpenAgents — install, configure, and run AI coding agents",
   "main": "src/index.js",
   "bin": {

package/src/installer.js

@@ -84,11 +84,17 @@ class Installer {
       throw new Error(`No install definition for agent type: ${agentType}`);
     }
 
-    const cmd = this._getInstallCommand(entry.install);
+    let cmd = this._getInstallCommand(entry.install);
     if (!cmd) {
       throw new Error(`No install command for ${agentType} on ${Installer.platform()}`);
     }
 
+    // Use bundled node/npm if system npm not available
+    if (cmd.startsWith('npm install')) {
+      const args = cmd.replace('npm install', 'install');
+      cmd = this._resolveNpmCommand(args);
+    }
+
     const output = await this._execShell(cmd);
     this._markInstalled(agentType);
     return { success: true, output };
@@ -107,14 +113,18 @@ class Installer {
       throw new Error(`No install definition for agent type: ${agentType}`);
     }
 
-    let cmd = this._getInstallCommand(entry.install);
-    if (!cmd) {
+    let rawCmd = this._getInstallCommand(entry.install);
+    if (!rawCmd) {
       throw new Error(`No install command for ${agentType} on ${Installer.platform()}`);
     }
 
-    // Add verbose logging for npm so user sees download progress on stderr
-    if (cmd.includes('npm install') && !cmd.includes('--loglevel')) {
-      cmd = cmd.replace('npm install', 'npm install --loglevel=verbose');
+    // Resolve npm to use bundled node if system npm is not available
+    let cmd = rawCmd;
+    if (rawCmd.startsWith('npm install')) {
+      const args = rawCmd.replace('npm install', 'install --loglevel=verbose');
+      cmd = this._resolveNpmCommand(args);
+    } else if (rawCmd.startsWith('pip install') || rawCmd.startsWith('pipx install')) {
+      cmd = rawCmd; // pip commands stay as-is
     }
 
     if (onData) onData(`$ ${cmd}\n\n`);
@@ -180,14 +190,16 @@ class Installer {
     }
 
     const installCmd = this._getInstallCommand(entry.install);
-    let cmd = this._deriveUninstallCommand(installCmd);
-    if (!cmd) {
+    let rawCmd = this._deriveUninstallCommand(installCmd);
+    if (!rawCmd) {
       throw new Error(`Cannot derive uninstall command for ${agentType}`);
     }
 
-    // Add verbose logging for npm so user sees progress on stderr
-    if (cmd.includes('npm uninstall') && !cmd.includes('--loglevel')) {
-      cmd = cmd.replace('npm uninstall', 'npm uninstall --loglevel=verbose');
+    // Resolve npm to use bundled node if system npm is not available
+    let cmd = rawCmd;
+    if (rawCmd.startsWith('npm uninstall')) {
+      const args = rawCmd.replace('npm uninstall', 'uninstall --loglevel=verbose');
+      cmd = this._resolveNpmCommand(args);
     }
 
     if (onData) onData(`$ ${cmd}\n\n`);
@@ -353,6 +365,52 @@ class Installer {
     return env;
   }
 
+  /**
+   * Resolve the npm CLI path. Prefers system npm, falls back to bundled
+   * npm module run via Electron's node. Works on machines without Node.js.
+   */
+  _resolveNpmCommand(args) {
+    // 1. Try system npm
+    const { whichBinary } = require('./paths');
+    const systemNpm = whichBinary('npm');
+    if (systemNpm) return `"${systemNpm}" ${args}`;
+
+    // 2. Find bundled npm-cli.js (npm is a dependency of the Launcher)
+    const nodeExe = process.execPath;
+    const candidates = [];
+
+    // Try require.resolve first — works when npm is in node_modules
+    try {
+      candidates.push(require.resolve('npm/bin/npm-cli.js'));
+    } catch {}
+
+    // Search common locations relative to the app
+    const searchRoots = [
+      path.join(path.dirname(nodeExe), 'resources', 'app'),  // packaged Electron
+      path.join(path.dirname(nodeExe), 'resources', 'app.asar.unpacked'), // asar unpacked
+      path.join(path.dirname(nodeExe), '..'),  // portable exe temp dir
+      process.cwd(),  // dev mode
+    ];
+    for (const root of searchRoots) {
+      candidates.push(path.join(root, 'node_modules', 'npm', 'bin', 'npm-cli.js'));
+    }
+
+    // Also check system node_modules
+    candidates.push(path.join(path.dirname(nodeExe), '..', 'lib', 'node_modules', 'npm', 'bin', 'npm-cli.js'));
+    candidates.push(path.join(path.dirname(nodeExe), 'node_modules', 'npm', 'bin', 'npm-cli.js'));
+
+    for (const p of candidates) {
+      try {
+        if (p && fs.existsSync(p)) {
+          return `"${nodeExe}" "${p}" ${args}`;
+        }
+      } catch {}
+    }
+
+    // 3. Last resort
+    return `npm ${args}`;
+  }
+
   _execShell(cmd, timeoutMs = 300000) {
     return new Promise((resolve, reject) => {
       const env = this._buildShellEnv();