@adhdev/daemon-standalone 0.9.77-rc.42 → 0.9.77-rc.43

package/package.json

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

package/vendor/mcp-server/index.js

@@ -25686,6 +25686,7 @@ function addNode(meshId, opts) {
     workspace: opts.workspace.trim(),
     repoRoot: opts.repoRoot,
     daemonId: opts.daemonId,
+    machineId: opts.machineId,
     userOverrides: opts.userOverrides || {},
     policy: opts.policy || {},
     isLocalWorktree: opts.isLocalWorktree,
@@ -53690,6 +53691,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
                   workspace: result.worktreePath,
                   repoRoot: result.worktreePath,
                   daemonId: sourceNode.daemonId,
+                  machineId: sourceNode.machineId ?? sourceNode.machine_id,
                   userOverrides: { ...sourceNode.userOverrides || {} },
                   policy: { ...sourceNode.policy || {} },
                   isLocalWorktree: true,
@@ -53703,6 +53705,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
                   workspace: result.worktreePath,
                   repoRoot: result.worktreePath,
                   daemonId: sourceNode.daemonId,
+                  machineId: sourceNode.machineId ?? sourceNode.machine_id,
                   userOverrides: { ...sourceNode.userOverrides || {} },
                   isLocalWorktree: true,
                   worktreeBranch: result.branch,
@@ -58153,14 +58156,40 @@ function resolveCoordinatorNode(ctx) {
     if (preferred) return preferred;
   }
   if (ctx.localMachineId) {
-    const byMachine = ctx.mesh.nodes.find((n) => n.machineId === ctx.localMachineId);
+    const byMachine = ctx.mesh.nodes.find((n) => readNodeMachineId(n) === ctx.localMachineId);
     if (byMachine) return byMachine;
   }
   if (ctx.localDaemonId) {
-    return ctx.mesh.nodes.find((n) => n.daemonId === ctx.localDaemonId);
+    return ctx.mesh.nodes.find((n) => readNodeDaemonId(n) === ctx.localDaemonId);
   }
   return void 0;
 }
+function readNodeMachineId(node) {
+  return readString(node.machineId) || readString(node.machine_id);
+}
+function readNodeDaemonId(node) {
+  return readString(node.daemonId) || readString(node.daemon_id);
+}
+function isDirectLocalNode(ctx, node) {
+  const machineId = readNodeMachineId(node);
+  const daemonId = readNodeDaemonId(node);
+  return Boolean(
+    ctx.localMachineId && machineId === ctx.localMachineId || ctx.localDaemonId && daemonId === ctx.localDaemonId
+  );
+}
+function findClonedFromNode(ctx, node) {
+  const clonedFromNodeId = readString(node.clonedFromNodeId) || readString(node.cloned_from_node_id);
+  if (!clonedFromNodeId) return void 0;
+  return ctx.mesh.nodes.find((n) => n.id === clonedFromNodeId || n.nodeId === clonedFromNodeId || n.node_id === clonedFromNodeId);
+}
+function isLocalControlPlaneNode(ctx, node) {
+  if (isDirectLocalNode(ctx, node)) return true;
+  if (node.isLocalWorktree === true) {
+    const sourceNode = findClonedFromNode(ctx, node);
+    if (sourceNode && isDirectLocalNode(ctx, sourceNode)) return true;
+  }
+  return false;
+}
 function meshSessionCacheKey(nodeId, runtimeSessionId) {
   return `${nodeId}:${runtimeSessionId}`;
 }
@@ -58352,7 +58381,7 @@ function summarizeBranchConvergence(nodes) {
   };
 }
 async function commandForNode(ctx, node, command, args = {}) {
-  const isLocalNode = ctx.localMachineId && node.machineId === ctx.localMachineId || ctx.localDaemonId && node.daemonId === ctx.localDaemonId;
+  const isLocalNode = isLocalControlPlaneNode(ctx, node);
   if (ctx.transport instanceof IpcTransport && node.daemonId && !isLocalNode) {
     return ctx.transport.meshCommand(node.daemonId, command, args);
   }
@@ -58780,7 +58809,7 @@ async function meshEnqueueTask(ctx, args) {
       });
       const dispatchPromises = [];
       for (const node of ctx.mesh.nodes) {
-        const isLocalNode = ctx.localMachineId && node.machineId === ctx.localMachineId || ctx.localDaemonId && node.daemonId === ctx.localDaemonId;
+        const isLocalNode = isLocalControlPlaneNode(ctx, node);
         if (isLocalNode || !node.daemonId) continue;
         dispatchPromises.push(
           ipcDispatchToRemoteAgent(ctx, node, { message: args.message }).then((result) => {
@@ -58891,7 +58920,7 @@ async function meshSendTask(ctx, args) {
       });
       return JSON.stringify(res);
     }
-    const isLocalNode = ctx.localMachineId && node.machineId === ctx.localMachineId || ctx.localDaemonId && node.daemonId === ctx.localDaemonId;
+    const isLocalNode = isLocalControlPlaneNode(ctx, node);
     if (ctx.transport instanceof IpcTransport && node.daemonId && !isLocalNode) {
       const cached2 = meshSessionProviderMetadata.get(meshSessionCacheKey(args.node_id, args.session_id || ""));
       const result = await ipcDispatchToRemoteAgent(ctx, node, {
@@ -59106,7 +59135,7 @@ async function meshLaunchSession(ctx, args) {
       });
     } catch {
     }
-    const isLocalNode = ctx.localMachineId && node.machineId === ctx.localMachineId || ctx.localDaemonId && node.daemonId === ctx.localDaemonId;
+    const isLocalNode = isLocalControlPlaneNode(ctx, node);
     if (ctx.transport instanceof IpcTransport && node.daemonId && !isLocalNode) {
       ctx.transport.meshCommand(node.daemonId, "trigger_mesh_queue", { meshId: ctx.mesh.id }).catch(() => {
       });