comfyui-mcp 0.52.37 → 0.52.39

package/dist/orchestrator/panel-tools.js

@@ -148,6 +148,8 @@ function journalConversationFor(ctx) {
     return conversationOfScopeAddress(ctx.tabId);
 }
 import { BRIDGE_DEFAULT_TIMEOUT_MS, BRIDGE_READ_DEFAULT_TIMEOUT_MS, dispatchOutcomeOf, GRAPH_CMD_EFFECT, isCapabilityRefusal, isPanelCmdUnsupportedError, isMidCommandDisconnectTagged, isReplyTimeoutTagged, isRoutingAmbiguity, requiresWorkflowStampEnforcement, } from "../services/ui-bridge.js";
+import { PANEL_TOOL_BY_GRAPH_CMD, QUEUE_BUSY_READ_TOOLS, RETRY_TOKEN_CMD_BY_TOOL, panelToolForGraphCmd, } from "../services/panel-graph-cmd-tools.js";
+export { PANEL_TOOL_BY_GRAPH_CMD, QUEUE_BUSY_READ_TOOLS, RETRY_TOKEN_CMD_BY_TOOL, panelToolForGraphCmd, };
 import { withWorkflowTarget, } from "../services/workflow-target-store.js";
 import { addUserMcpServer, readUserMcpServers, removeUserMcpServer, setUserMcpServerSecret, } from "../services/user-mcp-config.js";
 import { setComfyuiSecret, setAgentSecret, isAllowedAgentSecretKey, receiptDisclosures, shadowedNote, storeDamageNote, } from "../services/panel-secrets.js";
@@ -812,33 +814,6 @@ function queueBusySnapshotNote() {
 function graphCmdIsInertUnderQueueBusy(name) {
     return GRAPH_CMD_EFFECT[name] === "inert";
 }
-/**
- * #1933 — the READ TOOLS this refusal advertises, by their REGISTERED tool name.
- *
- * They must be tool names, not the `graph_outline` / `graph_query` /
- * `graph_get_errors` bridge commands they dispatch: this string is the whole
- * recovery contract for a fenced write, and an agent that follows it calls what
- * it is told to call. A bridge command is not callable, so the advice returned
- * "unknown tool" — a hard failure mid-degraded-state that the agent cannot
- * diagnose, and from which it can only conclude that reads are unavailable
- * during a render, which is precisely the state panel#1489 fixed and this
- * sentence exists to advertise (reported from the field in
- * artokun/comfyui-mcp-panel#1549).
- *
- * The mapping is NOT the `panel_` prefix mechanically applied — `graph_query`'s
- * tool is `panel_query_graph`, not `panel_graph_query`. So these are written
- * out, and `graph-read-during-render.test.ts` asserts every one of them is in
- * `buildPanelToolDefs()` — the registry the caller actually dispatches against.
- * That test is what stops this list from drifting again: the old literal was
- * green for the whole of its life with all three names wrong, because the
- * assertion matched `/graph_outline/`, which a wrong name and a right one both
- * satisfy.
- */
-export const QUEUE_BUSY_READ_TOOLS = [
-    "panel_graph_outline",
-    "panel_query_graph",
-    "panel_get_errors",
-];
 function graphCmdBlockedByRunningPrompt(cmd) {
     const name = typeof cmd.cmd === "string" ? cmd.cmd : "";
     if (!name.startsWith("graph_") || name === "graph_run")
@@ -3190,6 +3165,35 @@ function appendToolResultText(res, extra) {
     content[idx] = { type: "text", text: `${block.text}${extra}` };
     return { ...res, content };
 }
+/**
+ * #1873 — Save-As onto an EXISTING name 409s on purpose. ComfyUI's userdata POST
+ * returns 409 when overwrite=false; the frontend's saveWorkflowAs then prompts
+ * and, on confirm, DELETES the occupant. The panel refuses that delete path and
+ * surfaces "choose a different name", which is what forced a third workflow file.
+ *
+ * Matched on the panel's relocating-save collision (`conflictError` in
+ * workflow-save.js), not a generic "409 Conflict" — an in-place save can 409
+ * over its OWN file (#442) and that remedy is not this one.
+ */
+function isSaveAsNameConflict(res) {
+    if (!res.isError)
+        return false;
+    const text = textOfToolResult(res);
+    return /already exists \(409 Conflict\)/i.test(text) && /choose a different name/i.test(text);
+}
+const SAVE_AS_NAME_CONFLICT_NOTE = `\n\nDo NOT pick a third name. Save-As never overwrites an existing file — that 409 is ` +
+    `the copy contract, not a missing overwrite switch. To land the edited copy under the ` +
+    `intended original name while keeping a backup of the pre-edit original:\n` +
+    `1. panel_rename_workflow({path: "<original>", name: "<original>_pre_edit"}) — path can ` +
+    `target a CLOSED listed workflow, so this does not disturb the active tab.\n` +
+    `2. panel_rename_workflow({name: "<original>"}) — no path, so this renames the ACTIVE ` +
+    `copy onto the freed name; the tab follows the file.\n` +
+    `3. panel_save_workflow() — in-place save from then on.`;
+function withSaveAsNameConflictNote(res) {
+    if (!isSaveAsNameConflict(res))
+        return res;
+    return appendToolResultText(res, SAVE_AS_NAME_CONFLICT_NOTE);
+}
 // ---- #1695: bound the panel_set_widget previous/new echo --------------------
 //
 // Code-mode clients (Codex `functions.exec`) batch several panel_set_widget
@@ -9828,126 +9832,11 @@ const RETRY_OF_ARG = {
         .optional()
         .describe("Retry token (#694): pass the retry_of rid from a previous outcome-unknown failure of this identical call to retry that exact mutation; omit otherwise."),
 };
-/**
- * #694 — the MUTATING panel tools that accept retry_of, keyed to the bridge
- * command each dispatches. Covers every command the bridge fences to a workflow
- * (GRAPH_CMD_EFFECT "targeted" — see requiresWorkflowStampEnforcement) plus the
- * four workflow mutators (workflow_save / workflow_save_as / workflow_rename /
- * workflow_close). Navigation/creation (workflow_open / workflow_new) and the
- * tools whose descriptions declare them view/read-only (panel_find_nodes,
- * panel_canvas, panel_screenshot, panel_list_subgraphs) are excluded: a read must
- * never mint or carry a retry token — its retry could be answered from the ledger
- * with a STALE outcome (codex gate).
- *
- * Four UI-STATE commands are admitted on purpose (graph_select_nodes,
- * graph_enter/exit_subgraph, graph_copy_nodes): they change selection, subgraph
- * scope or clipboard idempotently, so a deduped retry is a no-op. THIS MAP — not
- * the workflow fence — is what decides whether a token is minted and whether a
- * caller-supplied one reaches the wire, so those four keep behaving exactly as
- * they did before #778 reclassified them as `inert` for the fence. The two
- * questions are related but not the same, and answering one with the other is
- * the defect #778 is about.
- *
- * EXPLICIT MAP, mirroring the RETRY_SAFE_CMDS / MUTATING_GRAPH_EDIT_CMDS
- * maintenance model — keep in sync when mutating tools are added. Exported for
- * the #694 surface-integrity test.
- */
-export const RETRY_TOKEN_CMD_BY_TOOL = {
-    panel_add_node: "graph_add_node",
-    panel_edit_node: "graph_edit_node",
-    panel_remove_node: "graph_remove_node",
-    panel_clear: "graph_clear",
-    panel_flatten_workflow: "graph_load",
-    panel_load_workflow: "graph_load",
-    panel_connect: "graph_connect",
-    panel_disconnect: "graph_disconnect",
-    // Idempotent: inputs/outputs/default_mode are absolute values, so a deduped
-    // retry writes the same metadata again rather than doubling anything.
-    panel_configure_app_mode: "graph_configure_app_mode",
-    panel_set_widget: "graph_set_widget",
-    panel_remove_widget: "graph_remove_widget",
-    panel_set_property: "graph_set_node_property",
-    panel_move_node: "graph_move_node",
-    panel_resize_node: "graph_resize_node",
-    panel_auto_layout: "graph_auto_layout",
-    panel_run: "graph_run",
-    panel_save_workflow: "workflow_save", // workflow_save_as when `name` is given
-    panel_rename_workflow: "workflow_rename",
-    panel_close_workflow: "workflow_close",
-    panel_select_nodes: "graph_select_nodes",
-    panel_create_subgraph: "graph_create_subgraph",
-    panel_subgraph_group: "graph_subgraph_group",
-    panel_copy_nodes: "graph_copy_nodes",
-    panel_paste_nodes: "graph_paste_nodes",
-    panel_save_subgraph: "graph_save_subgraph",
-    panel_add_subgraph: "graph_add_subgraph",
-    panel_create_group: "graph_create_group",
-    panel_move_group: "graph_move_group",
-    panel_edit_group: "graph_edit_group",
-    panel_remove_group: "graph_remove_group",
-    panel_set_node_title: "graph_set_title",
-    panel_set_node_collapsed: "graph_set_node_collapsed",
-    panel_set_node_mode: "graph_set_node_mode",
-    panel_set_node_color: "graph_set_node_color",
-    panel_enter_subgraph: "graph_enter_subgraph",
-    panel_exit_subgraph: "graph_exit_subgraph",
-    panel_move_rail: "graph_move_rail",
-    panel_promote_widget: "graph_promote_widget",
-    panel_expose_subgraph_output: "graph_expose_subgraph_output",
-    panel_expose_subgraph_input: "graph_expose_subgraph_input",
-    panel_unexpose_subgraph_output: "graph_unexpose_subgraph_output",
-    panel_unexpose_subgraph_input: "graph_unexpose_subgraph_input",
-    panel_unpack_subgraph: "graph_unpack_subgraph",
-    panel_update_node: "graph_update_node",
-};
 /** #694 — the bridge commands the retry map admits, for the mint gate: a
  *  dispatched timeout/drop only mints a retry token when the command is in
  *  this set (bridge classification alone would include read/view-only
  *  commands that sit outside BRIDGE_READONLY_CMDS). */
 export const RETRY_TOKEN_CMDS = new Set(Object.values(RETRY_TOKEN_CMD_BY_TOOL).concat(["workflow_save_as"]));
-/**
- * #1933 — the reverse of RETRY_TOKEN_CMD_BY_TOOL: which TOOL does a caller reach
- * this bridge command through?
- *
- * An agent-facing message written below the tool layer can only see `cmd.cmd`;
- * `PanelToolCtx.call` takes a command object and no tool identity, so by the
- * time a pre-dispatch refusal is worded the tool name is genuinely gone. This
- * recovers it from the map that already maintains the correspondence, rather
- * than adding a second hand-written list that can drift out of step with the
- * first.
- *
- * IT REFUSES TO GUESS. The forward map is not injective — `graph_load` is
- * dispatched by both `panel_load_workflow` and `panel_flatten_workflow` — and
- * naming one of two possible tools is a confidently wrong answer, which is worse
- * than declining to name one. Ambiguous commands are therefore OMITTED, and
- * callers must handle `undefined`.
- *
- * Coverage is not assumed either: every `targeted` GRAPH_CMD_EFFECT command
- * except `graph_run` is a value of the forward map, so the queue-busy fence
- * resolves a tool for everything it can refuse except `graph_load`.
- * `graph-read-during-render.test.ts` pins both halves — the resolution and the
- * refusal to guess.
- */
-export const PANEL_TOOL_BY_GRAPH_CMD = (() => {
-    const claims = new Map();
-    for (const [tool, cmd] of Object.entries(RETRY_TOKEN_CMD_BY_TOOL)) {
-        const prior = claims.get(cmd);
-        if (prior)
-            prior.push(tool);
-        else
-            claims.set(cmd, [tool]);
-    }
-    const unique = new Map();
-    for (const [cmd, tools] of claims)
-        if (tools.length === 1)
-            unique.set(cmd, tools[0]);
-    return unique;
-})();
-/** #1933 — the registered tool a bridge command is reached through, or
- *  `undefined` when no tool, or more than one tool, claims it. */
-export function panelToolForGraphCmd(cmd) {
-    return PANEL_TOOL_BY_GRAPH_CMD.get(cmd);
-}
 /** #694 — augment one MUTATING tool def: accept retry_of and attach it, UNTOUCHED,
  *  to every mutating command the handler dispatches (per-command gated so a read
  *  probe inside the same handler — e.g. panel_flatten_workflow's live-canvas
@@ -12350,7 +12239,7 @@ export function buildPanelToolDefs() {
                 multi_select: args.multi_select,
             });
         }),
-        def("panel_save_workflow", "Save the user's open workflow PROGRAMMATICALLY — no Save/Rename dialog ever pops. With no `name`: saves in place (or auto-names + persists a never-saved workflow). With `name`: if the workflow is ALREADY saved under a different name this is a SAVE-AS — it writes a NEW file and leaves the original untouched on disk (it NEVER renames/moves/destroys the original); for a never-saved workflow it is simply the first save. The result reports what happened: `saved_as`+`copied_from`+`original_on_disk` (a disk-verified check that the original file still exists) for a Save-As copy, or `first_save` for a brand-new workflow. Use this freely (e.g. after building a graph) — it won't interrupt the user.", { name: z.string().optional().describe("Name for the workflow (no .json needed). If the workflow is already saved under a different name, this writes a NEW file (Save-As COPY) and leaves the original in place — it never renames/moves/destroys it. Omit to save in place / auto-name an unsaved workflow.") }, async (args, ctx) => {
+        def("panel_save_workflow", "Save the user's open workflow PROGRAMMATICALLY — no Save/Rename dialog ever pops. With no `name`: saves in place (or auto-names + persists a never-saved workflow). With `name`: if the workflow is ALREADY saved under a different name this is a SAVE-AS — it writes a NEW file and leaves the original untouched on disk (it NEVER renames/moves/destroys the original); for a never-saved workflow it is simply the first save. The result reports what happened: `saved_as`+`copied_from`+`original_on_disk` (a disk-verified check that the original file still exists) for a Save-As copy, or `first_save` for a brand-new workflow. A Save-As onto an EXISTING name is a 409 Conflict (the copy never overwrites) — do NOT pick a third name; panel_rename_workflow can target a closed listed original to free the name, then rename the active copy onto it, then panel_save_workflow() in place. Use this freely (e.g. after building a graph) — it won't interrupt the user.", { name: z.string().optional().describe("Name for the workflow (no .json needed). If the workflow is already saved under a different name, this writes a NEW file (Save-As COPY) and leaves the original in place — it never renames/moves/destroys it. An existing target name 409s; do not invent a third name — use panel_rename_workflow to free the original then rename the active copy onto it. Omit to save in place / auto-name an unsaved workflow.") }, async (args, ctx) => {
             // #402: await a stable tab binding before dispatching the (mutating) save, so
             // a save issued in the post-restart "Connected: none" window reaches a live
             // tab instead of failing with a bare "Failed to fetch"/OUTCOME UNKNOWN. Pre-
@@ -12377,8 +12266,11 @@ export function buildPanelToolDefs() {
                     }
                 }
             }
-            if (res.isError)
-                return res;
+            if (res.isError) {
+                // #1873 — named Save-As 409s by contract; the panel's "choose a different
+                // name" is what forced a third file. Keep the 409 and name the rename path.
+                return args.name ? withSaveAsNameConflictNote(res) : res;
+            }
             // #1045 — a SAVE-AS replaces the active workflow instance: the canvas is
             // now the NEW file, with its own identity, while this session's command
             // fence still names the pre-save one. Every graph call afterwards fails
@@ -13140,9 +13032,9 @@ CHECKED FOR YOU: the graph read this message prescribes was just run, and it ` +
         // ack-timeout, confirm via the authoritative workflow_list active identity
         // before reporting failure — see openWorkflowWithVerify.
         async (args, ctx) => openWorkflowWithVerify(args.path, ctx)),
-        def("panel_rename_workflow", "Rename a workflow (the active one, or the one matching `path`).", {
+        def("panel_rename_workflow", "Rename a workflow (the active one, or the one matching `path`). `path` can name a CLOSED listed workflow — renaming it does not disturb the active tab. After a Save-As copy, this is how to land the edited graph under the original name without a third file: rename the closed original aside (`path` + new name), then rename the active copy onto the freed name (no `path`), then panel_save_workflow().", {
             name: z.string().describe("New name (no .json needed)."),
-            path: z.string().optional().describe("Which workflow to rename; omit for the active one."),
+            path: z.string().optional().describe("Which workflow to rename; omit for the active one. Can name a CLOSED listed workflow (does not disturb the active tab)."),
         }, async (args, ctx) => ctx.call({ cmd: "workflow_rename", name: args.name, path: args.path }, 15000)),
         def("panel_close_workflow", "Close a workflow tab (the active one, or the one matching `path`). Refuses if it has unsaved changes unless force:true — save first to avoid losing the user's work.", {
             path: z.string().optional().describe("Which workflow to close; omit for the active one."),