comfyui-mcp 0.52.69 → 0.52.71

package/dist/services/panel-installer.js

@@ -23,10 +23,10 @@ import { execFileSync } from "node:child_process";
 import { closeSync, existsSync, fsyncSync, lstatSync, mkdirSync, openSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statSync, writeFileSync, } from "node:fs";
 import { createHash } from "node:crypto";
 import { basename, dirname, isAbsolute, join, relative, resolve } from "node:path";
-import { isLocalMode } from "../config.js";
+import { getComfyUIBaseUrl, isLocalMode } from "../config.js";
 import { logger } from "../utils/logger.js";
 import { parsePyproject } from "./node-authoring.js";
-import { installCustomNode, updateCustomNode, reinstallCustomNode, nonInteractiveGitEnv, } from "./node-management.js";
+import { installCustomNode, updateCustomNode, reinstallCustomNode, nonInteractiveGitEnv, probeManagerQueueAvailability as probeManagerQueueAvailabilityOnHost, } from "./node-management.js";
 import { getSystemStats } from "../comfyui/client.js";
 import { describePanelPin, getPanelPinState, PANEL_PIN_ENV_VAR, } from "./panel-settings.js";
 import { withPanelMutationLock } from "./panel-pin-guard.js";
@@ -298,6 +298,7 @@ export function gitIgnoredPullConflicts(dir, upstreamRev) {
 }
 export const defaultDeps = {
     isLocalMode: () => isLocalMode(),
+    managerBase: () => getComfyUIBaseUrl(),
     // #766/#769 — LIVE-FIRST. The panel is not a file the user reads; it is a web
     // extension the RUNNING ComfyUI serves to the browser tab, so the only
     // custom_nodes that can matter is the one belonging to the server we are
@@ -1674,12 +1675,45 @@ async function readLiveQueueCounts(deps, base) {
         return undefined;
     }
 }
+/**
+ * A missing queue count is normally an unreadable queue and must refuse. The
+ * one safe exception is a probe that saw HTTP 404 from BOTH Manager dialects on
+ * this same base: there is no Manager queue that could be writing the checkout.
+ * Injected test deps without the probe stay fail-closed; production deps carry
+ * the real probe through the default dependency set.
+ */
+async function readLiveQueueObservation(deps, base) {
+    const live = await readLiveQueueCounts(deps, base);
+    if (live)
+        return live;
+    try {
+        let availability;
+        if (deps.probeManagerQueueAvailability) {
+            availability = await deps.probeManagerQueueAvailability(base);
+        }
+        else if (isRealDeps(deps)) {
+            availability = await probeManagerQueueAvailabilityOnHost(base);
+        }
+        else {
+            return undefined;
+        }
+        return availability === "absent" ? { managerAbsent: true } : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
 /** True only when the probe SUCCEEDED and every live indicator reports clear. */
 function isLiveQueueIdle(c) {
-    return !!c && c.pending === 0 && c.inProgress === 0 && c.processing === false;
+    return (!!c &&
+        ("managerAbsent" in c ||
+            (c.pending === 0 && c.inProgress === 0 && c.processing === false)));
 }
 /** Render a live probe for a message — including the "no answer at all" case. */
 function describeLiveQueue(c) {
+    if (c && "managerAbsent" in c) {
+        return `ComfyUI-Manager is confirmed absent (both queue/status endpoints returned HTTP 404)`;
+    }
     return c
         ? `pending=${c.pending}, in_progress=${c.inProgress}, is_processing=${c.processing}`
         : `the live queue could not be read at all`;
@@ -2246,7 +2280,7 @@ async function updateViaGitCheckoutFallback(opts) {
     // Each pre-merge check refuses BEFORE any mutation, so its own failure is
     // free — the guard cannot itself damage the tree it is protecting.
     {
-        const live = await readLiveQueueCounts(deps, managerBase);
+        const live = await readLiveQueueObservation(deps, managerBase);
         if (!isLiveQueueIdle(live)) {
             throw new PanelInstallError(`Panel update did NOT apply: ${managerReason}, and the git fallback is ` +
                 `REFUSED: the queue counts that authorized it were a snapshot, so ` +
@@ -2441,7 +2475,7 @@ async function updateViaGitCheckoutFallback(opts) {
             `status / git log) and repair it before restarting ComfyUI.`);
     }
     {
-        const live = await readLiveQueueCounts(deps, managerBase);
+        const live = await readLiveQueueObservation(deps, managerBase);
         if (!isLiveQueueIdle(live)) {
             throw new PanelInstallError(`Could not verify the panel update: the pinned fast-forward ALREADY RAN ` +
                 `in ${dir}, but re-probing ComfyUI-Manager afterwards showed ` +
@@ -4471,6 +4505,17 @@ async function runPanelActionCore(action, depsIn, opts, carried) {
         // to propagate when the disk AGREES the pack is absent — then the message
         // is true and there is genuinely nothing to update.
         assertSameTarget("before the ComfyUI-Manager update");
+        // updateCustomNode captures this same base before its first await, but a
+        // Manager-absent failure has no NodeOpResult to carry it back. Capture it
+        // here too so the absence probe cannot silently drift to a different
+        // configured ComfyUI while this operation is in flight.
+        let managerBaseForFailure;
+        try {
+            managerBaseForFailure = deps.managerBase?.();
+        }
+        catch {
+            managerBaseForFailure = undefined;
+        }
         let result;
         let managerFailure;
         try {
@@ -4632,11 +4677,11 @@ async function runPanelActionCore(action, depsIn, opts, carried) {
                     // The Manager errored on its OWN pack list, not on its queue — and
                     // an erroring Manager is no less likely to have a task writing to
                     // this checkout, so the merge is bracketed here exactly as it is
-                    // everywhere else. There is no observed base to pin to on this path
-                    // (the call threw before returning one), so the re-probe resolves the
-                    // configured Manager; the assertSameTarget checks around the mutation
-                    // are what catch a retarget in the meantime.
-                    managerBase: undefined,
+                    // everywhere else. The base was captured immediately before the
+                    // Manager call even though the thrown path has no NodeOpResult to
+                    // carry it back; the assertSameTarget checks around the mutation
+                    // still catch a local retarget in the meantime.
+                    managerBase: managerBaseForFailure,
                     // Synthesize the shape the fallback reports around; there is no real
                     // Manager result because the Manager call failed.
                     result: {