@adhdev/daemon-standalone 0.9.82-rc.286 → 0.9.82-rc.288

package/dist/index.js

@@ -29983,10 +29983,10 @@ var require_dist3 = __commonJS({
     }
     function getDaemonBuildInfo() {
       if (cached2) return cached2;
-      const commit = readInjected(true ? "ff6934b27530406c46b2c1835f9f3708f8fa4aba" : void 0) ?? "unknown";
-      const commitShort = readInjected(true ? "ff6934b2" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-      const version2 = readInjected(true ? "0.9.82-rc.286" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-      const builtAt = readInjected(true ? "2026-06-16T00:50:27.543Z" : void 0);
+      const commit = readInjected(true ? "b17916645417b641feddfdaa6e5b249aea09f12a" : void 0) ?? "unknown";
+      const commitShort = readInjected(true ? "b1791664" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+      const version2 = readInjected(true ? "0.9.82-rc.288" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+      const builtAt = readInjected(true ? "2026-06-16T03:12:32.272Z" : void 0);
       cached2 = builtAt ? { commit, commitShort, version: version2, builtAt } : { commit, commitShort, version: version2 };
       return cached2;
     }
@@ -37023,10 +37023,11 @@ Next step: ${nextStep}`;
       const sessionId = readNonEmptyString2(instanceId);
       let workspace = "";
       let coordinatorDaemonId = "";
+      let runtimeNodeId = "";
       const reject = (rejectionReason) => ({
         isDelegate: false,
         meshId: "",
-        nodeId: "",
+        nodeId: runtimeNodeId,
         nodeLabel: "",
         coordinatorDaemonId,
         workspace,
@@ -37040,6 +37041,7 @@ Next step: ${nextStep}`;
       if (!workspace) return reject("no_workspace");
       const settings = readSettings(state);
       coordinatorDaemonId = readNonEmptyString2(settings.meshCoordinatorDaemonId);
+      runtimeNodeId = readNonEmptyString2(settings.meshNodeId);
       const coordinatorMeshId = readNonEmptyString2(settings.meshCoordinatorFor);
       let meshIdFromDirectDispatch = "";
       if (coordinatorMeshId) {
@@ -37060,7 +37062,6 @@ Next step: ${nextStep}`;
       const meshId = meshIdFromRuntime || readNonEmptyString2(mesh?.id);
       if (!meshId) return reject("mesh_unresolved");
       const targetNode = mesh?.nodes?.find((n) => n.workspace === workspace);
-      const runtimeNodeId = readNonEmptyString2(settings.meshNodeId);
       const nodeId = readNonEmptyString2(targetNode?.id) || runtimeNodeId;
       const nodeLabel = targetNode ? `Node '${targetNode.id}'` : runtimeNodeId ? `Node '${runtimeNodeId}'` : `Agent at ${workspace}`;
       return {
@@ -38226,10 +38227,10 @@ Next step: ${nextStep}`;
       if (!isMeshCoordinatorEvent(eventName)) {
         return { success: false, error: "unsupported mesh event" };
       }
-      const meshId = readNonEmptyString2(payload.meshId);
-      if (!meshId) return { success: false, error: "meshId required" };
       const nodeId = readNonEmptyString2(payload.nodeId);
       const workspace = readNonEmptyString2(payload.workspace);
+      const meshId = readNonEmptyString2(payload.meshId) || (workspace ? readNonEmptyString2(getCachedMeshByWorkspace(workspace)?.id) : "");
+      if (!meshId) return { success: false, error: "meshId required" };
       const nodeLabel = nodeId ? `Node '${nodeId}'` : workspace ? `Agent at ${workspace}` : "Remote agent";
       const relayModalMessage = readNonEmptyString2(payload.modalMessage);
       const relayModalButtons = Array.isArray(payload.modalButtons) ? payload.modalButtons.filter((b) => typeof b === "string" && b.trim().length > 0) : null;
@@ -38268,6 +38269,24 @@ Next step: ${nextStep}`;
         }
       });
     }
+    function forwardUnresolvedDelegateEvent(components, routing, event) {
+      const coordinatorDaemonId = readNonEmptyString2(routing.coordinatorDaemonId);
+      if (!coordinatorDaemonId) return false;
+      if (!components.dispatchMeshCommand) return false;
+      const eventName = readNonEmptyString2(event.event);
+      if (!eventName) return false;
+      const payload = {
+        ...event,
+        event: eventName,
+        nodeId: readNonEmptyString2(routing.nodeId) || readNonEmptyString2(event.meshNodeId) || void 0,
+        workspace: readNonEmptyString2(routing.workspace) || readNonEmptyString2(event.workspace) || void 0
+      };
+      Promise.resolve(components.dispatchMeshCommand(coordinatorDaemonId, "mesh_forward_event", payload)).catch((e) => {
+        LOG2.warn("MeshEvents", `Fallback forward of ${eventName} to coordinator ${coordinatorDaemonId} failed: ${e?.message || e}`);
+      });
+      LOG2.info("MeshEvents", `Fallback-forwarded ${eventName} for unresolved-mesh worker at ${routing.workspace || "(no workspace)"} to coordinator daemon ${coordinatorDaemonId}`);
+      return true;
+    }
     function setupMeshEventForwarding(components) {
       components.instanceManager.onEvent((event) => {
         if (event.event === "agent:ready" || event.event === "agent:generating_completed") {
@@ -38317,6 +38336,9 @@ Next step: ${nextStep}`;
           getMeshByWorkspace: (workspace) => getCachedMeshByWorkspace(workspace)
         });
         if (!routing.isDelegate) {
+          if (isUnroutableDelegateRejection(routing) && forwardUnresolvedDelegateEvent(components, routing, event)) {
+            return;
+          }
           recordUnroutableDelegateEvent(routing, event.event);
           return;
         }
@@ -38426,6 +38448,20 @@ Next step: ${nextStep}`;
       if (!hostDaemonId) return true;
       return daemonIds.includes(hostDaemonId);
     }
+    function resolveCoordinatorSelfIds(mesh, drainDaemonIds) {
+      const ids = new Set(drainDaemonIds);
+      for (const node of mesh.nodes) {
+        const nodeDaemonId = readNonEmptyString2(node.daemonId);
+        const nodeMachineId = readNonEmptyString2(node.machineId);
+        const isSelf = nodeDaemonId && drainDaemonIds.includes(nodeDaemonId) || nodeMachineId && drainDaemonIds.includes(nodeMachineId);
+        if (!isSelf) continue;
+        if (nodeDaemonId) ids.add(nodeDaemonId);
+        if (nodeMachineId) ids.add(nodeMachineId);
+      }
+      const hostDaemonId = readNonEmptyString2(mesh.meshHost?.hostDaemonId);
+      if (hostDaemonId && ids.has(hostDaemonId)) ids.add(hostDaemonId);
+      return [...ids];
+    }
     function findLiveCoordinators(components) {
       const out = [];
       for (const inst of components.instanceManager.getByCategory("cli")) {
@@ -38459,9 +38495,10 @@ Next step: ${nextStep}`;
       })();
       if (dispatchMeshCommand) {
         for (const mesh of listMeshes()) {
-          if (!daemonHostsMesh(mesh, drainDaemonIds)) continue;
+          const selfIds = resolveCoordinatorSelfIds(mesh, drainDaemonIds);
+          if (!daemonHostsMesh(mesh, selfIds)) continue;
           try {
-            await pullRemoteNodeQueues(components, mesh, localDaemonId, drainDaemonIds);
+            await pullRemoteNodeQueues(components, mesh, localDaemonId, selfIds);
           } catch (e) {
             LOG2.warn("MeshReconcile", `Remote node pull failed for mesh ${mesh.id}: ${e?.message || e}`);
           }
@@ -38509,15 +38546,16 @@ Next step: ${nextStep}`;
         }
       }
     }
-    async function pullRemoteNodeQueues(components, mesh, localDaemonId, drainDaemonIds) {
+    async function pullRemoteNodeQueues(components, mesh, localDaemonId, candidateDaemonIds) {
       const dispatchMeshCommand = components.dispatchMeshCommand;
       if (!dispatchMeshCommand) return;
       const meshId = mesh.id;
-      const pulls = drainDaemonIds.length > 0 ? drainDaemonIds.map((id) => ({ meshId, coordinatorDaemonId: id })) : [{ meshId }];
+      const pulls = candidateDaemonIds.length > 0 ? candidateDaemonIds.map((id) => ({ meshId, coordinatorDaemonId: id })) : [{ meshId }];
       for (const node of mesh.nodes) {
         const nodeDaemonId = readNonEmptyString2(node.daemonId);
         if (!nodeDaemonId) continue;
         if (localDaemonId && nodeDaemonId === localDaemonId) continue;
+        if (candidateDaemonIds.includes(nodeDaemonId)) continue;
         for (const pendingEventArgs of pulls) {
           let events;
           try {