@openagents-org/agent-launcher 0.2.97 → 0.2.99

package/package.json

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

package/src/adapters/codex.js

@@ -33,9 +33,10 @@ class CodexAdapter extends BaseAdapter {
     this._codexThreadId = null;
 
     // Direct LLM API mode
-    this._directApiKey = process.env.OPENAI_API_KEY || '';
-    this._directBaseUrl = (process.env.OPENAI_BASE_URL || '').replace(/\/+$/, '');
-    this._directModel = process.env.CODEX_MODEL || process.env.OPENCLAW_MODEL || '';
+    const env = this.agentEnv || process.env;
+    this._directApiKey = env.OPENAI_API_KEY || '';
+    this._directBaseUrl = (env.OPENAI_BASE_URL || '').replace(/\/+$/, '');
+    this._directModel = env.CODEX_MODEL || env.OPENCLAW_MODEL || '';
     this._directMode = !!(this._directApiKey && this._directBaseUrl);
 
     if (this._directMode) {

package/src/daemon.js

@@ -25,6 +25,7 @@ class Daemon {
 
     // State
     this._processes = {};     // agentName → { proc, state, restarts, startedAt, lastError }
+    this._adapters = {};      // agentName → adapter instance
     this._stoppedAgents = new Set();
     this._shuttingDown = false;
     this._statusInterval = null;
@@ -273,6 +274,12 @@ class Daemon {
     const name = agentCfg.name;
     const type = agentCfg.type || 'openclaw';
 
+    // Prevent duplicate launches — if an adapter is already running, skip
+    if (this._adapters && this._adapters[name]) {
+      this._log(`${name} already running, skipping duplicate launch`);
+      return;
+    }
+
     this._stoppedAgents.delete(name);
 
     const info = {
@@ -418,8 +425,7 @@ class Daemon {
       return;
     }
 
-    // Store adapter reference for stop
-    this._adapters = this._adapters || {};
+    // Store adapter reference for stop and duplicate detection
     this._adapters[name] = adapter;
 
     info.state = 'running';

package/src/installer.js

@@ -266,9 +266,11 @@ class Installer {
     const shell = process.platform === 'win32'
       ? (process.env.ComSpec || 'C:\\Windows\\System32\\cmd.exe')
       : true;
+    // Set cwd to runtime prefix dir (avoids running from System32 on Windows)
+    const installCwd = rawCmd.startsWith('npm install') ? getRuntimePrefix(agentType) : os.homedir();
 
     return new Promise((resolve, reject) => {
-      const proc = spawn(cmd, [], { shell, env, stdio: ['ignore', 'pipe', 'pipe'] });
+      const proc = spawn(cmd, [], { shell, env, cwd: installCwd, stdio: ['ignore', 'pipe', 'pipe'] });
 
       if (proc.stdout) proc.stdout.setEncoding('utf-8');
       if (proc.stderr) proc.stderr.setEncoding('utf-8');
@@ -513,6 +515,10 @@ class Installer {
       try {
         const bundledDir = path.join(this.configDir, 'nodejs');
         if (fs.existsSync(bundledDir)) {
+          // Node.js may be directly in nodejs/ (launcher symlink style) or in nodejs/node-v*/
+          if (fs.existsSync(path.join(bundledDir, 'node.exe'))) {
+            extraDirs.push(bundledDir);
+          }
           const entries = fs.readdirSync(bundledDir).filter(e => e.startsWith('node-'));
           if (entries.length > 0) {
             extraDirs.push(path.join(bundledDir, entries[0]));