comfyui-mcp 0.48.26 → 0.48.27

package/dist/orchestrator/panel-tools.js

@@ -244,6 +244,57 @@ function isRetrySafeCmd(cmd) {
     const name = typeof cmd.cmd === "string" ? cmd.cmd : "";
     return RETRY_SAFE_CMDS.has(name);
 }
+// Graph-EDIT mutations that CHANGE the user's canvas (undoable edits). These are
+// the #436 bug surface: a real side effect the bridge will NOT auto-retry, so —
+// unlike a read — such a command can be neither parked mid-command nor retried
+// once, and firing it into the post-restart "Connected: none" window fails with
+// "no connected tab". It must await a stable binding BEFORE dispatch.
+//
+// This is an EXPLICIT ALLOWLIST, deliberately NOT "everything not read-only":
+// several genuine reads/probes/views that flow through ctx.call are absent from
+// BRIDGE_READONLY_CMDS (e.g. graph_list_subgraphs, training_get_state,
+// graph_canvas, graph_screenshot), so an exclusion rule would wrongly make THOSE
+// wait out the reconnect budget. Under-inclusion here is at worst an unfixed edge
+// (a command keeps today's behavior); over-inclusion would regress a read — so we
+// list only commands that unambiguously mutate the graph. Keep in sync when new
+// graph-edit tools are added (mirrors the RETRY_SAFE_CMDS maintenance model).
+const MUTATING_GRAPH_EDIT_CMDS = new Set([
+    "graph_add_node",
+    "graph_remove_node",
+    "graph_clear",
+    "graph_connect",
+    "graph_disconnect",
+    "graph_set_widget",
+    "graph_move_node",
+    "graph_resize_node",
+    "graph_set_title",
+    "graph_set_node_mode",
+    "graph_set_node_color",
+    "graph_set_node_collapsed",
+    "graph_update_node",
+    "graph_create_group",
+    "graph_edit_group",
+    "graph_remove_group",
+    "graph_move_group",
+    "graph_create_subgraph",
+    "graph_add_subgraph",
+    "graph_save_subgraph",
+    "graph_unpack_subgraph",
+    "graph_subgraph_group",
+    "graph_expose_subgraph_input",
+    "graph_expose_subgraph_output",
+    "graph_promote_widget",
+    "graph_move_rail",
+    "graph_paste_nodes",
+    "graph_auto_layout",
+    "graph_load",
+]);
+/** A MUTATING graph edit that must await a stable tab binding before dispatch so
+ *  it never fires into the post-restart "Connected: none" window (#436). */
+function isMutatingGraphCmd(cmd) {
+    const name = typeof cmd.cmd === "string" ? cmd.cmd : "";
+    return MUTATING_GRAPH_EDIT_CMDS.has(name);
+}
 /** True when an error is a TRANSIENT transport/reconnect drop (the tab went away
  *  or was replaced), NOT a genuine command error or a live-but-frozen reply
  *  timeout. Deliberately EXCLUDES "did not reply within N ms" (a backgrounded/
@@ -1525,6 +1576,21 @@ export function makePanelToolCtx(bridge, tabId, workflowTargets) {
     };
     const call = async (cmd, timeoutMs) => {
         try {
+            // #436: a MUTATING graph edit must not fire into the "Connected: none"
+            // window a ComfyUI restart/reload opens. A read survives that window (it is
+            // parked mid-command and is retry-safe), but a mutating edit is NEITHER — so
+            // panel_graph_outline succeeds while the very next panel_add_node hits
+            // resolveTarget's momentarily-empty registry and fails with
+            // "no connected tab … Connected: none" (the flap). Await a stable binding
+            // BEFORE dispatch — nothing is sent during the wait, so there is no
+            // double-apply risk — exactly as workflow_open/save already do. This returns
+            // INSTANTLY for a healthy session and only waits in the zero-tab window; the
+            // read path (parking + retry-once below) is left exactly as-is. A wait that
+            // times out unreached still falls through to sendRouted, whose authoritative
+            // dispatched:false surfaces the actionable "nothing applied — rebind" message.
+            if (isMutatingGraphCmd(cmd)) {
+                await awaitReachable();
+            }
             ensureReachable();
             return ok(await sendRouted(cmd, timeoutMs));
         }
@@ -1552,6 +1618,33 @@ export function makePanelToolCtx(bridge, tabId, workflowTargets) {
                     return fail(err2);
                 }
             }
+            // #442 defect 4: a MUTATING command (deliberately excluded from RETRY_SAFE_CMDS)
+            // that the bridge refused BEFORE any socket write surfaced the bare routing error
+            // ("no connected tab … Connected: none") with no recovery path — whereas a
+            // retry-safe read like graph_get_errors, via the branch above, names the rebind.
+            // That asymmetry made a brief post-reconnect read/edit-channel disagreement look
+            // like a dead agent (panel_list_workflows kept answering while panel_set_widget
+            // failed, in a multi-tab session the strict-single silent auto-heal won't touch).
+            // We must NOT retry the mutating command (double-apply risk), but the bridge's
+            // AUTHORITATIVE typed flag proves nothing was dispatched (dispatchOutcomeOf ===
+            // false) — so it is safe to state nothing was applied and name the rebind recovery,
+            // preserving the raw cause. Keying on the TYPED flag (not error text) means a
+            // POST-dispatch executor ok:false reply that merely quotes "no connected tab" is
+            // never mis-wrapped as "nothing applied".
+            if (dispatchOutcomeOf(err) === false) {
+                const name = typeof cmd.cmd === "string" ? cmd.cmd : "panel command";
+                // Neutral wording: a dispatched:false flag proves only that the command was NOT
+                // dispatched — it can be a routing refusal (the bound tab is gone / reconnecting),
+                // an ambiguous-or-multiple-tab resolver refusal (other tabs DO exist), or a socket
+                // write failure. All share the same TRUE facts (nothing applied) and the same
+                // recovery (rebind onto the tab that's live now); the raw cause carries the
+                // specifics. Do NOT overstate "disconnected", which is false for the ambiguity case.
+                return fail(`${name} could not be dispatched to this session's panel tab — nothing was applied. ` +
+                    `The tab may be disconnected, still reconnecting after a restart/reload, or the ` +
+                    `session's binding is stale (e.g. another workflow tab is now active). Retry in a ` +
+                    `moment, or rebind with panel_set_workflow_target({mode:"current"}) to follow the ` +
+                    `tab that's live now. (${err instanceof Error ? err.message : String(err)})`);
+            }
             return fail(err);
         }
     };