@agentdeck/bridge 1.0.8 → 1.0.9

package/dist/cli.js

@@ -365,6 +365,7 @@ program
     .option('--wake-word', 'Enable wake word voice assistant ("오픈클로")')
     .option('--remote-daemon', 'Opt in to attaching this session to a daemon on another machine (gates --daemon-host and mDNS discovery)')
     .option('--daemon-host <host>', 'Explicit remote daemon endpoint (host or host:port); requires --remote-daemon')
+    .option('--daemon-token <token>', 'Pairing token of the remote hub (~/.agentdeck/auth-token there); or set AGENTDECK_DAEMON_TOKEN')
     .option('--no-env-args', 'Ignore AGENTDECK_COMMANDER_ARGS and AGENTDECK_<AGENT>_ARGS for this invocation')
     .option('--weight <n>', 'Deck/tab sort order override (integer, lower first; default 0)', parseWeight)
     .action(async (opts) => {
@@ -380,6 +381,7 @@ program
         wakeWord: !!opts.wakeWord,
         remoteDaemon: !!opts.remoteDaemon,
         daemonHost: opts.daemonHost,
+        daemonToken: opts.daemonToken,
         weight: opts.weight,
         modules: opts.local ? { mdns: false, adb: false, serial: false, pixoo: false, timebox: false } : {
             mdns: false, // daemon-only — session bridges never advertise mDNS
@@ -402,6 +404,7 @@ program
     .option('--no-codex-hooks', 'Skip ~/.codex/config.toml hook install')
     .option('--remote-daemon', 'Opt in to attaching this session to a daemon on another machine (gates --daemon-host and mDNS discovery)')
     .option('--daemon-host <host>', 'Explicit remote daemon endpoint (host or host:port); requires --remote-daemon')
+    .option('--daemon-token <token>', 'Pairing token of the remote hub (~/.agentdeck/auth-token there); or set AGENTDECK_DAEMON_TOKEN')
     .option('--no-env-args', 'Ignore AGENTDECK_COMMANDER_ARGS and AGENTDECK_<AGENT>_ARGS for this invocation')
     .option('--weight <n>', 'Deck/tab sort order override (integer, lower first; default 0)', parseWeight)
     .action(async (opts) => {
@@ -439,6 +442,7 @@ program
         postit: opts.postit !== false,
         remoteDaemon: !!opts.remoteDaemon,
         daemonHost: opts.daemonHost,
+        daemonToken: opts.daemonToken,
         weight: opts.weight,
         modules: opts.local ? { mdns: false, adb: false, serial: false, pixoo: false, timebox: false } : {
             mdns: false, // daemon-only
@@ -461,6 +465,7 @@ program
     .option('--no-opencode-hooks', 'Skip OpenCode observer plugin install')
     .option('--remote-daemon', 'Opt in to attaching this session to a daemon on another machine (gates --daemon-host and mDNS discovery)')
     .option('--daemon-host <host>', 'Explicit remote daemon endpoint (host or host:port); requires --remote-daemon')
+    .option('--daemon-token <token>', 'Pairing token of the remote hub (~/.agentdeck/auth-token there); or set AGENTDECK_DAEMON_TOKEN')
     .option('--no-env-args', 'Ignore AGENTDECK_COMMANDER_ARGS and AGENTDECK_<AGENT>_ARGS for this invocation')
     .option('--weight <n>', 'Deck/tab sort order override (integer, lower first; default 0)', parseWeight)
     .action(async (opts) => {
@@ -497,6 +502,7 @@ program
         postit: opts.postit !== false,
         remoteDaemon: !!opts.remoteDaemon,
         daemonHost: opts.daemonHost,
+        daemonToken: opts.daemonToken,
         weight: opts.weight,
         modules: opts.local ? { mdns: false, adb: false, serial: false, pixoo: false, timebox: false } : {
             mdns: false,
@@ -515,6 +521,7 @@ program
     .option('--local', 'Disable all device modules')
     .option('--remote-daemon', 'Opt in to attaching this session to a daemon on another machine (gates --daemon-host and mDNS discovery)')
     .option('--daemon-host <host>', 'Explicit remote daemon endpoint (host or host:port); requires --remote-daemon')
+    .option('--daemon-token <token>', 'Pairing token of the remote hub (~/.agentdeck/auth-token there); or set AGENTDECK_DAEMON_TOKEN')
     // Commander-layer half only: monitor spawns no agent command to weave into.
     .option('--no-env-args', 'Ignore AGENTDECK_COMMANDER_ARGS for this invocation')
     .option('--weight <n>', 'Deck/tab sort order override (integer, lower first; default 0)', parseWeight)
@@ -530,6 +537,7 @@ program
         debug: opts.debug,
         remoteDaemon: !!opts.remoteDaemon,
         daemonHost: opts.daemonHost,
+        daemonToken: opts.daemonToken,
         weight: opts.weight,
         modules: opts.local ? { mdns: false, adb: false, serial: false, pixoo: false, timebox: false } : undefined,
     });
@@ -550,7 +558,7 @@ daemon
     .option('-f, --foreground', 'Run in foreground (default: background fork)')
     .option('--wake-word', 'Enable wake word voice assistant ("오픈클로")')
     .action(async (opts) => {
-    const { findExistingDaemon, probeDaemonHealth, readDaemonInfo, removeDaemonInfo, removeDaemonSession, requestDaemonStandDown, requestDaemonShutdown, waitForDaemonExit } = await import('./session-registry.js');
+    const { findExistingDaemon, probeDaemonHealth, readDaemonInfo, removeDaemonInfo, removeDaemonSession, requestDaemonStandDown, requestDaemonShutdown, waitForDaemonExit, waitForPortBindable } = await import('./session-registry.js');
     // Reverse two-tier upgrade path: the macOS app may already own the canonical
     // port with its in-process Swift daemon (Tier 1 — limited: no ADB devices,
     // no subscription usage, …). A plain "already running → exit" would strand
@@ -571,13 +579,52 @@ daemon
                 await requestDaemonShutdown(targetPort);
                 acked = true; // shutdown is best-effort (no ack body); rely on the exit wait
             }
-            if (acked && await waitForDaemonExit(targetPort, 12000)) {
+            // Two conditions, not one. `waitForDaemonExit` proves the app stopped
+            // answering; `waitForPortBindable` proves the socket is actually gone.
+            // The app releases the port with NWListener.cancel(), which returns
+            // before the teardown completes — binding on the first signal alone is
+            // what silently demoted this daemon to the 9121 fallback and left the
+            // canonical port ownerless.
+            if (acked
+                && await waitForDaemonExit(targetPort, 12000)
+                // 30s, and that is not padding. Cancelling the app's NWListener does
+                // not free the port: macOS keeps a NECP reservation on it for ~14s
+                // afterwards, during which `lsof` shows no sockets at all and bind()
+                // still returns EADDRINUSE (measured 2026-08-06 — bindable at ~17s).
+                // Anything shorter gives up while the kernel, not the app, is holding
+                // the port. The app's takeover-yield window is longer still (45s), so
+                // it stays off the port until well after this wait has claimed it.
+                && await waitForPortBindable(targetPort, 30000)) {
                 log(`App daemon yielded port ${targetPort}. Starting CLI daemon…`);
                 // fall through — port is clear, proceed to bind below
             }
             else {
-                log(`The AgentDeck app did not yield port ${targetPort} in time. Quit the app and retry 'agentdeck daemon start', or start on a different port with -p.`);
-                process.exit(1);
+                // The app yielded but the PORT did not come back, and that is often
+                // not the app's doing: a WiFi device that has gone to sleep with bytes
+                // still queued to it leaves its socket in LAST_ACK on this port, and
+                // TCP holds that until it exhausts retransmits — minutes, sometimes.
+                // Network.framework exposes no SO_LINGER, so the app cannot RST out of
+                // it (measured 2026-08-06: two sleeping ESP32 boards, 11901 and 4
+                // bytes queued, were the only things left on 9120).
+                //
+                // Carry on rather than exiting. The daemon binds a fallback port and
+                // writes it to daemon.json, which is what every client resolves
+                // through and what the app itself re-reads when its yield window ends
+                // — so the deck keeps working. What must NOT happen is this being
+                // silent, which is how the canonical port ended up owned by nobody
+                // with the CLI reporting success.
+                log(`The AgentDeck app yielded port ${targetPort} but the port has not been released `
+                    + `(usually a sleeping WiFi device holding a half-closed socket on it).`);
+                if (opts.port) {
+                    // The port was ASKED for, not defaulted to. Quietly binding a
+                    // different one would answer a question the user did not ask;
+                    // an explicit choice fails loudly instead.
+                    log(`Quit the AgentDeck app and retry, or choose another port.`);
+                    process.exit(1);
+                }
+                log(`Starting on a fallback port instead — clients resolve it from daemon.json. `
+                    + `For the canonical port, quit the AgentDeck app and retry, or pass -p.`);
+                // fall through to normal port selection
             }
         }
         else {
@@ -1287,6 +1334,29 @@ program
         // qrcode not available
     }
 });
+program
+    .command('token')
+    .description('Show or rotate the pairing token (~/.agentdeck/auth-token)')
+    .argument('[action]', "'show' (default) prints the token; 'rotate' replaces it", 'show')
+    .action(async (action) => {
+    const { getOrCreateToken, rotateToken } = await import('./auth.js');
+    if (action === 'rotate') {
+        const token = rotateToken();
+        log(`New pairing token: ${token}`);
+        log('All paired clients must re-pair: rescan the QR on companion apps (agentdeck qr),');
+        log('re-provision WiFi ESP32 boards (they re-provision automatically over USB serial),');
+        log('and update AGENTDECK_DAEMON_TOKEN on any remote workers.');
+        log('Restart the daemon (agentdeck daemon restart) so it picks up the new token.');
+    }
+    else if (action === 'show') {
+        log(getOrCreateToken());
+        log('(Anyone with this token can control your sessions over the LAN — treat it like a password.)');
+    }
+    else {
+        console.error(`Unknown action '${action}' — use 'show' or 'rotate'.`);
+        process.exitCode = 1;
+    }
+});
 program
     .command('inject-test')
     .description('Test observed-answer injection into a terminal or app (tuning aid)')