comfyui-mcp 0.52.192 → 0.52.194

package/dist/orchestrator/panel-tools.js

@@ -28,7 +28,7 @@ import { createHash, randomUUID } from "node:crypto";
 import { resolveToolSurfacePolicy, toolActionPolicyError, toolAllowed, } from "../tools/tool-surface-filter.js";
 import { logger as toolPolicyLogger } from "../utils/logger.js";
 import { existsSync, lstatSync, readdirSync, readFileSync, realpathSync, statSync } from "node:fs";
-import { forwardedByReferenceNote, oversizedInlineRefusal, resolveServableViewRef, stageFileIntoServedDir, stagedForDisplayNote, readShowMediaAck, unaccountedShowMediaNote, unverifiedViewRefNote, } from "../services/comfy-view-ref.js";
+import { forwardedByReferenceNote, mediaKindFromMime, oversizedInlineRefusal, remoteViewRefInlineFailedNote, resolveServableViewRef, stageFileIntoServedDir, stagedForDisplayNote, readShowMediaAck, unaccountedShowMediaNote, unverifiedViewRefNote, viewRefTypeForFetch, } from "../services/comfy-view-ref.js";
 import { extname, isAbsolute, join, resolve, sep } from "node:path";
 import { fileURLToPath } from "node:url";
 import { comfyuiFetch } from "../comfyui/fetch.js";
@@ -205,7 +205,7 @@ import { QueueMonitor, RUNNING_UNCONFIRMED_MS } from "../services/queue-monitor.
 import { stallThresholdMs } from "../services/stall-threshold.js";
 import { RunCompletions } from "./run-completion-journal.js";
 import { AskAnswers, askFingerprint, PANEL_ASK_ID_PREFIX, } from "./ask-answer-journal.js";
-import { getLogs, getQueueVerified, resetClient, resetObjectInfoCache, } from "../comfyui/client.js";
+import { fetchImage, getLogs, getQueueVerified, resetClient, resetObjectInfoCache, } from "../comfyui/client.js";
 import { convertUiToApi, collectNodeTypes } from "../services/workflow-converter.js";
 import { outputNodeObjectInfoForPanel, recoverOutputNodeScopedRun, stampOutputNodeFlagsOnToolResult, } from "../services/output-node.js";
 import { captureComfyUITargetFence, restartComfyUI, preflightLocalRestart, readServingArgv, resolveVerifiedProxyRestartTarget, describeArgvDrift, recordRestartDispatch, clearRestartDispatch, getRestartDispatchRecord, RESTART_DISPATCH_CAUSATION_WINDOW_MS, PROCESS_WIDE_RESTART_DISPATCH_TOKEN, __processControlTestHooks, targetFenceMatchesCurrent, targetFencesEqual, } from "../services/process-control.js";
@@ -21555,10 +21555,14 @@ CHECKED FOR YOU: the graph read this message prescribes was just run, and it ` +
                 .optional()
                 .describe("Reconnect pasted nodes' inputs to existing nodes where they line up (default false)."),
         }, async (args, ctx) => ctx.call({ cmd: "graph_paste_nodes", pos: args.pos, connect_inputs: args.connect_inputs }, 15000)),
-        def("panel_save_subgraph", "Save a SUBGRAPH node to the user's reusable blueprint LIBRARY (publish), so it can be dropped into any workflow later. Pass node_id to pick the subgraph node (else a single selected subgraph node is used) and name to title the blueprint (defaults to the node's title). Runs programmatically — NO save dialog pops. The blueprint becomes the addable type 'SubgraphBlueprint.<name>' (use panel_add_subgraph or panel_list_subgraphs). Returns {saved: {name, type}}.", {
+        def("panel_save_subgraph", "Save a SUBGRAPH node to the user's reusable blueprint LIBRARY (publish), so it can be dropped into any workflow later. Pass node_id to pick the subgraph node (else a single selected subgraph node is used) and name to title the blueprint (defaults to the node's title). On a name collision with an existing USER blueprint, pass overwrite:true to replace it in place (the panel already implements this; without the flag the call is refused and names overwrite:true as the remedy). Bundled/global blueprints cannot be overwritten. Runs programmatically — NO save dialog pops. The blueprint becomes the addable type 'SubgraphBlueprint.<name>' (use panel_add_subgraph or panel_list_subgraphs). Returns {saved: {name, type}}.", {
             node_id: nodeId().optional().describe("Subgraph node id to publish (is_subgraph=true). Omit to use the selected subgraph node."),
             name: z.string().optional().describe("Blueprint name. Defaults to the subgraph node's title."),
-        }, async (args, ctx) => ctx.call({ cmd: "graph_save_subgraph", node_id: args.node_id, name: args.name }, 20000)),
+            overwrite: z
+                .boolean()
+                .optional()
+                .describe("Replace an existing USER blueprint of the same name in place. Required on a name collision; omitted/false refuses. Bundled/global blueprints stay refused."),
+        }, async (args, ctx) => ctx.call({ cmd: "graph_save_subgraph", node_id: args.node_id, name: args.name, overwrite: args.overwrite }, 20000)),
         def("panel_list_subgraphs", "List the saved subgraph BLUEPRINTS in the user's library (from panel_save_subgraph, plus any global/bundled ones). Each entry has {name, type, display_name, description, is_global} — use name/type with panel_add_subgraph to drop it onto the canvas. Read-only.\n\nTOKEN-BOUNDED like the other reads (panel#690). The reply's count field is always the LIBRARY TOTAL, so compare it against the returned array. When entries are withheld the reply carries truncated:true, a returned field, and a note — an absent entry in a TRUNCATED list is NOT evidence the blueprint does not exist, so narrow with `filter` (or raise `limit`, up to 500) before concluding anything. When a filter is applied the reply's matched field reports how many the filter selected, distinct from the count field, so matched:0 against a non-zero count means the filter missed, not that the library is empty.", {
             filter: z
                 .string()
@@ -23850,21 +23854,27 @@ CHECKED FOR YOU: the graph read this message prescribes was just run, and it ` +
                     resolved.push({ kind, dataUrl, filename, caption: item.caption });
                 }
                 else {
-                    // ComfyUI /view ref. A browser panel fetches it same-origin — but a
-                    // HEADLESS (mobile/remote) client can't reach ComfyUI, so resolve the
-                    // bytes HERE and inline them as a data URL. Best-effort: any failure
-                    // (fetch error, non-media, too big) falls back to forwarding the ref,
-                    // which the client renders as a caption card.
+                    // ComfyUI /view ref. A local browser panel fetches it same-origin —
+                    // but a HEADLESS client cannot, and a REMOTE/CLOUD browser panel's
+                    // /view is a different route from get_image's authenticated client
+                    // (the panel 404s while get_image succeeds — #2861).
                     //
                     // #2012 — judge the DESTINATION, not the address. `ctx.tabId` may be
                     // a scope / prefix / alias; `isHeadless` on the address is a lookup
                     // miss that answers false and a phone gets a /view URL it cannot
-                    // fetch. Positive requirement: inline only a proven headless
-                    // destination.
+                    // fetch. Positive requirement: inline a proven headless destination,
+                    // or a proven interactive destination whose ComfyUI is not local.
+                    //
+                    // #877/#899 — remote bytes come from fetchImage (the get_image
+                    // path), never a same-named file on the orchestrator disk. A remote
+                    // interactive tab that cannot be inlined is refused rather than
+                    // handed a viewRef the panel will drop (painted:0).
                     let inlined = false;
-                    if (resolveClientKind(ctx).kind === "headless") {
+                    const dest = resolveClientKind(ctx);
+                    const remoteTarget = isRemoteMode() || isCloudMode();
+                    if (dest.kind === "headless") {
                         try {
-                            const base = (process.env.COMFYUI_URL ?? "http://127.0.0.1:8188").replace(/\/+$/, "");
+                            const base = getComfyUIBaseUrl().replace(/\/+$/, "");
                             const qs = new URLSearchParams({ filename: src.filename, type: src.type ?? "output" });
                             if (src.subfolder)
                                 qs.set("subfolder", src.subfolder);
@@ -23872,9 +23882,10 @@ CHECKED FOR YOU: the graph read this message prescribes was just run, and it ` +
                             if (resp.ok) {
                                 const mime = resp.headers.get("content-type") ?? "";
                                 const buf = Buffer.from(await resp.arrayBuffer());
-                                if ((mime.startsWith("image/") || mime.startsWith("video/")) && buf.length <= MAX_BYTES) {
+                                const kindFromMime = mediaKindFromMime(mime);
+                                if (kindFromMime && kindFromMime !== "audio" && buf.length <= MAX_BYTES) {
                                     resolved.push({
-                                        kind: mime.startsWith("video/") ? "video" : "image",
+                                        kind: kindFromMime,
                                         dataUrl: `data:${mime};base64,${buf.toString("base64")}`,
                                         filename: src.filename,
                                         caption: item.caption,
@@ -23887,6 +23898,41 @@ CHECKED FOR YOU: the graph read this message prescribes was just run, and it ` +
                             // fall through to the viewRef path
                         }
                     }
+                    else if (remoteTarget && dest.kind === "interactive") {
+                        try {
+                            const fetched = await fetchImage(src.filename, viewRefTypeForFetch(src.type), src.subfolder ?? "", { maxBytes: MAX_BYTES });
+                            const mime = fetched.mimeType.split(";")[0].trim();
+                            const buf = Buffer.from(fetched.base64, "base64");
+                            const kindFromMime = mediaKindFromMime(mime);
+                            if (kindFromMime && buf.length <= MAX_BYTES) {
+                                resolved.push({
+                                    kind: kindFromMime,
+                                    dataUrl: `data:${mime};base64,${fetched.base64}`,
+                                    filename: src.filename,
+                                    caption: item.caption,
+                                });
+                                inlined = true;
+                            }
+                            else {
+                                const detail = !kindFromMime
+                                    ? `The MCP client fetched it, but the body was not media (content-type "${mime || "unset"}").`
+                                    : `The MCP client fetched it, but it is ${buf.length} bytes — over the ${MAX_BYTES} byte inline cap.`;
+                                return fail(remoteViewRefInlineFailedNote({
+                                    filename: src.filename,
+                                    detail,
+                                    capBytes: MAX_BYTES,
+                                }));
+                            }
+                        }
+                        catch (err) {
+                            const detail = err instanceof Error ? err.message : String(err);
+                            return fail(remoteViewRefInlineFailedNote({
+                                filename: src.filename,
+                                detail,
+                                capBytes: MAX_BYTES,
+                            }));
+                        }
+                    }
                     if (!inlined) {
                         resolved.push({
                             kind: "viewRef",