@openagents-org/agent-launcher 0.2.192 → 0.2.194

package/src/cli.js

@@ -217,7 +217,7 @@ async function cmdCreate(connector, flags, positional) {
         }
       } else {
         print(`  agn connect ${name} <workspace-token>`);
-        print('Or pair this device first: agn node connect <pairing-code>');
+        print('Or pair this device first: agn device connect <pairing-code>');
       }
     } else {
       print(`Agent '${name}' created (type: ${type})`);
@@ -441,7 +441,7 @@ async function cmdConnect(connector, flags, positional) {
   // no server round-trip; the credential is already on disk. This is the
   // pairing-first path; the token form below stays for manual connection.
   if (flags.workspace && typeof flags.workspace === 'string') {
-    connectKnownWorkspace(connector, name, flags.workspace);
+    connectKnownWorkspace(connector, name, flags.workspace, flags.connection);
     return;
   }
 
@@ -480,7 +480,7 @@ async function cmdConnect(connector, flags, positional) {
     // CLI half of the dismissible launcher notice.
     if (!process.env.OPENAGENTS_NO_DEPRECATION_NOTES) {
       print('note: manual token connection is being retired in favor of device pairing.');
-      print('      Pair once with `agn node connect <code>`, then `agn connect <agent> --workspace <slug>`.');
+      print('      Pair once with `agn device connect <code>`, then `agn connect <agent> --workspace <slug>`.');
       print('      (Silence this note with OPENAGENTS_NO_DEPRECATION_NOTES=1.)');
     }
 
@@ -504,7 +504,12 @@ async function cmdConnect(connector, flags, positional) {
  * (node.json) — a pairing registers its network on the spot so the daemon can
  * pick up the token. Never touches the server.
  */
-function connectKnownWorkspace(connector, name, ref) {
+function connectKnownWorkspace(connector, name, ref, connectionId) {
+  const matches = require('./node-config').listPairings().filter((p) => p.workspace_slug === ref || p.workspace_id === ref);
+  if ((!connectionId && matches.length > 1) || (connectionId && !matches.some((p) => p.node_id === connectionId))) {
+    throw new Error("Choose a device connection with --connection <id>");
+  }
+  const chosen = matches.find((p) => !connectionId || p.node_id === connectionId);
   const networks = connector.config.getNetworks() || [];
   let net = networks.find((n) => n.slug === ref || n.id === ref);
 
@@ -538,13 +543,14 @@ function connectKnownWorkspace(connector, name, ref) {
     ].filter(Boolean);
     print(`No workspace '${ref}' is known on this device.`);
     if (known.length) print(`Known workspaces: ${known.join(', ')}`);
-    print('Pair this device first (`agn node connect <code>`), or connect with a token.');
+    print('Pair this device first (`agn device connect <code>`), or connect with a token.');
     process.exitCode = 1;
     return;
   }
 
   const slug = net.slug || ref;
   connector.connectWorkspace(name, slug);
+  if (chosen) connector.config.updateAgent(name, { node_id: chosen.node_id });
   print(`'${name}' connected to workspace '${net.name || slug}'`);
 
   const pid = connector.getDaemonPid();
@@ -570,6 +576,11 @@ function workspaceWebUrl(slug, endpoint) {
     : `https://workspace.openagents.org/${slug}`;
 }
 
+/**
+ * `agn device <connect|status>` — pair this device (formerly "node") to a
+ * workspace. `agn node`, `agn devices` and `agn nodes` are aliases so existing
+ * scripts and older docs keep working; the product wording is "device".
+ */
 async function cmdNode(connector, flags, positional) {
   const sub = positional[0] || 'status';
   const nodeCfg = require('./node-config');
@@ -577,8 +588,8 @@ async function cmdNode(connector, flags, positional) {
   if (sub === 'connect') {
     const code = positional[1] || flags.code;
     if (!code) {
-      print('Usage: agn node connect <pairing-code>');
-      print('Get a pairing code from your workspace: Connect a Node.');
+      print('Usage: agn device connect <pairing-code>');
+      print('Get a pairing code from your workspace: Devices → Connect a device.');
       process.exitCode = 1;
       return;
     }
@@ -616,12 +627,19 @@ async function cmdNode(connector, flags, positional) {
       // credential in place — but the user should hear "already paired", not
       // a duplicate "connected".
       const alreadyPaired = priorPairings.some(
-        (p) => p.workspace_id === res.workspaceId,
+        (p) => p.node_id === res.nodeId,
       );
       // recordPairing, not saveNode: this device can be a node in several
       // workspaces at once, and a bare save would drop the others' pairings.
+      // Freeze legacy bindings before another owner adds a connection here.
+      const prior = priorPairings.filter((p) => p.workspace_id === res.workspaceId);
+      if (prior.length === 1) for (const agent of connector.config.getAgents()) {
+        if (!agent.node_id && (agent.network === prior[0].workspace_slug || agent.network === prior[0].workspace_id))
+          connector.config.updateAgent(agent.name, { node_id: prior[0].node_id });
+      }
       nodeCfg.recordPairing(info.nodeKey, {
         node_id: res.nodeId,
+        owner_email: res.ownerEmail,
         workspace_id: res.workspaceId,
         workspace_slug: res.workspaceSlug,
         workspace_name: res.workspaceName,
@@ -639,7 +657,7 @@ async function cmdNode(connector, flags, positional) {
       if (alreadyPaired) {
         print(`Already paired with '${res.workspaceName}' (${res.workspaceSlug}) — refreshed this device's credential.`);
       } else {
-        print(`Node connected to workspace '${res.workspaceName}' (${res.workspaceSlug})`);
+        print(`Device connected to workspace '${res.workspaceName}' (${res.workspaceSlug})`);
       }
       print(`  This device: ${info.hostname} (${info.deviceType})`);
 
@@ -672,10 +690,10 @@ async function cmdNode(connector, flags, positional) {
   if (sub === 'status') {
     const pairings = nodeCfg.listPairings().filter((p) => p.node_id);
     if (!pairings.length) {
-      print('No node connected. Run: agn node connect <pairing-code>');
+      print('No device connected. Run: agn device connect <pairing-code>');
       return;
     }
-    print(`Node connected to ${pairings.length} workspace(s):`);
+    print(`Device connected to ${pairings.length} workspace(s):`);
     for (const p of pairings) {
       const slug = p.workspace_slug || p.workspace_id;
       print(`  ${p.workspace_name || slug} (${slug}) — ${workspaceWebUrl(slug, p.endpoint)}`);
@@ -683,7 +701,7 @@ async function cmdNode(connector, flags, positional) {
     return;
   }
 
-  print('Usage: agn node <connect|status> [pairing-code]');
+  print('Usage: agn device <connect|status> [pairing-code]   (alias: agn node)');
   process.exitCode = 1;
 }
 
@@ -1024,6 +1042,37 @@ async function cmdProbe(connector, flags, positional) {
   }
 }
 
+async function cmdModels(connector, flags, positional) {
+  const target = positional[0];
+  if (!target) { print('Usage: agn models <type|agent> [--json]'); return; }
+
+  // Accept an agent name, as `agn probe` does: its CLI is asked on that
+  // agent's own env, so a signed-in agent answers for its sign-in.
+  let type = target;
+  let agentEnv;
+  try {
+    const agent = connector.config.getAgent(target);
+    if (agent) { type = agent.type || 'openclaw'; agentEnv = agent.env || {}; }
+  } catch {}
+
+  const result = await connector.listCliModels(type, { agentEnv });
+
+  if (flags && flags.json) {
+    // Machine consumers (the daemon's model sweep) read ONLY stdout JSON —
+    // same contract as `agn probe --json`.
+    process.stdout.write(JSON.stringify(result));
+    if (!result.ok) process.exitCode = 1;
+    return;
+  }
+
+  if (!result.ok) {
+    print(`FAILED ${result.error || ''}`.trim());
+    process.exitCode = 1;
+    return;
+  }
+  for (const m of result.models) print(m.label === m.id ? m.id : `${m.id}  ${m.label}`);
+}
+
 async function cmdVersion() {
   const pkg = require('../package.json');
   print(`${pkg.name} v${pkg.version}`);
@@ -1086,6 +1135,8 @@ Commands:
   uninstall <type>            Uninstall an agent runtime
   search [query]              Browse agent catalog
   runtimes                    List installed runtimes
+  device connect <code>       Pair this device (formerly "node") to a workspace with a pairing code
+  device status               Show the workspaces this device is paired with (alias: node)
   connect <agent> <token>     Connect agent to workspace (or --workspace <slug> for a paired one)
   disconnect <agent>          Disconnect agent from workspace
   env <type> [--set K=V]      View/set env vars for agent type
@@ -1094,6 +1145,7 @@ Commands:
   autostart [--disable]       Enable/disable auto-start on login
   test-llm <type>             Test LLM connection
   probe <type|agent> [--json] Smoke-test an agent (tiny end-to-end prompt)
+  models <type|agent> [--json] List the models the agent's CLI offers its signed-in account
   logs [agent] [--lines N]    View daemon logs
   workspace create [name]     Create a new workspace
   workspace join <token>      Join workspace with token
@@ -1173,7 +1225,10 @@ async function main() {
     search: () => cmdSearch(connector, flags, positional),
     runtimes: () => cmdRuntimes(connector, flags),
     connect: () => cmdConnect(connector, flags, positional),
-    node: () => cmdNode(connector, flags, positional),
+    device: () => cmdNode(connector, flags, positional),
+    devices: () => cmdNode(connector, flags, positional),
+    node: () => cmdNode(connector, flags, positional),     // legacy spelling
+    nodes: () => cmdNode(connector, flags, positional),    // legacy spelling
     disconnect: () => cmdDisconnect(connector, flags, positional),
     logs: () => cmdLogs(connector, flags, positional),
     autostart: () => cmdAutostart(connector, flags),
@@ -1183,6 +1238,7 @@ async function main() {
     'tool-mode': () => cmdToolMode(connector, flags, positional),
     'test-llm': () => cmdTestLLM(connector, flags, positional),
     probe: () => cmdProbe(connector, flags, positional),
+    models: () => cmdModels(connector, flags, positional),
     update: () => cmdUpdate(connector),
     'mcp-server': () => {
       const { runMcpServer } = require('./mcp-server');

package/src/config.js

@@ -110,6 +110,7 @@ class Config {
       agent.network = networkSlug;
     } else {
       delete agent.network;
+      delete agent.node_id;
     }
     this.save(config);
   }
@@ -269,9 +270,18 @@ class Config {
     const { keptLines, removed } = filterLogsByTimeRange(allLines, start, end);
 
     const nextContent = keptLines.join('\n') + (hasTrailingNewline && keptLines.length > 0 ? '\n' : '');
-    const tempFile = `${this.logFile}.tmp`;
-    fs.writeFileSync(tempFile, nextContent, 'utf-8');
-    fs.renameSync(tempFile, this.logFile);
+    // Rewrite in place, not write-temp + rename: the running daemon's stdout
+    // and stderr are append-mode handles to daemon.log. A rename leaves them
+    // writing into the replaced file (and fails outright on Windows while they
+    // are open); truncating in place keeps them appending to daemon.log.
+    const nextBytes = Buffer.from(nextContent, 'utf-8');
+    const fd = fs.openSync(this.logFile, 'r+');
+    try {
+      if (nextBytes.length > 0) fs.writeSync(fd, nextBytes, 0, nextBytes.length, 0);
+      fs.ftruncateSync(fd, nextBytes.length);
+    } finally {
+      fs.closeSync(fd);
+    }
 
     return { removed, remaining: keptLines.length };
   }