@agent-relay/dashboard-server 2.0.62 → 2.0.63

package/dist/server.js

@@ -318,7 +318,7 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
     const options = typeof portOrOptions === 'number'
         ? { port: portOrOptions, dataDir: dataDirArg, teamDir: teamDirArg, dbPath: dbPathArg }
         : portOrOptions;
-    const { port, dataDir, teamDir, dbPath, enableSpawner, projectRoot, tmuxSession, onMarkSpawning, onClearSpawning, verbose } = options;
+    const { port, dataDir, teamDir, dbPath, enableSpawner, projectRoot, tmuxSession, onMarkSpawning, onClearSpawning, verbose, spawnManager: externalSpawnManager } = options;
     // Debug logging helper - only logs when verbose is true or VERBOSE env var is set
     const isVerbose = verbose || process.env.VERBOSE === 'true';
     const debug = (message) => {
@@ -483,9 +483,12 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
     // Use detectWorkspacePath to find the actual repo directory in cloud workspaces
     const workspacePath = detectWorkspacePath(projectRoot || dataDir);
     console.log(`[dashboard] Workspace path: ${workspacePath}`);
-    // Pass dashboard port to spawner so spawned agents can call spawn/release APIs for nested spawning
-    // Also pass spawn tracking callbacks so messages can be queued before HELLO completes
-    const spawner = enableSpawner
+    // 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.
+    // This solves relay-pty binary resolution issues in npx/global installs.
+    // Fall back to creating a local AgentSpawner only when no SpawnManager is provided.
+    const useExternalSpawnManager = !!externalSpawnManager;
+    const spawner = enableSpawner && !useExternalSpawnManager
         ? new AgentSpawner({
             projectRoot: workspacePath,
             tmuxSession,
@@ -494,8 +497,16 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
             onClearSpawning,
         })
         : undefined;
+    // spawnReader provides read-only access to spawner state.
+    // Uses the external SpawnManager when available (daemon co-located),
+    // otherwise falls back to the local AgentSpawner.
+    const spawnReader = externalSpawnManager || spawner;
+    if (useExternalSpawnManager) {
+        console.log('[dashboard] Using daemon SpawnManager for spawn operations (SDK-routed)');
+    }
     // Initialize cloud persistence and memory monitoring if enabled (RELAY_CLOUD_ENABLED=true)
-    if (spawner) {
+    // Only needed for local AgentSpawner; daemon's SpawnManager handles its own cloud persistence
+    if (spawner && !useExternalSpawnManager) {
         // Use workspace ID from env or generate from project root
         const workspaceId = process.env.RELAY_WORKSPACE_ID ||
             crypto.createHash('sha256').update(projectRoot || dataDir).digest('hex').slice(0, 36);
@@ -506,28 +517,27 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
         }).catch((err) => {
             console.warn('[dashboard] Failed to initialize cloud persistence:', err);
         });
-        // Initialize memory monitoring for cloud deployments
-        // Memory monitoring is enabled by default when cloud is enabled
-        if (process.env.RELAY_CLOUD_ENABLED === 'true' || process.env.RELAY_MEMORY_MONITORING === 'true') {
-            try {
-                const memoryMonitor = getMemoryMonitor({
-                    checkIntervalMs: 10000, // Check every 10 seconds
-                    enableTrendAnalysis: true,
-                    enableProactiveAlerts: true,
-                });
-                memoryMonitor.start();
-                console.log('[dashboard] Memory monitoring enabled');
-                // Register existing workers with memory monitor
-                const workers = spawner.getActiveWorkers();
-                for (const worker of workers) {
-                    if (worker.pid) {
-                        memoryMonitor.register(worker.name, worker.pid);
-                    }
+    }
+    // Initialize memory monitoring for cloud deployments
+    if (spawnReader && (process.env.RELAY_CLOUD_ENABLED === 'true' || process.env.RELAY_MEMORY_MONITORING === 'true')) {
+        try {
+            const memoryMonitor = getMemoryMonitor({
+                checkIntervalMs: 10000, // Check every 10 seconds
+                enableTrendAnalysis: true,
+                enableProactiveAlerts: true,
+            });
+            memoryMonitor.start();
+            console.log('[dashboard] Memory monitoring enabled');
+            // Register existing workers with memory monitor
+            const workers = spawnReader.getActiveWorkers();
+            for (const worker of workers) {
+                if (worker.pid) {
+                    memoryMonitor.register(worker.name, worker.pid);
                 }
             }
-            catch (err) {
-                console.warn('[dashboard] Failed to initialize memory monitoring:', err);
-            }
+        }
+        catch (err) {
+            console.warn('[dashboard] Failed to initialize memory monitoring:', err);
         }
     }
     process.on('uncaughtException', (err) => {
@@ -1162,8 +1172,8 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
             }
         }
         // Check spawner's active workers (they have accurate team info for spawned agents)
-        if (spawner) {
-            const activeWorkers = spawner.getActiveWorkers();
+        if (spawnReader) {
+            const activeWorkers = spawnReader.getActiveWorkers();
             for (const worker of activeWorkers) {
                 if (worker.team === teamName) {
                     members.add(worker.name);
@@ -1466,8 +1476,16 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
     // Helper to check if an agent name is internal/system (should be hidden from UI)
     // Convention: agent names starting with __ are internal (e.g., __spawner__, __DashboardBridge__)
     const isInternalAgent = (name) => {
+        if (name === '__cli_sender__')
+            return false;
         return name.startsWith('__');
     };
+    // Display-name remapping for CLI sender (used across message and history endpoints)
+    const remapAgentName = (name) => {
+        if (name === '__cli_sender__')
+            return 'CLI';
+        return name;
+    };
     const buildThreadSummaryMap = (rows) => {
         const summaries = new Map();
         for (const row of rows) {
@@ -1514,6 +1532,7 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
         let attachments;
         let channel;
         let effectiveFrom = row.from;
+        let effectiveTo = row.to;
         if (row.data && typeof row.data === 'object') {
             if ('attachments' in row.data) {
                 attachments = row.data.attachments;
@@ -1527,9 +1546,11 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
                 effectiveFrom = row.data.senderName;
             }
         }
+        effectiveFrom = remapAgentName(effectiveFrom);
+        effectiveTo = remapAgentName(effectiveTo);
         return {
             from: effectiveFrom,
-            to: row.to,
+            to: effectiveTo,
             content: row.body,
             timestamp: new Date(row.ts).toISOString(),
             id: row.id,
@@ -1776,8 +1797,8 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
             }
         }
         // Mark spawned agents with isSpawned flag and team
-        if (spawner) {
-            const activeWorkers = spawner.getActiveWorkers();
+        if (spawnReader) {
+            const activeWorkers = spawnReader.getActiveWorkers();
             for (const worker of activeWorkers) {
                 const agent = agentsMap.get(worker.name);
                 if (agent) {
@@ -2186,7 +2207,7 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
         };
         // Helper to subscribe to an agent (async to handle spawn timing)
         const subscribeToAgent = async (agentName) => {
-            let isSpawned = spawner?.hasWorker(agentName) ?? false;
+            let isSpawned = spawnReader?.hasWorker(agentName) ?? false;
             const isDaemon = isDaemonConnected(agentName);
             // Check if agent exists (either spawned or daemon-connected)
             if (!isSpawned && !isDaemon) {
@@ -2203,14 +2224,14 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
             // poll to handle race condition between spawn API returning and
             // WebSocket connection. This is common for setup agents (__setup__*).
             // Longer timeout for CLI auth flows (Cursor, etc.) which can take time to initialize.
-            if (!isSpawned && isDaemon && spawner) {
+            if (!isSpawned && isDaemon && spawnReader) {
                 const isSetupAgent = agentName.startsWith('__setup__');
                 const maxWaitMs = isSetupAgent ? 90000 : 5000; // 90s for setup agents (CLI auth can be slow), 5s otherwise
                 const pollIntervalMs = 100;
                 const startTime = Date.now();
                 while (Date.now() - startTime < maxWaitMs) {
                     await new Promise(resolve => setTimeout(resolve, pollIntervalMs));
-                    isSpawned = spawner.hasWorker(agentName);
+                    isSpawned = spawnReader.hasWorker(agentName);
                     if (isSpawned) {
                         console.log(`[dashboard] Agent ${agentName} appeared in spawner after ${Date.now() - startTime}ms`);
                         break;
@@ -2228,9 +2249,9 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
             }
             logSubscriptions.get(agentName).add(ws);
             debug(`[dashboard] Client subscribed to logs for: ${agentName} (spawned: ${isSpawned}, daemon: ${isDaemon})`);
-            if (isSpawned && spawner) {
+            if (isSpawned && spawnReader) {
                 // Send initial log history for spawned agents (5000 lines to match xterm scrollback capacity)
-                const lines = spawner.getWorkerOutput(agentName, 5000);
+                const lines = spawnReader.getWorkerOutput(agentName, 5000);
                 ws.send(JSON.stringify({
                     type: 'history',
                     agent: agentName,
@@ -2326,8 +2347,8 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
                         return;
                     }
                     // Check if this is a spawned agent (we can only send input to spawned agents)
-                    if (spawner?.hasWorker(agentName)) {
-                        const success = spawner.sendWorkerInput(agentName, msg.data);
+                    if (spawnReader?.hasWorker(agentName)) {
+                        const success = spawnReader.sendWorkerInput(agentName, msg.data);
                         if (!success) {
                             console.warn(`[dashboard] Failed to send input to agent ${agentName}`);
                         }
@@ -2438,10 +2459,17 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
             }
         });
     };
-    // Helper to broadcast channel messages to all presence clients
-    // This is used by fallback relay clients to forward messages to cloud-connected users
+    // 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);
+        // Broadcast to main WebSocket clients (local mode)
+        wss.clients.forEach((client) => {
+            if (client.readyState === WebSocket.OPEN) {
+                client.send(payload);
+            }
+        });
+        // Also broadcast to presence WebSocket clients (cloud mode)
         wssPresence.clients.forEach((client) => {
             if (client.readyState === WebSocket.OPEN) {
                 client.send(payload);
@@ -2829,8 +2857,8 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
         try {
             const availableAgents = [];
             // Get spawned agents from spawner
-            if (spawner) {
-                const activeWorkers = spawner.getActiveWorkers();
+            if (spawnReader) {
+                const activeWorkers = spawnReader.getActiveWorkers();
                 for (const worker of activeWorkers) {
                     availableAgents.push({
                         id: worker.name,
@@ -3234,6 +3262,9 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
                 if (workspaceId && data?._workspaceId && data._workspaceId !== workspaceId) {
                     return false;
                 }
+                // Filter out internal/system agents (e.g., __system__, __spawner__)
+                if (isInternalAgent(m.from))
+                    return false;
                 // Accept message if it has _isChannelMessage flag OR if it's addressed to a channel
                 return Boolean(data?._isChannelMessage) || (m.to && m.to.startsWith('#'));
             });
@@ -3960,8 +3991,8 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
         try {
             const agents = [];
             // Get metrics from spawner's active workers
-            if (spawner) {
-                const activeWorkers = spawner.getActiveWorkers();
+            if (spawnReader) {
+                const activeWorkers = spawnReader.getActiveWorkers();
                 for (const worker of activeWorkers) {
                     // Get memory and CPU usage
                     let rssBytes = 0;
@@ -4059,8 +4090,8 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
             const totalCrashes24h = 0;
             let totalAlerts24h = 0;
             // Get spawned agent count
-            if (spawner) {
-                const workers = spawner.getActiveWorkers();
+            if (spawnReader) {
+                const workers = spawnReader.getActiveWorkers();
                 agentCount = workers.length;
                 // Check for high memory usage
                 for (const worker of workers) {
@@ -4293,8 +4324,8 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
             }
             const result = messages.map(m => ({
                 id: m.id,
-                from: m.from,
-                to: m.to,
+                from: remapAgentName(m.from),
+                to: remapAgentName(m.to),
                 content: m.body,
                 timestamp: new Date(m.ts).toISOString(),
                 thread: m.thread,
@@ -4329,8 +4360,8 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
                 // Skip messages from/to internal system agents (e.g., __spawner__)
                 if (isInternalAgent(msg.from) || isInternalAgent(msg.to))
                     continue;
-                // Create normalized key (sorted participants)
-                const participants = [msg.from, msg.to].sort();
+                // Create normalized key (sorted participants, with display names)
+                const participants = [remapAgentName(msg.from), remapAgentName(msg.to)].sort();
                 const key = participants.join(':');
                 const existing = conversationMap.get(key);
                 if (existing) {
@@ -4438,19 +4469,19 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
      *   - raw: If 'true', return raw output instead of cleaned lines
      */
     app.get('/api/logs/:name', (req, res) => {
-        if (!spawner) {
+        if (!spawnReader) {
             return res.status(503).json({ error: 'Spawner not enabled' });
         }
         const { name } = req.params;
         const limit = req.query.limit ? parseInt(req.query.limit, 10) : 500;
         const raw = req.query.raw === 'true';
         // Check if worker exists
-        if (!spawner.hasWorker(name)) {
+        if (!spawnReader.hasWorker(name)) {
             return res.status(404).json({ error: `Agent ${name} not found` });
         }
         try {
             if (raw) {
-                const output = spawner.getWorkerRawOutput(name);
+                const output = spawnReader.getWorkerRawOutput(name);
                 res.json({
                     name,
                     raw: true,
@@ -4459,7 +4490,7 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
                 });
             }
             else {
-                const lines = spawner.getWorkerOutput(name, limit);
+                const lines = spawnReader.getWorkerOutput(name, limit);
                 res.json({
                     name,
                     raw: false,
@@ -4478,11 +4509,11 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
      * GET /api/logs - List all agents with available logs
      */
     app.get('/api/logs', (req, res) => {
-        if (!spawner) {
+        if (!spawnReader) {
             return res.status(503).json({ error: 'Spawner not enabled' });
         }
         try {
-            const workers = spawner.getActiveWorkers();
+            const workers = spawnReader.getActiveWorkers();
             const agents = workers.map(w => ({
                 name: w.name,
                 cli: w.cli,
@@ -4513,7 +4544,7 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
      * Body: { name: string, cli?: string, task?: string, team?: string, spawnerName?, cwd?, interactive?, shadowMode?, shadowAgent?, shadowOf?, shadowTriggers?, shadowSpeakOn? }
      */
     app.post('/api/spawn', async (req, res) => {
-        if (!spawner) {
+        if (!spawner && !useExternalSpawnManager) {
             return res.status(503).json({
                 success: false,
                 error: 'Spawner not enabled. Start dashboard with enableSpawner: true',
@@ -4527,23 +4558,56 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
             });
         }
         try {
-            const request = {
-                name,
-                cli,
-                task,
-                team: team || undefined, // Optional team name
-                spawnerName: spawnerName || undefined, // For policy enforcement
-                cwd: cwd || undefined, // Working directory
-                interactive, // Disables auto-accept for auth setup flows
-                shadowMode,
-                shadowAgent,
-                shadowOf,
-                shadowTriggers,
-                shadowSpeakOn,
-                userId: typeof userId === 'string' ? userId : undefined,
-                includeWorkflowConventions: true, // Cloud opts into ACK/DONE workflow conventions
-            };
-            const result = await spawner.spawn(request);
+            let result;
+            if (useExternalSpawnManager) {
+                // Route spawn through SDK → daemon socket → SpawnManager
+                // This ensures relay-pty binary resolution works regardless of install method
+                const client = await getRelayClient('Dashboard');
+                if (!client) {
+                    return res.status(503).json({
+                        success: false,
+                        error: 'Not connected to relay daemon',
+                    });
+                }
+                // spawnerName/userId/includeWorkflowConventions need SDK >= 2.2.0 types
+                // Cast removed once SDK is republished with these fields
+                result = await client.spawn({
+                    name,
+                    cli,
+                    task,
+                    team: team || undefined,
+                    cwd: cwd || undefined,
+                    interactive,
+                    shadowMode,
+                    shadowAgent,
+                    shadowOf,
+                    shadowTriggers,
+                    shadowSpeakOn,
+                    spawnerName: spawnerName || undefined,
+                    userId: typeof userId === 'string' ? userId : undefined,
+                    includeWorkflowConventions: true,
+                });
+            }
+            else {
+                // Fall back to local AgentSpawner (standalone mode)
+                const request = {
+                    name,
+                    cli,
+                    task,
+                    team: team || undefined,
+                    spawnerName: spawnerName || undefined,
+                    cwd: cwd || undefined,
+                    interactive,
+                    shadowMode,
+                    shadowAgent,
+                    shadowOf,
+                    shadowTriggers,
+                    shadowSpeakOn,
+                    userId: typeof userId === 'string' ? userId : undefined,
+                    includeWorkflowConventions: true,
+                };
+                result = await spawner.spawn(request);
+            }
             if (result.success) {
                 // Broadcast update to WebSocket clients
                 broadcastData().catch(() => { });
@@ -4573,7 +4637,7 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
      * Body: { cli?: string }
      */
     app.post('/api/spawn/architect', async (req, res) => {
-        if (!spawner) {
+        if (!spawner && !useExternalSpawnManager) {
             return res.status(503).json({
                 success: false,
                 error: 'Spawner not enabled. Start dashboard with enableSpawner: true',
@@ -4581,7 +4645,7 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
         }
         const { cli = 'claude' } = req.body;
         // Check if Architect already exists
-        const activeWorkers = spawner.getActiveWorkers();
+        const activeWorkers = spawnReader?.getActiveWorkers() || [];
         if (activeWorkers.some(w => w.name.toLowerCase() === 'architect')) {
             return res.status(409).json({
                 success: false,
@@ -4659,12 +4723,27 @@ Then output: \`->relay-file:all\`
 
 Start by greeting the project leads and asking for status updates.`;
         try {
-            const result = await spawner.spawn({
-                name: 'Architect',
-                cli,
-                task: architectPrompt,
-                includeWorkflowConventions: true, // Cloud opts into ACK/DONE workflow conventions
-            });
+            let result;
+            if (useExternalSpawnManager) {
+                const client = await getRelayClient('Dashboard');
+                if (!client) {
+                    return res.status(503).json({ success: false, error: 'Not connected to relay daemon' });
+                }
+                result = await client.spawn({
+                    name: 'Architect',
+                    cli,
+                    task: architectPrompt,
+                    includeWorkflowConventions: true,
+                });
+            }
+            else {
+                result = await spawner.spawn({
+                    name: 'Architect',
+                    cli,
+                    task: architectPrompt,
+                    includeWorkflowConventions: true,
+                });
+            }
             if (result.success) {
                 broadcastData().catch(() => { });
             }
@@ -4694,8 +4773,8 @@ Start by greeting the project leads and asking for status updates.`;
         // Collect agents from all available sources
         const agentsByName = new Map();
         // Source 1: Spawner's active workers (authoritative for spawned agents)
-        if (spawner) {
-            for (const worker of spawner.getActiveWorkers()) {
+        if (spawnReader) {
+            for (const worker of spawnReader.getActiveWorkers()) {
                 agentsByName.set(worker.name, {
                     name: worker.name,
                     cli: worker.cli,
@@ -4742,7 +4821,7 @@ Start by greeting the project leads and asking for status updates.`;
             agents,
             // Include source info for debugging
             sources: {
-                spawnerEnabled: !!spawner,
+                spawnerEnabled: !!spawnReader,
                 daemonAgentsFile: fs.existsSync(agentsPath),
             },
         });
@@ -4751,7 +4830,7 @@ Start by greeting the project leads and asking for status updates.`;
      * DELETE /api/spawned/:name - Release a spawned agent
      */
     app.delete('/api/spawned/:name', async (req, res) => {
-        if (!spawner) {
+        if (!spawner && !useExternalSpawnManager) {
             return res.status(503).json({
                 success: false,
                 error: 'Spawner not enabled',
@@ -4759,7 +4838,19 @@ Start by greeting the project leads and asking for status updates.`;
         }
         const { name } = req.params;
         try {
-            const released = await spawner.release(name);
+            let released;
+            if (useExternalSpawnManager) {
+                // Route release through SDK → daemon socket → SpawnManager
+                const client = await getRelayClient('Dashboard');
+                if (!client) {
+                    return res.status(503).json({ success: false, error: 'Not connected to relay daemon' });
+                }
+                const result = await client.release(name);
+                released = result.success;
+            }
+            else {
+                released = await spawner.release(name);
+            }
             if (released) {
                 broadcastData().catch(() => { });
                 // Broadcast agent_released event to activity feed
@@ -4792,7 +4883,7 @@ Start by greeting the project leads and asking for status updates.`;
      * This is useful for breaking agents out of stuck loops without terminating them.
      */
     app.post('/api/agents/by-name/:name/interrupt', (req, res) => {
-        if (!spawner) {
+        if (!spawnReader) {
             return res.status(503).json({
                 success: false,
                 error: 'Spawner not enabled',
@@ -4800,7 +4891,7 @@ Start by greeting the project leads and asking for status updates.`;
         }
         const { name } = req.params;
         // Check if agent exists
-        if (!spawner.hasWorker(name)) {
+        if (!spawnReader.hasWorker(name)) {
             return res.status(404).json({
                 success: false,
                 error: `Agent ${name} not found or not spawned`,
@@ -4809,7 +4900,7 @@ Start by greeting the project leads and asking for status updates.`;
         try {
             // Send ESC ESC sequence to interrupt the agent
             // ESC = 0x1b in hexadecimal
-            const success = spawner.sendWorkerInput(name, '\x1b\x1b');
+            const success = spawnReader.sendWorkerInput(name, '\x1b\x1b');
             if (success) {
                 console.log(`[api] Sent interrupt (ESC ESC) to agent ${name}`);
                 res.json({
@@ -5162,7 +5253,7 @@ Start by greeting the project leads and asking for status updates.`;
      */
     app.get('/api/fleet/servers', async (_req, res) => {
         const servers = [];
-        const localAgents = spawner?.getActiveWorkers() || [];
+        const localAgents = spawnReader?.getActiveWorkers() || [];
         const agentStatuses = await loadAgentStatuses();
         let hasBridgeProjects = false;
         // Check for bridge connections first
@@ -5246,7 +5337,7 @@ Start by greeting the project leads and asking for status updates.`;
      * GET /api/fleet/stats - Get aggregate fleet statistics
      */
     app.get('/api/fleet/stats', async (_req, res) => {
-        const localAgents = spawner?.getActiveWorkers() || [];
+        const localAgents = spawnReader?.getActiveWorkers() || [];
         const agentStatuses = await loadAgentStatuses();
         const totalAgents = localAgents.length;
         let onlineAgents = 0;
@@ -5551,8 +5642,9 @@ Start by greeting the project leads and asking for status updates.`;
         const listenCallback = async () => {
             console.log(`Dashboard running at http://${host || 'localhost'}:${availablePort} (build: cloud-channels-v2)`);
             console.log(`Monitoring: ${dataDir}`);
-            // Set the dashboard port on spawner so spawned agents can use the API for nested spawns
-            if (spawner) {
+            // Set the dashboard port on local spawner so spawned agents can use the API for nested spawns
+            // Not needed when using external SpawnManager (daemon handles this)
+            if (spawner && !useExternalSpawnManager) {
                 spawner.setDashboardPort(availablePort);
             }
             // Start health worker on separate thread for reliable health checks