comfyui-mcp 0.50.6 → 0.50.7

package/dist/comfyui/fetch.js

@@ -13,6 +13,75 @@ function targetOf(input) {
         return String(input);
     }
 }
+/**
+ * What the CONNECTED panels front, for the drift comparison below (#952).
+ *
+ * Injected by the orchestrator at startup rather than imported: this module is
+ * the bottom of the stack and must not depend on the bridge. Unset (the plain
+ * MCP server, tests, any process with no bridge) simply means the comparison is
+ * skipped — never that there is no drift.
+ *
+ * Origins here must be the SERVER-OBSERVED handshake Origin (UiBridge's
+ * `tabServerOrigin`), not the client-supplied `hello.comfyui_url`: the browser
+ * sets the former and blocks page JS from forging it, so it is the trustworthy
+ * answer to "which ComfyUI is this tab actually on".
+ */
+let connectedPanelOrigins = null;
+/** Install the panel-origin source. Pass null to clear (tests, shutdown). */
+export function setConnectedPanelOrigins(fn) {
+    connectedPanelOrigins = fn;
+}
+/** Origin (scheme://host:port) of a request target, or undefined if unparsable. */
+function originOf(target) {
+    try {
+        return new URL(target).origin;
+    }
+    catch {
+        return undefined;
+    }
+}
+/**
+ * Name the drift instead of asking the reader to go and check for it (#952).
+ *
+ * The shipped message told the user a connected panel "does not imply this
+ * address is reachable" and pointed them at install_comfyui(action:"environment")
+ * to compare the two by hand. We can usually just do the comparison — the bridge
+ * knows what each connected tab fronts — and saying which of the three cases
+ * holds is worth far more than the instruction to go and find out:
+ *
+ *   - DIFFERENT   → that is very likely the whole answer.
+ *   - THE SAME    → drift is RULED OUT. Worth stating plainly, because it stops
+ *                   the reader chasing the explanation the old text volunteered.
+ *                   The panel reaches it from the browser; this process does not
+ *                   (a firewall, a container boundary, a bound interface).
+ *   - UNKNOWN     → no panel connected, no origin source installed, or the
+ *                   handshake carried no usable Origin. Say nothing about drift;
+ *                   an absent comparison is not a negative result.
+ */
+function describeTargetDrift(target) {
+    const origins = (() => {
+        try {
+            return connectedPanelOrigins?.() ?? [];
+        }
+        catch {
+            return []; // a broken source must never replace the real network error
+        }
+    })();
+    if (origins.length === 0)
+        return "";
+    const want = originOf(target);
+    if (!want)
+        return "";
+    const distinct = [...new Set(origins)];
+    if (distinct.includes(want)) {
+        return (` A connected panel is on this same origin, so this is NOT a wrong-address problem: ` +
+            `the browser can reach ${want} and this process cannot (a firewall, a container ` +
+            `boundary, or a server bound to one interface).`);
+    }
+    return (` A connected panel is on ${distinct.join(", ")} — a DIFFERENT address, which is why ` +
+        `the panel works while this call does not. Point COMFYUI_URL at that origin if it is the ` +
+        `server you meant.`);
+}
 /**
  * Turn a network-layer throw into a diagnostic that says WHAT was attempted.
  *
@@ -25,14 +94,16 @@ function targetOf(input) {
  *
  * The two ARE separate targets by design: the panel talks to whichever ComfyUI
  * the browser is on, while these calls go to the configured COMFYUI_URL. That is
- * not a bug, but it is invisible unless the failure names the address.
+ * not a bug, but it is invisible unless the failure names the address — and,
+ * where the bridge can tell us, says whether the two actually differ.
  */
 function describeComfyFetchFailure(err, target) {
     const { message, code } = describeFetchFailure(err);
     const wrapped = new Error(`${message} — while requesting ${target}. ` +
         `That is the headless ComfyUI target (COMFYUI_URL); a CONNECTED sidebar panel does not imply this address is reachable, ` +
-        `because the panel talks to whichever ComfyUI its browser tab is on. ` +
-        `Check the target with install_comfyui (action:"environment"), and confirm the server is up with get_system_stats (action:"health").`, { cause: err });
+        `because the panel talks to whichever ComfyUI its browser tab is on.` +
+        describeTargetDrift(target) +
+        ` Check the target with install_comfyui (action:"environment"), and confirm the server is up with get_system_stats (action:"health").`, { cause: err });
     if (code)
         wrapped.code = code;
     return wrapped;

package/dist/comfyui/fetch.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../src/comfyui/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAE9E,4EAA4E;AAC5E,SAAS,QAAQ,CAAC,KAA6B;IAC7C,IAAI,CAAC;QACH,IAAI,OAAO,KAAK,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC;QAC5C,IAAI,KAAK,YAAY,GAAG;YAAE,OAAO,KAAK,CAAC,IAAI,CAAC;QAC5C,OAAQ,KAAiB,CAAC,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC;IACjD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,SAAS,yBAAyB,CAAC,GAAY,EAAE,MAAc;IAC7D,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;IACpD,MAAM,OAAO,GAAG,IAAI,KAAK,CACvB,GAAG,OAAO,uBAAuB,MAAM,IAAI;QACzC,yHAAyH;QACzH,sEAAsE;QACtE,qIAAqI,EACvI,EAAE,KAAK,EAAE,GAAG,EAAE,CACf,CAAC;IACF,IAAI,IAAI;QAAG,OAA6B,CAAC,IAAI,GAAG,IAAI,CAAC;IACrD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,KAA6B,EAC7B,OAAoB,EAAE;IAEtB,MAAM,IAAI,GAAG,qBAAqB,EAAE,CAAC;IACrC,IAAI,OAA0B,CAAC;IAC/B,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnC,OAAO,GAAG,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC/B,CAAC;SAAM,CAAC;QACN,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC1C,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACjD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;gBAAE,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACnD,CAAC;QACD,OAAO,GAAG,KAAK,CAAC,KAAK,EAAE,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IAC/C,CAAC;IACD,IAAI,CAAC;QACH,OAAO,MAAM,OAAO,CAAC;IACvB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,6EAA6E;QAC7E,oEAAoE;QACpE,4CAA4C;QAC5C,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC;YAAE,MAAM,GAAG,CAAC;QACxC,MAAM,yBAAyB,CAAC,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;IACxD,CAAC;AACH,CAAC"}
+{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../src/comfyui/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAE9E,4EAA4E;AAC5E,SAAS,QAAQ,CAAC,KAA6B;IAC7C,IAAI,CAAC;QACH,IAAI,OAAO,KAAK,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC;QAC5C,IAAI,KAAK,YAAY,GAAG;YAAE,OAAO,KAAK,CAAC,IAAI,CAAC;QAC5C,OAAQ,KAAiB,CAAC,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC;IACjD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,IAAI,qBAAqB,GAA4B,IAAI,CAAC;AAE1D,6EAA6E;AAC7E,MAAM,UAAU,wBAAwB,CAAC,EAA2B;IAClE,qBAAqB,GAAG,EAAE,CAAC;AAC7B,CAAC;AAED,mFAAmF;AACnF,SAAS,QAAQ,CAAC,MAAc;IAC9B,IAAI,CAAC;QACH,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC;IAChC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,SAAS,mBAAmB,CAAC,MAAc;IACzC,MAAM,OAAO,GAAG,CAAC,GAAG,EAAE;QACpB,IAAI,CAAC;YACH,OAAO,qBAAqB,EAAE,EAAE,IAAI,EAAE,CAAC;QACzC,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,EAAE,CAAC,CAAC,4DAA4D;QACzE,CAAC;IACH,CAAC,CAAC,EAAE,CAAC;IACL,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IACpC,MAAM,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC9B,IAAI,CAAC,IAAI;QAAE,OAAO,EAAE,CAAC;IACrB,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;IACvC,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5B,OAAO,CACL,qFAAqF;YACrF,yBAAyB,IAAI,oDAAoD;YACjF,gDAAgD,CACjD,CAAC;IACJ,CAAC;IACD,OAAO,CACL,4BAA4B,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,uCAAuC;QACtF,0FAA0F;QAC1F,mBAAmB,CACpB,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,SAAS,yBAAyB,CAAC,GAAY,EAAE,MAAc;IAC7D,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;IACpD,MAAM,OAAO,GAAG,IAAI,KAAK,CACvB,GAAG,OAAO,uBAAuB,MAAM,IAAI;QACzC,yHAAyH;QACzH,qEAAqE;QACrE,mBAAmB,CAAC,MAAM,CAAC;QAC3B,sIAAsI,EACxI,EAAE,KAAK,EAAE,GAAG,EAAE,CACf,CAAC;IACF,IAAI,IAAI;QAAG,OAA6B,CAAC,IAAI,GAAG,IAAI,CAAC;IACrD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,KAA6B,EAC7B,OAAoB,EAAE;IAEtB,MAAM,IAAI,GAAG,qBAAqB,EAAE,CAAC;IACrC,IAAI,OAA0B,CAAC;IAC/B,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnC,OAAO,GAAG,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC/B,CAAC;SAAM,CAAC;QACN,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC1C,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACjD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;gBAAE,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACnD,CAAC;QACD,OAAO,GAAG,KAAK,CAAC,KAAK,EAAE,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IAC/C,CAAC;IACD,IAAI,CAAC;QACH,OAAO,MAAM,OAAO,CAAC;IACvB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,6EAA6E;QAC7E,oEAAoE;QACpE,4CAA4C;QAC5C,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC;YAAE,MAAM,GAAG,CAAC;QACxC,MAAM,yBAAyB,CAAC,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;IACxD,CAAC;AACH,CAAC"}

package/dist/orchestrator/index.js

@@ -24,12 +24,14 @@ import { performPanelSync, reassessPanelAfterSyncFailure } from "../services/pan
 import { clearPanelDiskObservation } from "../services/panel-workspace.js";
 import { panelRecoveryContext } from "../services/panel-recovery.js";
 import { isPanelAutoInstallDisabled } from "../services/panel-installer.js";
-import { SelfRestarter } from "../services/self-restart.js";
+import { SelfRestarter, canSelfRestart } from "../services/self-restart.js";
+import { pairUrlDurability } from "./pair-durability.js";
 import { SessionStore, workflowIdentityParts } from "./session-store.js";
 import { SHARED_SESSION_SCOPE, isScopeAddress, conversationTabs, shouldRetireSharedAgent, messageOrigin, normalizeHelloBackend, workflowOriginNote, } from "../services/session-scope.js";
 import { TurnOriginTracker, makeScopeRepinHandler, makeScopeTargetResolver, } from "./turn-origins.js";
 import { listSessions, loadTranscript } from "./history.js";
 import { uploadImageHttp, resetClient } from "../comfyui/client.js";
+import { setConnectedPanelOrigins } from "../comfyui/fetch.js";
 import { logger } from "../utils/logger.js";
 import { PanelAgentManager, fetchSupportedModels, fetchSupportedCommands, isEffort, } from "./panel-agent.js";
 import { promptText } from "./error-text.js";
@@ -2466,6 +2468,12 @@ export async function runPanelOrchestrator() {
     // `null` (ambiguous origin) makes the bridge refuse loudly; no entry lets
     // the bridge fall back to active-tab resolution (idle-time probes).
     bridge.setScopeTargetResolver(makeScopeTargetResolver({ tracker: turnOrigins, scopeAgentKeyOf }));
+    // #952 — let a headless `fetch failed` say whether the connected panel is on a
+    // DIFFERENT ComfyUI than COMFYUI_URL. The reporter's readonly tools failed
+    // while every panel tool worked, and nothing in the error connected the two.
+    // SERVER-OBSERVED origins only (tabServerOrigin): the browser sets the
+    // handshake Origin and page JS cannot forge it, unlike hello.comfyui_url.
+    setConnectedPanelOrigins(() => bridge.connectedServerOrigins());
     // #884 P1 (confirming gate 2) — EXPLICIT recovery from a DEAD or AMBIGUOUS
     // pin, and from those only. The bridge's refusal names
     // panel_set_workflow_target as the way out; this is the ONLY path that
@@ -3911,8 +3919,22 @@ export async function runPanelOrchestrator() {
                     }
                     url = `ws://${ip}:${pairPort}/?token=${token}`;
                 }
-                logger.info(`[panel-orchestrator] pairing URL minted (${mode})`);
-                bridge.push({ type: "pair_url", mode, url }, tabId);
+                // #875 — say at pair time whether this URL survives a restart. The
+                // self-restarter is on by default and rotates the token (always, unless
+                // pinned) and the tunnel hostname (always, quick tunnels cannot be
+                // pinned). A user hit exactly this and reported it as "updating the npm
+                // version bricks my communication with the agent" — the restart was the
+                // cause, and nothing here had told them.
+                const durability = pairUrlDurability({
+                    mode,
+                    pinnedToken: envPairToken !== null,
+                    autoRestart: canSelfRestart(),
+                });
+                logger.info(`[panel-orchestrator] pairing URL minted (${mode}) — ` +
+                    (durability.survivesRestart
+                        ? "survives restart"
+                        : `rotates on restart: ${durability.rotates.join(", ")}`));
+                bridge.push({ type: "pair_url", mode, url, durability }, tabId);
             })().catch((err) => {
                 bridge.push({ type: "pair_error", mode, error: err instanceof Error ? err.message : String(err) }, tabId);
             });