comfyui-mcp 0.48.31 → 0.48.32

package/dist/orchestrator/panel-tools.js

@@ -193,6 +193,17 @@ let panelRebootTimingOverride = null;
 // COMFYUI_PANEL_REBOOT_* env overrides are set absurdly high (coordinator codex P2).
 const MAX_REBOOT_SETTLE_MS = 10_000; // 10s
 const MAX_REBOOT_BUDGET_MS = 240_000; // 240s  → settle+budget ≤ 250s < 300s outer
+// #404: hard ceiling on how long the panel_restart_comfyui CONFIRMATION card waits for
+// a yes/no answer. A restart is user-initiated, so a present user answers in seconds;
+// the failure mode is an unanswered/undelivered card AFTER a prior restart's reconnect
+// (the "second restart in one turn" repro: the panel tab is backgrounded or still
+// re-registering, so the card is never seen/answered). Previously the confirm inherited
+// the full remaining ~255s budget, so it blocked for ~4 minutes and read as an
+// indefinite hang (the user killed it at ~2min). Bounding the WAIT here — well under the
+// ~240s ask deadline and the ~300s tools/call budget — makes an unanswered card fail
+// fast with an actionable retry / restart_comfyui hint. It NEVER shortcuts the
+// confirmation itself (no auto-confirm): it bounds only how long we wait for the answer.
+const RESTART_CONFIRM_TIMEOUT_MS = 90_000; // 90s
 function parsePositiveNumberEnv(name, fallback) {
     const raw = process.env[name];
     if (raw == null || raw === "")
@@ -242,6 +253,8 @@ export const __panelToolsTestHooks = {
     loopbackProbeUrl,
     /** Compute reboot timing from env WITH the P2 hard caps (bypasses any override). */
     computeRebootTimingFromEnv,
+    /** #404: the hard ceiling on the panel_restart_comfyui confirmation-card wait. */
+    RESTART_CONFIRM_TIMEOUT_MS,
     /** Zero out the post-drop retry settle so retry-once tests don't sleep. */
     setRetrySettleMs(ms) {
         retrySettleMsOverride = ms;
@@ -341,6 +354,7 @@ const MUTATING_GRAPH_EDIT_CMDS = new Set([
     "graph_connect",
     "graph_disconnect",
     "graph_set_widget",
+    "graph_set_node_property",
     "graph_move_node",
     "graph_resize_node",
     "graph_set_title",
@@ -2819,6 +2833,15 @@ export function buildPanelToolDefs() {
             // Give the guarded write the bounded refresh ack budget.
             return ctx.call({ cmd: "graph_set_widget", node_id: args.node_id, widget: args.widget, value }, OBJECT_INFO_REFRESH_ACK_TIMEOUT_MS);
         }),
+        def("panel_set_property", "Set a node's LiteGraph PROPERTY (the right-click → Properties panel), NOT a widget — the counterpart to panel_set_widget, which only reaches `widgets`. Many custom nodes are configured entirely through node properties: e.g. the rgthree Fast Groups Bypasser's filters `matchTitle`, `matchColors`, `sort`, and `toggleRestriction` are node properties, and without `matchTitle` the node enumerates EVERY group in the workflow (a footgun). Sets node.properties[name] and, when the node defines an onPropertyChanged callback (rgthree and many LiteGraph nodes do), invokes it so the change takes effect LIVE (e.g. rgthree re-filters its group list). Returns the previous and new value. Undoable with Ctrl+Z.", {
+            node_id: z.number().int().describe("Node id from panel_graph_outline / panel_query_graph."),
+            name: z
+                .string()
+                .describe("Property name from the node's right-click → Properties panel (e.g. 'matchTitle', 'matchColors', 'sort', 'toggleRestriction')."),
+            value: z
+                .union([z.string(), z.number(), z.boolean(), z.null()])
+                .describe("New property value (string/number/boolean/null). For the rgthree Fast Groups Bypasser, matchTitle is a title substring/regex filter."),
+        }, async (args, ctx) => ctx.call({ cmd: "graph_set_node_property", node_id: args.node_id, name: args.name, value: args.value })),
         def("panel_move_node", "Move a node to a new canvas position [x, y] in the user's open graph. Undoable.", {
             node_id: z.number().int().describe("Node id from panel_graph_outline / panel_query_graph."),
             pos: xy().describe("New canvas [x, y] (two numbers)."),
@@ -3830,10 +3853,31 @@ export function buildPanelToolDefs() {
             // to the remaining budget (its deadline+grace can't overrun it — see confirm).
             const OVERALL_MAX_MS = 255_000;
             const overallDeadline = Date.now() + OVERALL_MAX_MS;
-            const decision = await ctx.confirm("Restart ComfyUI now? It (and this agent) will go down briefly, then reconnect and resume automatically.", "Restart ComfyUI", Math.max(1, overallDeadline - Date.now()));
+            // #404: if the ONLY reachable client is canvas-less (a mobile mirror / remote /
+            // headless viewer), a yes/no card can't render, so the confirm would block with
+            // no way to answer. Detect that up front — exactly as panel_ask does — and fail
+            // fast with an actionable message instead of dispatching a card into the void and
+            // waiting out the whole budget. Points at the headless restart_comfyui fallback,
+            // which needs no panel card. (A normal interactive tab returns null → proceed.)
+            const surfaceErr = askSurfaceError(ctx);
+            if (surfaceErr) {
+                return fail(surfaceErr +
+                    " To restart the server without a panel confirmation card, use restart_comfyui.");
+            }
+            // #404: BOUND the confirmation wait. It previously inherited the full remaining
+            // ~255s budget, so an unanswered/undelivered card (the panel tab backgrounded or
+            // still reconnecting after a PRIOR restart — the second-restart-in-one-turn repro)
+            // blocked for ~4 minutes and read as an indefinite hang. Cap it at
+            // RESTART_CONFIRM_TIMEOUT_MS (still clamped under the outer budget). This bounds
+            // only the WAIT — it never auto-confirms; on timeout we fail fast, below.
+            const confirmBudget = Math.max(1, Math.min(RESTART_CONFIRM_TIMEOUT_MS, overallDeadline - Date.now()));
+            const decision = await ctx.confirm("Restart ComfyUI now? It (and this agent) will go down briefly, then reconnect and resume automatically.", "Restart ComfyUI", confirmBudget);
             if (decision === "timeout") {
-                return ok("Timed out waiting for your confirmation, so I did NOT restart ComfyUI. " +
-                    "Tell me to restart it and I'll go ahead.");
+                return ok(`No confirmation received within ${Math.round(confirmBudget / 1000)}s, so I did NOT ` +
+                    "restart ComfyUI. The panel tab may be backgrounded or still reconnecting after a " +
+                    "previous restart, so the confirmation card wasn't answered. Tell me to restart it " +
+                    "and I'll re-ask, or use restart_comfyui to restart the server directly without a " +
+                    "panel card.");
             }
             if (decision !== "yes") {
                 return ok("Cancelled — ComfyUI was not restarted.");