@adhdev/daemon-core 0.9.82-rc.43 → 0.9.82-rc.45

package/dist/commands/router.d.ts

@@ -91,6 +91,7 @@ export declare class DaemonCommandRouter {
     private aggregateMeshStatusCache;
     constructor(deps: CommandRouterDeps);
     private cloneJsonValue;
+    private hydrateCachedAggregateMeshStatusFromInline;
     private getCachedAggregateMeshStatus;
     private rememberAggregateMeshStatus;
     getCachedInlineMesh(meshId: string, inlineMesh?: unknown): any | undefined;

package/dist/index.js

@@ -24072,6 +24072,70 @@ function readBooleanValue(...values) {
   }
   return void 0;
 }
+function summarizeRepoMeshDebugGit(git) {
+  const record = readObjectRecord(git);
+  if (!Object.keys(record).length) return null;
+  const submodules = Array.isArray(record.submodules) ? record.submodules.map((entry) => ({
+    path: readStringValue(entry?.path) ?? null,
+    commit: readStringValue(entry?.commit)?.slice(0, 12) ?? null,
+    dirty: readBooleanValue(entry?.dirty) ?? false,
+    outOfSync: readBooleanValue(entry?.outOfSync, entry?.out_of_sync) ?? false
+  })) : [];
+  return {
+    isGitRepo: readBooleanValue(record.isGitRepo),
+    workspace: readStringValue(record.workspace) ?? null,
+    repoRoot: readStringValue(record.repoRoot, record.repo_root) ?? null,
+    branch: readStringValue(record.branch) ?? null,
+    upstream: readStringValue(record.upstream) ?? null,
+    upstreamStatus: readStringValue(record.upstreamStatus, record.upstream_status) ?? null,
+    headCommit: readStringValue(record.headCommit, record.head_commit)?.slice(0, 12) ?? null,
+    ahead: readNumberValue(record.ahead) ?? null,
+    behind: readNumberValue(record.behind) ?? null,
+    dirtyCounts: {
+      staged: readNumberValue(record.staged) ?? 0,
+      modified: readNumberValue(record.modified) ?? 0,
+      untracked: readNumberValue(record.untracked) ?? 0,
+      deleted: readNumberValue(record.deleted) ?? 0,
+      renamed: readNumberValue(record.renamed) ?? 0
+    },
+    lastCheckedAt: readNumberValue(record.lastCheckedAt, record.last_checked_at) ?? null,
+    submoduleCount: submodules.length,
+    submodules
+  };
+}
+function summarizeRepoMeshStatusDebug(status) {
+  const nodes = Array.isArray(status?.nodes) ? status.nodes : [];
+  return {
+    success: status?.success,
+    meshId: readStringValue(status?.meshId, status?.mesh_id) ?? null,
+    refreshedAt: readStringValue(status?.refreshedAt, status?.refreshed_at) ?? null,
+    sourceOfTruth: status?.sourceOfTruth ?? null,
+    nodeCount: nodes.length,
+    nodes: nodes.map((node) => ({
+      nodeId: readStringValue(node?.nodeId, node?.id) ?? null,
+      daemonId: readStringValue(node?.daemonId, node?.daemon_id) ?? null,
+      workspace: readStringValue(node?.workspace, node?.git?.workspace) ?? null,
+      health: readStringValue(node?.health) ?? null,
+      machineStatus: readStringValue(node?.machineStatus, node?.machine_status) ?? null,
+      connection: node?.connection && typeof node.connection === "object" ? {
+        state: readStringValue(node.connection.state) ?? null,
+        transport: readStringValue(node.connection.transport) ?? null,
+        source: readStringValue(node.connection.source) ?? null,
+        reported: readBooleanValue(node.connection.reported) ?? null
+      } : null,
+      gitProbePending: node?.gitProbePending === true,
+      launchReady: node?.launchReady === true,
+      git: summarizeRepoMeshDebugGit(node?.git)
+    }))
+  };
+}
+function logRepoMeshStatusDebug(event, fields) {
+  try {
+    LOG.info("MeshStatusDebug", `[RepoMeshStatusDebug] ${JSON.stringify({ event, ...fields })}`);
+  } catch {
+    LOG.info("MeshStatusDebug", `[RepoMeshStatusDebug] ${event}`);
+  }
+}
 function joinRepoPath(root, relativePath) {
   const normalizedRoot = typeof root === "string" ? root.trim().replace(/[\\/]+$/, "") : "";
   const normalizedPath = typeof relativePath === "string" ? relativePath.trim() : "";
@@ -24140,8 +24204,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;
@@ -25010,10 +25078,69 @@ var DaemonCommandRouter = class {
     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 cached = this.aggregateMeshStatusCache.get(meshId);
     if (!cached?.snapshot || cached.snapshot.success !== true || !Array.isArray(cached.snapshot.nodes)) return null;
-    const snapshot = this.cloneJsonValue(cached.snapshot);
+    let snapshot = this.cloneJsonValue(cached.snapshot);
+    snapshot = this.hydrateCachedAggregateMeshStatusFromInline(snapshot, mesh, options);
     const ageMs = Math.max(0, Date.now() - cached.builtAt);
     const sourceOfTruth = snapshot.sourceOfTruth && typeof snapshot.sourceOfTruth === "object" ? snapshot.sourceOfTruth : {};
     snapshot.sourceOfTruth = {
@@ -25073,7 +25200,14 @@ var DaemonCommandRouter = class {
     const preferInline = options?.preferInline === true;
     if (preferInline) {
       const cached2 = this.getCachedInlineMesh(meshId);
-      if (cached2) return { mesh: cached2, inline: true, source: "inline_cache" };
+      if (cached2) {
+        if (inlineMeshCarriesTransientNodeTruth(inlineMesh)) {
+          const merged = reconcileInlineMeshCache(cached2, inlineMesh);
+          this.inlineMeshCache.set(meshId, sanitizeInlineMesh(merged));
+          return { mesh: merged, inline: true, source: "inline_cache" };
+        }
+        return { mesh: cached2, inline: true, source: "inline_cache" };
+      }
       if (inlineMeshCarriesTransientNodeTruth(inlineMesh)) {
         this.warmInlineMeshCache(meshId, inlineMesh);
         return { mesh: inlineMesh, inline: true, source: "inline_bootstrap" };
@@ -27053,8 +27187,16 @@ ${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);
-            if (cachedStatus) return cachedStatus;
+            const cachedStatus = this.getCachedAggregateMeshStatus(meshId, mesh, { requireDirectPeerTruth: args?.requireDirectPeerTruth === true });
+            if (cachedStatus) {
+              logRepoMeshStatusDebug("return_cached", {
+                meshId,
+                command: "mesh_status",
+                refreshRequested,
+                summary: summarizeRepoMeshStatusDebug(cachedStatus)
+              });
+              return cachedStatus;
+            }
           }
           const refreshReason = refreshRequested ? "explicit_refresh" : "cold_cache_miss";
           const { getMeshQueueStats: getMeshQueueStats2, getQueue: getQueue2 } = await Promise.resolve().then(() => (init_mesh_work_queue(), mesh_work_queue_exports));
@@ -27080,9 +27222,9 @@ ${block}`);
             peerConfirmedCount: 0,
             unavailableNodeIds: []
           };
-          const directTruthSatisfied = meshRecord.source !== "inline_bootstrap" || directTruth.directEvidenceCount > 0;
+          const directTruthSatisfied = !requireDirectPeerTruth || directTruth.directEvidenceCount > 0 && directTruth.unavailableNodeIds.length === 0;
           if (requireDirectPeerTruth && !directTruthSatisfied) {
-            return {
+            const failureResult = {
               success: false,
               code: "mesh_direct_peer_truth_unavailable",
               error: "Selected coordinator could not confirm direct mesh truth yet. Bootstrap inventory stays unavailable until direct mesh_status probes succeed.",
@@ -27101,6 +27243,14 @@ ${block}`);
                 }
               }
             };
+            logRepoMeshStatusDebug("direct_truth_unavailable", {
+              meshId,
+              command: "mesh_status",
+              refreshRequested,
+              meshSource: meshRecord.source,
+              directTruth
+            });
+            return failureResult;
           }
           const directTruthUnavailableNodeIds = new Set(directTruth.unavailableNodeIds);
           const selectedCoordinatorNodeId = readStringValue(
@@ -27308,7 +27458,17 @@ ${block}`);
             queue: { tasks: queue, summary: queueSummary },
             ledger: { entries: ledgerEntries, summary: ledgerSummary }
           };
-          return this.rememberAggregateMeshStatus(meshId, statusResult, refreshReason);
+          const rememberedStatus = this.rememberAggregateMeshStatus(meshId, statusResult, refreshReason);
+          logRepoMeshStatusDebug("return_live", {
+            meshId,
+            command: "mesh_status",
+            refreshRequested,
+            refreshReason,
+            meshSource: meshRecord.source,
+            directTruth,
+            summary: summarizeRepoMeshStatusDebug(rememberedStatus)
+          });
+          return rememberedStatus;
         } catch (e) {
           return { success: false, error: e.message };
         }