@agent-relay/dashboard-server 2.0.64 → 2.0.65

package/dist/messageBuffer.d.ts

@@ -0,0 +1,38 @@
+/**
+ * Ring buffer for storing recent WebSocket messages.
+ * Used to replay missed messages when clients reconnect after brief disconnects.
+ */
+export interface BufferedMessage {
+    id: number;
+    timestamp: number;
+    type: string;
+    payload: string;
+}
+export declare class MessageBuffer {
+    private buffer;
+    private capacity;
+    private writeIndex;
+    private sequenceCounter;
+    constructor(capacity?: number);
+    /**
+     * Push a new message into the buffer.
+     * Returns the assigned sequence ID.
+     */
+    push(type: string, payload: string): number;
+    /**
+     * Get all messages with an ID greater than the given sequence ID.
+     * Returns messages in chronological order.
+     */
+    getAfter(sequenceId: number): BufferedMessage[];
+    /**
+     * Get all messages with a timestamp greater than the given timestamp.
+     * Returns messages in chronological order.
+     */
+    getAfterTimestamp(ts: number): BufferedMessage[];
+    /**
+     * Get the current sequence ID (the ID of the last pushed message).
+     * Returns 0 if no messages have been pushed.
+     */
+    currentId(): number;
+}
+//# sourceMappingURL=messageBuffer.d.ts.map

package/dist/messageBuffer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"messageBuffer.d.ts","sourceRoot":"","sources":["../src/messageBuffer.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,eAAe,CAAS;gBAEpB,QAAQ,GAAE,MAAY;IAOlC;;;OAGG;IACH,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM;IAa3C;;;OAGG;IACH,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,eAAe,EAAE;IAa/C;;;OAGG;IACH,iBAAiB,CAAC,EAAE,EAAE,MAAM,GAAG,eAAe,EAAE;IAahD;;;OAGG;IACH,SAAS,IAAI,MAAM;CAGpB"}

package/dist/messageBuffer.js

@@ -0,0 +1,72 @@
+/**
+ * Ring buffer for storing recent WebSocket messages.
+ * Used to replay missed messages when clients reconnect after brief disconnects.
+ */
+export class MessageBuffer {
+    buffer;
+    capacity;
+    writeIndex;
+    sequenceCounter;
+    constructor(capacity = 500) {
+        this.capacity = capacity;
+        this.buffer = new Array(capacity).fill(null);
+        this.writeIndex = 0;
+        this.sequenceCounter = 0;
+    }
+    /**
+     * Push a new message into the buffer.
+     * Returns the assigned sequence ID.
+     */
+    push(type, payload) {
+        this.sequenceCounter++;
+        const message = {
+            id: this.sequenceCounter,
+            timestamp: Date.now(),
+            type,
+            payload,
+        };
+        this.buffer[this.writeIndex] = message;
+        this.writeIndex = (this.writeIndex + 1) % this.capacity;
+        return this.sequenceCounter;
+    }
+    /**
+     * Get all messages with an ID greater than the given sequence ID.
+     * Returns messages in chronological order.
+     */
+    getAfter(sequenceId) {
+        const results = [];
+        for (let i = 0; i < this.capacity; i++) {
+            const msg = this.buffer[i];
+            if (msg && msg.id > sequenceId) {
+                results.push(msg);
+            }
+        }
+        // Sort by id to ensure chronological order
+        results.sort((a, b) => a.id - b.id);
+        return results;
+    }
+    /**
+     * Get all messages with a timestamp greater than the given timestamp.
+     * Returns messages in chronological order.
+     */
+    getAfterTimestamp(ts) {
+        const results = [];
+        for (let i = 0; i < this.capacity; i++) {
+            const msg = this.buffer[i];
+            if (msg && msg.timestamp > ts) {
+                results.push(msg);
+            }
+        }
+        // Sort by id to ensure chronological order
+        results.sort((a, b) => a.id - b.id);
+        return results;
+    }
+    /**
+     * Get the current sequence ID (the ID of the last pushed message).
+     * Returns 0 if no messages have been pushed.
+     */
+    currentId() {
+        return this.sequenceCounter;
+    }
+}
+//# sourceMappingURL=messageBuffer.js.map

package/dist/messageBuffer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"messageBuffer.js","sourceRoot":"","sources":["../src/messageBuffer.ts"],"names":[],"mappings":"AAAA;;;GAGG;AASH,MAAM,OAAO,aAAa;IAChB,MAAM,CAA6B;IACnC,QAAQ,CAAS;IACjB,UAAU,CAAS;IACnB,eAAe,CAAS;IAEhC,YAAY,WAAmB,GAAG;QAChC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7C,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;QACpB,IAAI,CAAC,eAAe,GAAG,CAAC,CAAC;IAC3B,CAAC;IAED;;;OAGG;IACH,IAAI,CAAC,IAAY,EAAE,OAAe;QAChC,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,MAAM,OAAO,GAAoB;YAC/B,EAAE,EAAE,IAAI,CAAC,eAAe;YACxB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,IAAI;YACJ,OAAO;SACR,CAAC;QACF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC;QACvC,IAAI,CAAC,UAAU,GAAG,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC;QACxD,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAED;;;OAGG;IACH,QAAQ,CAAC,UAAkB;QACzB,MAAM,OAAO,GAAsB,EAAE,CAAC;QACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC;YACvC,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YAC3B,IAAI,GAAG,IAAI,GAAG,CAAC,EAAE,GAAG,UAAU,EAAE,CAAC;gBAC/B,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACpB,CAAC;QACH,CAAC;QACD,2CAA2C;QAC3C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;QACpC,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;;OAGG;IACH,iBAAiB,CAAC,EAAU;QAC1B,MAAM,OAAO,GAAsB,EAAE,CAAC;QACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC;YACvC,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YAC3B,IAAI,GAAG,IAAI,GAAG,CAAC,SAAS,GAAG,EAAE,EAAE,CAAC;gBAC9B,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACpB,CAAC;QACH,CAAC;QACD,2CAA2C;QAC3C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;QACpC,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;;OAGG;IACH,SAAS;QACP,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;CACF"}

package/dist/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AA8DA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAiYzD,wBAAsB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AACvH,wBAAsB,cAAc,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AA8DA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAkYzD,wBAAsB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AACvH,wBAAsB,cAAc,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC"}

package/dist/server.js

@@ -55,6 +55,7 @@ function findDashboardDir() {
 }
 import { startCLIAuth, getAuthSession, cancelAuthSession, submitAuthCode, completeAuthSession, getSupportedProviders, } from '@agent-relay/daemon';
 import { HealthWorkerManager, getHealthPort } from './services/health-worker-manager.js';
+import { MessageBuffer } from './messageBuffer.js';
 /**
  * Get the host to bind to.
  * In cloud environments, bind to '::' (IPv6 any) which also accepts IPv4 on dual-stack.
@@ -480,8 +481,11 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
         });
     };
     // Initialize spawner if enabled
-    // Use detectWorkspacePath to find the actual repo directory in cloud workspaces
-    const workspacePath = detectWorkspacePath(projectRoot || dataDir);
+    // When projectRoot is explicitly provided (e.g., via --project-root), use it directly.
+    // Only use detectWorkspacePath for cloud workspace auto-detection when no explicit root is given.
+    // This fixes #380: detectWorkspacePath could re-resolve projectRoot incorrectly when
+    // tool directories like ~/.nvm contain package.json markers.
+    const workspacePath = projectRoot || detectWorkspacePath(dataDir);
     console.log(`[dashboard] Workspace path: ${workspacePath}`);
     // When an external SpawnManager is provided (from the daemon), use it for read operations
     // (logs, worker listing, hasWorker) and route spawn/release through the SDK client.
@@ -581,14 +585,28 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
     // Track file watchers for externally-spawned worker logs (module scope to avoid duplicates)
     const fileWatchers = new Map();
     const fileLastSize = new Map();
+    // Message buffers for replay on reconnect
+    // Main buffer stores broadcast messages for the main dashboard WebSocket
+    const mainMessageBuffer = new MessageBuffer(500);
+    // Per-agent log buffers store log output for each agent (smaller capacity since per-agent)
+    const agentLogBuffers = new Map();
+    /** Get or create a log buffer for an agent */
+    const getAgentLogBuffer = (agentName) => {
+        let buffer = agentLogBuffers.get(agentName);
+        if (!buffer) {
+            buffer = new MessageBuffer(200);
+            agentLogBuffers.set(agentName, buffer);
+        }
+        return buffer;
+    };
     // Track alive status for ping/pong keepalive on main dashboard connections
     // This prevents TCP/proxy timeouts from killing idle workspace connections
     const mainClientAlive = new WeakMap();
     // Track alive status for ping/pong keepalive on bridge connections
     const bridgeClientAlive = new WeakMap();
-    // Ping interval for main dashboard WebSocket connections (30 seconds)
-    // Aligns with heartbeat timeout (5s heartbeat * 6 multiplier = 30s)
-    const MAIN_PING_INTERVAL_MS = 30000;
+    // Ping interval for main dashboard WebSocket connections (15 seconds)
+    // Reduced from 30s to detect disconnects faster and minimize message loss window
+    const MAIN_PING_INTERVAL_MS = 15000;
     const mainPingInterval = setInterval(() => {
         wss.clients.forEach((ws) => {
             if (mainClientAlive.get(ws) === false) {
@@ -602,8 +620,9 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
             ws.ping();
         });
     }, MAIN_PING_INTERVAL_MS);
-    // Ping interval for bridge WebSocket connections (30 seconds)
-    const BRIDGE_PING_INTERVAL_MS = 30000;
+    // Ping interval for bridge WebSocket connections (15 seconds)
+    // Reduced from 30s to detect disconnects faster and minimize message loss window
+    const BRIDGE_PING_INTERVAL_MS = 15000;
     const bridgePingInterval = setInterval(() => {
         wssBridge.clients.forEach((ws) => {
             if (bridgeClientAlive.get(ws) === false) {
@@ -1827,7 +1846,8 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
                     }
                     // Extract model from spawn command (e.g., "codex --model gpt-5.2-codex" → "gpt-5.2-codex")
                     if (worker.cli) {
-                        const modelMatch = worker.cli.match(/--model\s+(\S+)/);
+                        // Support both `--model foo` and `--model=foo`
+                        const modelMatch = worker.cli.match(/--model[=\s]+(\S+)/);
                         if (modelMatch) {
                             agent.model = modelMatch[1];
                         }
@@ -1929,12 +1949,15 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
     const broadcastData = async () => {
         try {
             const data = await getAllData();
-            const payload = JSON.stringify(data);
+            const rawPayload = JSON.stringify(data);
             // Guard against empty/invalid payloads
-            if (!payload || payload.length === 0) {
+            if (!rawPayload || rawPayload.length === 0) {
                 console.warn('[dashboard] Skipping broadcast - empty payload');
                 return;
             }
+            // Push into buffer and wrap with sequence ID for replay support
+            const seq = mainMessageBuffer.push('data', rawPayload);
+            const payload = JSON.stringify({ seq, ...data });
             wss.clients.forEach(client => {
                 // Skip clients that are still being initialized by the connection handler
                 if (initializingClients.has(client)) {
@@ -2044,6 +2067,10 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
         ws.on('pong', () => {
             mainClientAlive.set(ws, true);
         });
+        // Send current sequence ID so client can track its position
+        if (ws.readyState === WebSocket.OPEN) {
+            ws.send(JSON.stringify({ type: 'sync', sequenceId: mainMessageBuffer.currentId() }));
+        }
         // Mark as initializing to prevent broadcastData from sending before we do
         initializingClients.add(ws);
         try {
@@ -2070,6 +2097,39 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
             // Now allow broadcastData to send to this client
             initializingClients.delete(ws);
         }
+        // Handle messages from client (replay requests, etc.)
+        ws.on('message', (data) => {
+            try {
+                const msg = JSON.parse(data.toString());
+                // Handle replay request: client sends { type: "replay", lastSequenceId: N }
+                if (msg.type === 'replay' && typeof msg.lastSequenceId === 'number') {
+                    const missed = mainMessageBuffer.getAfter(msg.lastSequenceId);
+                    const gapMs = missed.length > 0 ? Date.now() - missed[0].timestamp : 0;
+                    console.log(`[dashboard] Client replaying ${missed.length} missed messages (gap: ${gapMs}ms)`);
+                    // Send each missed message with its original sequence ID
+                    for (const buffered of missed) {
+                        if (ws.readyState === WebSocket.OPEN) {
+                            try {
+                                // Reconstruct the payload with the seq wrapper
+                                const original = JSON.parse(buffered.payload);
+                                ws.send(JSON.stringify({ seq: buffered.id, ...original }));
+                            }
+                            catch (err) {
+                                console.error('[dashboard] Failed to replay message:', err);
+                            }
+                        }
+                    }
+                    // Send current sync position after replay
+                    if (ws.readyState === WebSocket.OPEN) {
+                        ws.send(JSON.stringify({ type: 'sync', sequenceId: mainMessageBuffer.currentId() }));
+                    }
+                }
+            }
+            catch (err) {
+                // Non-JSON messages are ignored (binary, etc.)
+                debug(`[dashboard] Unhandled main WebSocket message: ${err}`);
+            }
+        });
         ws.on('error', (err) => {
             console.error('[dashboard] WebSocket client error:', err);
         });
@@ -2105,9 +2165,9 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
     });
     // Track alive status for ping/pong keepalive on log connections
     const logClientAlive = new WeakMap();
-    // Ping interval for log WebSocket connections (30 seconds)
-    // This prevents TCP/proxy timeouts from killing idle connections
-    const LOG_PING_INTERVAL_MS = 30000;
+    // Ping interval for log WebSocket connections (15 seconds)
+    // Reduced from 30s to detect disconnects faster and minimize message loss window
+    const LOG_PING_INTERVAL_MS = 15000;
     const logPingInterval = setInterval(() => {
         wssLogs.clients.forEach((ws) => {
             if (logClientAlive.get(ws) === false) {
@@ -2135,6 +2195,10 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
         ws.on('pong', () => {
             logClientAlive.set(ws, true);
         });
+        // Send sync message with current server timestamp so client can track its position
+        if (ws.readyState === WebSocket.OPEN) {
+            ws.send(JSON.stringify({ type: 'sync', serverTimestamp: Date.now() }));
+        }
         // Helper to check if agent is daemon-connected (from agents.json)
         const isDaemonConnected = (agentName) => {
             const agentsPath = path.join(teamDir, 'agents.json');
@@ -2214,6 +2278,8 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
                                 data: newContent,
                                 timestamp: new Date().toISOString(),
                             });
+                            // Push into per-agent log buffer for replay on reconnect
+                            getAgentLogBuffer(agentName).push('output', payload);
                             for (const client of clients) {
                                 if (client.readyState === WebSocket.OPEN) {
                                     client.send(payload);
@@ -2388,6 +2454,29 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
                         }));
                     }
                 }
+                // Handle replay request: client sends { type: "replay", agent: "name", lastTimestamp: N }
+                // Logs use timestamps instead of sequence IDs since the data is raw text
+                if (msg.type === 'replay' && typeof msg.agent === 'string' && typeof msg.lastTimestamp === 'number') {
+                    const logBuffer = agentLogBuffers.get(msg.agent);
+                    if (logBuffer) {
+                        const missed = logBuffer.getAfterTimestamp(msg.lastTimestamp);
+                        const gapMs = missed.length > 0 ? Date.now() - missed[0].timestamp : 0;
+                        console.log(`[dashboard] Client replaying ${missed.length} missed log messages for ${msg.agent} (gap: ${gapMs}ms)`);
+                        // Send replay as a structured response the client expects
+                        if (ws.readyState === WebSocket.OPEN) {
+                            try {
+                                const entries = missed.map(m => ({
+                                    content: m.payload,
+                                    timestamp: m.timestamp,
+                                }));
+                                ws.send(JSON.stringify({ type: 'replay', entries }));
+                            }
+                            catch (err) {
+                                console.error('[dashboard] Failed to replay log messages:', err);
+                            }
+                        }
+                    }
+                }
             }
             catch (err) {
                 console.error('[dashboard] Invalid logs WebSocket message:', err);
@@ -2408,6 +2497,7 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
                         watcher.close();
                         fileWatchers.delete(agentName);
                         fileLastSize.delete(agentName);
+                        agentLogBuffers.delete(agentName);
                         console.log(`[dashboard] Stopped watching log file for: ${agentName}`);
                     }
                 }
@@ -2461,12 +2551,16 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
                 agentHashes.delete(oldest);
             }
         }
-        const payload = JSON.stringify({
+        const logPayload = {
             type: 'output',
             agent: agentName,
             data: output,
             timestamp: new Date().toISOString(),
-        });
+        };
+        const payload = JSON.stringify(logPayload);
+        // Push into per-agent log buffer for replay on reconnect
+        // Logs use timestamps instead of sequence IDs since the data is raw text
+        getAgentLogBuffer(agentName).push('output', payload);
         for (const client of clients) {
             if (client.readyState === WebSocket.OPEN) {
                 client.send(payload);
@@ -2488,7 +2582,10 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
     // Helper to broadcast channel messages to all connected clients
     // Broadcasts to both main wss (local mode) and wssPresence (cloud mode)
     const broadcastChannelMessage = (message) => {
-        const payload = JSON.stringify(message);
+        // Push into buffer and wrap with sequence ID for replay support
+        const rawPayload = JSON.stringify(message);
+        const seq = mainMessageBuffer.push('channel_message', rawPayload);
+        const payload = JSON.stringify({ seq, ...message });
         // Broadcast to main WebSocket clients (local mode)
         wss.clients.forEach((client) => {
             if (client.readyState === WebSocket.OPEN) {
@@ -2506,7 +2603,10 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
     // This enables agent replies to appear in the dashboard UI
     // Broadcasts to both main wss (local mode) and wssPresence (cloud mode)
     const broadcastDirectMessage = (message) => {
-        const payload = JSON.stringify(message);
+        // Push into buffer and wrap with sequence ID for replay support
+        const rawPayload = JSON.stringify(message);
+        const seq = mainMessageBuffer.push('direct_message', rawPayload);
+        const payload = JSON.stringify({ seq, ...message });
         // Broadcast to main WebSocket clients (local mode)
         const mainClients = Array.from(wss.clients).filter(c => c.readyState === WebSocket.OPEN);
         debug(`[dashboard] Broadcasting direct_message to ${mainClients.length} main clients`);