@adhdev/daemon-standalone 0.9.82-rc.371 → 0.9.82-rc.373

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-standalone",
-  "version": "0.9.82-rc.371",
+  "version": "0.9.82-rc.373",
   "description": "ADHDev standalone daemon — embedded HTTP/WS server for local dashboard",
   "main": "dist/index.js",
   "bin": {

package/vendor/mcp-server/index.js

@@ -1210,6 +1210,7 @@ function summarizeCompactSubmodules(submodules) {
     ...outOfSync.length > 0 ? { outOfSyncPaths: outOfSync } : {}
   };
 }
+var MESH_COMPACT_PRESERVED_MARKER_FIELDS = ["dataFreshness"];
 function compactMeshStatusNode(entry) {
   if (!entry || typeof entry !== "object") return entry;
   const next = { ...entry };
@@ -1248,8 +1249,9 @@ function compactMeshStatusNode(entry) {
     };
   }
   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)) {
-    if (k === "git" || k === "machine" || k === "branchConvergence" || k === "staleDaemonBuild" || k === "sessions" || k === "dataFreshness") continue;
+    if (elideSkip.has(k)) continue;
     next[k] = elideLargeNestedValue(k, next[k]);
   }
   return next;
@@ -1289,6 +1291,10 @@ function minimalCompactNode(entry) {
     reason: entry.branchConvergence.reason,
     branch: entry.branchConvergence.branch
   } : void 0;
+  const preservedMarkers = {};
+  for (const field of MESH_COMPACT_PRESERVED_MARKER_FIELDS) {
+    if (entry[field] !== void 0) preservedMarkers[field] = entry[field];
+  }
   return {
     nodeId: entry.nodeId,
     workspace: entry.workspace,
@@ -1303,10 +1309,7 @@ function minimalCompactNode(entry) {
     ...entry.launchBlockedReason !== void 0 ? { launchBlockedReason: entry.launchBlockedReason } : {},
     ...bc ? { branchConvergence: bc } : {},
     ...entry.sessionSummary ? { sessionSummary: entry.sessionSummary } : {},
-    // The freshness/reachability marker is exactly the signal a coordinator needs
-    // on a QUIET node — is this idle peer live, cached, or unreachable? — and it is
-    // tiny (6 scalar fields), so keep it even on the minimal stub.
-    ...entry.dataFreshness !== void 0 ? { dataFreshness: entry.dataFreshness } : {},
+    ...preservedMarkers,
     folded: true
   };
 }
@@ -2867,22 +2870,12 @@ async function meshStatus(ctx, args = {}) {
         noFallbackReason: failure.noFallbackReason
       });
     }
-    const freshnessDaemonId = readNodeDaemonId(node);
-    const freshnessStatus = {
+    entry.dataFreshness = (0, import_daemon_core.buildMeshNodeProbeFreshness)({
       git: entry.git,
-      connection: { state: liveTruthProbed ? "connected" : "disconnected" }
-    };
-    if (liveTruthProbed) freshnessStatus[import_daemon_core.MESH_NODE_LIVE_TRUTH_MARKER] = true;
-    entry.dataFreshness = (0, import_daemon_core.buildMeshNodeDataFreshness)({
-      status: freshnessStatus,
-      node,
-      isSelfNode: entry.machine?.sameMachine === true,
-      daemonId: freshnessDaemonId,
       liveTruthProbed,
-      // A probe that threw against a configured (daemonId-bearing) peer is an
-      // unreachable peer; an unconfigured node (no daemonId) falls through to
-      // the classifier's `unconfigured` branch instead of being mislabeled.
-      directTruthUnavailable: !liveTruthProbed && !!freshnessDaemonId
+      isSelfNode: entry.machine?.sameMachine === true,
+      daemonId: readNodeDaemonId(node),
+      node
     });
     const recoveryContext = (0, import_daemon_core.getSessionRecoveryContext)(mesh.id, { nodeId: node.id });
     if (recoveryContext.consecutiveNodeFailures > 0) {
@@ -3754,6 +3747,19 @@ async function meshSendTask(ctx, args) {
   if (node.policy?.readOnly) {
     return JSON.stringify({ error: `Node '${args.node_id}' is read-only` });
   }
+  if (taskMode === "convergence" && node.isLocalWorktree === true) {
+    return JSON.stringify({
+      success: false,
+      recoverable: true,
+      code: "mesh_convergence_target_is_worktree",
+      reason: "mesh_convergence_target_is_worktree",
+      nodeId: args.node_id,
+      sessionId: args.session_id,
+      taskMode,
+      error: `Node '${args.node_id}' is a worktree clone; a convergence task is base-only (it merges/pushes onto base). Dispatching it to a worktree session risks a multi-worktree push/deploy race.`,
+      nextAction: `Dispatch the convergence task to the base node for this mesh, or run the deterministic fast-forward convergence path (mesh_fast_forward_node / mesh_refine_node) instead of mesh_send_task.`
+    });
+  }
   let explicitTargetSession;
   if (args.session_id && isWorkerTaskMode(taskMode)) {
     try {