@way_marks/server 4.0.2 → 4.2.0

package/dist/api/routes/agent-monitor.js

@@ -0,0 +1,187 @@
+"use strict";
+/**
+ * Express route handlers for the agent-monitor REST API.
+ *
+ * Mount in packages/server/src/api/server.ts:
+ *
+ *   import { createAgentMonitorRouter } from './routes/agent-monitor';
+ *   app.use('/api/agent-monitor', createAgentMonitorRouter(collector));
+ *
+ * Endpoints:
+ *   GET /api/agent-monitor/sessions          → all sessions (+ filter query params)
+ *   GET /api/agent-monitor/sessions/:id      → single session detail (with toolCalls, fileAccesses)
+ *   GET /api/agent-monitor/rate-limits       → Claude + Codex rate limits
+ *   GET /api/agent-monitor/ports             → agent ports + orphan ports
+ *   GET /api/agent-monitor/snapshot          → full snapshot (sessions + rateLimits + ports)
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createAgentMonitorRouter = createAgentMonitorRouter;
+const express_1 = require("express");
+// ─── Router factory ───────────────────────────────────────────────────────────
+/**
+ * Create an Express router for the agent-monitor endpoints.
+ *
+ * @param getSnapshot  Function that returns the latest CollectorSnapshot.
+ *                     Pass `() => collector.tick()` for on-demand collection,
+ *                     or `() => lastSnapshot` for a cached snapshot from a timer.
+ */
+function createAgentMonitorRouter(getSnapshot) {
+    const router = (0, express_1.Router)();
+    // ── GET /sessions ──────────────────────────────────────────────────────────
+    router.get('/sessions', (_req, res) => {
+        const snapshot = getSnapshot();
+        let sessions = snapshot.sessions;
+        const agent = _req.query['agent'];
+        const status = _req.query['status'];
+        if (agent && agent !== 'all') {
+            sessions = sessions.filter((s) => s.agentCli === agent);
+        }
+        if (status && status !== 'all') {
+            if (status === 'active') {
+                sessions = sessions.filter((s) => s.status === 'thinking' || s.status === 'executing');
+            }
+            else {
+                sessions = sessions.filter((s) => s.status === status);
+            }
+        }
+        res.json({
+            sessions: sessions.map(sessionSummary),
+            count: sessions.length,
+            collectedAt: snapshot.collectedAt,
+        });
+    });
+    // ── GET /sessions/:id ──────────────────────────────────────────────────────
+    router.get('/sessions/:id', (req, res) => {
+        const snapshot = getSnapshot();
+        const session = snapshot.sessions.find((s) => s.sessionId === req.params['id']);
+        if (!session) {
+            res.status(404).json({ error: 'Session not found' });
+            return;
+        }
+        // Full detail including toolCalls and fileAccesses
+        res.json({ session: sessionDetail(session), collectedAt: snapshot.collectedAt });
+    });
+    // ── GET /rate-limits ───────────────────────────────────────────────────────
+    router.get('/rate-limits', (_req, res) => {
+        const snapshot = getSnapshot();
+        res.json({
+            rateLimits: snapshot.rateLimits.map((r) => ({
+                source: r.source,
+                fiveHour: r.fiveHourPct != null ? {
+                    usedPercent: r.fiveHourPct,
+                    resetsAt: r.fiveHourResetsAt,
+                    resetsAtIso: r.fiveHourResetsAt
+                        ? new Date(r.fiveHourResetsAt * 1000).toISOString()
+                        : undefined,
+                } : null,
+                sevenDay: r.sevenDayPct != null ? {
+                    usedPercent: r.sevenDayPct,
+                    resetsAt: r.sevenDayResetsAt,
+                    resetsAtIso: r.sevenDayResetsAt
+                        ? new Date(r.sevenDayResetsAt * 1000).toISOString()
+                        : undefined,
+                } : null,
+                updatedAt: r.updatedAt,
+                updatedAtIso: r.updatedAt
+                    ? new Date(r.updatedAt * 1000).toISOString()
+                    : undefined,
+            })),
+            collectedAt: snapshot.collectedAt,
+        });
+    });
+    // ── GET /ports ─────────────────────────────────────────────────────────────
+    router.get('/ports', (_req, res) => {
+        const snapshot = getSnapshot();
+        const agentPorts = [];
+        for (const s of snapshot.sessions) {
+            for (const child of s.children) {
+                if (child.port != null) {
+                    agentPorts.push({
+                        sessionId: s.sessionId,
+                        agentCli: s.agentCli,
+                        pid: child.pid,
+                        port: child.port,
+                        command: child.command,
+                    });
+                }
+            }
+        }
+        res.json({
+            agentPorts,
+            orphanPorts: snapshot.orphanPorts,
+            collectedAt: snapshot.collectedAt,
+        });
+    });
+    // ── GET /snapshot ──────────────────────────────────────────────────────────
+    // Returns the raw `CollectorSnapshot`. Two consumers depend on this exact
+    // shape: (1) the MCP process's `fetchSnapshotFromApi()`, whose handlers walk
+    // `s.subagents.length`, `s.children`, `s.totalInputTokens`, etc.; (2) the web
+    // dashboard's `useAgentSnapshot()` hook, whose `AgentSession` TS type is the
+    // raw `collectors/types.ts` shape. Earlier versions ran sessions through
+    // `sessionSummary()` here, which collapsed `subagents` → `subagentCount` and
+    // `tokens.input` etc. — silently breaking both consumers (the web limped
+    // along on `?? 0` guards; the MCP crashed on the missing arrays). The slim
+    // summary shape lives on `/sessions` for the CLI's table view.
+    router.get('/snapshot', (_req, res) => {
+        const snapshot = getSnapshot();
+        res.json({
+            sessions: snapshot.sessions,
+            rateLimits: snapshot.rateLimits,
+            orphanPorts: snapshot.orphanPorts,
+            collectedAt: snapshot.collectedAt,
+        });
+    });
+    return router;
+}
+function sessionSummary(s) {
+    return {
+        agentCli: s.agentCli,
+        pid: s.pid,
+        sessionId: s.sessionId,
+        cwd: s.cwd,
+        projectName: s.projectName,
+        startedAt: s.startedAt,
+        startedAtIso: new Date(s.startedAt).toISOString(),
+        status: s.status,
+        model: s.model,
+        effort: s.effort || undefined,
+        contextPercent: Math.round(s.contextPercent * 10) / 10,
+        contextWindow: s.contextWindow,
+        tokens: {
+            input: s.totalInputTokens,
+            output: s.totalOutputTokens,
+            cacheRead: s.totalCacheRead,
+            cacheCreate: s.totalCacheCreate,
+            total: s.totalInputTokens + s.totalOutputTokens + s.totalCacheRead + s.totalCacheCreate,
+        },
+        turnCount: s.turnCount,
+        currentTasks: s.currentTasks,
+        memMb: s.memMb,
+        version: s.version || undefined,
+        git: {
+            branch: s.gitBranch || undefined,
+            added: s.gitAdded,
+            modified: s.gitModified,
+        },
+        initialPrompt: s.initialPrompt || undefined,
+        subagentCount: s.subagents.length,
+        childCount: s.children.length,
+    };
+}
+function sessionDetail(s) {
+    return {
+        ...sessionSummary(s),
+        subagents: s.subagents,
+        children: s.children,
+        toolCalls: s.toolCalls,
+        fileAccesses: s.fileAccesses,
+        tokenHistory: s.tokenHistory,
+        contextHistory: s.contextHistory,
+        compactionCount: s.compactionCount,
+        memFileCount: s.memFileCount,
+        memLineCount: s.memLineCount,
+        pendingSinceMs: s.pendingSinceMs,
+        thinkingSinceMs: s.thinkingSinceMs,
+        firstAssistantText: s.firstAssistantText || undefined,
+    };
+}

package/dist/api/server.js

@@ -47,6 +47,8 @@ const handler_1 = require("../approvals/handler");
 const manager_2 = require("../approval/manager");
 const manager_3 = require("../escalation/manager");
 const events_1 = require("./events");
+const multi_collector_1 = require("../collectors/multi-collector");
+const agent_monitor_1 = require("./routes/agent-monitor");
 // Import registry for Phase 2 hub navigation
 const registryPath = path.join(process.env.HOME || process.env.USERPROFILE || '', '.waymark', 'registry.json');
 function getRegistryProjects() {
@@ -161,6 +163,17 @@ else {
     console.warn('[waymark] ui-dist/ not found — dashboard will return a setup banner. ' +
         'Run `npm run build -w @way_marks/web` to build the dashboard.');
 }
+// Agent monitor — MultiCollector on a 2 s timer (mirrors abtop polling interval).
+// .unref() so the timer doesn't keep the event loop alive on SIGTERM; the API
+// process should exit cleanly via the http server close.
+const agentCollector = new multi_collector_1.MultiCollector();
+let latestAgentSnapshot = agentCollector.tick();
+const agentCollectorTimer = setInterval(() => {
+    latestAgentSnapshot = agentCollector.tick();
+}, 2000);
+agentCollectorTimer.unref();
+// Mount agent-monitor REST API
+app.use('/api/agent-monitor', (0, agent_monitor_1.createAgentMonitorRouter)(() => latestAgentSnapshot));
 // GET /api/events — Server-Sent Events stream for live UI updates
 app.get('/api/events', (req, res) => {
     const detach = (0, events_1.attachSubscriber)(res);

package/dist/approvals/handler.js

@@ -50,12 +50,23 @@ async function approvePendingAction(actionId, approvedBy = 'ui') {
     let after_snapshot;
     if (action.tool_name === 'write_file') {
         const { path: filePath, content } = JSON.parse(action.input_payload);
-        const resolvedPath = path.resolve(filePath);
+        // Resolve against WAYMARK_PROJECT_ROOT, not process.cwd(). The policy engine
+        // (loadConfig in policies/engine.ts) uses the same env var; using cwd here
+        // would cause a relative target_path to resolve to a different absolute
+        // path than the one the policy was originally evaluated against — which
+        // would then re-trigger a policy block on approval.
+        const projectRoot = process.env.WAYMARK_PROJECT_ROOT || process.cwd();
+        const resolvedPath = path.isAbsolute(filePath)
+            ? path.resolve(filePath)
+            : path.resolve(projectRoot, filePath);
         // Re-check current policies — they may have changed since the action was queued
         const currentConfig = (0, engine_1.loadConfig)();
         const recheck = (0, engine_1.checkFileAction)(resolvedPath, 'write', currentConfig);
         if (recheck.decision === 'block') {
-            return { success: false, error: `Approval blocked: policy changed (${recheck.reason})` };
+            return {
+                success: false,
+                error: `Approval blocked: policy changed since action was recorded (${recheck.reason}). Resolved path: ${resolvedPath}`,
+            };
         }
         fs.mkdirSync(path.dirname(resolvedPath), { recursive: true });
         fs.writeFileSync(resolvedPath, content, 'utf8');