comfyui-mcp 0.52.58 → 0.52.60

package/dist/orchestrator/panel-tools.js

@@ -41,7 +41,7 @@ import { isPanelAnsweredError } from "../services/panel-answered.js";
 import { isPreExecutorRefusal } from "../services/panel-refusal.js";
 import { createSdkMcpServer, tool } from "@anthropic-ai/claude-agent-sdk";
 import { parse as parseYaml } from "yaml";
-import { requiredPanelVersion, SEMVER_RE, LATE_ASK_TTL_MS, tabIncarnationSlot, } from "../services/ui-bridge.js";
+import { requiredPanelVersion, SEMVER_RE, LATE_ASK_TTL_MS, tabIncarnationSlot, SHOW_MEDIA_KIND_MIN_PANEL_VERSION, showMediaItemsPanelCannotPaint, } from "../services/ui-bridge.js";
 import { compareSemver } from "../services/self-update.js";
 import { describeInstallPanelAction } from "../services/panel-recovery.js";
 import { peekResolvedPanelBase, primePanelBase, verifiedPanelDiskVersion, } from "../services/panel-workspace.js";
@@ -1303,6 +1303,8 @@ const RECONNECT_WAIT_MAX_MS = 60_000;
  *  healthy (panel#654): `panel_graph_outline` reported Connected: none and only a
  *  hard refresh restored the tab. 35s covers those recoveries; the 60s ceiling stays. */
 const RECONNECT_WAIT_DEFAULT_S = 35;
+/** Fresh original-tab hello must persist this long before graph tools are ready (#2067). */
+const POST_RESTART_RECONNECT_STABLE_MS = 2000;
 function reconnectWaitTiming() {
     if (reconnectWaitTimingOverride)
         return reconnectWaitTimingOverride;
@@ -3768,6 +3770,56 @@ function tabAdvertisedPanelVersion(ctx) {
     const v = reading?.version;
     return typeof v === "string" && SEMVER_RE.test(v.trim()) ? v.trim() : undefined;
 }
+function tabPanelVersionReading(ctx) {
+    const fn = ctx.bridge.advertisedPanelVersion;
+    if (typeof fn !== "function")
+        return {};
+    try {
+        return fn.call(ctx.bridge, ctx.tabId) ?? {};
+    }
+    catch {
+        return {};
+    }
+}
+function tabAdvertisedShowMediaKinds(ctx) {
+    const fn = ctx.bridge.tabShowMediaKinds;
+    if (typeof fn !== "function")
+        return undefined;
+    try {
+        return fn.call(ctx.bridge, ctx.tabId);
+    }
+    catch {
+        return undefined;
+    }
+}
+/**
+ * #2017 — refuse a kind this panel is proven unable to paint, rather than send
+ * an item that becomes a broken-image card and reports success.
+ *
+ * Names the advertised version (when we have one) and the upgrade; a restart
+ * alone leaves cached JS running, so the hard-refresh is part of the remedy.
+ */
+function formatShowMediaKindUnsupported(blocked) {
+    const kinds = [...new Set(blocked.map((b) => b.kind))];
+    const kindList = kinds.map((k) => `"${k}"`).join(", ");
+    const needed = blocked.find((b) => b.needed)?.needed ??
+        kinds.map((k) => SHOW_MEDIA_KIND_MIN_PANEL_VERSION[k]).find((v) => typeof v === "string");
+    const version = blocked.find((b) => b.version)?.version;
+    const items = blocked.map((b) => `  - ${b.filename} (${b.kind})`).join("\n");
+    const update = describeInstallPanelAction("update", "update the ComfyUI-MCP panel via ComfyUI Manager");
+    const floor = needed ? ` to ≥${needed}` : " to a build that can paint it";
+    const detected = version ? ` This tab announced panel ${version}.` : "";
+    const why = blocked.some((b) => b.reason === "not_in_hello")
+        ? `The panel advertised the kinds it can paint and ${kindList} ${kinds.length === 1 ? "is" : "are"} not among them.`
+        : `kind ${kindList} ${kinds.length === 1 ? "is" : "are"} only understood by panels from #710 onward` +
+            (needed ? ` (first shipped in ${needed})` : "") +
+            ".";
+    return (`This panel cannot paint ${kindList}.${detected} ${why} ` +
+        `Sending ${blocked.length === 1 ? "it" : "them"} would show a broken-image card and report success.\n` +
+        `Items not sent:\n${items}\n` +
+        `${update}${floor}, then HARD-REFRESH the browser tab (Ctrl+Shift+R, or Cmd+Shift+R on macOS); ` +
+        `a restart alone leaves the tab running cached old JS.`);
+}
 /**
  * #1828 — an allowlisted frontend-only type refused as "backend does not
  * provide it" is version skew when the tab's advertised panel is below this
@@ -8770,6 +8822,11 @@ export function makePanelToolCtx(bridge, tabId, workflowTargets, onRunTicketOpen
     // fresh hello can keep the same tab/socket id or arrive under a new one; in the
     // latter case only rebind after the old target is gone, preserving strict
     // multi-tab routing and never guessing away from a still-live pre-restart tab.
+    //
+    // #2067 — the first newer generation is not durable. A ComfyUI restart can
+    // hello, then drop the socket a moment later; returning true there reports
+    // graph_tools_ready while the next graph call sees Connected: none. The same
+    // identity must still be present after a short stability window.
     const awaitPostRestartReachable = async (before, budgetMs) => {
         // The actual UiBridge exposes a tab-session binding. Preserve historical
         // lightweight/mock-context behavior only when that capability does not exist
@@ -8781,14 +8838,24 @@ export function makePanelToolCtx(bridge, tabId, workflowTargets, onRunTicketOpen
         const timing = reconnectWaitTiming();
         const budget = Math.max(0, budgetMs != null ? Math.min(budgetMs, timing.budgetMs) : timing.budgetMs);
         const deadline = Date.now() + budget;
+        const stableMs = Math.max(0, timing.stableMs ?? POST_RESTART_RECONNECT_STABLE_MS);
         const isOriginalTabReconnected = () => {
             const current = panelConnectionIdentity();
             return (current != null &&
                 current.generation > before.generation &&
                 current.tabSessionId === before.tabSessionId);
         };
+        const originalTabStayedReconnected = async () => {
+            if (!isOriginalTabReconnected())
+                return false;
+            const left = deadline - Date.now();
+            if (left <= 0)
+                return false;
+            await sleep(Math.min(stableMs, left));
+            return isOriginalTabReconnected();
+        };
         for (;;) {
-            if (isOriginalTabReconnected())
+            if (await originalTabStayedReconnected())
                 return true;
             // A new tab id cannot resolve through the retired binding. Once that binding is
             // actually gone, the existing conservative rebind can follow the sole new tab.
@@ -8796,7 +8863,7 @@ export function makePanelToolCtx(bridge, tabId, workflowTargets, onRunTicketOpen
                 const interactive = interactiveTabIds() ?? [];
                 if (interactive.length > 0)
                     ensureReachable();
-                if (isOriginalTabReconnected())
+                if (await originalTabStayedReconnected())
                     return true;
             }
             const left = deadline - Date.now();
@@ -16508,6 +16575,20 @@ CHECKED FOR YOU: the graph read this message prescribes was just run, and it ` +
                     }
                 }
             }
+            // #2017 — do not send a painter kind this panel is proven unable to
+            // render. A pre-#710 panel paints `audio` as `<img>` and reports
+            // success; refusing with the version and the upgrade is strictly better
+            // than a broken-image card. Fail-OPEN when the version is unknown or
+            // inherited (same tri-state as the #392 command gate) so a current
+            // panel that omitted the field is never told to update. Image/video
+            // skip the check entirely.
+            const blocked = showMediaItemsPanelCannotPaint(resolved, {
+                reading: tabPanelVersionReading(ctx),
+                advertisedKinds: tabAdvertisedShowMediaKinds(ctx),
+            });
+            if (blocked.length > 0) {
+                return fail(formatShowMediaKindUnsupported(blocked));
+            }
             // #2010 — the reply below is the CLIENT's, and one of the two clients
             // that answer show_media says `{shown:true}` without reading the items.
             // Correct the claim against what the reply actually accounted for BEFORE