@agentbean/daemon 0.1.23 → 0.1.25

package/dist/index.js

@@ -8,6 +8,10 @@ import { pickAdapter } from './adapters/factory.js';
 import { logger } from './log.js';
 import { scanRuntimes, scanAgentOSAgents, scanLocalAgents, getDeviceId } from './scanner.js';
 import { loadAuth, saveAuth } from './auth-store.js';
+export function discoveredAgentId(name, deviceId) {
+    const slug = name.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-+|-+$/g, '');
+    return deviceId ? `scan-${deviceId}-${slug}` : slug;
+}
 async function discoverAgents(deviceId) {
     const [_runtimes, agentos, local] = await Promise.all([
         scanRuntimes(),
@@ -21,7 +25,7 @@ async function discoverAgents(deviceId) {
             continue;
         seen.add(s.command);
         results.push({
-            id: s.name.toLowerCase().replace(/[^a-z0-9]+/g, '-'),
+            id: discoveredAgentId(s.name, deviceId),
             name: s.name,
             role: s.category === 'executor-hosted' ? 'executor-agent' : 'gateway-agent',
             category: s.category,
@@ -29,6 +33,7 @@ async function discoverAgents(deviceId) {
                 kind: s.adapterKind,
                 command: s.command,
                 args: s.args,
+                cwd: s.cwd,
             },
             visibility: 'public',
         });
@@ -141,6 +146,7 @@ Options:
     }
     let serverUrl = values['server-url'] ?? process.env.AGENT_BEAN_SERVER_URL;
     let token = values['token'] ?? process.env.AGENT_BEAN_AGENT_TOKEN;
+    let savedAuth = null;
     let networkId = values['network-id'] ?? 'default';
     if (values.invite) {
         if (!serverUrl) {
@@ -153,11 +159,10 @@ Options:
         networkId = auth.networkId ?? networkId;
     }
     else if (!token) {
-        const saved = loadAuth();
-        if (saved) {
-            serverUrl = serverUrl ?? saved.serverUrl;
-            token = saved.token;
-            networkId = saved.networkId ?? networkId;
+        savedAuth = loadAuth();
+        if (savedAuth) {
+            serverUrl = serverUrl ?? savedAuth.serverUrl;
+            token = savedAuth.token;
         }
     }
     if (!serverUrl || !token) {
@@ -165,6 +170,18 @@ Options:
         console.error('Usage: agentbean-daemon --server-url <url> --token <token>');
         process.exit(1);
     }
+    const tokenNetworkId = networkIdFromToken(token);
+    if (values['network-id'] && tokenNetworkId && values['network-id'] !== tokenNetworkId) {
+        console.error('Error: --network-id does not match the provided token.');
+        console.error('Use the team ID embedded in the token, or omit --network-id and let the daemon detect it.');
+        process.exit(1);
+    }
+    networkId = resolveCliNetworkId({
+        explicitNetworkId: values['network-id'],
+        token,
+        savedNetworkId: savedAuth?.networkId,
+        fallbackNetworkId: networkId,
+    });
     const deviceId = values['device-id'] ?? await getDeviceId();
     logger.info({ serverUrl, deviceId, networkId }, 'CLI mode: auto-discovering agents');
     const agents = await discoverAgents(deviceId);
@@ -187,6 +204,20 @@ function normalizeAgentUrl(serverUrl) {
     const base = normalizeBaseUrl(serverUrl);
     return `${base}/agent`;
 }
+export function networkIdFromToken(token) {
+    const parts = String(token ?? '').split(':');
+    if (parts.length !== 3)
+        return undefined;
+    const networkId = parts[1]?.trim();
+    return networkId || undefined;
+}
+export function resolveCliNetworkId(input) {
+    return input.explicitNetworkId
+        ?? networkIdFromToken(input.token)
+        ?? input.savedNetworkId
+        ?? input.fallbackNetworkId
+        ?? 'default';
+}
 export const INVITE_CONNECTION_TIMEOUT_MS = 20_000;
 export function createInviteSocketOptions() {
     return {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@agentbean/daemon",
   "private": false,
-  "version": "0.1.23",
+  "version": "0.1.25",
   "type": "module",
   "main": "./dist/index.js",
   "bin": {