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

package/dist/index.js

@@ -32178,10 +32178,12 @@ Follow these recovery rules:
     });
     var mesh_work_queue_exports = {};
     __export2(mesh_work_queue_exports, {
+      cancelTask: () => cancelTask,
       claimNextTask: () => claimNextTask,
       enqueueTask: () => enqueueTask,
       getMeshQueueStats: () => getMeshQueueStats,
       getQueue: () => getQueue,
+      requeueTask: () => requeueTask,
       updateSessionTaskStatus: () => updateSessionTaskStatus,
       updateTaskStatus: () => updateTaskStatus
     });
@@ -32256,6 +32258,40 @@ Follow these recovery rules:
       writeQueue(meshId, queue);
       return queue[idx];
     }
+    function cancelTask(meshId, taskId, opts) {
+      const queue = readQueue(meshId);
+      const idx = queue.findIndex((q2) => q2.id === taskId);
+      if (idx === -1) return null;
+      const now = (/* @__PURE__ */ new Date()).toISOString();
+      queue[idx].status = "cancelled";
+      queue[idx].updatedAt = now;
+      queue[idx].cancelledAt = now;
+      if (opts?.reason) queue[idx].cancelReason = opts.reason;
+      writeQueue(meshId, queue);
+      return queue[idx];
+    }
+    function requeueTask(meshId, taskId, opts) {
+      const queue = readQueue(meshId);
+      const idx = queue.findIndex((q2) => q2.id === taskId);
+      if (idx === -1) return null;
+      const entry = queue[idx];
+      const now = (/* @__PURE__ */ new Date()).toISOString();
+      entry.status = "pending";
+      delete entry.assignedNodeId;
+      delete entry.assignedSessionId;
+      delete entry.cancelledAt;
+      delete entry.cancelReason;
+      if (opts?.clearTargetNode) delete entry.targetNodeId;
+      if (typeof opts?.targetNodeId === "string") entry.targetNodeId = opts.targetNodeId;
+      if (opts?.clearTargetSession !== false) delete entry.targetSessionId;
+      if (typeof opts?.targetSessionId === "string") entry.targetSessionId = opts.targetSessionId;
+      entry.updatedAt = now;
+      entry.requeuedAt = now;
+      entry.requeueCount = (entry.requeueCount || 0) + 1;
+      if (opts?.reason) entry.requeueReason = opts.reason;
+      writeQueue(meshId, queue);
+      return entry;
+    }
     function updateSessionTaskStatus(meshId, sessionId, status) {
       const queue = readQueue(meshId);
       for (let i = queue.length - 1; i >= 0; i--) {
@@ -32274,7 +32310,8 @@ Follow these recovery rules:
         pending: queue.filter((q2) => q2.status === "pending").length,
         assigned: queue.filter((q2) => q2.status === "assigned").length,
         completed: queue.filter((q2) => q2.status === "completed").length,
-        failed: queue.filter((q2) => q2.status === "failed").length
+        failed: queue.filter((q2) => q2.status === "failed").length,
+        cancelled: queue.filter((q2) => q2.status === "cancelled").length
       };
     }
     var import_fs4;
@@ -32662,12 +32699,14 @@ Do NOT retry on this node. Consider reassigning to a different node or asking th
       return "";
     }
     function injectMeshSystemMessage(components, args) {
+      let completedTaskForLedger = null;
       if (args.event === "agent:generating_completed") {
         const sessionId = resolveEventSessionId(args.metadataEvent, args.sourceInstanceId);
         const nodeId = readNonEmptyString(args.nodeId) || readNonEmptyString(args.metadataEvent.meshNodeId);
         const providerType = readNonEmptyString(args.metadataEvent.providerType);
         if (sessionId) {
-          updateSessionTaskStatus(args.meshId, sessionId, "completed");
+          const completedTask = updateSessionTaskStatus(args.meshId, sessionId, "completed");
+          completedTaskForLedger = completedTask ? { id: completedTask.id } : null;
           if (nodeId && providerType) {
             setTimeout(() => {
               tryAssignQueueTask(components, args.meshId, nodeId, sessionId, providerType);
@@ -32680,6 +32719,7 @@ Do NOT retry on this node. Consider reassigning to a different node or asking th
         const providerType = readNonEmptyString(args.metadataEvent.providerType);
         const completedTask = sessionId ? updateSessionTaskStatus(args.meshId, sessionId, "completed") : null;
         if (completedTask) {
+          completedTaskForLedger = { id: completedTask.id };
           try {
             appendLedgerEntry(args.meshId, {
               kind: "task_completed",
@@ -32691,7 +32731,8 @@ Do NOT retry on this node. Consider reassigning to a different node or asking th
                 nodeLabel: args.nodeLabel,
                 taskId: completedTask.id,
                 completedViaReady: true,
-                providerSessionId: readNonEmptyString(args.metadataEvent.providerSessionId) || void 0
+                providerSessionId: readNonEmptyString(args.metadataEvent.providerSessionId) || void 0,
+                finalSummary: readNonEmptyString(args.metadataEvent.finalSummary) || void 0
               }
             });
           } catch (e) {
@@ -32734,7 +32775,9 @@ Do NOT retry on this node. Consider reassigning to a different node or asking th
             payload: {
               event: args.event,
               nodeLabel: args.nodeLabel,
-              providerSessionId: readNonEmptyString(args.metadataEvent.providerSessionId) || void 0
+              taskId: completedTaskForLedger?.id || void 0,
+              providerSessionId: readNonEmptyString(args.metadataEvent.providerSessionId) || void 0,
+              finalSummary: readNonEmptyString(args.metadataEvent.finalSummary) || void 0
             }
           });
         } catch (e) {
@@ -32849,7 +32892,8 @@ Do NOT retry on this node. Consider reassigning to a different node or asking th
         metadataEvent: {
           targetSessionId: readNonEmptyString(payload.targetSessionId) || readNonEmptyString(payload.sessionId) || readNonEmptyString(payload.instanceId),
           providerType: readNonEmptyString(payload.providerType),
-          providerSessionId: readNonEmptyString(payload.providerSessionId)
+          providerSessionId: readNonEmptyString(payload.providerSessionId),
+          finalSummary: readNonEmptyString(payload.finalSummary) || readNonEmptyString(payload.summary)
         }
       });
     }
@@ -35073,6 +35117,11 @@ ${lastSnapshot}`;
             };
           }
           // ─── Script Execution ──────────────────────────
+          invokeCliScript(script, input) {
+            const hasStateFactory = typeof this.cliScripts?.createState === "function";
+            const expectsStateArgument = hasStateFactory || this.scriptState !== null || script.length >= 2;
+            return expectsStateArgument ? script(this.scriptState, input) : script(input);
+          }
           runParseSession() {
             if (typeof this.cliScripts?.parseSession !== "function") {
               this.parseErrorMessage = `${this.cliType} parseSession unavailable`;
@@ -35093,7 +35142,10 @@ ${lastSnapshot}`;
                 scope: this.currentTurnScope,
                 runtimeSettings: this.runtimeSettings
               });
-              const session = this.cliScripts.parseSession(this.scriptState, { ...input, tail, tailScreen: buildCliScreenSnapshot(tail) });
+              const session = this.invokeCliScript(
+                this.cliScripts.parseSession,
+                { ...input, tail, tailScreen: buildCliScreenSnapshot(tail) }
+              );
               this.parseErrorMessage = null;
               return session && typeof session === "object" ? session : null;
             } catch (e) {
@@ -35107,7 +35159,7 @@ ${lastSnapshot}`;
             if (!this.cliScripts?.detectStatus) return null;
             try {
               const screenText = this.terminalScreen.getText();
-              const status = this.cliScripts.detectStatus(this.scriptState, {
+              const status = this.invokeCliScript(this.cliScripts.detectStatus, {
                 tail: text.slice(-500),
                 screenText,
                 rawBuffer: this.accumulatedRawBuffer,
@@ -35126,7 +35178,7 @@ ${lastSnapshot}`;
             try {
               const screenText = this.terminalScreen.getText();
               const buffer = screenText || this.accumulatedBuffer;
-              return this.cliScripts.parseApproval(this.scriptState, {
+              return this.invokeCliScript(this.cliScripts.parseApproval, {
                 buffer,
                 screenText,
                 rawBuffer: this.accumulatedRawBuffer,
@@ -36043,6 +36095,7 @@ ${lastSnapshot}`;
       buildThoughtChatMessage: () => buildThoughtChatMessage,
       buildToolChatMessage: () => buildToolChatMessage,
       buildUserChatMessage: () => buildUserChatMessage,
+      cancelTask: () => cancelTask,
       claimNextTask: () => claimNextTask,
       classifyChatMessageVisibility: () => classifyChatMessageVisibility,
       classifyHotChatSessionsForSubscriptionFlush: () => classifyHotChatSessionsForSubscriptionFlush2,
@@ -36154,6 +36207,7 @@ ${lastSnapshot}`;
       registerExtensionProviders: () => registerExtensionProviders,
       removeNode: () => removeNode,
       removeWorktree: () => removeWorktree,
+      requeueTask: () => requeueTask,
       resetConfig: () => resetConfig,
       resetDebugRuntimeConfig: () => resetDebugRuntimeConfig,
       resetState: () => resetState,
@@ -54960,6 +55014,39 @@ ${(0, import_node_path.resolve)(workspace || os17.tmpdir())}`;
               return { success: false, error: e.message };
             }
           }
+          case "cancel_mesh_queue_task": {
+            const meshId = typeof args?.meshId === "string" ? args.meshId.trim() : "";
+            const taskId = typeof args?.taskId === "string" ? args.taskId.trim() : "";
+            if (!meshId || !taskId) return { success: false, error: "meshId and taskId required" };
+            try {
+              const { cancelTask: cancelTask2 } = await Promise.resolve().then(() => (init_mesh_work_queue(), mesh_work_queue_exports));
+              const reason = typeof args?.reason === "string" ? args.reason : void 0;
+              const task = cancelTask2(meshId, taskId, { reason });
+              if (!task) return { success: false, error: `Queue task '${taskId}' not found` };
+              return { success: true, task };
+            } catch (e) {
+              return { success: false, error: e.message };
+            }
+          }
+          case "requeue_mesh_queue_task": {
+            const meshId = typeof args?.meshId === "string" ? args.meshId.trim() : "";
+            const taskId = typeof args?.taskId === "string" ? args.taskId.trim() : "";
+            if (!meshId || !taskId) return { success: false, error: "meshId and taskId required" };
+            try {
+              const { requeueTask: requeueTask2 } = await Promise.resolve().then(() => (init_mesh_work_queue(), mesh_work_queue_exports));
+              const task = requeueTask2(meshId, taskId, {
+                reason: typeof args?.reason === "string" ? args.reason : void 0,
+                targetNodeId: typeof args?.targetNodeId === "string" ? args.targetNodeId.trim() : void 0,
+                targetSessionId: typeof args?.targetSessionId === "string" ? args.targetSessionId.trim() : void 0,
+                clearTargetNode: args?.clearTargetNode === true,
+                clearTargetSession: args?.clearTargetSession !== false
+              });
+              if (!task) return { success: false, error: `Queue task '${taskId}' not found` };
+              return { success: true, task };
+            } 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() : "";
@@ -55117,7 +55204,13 @@ ${(0, import_node_path.resolve)(workspace || os17.tmpdir())}`;
                   appendLedgerEntry2(meshId, {
                     kind: "node_removed",
                     nodeId,
-                    payload: { worktree: !!node?.isLocalWorktree, sessionCleanupMode }
+                    payload: {
+                      worktree: !!node?.isLocalWorktree,
+                      sessionCleanupMode,
+                      workspace: typeof node?.workspace === "string" ? node.workspace : void 0,
+                      daemonId: typeof node?.daemonId === "string" ? node.daemonId : void 0,
+                      worktreeBranch: typeof node?.worktreeBranch === "string" ? node.worktreeBranch : void 0
+                    }
                   });
                 } catch {
                 }