@openscout/scout 0.2.48 → 0.2.49

package/dist/pair-supervisor.mjs

@@ -14109,12 +14109,38 @@ function compact(p) {
     return null;
   return p.startsWith(HOME) ? `~${p.slice(HOME.length)}` : p;
 }
+var LATEST_AGENT_ENDPOINT_JOIN = `LEFT JOIN agent_endpoints ep ON ep.id = (
+  SELECT ep2.id
+  FROM agent_endpoints ep2
+  WHERE ep2.agent_id = a.id
+  ORDER BY ep2.updated_at DESC
+  LIMIT 1
+)`;
+function queryExecutingAgentIds() {
+  return new Set(db().prepare(`SELECT DISTINCT target_agent_id FROM flights
+       WHERE state = 'running'`).all().map((row) => row.target_agent_id));
+}
+function summarizeAgentState(rawState, isWorking) {
+  if (isWorking) {
+    return "working";
+  }
+  return rawState && rawState !== "offline" ? "available" : "offline";
+}
+function summarizeAgentStatusLabel(rawState, isWorking) {
+  switch (summarizeAgentState(rawState, isWorking)) {
+    case "working":
+      return "Working";
+    case "available":
+      return "Available";
+    default:
+      return "Offline";
+  }
+}
 function conversationIdForAgent(agentId) {
   return `dm.operator.${agentId}`;
 }
 function queryMobileAgents(limit = 50) {
-  const workingAgentIds = new Set(db().prepare(`SELECT DISTINCT target_agent_id FROM flights
-       WHERE state NOT IN ('completed','failed','cancelled')`).all().map((r) => r.target_agent_id));
+  const executingAgentIds = queryExecutingAgentIds();
   const lastMessageAt = new Map(db().prepare(`SELECT actor_id, MAX(created_at) AS last_at FROM messages GROUP BY actor_id`).all().map((r) => [r.actor_id, r.last_at]));
   const rows = db().prepare(`SELECT
        a.id,
@@ -14129,17 +14155,17 @@ function queryMobileAgents(limit = 50) {
        ep.updated_at
      FROM agents a
      JOIN actors ac ON ac.id = a.id
-     LEFT JOIN agent_endpoints ep ON ep.agent_id = a.id
-     ORDER BY ep.updated_at DESC NULLS LAST
+     ${LATEST_AGENT_ENDPOINT_JOIN}
+     ORDER BY COALESCE(ep.updated_at, 0) DESC, ac.display_name ASC
      LIMIT ?`).all(limit);
   return rows.map((r) => {
     let meta = {};
     try {
       meta = r.metadata_json ? JSON.parse(r.metadata_json) : {};
     } catch {}
-    const isWorking = workingAgentIds.has(r.id);
-    const state = isWorking ? "working" : r.state && r.state !== "offline" ? "available" : "offline";
-    const statusLabel = isWorking ? "Working" : r.state === "active" ? "Available" : r.state ?? "Offline";
+    const isWorking = executingAgentIds.has(r.id);
+    const state = summarizeAgentState(r.state, isWorking);
+    const statusLabel = summarizeAgentStatusLabel(r.state, isWorking);
     return {
       id: r.id,
       title: r.display_name,
@@ -14149,7 +14175,7 @@ function queryMobileAgents(limit = 50) {
       harness: r.harness,
       transport: r.transport,
       state,
-      statusLabel: statusLabel.charAt(0).toUpperCase() + statusLabel.slice(1),
+      statusLabel,
       sessionId: conversationIdForAgent(r.id),
       lastActiveAt: lastMessageAt.get(r.id) ?? null
     };
@@ -14271,7 +14297,7 @@ function queryMobileAgentDetail(agentId) {
        ep.updated_at
      FROM agents a
      JOIN actors ac ON ac.id = a.id
-     LEFT JOIN agent_endpoints ep ON ep.agent_id = a.id
+     ${LATEST_AGENT_ENDPOINT_JOIN}
      WHERE a.id = ?`).get(agentId);
   if (!row)
     return null;
@@ -14283,8 +14309,7 @@ function queryMobileAgentDetail(agentId) {
   try {
     capabilities = row.capabilities_json ? JSON.parse(row.capabilities_json) : [];
   } catch {}
-  const workingAgentIds = new Set(db().prepare(`SELECT DISTINCT target_agent_id FROM flights
-       WHERE state NOT IN ('completed','failed','cancelled')`).all().map((r) => r.target_agent_id));
+  const executingAgentIds = queryExecutingAgentIds();
   const activeFlights = db().prepare(`SELECT id, state, summary, started_at
      FROM flights
      WHERE target_agent_id = ? AND state NOT IN ('completed','failed','cancelled')
@@ -14308,9 +14333,9 @@ function queryMobileAgentDetail(agentId) {
   const msgRow = db().prepare(`SELECT COUNT(*) AS cnt FROM messages WHERE conversation_id = ?`).get(conversationIdForAgent(agentId));
   const messageCount = msgRow?.cnt ?? 0;
   const lastMessageAt = db().prepare(`SELECT MAX(created_at) AS last_at FROM messages WHERE actor_id = ?`).get(agentId)?.last_at ?? null;
-  const isWorking = workingAgentIds.has(row.id);
-  const state = isWorking ? "working" : row.state && row.state !== "offline" ? "available" : "offline";
-  const statusLabel = isWorking ? "Working" : row.state === "active" ? "Available" : row.state ?? "Offline";
+  const isWorking = executingAgentIds.has(row.id);
+  const state = summarizeAgentState(row.state, isWorking);
+  const statusLabel = summarizeAgentStatusLabel(row.state, isWorking);
   return {
     id: row.id,
     title: row.display_name,
@@ -14320,7 +14345,7 @@ function queryMobileAgentDetail(agentId) {
     harness: row.harness,
     transport: row.transport,
     state,
-    statusLabel: statusLabel.charAt(0).toUpperCase() + statusLabel.slice(1),
+    statusLabel,
     sessionId: conversationIdForAgent(row.id),
     lastActiveAt: lastMessageAt,
     cwd: compact(row.cwd),
@@ -14429,7 +14454,7 @@ function endpointForAgent(snapshot, agentId) {
 function buildMobileAgentSummary(snapshot, agent) {
   const endpoint = endpointForAgent(snapshot, agent.id);
   const flights = Object.values(snapshot.flights).filter((flight) => flight.targetAgentId === agent.id);
-  const hasWorkingFlight = flights.some((flight) => !["completed", "failed", "cancelled"].includes(flight.state));
+  const hasWorkingFlight = flights.some((flight) => flight.state === "running");
   const lastAuthoredMessageAt = Object.values(snapshot.messages).filter((message) => message.actorId === agent.id).reduce((latest, message) => {
     const createdAt = normalizeTimestamp(message.createdAt);
     return typeof createdAt === "number" && (!latest || createdAt > latest) ? createdAt : latest;
@@ -14444,7 +14469,7 @@ function buildMobileAgentSummary(snapshot, agent) {
     harness: endpoint?.harness ?? null,
     transport: endpoint?.transport ?? null,
     state,
-    statusLabel: hasWorkingFlight ? "Working" : endpoint?.state === "active" ? "Available" : endpoint?.state ?? "Offline",
+    statusLabel: state === "working" ? "Working" : state === "available" ? "Available" : "Offline",
     sessionId: endpoint?.sessionId ?? null,
     lastActiveAt: lastAuthoredMessageAt
   };

package/dist/scout-control-plane-web.mjs

@@ -13863,6 +13863,32 @@ function coerceNumber(value) {
   }
   return null;
 }
+function isExecutingFlightState(state2) {
+  return state2 === "running";
+}
+var LATEST_AGENT_ENDPOINT_JOIN = `LEFT JOIN agent_endpoints ep ON ep.id = (
+  SELECT ep2.id
+  FROM agent_endpoints ep2
+  WHERE ep2.agent_id = a.id
+  ORDER BY ep2.updated_at DESC
+  LIMIT 1
+)`;
+function queryExecutingAgentIds() {
+  return new Set(db().prepare(`SELECT DISTINCT target_agent_id FROM flights
+       WHERE state = 'running'`).all().map((row) => row.target_agent_id));
+}
+function summarizeAgentState(rawState, isWorking) {
+  if (isWorking) {
+    return "working";
+  }
+  return rawState && rawState !== "offline" ? "available" : "offline";
+}
+function isDuplicateActivityFeedItem(previous, next) {
+  if (!previous) {
+    return false;
+  }
+  return previous.kind === next.kind && previous.title === next.title && previous.summary === next.summary && previous.conversationId === next.conversationId && Math.abs(previous.ts - next.ts) <= 5000;
+}
 function workPhaseFromFlightState(state2) {
   switch (state2) {
     case "queued":
@@ -13953,6 +13979,7 @@ function projectWorkItemRow(row) {
   };
 }
 function queryAgents(limit = 50) {
+  const executingAgentIds = queryExecutingAgentIds();
   const rows = db().prepare(`SELECT
          a.id,
          ac.display_name AS name,
@@ -13970,9 +13997,9 @@ function queryAgents(limit = 50) {
          ep.updated_at
        FROM agents a
        JOIN actors ac ON ac.id = a.id
-       LEFT JOIN agent_endpoints ep ON ep.agent_id = a.id
+       ${LATEST_AGENT_ENDPOINT_JOIN}
        WHERE COALESCE(json_extract(a.metadata_json, '$.retiredFromFleet'), 0) != 1
-       ORDER BY ep.updated_at DESC NULLS LAST
+       ORDER BY COALESCE(ep.updated_at, 0) DESC, ac.display_name ASC
        LIMIT ?`).all(limit);
   return rows.map((r) => {
     let capabilities = [];
@@ -13989,7 +14016,7 @@ function queryAgents(limit = 50) {
       handle: r.handle,
       agentClass: r.agent_class,
       harness: r.harness,
-      state: r.state,
+      state: summarizeAgentState(r.state, executingAgentIds.has(r.id)),
       projectRoot: compact(r.project_root),
       cwd: compact(r.cwd),
       updatedAt: r.updated_at,
@@ -14015,9 +14042,14 @@ function queryActivity(limit = 60) {
          ai.workspace_root
        FROM activity_items ai
        LEFT JOIN actors ac ON ac.id = ai.actor_id
+       WHERE ai.kind != 'ask_replied'
+         AND NOT (
+           ai.kind = 'flight_updated'
+           AND COALESCE(ai.summary, '') LIKE 'Stale running flight reconciled:%'
+         )
        ORDER BY ai.ts DESC
        LIMIT ?`).all(limit);
-  return rows.map((r) => ({
+  const items = rows.map((r) => ({
     id: r.id,
     kind: r.kind,
     ts: r.ts,
@@ -14027,6 +14059,7 @@ function queryActivity(limit = 60) {
     conversationId: r.conversation_id,
     workspaceRoot: compact(r.workspace_root)
   }));
+  return items.filter((item, index) => !isDuplicateActivityFeedItem(items[index - 1] ?? null, item));
 }
 function queryRecentMessages(limit = 80) {
   const rows = db().prepare(`SELECT
@@ -14175,6 +14208,7 @@ function queryFleetObservable(agentRow) {
   });
   const flightRows = queryFleetFlightRows(agentRow.id);
   const latestFlight = flightRows[0] ?? null;
+  const isWorking = activeFlights.some((flight) => isExecutingFlightState(flight.state));
   const workStats = db().prepare(`SELECT
        COUNT(*) AS active_work_count,
        MAX(CASE WHEN state IN ('waiting','review') OR acceptance_state = 'pending' THEN 1 ELSE 0 END) AS attention_work_count,
@@ -14222,7 +14256,7 @@ function queryFleetObservable(agentRow) {
     role,
     harness: agentRow.harness,
     transport: agentRow.transport,
-    state: agentRow.state,
+    state: summarizeAgentState(agentRow.state, isWorking),
     attention,
     conversationId,
     sessionId: agentRow.session_id,

package/dist/scout-web-server.mjs

@@ -19390,6 +19390,15 @@ function coerceNumber(value) {
   }
   return null;
 }
+function isExecutingFlightState(state4) {
+  return state4 === "running";
+}
+function summarizeAgentState(rawState, isWorking) {
+  if (isWorking) {
+    return "working";
+  }
+  return rawState && rawState !== "offline" ? "available" : "offline";
+}
 function parseFleetCapabilities(value) {
   if (!value)
     return [];
@@ -19516,6 +19525,7 @@ function queryFleetObservable(agentRow) {
   });
   const flightRows = queryFleetFlightRows(agentRow.id);
   const latestFlight = flightRows[0] ?? null;
+  const isWorking = activeFlights.some((flight) => isExecutingFlightState(flight.state));
   const workStats = db().prepare(`SELECT
        COUNT(*) AS active_work_count,
        MAX(CASE WHEN state IN ('waiting','review') OR acceptance_state = 'pending' THEN 1 ELSE 0 END) AS attention_work_count,
@@ -19563,7 +19573,7 @@ function queryFleetObservable(agentRow) {
     role,
     harness: agentRow.harness,
     transport: agentRow.transport,
-    state: agentRow.state,
+    state: summarizeAgentState(agentRow.state, isWorking),
     attention,
     conversationId,
     sessionId: agentRow.session_id,
@@ -19803,7 +19813,7 @@ function endpointForAgent(snapshot, agentId) {
 function buildMobileAgentSummary(snapshot, agent) {
   const endpoint = endpointForAgent(snapshot, agent.id);
   const flights = Object.values(snapshot.flights).filter((flight) => flight.targetAgentId === agent.id);
-  const hasWorkingFlight = flights.some((flight) => !["completed", "failed", "cancelled"].includes(flight.state));
+  const hasWorkingFlight = flights.some((flight) => flight.state === "running");
   const lastAuthoredMessageAt = Object.values(snapshot.messages).filter((message) => message.actorId === agent.id).reduce((latest, message) => {
     const createdAt = normalizeTimestamp5(message.createdAt);
     return typeof createdAt === "number" && (!latest || createdAt > latest) ? createdAt : latest;
@@ -19818,7 +19828,7 @@ function buildMobileAgentSummary(snapshot, agent) {
     harness: endpoint?.harness ?? null,
     transport: endpoint?.transport ?? null,
     state: state4,
-    statusLabel: hasWorkingFlight ? "Working" : endpoint?.state === "active" ? "Available" : endpoint?.state ?? "Offline",
+    statusLabel: state4 === "working" ? "Working" : state4 === "available" ? "Available" : "Offline",
     sessionId: endpoint?.sessionId ?? null,
     lastActiveAt: lastAuthoredMessageAt
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openscout/scout",
-  "version": "0.2.48",
+  "version": "0.2.49",
   "description": "Published Scout package that installs the `scout` command",
   "license": "UNLICENSED",
   "type": "module",
@@ -23,6 +23,6 @@
     "access": "public"
   },
   "dependencies": {
-    "@openscout/runtime": "0.2.48"
+    "@openscout/runtime": "0.2.49"
   }
 }