@adhdev/daemon-standalone 0.9.77-rc.31 → 0.9.77-rc.33

package/dist/index.js

@@ -32176,6 +32176,15 @@ Follow these recovery rules:
         meshLedgerEvents = new import_events.EventEmitter();
       }
     });
+    var mesh_work_queue_exports = {};
+    __export2(mesh_work_queue_exports, {
+      claimNextTask: () => claimNextTask,
+      enqueueTask: () => enqueueTask,
+      getMeshQueueStats: () => getMeshQueueStats,
+      getQueue: () => getQueue,
+      updateSessionTaskStatus: () => updateSessionTaskStatus,
+      updateTaskStatus: () => updateTaskStatus
+    });
     function getQueuePath(meshId) {
       const safe = meshId.replace(/[^a-zA-Z0-9_-]/g, "_");
       return (0, import_path4.join)(getLedgerDir(), `${safe}.queue.json`);
@@ -32220,6 +32229,8 @@ Follow these recovery rules:
     }
     function claimNextTask(meshId, nodeId, sessionId) {
       const queue = readQueue(meshId);
+      const hasActiveAssignment = queue.some((q2) => q2.status === "assigned" && (q2.assignedSessionId === sessionId || q2.assignedNodeId === nodeId));
+      if (hasActiveAssignment) return null;
       let targetIdx = queue.findIndex((q2) => q2.status === "pending" && q2.targetSessionId === sessionId);
       if (targetIdx === -1) {
         targetIdx = queue.findIndex((q2) => q2.status === "pending" && q2.targetNodeId === nodeId && !q2.targetSessionId);
@@ -32523,6 +32534,9 @@ Follow these recovery rules:
     function readNonEmptyString(value) {
       return typeof value === "string" && value.trim() ? value.trim() : "";
     }
+    function resolveEventSessionId(event, fallback) {
+      return readNonEmptyString(event.targetSessionId) || readNonEmptyString(event.sessionId) || readNonEmptyString(event.instanceId) || readNonEmptyString(fallback);
+    }
     function isMeshCoordinatorEvent(eventName) {
       return typeof eventName === "string" && MESH_COORDINATOR_EVENTS.has(eventName);
     }
@@ -32581,10 +32595,12 @@ Follow these recovery rules:
         const state = inst.getState();
         const settings = state.settings || {};
         const instMeshId = readNonEmptyString(settings.meshNodeFor);
-        if (instMeshId !== meshId && !settings.launchedByCoordinator) continue;
+        if (instMeshId !== meshId) continue;
         const nodeId = readNonEmptyString(settings.meshNodeId) || readNonEmptyString(settings.nodeId);
         if (!nodeId) continue;
-        if (state.status !== "idle" && state.status !== "stopped" && state.activeChat?.status !== "waiting_input") continue;
+        const status = readNonEmptyString(state.status).toLowerCase();
+        if (["stopped", "failed", "terminated", "exited", "closed"].includes(status)) continue;
+        if (status !== "idle" && state.activeChat?.status !== "waiting_input") continue;
         const sessionId = state.instanceId;
         const providerType = state.type || readNonEmptyString(settings.providerType);
         if (providerType) {
@@ -32647,7 +32663,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 sessionId = resolveEventSessionId(args.metadataEvent, args.sourceInstanceId);
         const nodeId = readNonEmptyString(args.nodeId) || readNonEmptyString(args.metadataEvent.meshNodeId);
         const providerType = readNonEmptyString(args.metadataEvent.providerType);
         if (sessionId) {
@@ -32659,9 +32675,29 @@ Do NOT retry on this node. Consider reassigning to a different node or asking th
           }
         }
       } else if (args.event === "agent:ready") {
-        const sessionId = readNonEmptyString(args.metadataEvent.targetSessionId);
+        const sessionId = resolveEventSessionId(args.metadataEvent, args.sourceInstanceId);
         const nodeId = readNonEmptyString(args.nodeId) || readNonEmptyString(args.metadataEvent.meshNodeId);
         const providerType = readNonEmptyString(args.metadataEvent.providerType);
+        const completedTask = sessionId ? updateSessionTaskStatus(args.meshId, sessionId, "completed") : null;
+        if (completedTask) {
+          try {
+            appendLedgerEntry(args.meshId, {
+              kind: "task_completed",
+              nodeId: nodeId || void 0,
+              sessionId,
+              providerType: providerType || void 0,
+              payload: {
+                event: args.event,
+                nodeLabel: args.nodeLabel,
+                taskId: completedTask.id,
+                completedViaReady: true,
+                providerSessionId: readNonEmptyString(args.metadataEvent.providerSessionId) || void 0
+              }
+            });
+          } catch (e) {
+            LOG2.warn("MeshLedger", `Failed to record task_completed from ready: ${e?.message || e}`);
+          }
+        }
         if (sessionId && nodeId && providerType) {
           remoteIdleSessions.set(`${nodeId}:${sessionId}`, { nodeId, sessionId, providerType });
           setTimeout(() => {
@@ -32672,13 +32708,13 @@ Do NOT retry on this node. Consider reassigning to a different node or asking th
           }, 500);
         }
       } else if (args.event === "agent:generating_started") {
-        const sessionId = readNonEmptyString(args.metadataEvent.targetSessionId);
+        const sessionId = resolveEventSessionId(args.metadataEvent, args.sourceInstanceId);
         const nodeId = readNonEmptyString(args.nodeId) || readNonEmptyString(args.metadataEvent.meshNodeId);
         if (sessionId && nodeId) {
           remoteIdleSessions.delete(`${nodeId}:${sessionId}`);
         }
       } else if (args.event === "agent:stopped") {
-        const sessionId = readNonEmptyString(args.metadataEvent.targetSessionId);
+        const sessionId = resolveEventSessionId(args.metadataEvent, args.sourceInstanceId);
         const nodeId = readNonEmptyString(args.nodeId) || readNonEmptyString(args.metadataEvent.meshNodeId);
         if (sessionId && nodeId) {
           remoteIdleSessions.delete(`${nodeId}:${sessionId}`);
@@ -32693,7 +32729,7 @@ Do NOT retry on this node. Consider reassigning to a different node or asking th
           appendLedgerEntry(args.meshId, {
             kind: ledgerKind,
             nodeId: readNonEmptyString(args.nodeId) || readNonEmptyString(args.metadataEvent.meshNodeId) || void 0,
-            sessionId: readNonEmptyString(args.metadataEvent.targetSessionId) || void 0,
+            sessionId: resolveEventSessionId(args.metadataEvent, args.sourceInstanceId) || void 0,
             providerType: readNonEmptyString(args.metadataEvent.providerType) || void 0,
             payload: {
               event: args.event,
@@ -32711,7 +32747,7 @@ Do NOT retry on this node. Consider reassigning to a different node or asking th
           const mesh = getMesh(args.meshId);
           const maxRetries = mesh?.policy?.maxTaskRetries ?? 1;
           recoveryContext = getSessionRecoveryContext(args.meshId, {
-            sessionId: readNonEmptyString(args.metadataEvent.targetSessionId) || void 0,
+            sessionId: resolveEventSessionId(args.metadataEvent, args.sourceInstanceId) || void 0,
             nodeId: readNonEmptyString(args.nodeId) || readNonEmptyString(args.metadataEvent.meshNodeId) || void 0,
             maxRetries
           });
@@ -32811,7 +32847,7 @@ Do NOT retry on this node. Consider reassigning to a different node or asking th
         nodeLabel,
         event: eventName,
         metadataEvent: {
-          targetSessionId: readNonEmptyString(payload.targetSessionId) || readNonEmptyString(payload.sessionId),
+          targetSessionId: readNonEmptyString(payload.targetSessionId) || readNonEmptyString(payload.sessionId) || readNonEmptyString(payload.instanceId),
           providerType: readNonEmptyString(payload.providerType),
           providerSessionId: readNonEmptyString(payload.providerSessionId)
         }
@@ -32865,6 +32901,7 @@ Do NOT retry on this node. Consider reassigning to a different node or asking th
         MAX_PENDING_EVENTS = 50;
         pendingMeshCoordinatorEvents = [];
         MESH_COORDINATOR_EVENTS = /* @__PURE__ */ new Set([
+          "agent:generating_started",
           "agent:generating_completed",
           "agent:waiting_approval",
           "agent:stopped",
@@ -54911,6 +54948,18 @@ ${(0, import_node_path.resolve)(workspace || os17.tmpdir())}`;
               return { success: false, error: e.message };
             }
           }
+          case "get_mesh_queue": {
+            const meshId = typeof args?.meshId === "string" ? args.meshId.trim() : "";
+            if (!meshId) return { success: false, error: "meshId required" };
+            try {
+              const { getQueue: getQueue2 } = await Promise.resolve().then(() => (init_mesh_work_queue(), mesh_work_queue_exports));
+              const status = Array.isArray(args?.status) ? args.status.map((s15) => typeof s15 === "string" ? s15.trim() : "").filter(Boolean) : void 0;
+              const queue = getQueue2(meshId, { status });
+              return { success: true, queue };
+            } catch (e) {
+              return { success: false, error: e.message };
+            }
+          }
           case "add_mesh_node": {
             const meshId = typeof args?.meshId === "string" ? args.meshId.trim() : "";
             const workspace = typeof args?.workspace === "string" ? args.workspace.trim() : "";