@adhdev/daemon-core 0.9.82-rc.133 → 0.9.82-rc.135

package/dist/index.js

@@ -2819,14 +2819,26 @@ function findRecentTerminalLedgerEvidence(args) {
     const entry = entries[i];
     if (entry.kind !== "task_completed" && entry.kind !== "task_failed" && entry.kind !== "task_stalled") continue;
     if (args.sessionId && entry.sessionId === args.sessionId) {
-      return { kind: entry.kind, payload: entry.payload || {}, timestamp: entry.timestamp };
+      return { id: entry.id, kind: entry.kind, payload: entry.payload || {}, timestamp: entry.timestamp };
     }
     if (!args.sessionId && args.nodeId && entry.nodeId === args.nodeId) {
-      return { kind: entry.kind, payload: entry.payload || {}, timestamp: entry.timestamp };
+      return { id: entry.id, kind: entry.kind, payload: entry.payload || {}, timestamp: entry.timestamp };
     }
   }
   return null;
 }
+function hasDispatchAfterTerminal(meshId, sessionId, terminalId) {
+  const entries = readLedgerEntries(meshId);
+  let pastTerminal = false;
+  for (const entry of entries) {
+    if (!pastTerminal) {
+      if (entry.id === terminalId) pastTerminal = true;
+      continue;
+    }
+    if (entry.kind === "task_dispatched" && entry.sessionId === sessionId) return true;
+  }
+  return false;
+}
 function buildLongGeneratingCompletionReconciliation(args) {
   const sessionId = resolveEventSessionId(args.metadataEvent, args.sourceInstanceId);
   const nodeId = readNonEmptyString2(args.nodeId) || readNonEmptyString2(args.metadataEvent.meshNodeId);
@@ -3331,13 +3343,16 @@ function injectMeshSystemMessage(components, args) {
       nodeId: eventNodeId || void 0
     });
     if (terminal?.kind === "task_completed" && !sessionHasActiveAssignment(args.meshId, eventSessionId)) {
-      const terminalProviderSessionId = readNonEmptyString2(terminal.payload.providerSessionId);
-      const terminalFinalSummary = readNonEmptyString2(terminal.payload.finalSummary);
-      const eventProviderSessionId = readNonEmptyString2(args.metadataEvent.providerSessionId);
-      const eventFinalSummary = readNonEmptyString2(args.metadataEvent.finalSummary);
-      if (terminalProviderSessionId && terminalProviderSessionId === eventProviderSessionId || terminalFinalSummary && terminalFinalSummary === eventFinalSummary || args.metadataEvent.source === "long_generating_reconciliation") {
-        LOG.info("MeshEvents", `Suppressed duplicate completion with existing terminal ledger evidence for mesh ${args.meshId} session ${eventSessionId}`);
-        return { success: true, forwarded: 0, suppressed: true, duplicateCompletion: true, terminalLedgerEvidence: true };
+      const newDispatchAfterTerminal = hasDispatchAfterTerminal(args.meshId, eventSessionId, terminal.id);
+      if (!newDispatchAfterTerminal) {
+        const terminalProviderSessionId = readNonEmptyString2(terminal.payload.providerSessionId);
+        const terminalFinalSummary = readNonEmptyString2(terminal.payload.finalSummary);
+        const eventProviderSessionId = readNonEmptyString2(args.metadataEvent.providerSessionId);
+        const eventFinalSummary = readNonEmptyString2(args.metadataEvent.finalSummary);
+        if (terminalProviderSessionId && terminalProviderSessionId === eventProviderSessionId || terminalFinalSummary && terminalFinalSummary === eventFinalSummary || args.metadataEvent.source === "long_generating_reconciliation") {
+          LOG.info("MeshEvents", `Suppressed duplicate completion with existing terminal ledger evidence for mesh ${args.meshId} session ${eventSessionId}`);
+          return { success: true, forwarded: 0, suppressed: true, duplicateCompletion: true, terminalLedgerEvidence: true };
+        }
       }
     }
     const duplicateCompletion = isDuplicateMeshCompletionEvent({
@@ -21352,7 +21367,10 @@ var CliProviderInstance = class {
     if (!isCliGeneratingLikeStatus(parsedRawStatus)) return false;
     if (adapterRawStatus !== "idle") return false;
     if (hasNonEmptyCliModalButtons(parsedStatus?.activeModal ?? parsedStatus?.modal)) return false;
-    return !this.hasAdapterPendingResponse();
+    if (this.hasAdapterPendingResponse()) return false;
+    const adapterAny = this.adapter;
+    if (typeof adapterAny?.responseBuffer === "string" && adapterAny.responseBuffer.trim()) return false;
+    return true;
   }
   getCompletedFinalizationBlock(latestVisibleStatus) {
     if (latestVisibleStatus !== "idle") return { reason: `status:${latestVisibleStatus}`, terminal: true };
@@ -21550,13 +21568,30 @@ var CliProviderInstance = class {
       } else if (newStatus === "idle" && (this.lastStatus === "generating" || this.lastStatus === "waiting_approval")) {
         const duration = this.generatingStartedAt ? Math.round((now - this.generatingStartedAt) / 1e3) : 0;
         if (this.generatingDebouncePending) {
-          LOG.info("CLI", `[${this.type}] suppressed short generating (${now - this.generatingStartedAt}ms)`);
+          const shortDurationMs = this.generatingStartedAt ? now - this.generatingStartedAt : 0;
+          LOG.info("CLI", `[${this.type}] suppressed short generating (${shortDurationMs}ms)`);
           if (this.generatingDebounceTimer) {
             clearTimeout(this.generatingDebounceTimer);
             this.generatingDebounceTimer = null;
           }
           this.generatingDebouncePending = null;
           this.generatingStartedAt = 0;
+          let shortFinalSummary;
+          try {
+            shortFinalSummary = extractFinalSummaryFromMessages(this.adapter?.getScriptParsedStatus()?.messages);
+          } catch {
+          }
+          this.pushEvent({
+            event: "agent:generating_completed",
+            chatTitle,
+            duration: 0,
+            timestamp: now,
+            finalSummary: shortFinalSummary,
+            completionDiagnostic: {
+              reason: "short_generating_suppressed",
+              shortDurationMs
+            }
+          });
         } else {
           this.completedDebouncePending = { chatTitle, duration, timestamp: now, firstObservedAt: now };
           this.scheduleCompletedDebounceFlush(3e3);