@openagents-org/agent-launcher 0.2.156 → 0.2.158

package/package.json

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

package/src/cli.js

@@ -311,7 +311,28 @@ async function cmdList(connector) {
   table(rows, ['NAME', 'TYPE', 'ROLE', 'NETWORK']);
 }
 
-async function cmdRuntimes(connector) {
+async function cmdRuntimes(connector, flags) {
+  // Machine-readable detection for every supported type: installed? logged-in?
+  // Used by the daemon to report node runtimes to the workspace (Add-agent
+  // gallery). Emits ONLY JSON on stdout.
+  if (flags && flags.json) {
+    const runtimes = connector.registry.getCatalogSync().map((e) => {
+      let h;
+      try { h = connector.healthCheck(e.name); } catch { h = {}; }
+      return {
+        type: e.name,
+        installed: !!h.installed,
+        ready: !!h.ready,
+        version: h.version || null,
+        reason: h.reason || null,
+        message: h.message || null,
+        authStatus: h.auth_status || null,
+      };
+    });
+    process.stdout.write(JSON.stringify(runtimes));
+    return;
+  }
+
   let catalog;
   try {
     catalog = await connector.getCatalog();
@@ -922,7 +943,7 @@ async function main() {
     install: () => cmdInstall(connector, flags, positional),
     uninstall: () => cmdUninstall(connector, flags, positional),
     search: () => cmdSearch(connector, flags, positional),
-    runtimes: () => cmdRuntimes(connector),
+    runtimes: () => cmdRuntimes(connector, flags),
     connect: () => cmdConnect(connector, flags, positional),
     node: () => cmdNode(connector, flags, positional),
     disconnect: () => cmdDisconnect(connector, flags, positional),

package/src/daemon.js

@@ -33,6 +33,8 @@ class Daemon {
     this._nodeHeartbeatInterval = null;  // device-level heartbeat (connect-a-node)
     this._nodeClient = null;             // lazily-created WorkspaceClient for the node
     this._runningCommands = new Set();   // node-command ids currently executing
+    this._runtimes = [];                 // detected agent runtimes for the node view
+    this._runtimesInterval = null;
     this._reloadInFlight = null;  // serialize concurrent _reload() calls
   }
 
@@ -49,7 +51,7 @@ class Daemon {
       if (!this._nodeClient) {
         this._nodeClient = new WorkspaceClient(n.endpoint);
       }
-      const info = { ...nodeCfg.gatherDeviceInfo(), agents: this._buildRoster() };
+      const info = { ...nodeCfg.gatherDeviceInfo(), agents: this._buildRoster(), runtimes: this._runtimes };
       const resp = await this._nodeClient.nodeHeartbeat(n.node_id, n.token, info);
       // The heartbeat response is our push channel: run any queued remote
       // agent-management commands the workspace enqueued for this node. Fire
@@ -67,13 +69,18 @@ class Daemon {
     }
   }
 
-  /** Roster of agents this node hosts, for the workspace's node view. */
+  /**
+   * Roster of agents this node hosts, for the workspace's node view. Sourced
+   * from config (the source of truth for what's configured) and augmented with
+   * live process state, so a removed agent drops off immediately rather than
+   * lingering as a stale 'stopped' process entry.
+   */
   _buildRoster() {
     const roster = [];
     try {
-      const status = this.getStatus();
-      for (const [name, info] of Object.entries(status)) {
-        roster.push({ name, type: info.type || 'unknown', status: info.state || 'unknown' });
+      for (const a of this.config.getAgents()) {
+        const proc = this._processes[a.name];
+        roster.push({ name: a.name, type: a.type || 'unknown', status: (proc && proc.state) || 'stopped' });
       }
     } catch {
       // best-effort
@@ -81,6 +88,24 @@ class Daemon {
     return roster;
   }
 
+  /**
+   * Detect, for every supported agent type, whether its runtime is installed and
+   * logged-in/ready on this device. Runs `agn runtimes --json` in a CHILD process
+   * so the (synchronous, execSync-heavy) version/login probes never block the
+   * daemon's event loop. Result is reported to the workspace on the heartbeat.
+   */
+  async _refreshRuntimes() {
+    try {
+      const r = await this._runAgn(['runtimes', '--json']);
+      if (r.code === 0 && r.stdout) {
+        const parsed = JSON.parse(r.stdout.trim());
+        if (Array.isArray(parsed)) this._runtimes = parsed;
+      }
+    } catch {
+      // keep the previous snapshot on failure
+    }
+  }
+
   /**
    * Execute one remote command by shelling out to this same launcher's CLI, so
    * all of create/install/connect/start/stop/remove reuses the exact code path a
@@ -95,7 +120,9 @@ class Daemon {
     try {
       if (action === 'create_agent') {
         const type = (args.type || '').trim();
-        const r1 = await this._runAgn(['create', name, '--type', type, '--install']);
+        const createArgs = ['create', name, '--type', type, '--install'];
+        if (args.workingDir) createArgs.push('--path', String(args.workingDir));
+        const r1 = await this._runAgn(createArgs);
         if (r1.code !== 0) throw new Error(r1.stderr || r1.stdout || 'create failed');
         // Optional credentials for API-key agents (generic → provider mapping
         // happens in env resolution).
@@ -119,6 +146,13 @@ class Daemon {
         const r = await this._runAgn(['remove', name]);
         ok = r.code === 0;
         message = ok ? `Agent '${name}' removed` : (r.stderr || r.stdout || 'remove failed');
+      } else if (action === 'detect_runtimes') {
+        await this._refreshRuntimes();
+        // Push the fresh detection right away rather than waiting for the next
+        // heartbeat, so the workspace's Add-agent gallery updates promptly.
+        this._nodeHeartbeat();
+        ok = true;
+        message = `Detected ${this._runtimes.length} runtime(s)`;
       } else {
         message = `Unknown action '${action}'`;
       }
@@ -221,6 +255,11 @@ class Daemon {
     this._nodeHeartbeat();
     this._nodeHeartbeatInterval = setInterval(() => this._nodeHeartbeat(), 10000);
 
+    // Detect installed/logged-in agent runtimes for the Add-agent gallery. Runs
+    // in a child process (off the event loop), refreshed periodically.
+    this._refreshRuntimes();
+    this._runtimesInterval = setInterval(() => this._refreshRuntimes(), 120000);
+
     // Watch config file for hot-reload
     this._watchConfig();
 
@@ -247,6 +286,7 @@ class Daemon {
     if (this._statusInterval) clearInterval(this._statusInterval);
     if (this._cmdInterval) clearInterval(this._cmdInterval);
     if (this._nodeHeartbeatInterval) clearInterval(this._nodeHeartbeatInterval);
+    if (this._runtimesInterval) clearInterval(this._runtimesInterval);
     if (this._configWatcher) { try { this._configWatcher.close(); } catch {} }
 
     // Kill all child processes

package/src/workspace-client.js

@@ -134,6 +134,7 @@ class WorkspaceClient {
     if (deviceInfo.os) body.os = deviceInfo.os;
     if (deviceInfo.launcherVersion) body.launcher_version = deviceInfo.launcherVersion;
     if (Array.isArray(deviceInfo.agents)) body.agents = deviceInfo.agents;
+    if (Array.isArray(deviceInfo.runtimes)) body.runtimes = deviceInfo.runtimes;
     const data = await this._post('/v1/nodes/heartbeat', body, this._wsHeaders(token));
     return data.data || data;
   }