@adhdev/daemon-standalone 0.9.82-rc.382 → 0.9.82-rc.384

package/dist/index.js

@@ -30108,10 +30108,10 @@ var require_dist3 = __commonJS({
     }
     function getDaemonBuildInfo() {
       if (cached2) return cached2;
-      const commit = readInjected(true ? "70741c4fe19c6f71bcef702e7e149d963d6fd916" : void 0) ?? "unknown";
-      const commitShort = readInjected(true ? "70741c4f" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-      const version2 = readInjected(true ? "0.9.82-rc.382" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-      const builtAt = readInjected(true ? "2026-06-25T13:33:15.097Z" : void 0);
+      const commit = readInjected(true ? "6cca365bcea9757dd350c6bac460ca5a169a9280" : void 0) ?? "unknown";
+      const commitShort = readInjected(true ? "6cca365b" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+      const version2 = readInjected(true ? "0.9.82-rc.384" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+      const builtAt = readInjected(true ? "2026-06-25T15:23:09.439Z" : void 0);
       cached2 = builtAt ? { commit, commitShort, version: version2, builtAt } : { commit, commitShort, version: version2 };
       return cached2;
     }
@@ -44966,8 +44966,7 @@ ${cleanBody}`;
         const idleCoordinators = meshCoordinators.filter((c) => c.idle);
         const generatingCoordinators = meshCoordinators.filter((c) => !c.idle && !c.modalParked);
         const modalParkedCoordinators = meshCoordinators.filter((c) => !c.idle && c.modalParked);
-        const targetCoordinators = idleCoordinators.length > 0 ? idleCoordinators : generatingCoordinators;
-        const forceOnly = idleCoordinators.length === 0;
+        const targetCoordinators = idleCoordinators;
         if (targetCoordinators.length === 0) {
           if (modalParkedCoordinators.length > 0) {
             const liveSessionIds = new Set(
@@ -45034,6 +45033,23 @@ ${cleanBody}`;
                 modalParkedCoordinators.length
               );
             }
+          } else if (generatingCoordinators.length > 0) {
+            let hasPending = true;
+            if (store) {
+              try {
+                hasPending = store.pendingEventCount(meshId) > 0;
+              } catch {
+              }
+            }
+            if (hasPending) {
+              LOG2.info("MeshReconcile", `Reconcile skip \u2192 generating: holding pending event(s) for mesh ${meshId} (${generatingCoordinators.length} coordinator(s) busy; events left queued for the next idle tick)`);
+              recordHeldTerminalEventsToLedger(
+                meshId,
+                drainDaemonIds.length > 0 ? drainDaemonIds : localDaemonId ? [localDaemonId] : [],
+                "generating_no_idle_coordinator",
+                generatingCoordinators.length
+              );
+            }
           }
           continue;
         }
@@ -45047,16 +45063,14 @@ ${cleanBody}`;
         try {
           pendingEvents = drainPendingMeshCoordinatorEvents(
             meshId,
-            drainDaemonIds.length > 0 ? drainDaemonIds : localDaemonId,
-            forceOnly ? { onlyEvents: MESH_FORCE_INJECT_EVENTS } : void 0
+            drainDaemonIds.length > 0 ? drainDaemonIds : localDaemonId
           );
         } catch (e) {
           LOG2.warn("MeshReconcile", `Drain failed for mesh ${meshId}: ${e?.message || e}`);
           continue;
         }
         if (pendingEvents.length === 0) continue;
-        const mode = forceOnly ? "force-drain \u2192 generating" : "inject \u2192 idle";
-        LOG2.info("MeshReconcile", `Reconcile ${mode}: ${pendingEvents.length} pending event(s) \u2192 ${targetCoordinators.length} coordinator(s) for mesh ${meshId}`);
+        LOG2.info("MeshReconcile", `Reconcile inject \u2192 idle: ${pendingEvents.length} pending event(s) \u2192 ${targetCoordinators.length} coordinator(s) for mesh ${meshId}`);
         for (const pending of pendingEvents) {
           const wantSession = readNonEmptyString2(pending.targetCoordinatorSessionId);
           if (wantSession) {
@@ -81969,17 +81983,40 @@ ${mergeTreeErr?.stderr || ""}`;
        * the wider plural-shape scan so a controlbar/modal command targeting a non-primary remote
        * session still resolves its owner — the singular readCachedInlineMeshActiveSessions semantics
        * other consumers depend on stay untouched.
+       *
+       * CANCEL-STOP-RELAY: the session-id cache scan above only matches when the coordinator's
+       * cached status snapshot already lists the worker's session id in a recognized active-sessions
+       * shape. A worktree-clone worker session whose id form/timing differs from the cached snapshot
+       * (or is simply not yet reflected) misses the scan, so a stop that carries the authoritative
+       * owning nodeId (mesh_queue_cancel knows assignedNodeId) used to silently fail to forward.
+       * `ownerNodeIdHint` adds a deterministic fallback: when the session-id scan misses, resolve the
+       * owner daemonId by matching the node by id (meshNodeIdMatches — same form-tolerant compare the
+       * rest of the router uses, no new raw compare). The same self-loopback guard applies to both
+       * paths, so a coordinator-hosted node is still never force-forwarded to a remote form of itself.
        */
-      resolveRemoteMeshSessionOwnerDaemonId(sessionId) {
+      resolveRemoteMeshSessionOwnerDaemonId(sessionId, ownerNodeIdHint) {
         const trimmed = typeof sessionId === "string" ? sessionId.trim() : "";
-        if (!trimmed) return void 0;
+        const nodeHint = typeof ownerNodeIdHint === "string" ? ownerNodeIdHint.trim() : "";
+        if (!trimmed && !nodeHint) return void 0;
         const selfDaemonId = this.deps.statusInstanceId;
-        for (const node of this.collectMeshSessionOwnerCandidateNodes()) {
-          if (!collectMeshNodeHostedSessionIds(node).has(trimmed)) continue;
-          const nodeDaemonId = readMeshNodeDaemonId(readObjectRecord(node));
-          if (!nodeDaemonId) continue;
-          if (selfDaemonId && daemonIdsEquivalent(nodeDaemonId, selfDaemonId)) return void 0;
-          return nodeDaemonId;
+        const candidates = this.collectMeshSessionOwnerCandidateNodes();
+        if (trimmed) {
+          for (const node of candidates) {
+            if (!collectMeshNodeHostedSessionIds(node).has(trimmed)) continue;
+            const nodeDaemonId = readMeshNodeDaemonId(readObjectRecord(node));
+            if (!nodeDaemonId) continue;
+            if (selfDaemonId && daemonIdsEquivalent(nodeDaemonId, selfDaemonId)) return void 0;
+            return nodeDaemonId;
+          }
+        }
+        if (nodeHint) {
+          for (const node of candidates) {
+            if (!meshNodeIdMatches(node, nodeHint)) continue;
+            const nodeDaemonId = readMeshNodeDaemonId(readObjectRecord(node));
+            if (!nodeDaemonId) continue;
+            if (selfDaemonId && daemonIdsEquivalent(nodeDaemonId, selfDaemonId)) return void 0;
+            return nodeDaemonId;
+          }
         }
         return void 0;
       }
@@ -84113,7 +84150,9 @@ ${hintLines.join("\n")}` : "",
             const localInstance = this.deps.instanceManager?.getInstance(targetSessionId);
             const localRegistry = this.deps.sessionRegistry?.get?.(targetSessionId);
             if (!localInstance && !localRegistry) {
-              const ownerDaemonId = this.resolveRemoteMeshSessionOwnerDaemonId(targetSessionId);
+              const meshContext = readObjectRecord(args?.meshContext);
+              const ownerNodeIdHint = readStringValue(meshContext.nodeId);
+              const ownerDaemonId = this.resolveRemoteMeshSessionOwnerDaemonId(targetSessionId, ownerNodeIdHint);
               if (ownerDaemonId) {
                 LOG2.info("Mesh", `[Mesh] Forwarding session-scoped '${cmd}' for remote worker session ${targetSessionId.split("_")[0]} \u2192 daemon ${ownerDaemonId.slice(0, 12)}`);
                 const forwarded = await this.deps.dispatchMeshCommand(ownerDaemonId, cmd, {