@agent-relay/dashboard-server 2.0.66-beta.1 → 2.0.67

package/dist/server.js

@@ -5,7 +5,7 @@ import path from 'path';
 import fs from 'fs';
 import os from 'os';
 import crypto from 'crypto';
-import { exec } from 'child_process';
+import { exec, execFile } from 'child_process';
 import { fileURLToPath } from 'url';
 import { createStorageAdapter } from '@agent-relay/storage/adapter';
 import { RelayClient } from '@agent-relay/sdk';
@@ -642,6 +642,9 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
         clearInterval(bridgePingInterval);
     });
     const onlineUsers = new Map();
+    // Track cwd per spawned agent (name -> cwd)
+    // This is set when /api/spawn is called and included in /api/spawned responses
+    const agentCwdMap = new Map();
     // Validation helpers for presence
     const isValidUsername = (username) => {
         if (typeof username !== 'string')
@@ -1834,7 +1837,7 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
                 // Ignore errors reading processing state - it's optional
             }
         }
-        // Mark spawned agents with isSpawned flag, team, and model
+        // Mark spawned agents with isSpawned flag, team, model, and cwd
         if (spawnReader) {
             const activeWorkers = spawnReader.getActiveWorkers();
             for (const worker of activeWorkers) {
@@ -1844,6 +1847,12 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
                     if (worker.team) {
                         agent.team = worker.team;
                     }
+                    // Inject cwd from agentCwdMap (set during /api/spawn) or from worker info
+                    // (set by SpawnManager for relay-protocol spawns that bypass /api/spawn)
+                    const workerCwd = agentCwdMap.get(worker.name) || worker.cwd;
+                    if (workerCwd) {
+                        agent.cwd = workerCwd;
+                    }
                     // Extract model from spawn command (e.g., "codex --model gpt-5.2-codex" → "gpt-5.2-codex")
                     if (worker.cli) {
                         // Support both `--model foo` and `--model=foo`
@@ -1855,6 +1864,14 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
                 }
             }
         }
+        // Inject cwd from agentCwdMap for agents not in spawner's active workers
+        // (e.g., agents that connected before spawner tracked them, or after restarts)
+        for (const [name, cwd] of agentCwdMap) {
+            const agent = agentsMap.get(name);
+            if (agent && !agent.cwd) {
+                agent.cwd = cwd;
+            }
+        }
         // Also check workers.json for externally-spawned workers (e.g., from agentswarm)
         // These workers have log files but weren't spawned by the dashboard's spawner
         const workersJsonPath = path.join(teamDir, 'workers.json');
@@ -1872,6 +1889,21 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
                 // Ignore errors reading workers.json
             }
         }
+        // Mark relay-protocol spawned agents (spawned by other agents, not via dashboard /api/spawn)
+        // These agents have log files in the team directory but aren't tracked by agentCwdMap
+        if (spawnReader) {
+            for (const [name, agent] of agentsMap) {
+                if (agent.isSpawned)
+                    continue;
+                if (onlineUsers.has(name) || name === 'Dashboard')
+                    continue;
+                // Check if there's a log file for this agent (indicates it was spawned)
+                const logPath = path.join(teamDir, `${name}.log`);
+                if (fs.existsSync(logPath)) {
+                    agent.isSpawned = true;
+                }
+            }
+        }
         // Set team from teams.json for agents that don't have a team yet
         // This ensures agents defined in teams.json are associated with their team
         // even if they weren't spawned via auto-spawn
@@ -4167,26 +4199,9 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
                     });
                 }
             }
-            // Also check agents.json for registered agents that may not be spawned
-            const agentsPath = path.join(teamDir, 'agents.json');
-            if (fs.existsSync(agentsPath)) {
-                const data = JSON.parse(fs.readFileSync(agentsPath, 'utf-8'));
-                const registeredAgents = data.agents || [];
-                for (const agent of registeredAgents) {
-                    if (!agents.find(a => a.name === agent.name)) {
-                        // Check if recently active (within 30 seconds)
-                        const lastSeen = agent.lastSeen ? new Date(agent.lastSeen).getTime() : 0;
-                        const isActive = Date.now() - lastSeen < 30000;
-                        if (isActive) {
-                            agents.push({
-                                name: agent.name,
-                                status: 'active',
-                                alertLevel: 'normal',
-                            });
-                        }
-                    }
-                }
-            }
+            // Note: We only show spawned agents with actual PIDs in memory metrics.
+            // Human users and non-process entries from agents.json are excluded since
+            // they don't have memory usage to track.
             res.json({
                 agents,
                 system: {
@@ -4664,6 +4679,20 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
         const online = isAgentOnline(name);
         res.json({ name, online });
     });
+    /**
+     * PUT /api/agents/:name/cwd - Register an agent's working directory
+     * Used by relay-pty-orchestrator after daemon socket spawns (which bypass /api/spawn).
+     */
+    app.put('/api/agents/:name/cwd', (req, res) => {
+        const { name } = req.params;
+        const { cwd } = req.body || {};
+        if (!cwd || typeof cwd !== 'string') {
+            return res.status(400).json({ error: 'Missing required field: cwd' });
+        }
+        agentCwdMap.set(name, cwd);
+        broadcastData().catch(() => { });
+        res.json({ success: true, name, cwd });
+    });
     // ===== Agent Spawn API =====
     /**
      * POST /api/spawn - Spawn a new agent
@@ -4683,6 +4712,8 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
                 error: 'Missing required field: name',
             });
         }
+        // Inherit spawner's cwd if no explicit cwd provided (for nested/agent-to-agent spawns)
+        const effectiveCwd = cwd || (spawnerName ? agentCwdMap.get(spawnerName) : undefined);
         try {
             let result;
             if (useExternalSpawnManager) {
@@ -4702,7 +4733,7 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
                     cli,
                     task,
                     team: team || undefined,
-                    cwd: cwd || undefined,
+                    cwd: effectiveCwd || undefined,
                     interactive,
                     shadowMode,
                     shadowAgent,
@@ -4722,7 +4753,7 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
                     task,
                     team: team || undefined,
                     spawnerName: spawnerName || undefined,
-                    cwd: cwd || undefined,
+                    cwd: effectiveCwd || undefined,
                     interactive,
                     shadowMode,
                     shadowAgent,
@@ -4735,6 +4766,10 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
                 result = await spawner.spawn(request);
             }
             if (result.success) {
+                // Track cwd for this agent so /api/spawned can return it
+                if (effectiveCwd) {
+                    agentCwdMap.set(name, effectiveCwd);
+                }
                 // Broadcast update to WebSocket clients
                 broadcastData().catch(() => { });
                 // Broadcast agent_spawned event to activity feed
@@ -4758,6 +4793,53 @@ export async function startDashboard(portOrOptions, dataDirArg, teamDirArg, dbPa
             });
         }
     });
+    /**
+     * POST /api/repos/clone - Clone a repo into the workspace directory
+     * Body: { fullName: "Owner/RepoName" }
+     * Used by cloud API to hot-clone repos added to a running workspace.
+     */
+    app.post('/api/repos/clone', async (req, res) => {
+        const { fullName } = req.body;
+        if (!fullName || typeof fullName !== 'string' || !fullName.includes('/')) {
+            return res.status(400).json({ success: false, error: 'fullName is required (e.g., "Owner/RepoName")' });
+        }
+        // Validate format: "Owner/RepoName" with safe characters only
+        if (!/^[a-zA-Z0-9._-]+\/[a-zA-Z0-9._-]+$/.test(fullName)) {
+            return res.status(400).json({ success: false, error: 'Invalid repository name format' });
+        }
+        const repoName = fullName.split('/').pop();
+        const workspaceDir = process.env.WORKSPACE_DIR || path.dirname(projectRoot || dataDir);
+        const targetDir = path.join(workspaceDir, repoName);
+        // Idempotent: skip if already cloned
+        if (fs.existsSync(targetDir)) {
+            return res.json({ success: true, message: 'Already cloned', path: targetDir });
+        }
+        // Use plain HTTPS URL - git credential helper handles authentication.
+        // The credential helper (git-credential-relay) fetches per-repo tokens from
+        // the cloud API, which correctly resolves installation tokens for private repos.
+        const cloneUrl = `https://github.com/${fullName}.git`;
+        try {
+            // Use execFile to avoid shell injection
+            await new Promise((resolve, reject) => {
+                execFile('git', ['clone', cloneUrl, targetDir], { timeout: 120000 }, (error, _stdout, stderr) => {
+                    if (error) {
+                        reject(new Error(stderr || error.message));
+                    }
+                    else {
+                        resolve();
+                    }
+                });
+            });
+            // Mark directory as safe for git
+            execFile('git', ['config', '--global', '--add', 'safe.directory', targetDir], () => { });
+            res.json({ success: true, path: targetDir });
+        }
+        catch (err) {
+            const safeMessage = (err.message || 'Clone failed');
+            console.error('[api/repos/clone] Clone failed:', safeMessage);
+            res.status(500).json({ success: false, error: safeMessage });
+        }
+    });
     /**
      * POST /api/spawn/architect - Spawn an Architect agent for bridge mode
      * Body: { cli?: string }
@@ -4908,6 +4990,7 @@ Start by greeting the project leads and asking for status updates.`;
                     spawnedAt: worker.spawnedAt,
                     task: worker.task,
                     team: worker.team,
+                    cwd: agentCwdMap.get(worker.name) || worker.cwd,
                     source: 'spawner',
                 });
             }
@@ -4978,6 +5061,7 @@ Start by greeting the project leads and asking for status updates.`;
                 released = await spawner.release(name);
             }
             if (released) {
+                agentCwdMap.delete(name);
                 broadcastData().catch(() => { });
                 // Broadcast agent_released event to activity feed
                 broadcastPresence({