comfyui-mcp 0.52.59 → 0.52.61

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";
@@ -3770,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
@@ -3939,6 +3989,46 @@ function rewriteToolResultJson(res, payload) {
         content: res.content.map((c, i) => i === idx && c.type === "text" ? { ...c, text: JSON.stringify(payload, null, 2) } : c),
     };
 }
+/**
+ * #2075 — a verified widget write that fell back to last-observed schema still
+ * succeeded. The panel's `schema_note` (#1223) tells the agent the live probes
+ * went silent and to re-read "once ComfyUI is responding again", which makes a
+ * routine canvas edit look degraded while ComfyUI and the panel bridge are
+ * healthy.
+ *
+ * Sibling panel#1582 skips re-waiting on later writes once silence is known.
+ * This report is the write immediately after adding a node: that add records a
+ * live map and unlatches the skip, so the next set_widget re-probes, times out
+ * inside the 2000 ms snapshot budget, and re-emits the note. Matched on the
+ * panel's own snapshotAuthorizationNote wording. Used ONLY to drop the note
+ * from a write the panel already verified against an unchanged backend —
+ * never to authorize anything, never on a refusal, never when `set` is missing.
+ */
+function stripVerifiedLastObservedSchemaNote(res) {
+    if (res.isError)
+        return res;
+    const payload = parseToolResultJson(res);
+    if (!payload)
+        return res;
+    if (payload.schema_source !== "last-observed")
+        return res;
+    if (typeof payload.schema_note !== "string")
+        return res;
+    const note = payload.schema_note;
+    if (!/write SUCCEEDED and was verified/i.test(note))
+        return res;
+    if (!/last whole \/?object_info observed/i.test(note))
+        return res;
+    if (!/backend has not reconnected/i.test(note))
+        return res;
+    const set = payload.set;
+    if (!set || typeof set !== "object" || Array.isArray(set))
+        return res;
+    const next = { ...payload };
+    delete next.schema_note;
+    delete next.schema_source;
+    return rewriteToolResultJson(res, next);
+}
 async function exitSubgraphLevels(ctx, count) {
     const failures = [];
     for (let i = 0; i < count; i++) {
@@ -12114,7 +12204,7 @@ export function buildPanelToolDefs() {
             // to the raw success reply so a later appendToolResultText disclosure
             // (which makes the text no longer parse as JSON) cannot dodge it.
             const echoFull = args.echo === "full";
-            const write = async (nodeId, widget) => summarizeSetWidgetEcho(await ctx.call({ cmd: "graph_set_widget", node_id: nodeId, widget, value }, OBJECT_INFO_REFRESH_ACK_TIMEOUT_MS), echoFull);
+            const write = async (nodeId, widget) => stripVerifiedLastObservedSchemaNote(summarizeSetWidgetEcho(await ctx.call({ cmd: "graph_set_widget", node_id: nodeId, widget, value }, OBJECT_INFO_REFRESH_ACK_TIMEOUT_MS), echoFull));
             let first = await write(args.node_id, args.widget);
             if (!first.isError) {
                 markPanelSchemaReady(panelSchemaKey(ctx));
@@ -16525,6 +16615,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