comfyui-mcp 0.52.126 → 0.52.127

package/dist/orchestrator/index.js

@@ -134,6 +134,7 @@ import { readComfyuiCrashLog, formatCrashNote } from "../services/crash-log.js";
 import { QueueMonitor } from "../services/queue-monitor.js";
 import { formatQueueNote } from "./queue-note.js";
 import { RunCompletions, describe as describeCorrelation, } from "./run-completion-journal.js";
+import { RunCompletionIdempotencyFence, scheduleRunCompletion, } from "./run-completion-idempotency.js";
 import { createRunCompletionWatchdog, resolveHistoryCompletionImages, resolveHistoryCompletionStatus, } from "./run-completion-watchdog.js";
 import { AskAnswers, preview as previewQuestion } from "./ask-answer-journal.js";
 import { initRunpodWatcher, getRunpodWatcher } from "../services/runpod-watch.js";
@@ -721,6 +722,9 @@ export function armStartupDeadline(port, deps = {}) {
     return () => clearTimeout(timer);
 }
 export async function runPanelOrchestrator() {
+    const completionFence = new RunCompletionIdempotencyFence();
+    /** Stable completion keys held by accepted queue items until the real turn ack. */
+    const completionFenceTokens = new Map();
     // Crash guard: the orchestrator is a long-lived background process the user
     // can't see. A stray rejection (e.g. a fire-and-forget push to a tab that
     // vanished mid-flight, or an SDK hiccup) must never silently kill it —
@@ -2760,11 +2764,22 @@ export async function runPanelOrchestrator() {
     }
     function flushRunCompletions(panelTabId) {
         const key = agentKeyFor(panelTabId);
-        const { blockedOn } = RunCompletions.deliverPending(panelTabId, (payload, token) => 
-        // #884 P0 — the injected turn carries the completion's ORIGIN tab, so it
-        // pins/stamps there (show the render on the tab that ran it), never on
-        // whatever tab is active (confirming-gate 2).
-        manager.injectEvent(key, payload, { eventToken: token, mid: turnOrigins.mintInjectionOrigin(panelTabId) }));
+        const { blockedOn } = RunCompletions.deliverPending(panelTabId, (payload, token) => scheduleRunCompletion({
+            route: key,
+            payload,
+            token,
+            fence: completionFence,
+            // #884 P0 — the injected turn carries the completion's ORIGIN tab, so it
+            // pins/stamps there (show the render on the tab that ran it), never on
+            // whatever tab is active (confirming-gate 2).
+            inject: () => manager.injectEvent(key, payload, {
+                eventToken: token,
+                mid: turnOrigins.mintInjectionOrigin(panelTabId),
+            }),
+            onAccepted: (identity) => completionFenceTokens.set(token, identity),
+            suppress: (duplicateToken) => RunCompletions.suppress(duplicateToken),
+            log: (message) => logger.info(`[panel-orchestrator] tab ${panelTabId.slice(0, 8)} ${message} before creating another agent turn (#2341)`),
+        }));
         if (blockedOn) {
             logger.warn(`[panel-orchestrator] tab ${panelTabId.slice(0, 8)} has no live agent for ${describeCorrelation(blockedOn.correlation)} — journaled, replayed when one comes back (#468)`);
         }
@@ -2830,16 +2845,33 @@ export async function runPanelOrchestrator() {
         // #486 — the ask journal verifies WHICH agent instance is acking, so a
         // provider switch cannot let the new conversation certify the old one's
         // answer. Run completions have their own turn-marker gate and need none.
-        if (token.startsWith("aa"))
+        if (token.startsWith("aa")) {
             AskAnswers.ack(token, from);
-        else
-            RunCompletions.ack(token);
+            return;
+        }
+        const identity = completionFenceTokens.get(token);
+        if (identity && !completionFence.markDelivered(identity)) {
+            logger.warn(`[panel-orchestrator] could not persist the delivered completion fence for ${token}; a restart may replay it (#2341)`);
+        }
+        if (identity)
+            completionFenceTokens.delete(token);
+        RunCompletions.ack(token);
     }
     function releaseEventToken(token, carried) {
-        if (token.startsWith("aa"))
+        if (token.startsWith("aa")) {
             AskAnswers.release(token, { carried });
-        else
-            RunCompletions.release(token, { carried });
+            return;
+        }
+        // Release the scheduling reservation BEFORE re-arming the journal. The
+        // journal's release hook immediately flushes a replacement agent, so the
+        // replay must be able to reclaim the identity in the same call stack.
+        const identity = completionFenceTokens.get(token);
+        if (identity && !completionFence.release(identity)) {
+            logger.warn(`[panel-orchestrator] could not release the completion fence for ${token}; replay remains durability-blocked (#2341)`);
+        }
+        if (identity)
+            completionFenceTokens.delete(token);
+        RunCompletions.release(token, { carried });
     }
     // Flag the mobile mirror picker's "session attached" (green) dot from live agents.
     bridge.setHasSessionPredicate((tabId) => manager.hasLiveAgent(agentKeyFor(tabId)));