@adhdev/daemon-core 0.9.77-rc.30 → 0.9.77-rc.32

package/dist/index.js

@@ -978,6 +978,15 @@ var init_mesh_ledger = __esm({
 });
 
 // src/mesh/mesh-work-queue.ts
+var mesh_work_queue_exports = {};
+__export(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`);
@@ -1004,6 +1013,7 @@ function enqueueTask(meshId, message, opts) {
     message,
     status: "pending",
     targetNodeId: opts?.targetNodeId,
+    targetSessionId: opts?.targetSessionId,
     createdAt: (/* @__PURE__ */ new Date()).toISOString(),
     updatedAt: (/* @__PURE__ */ new Date()).toISOString()
   };
@@ -1021,9 +1031,14 @@ function getQueue(meshId, opts) {
 }
 function claimNextTask(meshId, nodeId, sessionId) {
   const queue = readQueue(meshId);
-  let targetIdx = queue.findIndex((q) => q.status === "pending" && q.targetNodeId === nodeId);
+  const hasActiveAssignment = queue.some((q) => q.status === "assigned" && (q.assignedSessionId === sessionId || q.assignedNodeId === nodeId));
+  if (hasActiveAssignment) return null;
+  let targetIdx = queue.findIndex((q) => q.status === "pending" && q.targetSessionId === sessionId);
+  if (targetIdx === -1) {
+    targetIdx = queue.findIndex((q) => q.status === "pending" && q.targetNodeId === nodeId && !q.targetSessionId);
+  }
   if (targetIdx === -1) {
-    targetIdx = queue.findIndex((q) => q.status === "pending" && !q.targetNodeId);
+    targetIdx = queue.findIndex((q) => q.status === "pending" && !q.targetNodeId && !q.targetSessionId);
   }
   if (targetIdx === -1) return null;
   const entry = queue[targetIdx];
@@ -1304,6 +1319,9 @@ function drainPendingMeshCoordinatorEvents() {
 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);
 }
@@ -1428,7 +1446,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) {
@@ -1440,9 +1458,29 @@ function injectMeshSystemMessage(components, args) {
       }
     }
   } 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) {
+        LOG.warn("MeshLedger", `Failed to record task_completed from ready: ${e?.message || e}`);
+      }
+    }
     if (sessionId && nodeId && providerType) {
       remoteIdleSessions.set(`${nodeId}:${sessionId}`, { nodeId, sessionId, providerType });
       setTimeout(() => {
@@ -1453,13 +1491,13 @@ function injectMeshSystemMessage(components, args) {
       }, 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}`);
@@ -1474,7 +1512,7 @@ function injectMeshSystemMessage(components, args) {
       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,
@@ -1492,7 +1530,7 @@ function injectMeshSystemMessage(components, args) {
       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
       });
@@ -1592,7 +1630,7 @@ function handleMeshForwardEvent(components, payload) {
     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)
     }
@@ -1642,6 +1680,7 @@ var init_mesh_events = __esm({
     MAX_PENDING_EVENTS = 50;
     pendingMeshCoordinatorEvents = [];
     MESH_COORDINATOR_EVENTS = /* @__PURE__ */ new Set([
+      "agent:generating_started",
       "agent:generating_completed",
       "agent:waiting_approval",
       "agent:stopped",
@@ -23863,6 +23902,18 @@ var DaemonCommandRouter = class {
           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((s) => typeof s === "string" ? s.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() : "";