comfyui-mcp 0.44.0 → 0.46.0

package/dist/services/download-progress.js

@@ -8,17 +8,54 @@
 //
 // This no-ops entirely when COMFYUI_MCP_PROGRESS_DIR is unset — i.e. for every
 // normal (non-panel) use of the MCP — so it costs nothing outside the panel.
-import { mkdirSync, writeFileSync, rmSync } from "node:fs";
-import { join } from "node:path";
+import { mkdirSync, readFileSync, readdirSync, writeFileSync, rmSync } from "node:fs";
+import { createHash } from "node:crypto";
+import { basename, dirname, join } from "node:path";
 const PROGRESS_DIR = process.env.COMFYUI_MCP_PROGRESS_DIR || "";
+/** Late-bound by the ORCHESTRATOR at startup (its own process has no env var —
+ *  codex finding: the control channel was dead for in-process direct/mobile
+ *  tool calls). progressEnabled() stays env-only on purpose: runpod.ts uses it
+ *  as the spawned-child discriminator, and the orchestrator is NOT a child. */
+let lateBoundDir = "";
+export function setProgressDir(dir) {
+    lateBoundDir = dir;
+}
+function channelDir() {
+    return PROGRESS_DIR || lateBoundDir;
+}
 const lastWriteAt = new Map();
 /** True when running under the panel orchestrator (progress channel is active). */
 export function progressEnabled() {
     return !!PROGRESS_DIR;
 }
-function fileFor(id) {
+function fileFor(id, target) {
     // The id is a hex hash from callers, but stay defensive about the filename.
-    return join(PROGRESS_DIR, `${id.replace(/[^a-zA-Z0-9_.-]/g, "_")}.json`);
+    // Include a TARGET discriminator (codex finding: the same URL downloaded for
+    // local AND pod concurrently shared one file — the last writer's target won
+    // the per-pod idle veto and a pod could be auto-stopped mid-transfer).
+    const disc = createHash("sha1")
+        .update(target ?? `pid:${process.pid}`)
+        .digest("hex")
+        .slice(0, 8);
+    return join(PROGRESS_DIR, `${id.replace(/[^a-zA-Z0-9_.-]/g, "_")}-${disc}.json`);
+}
+/** Credential-free form of a target URL for persisted rows / control files:
+ *  strips userinfo (https://user:pass@host) before anything hits disk or a
+ *  bridge frame (codex finding — raw COMFYUI_URL was being broadcast). */
+function redactUrl(raw) {
+    try {
+        const u = new URL(raw);
+        u.username = "";
+        u.password = "";
+        // Query/fragment can carry credentials too (?token=secret) — the contract
+        // is credential-free before disk/broadcast (codex finding).
+        u.search = "";
+        u.hash = "";
+        return u.toString().replace(/\/+$/, "");
+    }
+    catch {
+        return raw.split("@").pop() ?? raw; // unparseable — drop anything before the last @
+    }
 }
 /**
  * Write a progress snapshot for one download. The in-flight "downloading" state
@@ -36,19 +73,152 @@ export function reportDownloadProgress(p, force = false) {
     lastWriteAt.set(p.id, now);
     try {
         mkdirSync(PROGRESS_DIR, { recursive: true });
-        writeFileSync(fileFor(p.id), JSON.stringify({ ...p, updated: now }));
+        // Stamp the writer's OWN target (the spawned MCP child's COMFYUI_URL): the
+        // idle-stop veto scopes by it, and after a retarget the respawned child
+        // reports against the new host while stale rows age out (codex finding:
+        // a process-wide count let any download disable any pod's auto-stop).
+        // Redacted — target URLs can carry userinfo (codex finding).
+        const rawTarget = p.target ?? (process.env.COMFYUI_URL?.trim() || undefined);
+        const target = rawTarget ? redactUrl(rawTarget) : undefined;
+        writeFileSync(fileFor(p.id, target), JSON.stringify({ ...p, target, updated: now }));
     }
     catch {
         // best-effort — progress is cosmetic, never fail a download over it
     }
 }
-/** Remove a download's progress file (e.g. on cancel). */
+/** Remove a download's progress file(s) (e.g. on cancel). Target-scoped files
+ *  share the id prefix, so clear every variant for the logical download. */
 export function clearDownloadProgress(id) {
     if (!PROGRESS_DIR)
         return;
     lastWriteAt.delete(id);
     try {
-        rmSync(fileFor(id), { force: true });
+        const prefix = `${id.replace(/[^a-zA-Z0-9_.-]/g, "_")}-`;
+        for (const f of readdirSync(PROGRESS_DIR)) {
+            if (f.startsWith(prefix) && f.endsWith(".json"))
+                rmSync(join(PROGRESS_DIR, f), { force: true });
+        }
+    }
+    catch {
+        // ignore
+    }
+}
+const CONTROL_TTL_MS = 60_000; // a request older than this is stale — ignore
+/** Per-request control files are prefixed so the orchestrator consumes EXACTLY
+ *  the file it read (no read-then-delete race between agent children, and no
+ *  timestamp-collision identity problems — codex finding). Kept OUT of
+ *  pollDownloads' tray rows via the "control-" prefix (applied-acks too). */
+export const CONTROL_PREFIX = "control-";
+const REQUEST_PREFIX = `${CONTROL_PREFIX}target-`;
+const APPLIED_PREFIX = `${CONTROL_PREFIX}applied-`;
+let controlSeq = 0;
+function controlDirPath(dir = channelDir()) {
+    return dir || null;
+}
+/** Ask the orchestrator to retarget (+ optionally watch a pod). Returns the
+ *  request file path (for awaitTargetApplied), or null when the channel is
+ *  inactive (no progress dir). */
+export function requestTargetChange(req) {
+    const dir = controlDirPath();
+    if (!dir)
+        return null;
+    try {
+        mkdirSync(dir, { recursive: true });
+        // Redact any credential-bearing target URL before it touches disk (codex).
+        const safe = {
+            ...req,
+            ...(req.url ? { url: redactUrl(req.url) } : {}),
+            ...(req.connectWhenReady ? { connectWhenReady: { ...req.connectWhenReady, url: redactUrl(req.connectWhenReady.url) } } : {}),
+        };
+        // Unique-per-request file: consumption deletes exactly this name — a second
+        // child's request can never be clobbered by the first's delete.
+        const file = join(dir, `${REQUEST_PREFIX}${process.pid}-${Date.now()}-${controlSeq++}.json`);
+        writeFileSync(file, JSON.stringify({ ...safe, updated: Date.now() }));
+        return file;
+    }
+    catch {
+        return null; // best-effort — the caller's own retarget still happened
+    }
+}
+/** The ack file the orchestrator writes after applying a given request file. */
+function appliedFileFor(requestFile) {
+    return join(dirname(requestFile), `${APPLIED_PREFIX}${basename(requestFile).slice(REQUEST_PREFIX.length)}`);
+}
+/** Child side: wait for the orchestrator to apply our request and report the
+ *  RESULTING target (its own remembered LAN fallback included — the child
+ *  can't compute it, codex finding). Returns the ack, or null on timeout —
+ *  callers must then report honestly rather than guess 127.0.0.1. */
+export async function awaitTargetApplied(requestFile, timeoutMs = 4_000) {
+    const ack = appliedFileFor(requestFile);
+    const start = Date.now();
+    for (;;) {
+        try {
+            const raw = JSON.parse(readFileSync(ack, "utf-8"));
+            if (typeof raw?.url === "string") {
+                rmSync(ack, { force: true }); // consumed — don't leak it into a later poll
+                return { url: raw.url, applied: raw.applied !== false };
+            }
+        }
+        catch {
+            // not applied yet
+        }
+        if (Date.now() - start > timeoutMs)
+            return null;
+        await new Promise((r) => setTimeout(r, 150));
+    }
+}
+/** Orchestrator side: all fresh pending requests (within TTL), oldest first.
+ *  The dir is EXPLICIT: the orchestrator computes progressDir itself while the
+ *  module-level env capture is unset in its own process (codex finding — the
+ *  channel was write-only: children stamped, nobody read). */
+export function listTargetChangeRequests(dir) {
+    const out = [];
+    let files = [];
+    try {
+        files = readdirSync(dir).filter((f) => f.startsWith(REQUEST_PREFIX) && f.endsWith(".json"));
+    }
+    catch {
+        return out;
+    }
+    for (const f of files) {
+        try {
+            const file = join(dir, f);
+            const raw = JSON.parse(readFileSync(file, "utf-8"));
+            if (typeof raw?.updated !== "number")
+                continue;
+            if (!raw.url && !raw.local && !raw.watchPodId && !raw.unwatch && !raw.connectWhenReady && !raw.stoppedPodId)
+                continue;
+            if (Date.now() - raw.updated > CONTROL_TTL_MS) {
+                rmSync(file, { force: true }); // reap stale requests while we're here
+                continue;
+            }
+            out.push({ req: raw, file });
+        }
+        catch {
+            // mid-write or corrupt — retry next tick
+        }
+    }
+    return out.sort((a, b) => a.req.updated - b.req.updated);
+}
+/** Orchestrator side: after applying a request, ack it with the RESULTING
+ *  target so the requesting child can align its own process to the TRUE
+ *  fallback/target (it can't compute the orchestrator's remembered LAN URL —
+ *  codex finding). `applied` reports whether a guarded (onlyIfTarget) request
+ *  was actually applied — a guarded-out request must not read as a successful
+ *  local switch (codex finding). Best-effort; the child times out gracefully. */
+export function ackTargetChange(requestFile, url, applied = true) {
+    try {
+        writeFileSync(appliedFileFor(requestFile), JSON.stringify({ url, applied, updated: Date.now() }));
+    }
+    catch {
+        // ignore
+    }
+}
+/** Orchestrator side: consume one applied request file (exactly the file that
+ *  was read — never a newer replacement, since each request is its own file). */
+export function consumeTargetChange(file) {
+    try {
+        rmSync(file, { force: true });
     }
     catch {
         // ignore

package/dist/services/download-progress.js.map

@@ -1 +1 @@
-{"version":3,"file":"download-progress.js","sourceRoot":"","sources":["../../src/services/download-progress.ts"],"names":[],"mappings":"AAAA,2CAA2C;AAC3C,EAAE;AACF,+EAA+E;AAC/E,iFAAiF;AACjF,8EAA8E;AAC9E,iFAAiF;AACjF,wEAAwE;AACxE,EAAE;AACF,+EAA+E;AAC/E,6EAA6E;AAE7E,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAC3D,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAmBjC,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,EAAE,CAAC;AAChE,MAAM,WAAW,GAAG,IAAI,GAAG,EAAkB,CAAC;AAE9C,mFAAmF;AACnF,MAAM,UAAU,eAAe;IAC7B,OAAO,CAAC,CAAC,YAAY,CAAC;AACxB,CAAC;AAED,SAAS,OAAO,CAAC,EAAU;IACzB,4EAA4E;IAC5E,OAAO,IAAI,CAAC,YAAY,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,kBAAkB,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;AAC3E,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,sBAAsB,CACpC,CAAoC,EACpC,KAAK,GAAG,KAAK;IAEb,IAAI,CAAC,YAAY;QAAE,OAAO;IAC1B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,MAAM,KAAK,aAAa,EAAE,CAAC;QACzC,IAAI,GAAG,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,GAAG;YAAE,OAAO;IACvD,CAAC;IACD,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IAC3B,IAAI,CAAC;QACH,SAAS,CAAC,YAAY,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7C,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;IACvE,CAAC;IAAC,MAAM,CAAC;QACP,oEAAoE;IACtE,CAAC;AACH,CAAC;AAED,0DAA0D;AAC1D,MAAM,UAAU,qBAAqB,CAAC,EAAU;IAC9C,IAAI,CAAC,YAAY;QAAE,OAAO;IAC1B,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACvB,IAAI,CAAC;QACH,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACvC,CAAC;IAAC,MAAM,CAAC;QACP,SAAS;IACX,CAAC;AACH,CAAC"}
+{"version":3,"file":"download-progress.js","sourceRoot":"","sources":["../../src/services/download-progress.ts"],"names":[],"mappings":"AAAA,2CAA2C;AAC3C,EAAE;AACF,+EAA+E;AAC/E,iFAAiF;AACjF,8EAA8E;AAC9E,iFAAiF;AACjF,wEAAwE;AACxE,EAAE;AACF,+EAA+E;AAC/E,6EAA6E;AAE7E,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACtF,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAwBpD,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAI,EAAE,CAAC;AAChE;;;+EAG+E;AAC/E,IAAI,YAAY,GAAG,EAAE,CAAC;AACtB,MAAM,UAAU,cAAc,CAAC,GAAW;IACxC,YAAY,GAAG,GAAG,CAAC;AACrB,CAAC;AACD,SAAS,UAAU;IACjB,OAAO,YAAY,IAAI,YAAY,CAAC;AACtC,CAAC;AACD,MAAM,WAAW,GAAG,IAAI,GAAG,EAAkB,CAAC;AAE9C,mFAAmF;AACnF,MAAM,UAAU,eAAe;IAC7B,OAAO,CAAC,CAAC,YAAY,CAAC;AACxB,CAAC;AAED,SAAS,OAAO,CAAC,EAAU,EAAE,MAAe;IAC1C,4EAA4E;IAC5E,6EAA6E;IAC7E,4EAA4E;IAC5E,uEAAuE;IACvE,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,CAAC;SAC5B,MAAM,CAAC,MAAM,IAAI,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC;SACtC,MAAM,CAAC,KAAK,CAAC;SACb,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACf,OAAO,IAAI,CAAC,YAAY,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,kBAAkB,EAAE,GAAG,CAAC,IAAI,IAAI,OAAO,CAAC,CAAC;AACnF,CAAC;AAED;;0EAE0E;AAC1E,SAAS,SAAS,CAAC,GAAW;IAC5B,IAAI,CAAC;QACH,MAAM,CAAC,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;QACvB,CAAC,CAAC,QAAQ,GAAG,EAAE,CAAC;QAChB,CAAC,CAAC,QAAQ,GAAG,EAAE,CAAC;QAChB,0EAA0E;QAC1E,4DAA4D;QAC5D,CAAC,CAAC,MAAM,GAAG,EAAE,CAAC;QACd,CAAC,CAAC,IAAI,GAAG,EAAE,CAAC;QACZ,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAC1C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,GAAG,CAAC,CAAC,gDAAgD;IACtF,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,sBAAsB,CACpC,CAAoC,EACpC,KAAK,GAAG,KAAK;IAEb,IAAI,CAAC,YAAY;QAAE,OAAO;IAC1B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,MAAM,KAAK,aAAa,EAAE,CAAC;QACzC,IAAI,GAAG,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,GAAG;YAAE,OAAO;IACvD,CAAC;IACD,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IAC3B,IAAI,CAAC;QACH,SAAS,CAAC,YAAY,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7C,2EAA2E;QAC3E,wEAAwE;QACxE,wEAAwE;QACxE,sEAAsE;QACtE,6DAA6D;QAC7D,MAAM,SAAS,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,EAAE,IAAI,SAAS,CAAC,CAAC;QAC7E,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC5D,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;IACvF,CAAC;IAAC,MAAM,CAAC;QACP,oEAAoE;IACtE,CAAC;AACH,CAAC;AAED;4EAC4E;AAC5E,MAAM,UAAU,qBAAqB,CAAC,EAAU;IAC9C,IAAI,CAAC,YAAY;QAAE,OAAO;IAC1B,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACvB,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,kBAAkB,EAAE,GAAG,CAAC,GAAG,CAAC;QACzD,KAAK,MAAM,CAAC,IAAI,WAAW,CAAC,YAAY,CAAC,EAAE,CAAC;YAC1C,IAAI,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC;gBAAE,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAClG,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,SAAS;IACX,CAAC;AACH,CAAC;AAqDD,MAAM,cAAc,GAAG,MAAM,CAAC,CAAC,8CAA8C;AAC7E;;;6EAG6E;AAC7E,MAAM,CAAC,MAAM,cAAc,GAAG,UAAU,CAAC;AACzC,MAAM,cAAc,GAAG,GAAG,cAAc,SAAS,CAAC;AAClD,MAAM,cAAc,GAAG,GAAG,cAAc,UAAU,CAAC;AACnD,IAAI,UAAU,GAAG,CAAC,CAAC;AAEnB,SAAS,cAAc,CAAC,MAAc,UAAU,EAAE;IAChD,OAAO,GAAG,IAAI,IAAI,CAAC;AACrB,CAAC;AAED;;kCAEkC;AAClC,MAAM,UAAU,mBAAmB,CAAC,GAAyC;IAC3E,MAAM,GAAG,GAAG,cAAc,EAAE,CAAC;IAC7B,IAAI,CAAC,GAAG;QAAE,OAAO,IAAI,CAAC;IACtB,IAAI,CAAC;QACH,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACpC,2EAA2E;QAC3E,MAAM,IAAI,GAAyC;YACjD,GAAG,GAAG;YACN,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/C,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,EAAE,GAAG,GAAG,CAAC,gBAAgB,EAAE,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC7H,CAAC;QACF,4EAA4E;QAC5E,gEAAgE;QAChE,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,cAAc,GAAG,OAAO,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE,IAAI,UAAU,EAAE,OAAO,CAAC,CAAC;QAC7F,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;QACtE,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC,CAAC,yDAAyD;IACxE,CAAC;AACH,CAAC;AAED,gFAAgF;AAChF,SAAS,cAAc,CAAC,WAAmB;IACzC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,GAAG,cAAc,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAC9G,CAAC;AAED;;;qEAGqE;AACrE,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,WAAmB,EAAE,SAAS,GAAG,KAAK;IAC7E,MAAM,GAAG,GAAG,cAAc,CAAC,WAAW,CAAC,CAAC;IACxC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACzB,SAAS,CAAC;QACR,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,OAAO,CAAC,CAAwC,CAAC;YAC1F,IAAI,OAAO,GAAG,EAAE,GAAG,KAAK,QAAQ,EAAE,CAAC;gBACjC,MAAM,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,6CAA6C;gBAC3E,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;YAC1D,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,kBAAkB;QACpB,CAAC;QACD,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,SAAS;YAAE,OAAO,IAAI,CAAC;QAChD,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IAC/C,CAAC;AACH,CAAC;AAOD;;;8DAG8D;AAC9D,MAAM,UAAU,wBAAwB,CAAC,GAAW;IAClD,MAAM,GAAG,GAA0B,EAAE,CAAC;IACtC,IAAI,KAAK,GAAa,EAAE,CAAC;IACzB,IAAI,CAAC;QACH,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;IAC9F,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,GAAG,CAAC;IACb,CAAC;IACD,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;QACtB,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;YAC1B,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAwB,CAAC;YAC3E,IAAI,OAAO,GAAG,EAAE,OAAO,KAAK,QAAQ;gBAAE,SAAS;YAC/C,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,GAAG,CAAC,UAAU,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,gBAAgB,IAAI,CAAC,GAAG,CAAC,YAAY;gBAAE,SAAS;YACtH,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC,OAAO,GAAG,cAAc,EAAE,CAAC;gBAC9C,MAAM,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,uCAAuC;gBACtE,SAAS;YACX,CAAC;YACD,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/B,CAAC;QAAC,MAAM,CAAC;YACP,yCAAyC;QAC3C,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AAC3D,CAAC;AAED;;;;;iFAKiF;AACjF,MAAM,UAAU,eAAe,CAAC,WAAmB,EAAE,GAAW,EAAE,OAAO,GAAG,IAAI;IAC9E,IAAI,CAAC;QACH,aAAa,CAAC,cAAc,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;IACpG,CAAC;IAAC,MAAM,CAAC;QACP,SAAS;IACX,CAAC;AACH,CAAC;AAED;iFACiF;AACjF,MAAM,UAAU,mBAAmB,CAAC,IAAY;IAC9C,IAAI,CAAC;QACH,MAAM,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAChC,CAAC;IAAC,MAAM,CAAC;QACP,SAAS;IACX,CAAC;AACH,CAAC"}

package/dist/services/missing-models.js

@@ -0,0 +1,295 @@
+// Missing-model resolution: figure out which model files a workflow wants but
+// this ComfyUI doesn't have, then find installable candidates for them.
+//
+// WHY THIS EXISTS: `extract_workflow_dependencies` / `install_workflow_dependencies`
+// resolve the custom NODE PACKS a workflow needs — they never touch the missing
+// MODEL side of the same problem. So "open this Template and make it runnable"
+// took two manual hops: the agent had to infer which checkpoint/VAE/LoRA was
+// missing, then find it itself. Reported in the help channel (seanmcmagic).
+//
+// DETECTION: we do NOT hardcode widget names. ComfyUI publishes every model
+// selector as a COMBO whose options are the server's ACTUAL filenames:
+//
+//   CheckpointLoaderSimple.input.required.ckpt_name = [["a.safetensors", …], {…}]
+//
+// So a workflow value that is a model-looking filename and is NOT in its combo's
+// option list is missing — which covers every model type, including ones from
+// custom packs we've never heard of, with no per-node mapping to maintain.
+//
+// SIZE IS NOT VRAM: weights are the floor, not the ceiling (activations, latents
+// and context sit on top), so `fitVerdict` deliberately reserves headroom rather
+// than pretending file size == requirement.
+/** Weight-file extensions. Used to tell a model value from an ordinary enum. */
+const MODEL_EXTS = new Set([".safetensors", ".ckpt", ".pt", ".pth", ".bin", ".gguf", ".sft", ".onnx"]);
+/** Widget name → models/ subdirectory. Only used to say WHERE a download should
+ *  land; detection never depends on it, so an unknown widget degrades to
+ *  `undefined` rather than dropping the missing model. */
+const DIR_BY_WIDGET = {
+    ckpt_name: "checkpoints",
+    lora_name: "loras",
+    vae_name: "vae",
+    control_net_name: "controlnet",
+    controlnet_name: "controlnet",
+    unet_name: "diffusion_models",
+    model_name: "upscale_models",
+    clip_name: "text_encoders",
+    clip_name1: "text_encoders",
+    clip_name2: "text_encoders",
+    style_model_name: "style_models",
+    embedding_name: "embeddings",
+    gligen_name: "gligen",
+    hypernetwork_name: "hypernetworks",
+    ipadapter_file: "ipadapter",
+};
+/** Strip directory + extension, lowercase — the comparable identity of a model. */
+export function fileStem(name) {
+    const base = name.split(/[/\\]/).pop() ?? name;
+    return base.replace(/\.[^.]+$/, "").toLowerCase();
+}
+function hasModelExt(name) {
+    const base = name.split(/[/\\]/).pop() ?? name;
+    const dot = base.lastIndexOf(".");
+    if (dot < 0)
+        return false;
+    return MODEL_EXTS.has(base.slice(dot).toLowerCase());
+}
+/**
+ * Read the precision / quantisation out of a weight filename.
+ *
+ * This is what makes a fuzzy match set useful instead of opaque: the same model
+ * ships as fp16 / fp8 / several GGUF quants at wildly different sizes, and on a
+ * constrained GPU the quantised one is the whole answer.
+ *
+ * GGUF is checked FIRST: a name can contain both "gguf" and a dtype-looking
+ * token, and the container is what decides whether it loads at all.
+ */
+export function classifyPrecision(filename) {
+    const n = filename.toLowerCase();
+    if (/\.gguf$|[-_.]gguf\b/.test(n)) {
+        // Q4_K_M, Q6_K, Q8_0, IQ3_XXS …
+        const m = n.match(/\b(iq|q)(\d+)(_[a-z0-9]+)*\b/);
+        return {
+            precision: "gguf",
+            quant: m ? m[0].toUpperCase() : undefined,
+            requiresPack: "ComfyUI-GGUF",
+        };
+    }
+    if (/\bnf4\b/.test(n))
+        return { precision: "nf4" };
+    // fp8_e4m3fn / fp8_e5m2 / float8
+    if (/\bfp8\b|\bfloat8\b|e4m3|e5m2/.test(n))
+        return { precision: "fp8" };
+    if (/\bbf16\b|\bbfloat16\b/.test(n))
+        return { precision: "bf16" };
+    if (/\bfp16\b|\bfloat16\b|\bhalf\b/.test(n))
+        return { precision: "fp16" };
+    if (/\bfp32\b|\bfloat32\b|\bfull\b/.test(n))
+        return { precision: "fp32" };
+    return { precision: "unknown" };
+}
+/**
+ * Can this file plausibly run on a card with `vramBytes` of VRAM?
+ *
+ * Weights are the floor, not the ceiling — activations/latents/context also live
+ * in VRAM — so we reserve headroom instead of claiming a 15.9 GB file "fits" a
+ * 16 GB card. Anything above 80% of VRAM is reported as `tight`, not `fits`.
+ */
+export function fitVerdict(sizeBytes, vramBytes) {
+    if (!sizeBytes || !vramBytes || sizeBytes <= 0 || vramBytes <= 0)
+        return "unknown";
+    const ratio = sizeBytes / vramBytes;
+    if (ratio > 1)
+        return "too_big";
+    if (ratio > 0.8)
+        return "tight";
+    return "fits";
+}
+/** How well does `candidate` answer the request for `wanted`? */
+export function matchQuality(wanted, candidate) {
+    const w = (wanted.split(/[/\\]/).pop() ?? wanted).toLowerCase();
+    const c = (candidate.split(/[/\\]/).pop() ?? candidate).toLowerCase();
+    if (w === c)
+        return "exact";
+    if (fileStem(wanted) === fileStem(candidate))
+        return "stem";
+    return "fuzzy";
+}
+const MATCH_RANK = { exact: 0, stem: 1, fuzzy: 2 };
+const FIT_RANK = { fits: 0, tight: 1, unknown: 2, too_big: 3 };
+/**
+ * Order candidates the way a human would pick: closest name first, then what
+ * actually fits the card, then larger (higher-quality) files before smaller.
+ * Stable — equal candidates keep their input order.
+ */
+export function rankCandidates(wanted, candidates) {
+    return candidates
+        .map((c, i) => ({ ...c, match: matchQuality(wanted, c.filename), _i: i }))
+        .sort((a, b) => {
+        const m = MATCH_RANK[a.match] - MATCH_RANK[b.match];
+        if (m !== 0)
+            return m;
+        const f = FIT_RANK[a.fit ?? "unknown"] - FIT_RANK[b.fit ?? "unknown"];
+        if (f !== 0)
+            return f;
+        const s = (b.size_bytes ?? 0) - (a.size_bytes ?? 0);
+        if (s !== 0)
+            return s;
+        return a._i - b._i;
+    })
+        .map(({ _i, ...rest }) => rest);
+}
+/** The combo option list for an input spec, or null when it isn't a combo. */
+function comboOptions(spec) {
+    if (!Array.isArray(spec) || spec.length === 0)
+        return null;
+    const first = spec[0];
+    if (!Array.isArray(first))
+        return null;
+    return first.filter((o) => typeof o === "string");
+}
+/**
+ * Find every model a workflow references that this server does not have.
+ *
+ * A value counts as a missing model when its input is a COMBO (so the server
+ * published the set it actually has) and the value is a model-looking filename
+ * absent from that set. Connections (`[nodeId, slot]` arrays) and non-model
+ * enums are ignored.
+ *
+ * `directory` is a best-effort hint for where a download should land; it is
+ * never required, so an unrecognised widget still reports its missing model.
+ */
+export function findMissingModels(workflow, objectInfo) {
+    const missing = [];
+    const seen = new Set();
+    for (const [nodeId, rawNode] of Object.entries(workflow)) {
+        if (!rawNode || typeof rawNode !== "object")
+            continue;
+        const node = rawNode;
+        const classType = node.class_type;
+        if (!classType || !node.inputs)
+            continue;
+        const def = objectInfo[classType];
+        if (!def?.input)
+            continue;
+        const specs = { ...(def.input.required ?? {}), ...(def.input.optional ?? {}) };
+        for (const [widget, value] of Object.entries(node.inputs)) {
+            // A wired connection, not a widget value.
+            if (Array.isArray(value))
+                continue;
+            if (typeof value !== "string" || value.length === 0)
+                continue;
+            const options = comboOptions(specs[widget]);
+            if (!options)
+                continue; // not a combo → not a model selector
+            if (options.includes(value))
+                continue; // present on this server
+            // Only claim "missing MODEL" when it looks like a weight file — otherwise
+            // it's an ordinary enum drift and not ours to fix.
+            if (!hasModelExt(value) && !options.some(hasModelExt))
+                continue;
+            const key = `${value.toLowerCase()}|${widget}`;
+            if (seen.has(key))
+                continue;
+            seen.add(key);
+            missing.push({
+                node_id: nodeId,
+                node_type: classType,
+                widget,
+                name: value,
+                directory: DIR_BY_WIDGET[widget],
+            });
+        }
+    }
+    return missing;
+}
+/** models/ subdir → CivitAI `types` filter, so a LoRA hunt can't return checkpoints. */
+const CIVITAI_TYPE_BY_DIR = {
+    checkpoints: ["Checkpoint"],
+    loras: ["LORA", "LoCon"],
+    vae: ["VAE"],
+    controlnet: ["Controlnet"],
+    embeddings: ["TextualInversion"],
+    upscale_models: ["Upscaler"],
+};
+const MB = 1024 * 1024;
+/**
+ * Find installable candidates for ONE missing model, annotated with precision,
+ * size and whether it fits this GPU, best first.
+ *
+ * Deliberately does NOT auto-pick: the same filename ships across quants and
+ * base models, so we return a ranked, annotated list and let the caller decide.
+ * Network failures degrade to fewer candidates rather than failing the lookup —
+ * a partial answer beats none when one provider is down.
+ */
+export async function resolveCandidates(missing, deps, opts = {}) {
+    const limit = opts.limit ?? 8;
+    const query = fileStem(missing.name);
+    const vram = await deps.vramBytes().catch(() => undefined);
+    const out = [];
+    const civitaiTypes = missing.directory ? CIVITAI_TYPE_BY_DIR[missing.directory] : undefined;
+    const hits = await deps.searchCivitai(query, civitaiTypes).catch(() => []);
+    for (const h of hits) {
+        const size = typeof h.size_mb === "number" ? Math.round(h.size_mb * MB) : undefined;
+        const p = classifyPrecision(h.name);
+        out.push({
+            filename: h.name,
+            source: "civitai",
+            civitai_model_id: h.model_id,
+            civitai_version_id: h.version_id,
+            size_bytes: size,
+            precision: p.precision,
+            quant: p.quant,
+            requires_pack: p.requiresPack,
+            base_model: h.base_model,
+            fit: fitVerdict(size, vram),
+        });
+    }
+    // Expand generously: the QUANTISED repo (e.g. city96/FLUX.1-dev-gguf) is
+    // routinely ranked below the official one, and on a constrained GPU it is the
+    // only candidate that actually helps — slicing too tightly drops exactly the
+    // answer the user needs.
+    const repos = await deps.searchHf(query).catch(() => []);
+    for (const repo of repos.slice(0, 6)) {
+        const files = await deps.hfRepoFiles(repo.id).catch(() => []);
+        for (const f of files) {
+            const p = classifyPrecision(f.filename);
+            out.push({
+                filename: f.filename,
+                source: "huggingface",
+                url: `https://huggingface.co/${repo.id}/resolve/main/${f.filename}`,
+                size_bytes: f.size_bytes,
+                precision: p.precision,
+                quant: p.quant,
+                requires_pack: p.requiresPack,
+                fit: fitVerdict(f.size_bytes, vram),
+            });
+        }
+    }
+    return rankCandidates(missing.name, dedupeCandidates(out)).slice(0, limit);
+}
+/**
+ * Collapse the same file offered by several repos/providers into one row.
+ *
+ * Popular weights are mirrored widely, so an un-deduped list wastes most of its
+ * slots showing `flux1-dev.safetensors` three times instead of the fp8 and GGUF
+ * variants that are the actual reason to look. Keyed on filename + precision +
+ * quant so genuinely different builds stay distinct; the entry that knows its
+ * size wins, since size drives the fit verdict.
+ */
+export function dedupeCandidates(candidates) {
+    const best = new Map();
+    for (const c of candidates) {
+        const key = `${(c.filename.split(/[/\\]/).pop() ?? c.filename).toLowerCase()}|${c.precision}|${c.quant ?? ""}`;
+        const prev = best.get(key);
+        if (!prev) {
+            best.set(key, c);
+            continue;
+        }
+        const prevKnows = typeof prev.size_bytes === "number" && prev.size_bytes > 0;
+        const nextKnows = typeof c.size_bytes === "number" && c.size_bytes > 0;
+        if (!prevKnows && nextKnows)
+            best.set(key, c);
+    }
+    return [...best.values()];
+}
+//# sourceMappingURL=missing-models.js.map

package/dist/services/missing-models.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"missing-models.js","sourceRoot":"","sources":["../../src/services/missing-models.ts"],"names":[],"mappings":"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"}

package/dist/services/openai-provider-registry.js

@@ -31,7 +31,7 @@ export const OPENAI_KEY_PROVIDERS = [
     {
         id: "glm",
         slotLabel: "GLM / Zhipu",
-        slotHelp: "GLM provider",
+        slotHelp: "Z.AI Coding Plan (GLM / Zhipu)",
         envKeys: ["GLM_API_KEY", "ZHIPU_API_KEY", "ZHIPUAI_API_KEY", "ZAI_API_KEY"],
         modelEnv: "COMFYUI_MCP_GLM_MODEL",
         defaultModel: process.env.COMFYUI_MCP_GLM_MODEL?.trim() || "glm-4.7",
@@ -84,4 +84,23 @@ export function simpleKeyProvider(id) {
 export function openAiKeyProviderModel(p) {
     return process.env[p.modelEnv] ?? p.defaultModel;
 }
+/**
+ * One-line "which model am I on, and how do I change it?" hint for the panel's
+ * API Keys card.
+ *
+ * These providers ship a pinned default (glm-4.7, kimi-for-coding, kimi-k3) and
+ * a `modelEnv` override, but NOTHING in the UI ever said the override existed —
+ * so a user on a newer model (e.g. GLM 5.2) had no way to discover they could
+ * point at it without reading the source. Generated from the registry rather
+ * than hand-written per provider, so it can never drift from the real default.
+ *
+ * Reports the ACTIVE model (env override if set, else the default) and names the
+ * env var either way, so the card also answers "why am I not on the model I set?".
+ */
+export function providerModelHint(p) {
+    const active = openAiKeyProviderModel(p);
+    return active === p.defaultModel
+        ? `Model ${active} (default) — set ${p.modelEnv} to use another.`
+        : `Model ${active} (via ${p.modelEnv}; default ${p.defaultModel}).`;
+}
 //# sourceMappingURL=openai-provider-registry.js.map

package/dist/services/openai-provider-registry.js.map

@@ -1 +1 @@
-{"version":3,"file":"openai-provider-registry.js","sourceRoot":"","sources":["../../src/services/openai-provider-registry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"openai-provider-registry.js","sourceRoot":"","sources":["../../src/services/openai-provider-registry.ts"],"names":[],"mappings":"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"}