adhdev 0.9.82-rc.44 → 0.9.82-rc.46

package/dist/cli/index.js

@@ -46770,8 +46770,12 @@ function buildInlineMeshTransitGitStatus(node) {
   const probeGitResult = readObjectRecord(probeGit.result);
   const probeDirectStatus = readObjectRecord(probeGit.status);
   const probeNestedStatus = readObjectRecord(probeGitResult.status);
-  const status = Object.keys(directStatus).length ? directStatus : Object.keys(nestedStatus).length ? nestedStatus : Object.keys(probeDirectStatus).length ? probeDirectStatus : Object.keys(probeNestedStatus).length ? probeNestedStatus : {};
-  return normalizeInlineMeshGitStatus(status, node, { lastCheckedAt: Date.now() });
+  const candidates = [directStatus, nestedStatus, probeDirectStatus, probeNestedStatus];
+  for (const status of candidates) {
+    const normalized = normalizeInlineMeshGitStatus(status, node, { lastCheckedAt: Date.now() });
+    if (normalized) return normalized;
+  }
+  return void 0;
 }
 function recordInlineMeshDirectGitTruth(node, git, source) {
   if (!node || typeof node !== "object" || Array.isArray(node)) return;
@@ -47677,10 +47681,69 @@ var init_router = __esm({
         if (typeof structuredClone === "function") return structuredClone(value);
         return JSON.parse(JSON.stringify(value));
       }
-      getCachedAggregateMeshStatus(meshId) {
+      hydrateCachedAggregateMeshStatusFromInline(snapshot, mesh, options) {
+        if (!mesh || typeof mesh !== "object" || !Array.isArray(mesh.nodes) || !Array.isArray(snapshot?.nodes)) return snapshot;
+        const inlineNodesById = /* @__PURE__ */ new Map();
+        for (const node of mesh.nodes) {
+          const nodeId = readInlineMeshNodeId(node);
+          if (nodeId) inlineNodesById.set(nodeId, node);
+        }
+        if (!inlineNodesById.size) return snapshot;
+        let changed = false;
+        const unavailableNodeIds = /* @__PURE__ */ new Set();
+        const sourceOfTruth = readObjectRecord(snapshot.sourceOfTruth);
+        const directPeerTruth = readObjectRecord(sourceOfTruth.directPeerTruth);
+        for (const entry of Array.isArray(directPeerTruth.unavailableNodeIds) ? directPeerTruth.unavailableNodeIds : []) {
+          const nodeId = readStringValue(entry);
+          if (nodeId) unavailableNodeIds.add(nodeId);
+        }
+        const nodes = snapshot.nodes.map((statusNode) => {
+          const nodeId = readStringValue(statusNode?.nodeId, statusNode?.id);
+          const inlineNode = nodeId ? inlineNodesById.get(nodeId) : void 0;
+          if (!inlineNode) return statusNode;
+          const liveGit = buildInlineMeshTransitGitStatus(inlineNode);
+          if (!liveGit) return statusNode;
+          const nextStatus = { ...statusNode };
+          nextStatus.git = liveGit;
+          nextStatus.health = deriveMeshNodeHealthFromGit(liveGit);
+          delete nextStatus.gitProbePending;
+          if (readStringValue(nextStatus.error) === "waiting for live peer git snapshot") delete nextStatus.error;
+          if (!readStringValue(nextStatus.machineStatus)) nextStatus.machineStatus = "online";
+          if (nodeId) unavailableNodeIds.delete(nodeId);
+          changed = true;
+          return nextStatus;
+        });
+        if (!changed && !(options?.requireDirectPeerTruth && unavailableNodeIds.size > 0)) return snapshot;
+        const nextSourceOfTruth = {
+          ...sourceOfTruth,
+          ...Object.keys(directPeerTruth).length ? {
+            directPeerTruth: {
+              ...directPeerTruth,
+              satisfied: options?.requireDirectPeerTruth === true ? unavailableNodeIds.size === 0 : directPeerTruth.satisfied,
+              unavailableNodeIds: [...unavailableNodeIds]
+            },
+            ...options?.requireDirectPeerTruth === true ? {
+              coordinatorOwnsLiveTruth: unavailableNodeIds.size === 0,
+              currentStatus: unavailableNodeIds.size === 0 ? "live_git_and_session_probes" : "direct_peer_truth_unavailable"
+            } : {}
+          } : {}
+        };
+        return {
+          ...snapshot,
+          ...options?.requireDirectPeerTruth === true && unavailableNodeIds.size > 0 ? {
+            success: false,
+            code: "mesh_direct_peer_truth_unavailable",
+            error: "Selected coordinator could not confirm direct mesh truth for every remote node yet."
+          } : {},
+          sourceOfTruth: nextSourceOfTruth,
+          nodes
+        };
+      }
+      getCachedAggregateMeshStatus(meshId, mesh, options) {
         const cached2 = this.aggregateMeshStatusCache.get(meshId);
         if (!cached2?.snapshot || cached2.snapshot.success !== true || !Array.isArray(cached2.snapshot.nodes)) return null;
-        const snapshot = this.cloneJsonValue(cached2.snapshot);
+        let snapshot = this.cloneJsonValue(cached2.snapshot);
+        snapshot = this.hydrateCachedAggregateMeshStatusFromInline(snapshot, mesh, options);
         const ageMs = Math.max(0, Date.now() - cached2.builtAt);
         const sourceOfTruth = snapshot.sourceOfTruth && typeof snapshot.sourceOfTruth === "object" ? snapshot.sourceOfTruth : {};
         snapshot.sourceOfTruth = {
@@ -47740,7 +47803,14 @@ var init_router = __esm({
         const preferInline = options?.preferInline === true;
         if (preferInline) {
           const cached3 = this.getCachedInlineMesh(meshId);
-          if (cached3) return { mesh: cached3, inline: true, source: "inline_cache" };
+          if (cached3) {
+            if (inlineMeshCarriesTransientNodeTruth(inlineMesh)) {
+              const merged = reconcileInlineMeshCache(cached3, inlineMesh);
+              this.inlineMeshCache.set(meshId, sanitizeInlineMesh(merged));
+              return { mesh: merged, inline: true, source: "inline_cache" };
+            }
+            return { mesh: cached3, inline: true, source: "inline_cache" };
+          }
           if (inlineMeshCarriesTransientNodeTruth(inlineMesh)) {
             this.warmInlineMeshCache(meshId, inlineMesh);
             return { mesh: inlineMesh, inline: true, source: "inline_bootstrap" };
@@ -49720,7 +49790,7 @@ ${block}`);
               if (!mesh) return { success: false, error: "Mesh not found" };
               const refreshRequested = args?.refresh === true || args?.forceRefresh === true;
               if (!refreshRequested) {
-                const cachedStatus = this.getCachedAggregateMeshStatus(meshId);
+                const cachedStatus = this.getCachedAggregateMeshStatus(meshId, mesh, { requireDirectPeerTruth: args?.requireDirectPeerTruth === true });
                 if (cachedStatus) {
                   logRepoMeshStatusDebug("return_cached", {
                     meshId,
@@ -49755,7 +49825,9 @@ ${block}`);
                 peerConfirmedCount: 0,
                 unavailableNodeIds: []
               };
-              const directTruthSatisfied = meshRecord.source !== "inline_bootstrap" || directTruth.directEvidenceCount > 0;
+              const passivePeerTruthNotAttempted = requireDirectPeerTruth && !refreshRequested && directTruth.directEvidenceCount > 0 && directTruth.peerAttemptedCount === 0;
+              const effectiveDirectTruth = passivePeerTruthNotAttempted ? { ...directTruth, unavailableNodeIds: [] } : directTruth;
+              const directTruthSatisfied = !requireDirectPeerTruth || effectiveDirectTruth.directEvidenceCount > 0 && effectiveDirectTruth.unavailableNodeIds.length === 0;
               if (requireDirectPeerTruth && !directTruthSatisfied) {
                 const failureResult = {
                   success: false,
@@ -49785,7 +49857,7 @@ ${block}`);
                 });
                 return failureResult;
               }
-              const directTruthUnavailableNodeIds = new Set(directTruth.unavailableNodeIds);
+              const directTruthUnavailableNodeIds = new Set(effectiveDirectTruth.unavailableNodeIds);
               const selectedCoordinatorNodeId = readStringValue(
                 mesh.coordinator?.preferredNodeId,
                 mesh.nodes?.[0]?.id,
@@ -49978,11 +50050,11 @@ ${block}`);
                     directPeerTruth: {
                       required: true,
                       satisfied: directTruthSatisfied,
-                      directEvidenceCount: directTruth.directEvidenceCount,
-                      localConfirmedCount: directTruth.localConfirmedCount,
-                      peerAttemptedCount: directTruth.peerAttemptedCount,
-                      peerConfirmedCount: directTruth.peerConfirmedCount,
-                      unavailableNodeIds: directTruth.unavailableNodeIds
+                      directEvidenceCount: effectiveDirectTruth.directEvidenceCount,
+                      localConfirmedCount: effectiveDirectTruth.localConfirmedCount,
+                      peerAttemptedCount: effectiveDirectTruth.peerAttemptedCount,
+                      peerConfirmedCount: effectiveDirectTruth.peerConfirmedCount,
+                      unavailableNodeIds: effectiveDirectTruth.unavailableNodeIds
                     }
                   } : {},
                   historicalEvidenceOnly: ["recoveryHints", "ledger.summary", "queue.summary"]
@@ -99236,7 +99308,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.82-rc.44" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.82-rc.46" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;