@adhdev/daemon-standalone 1.0.32-rc.4 → 1.0.32-rc.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-standalone",
-  "version": "1.0.32-rc.4",
+  "version": "1.0.32-rc.5",
   "description": "ADHDev standalone daemon — embedded HTTP/WS server for local dashboard",
   "main": "dist/index.js",
   "bin": {
@@ -37,7 +37,7 @@
   "license": "AGPL-3.0-or-later",
   "dependencies": {
     "@adhdev/ghostty-vt-node": "*",
-    "@adhdev/session-host-core": "1.0.32-rc.4",
+    "@adhdev/session-host-core": "1.0.32-rc.5",
     "@xterm/addon-serialize": "^0.14.0",
     "@xterm/xterm": "^6.0.0",
     "chalk": "^5.3.0",

package/vendor/mcp-server/index.js

@@ -1883,7 +1883,23 @@ function summarizeCompactSubmodules(submodules) {
     ...outOfSync.length > 0 ? { outOfSyncPaths: outOfSync } : {}
   };
 }
-var MESH_COMPACT_PRESERVED_MARKER_FIELDS = ["dataFreshness"];
+var MESH_COMPACT_PRESERVED_MARKER_FIELDS = ["dataFreshness", "quota"];
+function summarizeNodeQuota(quota) {
+  if (!quota || typeof quota !== "object" || Array.isArray(quota)) return void 0;
+  const out = {};
+  for (const [provider, snapshot] of Object.entries(quota)) {
+    if (!snapshot || typeof snapshot !== "object") continue;
+    const status = typeof snapshot.status === "string" ? snapshot.status : "unknown";
+    if (status !== "ok") {
+      const kind = typeof snapshot.metadata?.failureKind === "string" ? snapshot.metadata.failureKind : void 0;
+      out[provider] = kind ? `${status}:${kind}` : status;
+      continue;
+    }
+    const pct = (w) => w && Number.isFinite(w.usedPercent) ? `${Math.round(w.usedPercent)}%` : "\u2014";
+    out[provider] = `${pct(snapshot.session)}/${pct(snapshot.weekly)}`;
+  }
+  return Object.keys(out).length > 0 ? out : void 0;
+}
 function compactMeshStatusNode(entry) {
   if (!entry || typeof entry !== "object") return entry;
   const next = { ...entry };
@@ -1921,6 +1937,11 @@ function compactMeshStatusNode(entry) {
       seeStaleDaemonBuilds: true
     };
   }
+  if (next.quota !== void 0) {
+    const summary = summarizeNodeQuota(next.quota);
+    if (summary) next.quota = summary;
+    else delete next.quota;
+  }
   delete next.capabilityTagsByProvider;
   const elideSkip = /* @__PURE__ */ new Set(["git", "machine", "branchConvergence", "staleDaemonBuild", "sessions", ...MESH_COMPACT_PRESERVED_MARKER_FIELDS]);
   for (const k of Object.keys(next)) {
@@ -2011,7 +2032,7 @@ var STALE_ASSIGNED_QUEUE_MS = 30 * 6e4;
 var OLD_HISTORICAL_QUEUE_RECORD_MS = 7 * 24 * 60 * 6e4;
 var ACTIVE_QUEUE_STATUSES = /* @__PURE__ */ new Set(["pending", "assigned"]);
 var HISTORICAL_QUEUE_STATUSES = /* @__PURE__ */ new Set(["completed", "failed", "cancelled"]);
-function buildQueueLivenessIndex(mesh) {
+function buildQueueLivenessIndex(mesh, liveVerifiedNodes) {
   const nodeIds = /* @__PURE__ */ new Set();
   const nodeSessionIds = /* @__PURE__ */ new Map();
   for (const node of Array.isArray(mesh?.nodes) ? mesh.nodes : []) {
@@ -2021,20 +2042,33 @@ function buildQueueLivenessIndex(mesh) {
     const sessions = collectNodeSessionIds(node);
     if (sessions.size > 0) nodeSessionIds.set(nodeId, sessions);
   }
-  return { nodeIds, nodeSessionIds };
+  const verifiedLiveNodeIds = /* @__PURE__ */ new Set();
+  for (const node of Array.isArray(liveVerifiedNodes) ? liveVerifiedNodes : []) {
+    if (node?.__liveProbeVerified !== true) continue;
+    const nodeId = readString(node.id) || readString(node.nodeId) || readString(node.node_id);
+    if (!nodeId) continue;
+    verifiedLiveNodeIds.add(nodeId);
+    nodeSessionIds.set(nodeId, collectNodeSessionIds(node));
+  }
+  return { nodeIds, nodeSessionIds, verifiedLiveNodeIds };
 }
+var SESSION_LIVENESS_STARTUP_GRACE_MS = 2 * 6e4;
 function queueAssignmentStaleReason(task, liveness) {
   if (task?.status !== "assigned") return void 0;
   const nodeId = readString(task.assignedNodeId) || readString(task.nodeId) || readString(task.node_id) || readString(task.targetNodeId);
   const sessionId = readString(task.assignedSessionId) || readString(task.sessionId) || readString(task.session_id) || readString(task.targetSessionId);
+  const updatedAt = new Date(task.updatedAt).getTime();
+  const ageMs = Number.isFinite(updatedAt) ? Date.now() - updatedAt : null;
   if (nodeId && liveness.nodeIds.size > 0 && !liveness.nodeIds.has(nodeId)) {
     return "assigned node is not present in the current mesh snapshot";
   }
   if (nodeId && sessionId && liveness.nodeSessionIds.has(nodeId) && !liveness.nodeSessionIds.get(nodeId).has(sessionId)) {
-    return "assigned session is not live on the assigned node";
+    const verifiedByProbe = liveness.verifiedLiveNodeIds.size === 0 || liveness.verifiedLiveNodeIds.has(nodeId);
+    const pastStartupGrace = ageMs === null || ageMs >= SESSION_LIVENESS_STARTUP_GRACE_MS;
+    if (verifiedByProbe && pastStartupGrace) {
+      return "assigned session is not live on the assigned node";
+    }
   }
-  const updatedAt = new Date(task.updatedAt).getTime();
-  const ageMs = Number.isFinite(updatedAt) ? Date.now() - updatedAt : null;
   if (!nodeId && ageMs !== null && ageMs >= STALE_ASSIGNED_QUEUE_MS) {
     return "assigned task has no assigned node metadata";
   }
@@ -2210,8 +2244,8 @@ function compactActiveWorkRecords(records) {
   const capped = records.slice(0, COMPACT_MAX_ACTIVE_WORK_ROWS).map(compactActiveWorkRecord);
   return { records: capped, omitted: Math.max(0, records.length - capped.length) };
 }
-function annotateQueueStaleness(queue, mesh) {
-  const liveness = buildQueueLivenessIndex(mesh);
+function annotateQueueStaleness(queue, mesh, liveVerifiedNodes) {
+  const liveness = buildQueueLivenessIndex(mesh, liveVerifiedNodes);
   const now = Date.now();
   return queue.map((task) => {
     const taskStatus = typeof task?.status === "string" ? task.status : void 0;
@@ -2771,6 +2805,13 @@ function extractSubmodules(value, ignorePaths) {
   const ignoreSet = new Set(ignorePaths);
   return subs.filter((s) => s?.path && !ignoreSet.has(s.path));
 }
+function extractReporterNodeFactsQuota(value) {
+  const payload = unwrapCommandPayload(value);
+  const facts = payload?.reporterNodeFacts ?? value?.reporterNodeFacts;
+  const quota = facts?.quota;
+  if (!quota || typeof quota !== "object" || Array.isArray(quota)) return void 0;
+  return Object.keys(quota).length > 0 ? quota : void 0;
+}
 function assignFullGitSnapshot(entry, status) {
   if (!status || typeof status !== "object" || Array.isArray(status)) return;
   entry.git = status;
@@ -3278,6 +3319,14 @@ async function collectLiveStatusSessions(ctx, node) {
     return [];
   }
 }
+async function collectLiveStatusSessionsVerified(ctx, node) {
+  try {
+    const statusResult = await commandForNode(ctx, node, "get_status_metadata", {});
+    return { sessions: extractStatusMetadataSessions(statusResult), verified: true };
+  } catch {
+    return { sessions: [], verified: false };
+  }
+}
 async function collectLiveStatusProbe(ctx, node) {
   try {
     const statusResult = await commandForNode(ctx, node, "get_status_metadata", {}, { statusProbe: true });
@@ -3309,6 +3358,16 @@ async function collectMeshViewQueueNodesWithLiveSessions(ctx) {
   }));
   return nodes;
 }
+async function collectMeshViewQueueNodesWithLiveSessionsVerified(ctx) {
+  const nodes = await Promise.all(ctx.mesh.nodes.map(async (node) => {
+    const { sessions: liveSessions, verified } = await collectLiveStatusSessionsVerified(ctx, node);
+    if (verified) {
+      return { ...node, sessions: liveSessions, __liveProbeVerified: true };
+    }
+    return { ...node, __liveProbeVerified: false };
+  }));
+  return nodes;
+}
 function buildBranchConvergence(mesh, node, status, dirty, uncommittedChanges) {
   const defaultBranch = readString(mesh.defaultBranch) ?? "main";
   const branch = readString(status?.branch) ?? readString(node.worktreeBranch) ?? null;
@@ -3742,6 +3801,8 @@ async function meshStatus(ctx, args = {}) {
       if (status?.daemonBuildBehind && typeof status.daemonBuildBehind === "object") {
         entry.staleDaemonBuild = status.daemonBuildBehind;
       }
+      const reportedQuota = extractReporterNodeFactsQuota(statusResult);
+      if (reportedQuota) entry.quota = reportedQuota;
       const submodules = extractSubmodules(statusResult, node.policy?.submoduleIgnorePaths || []);
       if (submodules && submodules.some((s) => s?.outOfSync)) {
         entry.submoduleWarning = "One or more submodules are out of sync with the parent repo. Run `git submodule update` or check deployment readiness.";
@@ -4440,12 +4501,12 @@ async function meshViewQueue(ctx, args) {
       const depState = (0, import_daemon_core4.describeTaskDependencyState)(task, statusById);
       return { ...task, ...depState };
     });
-    const fullQueue = prioritizeActiveQueueRows(annotateQueueStaleness(withDependencies, ctx.mesh));
+    const liveNodes = await collectMeshViewQueueNodesWithLiveSessionsVerified(ctx);
+    const fullQueue = prioritizeActiveQueueRows(annotateQueueStaleness(withDependencies, ctx.mesh, liveNodes));
     const queue = filterQueueForView(fullQueue, view, statusFilter);
     const summary = buildQueueStatusSummary(fullQueue);
     const visibleSummary = buildQueueStatusSummary(queue);
     const maintenance = buildQueueMaintenanceReport(fullQueue);
-    const liveNodes = await collectMeshViewQueueNodesWithLiveSessions(ctx);
     let ledgerEntries = (0, import_daemon_core4.readLedgerEntries)(ctx.mesh.id, { tail: 200 });
     let directDispatches = (0, import_daemon_core4.getActiveDirectDispatches)(ctx.mesh.id);
     const directReconciliation = await reconcileDirectDispatchesFromTranscriptEvidence(ctx, liveNodes, directDispatches, ledgerEntries);