comfyui-mcp 0.52.114 → 0.52.116

package/dist/orchestrator/download-done-guard.js

@@ -53,14 +53,9 @@ function progressIdentityOf(job) {
  * outcomes. Matching on id alone could annotate the wrong terminal, or miss a real
  * disagreement by finding the other one first (review).
  *
- * A target is compared only when BOTH sides carry one. Rows and records that predate the
- * field, or a route that never sets it, must not silently stop matching — that would make
- * the check inert again, which is exactly how the first version shipped.
- *
- * PREFER THE EXACT (id, target) MATCH (review, round 3). Taking the first id match in
- * array order let a TARGETLESS record shadow the exact one: a targetless "downloading"
- * sitting before an exact-target terminal reported a disagreement that does not exist.
- * The targetless record still stands in when nothing matches on target.
+ * Target identity is production data, not a test-only discriminator. A row or record
+ * without it is ambiguous when local and pod transfers share an id, so legacy targetless
+ * records fail closed and never suppress or promote a terminal event.
  */
 function matchingRecord(row, jobs) {
     if (!row || typeof row !== "object")
@@ -70,18 +65,37 @@ function matchingRecord(row, jobs) {
         return null;
     if (!Array.isArray(jobs))
         return null;
-    const target = typeof row.target === "string" ? row.target : null;
-    const sameId = jobs.filter((j) => j && typeof j === "object" && progressIdentityOf(j) === id);
-    if (!sameId.length)
+    const target = typeof row.target === "string" && row.target.length > 0 ? row.target : null;
+    if (!target)
+        return null;
+    const candidates = jobs.filter((j) => j &&
+        typeof j === "object" &&
+        progressIdentityOf(j) === id &&
+        typeof j.target === "string" &&
+        j.target.length > 0 &&
+        j.target === target);
+    if (!candidates.length)
         return null;
-    return ((target ? sameId.find((j) => j.target === target) : undefined) ??
-        sameId.find((j) => typeof j.target !== "string") ??
-        (target ? undefined : sameId[0]) ??
+    // A reconnect can leave both an older terminal snapshot and the newer live record in
+    // the persisted store. `download_model action:"status"` resolves that ambiguity in
+    // favour of the live transfer; the tray guard must make the same choice or it can
+    // announce FAILED while status is still advancing.
+    // `download_model action:"status"` treats stale persisted rows as historical
+    // diagnostics and resolves the terminal record instead. Prefer a fresh live record
+    // when both snapshots are present, but keep a stale one available for error-detail
+    // lookup and explicit non-live handling below.
+    return (candidates.find((j) => j.status === "downloading" && j.staleInflight !== true) ??
+        candidates.find((j) => j.status !== "downloading") ??
+        candidates.find((j) => j.status === "downloading") ??
+        candidates[0] ??
         null);
 }
 function recordStillDownloading(row, jobs) {
     const record = matchingRecord(row, jobs);
-    return record != null && record.status === "downloading";
+    // This is deliberately the same freshness boundary as the status action. A stale
+    // persisted heartbeat can remain on disk for six hours, but status resolves it as a
+    // terminal/no-live answer; it must not suppress a real FAILED tray notification.
+    return record != null && record.status === "downloading" && record.staleInflight !== true;
 }
 /**
  * Does the job record disagree with announcing this row as completed?
@@ -99,6 +113,19 @@ export function completionDisagreesWithRecord(row, jobs) {
         return false;
     return recordStillDownloading(row, jobs);
 }
+/** Classify a terminal tray row against the exact production job identity. */
+export function failureRecordDisposition(row, jobs) {
+    if (!row || typeof row !== "object" || row.status !== "error") {
+        return { disposition: "none", record: null };
+    }
+    const record = matchingRecord(row, jobs);
+    if (!record || record.status !== "downloading") {
+        return { disposition: "none", record: null };
+    }
+    if (record.staleInflight === true)
+        return { disposition: "stale", record };
+    return { disposition: row.progressAdvanced === true ? "advancing" : "stalled", record };
+}
 /**
  * Does the job record disagree with announcing this row as FAILED?
  *
@@ -112,7 +139,47 @@ export function failureDisagreesWithRecord(row, jobs) {
         return false;
     if (row.status !== "error")
         return false;
-    return recordStillDownloading(row, jobs);
+    // A fresh heartbeat says only that persistence happened. The failure hedge requires
+    // an actual byte increase observed by the poller, or a stalled stream could suppress
+    // a genuine FAILED notification indefinitely. Stalled/stale records are reconciled to
+    // terminal state by the production poll seam instead of being treated as live.
+    return failureRecordDisposition(row, jobs).disposition === "advancing";
+}
+/** Bound one error string before it reaches the tray/agent event. */
+export function boundedDownloadError(value) {
+    if (typeof value !== "string")
+        return undefined;
+    const compact = value.replace(/\s+/g, " ").trim();
+    return compact ? compact.slice(0, 400) : undefined;
+}
+/** Return the bounded error detail from the authoritative terminal record, when present. */
+export function failureErrorDetail(row, jobs) {
+    if (!row || typeof row !== "object" || row.status !== "error")
+        return undefined;
+    const rowError = boundedDownloadError(row.error);
+    const record = matchingRecord(row, jobs);
+    return (rowError ??
+        (record?.status !== "downloading" ? boundedDownloadError(record?.error) : undefined));
+}
+/**
+ * Reconcile the failure half of one production download_done batch.
+ *
+ * The poll loop calls this after it has read the tray rows and authoritative job records,
+ * before injecting the batch into the panel agent. Keeping the mutation here makes that
+ * production seam directly testable without treating PanelAgentManager injection as the
+ * producer-side proof.
+ */
+export function reconcileDownloadDoneFailures(rows, jobs) {
+    const disagreeing = [];
+    for (const row of rows) {
+        if (failureDisagreesWithRecord(row, jobs)) {
+            row.recordDisagrees = true;
+            disagreeing.push(row);
+        }
+        if (row.status === "error")
+            row.error = failureErrorDetail(row, jobs);
+    }
+    return disagreeing;
 }
 /** The disclosure appended to a completion the record disagrees with. Deliberately states
  *  BOTH readings and what to do, rather than picking a winner this cannot establish. */

package/dist/orchestrator/download-done-guard.js.map

@@ -1 +1 @@
-{"version":3,"file":"download-done-guard.js","sourceRoot":"","sources":["../../src/orchestrator/download-done-guard.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"download-done-guard.js","sourceRoot":"","sources":["../../src/orchestrator/download-done-guard.ts"],"names":[],"mappings":"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"}

package/dist/orchestrator/download-done-loop.js

@@ -0,0 +1,38 @@
+import { listDownloadJobs, reconcileStalledDownloadRecord, } from "../services/download-jobs.js";
+import { failureErrorDetail, failureRecordDisposition, reconcileDownloadDoneFailures, } from "./download-done-guard.js";
+/**
+ * The failure-reconciliation stage used by the download poll loop.
+ *
+ * The live loop already has the authoritative records because the completion guard reads
+ * them once per flush; callers pass those records to avoid a second filesystem scan. Tests
+ * may omit them to exercise the same production lookup against the persisted job store.
+ */
+export function reconcileDownloadDoneBatch(rows, records, progress, onInject) {
+    let authoritative = records;
+    if (!authoritative) {
+        try {
+            authoritative = listDownloadJobs();
+        }
+        catch {
+            authoritative = [];
+        }
+    }
+    for (const row of rows)
+        row.progressAdvanced = progress?.hasAdvanced(row) === true;
+    for (const row of rows) {
+        const match = failureRecordDisposition(row, authoritative);
+        if (match.disposition !== "stalled" && match.disposition !== "stale")
+            continue;
+        const durable = reconcileStalledDownloadRecord(match.record, failureErrorDetail(row, authoritative));
+        if (!durable)
+            row.recordDisagrees = true;
+    }
+    const disagreeing = reconcileDownloadDoneFailures(rows, authoritative);
+    // The advancement proof is producer-internal; recordDisagrees is the only reconciliation
+    // result the consumer needs. Do not add the polling detail to the agent event payload.
+    for (const row of rows)
+        delete row.progressAdvanced;
+    onInject?.({ kind: "download_done", downloads: rows });
+    return disagreeing;
+}
+//# sourceMappingURL=download-done-loop.js.map

package/dist/orchestrator/download-done-loop.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"download-done-loop.js","sourceRoot":"","sources":["../../src/orchestrator/download-done-loop.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,8BAA8B,GAE/B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,6BAA6B,GAE9B,MAAM,0BAA0B,CAAC;AAOlC;;;;;;GAMG;AACH,MAAM,UAAU,0BAA0B,CACxC,IAAS,EACT,OAAgC,EAChC,QAAmG,EACnG,QAAoD;IAEpD,IAAI,aAAa,GAAG,OAAO,CAAC;IAC5B,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,IAAI,CAAC;YACH,aAAa,GAAG,gBAAgB,EAAE,CAAC;QACrC,CAAC;QAAC,MAAM,CAAC;YACP,aAAa,GAAG,EAAE,CAAC;QACrB,CAAC;IACH,CAAC;IACD,KAAK,MAAM,GAAG,IAAI,IAAI;QAAE,GAAG,CAAC,gBAAgB,GAAG,QAAQ,EAAE,WAAW,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC;IACnF,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,KAAK,GAAG,wBAAwB,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;QAC3D,IAAI,KAAK,CAAC,WAAW,KAAK,SAAS,IAAI,KAAK,CAAC,WAAW,KAAK,OAAO;YAAE,SAAS;QAC/E,MAAM,OAAO,GAAG,8BAA8B,CAC5C,KAAK,CAAC,MAAqB,EAC3B,kBAAkB,CAAC,GAAG,EAAE,aAAa,CAAC,CACvC,CAAC;QACF,IAAI,CAAC,OAAO;YAAE,GAAG,CAAC,eAAe,GAAG,IAAI,CAAC;IAC3C,CAAC;IACD,MAAM,WAAW,GAAG,6BAA6B,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IACvE,yFAAyF;IACzF,uFAAuF;IACvF,KAAK,MAAM,GAAG,IAAI,IAAI;QAAE,OAAO,GAAG,CAAC,gBAAgB,CAAC;IACpD,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACvD,OAAO,WAAW,CAAC;AACrB,CAAC"}

package/dist/orchestrator/index.js

@@ -50,7 +50,8 @@ import { startPanelImageRelayServer, verifyPanelImageRelayCapability, } from "..
 import { startPanelTemplateRelayServer, verifyPanelTemplateRelayCapability, } from "../services/panel-template-relay.js";
 import { logger } from "../utils/logger.js";
 import { listDownloadJobs } from "../services/download-jobs.js";
-import { completionDisagreesWithRecord, failureDisagreesWithRecord } from "./download-done-guard.js";
+import { boundedDownloadError, completionDisagreesWithRecord, } from "./download-done-guard.js";
+import { reconcileDownloadDoneBatch } from "./download-done-loop.js";
 import { assembleVocabularyHash, describeVocabularySkew } from "../tools/vocabulary.js";
 import { buildPanelToolDefs } from "./panel-tools.js";
 /** The panel vocabulary hashes whose MISMATCH has already been reported (#236).
@@ -573,9 +574,39 @@ export function pushModelsFrame(bridge, panelTabId, models, current, backend) {
  * hello/re-hello so a reconnect cannot retain rows from an old process.
  */
 export class DownloadProgressSnapshots {
+    /** A recent byte increase is required; heartbeat-only rows must not keep this hedge live. */
+    static ADVANCEMENT_MAX_AGE_MS = 5_000;
     lastSnapshot = null;
     rows = [];
+    progressByKey = new Map();
+    lastAdvancedAt = new Map();
+    progressKey(row) {
+        if (typeof row.id !== "string" || !row.id)
+            return null;
+        const target = typeof row.target === "string" ? row.target : "";
+        const attempt = typeof row.attempt === "number" ? String(row.attempt) : "";
+        return `${row.id}\n${target}\n${attempt}`;
+    }
     record(rows) {
+        for (const row of rows) {
+            if (row.status !== "downloading")
+                continue;
+            const key = this.progressKey(row);
+            const downloaded = typeof row.downloaded === "number" ? row.downloaded : undefined;
+            const total = typeof row.total === "number" ? row.total : undefined;
+            if (!key ||
+                downloaded === undefined ||
+                !Number.isFinite(downloaded) ||
+                downloaded < 0 ||
+                total === undefined ||
+                !Number.isFinite(total) ||
+                total < 0)
+                continue;
+            const previous = this.progressByKey.get(key);
+            if (previous && downloaded > previous.downloaded)
+                this.lastAdvancedAt.set(key, Date.now());
+            this.progressByKey.set(key, { downloaded, total });
+        }
         const snapshot = JSON.stringify(rows);
         if (snapshot === this.lastSnapshot)
             return false;
@@ -583,6 +614,15 @@ export class DownloadProgressSnapshots {
         this.rows = rows;
         return true;
     }
+    /** True only after a recent later progress row proves downloaded bytes increased. */
+    hasAdvanced(row, now = Date.now()) {
+        if (typeof row.id !== "string" || !row.id)
+            return false;
+        const target = typeof row.target === "string" ? row.target : "";
+        const attempt = typeof row.attempt === "number" ? String(row.attempt) : "";
+        const advancedAt = this.lastAdvancedAt.get(`${row.id}\n${target}\n${attempt}`);
+        return advancedAt !== undefined && now - advancedAt <= DownloadProgressSnapshots.ADVANCEMENT_MAX_AGE_MS;
+    }
     forPanel() {
         return this.rows;
     }
@@ -5472,6 +5512,13 @@ export async function runPanelOrchestrator() {
             }
             if (!row || typeof row !== "object")
                 continue;
+            if ("error" in row) {
+                const error = boundedDownloadError(row.error);
+                if (error)
+                    row.error = error;
+                else
+                    delete row.error;
+            }
             const updated = typeof row.updated === "number" ? row.updated : now;
             parsed.push({ full, row, status: row.status, updated });
         }
@@ -5553,6 +5600,7 @@ export async function runPanelOrchestrator() {
                             target: typeof row.target === "string" ? row.target : undefined,
                             name: String(row.name ?? row.id ?? "model"),
                             status: String(status),
+                            error: boundedDownloadError(row.error),
                             attempt: typeof row.attempt === "number" ? row.attempt : undefined,
                             supKey,
                         });
@@ -5645,9 +5693,9 @@ export async function runPanelOrchestrator() {
             // advancing. #1150 only sees a live TRAY row of that filename; here the tray
             // row itself was the error, so that hedge never ran. Flag it so the formatter
             // will not say FAILED.
-            const failedDisagreeing = settled.filter((d) => failureDisagreesWithRecord(d, records));
-            for (const d of failedDisagreeing)
-                d.recordDisagrees = true;
+            const failedDisagreeing = reconcileDownloadDoneBatch(settled, records, downloadSnapshots, (event) => manager.injectEvent(key, event, {
+                mid: turnOrigins.mintInheritedOrigin(),
+            }));
             if (failedDisagreeing.length) {
                 logger.warn("[panel-orchestrator] a download failure disagrees with the job record; disclosing rather than announcing FAILED (#2057)", { ids: failedDisagreeing.map((d) => String(d.id ?? "")) });
             }
@@ -5660,9 +5708,6 @@ export async function runPanelOrchestrator() {
             // ran — the turn routed to whatever tab was active (confirming gate 3,
             // P1). The minted mid contributes nothing and the batch close inherits
             // (or refuses, when no origin was ever established).
-            manager.injectEvent(key, { kind: "download_done", downloads: settled }, {
-                mid: turnOrigins.mintInheritedOrigin(),
-            });
         }
         // MCP-child control channel (#269): runpod_* tools that ran in spawned
         // agent children ask the orchestrator to retarget / watch / unwatch /