comfyui-mcp 0.50.70 → 0.50.72

package/dist/orchestrator/panel-tools.js

@@ -4704,8 +4704,21 @@ export function makePanelToolCtx(bridge, tabId, workflowTargets) {
             if (!opts?.scopeRecoveryConsent || !pinProvenDead) {
                 return { previous, current: previous, rebound: false };
             }
-            const repinned = bridge.repinScopeToActive?.(previous);
-            return { previous, current: previous, rebound: Boolean(repinned) };
+            // #1077 Finding 2 — carry the REASON out when nothing was repinned. This
+            // collapsed to `Boolean(repinned)`, so four different refusals arrived at
+            // the caller as one bare `false` and the user was told only that the
+            // adoption was refused. One of those refusals repeats forever (an active
+            // tab on another backend's conversation while this one has several), and
+            // nothing in the reply hinted that naming a workflow is the way out.
+            const outcome = bridge.repinScopeToActive?.(previous);
+            const repinned = typeof outcome === "string" ? outcome : undefined;
+            const repinRefusal = outcome && typeof outcome === "object" ? outcome.reason : undefined;
+            return {
+                previous,
+                current: previous,
+                rebound: Boolean(repinned),
+                ...(repinRefusal ? { repinRefusal } : {}),
+            };
         }
         // A healthy binding is left untouched (never disturb a live session). Recovery only
         // fires for an orphaned/stale tab id.
@@ -5290,11 +5303,26 @@ function recoveredAskResult(entry) {
  * the question at hand, which is the misattribution this whole path exists to
  * prevent. Reporting them beats swallowing them — the user did answer something.
  */
-function askTimeoutResult(tabId, fingerprint, recovery) {
-    let text = "The question card was not answered in time (or no interactive panel surface " +
-        "rendered it — e.g. an exec/headless run), so nothing was selected. If you " +
-        "still need the decision, ask the user directly in plain chat text, or " +
-        "re-invoke panel_ask from an interactive ComfyUI tab.";
+export function askTimeoutResult(tabId, fingerprint, recovery, 
+/**
+ * #1243 — did a reachability check actually run before the wait? When it did, the
+ * "maybe nothing rendered the card" alternative has ALREADY been ruled out, and
+ * offering it anyway sends the agent to re-invoke from "an interactive tab" it was
+ * demonstrably already on. `ctx.ensureReachable` is optional-chained at the call
+ * site, so this is threaded rather than assumed — an absent check means the
+ * alternative is still live and is still named.
+ */
+surfaceConfirmed) {
+    const waited = `${Math.round(ASK_TOTAL_BUDGET_CAP_MS / 1000)}s`;
+    let text = surfaceConfirmed
+        ? `The question card was delivered to the panel and went unanswered for ${waited}, ` +
+            "so nothing was selected — this is a timeout, not a delivery failure. The user " +
+            "may simply not have been at the screen. If you still need the decision, ask them " +
+            "directly in plain chat text, or re-invoke panel_ask when they are present."
+        : `The question card was not answered within ${waited} — either it went unanswered, ` +
+            "or no interactive panel surface rendered it (e.g. an exec/headless run), and this " +
+            "call could not establish which. If you still need the decision, ask the user " +
+            "directly in plain chat text, or re-invoke panel_ask from an interactive ComfyUI tab.";
     // What is surfaced, and why each:
     //  • an answer that reached NO tool call — nobody has it, so it must be told;
     //  • an answer to THIS EXACT question that DID reach a tool call but could not
@@ -5454,7 +5482,13 @@ async function askUserWithGrace(ctx, ask) {
             // a conversation replaced mid-ask would let the live turn's ack settle a
             // warning that conversation never saw — the debt path reaching a live turn
             // through a helper, which is how it slipped the gate before.
-            const body = askTimeoutResult(tabId, fingerprint, outcome.recovery);
+            // #1243 — derive this rather than hardcoding `true`. The reachability call above
+            // is optional-chained (`ctx.ensureReachable?.()`), so on a ctx that does not
+            // provide it NO check ran and the no-surface alternative is still live. Passing a
+            // literal would have made the false branch unreachable in production — dead code
+            // justified by a hypothetical, and a test exercising a path nothing takes.
+            const surfaceConfirmed = typeof ctx.ensureReachable === "function";
+            const body = askTimeoutResult(tabId, fingerprint, outcome.recovery, surfaceConfirmed);
             return AskAnswers.askBelongsToLiveConversation(askId)
                 ? withDroppedAnswerWarning(tabId, body)
                 : body;
@@ -7469,7 +7503,7 @@ export function buildPanelToolDefs() {
                 .min(1)
                 .describe("Wizard step/field refs to glow green (as the wizard labels them). Pass several to highlight a set."),
         }, async (args, ctx) => ctx.call({ cmd: "training_highlight", refs: args.refs }, 10000)),
-        def("panel_ask", "Ask the user to choose between options — renders an interactive question card in the panel chat and BLOCKS until they pick, returning their choice as text. Use this (NOT the AskUserQuestion tool, which never renders here) whenever you need the user to decide between options. Each option may carry a short description. The card always includes an 'Other…' free-text field, so the returned string may be a listed label or whatever the user typed (comma-joined for multi_select). Ask only when the answer genuinely changes what you do.", {
+        def("panel_ask", "Ask the user to choose between options — renders an interactive question card in the panel chat and BLOCKS until they pick, returning their choice as text. It does NOT block forever: if nobody answers within ~285s the call returns an error saying so, and you must then ask in plain chat text or re-invoke when the user is present. Budget for that — a question asked while the user is away costs the better part of five minutes before you learn anything. Use this (NOT the AskUserQuestion tool, which never renders here) whenever you need the user to decide between options. Each option may carry a short description. The card always includes an 'Other…' free-text field, so the returned string may be a listed label or whatever the user typed (comma-joined for multi_select). Ask only when the answer genuinely changes what you do.", {
             question: z.string().describe("The question to ask, e.g. 'Which sampler should I use?'"),
             options: z
                 .array(z.object({
@@ -7603,7 +7637,16 @@ export function buildPanelToolDefs() {
                     // THE explicit scope-recovery consent (#884 gate 3) — the only
                     // caller that may escape a DEAD scope pin (a healthy pin still
                     // stays put; see rebindToActiveTab's double gate).
-                    ctx.rebindToActiveTab({ scopeRecoveryConsent: true });
+                    const rebind = ctx.rebindToActiveTab({ scopeRecoveryConsent: true });
+                    // #1077 Finding 2 — a scope repin that declined now says WHY, and
+                    // this is where the user reads it. The refusal used to be a bare
+                    // boolean, so a session stuck in the one state that repeats forever
+                    // (the active tab belongs to another backend's conversation while
+                    // this one has several eligible tabs) saw no difference from a
+                    // healthy pin being correctly left alone.
+                    if (rebind?.repinRefusal) {
+                        rebindNote += ` The session pin was NOT moved: ${rebind.repinRefusal}.`;
+                    }
                 }
                 catch (err) {
                     // #474: with 2+ live tabs the rebind is AMBIGUOUS — fail so the user picks.