comfyui-mcp 0.52.60 → 0.52.62

package/dist/orchestrator/panel-tools.js

@@ -3989,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++) {
@@ -8723,13 +8763,20 @@ export function makePanelToolCtx(bridge, tabId, workflowTargets, onRunTicketOpen
         // here is the same recovery, just delayed until a canvas tab exists; it is
         // not a silent re-target.
         if (isScopeAddress(ctx.tabId)) {
-            if (ctx.pendingScopeRecoveryConsent) {
+            const deferredConsent = ctx.pendingScopeRecoveryConsent === true ||
+                (typeof bridge.hasScopeRecoveryConsent === "function" &&
+                    bridge.hasScopeRecoveryConsent(ctx.tabId));
+            if (deferredConsent) {
                 try {
                     const out = rebindToActiveTab({ scopeRecoveryConsent: true });
-                    if (out.rebound)
+                    if (out.rebound) {
                         ctx.pendingScopeRecoveryConsent = false;
-                    else if ((interactiveTabIds() ?? []).length > 0)
+                        bridge.clearScopeRecoveryConsent?.(ctx.tabId);
+                    }
+                    else if ((interactiveTabIds() ?? []).length > 0) {
                         ctx.pendingScopeRecoveryConsent = false;
+                        bridge.clearScopeRecoveryConsent?.(ctx.tabId);
+                    }
                 }
                 catch {
                     // still nothing bindable — keep the consent for the next attempt
@@ -12164,7 +12211,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));
@@ -13992,10 +14039,12 @@ export function buildPanelToolDefs() {
                     if (recoveringScope)
                         ctx.bridge.endScopeRecovery?.(before);
                 }
-                // panel#1557 — the consent survives a zero-tab DEFER so a graph call
-                // after the canvas reconnects can finish the recovery.
-                if (deferredBind && recoveringScope)
+                // panel#1557 — the consent survives a zero-tab DEFER so a later graph
+                // call (possibly on a fresh HTTP MCP ctx) can finish the recovery.
+                if (deferredBind && recoveringScope) {
                     ctx.pendingScopeRecoveryConsent = true;
+                    ctx.bridge.armScopeRecoveryConsent?.(before);
+                }
                 // Detect the rebind regardless of whether awaitReachable or rebindToActiveTab
                 // performed it (either mutates ctx.tabId), so the note is never swallowed.
                 if (!deferredBind && ctx.tabId !== before) {