@openagents-org/agent-launcher 0.1.16 → 0.1.17

package/package.json

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

package/src/adapters/base.js

@@ -31,13 +31,14 @@ class BaseAdapter {
    * @param {string} opts.agentName
    * @param {string} [opts.endpoint]
    */
-  constructor({ workspaceId, channelName, token, agentName, endpoint, agentEnv }) {
+  constructor({ workspaceId, channelName, token, agentName, endpoint, agentEnv, agentType }) {
     this.workspaceId = workspaceId;
     this.channelName = channelName;
     this.token = token;
     this.agentName = agentName;
     this.endpoint = endpoint || DEFAULT_ENDPOINT;
     this.agentEnv = agentEnv || process.env;
+    this.agentType = agentType;
     this.client = new WorkspaceClient(this.endpoint);
     this._lastEventId = null;
     this._running = false;
@@ -60,6 +61,18 @@ class BaseAdapter {
 
   async run() {
     this._running = true;
+
+    // Announce agent to workspace
+    try {
+      await this.client.joinNetwork(this.agentName, this.token, {
+        network: this.workspaceId,
+        agentType: this.agentType || 'agent',
+      });
+      this._log(`Joined workspace ${this.workspaceId}`);
+    } catch (e) {
+      this._log(`Warning: join failed: ${e.message}`);
+    }
+
     await this._skipExistingEvents();
 
     const heartbeatInterval = setInterval(() => this._heartbeat(), 30000);

package/src/adapters/openclaw.js

@@ -59,7 +59,8 @@ class OpenClawAdapter extends BaseAdapter {
   _findOpenclawBinary() {
     try {
       const cmd = IS_WINDOWS ? 'where openclaw' : 'which openclaw';
-      const result = execSync(cmd, { encoding: 'utf-8', timeout: 5000 })
+      const { getEnhancedEnv } = require('../paths');
+      const result = execSync(cmd, { encoding: 'utf-8', timeout: 5000, env: getEnhancedEnv() })
         .split(/\r?\n/)[0].trim();
       if (result) return result;
     } catch {}
@@ -69,6 +70,9 @@ class OpenClawAdapter extends BaseAdapter {
     if (IS_WINDOWS) {
       const appdata = process.env.APPDATA || '';
       if (appdata) dirs.push(path.join(appdata, 'npm'));
+      // Portable Node.js installed by OpenAgents Launcher
+      const home = process.env.USERPROFILE || process.env.HOME || '';
+      if (home) dirs.push(path.join(home, '.openagents', 'nodejs'));
     } else {
       const home = process.env.HOME || '';
       dirs.push(path.join(home, '.npm-global', 'bin'), '/usr/local/bin');

package/src/daemon.js

@@ -67,6 +67,8 @@ class Daemon {
 
     this._writeStatus();
     this._cachedAgentNames = new Set(agents.map(a => a.name));
+    this._cachedAgentConfigs = {};
+    for (const a of agents) this._cachedAgentConfigs[a.name] = a.network || '';
     this._log(`Daemon started with ${agents.length} agent(s)`);
 
     // Block until shutdown
@@ -260,10 +262,10 @@ class Daemon {
     if (network) {
       this._adapterLoop(name, agentCfg, info, network);
     } else {
-      // No workspace connected — nothing to do, mark as idle
-      info.state = 'stopped';
+      // No workspace connected — agent is ready but not connected
+      info.state = 'idle';
       this._writeStatus();
-      this._log(`${name} idle (no workspace connected)`);
+      this._log(`${name} ready (no workspace connected)`);
     }
   }
 
@@ -358,6 +360,7 @@ class Daemon {
         token: network.token,
         agentName: name,
         endpoint,
+        agentType,
         openclawAgentId: agentCfg.openclaw_agent_id || 'main',
         disabledModules: new Set(),
         agentEnv: this._buildAgentEnv(agentCfg),
@@ -577,9 +580,12 @@ class Daemon {
   _reload() {
     this._log('Reloading config...');
     const oldNames = this._cachedAgentNames || new Set();
+    const oldConfigs = this._cachedAgentConfigs || {};
     // Re-read config from disk
     const newAgents = this.config.getAgents();
     const newNames = new Set(newAgents.map(a => a.name));
+    const newConfigs = {};
+    for (const a of newAgents) newConfigs[a.name] = a.network || '';
 
     // Stop removed agents
     for (const name of oldNames) {
@@ -589,15 +595,21 @@ class Daemon {
       }
     }
 
-    // Start new agents
+    // Start new agents or restart agents whose network changed
     for (const agent of newAgents) {
       if (!oldNames.has(agent.name)) {
         this._launchAgent(agent);
         this._log(`Reload: started new agent '${agent.name}'`);
+      } else if ((oldConfigs[agent.name] || '') !== (agent.network || '')) {
+        // Network config changed — restart agent
+        this.stopAgent(agent.name);
+        this._launchAgent(agent);
+        this._log(`Reload: restarted '${agent.name}' (network changed)`);
       }
     }
 
     this._cachedAgentNames = newNames;
+    this._cachedAgentConfigs = newConfigs;
     this._writeStatus();
   }
 

package/src/tui.js

@@ -37,18 +37,24 @@ const COLORS = {
 };
 
 const STATE_DISPLAY = {
-  online:        { sym: '\u25CF', color: COLORS.stateRunning },
-  running:       { sym: '\u25CF', color: COLORS.stateRunning },
-  starting:      { sym: '\u25D0', color: COLORS.stateStarting },
-  reconnecting:  { sym: '\u25D0', color: COLORS.stateStarting },
-  stopped:       { sym: '\u25CB', color: COLORS.stateStopped },
-  'not configured': { sym: '\u25CB', color: COLORS.stateStopped },
-  error:         { sym: '\u2717', color: COLORS.stateError },
+  online:        { sym: '\u25CF', color: COLORS.stateRunning, label: 'connected' },
+  running:       { sym: '\u25CF', color: COLORS.stateRunning, label: 'connected' },
+  idle:          { sym: '\u25CB', color: COLORS.stateStarting, label: 'ready' },
+  starting:      { sym: '\u25D0', color: COLORS.stateStarting, label: 'starting' },
+  reconnecting:  { sym: '\u25D0', color: COLORS.stateStarting, label: 'reconnecting' },
+  stopped:       { sym: '\u25CB', color: COLORS.stateStopped, label: 'stopped' },
+  'not configured': { sym: '\u25CB', color: COLORS.stateStopped, label: 'not configured' },
+  error:         { sym: '\u2717', color: COLORS.stateError, label: 'error' },
 };
 
-function stateMarkup(state) {
-  const d = STATE_DISPLAY[state] || { sym: '?', color: 'white' };
-  return `{${d.color}-fg}${d.sym} ${state}{/${d.color}-fg}`;
+function stateMarkup(state, hasWorkspace) {
+  const d = STATE_DISPLAY[state] || { sym: '?', color: 'white', label: state };
+  let label = d.label;
+  // For running/connected agents, clarify workspace status
+  if ((state === 'running' || state === 'online') && !hasWorkspace) {
+    label = 'running';
+  }
+  return `{${d.color}-fg}${d.sym} ${label}{/${d.color}-fg}`;
 }
 
 // ── Data helpers ────────────────────────────────────────────────────────────
@@ -299,7 +305,7 @@ function createTUI() {
       agentList.setItems(['  {gray-fg}No agents configured. Press {bold}i{/bold} to install, {bold}n{/bold} to create.{/gray-fg}']);
     } else {
       const items = agentRows.map(r => {
-        const state = stateMarkup(r.state);
+        const state = stateMarkup(r.state, !!r.workspace);
         const ws = r.workspace || '{gray-fg}-{/gray-fg}';
         const pathInfo = r.path ? `{gray-fg} ${r.path}{/gray-fg}` : '';
         return `  ${r.name.padEnd(22)} ${r.type.padEnd(14)} ${state.padEnd(30)} ${ws}${pathInfo}`;
@@ -1128,15 +1134,17 @@ function createTUI() {
       opened = true;
     } catch {}
 
-    // Show URL in a dialog
+    // Show URL in a dialog — full width, auto-height for long URLs
+    const innerW = screen.width - 4;
+    const urlLines = Math.ceil(url.length / innerW);
     const dialog = blessed.box({
-      top: 'center', left: 'center',
-      width: 70, height: 7,
+      top: 'center', left: 0,
+      width: '100%', height: 4 + urlLines + 2,
       border: { type: 'line' },
       tags: true,
       label: ' {bold}Workspace URL{/bold} ',
       style: { border: { fg: COLORS.accent }, bg: COLORS.surface },
-      content: `\n  ${url}\n\n  {gray-fg}${opened ? 'Opened in browser.' : 'Copy the URL above.'} Press Esc to close.{/gray-fg}`,
+      content: `\n {bold}${url}{/bold}\n\n {gray-fg}${opened ? 'Opened in browser.' : 'Copy the URL above.'} Press Esc to close.{/gray-fg}`,
     });
 
     screen.append(dialog);