@adhdev/daemon-core 0.9.77-rc.20 → 0.9.77-rc.22

package/dist/index.mjs

@@ -1311,15 +1311,35 @@ function formatCompletionMetadata(event) {
 }
 function tryAssignQueueTask(components, meshId, nodeId, sessionId, providerType) {
   const task = claimNextTask(meshId, nodeId, sessionId);
-  if (!task) return false;
+  if (!task) {
+    return false;
+  }
   LOG.info("MeshQueue", `Node ${nodeId} (${sessionId}) pulled task ${task.id}`);
+  const mesh = getMesh(meshId);
+  const node = mesh?.nodes.find((n) => n.id === nodeId);
+  if (node?.daemonId && components.dispatchMeshCommand) {
+    const isLocalNode = components.cliManager.adapters.has(sessionId);
+    if (!isLocalNode) {
+      components.dispatchMeshCommand(node.daemonId, "agent_command", {
+        targetSessionId: sessionId,
+        cliType: providerType,
+        action: "send_chat",
+        message: task.message
+      }).catch((e) => {
+        LOG.error("MeshQueue", `Failed to dispatch task via P2P to remote node ${nodeId}: ${e?.message}`);
+        updateTaskStatus(meshId, task.id, "failed");
+      });
+      return true;
+    }
+  }
   components.cliManager.handleCliCommand("agent_command", {
     targetSessionId: sessionId,
     cliType: providerType,
     action: "send_chat",
     message: task.message
   }).catch((e) => {
-    LOG.error("MeshQueue", `Failed to dispatch task to node ${nodeId}: ${e?.message}`);
+    LOG.error("MeshQueue", `Failed to dispatch task locally to node ${nodeId}: ${e?.message}`);
+    updateTaskStatus(meshId, task.id, "failed");
   });
   return true;
 }
@@ -1389,7 +1409,7 @@ Do NOT retry on this node. Consider reassigning to a different node or asking th
 function injectMeshSystemMessage(components, args) {
   if (args.event === "agent:generating_completed") {
     const sessionId = readNonEmptyString(args.metadataEvent.targetSessionId);
-    const nodeId = readNonEmptyString(args.metadataEvent.nodeId) || readNonEmptyString(args.metadataEvent.meshNodeId);
+    const nodeId = readNonEmptyString(args.nodeId) || readNonEmptyString(args.metadataEvent.meshNodeId);
     const providerType = readNonEmptyString(args.metadataEvent.providerType);
     if (sessionId) {
       updateSessionTaskStatus(args.meshId, sessionId, "completed");
@@ -1401,7 +1421,7 @@ function injectMeshSystemMessage(components, args) {
     }
   } else if (args.event === "agent:ready") {
     const sessionId = readNonEmptyString(args.metadataEvent.targetSessionId);
-    const nodeId = readNonEmptyString(args.metadataEvent.nodeId) || readNonEmptyString(args.metadataEvent.meshNodeId);
+    const nodeId = readNonEmptyString(args.nodeId) || readNonEmptyString(args.metadataEvent.meshNodeId);
     const providerType = readNonEmptyString(args.metadataEvent.providerType);
     if (sessionId && nodeId && providerType) {
       setTimeout(() => {
@@ -1419,7 +1439,7 @@ function injectMeshSystemMessage(components, args) {
     try {
       appendLedgerEntry(args.meshId, {
         kind: ledgerKind,
-        nodeId: readNonEmptyString(args.metadataEvent.nodeId) || readNonEmptyString(args.metadataEvent.meshNodeId) || void 0,
+        nodeId: readNonEmptyString(args.nodeId) || readNonEmptyString(args.metadataEvent.meshNodeId) || void 0,
         sessionId: readNonEmptyString(args.metadataEvent.targetSessionId) || void 0,
         providerType: readNonEmptyString(args.metadataEvent.providerType) || void 0,
         payload: {
@@ -1439,7 +1459,7 @@ function injectMeshSystemMessage(components, args) {
       const maxRetries = mesh?.policy?.maxTaskRetries ?? 1;
       recoveryContext = getSessionRecoveryContext(args.meshId, {
         sessionId: readNonEmptyString(args.metadataEvent.targetSessionId) || void 0,
-        nodeId: readNonEmptyString(args.metadataEvent.nodeId) || readNonEmptyString(args.metadataEvent.meshNodeId) || void 0,
+        nodeId: readNonEmptyString(args.nodeId) || readNonEmptyString(args.metadataEvent.meshNodeId) || void 0,
         maxRetries
       });
       recoveryContext.failedProviderType = readNonEmptyString(args.metadataEvent.providerType) || null;
@@ -1534,6 +1554,7 @@ function handleMeshForwardEvent(components, payload) {
   const nodeLabel = nodeId ? `Node '${nodeId}'` : workspace ? `Agent at ${workspace}` : "Remote agent";
   return injectMeshSystemMessage(components, {
     meshId,
+    nodeId,
     nodeLabel,
     event: eventName,
     metadataEvent: {
@@ -1563,10 +1584,12 @@ function setupMeshEventForwarding(components) {
     if (!meshId) return;
     const targetNode = mesh?.nodes?.find((n) => n.workspace === workspace);
     const runtimeNodeId = readNonEmptyString(settings.meshNodeId);
+    const resolvedNodeId = targetNode?.id || runtimeNodeId;
     const nodeLabel = targetNode ? `Node '${targetNode.id}'` : runtimeNodeId ? `Node '${runtimeNodeId}'` : `Agent at ${workspace}`;
     injectMeshSystemMessage(components, {
       meshId,
       sourceInstanceId: instanceId,
+      nodeId: resolvedNodeId,
       nodeLabel,
       event: event.event,
       metadataEvent: event
@@ -32112,7 +32135,8 @@ async function initDaemonComponents(config) {
     cdpManagers,
     sessionRegistry,
     detectedIdes: detectedIdesRef,
-    refreshProviderAvailability
+    refreshProviderAvailability,
+    dispatchMeshCommand: config.dispatchMeshCommand
   };
   setupMeshEventForwarding(components);
   return components;