comfyui-mcp 0.51.35 → 0.51.37

package/dist/orchestrator/panel-tools.js

@@ -65,7 +65,7 @@ function journalTabFor(ctx) {
 function journalConversationFor(ctx) {
     return conversationOfScopeAddress(ctx.tabId);
 }
-import { BRIDGE_DEFAULT_TIMEOUT_MS, dispatchOutcomeOf, isCapabilityRefusal, isPanelCmdUnsupportedError, isReplyTimeoutTagged, isRoutingAmbiguity, } from "../services/ui-bridge.js";
+import { BRIDGE_DEFAULT_TIMEOUT_MS, BRIDGE_READ_DEFAULT_TIMEOUT_MS, dispatchOutcomeOf, isCapabilityRefusal, isPanelCmdUnsupportedError, isReplyTimeoutTagged, isRoutingAmbiguity, } from "../services/ui-bridge.js";
 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";
@@ -2578,6 +2578,39 @@ function fitQueryGraphReply(res, requested) {
 const CIVITAI_SAMPLE_MAX_BYTES = 4 * 1024 * 1024; // per-thumbnail cap (450px jpeg ≈ tens of KB)
 const CIVITAI_SAMPLE_DEFAULT = 4; // thumbnails delivered by default — bounds context
 const CIVITAI_SAMPLE_MAX = 8; // hard ceiling even if the agent asks for more
+/**
+ * The `civitai_*` commands whose reply time is bounded by CivitAI rather than by
+ * the tab (#1520). Of the six in the family, exactly these two await the
+ * in-flight fetch panel-side (`state.activeReloadPromise`): `civitai_results`
+ * and `civitai_highlight`. `clear_highlight`, `switch_tab` and `open_lightbox`
+ * do not, and keep the tighter bound.
+ *
+ * `civitai_search` is the sixth and is not on either path: it dispatches through
+ * `ctx.bridge.send` so the handler can inspect the reply, and already takes
+ * `BRIDGE_DEFAULT_TIMEOUT_MS` — #1468 raised it because `driveSearch` returns
+ * without awaiting at all. The family is not uniform; do not assume a single
+ * bound describes it.
+ *
+ * That await is deliberate (panel#793): without it an agent that opened the
+ * browser and immediately asked for results got `{count:0, total:0}`, which
+ * reads as "this search found nothing" while a concurrent `civitai_highlight`
+ * *did* wait and *did* see cards — two commands disagreeing about whether
+ * results existed. So the fix is not to remove the wait but to stop charging it
+ * against a bound sized for a local read.
+ *
+ * Timing out here is not harmless in either case:
+ *   - `civitai_results` is a pure read; the caller simply loses the answer.
+ *   - `civitai_highlight` *lands* — the panel installs the glow once the reload
+ *     resolves — so the caller is told the command failed while its effect
+ *     arrives anyway. That is the #1468 false-failure shape. Re-issuing is safe
+ *     (`driveHighlight` clears before installing), but the report was wrong.
+ *
+ * 20 s is not a cure — no bound covers a CivitAI 503-and-retry. It is the
+ * tolerant bound every other read already gets (#357: a busy-but-alive tab
+ * fails a tight one), and it is the window the panel's own bounded wait has to
+ * fit inside to be able to answer at all.
+ */
+const CIVITAI_COUPLED_READ_TIMEOUT_MS = BRIDGE_READ_DEFAULT_TIMEOUT_MS;
 const CIVITAI_SAMPLE_FETCH_TIMEOUT_MS = 8000;
 // Extra fetch ATTEMPTS allowed beyond the requested image count, so a few
 // 404/non-image/oversize URLs don't starve the result — but a malformed reply
@@ -8954,7 +8987,7 @@ export function buildPanelToolDefs() {
                 .optional()
                 .describe(`How many top NON-GATED sample thumbnails to fetch and return as inline IMAGE blocks (0–${CIVITAI_SAMPLE_MAX}, default ${CIVITAI_SAMPLE_DEFAULT}). Set 0 for metadata only (e.g. a quick scan where you don't need pixels). Gated/blurred results are always skipped regardless of this count.`),
         }, async (args, ctx) => {
-            const res = await ctx.call({ cmd: "civitai_results", limit: args.limit }, 10000);
+            const res = await ctx.call({ cmd: "civitai_results", limit: args.limit }, CIVITAI_COUPLED_READ_TIMEOUT_MS);
             // Enrich with inline sample pixels (#623). Best-effort + additive: on any
             // problem we return the untouched text results, so the read path can never
             // regress to an error just because a thumbnail fetch failed.
@@ -8999,7 +9032,7 @@ export function buildPanelToolDefs() {
                 .enum(["media", "model"])
                 .optional()
                 .describe("Which result kind these ids refer to (media = images/videos, model = checkpoints/loras/workflows). Match the active tab if omitted."),
-        }, async (args, ctx) => ctx.call({ cmd: "civitai_highlight", ids: args.ids, kind: args.kind }, 10000)),
+        }, async (args, ctx) => ctx.call({ cmd: "civitai_highlight", ids: args.ids, kind: args.kind }, CIVITAI_COUPLED_READ_TIMEOUT_MS)),
         def("panel_civitai_clear_highlight", "Remove any green highlight glow from the CivitAI results — clears what panel_civitai_highlight set. The browser must be open — otherwise the panel replies with an honest error.", {}, async (_args, ctx) => ctx.call({ cmd: "civitai_clear_highlight" }, 10000)),
         def("panel_civitai_switch_tab", "Switch the OPEN CivitAI browser to a different tab (crossfades and re-fetches that tab's results). Use to move between images, videos, checkpoints, loras, workflows, or the user's favorites while driving the browse. Follow with panel_civitai_results to read what loaded. The browser must be open — otherwise the panel replies with an honest error.", {
             tab: z