Regroup node widgets, fix restored-workflow overflow, drop dead-widget layout debt

Layout was incoherent: image_resize sat between seed and the draft model, two
empty textareas broke up the sampling rows, and json_schema showed even in Text
mode. Widgets are now grouped most-used first:

  prompts -> model -> generation -> sampling -> output shaping -> reasoning
  -> vision -> speculative decoding -> management

Reordering is safe precisely now: no v2 workflow exists yet, and the v1
migration writes values onto current widgets by name, so it is order
independent. Verified in a browser - a v1 workflow lands correctly on the
regrouped widgets, including image_resize and custom_draft_model.

Also fixes a real defect this surfaced: a workflow stores the node's size and
LiteGraph restores it verbatim without re-checking that the widgets still fit.
v2.0.0 has a net two more widgets than v1.5.x, so every upgraded workflow was
restored too short and the overflow drew outside the node frame.
growToFitWidgets grows (never shrinks) the node on configure and after
execution; a v1 node stored at 700px now grows to 820px on load.

For the record: a stock ComfyUI Note node's textarea overhangs its own frame by
~13 units at any size. That is upstream behaviour, measured against a freshly
created Note, and is not something this pack causes or should chase.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

Author: EnragedAntelope

AGENTS.md

@@ -80,11 +80,21 @@ seed, and no thinking on/off flag.** `seed` exists only in the *load* config.
 The `seed` widget is a ComfyUI cache-buster and nothing more.
 
 **Removing or reordering a widget corrupts saved workflows.** ComfyUI serialises
-`widgets_values` positionally, so a removal shifts every later value. The
-migration in `web/ea_lmstudio.js` keys the old array by the v1.5.x widget-name
-order (two variants, with and without the `control_after_generate` widget
-ComfyUI inserts after an INT named `seed`). Any future removal needs the same
-treatment, and the legacy order table must be kept.
+`widgets_values` positionally, so a removal or a regroup shifts every later
+value. The migration in `web/ea_lmstudio.js` keys the old array by the v1.5.x
+widget-name order (two variants, with and without the `control_after_generate`
+widget ComfyUI inserts after an INT named `seed`) and writes values onto current
+widgets **by name**, which is why v2.0.0 could both drop two widgets and regroup
+the rest. Any future removal or reorder needs the same treatment, and the legacy
+order table must be kept.
+
+**A stored node size is restored verbatim and is not re-checked against the
+widgets.** Adding a widget therefore leaves every previously saved workflow too
+short, and the overflow draws outside the node frame. `growToFitWidgets` in the
+frontend extension grows (never shrinks) the node on configure and after
+execution. Note that a stock ComfyUI `Note` node's textarea overhangs its own
+frame by ~13 units at any size — that is upstream behaviour, not a symptom of
+this, so don't chase it.
 
 **A streamed prediction must be drained, not broken out of.** Breaking the `for`
 loop closes the generator and `stream.result()` then raises `GeneratorExit`.

LMStudio.py

@@ -248,33 +248,12 @@ def INPUT_TYPES(cls):
                     "tooltip": "Re-roll control only. LM Studio has no inference-time seed, so this does NOT make output reproducible - changing it simply tells ComfyUI the node is dirty so it generates again instead of reusing the cached response. Set control_after_generate to 'randomize' for a fresh answer every queue, or 'fixed' to keep the cached one."
                 }),
             },
+            # Widget order below is the on-node layout. Grouped most-used first:
+            # sampling -> output shaping -> reasoning -> vision -> speculative
+            # decoding -> management. Each group's dependent fields follow the
+            # control that switches them on, and every dependent field's tooltip
+            # names that control, so the layout reads top-to-bottom.
             "optional": {
-                # --- Image inputs (for VLMs) ---
-                "image_resize": (IMAGE_RESIZE_OPTIONS, {
-                    "default": "Medium (768px)",
-                    "tooltip": "Resize images before processing. Smaller = faster inference. 'No Resize' keeps original size. Only applies when images are connected."
-                }),
-                "image1": ("IMAGE", {
-                    "tooltip": "First image input for vision models (VLMs). Leave unconnected for text-only inference."
-                }),
-                "image2": ("IMAGE", {
-                    "tooltip": "Second image input for multi-image VLMs. Not all VLMs support multiple images."
-                }),
-                "image3": ("IMAGE", {
-                    "tooltip": "Third image input for multi-image VLMs. Not all VLMs support multiple images."
-                }),
-                "image4": ("IMAGE", {
-                    "tooltip": "Fourth image input for multi-image VLMs. Not all VLMs support multiple images."
-                }),
-                # --- Advanced model options ---
-                "draft_model_selection": (model_choices, {
-                    "default": CUSTOM_MODEL_OPTION,
-                    "tooltip": "Optional draft model for speculative decoding (faster inference). Must share a tokenizer with the main model. Leave on 'Custom' with an empty box to disable. Acceptance stats are reported in troubleshooting."
-                }),
-                "custom_draft_model": ("STRING", {
-                    "default": "",
-                    "tooltip": "Manual draft model identifier. Only used when draft 'Custom' is selected. Leave empty to disable."
-                }),
                 # --- Sampling parameters ---
                 "top_p": ("FLOAT", {
                     "default": 1.0,
@@ -336,6 +315,32 @@ def INPUT_TYPES(cls):
                     "default": "</think>",
                     "tooltip": "Custom closing tag for reasoning extraction. Only used when reasoning_mode is 'Custom tags'."
                 }),
+                # --- Vision (only relevant when an image input is connected) ---
+                "image_resize": (IMAGE_RESIZE_OPTIONS, {
+                    "default": "Medium (768px)",
+                    "tooltip": "Resize images before processing. Smaller = faster inference. 'No Resize' keeps original size. Only applies when images are connected."
+                }),
+                "image1": ("IMAGE", {
+                    "tooltip": "First image input for vision models (VLMs). Leave unconnected for text-only inference."
+                }),
+                "image2": ("IMAGE", {
+                    "tooltip": "Second image input for multi-image VLMs. Not all VLMs support multiple images."
+                }),
+                "image3": ("IMAGE", {
+                    "tooltip": "Third image input for multi-image VLMs. Not all VLMs support multiple images."
+                }),
+                "image4": ("IMAGE", {
+                    "tooltip": "Fourth image input for multi-image VLMs. Not all VLMs support multiple images."
+                }),
+                # --- Speculative decoding ---
+                "draft_model_selection": (model_choices, {
+                    "default": CUSTOM_MODEL_OPTION,
+                    "tooltip": "Optional draft model for speculative decoding (faster inference). Must share a tokenizer with the main model. Leave on 'Custom' with an empty box to disable. Acceptance stats are reported in troubleshooting."
+                }),
+                "custom_draft_model": ("STRING", {
+                    "default": "",
+                    "tooltip": "Manual draft model identifier. Only used when draft 'Custom' is selected. Leave empty to disable."
+                }),
                 # --- Management ---
                 "unload_llm": ("BOOLEAN", {
                     "default": True,

docs/images/node-text-prompt-enhancer.png

@@ -6,7 +6,7 @@
       "id": 1,
       "type": "Note",
       "pos": [40, 40],
-      "size": [420, 260],
+      "size": [420, 390],
       "flags": {},
       "order": 0,
       "mode": 0,
@@ -23,7 +23,7 @@
       "id": 2,
       "type": "EA_LMStudio",
       "pos": [500, 40],
-      "size": [480, 780],
+      "size": [480, 900],
       "flags": {},
       "order": 1,
       "mode": 0,
@@ -48,9 +48,6 @@
         0.8,
         0,
         "randomize",
-        "Medium (768px)",
-        "-- Custom (enter below) --",
-        "",
         0.95,
         0,
         1.1,
@@ -62,6 +59,9 @@
         "Auto-detect (recommended)",
         "<think>",
         "</think>",
+        "Medium (768px)",
+        "-- Custom (enter below) --",
+        "",
         true,
         false,
         false

docs/images/node-vision-structured-json.png

@@ -6,7 +6,7 @@
       "id": 1,
       "type": "Note",
       "pos": [40, 40],
-      "size": [420, 300],
+      "size": [460, 460],
       "flags": {},
       "order": 0,
       "mode": 0,
@@ -22,8 +22,8 @@
     {
       "id": 2,
       "type": "LoadImage",
-      "pos": [40, 380],
-      "size": [420, 440],
+      "pos": [40, 560],
+      "size": [460, 460],
       "flags": {},
       "order": 1,
       "mode": 0,
@@ -38,8 +38,8 @@
     {
       "id": 3,
       "type": "EA_LMStudio",
-      "pos": [500, 40],
-      "size": [480, 820],
+      "pos": [540, 40],
+      "size": [480, 940],
       "flags": {},
       "order": 2,
       "mode": 0,
@@ -64,9 +64,6 @@
         0.3,
         0,
         "randomize",
-        "Medium (768px)",
-        "-- Custom (enter below) --",
-        "",
         1,
         0,
         1,
@@ -78,6 +75,9 @@
         "Auto-detect (recommended)",
         "<think>",
         "</think>",
+        "Medium (768px)",
+        "-- Custom (enter below) --",
+        "",
         true,
         false,
         false
@@ -86,7 +86,7 @@
     {
       "id": 4,
       "type": "PreviewAny",
-      "pos": [1020, 40],
+      "pos": [1060,40],
       "size": [400, 320],
       "flags": {},
       "order": 3,
@@ -100,7 +100,7 @@
     {
       "id": 5,
       "type": "PreviewAny",
-      "pos": [1020, 400],
+      "pos": [1060,400],
       "size": [400, 420],
       "flags": {},
       "order": 4,

example_workflows/01-prompt-enhancer.json

@@ -51,6 +51,9 @@ const LEGACY_ORDER = [
     "unload_comfy_models",
     "refresh_models",
 ];
+// v2.0.0 also regrouped the widgets, so the migration below cannot assume the
+// old and new orders line up - it maps every legacy value onto the current
+// widget of the same name, which is order-independent by construction.
 
 const LEGACY_ORDER_WITH_SEED_CONTROL = [
     ...LEGACY_ORDER.slice(0, 7),
@@ -139,6 +142,30 @@ function migrateLegacyWidgetValues(node, widgetValues, defaults) {
     return true;
 }
 
+/**
+ * Grow a node that is stored smaller than its widgets need.
+ *
+ * A workflow stores the node's size, and LiteGraph restores it verbatim - it
+ * does not re-check that the widgets still fit. Any release that adds a widget
+ * therefore leaves every previously saved workflow a row or two too short, and
+ * the overflowing widgets draw outside the node's frame. v2.0.0 has a net two
+ * more widgets than v1.5.x, so this affects every upgraded workflow, not just
+ * an unlucky few. Only ever grows - a deliberately widened node is preserved.
+ */
+function growToFitWidgets(node) {
+    try {
+        const [minWidth, minHeight] = node.computeSize();
+        if (node.size[0] < minWidth || node.size[1] < minHeight) {
+            node.setSize([
+                Math.max(node.size[0], minWidth),
+                Math.max(node.size[1], minHeight),
+            ]);
+        }
+    } catch (err) {
+        console.error("[EA_LMStudio] Could not resize node to fit widgets:", err);
+    }
+}
+
 function getPreviewWidget(node) {
     let widget = node.widgets?.find((w) => w.name === PREVIEW_WIDGET_NAME);
     if (widget) return widget;
@@ -179,6 +206,7 @@ app.registerExtension({
             } catch (err) {
                 console.error("[EA_LMStudio] Legacy workflow migration failed:", err);
             }
+            growToFitWidgets(this);
         };
 
         /*
@@ -207,11 +235,7 @@ app.registerExtension({
             const widget = getPreviewWidget(this);
             widget.value = text;
 
-            const [minWidth, minHeight] = this.computeSize();
-            this.setSize([
-                Math.max(this.size[0], minWidth),
-                Math.max(this.size[1], minHeight),
-            ]);
+            growToFitWidgets(this);
             app.graph.setDirtyCanvas(true, false);
         };
     },