@agentbean/daemon 0.1.22 → 0.1.24

package/dist/device-daemon.js

@@ -76,6 +76,26 @@ function saveCache(payload) {
         logger.warn({ err: err?.message }, 'failed to save scan cache');
     }
 }
+export function createDeviceSocketOptions(input) {
+    return {
+        auth: {
+            token: input.token,
+            deviceId: input.deviceId,
+            networkId: input.networkId,
+            agents: input.agents,
+            systemInfo: input.systemInfo,
+            daemonVersion: input.systemInfo.daemonVersion,
+            protocolVersion: 1,
+            capabilities: {
+                customAgentDispatch: true,
+            },
+        },
+        reconnection: true,
+        reconnectionDelay: 1_000,
+        reconnectionDelayMax: 10_000,
+        timeout: 20_000,
+    };
+}
 async function scanAll() {
     const [runtimes, agentos, local] = await Promise.all([
         scanRuntimes(),
@@ -197,23 +217,13 @@ export function createDeviceDaemon(cfg, agents) {
     return {
         async start() {
             const agentUrl = cfg.server.url.endsWith('/agent') ? cfg.server.url : cfg.server.url + '/agent';
-            socket = io(agentUrl, {
-                auth: {
-                    token: cfg.server.token,
-                    deviceId: cfg.deviceId,
-                    networkId: cfg.networkId,
-                    agents: publicAgents,
-                    systemInfo,
-                    daemonVersion: systemInfo.daemonVersion,
-                    protocolVersion: 1,
-                    capabilities: {
-                        customAgentDispatch: true,
-                    },
-                },
-                transports: ['websocket'],
-                reconnection: true,
-                reconnectionDelay: 1_000,
-            });
+            socket = io(agentUrl, createDeviceSocketOptions({
+                token: cfg.server.token,
+                deviceId: cfg.deviceId,
+                networkId: cfg.networkId,
+                agents: publicAgents,
+                systemInfo,
+            }));
             socket.on('connect', () => {
                 const reconnecting = !firstConnect;
                 firstConnect = false;
@@ -249,6 +259,15 @@ export function createDeviceDaemon(cfg, agents) {
             socket.on('connect_error', (err) => {
                 logger.error({ err: err.message }, 'connect_error');
             });
+            socket.io.on('reconnect_attempt', (attempt) => {
+                logger.info({ attempt }, 'device daemon reconnect attempt');
+            });
+            socket.io.on('reconnect', (attempt) => {
+                logger.info({ attempt }, 'device daemon reconnected');
+            });
+            socket.io.on('reconnect_error', (err) => {
+                logger.warn({ err: errorMessage(err) }, 'device daemon reconnect failed');
+            });
             socket.on('dispatch', (req) => {
                 let agent = agents.get(req.agentId);
                 if (!agent && req.customAgent) {

package/dist/index.js

@@ -141,6 +141,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 +154,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 +165,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 +199,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.22",
+  "version": "0.1.24",
   "type": "module",
   "main": "./dist/index.js",
   "bin": {