comfyui-mcp 0.52.41 → 0.52.43

package/dist/orchestrator/index.js

@@ -28,6 +28,7 @@ import { resolveBlindTabGate } from "./blind-tab-gate.js";
 import { clearPanelDiskObservation } from "../services/panel-workspace.js";
 import { panelRecoveryContext } from "../services/panel-recovery.js";
 import { isPanelAutoInstallDisabled } from "../services/panel-installer.js";
+import { releaseOwnedPanelLock } from "../services/panel-pin-guard.js";
 import { SelfRestarter, canSelfRestart } from "../services/self-restart.js";
 import { pairUrlDurability } from "./pair-durability.js";
 import { loadOrCreatePairToken } from "./pair-token-store.js";
@@ -123,7 +124,7 @@ import { startPanelConsoleHttpServer } from "./panel-console-http.js";
 import { readComfyuiCrashLog, formatCrashNote } from "../services/crash-log.js";
 import { QueueMonitor } from "../services/queue-monitor.js";
 import { RunCompletions, describe as describeCorrelation, } from "./run-completion-journal.js";
-import { createRunCompletionWatchdog, resolveHistoryCompletionImages } from "./run-completion-watchdog.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";
 import { getPod } from "../services/runpod-client.js";
@@ -2913,6 +2914,12 @@ export async function runPanelOrchestrator() {
         backendForTab,
         backendOfKey: backendOf,
         info: (msg) => logger.info(msg),
+        // panel#1557 — a unique-canvas reconnect that hello'd without `backend`
+        // joined the default conversation; claiming puts it on this one so the
+        // pin we just wrote is not immediately invalidated at resolution.
+        claimTab: (tab, backend) => {
+            tabBackends.set(tab, backend);
+        },
     }));
     // #884 P1 (confirming gate 2) — a hello whose `backend` is absent or unknown
     // JOINS the default conversation, so its backend-qualified buffers must drain
@@ -3503,6 +3510,10 @@ export async function runPanelOrchestrator() {
             logger.warn(`[panel-orchestrator] readiness probe failed: ${err instanceof Error ? err.message : String(err)}`);
         }
     }
+    // Assigned next to the queue-status timer below. Declared here so the hello
+    // path can reconcile owed panel_run tickets the moment the panel reconnects
+    // (#1556) without waiting for that timer to construct it.
+    let runCompletionWatchdog;
     bridge.onPanelMessage = (event) => {
         // Connect ack: the instant a panel tab connects, the orchestrator announces
         // itself so "connected" means "a real agent is attending" — not merely "a
@@ -3957,6 +3968,12 @@ export async function runPanelOrchestrator() {
             // are change-only, so a tab connecting MID-render would otherwise wait for
             // the next state transition to learn a job is already running.
             bridge.push(buildQueueStatusFrame(QueueMonitor.snapshot()), panelTab);
+            // #1556 — a hello is a reconnect (or the first chance after a missed
+            // ComfyUI WS frame). Look up every still-owed panel_run in /history NOW
+            // and journal a completion if ComfyUI already finished it, instead of
+            // waiting the synthesis grace. Exactly-once: the journal skips a run it
+            // already holds.
+            void runCompletionWatchdog?.reconcile(RunCompletions.owedCompletions().map((t) => t.promptId));
             // Seed the RunPod control panel too — a tab that just connected gets the
             // current pod-status frame (or a cleared one when nothing is watched).
             const rpFrame = getRunpodWatcher()?.current();
@@ -5898,9 +5915,10 @@ export async function runPanelOrchestrator() {
     // after the grace is synthesised into the SAME journal the real frame uses.
     // See run-completion-watchdog.ts for why it waits, and why the panel's frame
     // still wins whenever it is coming.
-    const runCompletionWatchdog = createRunCompletionWatchdog({
+    const wd = createRunCompletionWatchdog({
         awaiting: (promptId) => RunCompletions.awaitingCompletion(promptId),
         resolveOutputs: (promptId) => resolveHistoryCompletionImages(promptId),
+        lookupStatus: (promptId) => resolveHistoryCompletionStatus(promptId),
         deliver: (payload, ticket) => {
             // The SAME arrival path the panel's frame takes: correlated once, here,
             // against the ticket that is still open — so the agent is told this is the
@@ -5913,13 +5931,14 @@ export async function runPanelOrchestrator() {
             flushRunCompletions(ticket.tabId);
         },
     });
+    runCompletionWatchdog = wd;
     const queueStatusBroadcaster = createQueueStatusBroadcaster(() => QueueMonitor.snapshot(), (frame) => void bridge.push(frame), 
     // TEE, not a second drain: drainCompletions() splices, so the watchdog has
     // to read the same array the broadcaster is handed rather than call it
     // again — a second call would race and each consumer would see only half.
     () => {
         const completions = QueueMonitor.drainCompletions();
-        runCompletionWatchdog.observe(completions);
+        wd.observe(completions);
         return completions;
     });
     // Each tick first refreshes the monitor over HTTP (GET /queue + /history
@@ -5933,7 +5952,7 @@ export async function runPanelOrchestrator() {
             // …and only THEN expire the watchdog's arms: the broadcaster tick is what
             // feeds it (the drain tee above), so ticking it first would let an
             // observation sit a whole extra second before it is even armed. #1789.
-            runCompletionWatchdog.tick();
+            wd.tick();
         });
     }, 1000);
     queueStatusTimer.unref?.();
@@ -6260,6 +6279,15 @@ export async function runPanelOrchestrator() {
         catch {
             // No lockfile / unreadable — nothing to clean up.
         }
+        // Same for panel-op.lock: a clean exit (SIGINT or self-restart) must not
+        // leave a lock whose owner is about to die (#1953). Idempotent if the
+        // restarter already released it; a lock naming any other pid is left.
+        try {
+            releaseOwnedPanelLock();
+        }
+        catch {
+            /* best-effort — unlock/reclaim remains the recovery if this fails */
+        }
     };
     /** The single in-flight teardown, so repeated signals queue behind it. */
     let teardownOnce = null;