adhdev 0.9.82-rc.43 → 0.9.82-rc.45

package/dist/cli/index.js

@@ -46638,6 +46638,70 @@ function readBooleanValue(...values) {
   }
   return void 0;
 }
+function summarizeRepoMeshDebugGit(git) {
+  const record2 = readObjectRecord(git);
+  if (!Object.keys(record2).length) return null;
+  const submodules = Array.isArray(record2.submodules) ? record2.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(record2.isGitRepo),
+    workspace: readStringValue(record2.workspace) ?? null,
+    repoRoot: readStringValue(record2.repoRoot, record2.repo_root) ?? null,
+    branch: readStringValue(record2.branch) ?? null,
+    upstream: readStringValue(record2.upstream) ?? null,
+    upstreamStatus: readStringValue(record2.upstreamStatus, record2.upstream_status) ?? null,
+    headCommit: readStringValue(record2.headCommit, record2.head_commit)?.slice(0, 12) ?? null,
+    ahead: readNumberValue(record2.ahead) ?? null,
+    behind: readNumberValue(record2.behind) ?? null,
+    dirtyCounts: {
+      staged: readNumberValue(record2.staged) ?? 0,
+      modified: readNumberValue(record2.modified) ?? 0,
+      untracked: readNumberValue(record2.untracked) ?? 0,
+      deleted: readNumberValue(record2.deleted) ?? 0,
+      renamed: readNumberValue(record2.renamed) ?? 0
+    },
+    lastCheckedAt: readNumberValue(record2.lastCheckedAt, record2.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() : "";
@@ -46706,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;
@@ -47613,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 = {
@@ -47676,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" };
@@ -49656,8 +49790,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));
@@ -49683,9 +49825,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.",
@@ -49704,6 +49846,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(
@@ -49911,7 +50061,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 };
             }
@@ -98240,6 +98400,84 @@ var daemon_mesh_manager_exports = {};
 __export(daemon_mesh_manager_exports, {
   DaemonMeshManager: () => DaemonMeshManager
 });
+function asRecord(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : {};
+}
+function summarizeMeshCommandArgs(command, args) {
+  if (command === "git_status") {
+    return {
+      workspace: typeof args.workspace === "string" ? args.workspace : null,
+      refreshUpstream: args.refreshUpstream === true,
+      includeSubmodules: args.includeSubmodules === true
+    };
+  }
+  if (command === "mesh_status" || command === "get_mesh") {
+    const inlineMesh = asRecord(args.inlineMesh);
+    const inlineNodes = Array.isArray(inlineMesh.nodes) ? inlineMesh.nodes : [];
+    return {
+      meshId: typeof args.meshId === "string" ? args.meshId : null,
+      requireDirectPeerTruth: args.requireDirectPeerTruth === true,
+      refresh: args.refresh === true,
+      inlineMeshNodes: inlineNodes.length
+    };
+  }
+  return { keys: Object.keys(args).sort() };
+}
+function summarizeMeshCommandGitResult(result) {
+  const envelope = asRecord(result);
+  const nestedResult = asRecord(envelope.result);
+  const status = Object.keys(asRecord(envelope.status)).length ? asRecord(envelope.status) : Object.keys(asRecord(nestedResult.status)).length ? asRecord(nestedResult.status) : Object.keys(envelope).length ? envelope : {};
+  if (!Object.keys(status).length) return null;
+  const submodules = Array.isArray(status.submodules) ? status.submodules.map((entry) => ({
+    path: typeof entry?.path === "string" ? entry.path : null,
+    commit: typeof entry?.commit === "string" ? entry.commit.slice(0, 12) : null,
+    dirty: entry?.dirty === true,
+    outOfSync: entry?.outOfSync === true
+  })) : [];
+  return {
+    workspace: typeof status.workspace === "string" ? status.workspace : null,
+    repoRoot: typeof status.repoRoot === "string" ? status.repoRoot : null,
+    isGitRepo: status.isGitRepo,
+    branch: status.branch ?? null,
+    upstream: status.upstream ?? null,
+    upstreamStatus: status.upstreamStatus ?? null,
+    headCommit: typeof status.headCommit === "string" ? status.headCommit.slice(0, 12) : status.headCommit ?? null,
+    ahead: status.ahead ?? null,
+    behind: status.behind ?? null,
+    dirtyCounts: {
+      staged: status.staged ?? 0,
+      modified: status.modified ?? 0,
+      untracked: status.untracked ?? 0,
+      deleted: status.deleted ?? 0,
+      renamed: status.renamed ?? 0
+    },
+    lastCheckedAt: status.lastCheckedAt ?? null,
+    submoduleCount: submodules.length,
+    submodules
+  };
+}
+function summarizeMeshCommandResult(command, result) {
+  if (command === "git_status") return summarizeMeshCommandGitResult(result);
+  const record2 = asRecord(result);
+  if (command === "mesh_status") {
+    const nodes = Array.isArray(record2.nodes) ? record2.nodes : [];
+    return {
+      success: record2.success,
+      meshId: record2.meshId ?? null,
+      sourceOfTruth: record2.sourceOfTruth ?? null,
+      nodeCount: nodes.length,
+      nodes: nodes.map((node) => ({
+        nodeId: node?.nodeId ?? node?.id ?? null,
+        daemonId: node?.daemonId ?? null,
+        workspace: node?.workspace ?? node?.git?.workspace ?? null,
+        health: node?.health ?? null,
+        gitProbePending: node?.gitProbePending === true,
+        git: summarizeMeshCommandGitResult({ status: node?.git })
+      }))
+    };
+  }
+  return null;
+}
 function interpolateArgs(args, context) {
   const result = {};
   for (const [k, v] of Object.entries(args)) {
@@ -98429,7 +98667,9 @@ var init_daemon_mesh_manager = __esm({
             targetDaemonId,
             sentAt: (/* @__PURE__ */ new Date()).toISOString(),
             peerState: peer.state,
-            success: !error48
+            success: !error48,
+            resultSummary: !error48 ? summarizeMeshCommandGitResult(result) : null,
+            error: error48
           });
         } catch (err) {
           LOG.warn("Mesh", `[Mesh] Failed to send command result: ${err.message}`);
@@ -98523,7 +98763,8 @@ var init_daemon_mesh_manager = __esm({
               queuedAt,
               sentAt,
               peerState: peer.state,
-              transport: peer.isRelay === true ? "relay" : peer.isRelay === false ? "direct" : "unknown"
+              transport: peer.isRelay === true ? "relay" : peer.isRelay === false ? "direct" : "unknown",
+              argsSummary: summarizeMeshCommandArgs(command, args)
             });
             try {
               peer.dataChannel.sendMessage(JSON.stringify(payload));
@@ -98551,7 +98792,8 @@ var init_daemon_mesh_manager = __esm({
             targetDaemonId,
             queuedAt,
             peerState: peer.state,
-            transport: peer.isRelay === true ? "relay" : peer.isRelay === false ? "direct" : "unknown"
+            transport: peer.isRelay === true ? "relay" : peer.isRelay === false ? "direct" : "unknown",
+            argsSummary: summarizeMeshCommandArgs(command, args)
           });
           if (!peer.commandQueue) {
             peer.commandQueue = [];
@@ -98738,7 +98980,8 @@ var init_daemon_mesh_manager = __esm({
                   sentAt,
                   peerState: entry.state,
                   transport: entry.isRelay === true ? "relay" : entry.isRelay === false ? "direct" : "unknown",
-                  flushed: true
+                  flushed: true,
+                  argsSummary: summarizeMeshCommandArgs(item.command, item.args)
                 });
                 dc.sendMessage(JSON.stringify({
                   type: "mesh_command",
@@ -98773,7 +99016,8 @@ var init_daemon_mesh_manager = __esm({
                 requestId: data.requestId,
                 command: data.command,
                 senderDaemonId: targetDaemonId,
-                receivedAt: (/* @__PURE__ */ new Date()).toISOString()
+                receivedAt: (/* @__PURE__ */ new Date()).toISOString(),
+                argsSummary: summarizeMeshCommandArgs(data.command, asRecord(data.args))
               });
               if (this.commandCallback) {
                 this.commandCallback(targetDaemonId, data.command, data.args, data.requestId).catch((e) => {
@@ -98790,7 +99034,9 @@ var init_daemon_mesh_manager = __esm({
                   queuedAt: pending.queuedAt,
                   sentAt: pending.sentAt,
                   receivedAt: (/* @__PURE__ */ new Date()).toISOString(),
-                  success: data.success === true
+                  success: data.success === true,
+                  resultSummary: data.success === true ? summarizeMeshCommandResult(pending.command, data.result) : null,
+                  error: data.success === true ? void 0 : data.error
                 });
                 if (data.success) {
                   pending.resolve(data.result);
@@ -99060,7 +99306,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.82-rc.43" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.82-rc.45" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;