comfyui-mcp 0.52.28 → 0.52.29

package/dist/orchestrator/create-group-membership.js

@@ -0,0 +1,263 @@
+/**
+ * #1877 — panel_create_group can wrap a collapsed node and still report it
+ * missing.
+ *
+ * The panel sizes the box from live `pos`/`size`. A collapsed node often has
+ * `size[1] === 0` (title-chip only), so the box is ~100px tall around the
+ * node's origin. Membership then tests the CENTRE of a boundingRect rebuilt
+ * with the panel's `finiteExtent` fallback (0 is not a usable height, so the
+ * body becomes 100px plus a 30px title). That centre sits a few pixels below
+ * the box, so the group is empty even though the node's coordinates are inside.
+ *
+ * These helpers expand a created group's bounds just enough to contain every
+ * membership-plausible centre of a requested node whose origin is already in
+ * the box — then the caller writes those bounds with graph_edit_group.
+ *
+ * Constants match comfyui-mcp-panel `web/js/lib/group-geometry.js`
+ * (`COLLAPSED_TITLE_HEIGHT`, `COLLAPSED_PILL_WIDTH`, `finiteExtent` fallbacks)
+ * and LiteGraph's containsCentre rule (min edge inclusive, max edge exclusive).
+ */
+export const NODE_TITLE_HEIGHT = 30;
+export const COLLAPSED_PILL_WIDTH = 80;
+export const DEFAULT_NODE_WIDTH = 200;
+export const DEFAULT_NODE_BODY_HEIGHT = 100;
+function finiteExtent(value, fallback) {
+    const n = Number(value);
+    return Number.isFinite(n) && n > 0 ? n : fallback;
+}
+function finiteQuad(v) {
+    if (!Array.isArray(v) || v.length !== 4)
+        return null;
+    const q = [Number(v[0]), Number(v[1]), Number(v[2]), Number(v[3])];
+    return q.every(Number.isFinite) ? q : null;
+}
+export function nodePosInsideGroupBounds(pos, bounds) {
+    const [gx, gy, gw, gh] = bounds;
+    const [x, y] = pos;
+    // Inclusive on every edge: the reporter's "bounds cover the node" is a
+    // top-left origin sitting on or inside the box, not a centre test.
+    return x >= gx && x <= gx + gw && y >= gy && y <= gy + gh;
+}
+/**
+ * Centres LiteGraph / the panel might use for containsCentre, given only the
+ * geometry panel_query_graph actually returns (pos, size, collapsed, full_height).
+ */
+export function membershipCandidateCenters(node) {
+    const x = node.pos[0];
+    const y = node.pos[1];
+    const pillW = finiteExtent(node.size[0], COLLAPSED_PILL_WIDTH);
+    const fullW = finiteExtent(node.size[0], DEFAULT_NODE_WIDTH);
+    const fullH = finiteExtent(node.size[1], DEFAULT_NODE_BODY_HEIGHT);
+    const chipH = finiteExtent(node.full_height, NODE_TITLE_HEIGHT);
+    return [
+        // Collapsed title-chip (syncNodeArea without forceCollapsed).
+        { x: x + pillW / 2, y: y - NODE_TITLE_HEIGHT + chipH / 2 },
+        // forceCollapsed wantedNodeArea: size[1]===0 falls back to DEFAULT_NODE_BODY_HEIGHT.
+        { x: x + fullW / 2, y: y - NODE_TITLE_HEIGHT + (fullH + NODE_TITLE_HEIGHT) / 2 },
+        // Raw pos + stored size (degenerate when size[1] is 0 — origin itself).
+        { x: x + fullW / 2, y: y + (node.size[1] > 0 ? node.size[1] : 0) / 2 },
+    ];
+}
+/** Grow `bounds` so every point is a containsCentre member (max edge exclusive). */
+export function expandBoundsToContainCenters(bounds, points) {
+    let [x, y, w, h] = bounds;
+    let x2 = x + w;
+    let y2 = y + h;
+    for (const p of points) {
+        if (!Number.isFinite(p.x) || !Number.isFinite(p.y))
+            continue;
+        if (p.x < x)
+            x = p.x;
+        if (p.y < y)
+            y = p.y;
+        if (p.x >= x2)
+            x2 = p.x + 1;
+        if (p.y >= y2)
+            y2 = p.y + 1;
+    }
+    return [x, y, x2 - x, y2 - y];
+}
+export function expandGroupBoundsForMembership(bounds, nodes) {
+    const points = [];
+    for (const n of nodes) {
+        if (!nodePosInsideGroupBounds(n.pos, bounds))
+            continue;
+        points.push(...membershipCandidateCenters(n));
+    }
+    return points.length ? expandBoundsToContainCenters(bounds, points) : bounds;
+}
+function idKey(id) {
+    return String(id);
+}
+export function classifyRequestedMembership(requested, members) {
+    const reqKeys = new Set(requested.map(idKey));
+    const memberKeys = new Set(members.map(idKey));
+    return {
+        extra: members.filter((id) => !reqKeys.has(idKey(id))),
+        missing: requested.filter((id) => !memberKeys.has(idKey(id))),
+    };
+}
+function asIdList(v) {
+    if (!Array.isArray(v))
+        return [];
+    return v.filter((id) => typeof id === "number" || typeof id === "string");
+}
+function parseToolJson(res) {
+    if (!res || res.isError)
+        return null;
+    const text = res.content.find((c) => c.type === "text")?.text;
+    if (typeof text !== "string")
+        return null;
+    try {
+        const parsed = JSON.parse(text);
+        return parsed && typeof parsed === "object" && !Array.isArray(parsed)
+            ? parsed
+            : null;
+    }
+    catch {
+        return null;
+    }
+}
+function withPayload(res, payload) {
+    const first = res.content[0];
+    if (!first || first.type !== "text")
+        return res;
+    return {
+        ...res,
+        content: [{ type: "text", text: JSON.stringify(payload, null, 2) }, ...res.content.slice(1)],
+    };
+}
+function groupFromCreateReply(payload) {
+    const inner = payload.group;
+    if (inner && typeof inner === "object" && !Array.isArray(inner))
+        return inner;
+    if ("bounding" in payload || "node_ids" in payload)
+        return payload;
+    return null;
+}
+export function parseDetailNodesFromQueryText(text) {
+    if (typeof text !== "string")
+        return [];
+    const out = [];
+    for (const line of text.split("\n")) {
+        const s = line.trim();
+        if (!s.startsWith("{"))
+            continue;
+        try {
+            const row = JSON.parse(s);
+            const id = row.id;
+            if (typeof id !== "number" && typeof id !== "string")
+                continue;
+            const pos = row.pos;
+            const size = row.size;
+            if (!Array.isArray(pos) || pos.length < 2 || !Array.isArray(size) || size.length < 2)
+                continue;
+            const x = Number(pos[0]);
+            const y = Number(pos[1]);
+            const w = Number(size[0]);
+            const h = Number(size[1]);
+            if (![x, y, w, h].every(Number.isFinite))
+                continue;
+            const geom = { id, pos: [x, y], size: [w, h] };
+            if (row.collapsed === true)
+                geom.collapsed = true;
+            if (typeof row.full_height === "number" && Number.isFinite(row.full_height)) {
+                geom.full_height = row.full_height;
+            }
+            out.push(geom);
+        }
+        catch {
+            /* skip a non-JSON detail line */
+        }
+    }
+    return out;
+}
+function honestyWarning(extra, missing) {
+    return ("group membership is geometric: the box that wraps the requested nodes " +
+        `also captures ${extra} unrelated node(s) (their centre falls inside)` +
+        (missing ? ` and misses ${missing} requested node(s)` : "") +
+        ". Move the intended nodes into a contiguous region (panel_edit_node / " +
+        "panel_auto_layout) before grouping, or edit the group bounds, to get an exact set.");
+}
+function attachHonesty(group, requested) {
+    const live = asIdList(group.node_ids);
+    const { extra, missing } = classifyRequestedMembership(requested, live);
+    const out = { ...group, requested_node_ids: requested };
+    delete out.extra_node_ids;
+    delete out.missing_node_ids;
+    delete out.warning;
+    if (extra.length || missing.length) {
+        if (extra.length)
+            out.extra_node_ids = extra;
+        if (missing.length)
+            out.missing_node_ids = missing;
+        out.warning = honestyWarning(extra.length, missing.length);
+    }
+    return out;
+}
+function quadsEqual(a, b) {
+    return a[0] === b[0] && a[1] === b[1] && a[2] === b[2] && a[3] === b[3];
+}
+/**
+ * After graph_create_group, if requested ids are missing AND their origin sits
+ * inside the new box, expand the box so those centres are members and rewrite
+ * the reply. Never throws: a failed repair returns the original create result.
+ */
+export async function includeRequestedCreateGroupMembers(created, requestedIds, call) {
+    try {
+        if (created.isError)
+            return created;
+        const requested = asIdList(requestedIds);
+        if (!requested.length)
+            return created;
+        const payload = parseToolJson(created);
+        if (!payload)
+            return created;
+        const group = groupFromCreateReply(payload);
+        if (!group)
+            return created;
+        const bounds = finiteQuad(group.bounding);
+        if (!bounds)
+            return created;
+        const live = asIdList(group.node_ids);
+        const reportedMissing = asIdList(group.missing_node_ids);
+        const missing = reportedMissing.length
+            ? reportedMissing.filter((id) => requested.some((r) => idKey(r) === idKey(id)))
+            : classifyRequestedMembership(requested, live).missing;
+        if (!missing.length)
+            return created;
+        const query = await call({
+            cmd: "graph_query",
+            ids: missing,
+            fields: "detail",
+            limit: Math.min(Math.max(missing.length, 1), 200),
+        }, 8000);
+        if (query.isError)
+            return created;
+        const qPayload = parseToolJson(query);
+        const nodes = parseDetailNodesFromQueryText(qPayload?.text).filter((n) => missing.some((id) => idKey(id) === idKey(n.id)));
+        const repairable = nodes.filter((n) => nodePosInsideGroupBounds(n.pos, bounds));
+        if (!repairable.length)
+            return created;
+        const expanded = expandGroupBoundsForMembership(bounds, repairable);
+        if (quadsEqual(expanded, bounds))
+            return created;
+        const groupId = group.id;
+        if (typeof groupId !== "number" && typeof groupId !== "string")
+            return created;
+        const edited = await call({ cmd: "graph_edit_group", group_id: groupId, bounds: expanded }, 15000);
+        if (edited.isError)
+            return created;
+        const ePayload = parseToolJson(edited);
+        if (!ePayload)
+            return created;
+        const editedGroup = groupFromCreateReply(ePayload);
+        if (!editedGroup)
+            return created;
+        return withPayload(created, { ...ePayload, group: attachHonesty(editedGroup, requested) });
+    }
+    catch {
+        return created;
+    }
+}
+//# sourceMappingURL=create-group-membership.js.map

package/dist/orchestrator/create-group-membership.js.map

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

package/dist/orchestrator/panel-tools.js

@@ -48,6 +48,7 @@ import { peekResolvedPanelBase, primePanelBase, verifiedPanelDiskVersion, } from
 import { conversationOfScopeAddress, isScopeAddress, shortTabId } from "../services/session-scope.js";
 import { NODE_ID_MESSAGE, NODE_ID_PATTERN, normalizeNodeId, PLAIN_NODE_ID_PATTERN, } from "./node-id.js";
 import { parseContradictoryPromotedWidgetRefusal, resolveInnerPromotedTarget, } from "./promoted-widget.js";
+import { includeRequestedCreateGroupMembers } from "./create-group-membership.js";
 import { fastGroupsFilterPropertyNote, isFastGroupsFilterProperty, } from "./rgthree-fast-groups-property.js";
 import { isPlainObject, isStampMismatchSaveRefusal, openLiveMatchesDestContent, patchOpenIdentity, shouldRebindOpenIdentity, workflowFromSerializeReply, } from "./open-identity-normalization.js";
 import { clearSwitchHold, describeSwitchHold, recordSwitchHold, successProvesSwitchCleared, } from "./switch-hold.js";
@@ -662,12 +663,47 @@ function sleep(ms) {
 // frozen/backgrounded tab fails in bounded time instead of hanging forever.
 const OBJECT_INFO_REFRESH_ACK_TIMEOUT_MS = 30_000;
 // #1639 — while a ComfyUI prompt is running the frontend main thread often
-// cannot service graph_* at all (reads included). Waiting out the 20/30 s ack
-// bound only surfaces "tab may be backgrounded or frozen" with an unknown
-// mutation outcome. Fail closed BEFORE dispatch for canvas-touching graph
-// commands so the agent gets an explicit QUEUE BUSY instead. `graph_run` is
-// excluded: queuing behind an in-flight job is the documented sweep path, and
-// panel_run already has its own duplicate fence.
+// cannot service graph_* at all. Waiting out the 20/30 s ack bound only
+// surfaces "tab may be backgrounded or frozen" with an unknown mutation
+// outcome. Fail closed BEFORE dispatch for canvas-touching graph commands so
+// the agent gets an explicit QUEUE BUSY instead. `graph_run` is excluded:
+// queuing behind an in-flight job is the documented sweep path, and panel_run
+// already has its own duplicate fence.
+//
+// panel#1489 — that fence was applied to READS too, and it should not have been.
+//
+// The harm #1639 names is specific to a WRITE: a delivered frame cannot be
+// retracted, so a write that times out mid-render leaves the caller unable to say
+// whether it applied. A read carries no such outcome. Abandoning one costs a
+// retry and nothing else — the asymmetry BRIDGE_DEFAULT_TIMEOUT_MS's own doc
+// spells out ("a read abandoned too early costs a retry; a write abandoned too
+// early is UNRECOVERABLE ambiguity"). So fencing reads bought no safety at all,
+// and it cost the reporter the thing they needed: panel_graph_outline on a
+// running render was rejected unsent, forcing queue-polling and a later retry
+// just to LOOK at the graph.
+//
+// It also asserted more than we know, in BOTH directions. "The tab typically
+// cannot answer" is a prediction, not a measurement — and refusing the call made
+// it unfalsifiable, because no read ever got to try. The architectural reason to
+// doubt it is that ComfyUI executes in server-side Python, so the browser main
+// thread is not the thing doing the work; how often a real tab answers mid-render
+// is NOT measured here, and nothing below depends on a number for it. Attempting
+// the read is what turns the question back into something observable.
+//
+// Note what #1639 actually asked for: "(a) keep the panel's command channel
+// responsive during execution (the reads at minimum should never be blocked by a
+// running prompt), or (b) ... say so explicitly instead of a generic timeout."
+// It shipped (b) and applied it to reads as well, which is the one combination
+// the reporter did not ask for. Reads now get BOTH halves: the call is attempted,
+// and if the tab really cannot answer, queueBusyTimeoutNote still names the
+// running prompt instead of surfacing a bare "backgrounded or frozen".
+//
+// Reads keep their normal tolerant ack budget on purpose. Shortening it mid-render
+// is tempting — a frozen tab costs the caller 20 s instead of 0 — but that is the
+// trade #357 and #589 were both regressions of, in a file whose read-timeout policy
+// is "reads get MORE patience, not less, because a false timeout costs an agent its
+// only look at a broken graph". #589 is precisely this: panel_get_errors was given a
+// 30 s budget because the panel's own bound is 18 s. A cap here would re-break it.
 function queueBusySnapshotNote() {
     const snap = QueueMonitor.snapshot();
     if (!snap.running)
@@ -677,26 +713,54 @@ function queueBusySnapshotNote() {
     const close = snap.runningPromptId ? ")" : "";
     return `${prompt}${node}${close}`;
 }
+/**
+ * panel#1489 — is this `graph_*` command one the queue-busy fence must let past?
+ *
+ * Answered from GRAPH_CMD_EFFECT, which is the ledger that classifies a graph
+ * command by exactly the property this gate turns on: `targeted` means "changes
+ * workflow content, publishes from it, or queues a render of it — a delivered
+ * frame cannot be retracted", which IS the unknown-outcome hazard #1639 fenced.
+ * `inert` means it cannot change workflow content and cannot act on it, so a
+ * frame delivered into a busy tab has nothing to leave half-done.
+ *
+ * NOT `BRIDGE_READONLY_CMDS`: that set answers re-dispatch safety (which default
+ * timeout, may a mid-command socket drop be parked), and #778 is the standing
+ * record of what reading one list for the other question costs — `graph_canvas`
+ * is inert but not idempotent, `refresh_nodes` is idempotent but not a read.
+ *
+ * Fail-closed by construction: an unlisted command has no entry, `undefined` is
+ * not `"inert"`, and it stays fenced. A new mutator is never waved past this gate
+ * by omission.
+ */
+function graphCmdIsInertUnderQueueBusy(name) {
+    return GRAPH_CMD_EFFECT[name] === "inert";
+}
 function graphCmdBlockedByRunningPrompt(cmd) {
     const name = typeof cmd.cmd === "string" ? cmd.cmd : "";
     if (!name.startsWith("graph_") || name === "graph_run")
         return null;
+    // panel#1489 — reads and view/selection changes go through. Only a command
+    // that could leave the workflow half-changed is worth refusing unsent.
+    if (graphCmdIsInertUnderQueueBusy(name))
+        return null;
     const snap = QueueMonitor.snapshot();
     if (!snap.running)
         return null;
     return (`${name} was NOT sent — nothing was applied. QUEUE BUSY: a ComfyUI prompt is running` +
-        `${queueBusySnapshotNote()}. The panel tab typically cannot answer graph_* commands ` +
-        `(including read-only graph_query / graph_outline) while a prompt is executing — ` +
-        `waiting out the ack timeout would only surface a generic "tab may be backgrounded ` +
-        `or frozen" with an unknown outcome. Retry after queue (action:"list") shows running: 0.`);
+        `${queueBusySnapshotNote()}. ${name} MUTATES the workflow, and the panel tab often ` +
+        `cannot service a graph edit while a prompt is executing — delivering it would only ` +
+        `surface a generic "tab may be backgrounded or frozen" timeout with an unknown ` +
+        `outcome, leaving you unable to say whether the edit applied. Read-only graph calls ` +
+        `(graph_outline / graph_query / graph_get_errors) are NOT fenced and can be used right ` +
+        `now to inspect the graph. Retry this edit after queue (action:"list") shows running: 0.`);
 }
 function queueBusyTimeoutNote() {
     if (!QueueMonitor.snapshot().running)
         return "";
-    return (`\n\nQUEUE BUSY: a ComfyUI prompt is still running${queueBusySnapshotNote()}. ` +
-        `The panel tab typically cannot answer graph_* (including read-only queries) while a ` +
-        `prompt is executing — this is not a backgrounded or frozen tab. Retry after queue ` +
-        `(action:"list") shows running: 0.`);
+    return (`\n\nQUEUE BUSY: a ComfyUI prompt is still running${queueBusySnapshotNote()}, which is the ` +
+        `most likely reason the tab did not answer in time — a render can occupy the panel's main ` +
+        `thread. Retry after queue (action:"list") shows running: 0; if it still does not answer ` +
+        `once the queue is idle, THEN treat the tab as backgrounded or frozen.`);
 }
 const RETRY_SAFE_CMDS = new Set([
     // Idempotent reads (mirror UiBridge.READONLY_CMDS + list/status probes).
@@ -2217,19 +2281,24 @@ function sampleVramDevice(d) {
         sample.torch_vram_free = dev.torch_vram_free;
     return sample;
 }
-/** A device with at least 1 GiB of VRAM is still PINNED when less than 20% is
- *  free after /free. CUDA context leftover on an unloaded GPU is a few hundred
- *  MB to a couple of GiB, not 80%+ of a 21 GiB card. The reporter's Raylight
- *  MiniMax H3 case was device 2 at ~0.8% free (~179 MiB of 21 GiB) next to
- *  siblings at ~44% free — that occupancy is what this threshold names.
- *
- *  Unknown/unreadable counters are NOT pinned: an unknown answer claims
- *  nothing in either direction (#1473). */
+/** A device whose ComfyUI torch pool is at least 1 GiB is still PINNED when
+ *  less than 20% of that pool is free after /free. `vram_free` is
+ *  torch.cuda.mem_get_info — the whole device, every process — so it cannot
+ *  attribute a pin to THIS ComfyUI. `torch_vram_total` / `torch_vram_free`
+ *  are this process's allocator: a 32 MiB leftover pool next to a card
+ *  occupied by another instance is not a /free failure and must not
+ *  prescribe panel_restart_comfyui (#1887). The reporter's Raylight MiniMax
+ *  H3 case was device 2 with the torch pool at ~0.24% free — that occupancy
+ *  is what this threshold names.
+ *
+ *  Unknown/unreadable torch counters are NOT pinned: an unknown answer
+ *  claims nothing in either direction (#1473). Device-global counters
+ *  alone also claim nothing — they cannot tell ComfyUI from another process. */
 const PINNED_VRAM_MIN_TOTAL_BYTES = 1024 * 1024 * 1024;
 const PINNED_VRAM_FREE_RATIO = 0.2;
 function deviceStillPinned(d) {
-    const total = d.vram_total;
-    const free = d.vram_free;
+    const total = d.torch_vram_total;
+    const free = d.torch_vram_free;
     if (typeof total !== "number" || typeof free !== "number")
         return false;
     if (!Number.isFinite(total) || !Number.isFinite(free))
@@ -2394,14 +2463,20 @@ async function settleFreeVramAfterAckTimeout(ctx, timedOut) {
  * GPU. After the tab says it posted /free, re-read /system_stats and refuse to
  * claim VRAM was freed when a device is still occupied. Unreadable stats leave
  * the original ack UNTOUCHED: an unknown answer claims nothing extra.
+ *
+ * #1887 — occupancy is read from the same proven local base the frozen-tab
+ * settle uses (`captureRebootHealthBase(ctx)`), never `getComfyUIBaseUrl()`.
+ * A hello from another tab can retarget the global base asynchronously;
+ * reporting that GPU as this command's failure is the wrong-target failure
+ * the gate exists to prevent. No proven local server → leave the ack.
  */
-async function annotateFreeVramAck(res) {
+async function annotateFreeVramAck(ctx, res) {
     if (res.isError)
         return res;
     const parsed = parseToolResultJson(res);
     if (!parsed || parsed.freed !== true)
         return res;
-    const base = (getComfyUIBaseUrl() || "").replace(/\/+$/, "");
+    const base = captureRebootHealthBase(ctx);
     if (!base)
         return res;
     const devices = await readVramDevicesMaybe(base, FREE_VRAM_DIRECT_TIMEOUT_MS);
@@ -7151,9 +7226,11 @@ export function makePanelToolCtx(bridge, tabId, workflowTargets) {
                 await awaitReachable();
             }
             ensureReachable();
-            // #1639 — a running prompt freezes the tab's graph_* channel. Refuse
-            // BEFORE dispatch so a mutation is known-not-applied rather than
+            // #1639 — a running prompt can freeze the tab's graph_* channel. Refuse a
+            // MUTATION before dispatch so it is known-not-applied rather than
             // delivered-into-a-frozen-tab with a 20/30s unknown-outcome timeout.
+            // panel#1489 — reads are NOT refused here: they carry no unknown outcome,
+            // so they are dispatched on the bounded budget above instead.
             const blocked = graphCmdBlockedByRunningPrompt(cmd);
             if (blocked)
                 return fail(blocked);
@@ -7202,6 +7279,38 @@ export function makePanelToolCtx(bridge, tabId, workflowTargets) {
                 let holdTab = ctx.tabId;
                 try {
                     await sleep(retrySettleMs());
+                    // #1881 — a retry-safe READ that failed on an EMPTY tab registry gets the
+                    // same bounded reconnect wait a mutating edit already gets, instead of
+                    // spending its one re-issue ~400ms in.
+                    //
+                    // #436 gated mutations here and deliberately left the read path alone, on
+                    // the reasoning that "a read survives that window (it is parked mid-command
+                    // and is retry-safe)". Parking is what happens to a command the bridge
+                    // ACCEPTED and cannot answer yet. This failure happens strictly earlier:
+                    // resolveTarget throws before any socket write (dispatched:false), so there
+                    // is no parked command — the read just gets one re-issue after the settle,
+                    // and reconnectWaitTiming's own docstring says why that loses: "the browser
+                    // reconnects its own socket seconds-to-tens-of-seconds after ComfyUI comes
+                    // back, so the existing single ~400ms retry always loses the race."
+                    //
+                    // Reported shape: after a full ComfyUI Desktop restart the panel's chat
+                    // frame is delivered (deliverPanelEvent runs whether or not the socket has
+                    // re-registered) while its `hello` — the ONLY writer of the connected-tab
+                    // registry — has not landed yet. So the turn is live, `Connected: none` is
+                    // true, and panel_graph_outline failed both immediately and 3s later; only
+                    // a manual browser refresh cleared it.
+                    //
+                    // awaitReachable() is SELF-GATING, which is the whole safety argument: it
+                    // returns at once when the bound tab is reachable, and it loops ONLY while
+                    // zero interactive tabs are connected. So this adds latency in exactly one
+                    // state — the genuine post-restart empty registry — and changes nothing for
+                    // a healthy session, a multi-tab session, or a panel that answered (a
+                    // pre-executor / workflow-switch refusal reaches here with its tab still
+                    // connected, so the wait is a no-op for those). The command is idempotent
+                    // and NOTHING was dispatched, so waiting cannot double-apply. Reads outside
+                    // RETRY_SAFE_CMDS never enter this branch at all, so graph_list_subgraphs
+                    // and training_get_state keep failing fast.
+                    await awaitReachable();
                     ensureReachable(); // rebinds a current-mode session onto the reconnected tab
                     holdTab = ctx.tabId;
                     const retried = ok(await sendRouted(cmd, timeoutMs, observeRid));
@@ -12392,14 +12501,17 @@ CHECKED FOR YOU: the graph read this message prescribes was just run, and it ` +
                 .describe("Explicit [x, y, width, height] (four numbers). Ignored if node_ids is given."),
             color: z.string().optional().describe("Box/header color, e.g. '#3f789e'."),
             font_size: z.number().optional().describe("Title font size (default 24)."),
-        }, async (args, ctx) => ctx.call({
+        }, 
+        // #1877 — a collapsed node can sit inside the auto-fit box and still be
+        // reported missing (size[1]===0 vs membership's 100px body fallback).
+        async (args, ctx) => includeRequestedCreateGroupMembers(await ctx.call({
             cmd: "graph_create_group",
             title: args.title,
             node_ids: args.node_ids,
             bounds: args.bounds,
             color: args.color,
             font_size: args.font_size,
-        }, 15000)),
+        }, 15000), args.node_ids, (cmd, timeoutMs) => ctx.call(cmd, timeoutMs))),
         def("panel_move_group", "Move a group box to a new top-left [x, y] on the user's open graph. By default the nodes inside the group move with it (like dragging the group header); pass move_nodes:false to move only the box. Group id comes from panel_query_graph (the `groups` array on every result) or panel_create_group. Undoable.", {
             group_id: z.number().int().describe("Group id from panel_query_graph's groups[] / panel_create_group."),
             pos: xy().describe("New top-left [x, y] (two numbers)."),
@@ -13299,6 +13411,10 @@ CHECKED FOR YOU: the graph read this message prescribes was just run, and it ` +
             // process tree was unreadable, so the launch signatures stood in). Appended
             // to the outcome note below — a dispatch allowed on an inference says so.
             let preflightNote;
+            // #1847: proven python-command relaunch when Desktop parent inspection
+            // could not identify a supervisor. Routes to Manager-stop, then spawn
+            // only if that parent is gone — a live parent may already be relaunching.
+            let preflightSelfRelaunch = false;
             // The target generation as of BEFORE the preflight resolved that argv, so the
             // whole span up to the post-restart reading sits inside one instance fence.
             let preflightArgvGeneration = -1;
@@ -13328,6 +13444,7 @@ CHECKED FOR YOU: the graph read this message prescribes was just run, and it ` +
                 preflightArgv = preflight.observedArgv;
                 preflightIsDesktop = preflight.isDesktopApp === true;
                 preflightNote = preflight.note;
+                preflightSelfRelaunch = preflight.selfRelaunch === true;
                 preflightArgvGeneration = preflightTargetGeneration;
                 // r8/r9/r10: the preflight AWAIT makes the pre-decision captures
                 // STALE — and the preflight itself reads MUTABLE config (target URL,
@@ -13450,6 +13567,20 @@ CHECKED FOR YOU: the graph read this message prescribes was just run, and it ` +
                         observedOrigin: ctx.bridge?.tabServerOrigin?.(ctx.tabId) ?? null,
                     }));
             }
+            // #1847: parent-process inspection could not identify a Desktop
+            // supervisor, but the launch command is proven on disk. Manager-stop,
+            // then spawn that command only if the parent is gone — a live parent
+            // may already be relaunching, and a free port is not proof it isn't.
+            if (preflightSelfRelaunch && healthBase != null && dispatchBound) {
+                return runHeadlessManagedRestart({
+                    healthBase,
+                    preRestartPanelIdentity,
+                    why: "Desktop parent-process inspection could not identify a supervisor, and the launch command is proven on disk",
+                    mechanism: "a Manager stop, then the proven launch command only if that parent process is gone",
+                    noteHealthyLead: "Desktop parent-process inspection could not identify a supervisor; the proven launch command",
+                    noteRanLead: "Desktop parent-process inspection could not identify a supervisor; ran a Manager stop (and the proven launch command only if that parent process was gone)",
+                });
+            }
             const timing = getPanelRebootTiming();
             const dispatchTimeout = Math.max(1, Math.min(15000, overallDeadline - Date.now()));
             // CONCURRENT OBSERVATION (coordinator): start probing the fixed boot endpoint NOW,
@@ -13868,7 +13999,7 @@ CHECKED FOR YOU: the graph read this message prescribes was just run, and it ` +
                         ".") + argvNote + (preflightNote ? ` ${preflightNote}` : ""),
             });
         }),
-        def("panel_free_vram", "Unload all loaded models and free VRAM (ComfyUI /free). Use to unwedge a stuck/OOM ComfyUI when a cancel didn't free memory — before retrying or, last resort, restarting (panel_restart_comfyui). Does NOT restart ComfyUI; it just drops resident models and frees cached memory. After /free, occupancy is re-read from /system_stats: if a device remains pinned (Ray workers, parallel CLIP, custom-node allocations /free cannot terminate), the reply names those devices and does NOT claim VRAM was freed — next step is panel_restart_comfyui. If the panel tab is frozen and cannot acknowledge, the free is instead issued DIRECTLY to the ComfyUI server and verified there (same /free, idempotent) whenever the tab provably fronts the local server — otherwise the outcome is reported unknown rather than claimed.", {}, async (_args, ctx) => {
+        def("panel_free_vram", "Unload all loaded models and free VRAM (ComfyUI /free). Use to unwedge a stuck/OOM ComfyUI when a cancel didn't free memory — before retrying or, last resort, restarting (panel_restart_comfyui). Does NOT restart ComfyUI; it just drops resident models and frees cached memory. After /free, THIS instance's torch-pool occupancy is re-read from /system_stats on the server this tab provably fronts: if a device remains pinned (Ray workers, parallel CLIP, custom-node allocations /free cannot terminate), the reply names those devices and does NOT claim VRAM was freed — next step is panel_restart_comfyui. Device-global occupancy held by another process is not this free failing. If the panel tab is frozen and cannot acknowledge, the free is instead issued DIRECTLY to the ComfyUI server and verified there (same /free, idempotent) whenever the tab provably fronts the local server — otherwise the outcome is reported unknown rather than claimed.", {}, async (_args, ctx) => {
             const res = await ctx.call({ cmd: "free_vram" }, 15000);
             // #1249 — ONLY a no-reply is settled server-side. An acked executor error
             // (the panel's own "Failed to free VRAM: …") is a reply the bridge
@@ -13879,7 +14010,7 @@ CHECKED FOR YOU: the graph read this message prescribes was just run, and it ` +
                 return settleFreeVramAfterAckTimeout(ctx, res);
             // #1866 — a successful /free ack is not a free GPU. Re-read occupancy
             // and refuse to report freed:true when a device is still pinned.
-            return annotateFreeVramAck(res);
+            return annotateFreeVramAck(ctx, res);
         }),
         def("panel_show_media", "Display one or more images or videos directly in the panel chat. Use this whenever the user asks to SEE or SHOW a file — a disk path you composited/downloaded/generated (absolute path on the orchestrator host) OR a ComfyUI output ref ({ filename, subfolder?, type? }). Items are rendered as media cards in the agent chat area; supply optional captions. Max 8 items per call. A path item OVER the 20 MB inline cap that is not under any directory ComfyUI serves can still be shown by passing stage:true on that item — the orchestrator COPIES it into <output>/_panel_staged (an opt-in, persistent disk write; 512 MB per-file and 2 GB total caps) and displays the copy by reference. NEVER describe an image with emoji or text placeholders — call this tool instead.", {
             items: z