@openagents-org/agent-launcher 0.2.87 → 0.2.88

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openagents-org/agent-launcher",
-  "version": "0.2.87",
+  "version": "0.2.88",
   "description": "OpenAgents Launcher — install, configure, and run AI coding agents from your terminal",
   "main": "src/index.js",
   "bin": {

package/src/adapters/claude.js

@@ -152,9 +152,13 @@ class ClaudeAdapter extends BaseAdapter {
   _findClaudeBinary() {
     const home = os.homedir();
 
-    // Tier 0: Portable install at ~/.openagents/nodejs/node_modules/.bin/
-    const portableBin = path.join(home, '.openagents', 'nodejs', 'node_modules', '.bin');
+    // Tier 0: Isolated runtime prefix (~/.openagents/runtimes/claude/)
     const ext = IS_WINDOWS ? '.cmd' : '';
+    const runtimeCandidate = path.join(home, '.openagents', 'runtimes', 'claude', 'node_modules', '.bin', `claude${ext}`);
+    if (fs.existsSync(runtimeCandidate)) return runtimeCandidate;
+
+    // Tier 0b: Legacy portable install at ~/.openagents/nodejs/node_modules/.bin/
+    const portableBin = path.join(home, '.openagents', 'nodejs', 'node_modules', '.bin');
     const portableCandidate = path.join(portableBin, `claude${ext}`);
     if (fs.existsSync(portableCandidate)) return portableCandidate;
 
@@ -271,9 +275,22 @@ class ClaudeAdapter extends BaseAdapter {
     // Find openagents binary (multi-tier)
     let oaBin = null;
     const home3 = os.homedir();
-    // Tier 0: Portable install at ~/.openagents/nodejs/node_modules/.bin/
-    const oaPortable = path.join(home3, '.openagents', 'nodejs', 'node_modules', '.bin', `openagents${IS_WINDOWS ? '.cmd' : ''}`);
-    if (fs.existsSync(oaPortable)) oaBin = oaPortable;
+    // Tier 0: Check all isolated runtime prefixes for openagents binary
+    const oaExt = IS_WINDOWS ? '.cmd' : '';
+    const runtimesRoot = path.join(home3, '.openagents', 'runtimes');
+    try {
+      for (const d of fs.readdirSync(runtimesRoot, { withFileTypes: true })) {
+        if (d.isDirectory()) {
+          const candidate = path.join(runtimesRoot, d.name, 'node_modules', '.bin', `openagents${oaExt}`);
+          if (fs.existsSync(candidate)) { oaBin = candidate; break; }
+        }
+      }
+    } catch {}
+    // Tier 0b: Legacy portable install
+    if (!oaBin) {
+      const oaPortable = path.join(home3, '.openagents', 'nodejs', 'node_modules', '.bin', `openagents${oaExt}`);
+      if (fs.existsSync(oaPortable)) oaBin = oaPortable;
+    }
     // Tier 1: PATH
     if (!oaBin) try {
       if (IS_WINDOWS) {

package/src/installer.js

@@ -4,7 +4,7 @@ const fs = require('fs');
 const os = require('os');
 const path = require('path');
 const { execSync, exec } = require('child_process');
-const { whichBinary, getEnhancedEnv } = require('./paths');
+const { whichBinary, getEnhancedEnv, getRuntimePrefix } = require('./paths');
 
 /**
  * Manages installation and uninstallation of agent runtimes.
@@ -36,13 +36,9 @@ class Installer {
    * Checks binary on PATH first, then marker files.
    */
   isInstalled(agentType) {
-    // Definitive check: does the package exist in our node_modules?
-    const portableDir = path.join(os.homedir(), '.openagents', 'nodejs');
-    const globalModules = path.join(portableDir, 'node_modules');
     const entry = this.registry.getEntry(agentType);
     const npmPkg = entry && entry.install ? entry.install.npm_package : null;
     const binary = entry && entry.install ? entry.install.binary : agentType;
-    // Extract actual npm package name from install command (e.g. "npm install -g @anthropic-ai/claude-code" → "@anthropic-ai/claude-code")
     const installCmd = entry && entry.install ? this._getInstallCommand(entry.install) : null;
     let npmPkgFromCmd = null;
     if (!npmPkg && installCmd && installCmd.includes('npm install')) {
@@ -50,29 +46,31 @@ class Installer {
       if (match) npmPkgFromCmd = match[1];
     }
     const pkgName = npmPkg || npmPkgFromCmd || binary;
-    const pkgDir = path.join(globalModules, pkgName);
-    if (fs.existsSync(path.join(pkgDir, 'package.json'))) return true;
 
-    // Marker file alone is not enough — package may have been pruned
-    // (npm --prefix removes packages not in its dependency tree)
+    // Check isolated runtime prefix first (~/.openagents/runtimes/<type>/)
+    const runtimeModules = path.join(getRuntimePrefix(agentType), 'node_modules');
+    if (fs.existsSync(path.join(runtimeModules, pkgName, 'package.json'))) return true;
+
+    // Legacy: check shared prefix (~/.openagents/nodejs/node_modules/)
+    const legacyModules = path.join(os.homedir(), '.openagents', 'nodejs', 'node_modules');
+    if (fs.existsSync(path.join(legacyModules, pkgName, 'package.json'))) return true;
 
     // Fallback: check if binary exists on PATH (system install)
     const binaryPath = this._whichBinary(agentType);
     if (!binaryPath) {
-      // Clean stale marker if package is gone
       try { fs.unlinkSync(path.join(this.markersDir, agentType)); } catch {}
       return false;
     }
 
-    // Verify it's not a stale shim — if binary is in our portable dir,
-    // check the actual package exists (reuse variables from above)
-    if (binaryPath.startsWith(portableDir)) {
-      if (!fs.existsSync(path.join(pkgDir, 'package.json'))) {
-        // Stale shim — clean it up from all possible locations
-        for (const dir of [portableDir, path.join(globalModules, '.bin')]) {
-          for (const ext of ['', '.cmd', '.ps1']) {
-            try { const p = path.join(dir, binary + ext); if (fs.existsSync(p)) fs.unlinkSync(p); } catch {}
-          }
+    // Verify it's not a stale shim pointing to a missing package
+    const openagentsDir = path.join(os.homedir(), '.openagents');
+    if (binaryPath.startsWith(openagentsDir)) {
+      const hasRuntime = fs.existsSync(path.join(runtimeModules, pkgName, 'package.json'));
+      const hasLegacy = fs.existsSync(path.join(legacyModules, pkgName, 'package.json'));
+      if (!hasRuntime && !hasLegacy) {
+        // Stale shim — clean it up
+        for (const ext of ['', '.cmd', '.ps1']) {
+          try { const p = path.join(path.dirname(binaryPath), binary + ext); if (fs.existsSync(p)) fs.unlinkSync(p); } catch {}
         }
         return false;
       }
@@ -195,7 +193,8 @@ class Installer {
 
     // Use bundled node/npm if system npm not available
     if (cmd.startsWith('npm install')) {
-      const prefixDir = path.join(os.homedir(), '.openagents', 'nodejs');
+      const prefixDir = getRuntimePrefix(agentType);
+      fs.mkdirSync(prefixDir, { recursive: true });
       const args = cmd.replace('npm install', 'install --save').replace(' -g ', ` --prefix "${prefixDir}" `);
       cmd = this._resolveNpmCommand(args);
     }
@@ -231,9 +230,10 @@ class Installer {
     // Resolve npm command
     let cmd = rawCmd;
     if (rawCmd.startsWith('npm install')) {
-      const prefixDir2 = path.join(os.homedir(), '.openagents', 'nodejs');
+      const prefixDir = getRuntimePrefix(agentType);
+      fs.mkdirSync(prefixDir, { recursive: true });
       // Use --save so npm tracks the package in package.json (prevents pruning on next install)
-      const args = rawCmd.replace('npm install', 'install --loglevel=verbose --save').replace(' -g ', ` --prefix "${prefixDir2}" `);
+      const args = rawCmd.replace('npm install', 'install --loglevel=verbose --save').replace(' -g ', ` --prefix "${prefixDir}" `);
       cmd = this._resolveNpmCommand(args);
     } else if (rawCmd.startsWith('pip install') || rawCmd.startsWith('pipx install')) {
       cmd = rawCmd; // pip commands stay as-is
@@ -281,14 +281,14 @@ class Installer {
     }
 
     const installCmd = this._getInstallCommand(entry.install);
-    const uninstallCmd = this._deriveUninstallCommand(installCmd);
+    const uninstallCmd = this._deriveUninstallCommand(installCmd, agentType);
     if (!uninstallCmd) {
       throw new Error(`Cannot derive uninstall command for ${agentType}`);
     }
 
     const output = await this._execShell(uninstallCmd);
     this._markUninstalled(agentType);
-    // Clean stale shims on Windows (npm sometimes leaves .cmd/.ps1 files behind)
+    // Clean stale shims (npm sometimes leaves .cmd/.ps1 files behind)
     this._cleanStaleShims(agentType);
     return { success: true, output };
   }
@@ -297,9 +297,15 @@ class Installer {
     const entry = this.registry.getEntry(agentType);
     const binary = entry && entry.install ? entry.install.binary : agentType;
     if (!binary) return;
-    const portableDir = path.join(os.homedir(), '.openagents', 'nodejs');
-    const binDir = path.join(portableDir, 'node_modules', '.bin');
-    for (const dir of [portableDir, binDir]) {
+
+    // Clean from isolated runtime prefix
+    const runtimeBin = path.join(getRuntimePrefix(agentType), 'node_modules', '.bin');
+
+    // Clean from legacy shared prefix
+    const legacyDir = path.join(os.homedir(), '.openagents', 'nodejs');
+    const legacyBin = path.join(legacyDir, 'node_modules', '.bin');
+
+    for (const dir of [runtimeBin, legacyDir, legacyBin]) {
       for (const ext of ['', '.cmd', '.ps1']) {
         const shimPath = path.join(dir, binary + ext);
         try { if (fs.existsSync(shimPath)) fs.unlinkSync(shimPath); } catch {}
@@ -318,7 +324,7 @@ class Installer {
     }
 
     const installCmd = this._getInstallCommand(entry.install);
-    let rawCmd = this._deriveUninstallCommand(installCmd);
+    let rawCmd = this._deriveUninstallCommand(installCmd, agentType);
     if (!rawCmd) {
       throw new Error(`Cannot derive uninstall command for ${agentType}`);
     }
@@ -372,13 +378,15 @@ class Installer {
 
   /**
    * Derive uninstall command from install command.
+   * @param {string} installCmd
+   * @param {string} [agentType] - used to resolve the isolated runtime prefix
    */
-  _deriveUninstallCommand(installCmd) {
+  _deriveUninstallCommand(installCmd, agentType) {
     if (!installCmd) return null;
 
-    // npm install -g <pkg> → npm uninstall --prefix <dir> <pkg>
+    // npm install -g <pkg> → npm uninstall --prefix <runtimeDir> <pkg>
     if (installCmd.includes('npm install')) {
-      const prefixDir = path.join(os.homedir(), '.openagents', 'nodejs');
+      const prefixDir = agentType ? getRuntimePrefix(agentType) : path.join(os.homedir(), '.openagents', 'nodejs');
       return installCmd
         .replace('npm install -g', `npm uninstall --prefix "${prefixDir}"`)
         .replace('npm install', 'npm uninstall')

package/src/paths.js

@@ -42,11 +42,24 @@ function getExtraBinDirs() {
     if (nodeDir) _push(dirs, nodeDir);
   } catch {}
 
-  // Add portable Node.js directory (~/.openagents/nodejs/) and agent binaries
+  // Add portable Node.js directory (~/.openagents/nodejs/)
   const portableNode = path.join(HOME, '.openagents', 'nodejs');
-  _push(dirs, path.join(portableNode, 'node_modules', '.bin'));
   _push(dirs, portableNode);
 
+  // Core library bin (~/.openagents/core/node_modules/.bin)
+  _push(dirs, path.join(HOME, '.openagents', 'core', 'node_modules', '.bin'));
+
+  // Per-agent runtime bins (~/.openagents/runtimes/<type>/node_modules/.bin)
+  const runtimesDir = path.join(HOME, '.openagents', 'runtimes');
+  try {
+    for (const d of fs.readdirSync(runtimesDir, { withFileTypes: true })) {
+      if (d.isDirectory()) _push(dirs, path.join(runtimesDir, d.name, 'node_modules', '.bin'));
+    }
+  } catch {}
+
+  // Legacy: shared node_modules/.bin (for backward compat with pre-isolation installs)
+  _push(dirs, path.join(portableNode, 'node_modules', '.bin'));
+
   // Filter to existing directories only, deduplicate
   const seen = new Set();
   const currentPATH = process.env.PATH || '';
@@ -178,8 +191,7 @@ function _addUnixPaths(dirs) {
   _push(dirs, '/usr/local/bin');
   _push(dirs, '/usr/bin');
 
-  // npm global — all installs use --prefix ~/.openagents/nodejs
-  // No need for ~/.npm-global or ~/.openagents/npm-global
+  // npm agents install to isolated prefixes: ~/.openagents/runtimes/<type>/
 
   // nvm
   const nvmDir = process.env.NVM_DIR || path.join(HOME, '.nvm');
@@ -272,11 +284,28 @@ function _resolveNvmVersion(nvmDir, alias) {
   return null;
 }
 
+/**
+ * Get the isolated npm prefix directory for an agent runtime.
+ * Each agent type gets its own prefix to prevent cross-agent interference.
+ */
+function getRuntimePrefix(agentType) {
+  return path.join(HOME, '.openagents', 'runtimes', agentType);
+}
+
+/**
+ * Get the core library directory (separate from agent runtimes).
+ */
+function getCorePrefix() {
+  return path.join(HOME, '.openagents', 'core');
+}
+
 module.exports = {
   getExtraBinDirs,
   getEnhancedPATH,
   getEnhancedEnv,
   whichBinary,
+  getRuntimePrefix,
+  getCorePrefix,
   IS_WINDOWS,
   IS_MACOS,
   SEP,

package/src/registry.js

@@ -127,7 +127,7 @@ class Registry {
    */
   async refresh() {
     const remote = await this._fetchRemote();
-    if (remote) this._catalog = remote;
+    if (remote) this._catalog = this._mergeBundled(remote);
     return this._catalog || this.getCatalogSync();
   }