comfyui-mcp 0.52.25 → 0.52.26

package/dist/orchestrator/blind-completion.js

@@ -0,0 +1,43 @@
+/**
+ * Blind, applied to a run completion.
+ *
+ * Blind is conversation-wide (#884) and must fail CLOSED (`blind-tab-gate.ts`). A run
+ * completion reaches the agent through more than one door: the panel's own `executed`
+ * frame arrives at the orchestrator's agent-event ingress, and the #1789 watchdog
+ * SYNTHESISES one when that frame never comes.
+ *
+ * #1861 — the watchdog door recorded the raw payload. That was inert only while its
+ * `images` was always empty; #1853 filled it from `/history` and the bypass became live:
+ * Blind ON plus a dropped `executed` frame attached the render's pixels to the agent turn
+ * ~45 s later. The strip lived inline at one door, so nothing carried it to the next one.
+ *
+ * It is a pure function here so both doors call the SAME implementation and it can be
+ * tested without standing up the orchestrator.
+ */
+/** The note appended when pixels are withheld. Also overrides a sighted "review this"
+ *  instruction that must not be obeyed — the composer renders it verbatim. */
+function blindDisclosure(existing, withheld) {
+    const prefix = typeof existing === "string" && existing.trim() ? `${existing.trim()} ` : "";
+    return (`${prefix}⚠️ Blind mode is ON: ${withheld} image(s) from this run were withheld ` +
+        `from you and are NOT attached — they ARE shown to the user in the panel. Do NOT ` +
+        `comment on motion, sharpness, composition or any other visual quality, and do not ` +
+        `claim you reviewed them; ask the user to describe what they see, or to turn Blind off.`);
+}
+/**
+ * Return `ev` with its pixels removed when `blind`, otherwise unchanged.
+ *
+ * The disclosure is only added when something was actually withheld: a completion that
+ * carried no images has nothing to disclose, and saying otherwise would report a
+ * withholding that did not happen.
+ */
+export function stripBlindCompletion(ev, blind) {
+    if (!blind)
+        return ev;
+    const withheld = Array.isArray(ev.images) ? ev.images.length : 0;
+    return {
+        ...ev,
+        images: [],
+        ...(withheld > 0 ? { note: blindDisclosure(ev.note, withheld) } : {}),
+    };
+}
+//# sourceMappingURL=blind-completion.js.map

package/dist/orchestrator/blind-completion.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"blind-completion.js","sourceRoot":"","sources":["../../src/orchestrator/blind-completion.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH;8EAC8E;AAC9E,SAAS,eAAe,CAAC,QAAiB,EAAE,QAAgB;IAC1D,MAAM,MAAM,GAAG,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAC5F,OAAO,CACL,GAAG,MAAM,wBAAwB,QAAQ,wCAAwC;QACjF,kFAAkF;QAClF,oFAAoF;QACpF,wFAAwF,CACzF,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,oBAAoB,CAClC,EAAK,EACL,KAAc;IAEd,IAAI,CAAC,KAAK;QAAE,OAAO,EAAE,CAAC;IACtB,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IACjE,OAAO;QACL,GAAG,EAAE;QACL,MAAM,EAAE,EAAE;QACV,GAAG,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACtE,CAAC;AACJ,CAAC"}

package/dist/orchestrator/index.js

@@ -9,6 +9,7 @@
 // panel-agent.ts). Each agent runs on the user's Claude SUBSCRIPTION with no API
 // key. See design/panel-orchestrator.md.
 import { existsSync, mkdirSync, writeFileSync, unlinkSync, readFileSync, readdirSync, rmSync, appendFileSync, } from "node:fs";
+import { stripBlindCompletion } from "./blind-completion.js";
 import { execFileSync } from "node:child_process";
 import { tmpdir, homedir, networkInterfaces } from "node:os";
 import { dirname, join } from "node:path";
@@ -87,7 +88,7 @@ import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { InMemoryTransport } from "@modelcontextprotocol/sdk/inMemory.js";
 import { registerAllTools } from "../tools/index.js";
 import { tryInstallRetiredNameRedirect } from "../tools/retired-redirect.js";
-import { isForceRemoteFlagSet, isLoopbackHost, detectLocalComfyUIPath, setComfyuiTarget, onComfyuiTargetChanged, isTargetingLocal, isTargetingLocalOrLan, isTargetingPod, getComfyUIBaseUrl, getLocalComfyuiUrl, rescopeLocalTargetFile, getComfyUIAuthHeaders } from "../config.js";
+import { config, isForceRemoteFlagSet, isLoopbackHost, detectLocalComfyUIPath, setComfyuiTarget, onComfyuiTargetChanged, isTargetingLocal, isTargetingLocalOrLan, isTargetingPod, getComfyUIBaseUrl, getLocalComfyuiUrl, rescopeLocalTargetFile, getComfyUIAuthHeaders } from "../config.js";
 import { normalizeInstallPathEnv } from "../utils/install-path-env.js";
 import { AGENT_IDENTITY_ENV, agentIdentityPath, publishAgentIdentity, } from "../services/agent-identity.js";
 import { buildComfyuiMcpEnv, comfyuiSecretKeys, onComfyuiSecretsChanged, hydrateAgentSecretsIntoEnv, onAgentSecretsChanged, setAgentSecret, setComfyuiSecret, isAllowedComfyuiSecretKey, changeJustifiesRetryNudge, } from "../services/panel-secrets.js";
@@ -1267,6 +1268,13 @@ export async function runPanelOrchestrator() {
         logger.info(`[panel-orchestrator] no COMFYUI_PATH/default workspace; adopted ComfyUI ` +
             `base_path from the panel status route: ${comfyuiPath} (#296).`);
     }
+    // #1845 — panel_load_workflow runs IN this process and reconstructs the
+    // workflow library from config.comfyuiPath, not from the spawn env handed to
+    // child MCP servers. A recovered path that never reached config left the
+    // local fallback claiming "COMFYUI_PATH not set" while install_comfyui
+    // environment (the child) reported the same trusted workspace.
+    if (comfyuiPath && !config.comfyuiPath)
+        config.comfyuiPath = comfyuiPath;
     // Force the child remote only when opted in (--force-remote) or the target is
     // non-loopback; a default loopback panel user with no COMFYUI_PATH is left to
     // auto-detect its local install (keeps download_model/apply_manifest/scans).
@@ -1756,6 +1764,16 @@ export async function runPanelOrchestrator() {
         }
         return blind;
     };
+    /**
+     * Blind, applied to a run completion — the SAME implementation at every door.
+     *
+     * #1861: the panel's `executed` frame arrives at the ingress below; the #1789 watchdog
+     * SYNTHESISES one when that frame never comes, and that door recorded the raw payload.
+     * Inert while its `images` was always empty, live once #1853 filled it from /history.
+     * The logic lives in blind-completion.ts so a new arrival point cannot get a
+     * near-copy that drifts, and so it is testable without the orchestrator.
+     */
+    const blindStrippedCompletion = (ev) => stripBlindCompletion(ev, anyTabBlind());
     // ---- live ENVIRONMENT-CAPABILITIES block ----
     // Gather the machine's facts ONCE at startup (CACHED) — OS/CPU/RAM from node,
     // GPU/VRAM/CUDA/torch/python/ComfyUI from /system_stats, Triton/SageAttention by
@@ -3139,6 +3157,8 @@ export async function runPanelOrchestrator() {
                 if (comfyuiPath === recovered)
                     return;
                 comfyuiPath = recovered;
+                if (!config.comfyuiPath)
+                    config.comfyuiPath = recovered;
                 logger.info(`[panel-orchestrator] recovered ComfyUI base_path from panel status route ` +
                     `after retarget: ${recovered} (#296).`);
                 // Rebuild the comfyui MCP spawn env (now carrying COMFYUI_PATH) and respawn
@@ -4816,22 +4836,7 @@ export async function runPanelOrchestrator() {
             // stores the stripped copy. Only the SILENCE is fixed, by appending the
             // disclosure to the note the composer already renders verbatim, which also
             // overrides a sighted "review this" instruction that must not be obeyed.
-            const blindWithheldCount = anyTabBlind() && Array.isArray(ev.images) ? ev.images.length : 0;
-            const evForTab = anyTabBlind()
-                ? {
-                    ...ev,
-                    images: [],
-                    ...(blindWithheldCount > 0
-                        ? {
-                            note: `${typeof ev.note === "string" && ev.note.trim() ? `${ev.note.trim()} ` : ""}` +
-                                `⚠️ Blind mode is ON: ${blindWithheldCount} image(s) from this run were withheld ` +
-                                `from you and are NOT attached — they ARE shown to the user in the panel. Do NOT ` +
-                                `comment on motion, sharpness, composition or any other visual quality, and do not ` +
-                                `claim you reviewed them; ask the user to describe what they see, or to turn Blind off.`,
-                        }
-                        : {}),
-                }
-                : ev;
+            const evForTab = blindStrippedCompletion(ev);
             // #468 — a RUN COMPLETION is a promise `panel_run` made ("end your turn,
             // you WILL be notified"), so it goes through the journal: correlated by
             // exact prompt id ONCE, here, and replayed until the turn that carries it
@@ -5900,7 +5905,8 @@ export async function runPanelOrchestrator() {
             // The SAME arrival path the panel's frame takes: correlated once, here,
             // against the ticket that is still open — so the agent is told this is the
             // run IT queued, and the journal's replay/ack durability covers it too.
-            const entry = RunCompletions.record(ticket.tabId, payload, {
+            // #1861 — the SAME strip the panel ingress applies. Blind is conversation-wide.
+            const entry = RunCompletions.record(ticket.tabId, blindStrippedCompletion(payload), {
                 ...(ticket.conversation !== undefined ? { conversation: ticket.conversation } : {}),
             });
             logger.info(`[panel-orchestrator] tab ${ticket.tabId.slice(0, 8)} synthesised run completion for ${describeCorrelation(entry.correlation)} (the panel never reported it — #1789)`);