From 3e27610e413aa87ba6c462ca13424ce6f94d8ed0 Mon Sep 17 00:00:00 2001 From: Lucas Dow Date: Wed, 7 Oct 2026 22:25:40 +0200 Subject: [PATCH 1/2] feat(api): return lastEventAt on active sessions /api/sessions/active now carries each session's latest event time (clamped to now, since event times come from the client), for the topology's "Your turn" / "Inactive" states. It is timing only, so it joins the activity-view allowlist. Co-Authored-By: Claude Opus 5.5 DevScope-Session: 7ed92b1f-21e5-4a3b-b933-e2ce8af3a7ee --- packages/backend/src/db/queries.ts | 6 +++-- .../src/routes/__tests__/sessions.test.ts | 22 +++++++++++++++++++ packages/backend/src/routes/sessions.ts | 1 + packages/backend/src/services/visibility.ts | 2 +- packages/shared/src/models.ts | 2 ++ 5 files changed, 30 insertions(+), 3 deletions(-) diff --git a/packages/backend/src/db/queries.ts b/packages/backend/src/db/queries.ts index 53b0ff9..0a9e59d 100644 --- a/packages/backend/src/db/queries.ts +++ b/packages/backend/src/db/queries.ts @@ -136,14 +136,16 @@ export async function getActiveAgents(sql: SQL) { export async function getActiveSessions(sql: SQL, developerIds?: string[]) { if (developerIds !== undefined) { return await sql` - SELECT s.*, d.name as developer_name, d.email as developer_email, d.share_details as owner_share_details + SELECT s.*, d.name as developer_name, d.email as developer_email, d.share_details as owner_share_details, + LEAST((SELECT MAX(e.created_at) FROM events e WHERE e.session_id = s.id), NOW()) as last_event_at FROM sessions s JOIN developers d ON s.developer_id = d.id WHERE s.status = 'active' AND s.developer_id IN (${inList(developerIds)}) ORDER BY s.started_at DESC`; } return await sql` - SELECT s.*, d.name as developer_name, d.email as developer_email, d.share_details as owner_share_details + SELECT s.*, d.name as developer_name, d.email as developer_email, d.share_details as owner_share_details, + LEAST((SELECT MAX(e.created_at) FROM events e WHERE e.session_id = s.id), NOW()) as last_event_at FROM sessions s JOIN developers d ON s.developer_id = d.id WHERE s.status = 'active' diff --git a/packages/backend/src/routes/__tests__/sessions.test.ts b/packages/backend/src/routes/__tests__/sessions.test.ts index 87dbd6d..2ec3b5d 100644 --- a/packages/backend/src/routes/__tests__/sessions.test.ts +++ b/packages/backend/src/routes/__tests__/sessions.test.ts @@ -142,6 +142,7 @@ describe("GET /sessions", () => { projectName: "my-project", startedAt: "2026-03-01T10:00:00Z", endedAt: null, + lastEventAt: null, status: "active", permissionMode: "default", privacyMode: "standard", @@ -282,6 +283,27 @@ describe("GET /sessions/active", () => { expect(s2.activeAgents[0].agentId).toBe("agent-3"); }); + test("returns lastEventAt, also for a teammate's activity-only session", async () => { + const own = makeSessionRow({ id: "sess-1", last_event_at: "2026-03-01T10:09:00Z" }); + const teammate = makeSessionRow({ + id: "sess-2", + developer_id: "dev-bbb", + owner_share_details: false, + last_event_at: "2026-03-01T10:08:00Z", + }); + mockGetActiveSessions.mockImplementation(() => Promise.resolve([own, teammate])); + mockGetActiveAgents.mockImplementation(() => Promise.resolve([])); + mockGetAllDeveloperIdsForUser.mockImplementation(() => Promise.resolve(["dev-aaa"])); + + const app = buildApp({ orgDeveloperIds: ["dev-aaa", "dev-bbb"], user: { id: "user-1" } }); + const body = await (await app.request("/sessions/active")).json(); + + expect(body.find((s: any) => s.id === "sess-1").lastEventAt).toBe("2026-03-01T10:09:00Z"); + const s2 = body.find((s: any) => s.id === "sess-2"); + expect(s2.lastEventAt).toBe("2026-03-01T10:08:00Z"); + expect(s2.projectName).toBeNull(); + }); + test("passes orgDeveloperIds to getActiveSessions", async () => { const devIds = ["dev-aaa"]; const app = buildApp({ orgDeveloperIds: devIds }); diff --git a/packages/backend/src/routes/sessions.ts b/packages/backend/src/routes/sessions.ts index 387328e..2afa8f7 100644 --- a/packages/backend/src/routes/sessions.ts +++ b/packages/backend/src/routes/sessions.ts @@ -20,6 +20,7 @@ function mapSession(row: any) { projectName: row.project_name ?? null, startedAt: row.started_at, endedAt: row.ended_at, + lastEventAt: row.last_event_at ?? null, status: row.status, permissionMode: row.permission_mode ?? null, privacyMode: row.privacy_mode ?? null, diff --git a/packages/backend/src/services/visibility.ts b/packages/backend/src/services/visibility.ts index a3e15d4..e1c1e60 100644 --- a/packages/backend/src/services/visibility.ts +++ b/packages/backend/src/services/visibility.ts @@ -45,7 +45,7 @@ export function visibilityForRow(row: any, viewerDevIds: string[]): Visibility { // column added later stays hidden until someone decides it is safe to show. const ACTIVITY_SESSION_KEYS = [ "id", "developer_id", "developer_name", "developer_email", - "started_at", "ended_at", "status", "event_count", "context_clear_count", + "started_at", "ended_at", "last_event_at", "status", "event_count", "context_clear_count", ] as const; const ACTIVITY_EVENT_KEYS = [ diff --git a/packages/shared/src/models.ts b/packages/shared/src/models.ts index 473225a..03d1326 100644 --- a/packages/shared/src/models.ts +++ b/packages/shared/src/models.ts @@ -22,6 +22,8 @@ export interface Session { projectName: string | null; startedAt: string; endedAt: string | null; + /** Time of the session's latest event; only set by /api/sessions/active. */ + lastEventAt?: string | null; status: "active" | "ended"; permissionMode: string | null; privacyMode: PrivacyMode; From f1cbe837a8c3a0b30fc8e58b2ef89cb814614ddb Mon Sep 17 00:00:00 2001 From: Lucas Dow Date: Wed, 7 Oct 2026 22:25:40 +0200 Subject: [PATCH 2/2] feat(dashboard): clearer topology states and collapsed finished subagents - "Idle" becomes "Your turn"; a session with no events for 2 min turns a dimmed "Inactive", and cards show "active Xm ago" - developer node counts active and inactive sessions; edges animate only while a session works - finished subagents collapse into one "N subagents done" card that stays until the session ends - per-session latest event survives the 200-event window, stopped agents keep their stop time, agent entries are deduplicated - layout and node types move to shared modules used by the landing demo Co-Authored-By: Claude Opus 5.5 DevScope-Session: 7ed92b1f-21e5-4a3b-b933-e2ce8af3a7ee --- CHANGELOG.md | 9 + .../src/components/flow/AgentNode.tsx | 29 +- .../src/components/flow/AgentSummaryNode.tsx | 28 ++ .../src/components/flow/DeveloperNode.tsx | 21 +- .../src/components/flow/FlowView.tsx | 13 +- .../src/components/flow/SessionNode.tsx | 15 +- .../src/components/flow/flowTypes.ts | 17 +- .../dashboard/src/components/flow/layout.ts | 54 ++++ .../src/components/flow/nodeTypes.ts | 12 + .../src/components/flow/useFlowLayout.ts | 247 +++++++++++------- .../landing/TopologyDemoSection.tsx | 10 +- .../components/landing/demoTopologyData.ts | 77 +++--- packages/dashboard/src/hooks/useNow.ts | 23 ++ .../dashboard/src/stores/activityStore.ts | 54 +++- 14 files changed, 404 insertions(+), 205 deletions(-) create mode 100644 packages/dashboard/src/components/flow/AgentSummaryNode.tsx create mode 100644 packages/dashboard/src/components/flow/layout.ts create mode 100644 packages/dashboard/src/components/flow/nodeTypes.ts create mode 100644 packages/dashboard/src/hooks/useNow.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index 600987c..21394f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). ### Added +- **Topology shows what each session is actually doing.** A session whose turn + finished reads "Your turn" instead of "Idle", turns a dimmed "Inactive" after + 2 minutes without events, and shows "active 3m ago" instead of its start time. + The developer node counts active and inactive sessions separately, and an + edge animates only while its session is working. Finished subagents collapse + into one "✓ N subagents done" card per session instead of vanishing after 30 s. + `/api/sessions/active` returns each session's `lastEventAt` for this (timing + only, so it is also visible in the `activity` view). + - **Louder server voice.** `/api/ai/voice-audio` takes an optional `volume` (Kokoro `volume_multiplier`, 0.5-3); the default `TTS_VOLUME=2` doubles the loudness without clipping (Kokoro keeps peaks limited). diff --git a/packages/dashboard/src/components/flow/AgentNode.tsx b/packages/dashboard/src/components/flow/AgentNode.tsx index f32d633..3722c8f 100644 --- a/packages/dashboard/src/components/flow/AgentNode.tsx +++ b/packages/dashboard/src/components/flow/AgentNode.tsx @@ -42,7 +42,7 @@ const EVENT_COLORS: Record = { }; export function AgentNode({ data }: NodeProps & { data: AgentNodeData }) { - const { agentId, agentType, startedAt, latestEvent, isToolRunning, currentToolName, isStopped } = data; + const { agentId, agentType, startedAt, latestEvent, isToolRunning, currentToolName } = data; const debounced = useDebouncedToolState(isToolRunning, currentToolName, latestEvent); @@ -61,11 +61,9 @@ export function AgentNode({ data }: NodeProps & { data: AgentNodeData }) { } } - const borderColor = isStopped - ? "rgba(34, 197, 94, 0.4)" // green-500/40 - : debounced.isToolRunning - ? "rgba(245, 158, 11, 0.4)" // amber-500/40 - : "rgba(168, 85, 247, 0.4)"; // purple-500/40 + const borderColor = debounced.isToolRunning + ? "rgba(245, 158, 11, 0.4)" // amber-500/40 + : "rgba(168, 85, 247, 0.4)"; // purple-500/40 return ( - +
- {isStopped ? ( - - ) : ( - - )} - + + {agentType}
@@ -104,7 +98,6 @@ export function AgentNode({ data }: NodeProps & { data: AgentNodeData }) { displayEvent={debounced.displayEvent} /> -
); } diff --git a/packages/dashboard/src/components/flow/AgentSummaryNode.tsx b/packages/dashboard/src/components/flow/AgentSummaryNode.tsx new file mode 100644 index 0000000..d451cdc --- /dev/null +++ b/packages/dashboard/src/components/flow/AgentSummaryNode.tsx @@ -0,0 +1,28 @@ +import { Handle, Position, type NodeProps } from "@xyflow/react"; +import { motion } from "motion/react"; +import { Check } from "lucide-react"; +import type { AgentSummaryNodeData } from "./flowTypes"; + +export function AgentSummaryNode({ data }: NodeProps & { data: AgentSummaryNodeData }) { + const { total, types } = data; + + return ( + + + +
+ + {total} subagent{total !== 1 ? "s" : ""} done +
+
+ {types.map((t) => (t.count > 1 ? `${t.agentType} ×${t.count}` : t.agentType)).join(" · ")} +
+
+ ); +} diff --git a/packages/dashboard/src/components/flow/DeveloperNode.tsx b/packages/dashboard/src/components/flow/DeveloperNode.tsx index ef74932..47cf873 100644 --- a/packages/dashboard/src/components/flow/DeveloperNode.tsx +++ b/packages/dashboard/src/components/flow/DeveloperNode.tsx @@ -12,8 +12,8 @@ function getInitials(name: string): string { } export function DeveloperNode({ data }: NodeProps & { data: DeveloperNodeData }) { - const { developer, sessionCount } = data; - const isActive = sessionCount > 0; + const { developer, activeCount, inactiveCount } = data; + const isActive = activeCount > 0; const borderColor = isActive ? "rgba(16, 185, 129, 0.6)" // emerald-500/60 @@ -43,11 +43,18 @@ export function DeveloperNode({ data }: NodeProps & { data: DeveloperNodeData }) - {sessionCount > 0 && ( -
- - {sessionCount} active session{sessionCount !== 1 ? "s" : ""} - + {(activeCount > 0 || inactiveCount > 0) && ( +
+ {activeCount > 0 && ( + + {activeCount} active + + )} + {inactiveCount > 0 && ( + + {inactiveCount} inactive + + )}
)} diff --git a/packages/dashboard/src/components/flow/FlowView.tsx b/packages/dashboard/src/components/flow/FlowView.tsx index 8bdd5c6..15c3ba5 100644 --- a/packages/dashboard/src/components/flow/FlowView.tsx +++ b/packages/dashboard/src/components/flow/FlowView.tsx @@ -6,18 +6,10 @@ import { MiniMap, } from "@xyflow/react"; import "@xyflow/react/dist/style.css"; -import { DeveloperNode } from "./DeveloperNode"; -import { SessionNode } from "./SessionNode"; -import { AgentNode } from "./AgentNode"; +import { nodeTypes } from "./nodeTypes"; import { useFlowLayout } from "./useFlowLayout"; import { useActivityStore } from "@/stores/activityStore"; -const nodeTypes = { - developer: DeveloperNode, - session: SessionNode, - agent: AgentNode, -}; - class FlowErrorBoundary extends Component< { children: ReactNode }, { hasError: boolean } @@ -55,7 +47,7 @@ export function FlowView() { const connected = useActivityStore((s) => s.connected); const cleanupStale = useActivityStore((s) => s.cleanupStale); - // Periodically remove ended sessions and stopped agents after grace period + // Periodically remove ended sessions after a grace period, with their finished agents useEffect(() => { const id = setInterval(cleanupStale, CLEANUP_INTERVAL_MS); return () => clearInterval(id); @@ -97,6 +89,7 @@ export function FlowView() { nodeColor={(node) => { if (node.type === "developer") return "#10b981"; if (node.type === "agent") return "#a855f7"; + if (node.type === "agentSummary") return "#374151"; return "#6b7280"; }} maskColor="rgba(0, 0, 0, 0.7)" diff --git a/packages/dashboard/src/components/flow/SessionNode.tsx b/packages/dashboard/src/components/flow/SessionNode.tsx index 3f53495..dc05d31 100644 --- a/packages/dashboard/src/components/flow/SessionNode.tsx +++ b/packages/dashboard/src/components/flow/SessionNode.tsx @@ -89,11 +89,17 @@ const STATE_CONFIG: Record = { }; export function SessionNode({ data }: NodeProps & { data: SessionNodeData }) { - const { session, developerName, latestEvent, isToolRunning, currentToolName, activityState } = data; - const startedAt = session.startedAt ?? ""; + const { session, developerName, latestEvent, isToolRunning, currentToolName, activityState, lastActivityAt } = data; const isDangerousMode = session.permissionMode === "dangerously-skip-permissions"; const isRedactedMode = session.privacyMode === "private"; @@ -148,7 +153,7 @@ export function SessionNode({ data }: NodeProps & { data: SessionNodeData }) { { navigate(`/dashboard/sessions/${session.id}`); }} initial={{ opacity: 0, y: 12 }} - animate={{ opacity: 1, y: 0, borderColor: stateConfig.borderColor }} + animate={{ opacity: displayState === "inactive" ? 0.55 : 1, y: 0, borderColor: stateConfig.borderColor }} transition={{ type: "spring", stiffness: 500, damping: 35 }} className="rounded-xl border bg-gray-900 px-4 py-3 shadow-lg cursor-pointer hover:brightness-110" style={{ width: 280, borderWidth: 1 }} @@ -194,7 +199,7 @@ export function SessionNode({ data }: NodeProps & { data: SessionNodeData }) {
- {startedAt ? timeAgo(startedAt) : ""} + active {timeAgo(lastActivityAt)}
({})); + g.setGraph({ rankdir: "TB", nodesep: 40, ranksep: 80 }); + + for (const node of nodes) { + const { width, height } = getNodeDimensions(node.type ?? "session"); + g.setNode(node.id, { width, height }); + } + + for (const edge of edges) { + g.setEdge(edge.source, edge.target); + } + + dagre.layout(g); + + const layoutedNodes = nodes.map((node) => { + const pos = g.node(node.id); + const { width, height } = getNodeDimensions(node.type ?? "session"); + return { + ...node, + position: { x: pos.x - width / 2, y: pos.y - height / 2 }, + }; + }); + + return { nodes: layoutedNodes, edges }; +} diff --git a/packages/dashboard/src/components/flow/nodeTypes.ts b/packages/dashboard/src/components/flow/nodeTypes.ts new file mode 100644 index 0000000..3976d17 --- /dev/null +++ b/packages/dashboard/src/components/flow/nodeTypes.ts @@ -0,0 +1,12 @@ +import { DeveloperNode } from "./DeveloperNode"; +import { SessionNode } from "./SessionNode"; +import { AgentNode } from "./AgentNode"; +import { AgentSummaryNode } from "./AgentSummaryNode"; + +/** Node components of the topology graph, shared by the dashboard and the landing demo. */ +export const nodeTypes = { + developer: DeveloperNode, + session: SessionNode, + agent: AgentNode, + agentSummary: AgentSummaryNode, +}; diff --git a/packages/dashboard/src/components/flow/useFlowLayout.ts b/packages/dashboard/src/components/flow/useFlowLayout.ts index 36eace5..803fb64 100644 --- a/packages/dashboard/src/components/flow/useFlowLayout.ts +++ b/packages/dashboard/src/components/flow/useFlowLayout.ts @@ -1,61 +1,27 @@ import { useMemo } from "react"; import { useShallow } from "zustand/shallow"; -import dagre from "@dagrejs/dagre"; import type { Node, Edge } from "@xyflow/react"; import { useActivityStore, type ActiveAgent } from "../../stores/activityStore"; -import type { DeveloperNodeData, SessionNodeData, AgentNodeData, SessionActivityState } from "./flowTypes"; +import type { + DeveloperNodeData, + SessionNodeData, + AgentNodeData, + AgentSummaryNodeData, + SessionActivityState, +} from "./flowTypes"; import type { FeedEvent, ToolEventPayload, AgentEventPayload } from "@devscope/shared"; +import { useNow } from "@/hooks/useNow"; +import { parseUTC } from "@/lib/utils"; +import { getLayoutedElements } from "./layout"; -const NODE_WIDTH_DEVELOPER = 200; -const NODE_HEIGHT_DEVELOPER = 90; -const NODE_WIDTH_SESSION = 280; -const NODE_HEIGHT_SESSION = 160; -const NODE_WIDTH_AGENT = 240; -const NODE_HEIGHT_AGENT = 110; +/** A session whose turn has ended goes inactive after this long without events. */ +const INACTIVE_AFTER_MS = 2 * 60_000; +const NOW_REFRESH_MS = 10_000; -const TOOL_EVENT_TYPES = new Set(["tool.start", "tool.complete", "tool.fail"]); - -function getNodeDimensions(type: string): { width: number; height: number } { - switch (type) { - case "developer": - return { width: NODE_WIDTH_DEVELOPER, height: NODE_HEIGHT_DEVELOPER }; - case "agent": - return { width: NODE_WIDTH_AGENT, height: NODE_HEIGHT_AGENT }; - default: - return { width: NODE_WIDTH_SESSION, height: NODE_HEIGHT_SESSION }; - } -} - -function getLayoutedElements( - nodes: Node[], - edges: Edge[], -): { nodes: Node[]; edges: Edge[] } { - const g = new dagre.graphlib.Graph(); - g.setDefaultEdgeLabel(() => ({})); - g.setGraph({ rankdir: "TB", nodesep: 40, ranksep: 80 }); - - for (const node of nodes) { - const { width, height } = getNodeDimensions(node.type ?? "session"); - g.setNode(node.id, { width, height }); - } - - for (const edge of edges) { - g.setEdge(edge.source, edge.target); - } +/** States in which the session is doing work, so its edge animates. */ +const WORKING_STATES = new Set(["running", "thinking", "compacting"]); - dagre.layout(g); - - const layoutedNodes = nodes.map((node) => { - const pos = g.node(node.id); - const { width, height } = getNodeDimensions(node.type ?? "session"); - return { - ...node, - position: { x: pos.x - width / 2, y: pos.y - height / 2 }, - }; - }); - - return { nodes: layoutedNodes, edges }; -} +const TOOL_EVENT_TYPES = new Set(["tool.start", "tool.complete", "tool.fail"]); /** * Partition tool events between the session and its active agents. @@ -64,7 +30,7 @@ function getLayoutedElements( */ function attributeEventsToAgents( sessionEvents: FeedEvent[], - sessionAgents: ActiveAgent[], + sessionAgents: (ActiveAgent & { stoppedAt?: number })[], allEvents: FeedEvent[], ): { sessionEvents: FeedEvent[]; agentEvents: Map } { const agentEvents = new Map(); @@ -86,7 +52,8 @@ function attributeEventsToAgents( return { agentId: agent.agentId, start: new Date(agent.startedAt).getTime(), - stop: stopEvent ? new Date(stopEvent.timestamp).getTime() : Infinity, + // The stop event may have left the events window; fall back to when we saw it stop. + stop: stopEvent ? new Date(stopEvent.timestamp).getTime() : agent.stoppedAt ?? Infinity, }; }); @@ -130,11 +97,7 @@ function attributeEventsToAgents( return { sessionEvents: remaining, agentEvents }; } -function deriveSessionState( - session: { status: string }, - latestEvent: FeedEvent | null, -): SessionActivityState { - if (session.status === "ended") return "ended"; +function stateFromLatestEvent(latestEvent: FeedEvent | null): SessionActivityState { if (!latestEvent) return "idle"; switch (latestEvent.eventType) { @@ -151,31 +114,65 @@ function deriveSessionState( case "agent.start": case "agent.stop": return "thinking"; - case "response.complete": - case "session.start": - case "notification": - case "task.completed": - case "config.change": - case "worktree.create": - case "worktree.remove": - return "idle"; default: return "idle"; } } +function deriveSessionState( + session: { status: string }, + latestEvent: FeedEvent | null, + lastActivityAt: string, + now: number, +): SessionActivityState { + if (session.status === "ended") return "ended"; + const state = stateFromLatestEvent(latestEvent); + const quietFor = now - parseUTC(lastActivityAt).getTime(); + return state === "idle" && quietFor > INACTIVE_AFTER_MS ? "inactive" : state; +} + +/** + * The latest of the given timestamps; `fallback` only when none is set, since + * event times come from the client and a session's start from the server. + */ +function latestTimestamp(fallback: string, ...timestamps: (string | null | undefined)[]): string { + let latest: string | null = null; + for (const ts of timestamps) { + if (ts && (!latest || parseUTC(ts).getTime() > parseUTC(latest).getTime())) latest = ts; + } + return latest ?? fallback; +} + +/** Event times come from the developer's machine; one ahead of this browser counts as now. */ +function clampToNow(timestamp: string, now: number): string { + return parseUTC(timestamp).getTime() > now ? new Date(now).toISOString() : timestamp; +} + +function summarizeAgentTypes(agents: ActiveAgent[]): AgentSummaryNodeData["types"] { + const counts = new Map(); + for (const agent of agents) { + counts.set(agent.agentType, (counts.get(agent.agentType) ?? 0) + 1); + } + return [...counts] + .map(([agentType, count]) => ({ agentType, count })) + .sort((a, b) => b.count - a.count); +} + export function useFlowLayout(): { nodes: Node[]; edges: Edge[] } { - const { developers, activeSessions, activeAgents, stoppedAgents, events } = useActivityStore( - useShallow((s) => ({ - developers: s.developers, - activeSessions: s.activeSessions, - activeAgents: s.activeAgents, - stoppedAgents: s.stoppedAgents, - events: s.events, - })), - ); + const { developers, activeSessions, activeAgents, stoppedAgents, events, latestSessionEvents } = + useActivityStore( + useShallow((s) => ({ + developers: s.developers, + activeSessions: s.activeSessions, + activeAgents: s.activeAgents, + stoppedAgents: s.stoppedAgents, + events: s.events, + latestSessionEvents: s.latestSessionEvents, + })), + ); + const now = useNow(NOW_REFRESH_MS); - // Merge active and stopped agents for layout (stopped agents remain visible during grace period) + // Running and finished agents; finished ones are needed to attribute their past tool events. const allAgents = useMemo( () => [ ...activeAgents.map((a) => ({ ...a, stopped: false })), @@ -187,25 +184,18 @@ export function useFlowLayout(): { nodes: Node[]; edges: Edge[] } { // Stage 1: Build graph structure and run dagre layout. // Only re-runs when the topology changes (nodes added/removed), not on every event. const { positionedNodes, layoutEdges } = useMemo(() => { - const developerSessionCounts = new Map(); - for (const session of activeSessions) { - const devId = session.developerId; - const count = developerSessionCounts.get(devId) ?? 0; - developerSessionCounts.set(devId, count + 1); - } - - const activeDevelopers = developers.filter((d) => - developerSessionCounts.has(d.id), - ); + const developerIds = new Set(activeSessions.map((s) => s.developerId)); + const activeDevelopers = developers.filter((d) => developerIds.has(d.id)); const nodes: Node[] = []; const edges: Edge[] = []; - // Developer nodes + // Developer nodes (session counts filled in stage 2) for (const dev of activeDevelopers) { const data: DeveloperNodeData = { developer: dev, - sessionCount: developerSessionCounts.get(dev.id) ?? 0, + activeCount: 0, + inactiveCount: 0, }; nodes.push({ id: `dev-${dev.id}`, @@ -228,6 +218,7 @@ export function useFlowLayout(): { nodes: Node[]; edges: Edge[] } { isToolRunning: false, currentToolName: null, activityState: "idle", + lastActivityAt: session.startedAt, }; nodes.push({ @@ -242,15 +233,14 @@ export function useFlowLayout(): { nodes: Node[]; edges: Edge[] } { source: `dev-${devId}`, target: `session-${session.id}`, type: "smoothstep", - animated: session.status === "active", + data: { sessionId: session.id }, style: { stroke: "#4b5563" }, }); const sessionAgents = allAgents.filter( (a) => a.sessionId === session.id && a.agentId != null, ); - for (const agent of sessionAgents) { - const isStopped = agent.stopped; + for (const agent of sessionAgents.filter((a) => !a.stopped)) { const agentData: AgentNodeData = { agentId: agent.agentId, agentType: agent.agentType, @@ -259,7 +249,6 @@ export function useFlowLayout(): { nodes: Node[]; edges: Edge[] } { latestEvent: null, isToolRunning: false, currentToolName: null, - isStopped: agent.stopped, }; nodes.push({ @@ -274,8 +263,32 @@ export function useFlowLayout(): { nodes: Node[]; edges: Edge[] } { source: `session-${session.id}`, target: `agent-${agent.agentId}`, type: "smoothstep", - animated: !isStopped, - style: { stroke: isStopped ? "#6b7280" : "#a855f7" }, + animated: true, + style: { stroke: "#a855f7" }, + }); + } + + const doneAgents = sessionAgents.filter((a) => a.stopped); + if (doneAgents.length > 0) { + const summaryData: AgentSummaryNodeData = { + sessionId: session.id, + total: doneAgents.length, + types: summarizeAgentTypes(doneAgents), + }; + + nodes.push({ + id: `agents-done-${session.id}`, + type: "agentSummary", + position: { x: 0, y: 0 }, + data: summaryData, + }); + + edges.push({ + id: `edge-${session.id}-agents-done`, + source: `session-${session.id}`, + target: `agents-done-${session.id}`, + type: "smoothstep", + style: { stroke: "#4b5563" }, }); } } @@ -288,14 +301,16 @@ export function useFlowLayout(): { nodes: Node[]; edges: Edge[] } { return { positionedNodes: laid.nodes, layoutEdges: laid.edges }; }, [developers, activeSessions, allAgents]); - // Stage 2: Decorate positioned nodes with event-derived data. - // Runs on event changes but skips the expensive dagre layout. + // Stage 2: Decorate positioned nodes with event- and time-derived data. + // Runs on event changes and clock ticks but skips the expensive dagre layout. return useMemo(() => { if (positionedNodes.length === 0) { return { nodes: [], edges: layoutEdges }; } - const nodes = positionedNodes.map((node) => { + const sessionStates = new Map(); + + const decorated = positionedNodes.map((node) => { if (node.type === "session") { const data = node.data as SessionNodeData; const sessionId = data.session.id; @@ -310,7 +325,7 @@ export function useFlowLayout(): { nodes: Node[]; edges: Edge[] } { attributeEventsToAgents(allSessionEvents, sessionAgents, events); const recentEvents = ownEvents.slice(0, 3); - const latestEvent = ownEvents[0] ?? null; + const latestEvent = ownEvents[0] ?? latestSessionEvents[sessionId] ?? null; let isToolRunning = false; let currentToolName: string | null = null; @@ -320,7 +335,17 @@ export function useFlowLayout(): { nodes: Node[]; edges: Edge[] } { currentToolName = payload.toolName ?? null; } - const activityState = deriveSessionState(data.session, latestEvent); + const lastActivityAt = clampToNow( + latestTimestamp( + data.session.startedAt, + data.session.lastEventAt, + allSessionEvents[0]?.timestamp, + latestSessionEvents[sessionId]?.timestamp, + ), + now, + ); + const activityState = deriveSessionState(data.session, latestEvent, lastActivityAt, now); + sessionStates.set(sessionId, activityState); return { ...node, @@ -331,6 +356,7 @@ export function useFlowLayout(): { nodes: Node[]; edges: Edge[] } { isToolRunning, currentToolName, activityState, + lastActivityAt, }, }; } @@ -371,6 +397,27 @@ export function useFlowLayout(): { nodes: Node[]; edges: Edge[] } { return node; }); - return { nodes, edges: layoutEdges }; - }, [positionedNodes, layoutEdges, events, allAgents]); + const nodes = decorated.map((node) => { + if (node.type !== "developer") return node; + const data = node.data as DeveloperNodeData; + let activeCount = 0; + let inactiveCount = 0; + for (const session of activeSessions) { + if (session.developerId !== data.developer.id) continue; + const state = sessionStates.get(session.id); + if (state === "inactive") inactiveCount++; + else if (state !== "ended") activeCount++; + } + return { ...node, data: { ...data, activeCount, inactiveCount } }; + }); + + const edges = layoutEdges.map((edge) => { + const sessionId = (edge.data as { sessionId?: string } | undefined)?.sessionId; + if (!sessionId) return edge; + const state = sessionStates.get(sessionId); + return { ...edge, animated: state !== undefined && WORKING_STATES.has(state) }; + }); + + return { nodes, edges }; + }, [positionedNodes, layoutEdges, events, latestSessionEvents, allAgents, activeSessions, now]); } diff --git a/packages/dashboard/src/components/landing/TopologyDemoSection.tsx b/packages/dashboard/src/components/landing/TopologyDemoSection.tsx index 59b3093..d35b0a0 100644 --- a/packages/dashboard/src/components/landing/TopologyDemoSection.tsx +++ b/packages/dashboard/src/components/landing/TopologyDemoSection.tsx @@ -3,18 +3,10 @@ import { motion } from "motion/react"; import { ReactFlow, Background } from "@xyflow/react"; import type { Node } from "@xyflow/react"; import "@xyflow/react/dist/style.css"; -import { DeveloperNode } from "../flow/DeveloperNode"; -import { SessionNode } from "../flow/SessionNode"; -import { AgentNode } from "../flow/AgentNode"; +import { nodeTypes } from "../flow/nodeTypes"; import { buildDemoLayout, tickSimulation } from "./demoTopologyData"; import { usePersona } from "./PersonaContext"; -const nodeTypes = { - developer: DeveloperNode, - session: SessionNode, - agent: AgentNode, -}; - const revealInitial = { opacity: 0, y: 24 } as const; const revealVisible = { opacity: 1, y: 0 } as const; const revealViewport = { once: true, amount: 0.2 } as const; diff --git a/packages/dashboard/src/components/landing/demoTopologyData.ts b/packages/dashboard/src/components/landing/demoTopologyData.ts index 53a6100..228da61 100644 --- a/packages/dashboard/src/components/landing/demoTopologyData.ts +++ b/packages/dashboard/src/components/landing/demoTopologyData.ts @@ -1,27 +1,15 @@ -import dagre from "@dagrejs/dagre"; import type { Node, Edge } from "@xyflow/react"; -import type { DeveloperNodeData, SessionNodeData, AgentNodeData, SessionActivityState } from "../flow/flowTypes"; +import type { + DeveloperNodeData, + SessionNodeData, + AgentNodeData, + AgentSummaryNodeData, + SessionActivityState, +} from "../flow/flowTypes"; +import { getLayoutedElements } from "../flow/layout"; import type { Developer, Session, FeedEvent, ToolEventPayload, PromptEventPayload } from "@devscope/shared"; import type { Persona } from "./PersonaContext"; -const NODE_WIDTH_DEVELOPER = 200; -const NODE_HEIGHT_DEVELOPER = 90; -const NODE_WIDTH_SESSION = 280; -const NODE_HEIGHT_SESSION = 160; -const NODE_WIDTH_AGENT = 240; -const NODE_HEIGHT_AGENT = 110; - -function getNodeDimensions(type: string): { width: number; height: number } { - switch (type) { - case "developer": - return { width: NODE_WIDTH_DEVELOPER, height: NODE_HEIGHT_DEVELOPER }; - case "agent": - return { width: NODE_WIDTH_AGENT, height: NODE_HEIGHT_AGENT }; - default: - return { width: NODE_WIDTH_SESSION, height: NODE_HEIGHT_SESSION }; - } -} - function minutesAgo(m: number): string { return new Date(Date.now() - m * 60_000).toISOString(); } @@ -102,8 +90,11 @@ const sessionDefs: SessionDef[] = [ ]; const agentDefs = [ - { agentId: "agent-1", agentType: "general-purpose", sessionId: "s1", startedAt: minutesAgo(5), isStopped: false }, - { agentId: "agent-2", agentType: "Explore", sessionId: "s4", startedAt: minutesAgo(10), isStopped: true }, + { agentId: "agent-1", agentType: "general-purpose", sessionId: "s1", startedAt: minutesAgo(5) }, +]; + +const doneAgentDefs: AgentSummaryNodeData[] = [ + { sessionId: "s4", total: 2, types: [{ agentType: "Explore", count: 2 }] }, ]; // --- Per-session simulation state --- @@ -130,7 +121,8 @@ export function buildDemoLayout(): { nodes: Node[]; edges: Edge[] } { for (const dev of developers) { const data: DeveloperNodeData = { developer: dev, - sessionCount: devSessionCounts.get(dev.id) ?? 0, + activeCount: devSessionCounts.get(dev.id) ?? 0, + inactiveCount: 0, }; nodes.push({ id: `dev-${dev.id}`, type: "developer", position: { x: 0, y: 0 }, data }); } @@ -144,6 +136,7 @@ export function buildDemoLayout(): { nodes: Node[]; edges: Edge[] } { isToolRunning: false, currentToolName: null, activityState: "idle", + lastActivityAt: minutesAgo(0), }; nodes.push({ id: `session-${s.session.id}`, type: "session", position: { x: 0, y: 0 }, data }); edges.push({ @@ -165,7 +158,6 @@ export function buildDemoLayout(): { nodes: Node[]; edges: Edge[] } { latestEvent: null, isToolRunning: false, currentToolName: null, - isStopped: a.isStopped, }; nodes.push({ id: `agent-${a.agentId}`, type: "agent", position: { x: 0, y: 0 }, data }); edges.push({ @@ -173,33 +165,23 @@ export function buildDemoLayout(): { nodes: Node[]; edges: Edge[] } { source: `session-${a.sessionId}`, target: `agent-${a.agentId}`, type: "smoothstep", - animated: !a.isStopped, - style: { stroke: a.isStopped ? "#6b7280" : "#a855f7" }, + animated: true, + style: { stroke: "#a855f7" }, }); } - // Run Dagre layout - const g = new dagre.graphlib.Graph(); - g.setDefaultEdgeLabel(() => ({})); - g.setGraph({ rankdir: "TB", nodesep: 40, ranksep: 80 }); - - for (const node of nodes) { - const { width, height } = getNodeDimensions(node.type ?? "session"); - g.setNode(node.id, { width, height }); - } - for (const edge of edges) { - g.setEdge(edge.source, edge.target); + for (const data of doneAgentDefs) { + nodes.push({ id: `agents-done-${data.sessionId}`, type: "agentSummary", position: { x: 0, y: 0 }, data }); + edges.push({ + id: `edge-${data.sessionId}-agents-done`, + source: `session-${data.sessionId}`, + target: `agents-done-${data.sessionId}`, + type: "smoothstep", + style: { stroke: "#4b5563" }, + }); } - dagre.layout(g); - - const layoutedNodes = nodes.map((node) => { - const pos = g.node(node.id); - const { width, height } = getNodeDimensions(node.type ?? "session"); - return { ...node, position: { x: pos.x - width / 2, y: pos.y - height / 2 } }; - }); - - return { nodes: layoutedNodes, edges }; + return getLayoutedElements(nodes, edges); } // --- Event simulation --- @@ -360,13 +342,14 @@ export function tickSimulation(baseNodes: Node[], persona?: Persona | null): Nod isToolRunning: state.phase === "tool_start", currentToolName: state.toolName, activityState: phaseToActivityState(state.phase), + // Demo sessions are always live. + lastActivityAt: new Date().toISOString(), }, }; } if (node.type === "agent") { const data = node.data as AgentNodeData; - if (data.isStopped) return node; // Don't simulate stopped agents return { ...node, diff --git a/packages/dashboard/src/hooks/useNow.ts b/packages/dashboard/src/hooks/useNow.ts new file mode 100644 index 0000000..42de493 --- /dev/null +++ b/packages/dashboard/src/hooks/useNow.ts @@ -0,0 +1,23 @@ +import { useEffect, useState } from "react"; + +/** + * Current time in ms, refreshed every `intervalMs` while the tab is visible, + * for UI that changes with time alone. + */ +export function useNow(intervalMs: number): number { + const [now, setNow] = useState(() => Date.now()); + + useEffect(() => { + const tick = () => { + if (!document.hidden) setNow(Date.now()); + }; + const id = setInterval(tick, intervalMs); + document.addEventListener("visibilitychange", tick); + return () => { + clearInterval(id); + document.removeEventListener("visibilitychange", tick); + }; + }, [intervalMs]); + + return now; +} diff --git a/packages/dashboard/src/stores/activityStore.ts b/packages/dashboard/src/stores/activityStore.ts index 4653d2e..94ef9f5 100644 --- a/packages/dashboard/src/stores/activityStore.ts +++ b/packages/dashboard/src/stores/activityStore.ts @@ -1,5 +1,6 @@ import { create } from "zustand"; import type { FeedEvent, Developer, Session, AlertEvent, FrictionAlert } from "@devscope/shared"; +import { parseUTC } from "@/lib/utils"; export interface ActiveAgent { agentId: string; @@ -14,8 +15,32 @@ export interface StoppedAgent extends ActiveAgent { const MAX_STOPPED_AGENTS = 100; +/** An event of the session itself, not one of its subagents' tool calls. */ +function isSessionOwnEvent(event: FeedEvent): boolean { + if (event.eventType === "agent.start" || event.eventType === "agent.stop") return true; + return !(event.payload as { agentId?: string } | null)?.agentId; +} + +/** Keeps the newest own event per session, so state survives eviction from `events`. */ +function withLatestSessionEvents( + latest: Record, + events: FeedEvent[], +): Record { + let next = latest; + for (const event of events) { + if (!isSessionOwnEvent(event)) continue; + const current = next[event.sessionId]; + if (current && parseUTC(current.timestamp) >= parseUTC(event.timestamp)) continue; + if (next === latest) next = { ...latest }; + next[event.sessionId] = event; + } + return next; +} + export interface ActivityState { events: FeedEvent[]; + /** Newest own event per session, kept beyond the `events` window. */ + latestSessionEvents: Record; developers: (Developer & { activeSessions?: number })[]; activeSessions: Session[]; activeAgents: ActiveAgent[]; @@ -48,6 +73,7 @@ const MAX_EVENTS = 200; export const useActivityStore = create((set) => ({ events: [], + latestSessionEvents: {}, developers: [], activeSessions: [], activeAgents: [], @@ -61,7 +87,10 @@ export const useActivityStore = create((set) => ({ addEvent: (event) => set((state) => { if (state.events.some((e) => e.id === event.id)) return state; - return { events: [event, ...state.events].slice(0, MAX_EVENTS) }; + return { + events: [event, ...state.events].slice(0, MAX_EVENTS), + latestSessionEvents: withLatestSessionEvents(state.latestSessionEvents, [event]), + }; }), // Ignore non-array payloads (e.g. an `{ error }` body from a 401/429) so a @@ -72,22 +101,28 @@ export const useActivityStore = create((set) => ({ setActiveAgents: (activeAgents) => set((state) => (Array.isArray(activeAgents) ? { activeAgents } : state)), addActiveAgent: (agent) => set((state) => { - if (state.activeAgents.some((a) => a.agentId === agent.agentId)) return state; + if ( + state.activeAgents.some((a) => a.agentId === agent.agentId) || + state.stoppedAgents.some((a) => a.agentId === agent.agentId) + ) return state; return { activeAgents: [...state.activeAgents, agent] }; }), removeActiveAgent: (agentId) => set((state) => { const agent = state.activeAgents.find((a) => a.agentId === agentId); + if (!agent) return state; return { activeAgents: state.activeAgents.filter((a) => a.agentId !== agentId), - stoppedAgents: agent - ? [...state.stoppedAgents, { ...agent, stoppedAt: Date.now() }].slice(-MAX_STOPPED_AGENTS) - : state.stoppedAgents, + stoppedAgents: [...state.stoppedAgents, { ...agent, stoppedAt: Date.now() }].slice(-MAX_STOPPED_AGENTS), }; }), setConnected: (connected) => set({ connected }), bumpFetchGeneration: () => set((state) => ({ fetchGeneration: state.fetchGeneration + 1 })), - setEvents: (events) => set({ events }), + setEvents: (events) => + set((state) => ({ + events, + latestSessionEvents: withLatestSessionEvents(state.latestSessionEvents, events), + })), updateSession: (sessionId, status) => set((state) => ({ @@ -134,10 +169,15 @@ export const useActivityStore = create((set) => ({ const endedSessionTimes = removedIds.size > 0 ? Object.fromEntries(Object.entries(state.endedSessionTimes).filter(([id]) => !removedIds.has(id))) : state.endedSessionTimes; + // Finished agents stay (collapsed on the topology) for as long as their session does. + const sessionIds = new Set(activeSessions.map((s) => s.id)); return { activeSessions, endedSessionTimes, - stoppedAgents: state.stoppedAgents.filter((a) => a.stoppedAt > cutoff), + stoppedAgents: state.stoppedAgents.filter((a) => sessionIds.has(a.sessionId)), + latestSessionEvents: Object.fromEntries( + Object.entries(state.latestSessionEvents).filter(([id]) => sessionIds.has(id)), + ), }; }),