@openagents-org/agent-launcher 0.1.6 → 0.1.8

package/package.json

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

package/src/adapters/base.js

@@ -31,12 +31,13 @@ class BaseAdapter {
    * @param {string} opts.agentName
    * @param {string} [opts.endpoint]
    */
-  constructor({ workspaceId, channelName, token, agentName, endpoint }) {
+  constructor({ workspaceId, channelName, token, agentName, endpoint, agentEnv }) {
     this.workspaceId = workspaceId;
     this.channelName = channelName;
     this.token = token;
     this.agentName = agentName;
     this.endpoint = endpoint || DEFAULT_ENDPOINT;
+    this.agentEnv = agentEnv || process.env;
     this.client = new WorkspaceClient(this.endpoint);
     this._lastEventId = null;
     this._running = false;

package/src/adapters/claude.js

@@ -288,7 +288,7 @@ class ClaudeAdapter extends BaseAdapter {
     }
 
     // Clean env
-    const cleanEnv = { ...process.env };
+    const cleanEnv = { ...(this.agentEnv || process.env) };
     delete cleanEnv.CLAUDECODE;
     delete cleanEnv.CLAUDE_CODE_SESSION;
 

package/src/adapters/openclaw.js

@@ -192,7 +192,7 @@ class OpenClawAdapter extends BaseAdapter {
 
       this._log(`CLI: ${binary} ${args.slice(0, 5).join(' ')} ...`);
 
-      const spawnEnv = { ...process.env };
+      const spawnEnv = { ...(this.agentEnv || process.env) };
       if (IS_WINDOWS) {
         // Ensure node and npm global bin are on PATH
         const nodeBinDir = path.dirname(process.execPath);
@@ -223,8 +223,9 @@ class OpenClawAdapter extends BaseAdapter {
       let stdout = '';
       let stderr = '';
 
+      // OpenClaw writes --json output to stderr, so capture both
       if (proc.stdout) proc.stdout.on('data', (d) => { stdout += d; });
-      if (proc.stderr) proc.stderr.on('data', (d) => { stderr += d; });
+      if (proc.stderr) proc.stderr.on('data', (d) => { stderr += d; stdout += d; });
 
       proc.on('error', (err) => reject(err));
       proc.on('exit', (code) => {

package/src/daemon.js

@@ -357,6 +357,7 @@ class Daemon {
         endpoint,
         openclawAgentId: agentCfg.openclaw_agent_id || 'main',
         disabledModules: new Set(),
+        agentEnv: this._buildAgentEnv(agentCfg),
       });
     } catch (e) {
       this._log(`${name} failed to create ${agentType} adapter: ${e.message}`);

package/src/registry.js

@@ -54,9 +54,22 @@ class Registry {
   getCatalogSync() {
     if (this._catalog) return this._catalog;
     const cached = this._loadCache();
-    if (cached) { this._catalog = cached; return cached; }
-    this._catalog = this._loadBundled();
-    return this._catalog;
+    const bundled = this._loadBundled();
+    if (cached) {
+      // Merge bundled env_config/resolve_env into cached entries (cache may be stale)
+      for (const entry of cached) {
+        const b = bundled.find(x => x.name === entry.name);
+        if (b) {
+          if (!entry.env_config && b.env_config) entry.env_config = b.env_config;
+          if (!entry.resolve_env && b.resolve_env) entry.resolve_env = b.resolve_env;
+          if (!entry.install && b.install) entry.install = b.install;
+        }
+      }
+      this._catalog = cached;
+      return cached;
+    }
+    this._catalog = bundled;
+    return bundled;
   }
 
   /**