Drop an unused import in the second-copy test

Manager installs the pack in custom_nodes/ausboss-nodes and a git clone
lands in custom_nodes/ComfyUI-AusBoss. With both folders present, both
copies registered GET /ausboss/pack_modules and ComfyUI stopped at
startup: "Added route will never be executed, method HEAD is already
registered".

The first copy to load claims a marker in sys.modules. A later copy
loads no node modules, registers no routes, serves no js folder, and
prints which folder it skipped.

.github/workflows/publish_model_downloader.yml

@@ -7,6 +7,10 @@ on:
         description: Full commit SHA from ComfyUI-AusBoss-Model-Downloader main
         required: true
         type: string
+      changelog:
+        description: Release note for this version, shown in the Registry's Updates section
+        required: true
+        type: string
 
 # The existing AusBoss publisher credential stays in this repository. This
 # manual job publishes only the separately maintained Model Downloader addon.
@@ -62,12 +66,16 @@ jobs:
         id: publish
         env:
           REGISTRY_ACCESS_TOKEN: ${{ secrets.REGISTRY_ACCESS_TOKEN }}
-          COMFY_NODE_CHANGELOG: 'Initial release: model downloads from Civitai and Hugging Face, installed-file checks, saved model lists, and AusBoss Workflow Note integration.'
+          COMFY_NODE_CHANGELOG: ${{ inputs.changelog }}
         run: |
           if [ -z "$REGISTRY_ACCESS_TOKEN" ]; then
             echo '::error::REGISTRY_ACCESS_TOKEN is not configured.'
             exit 1
           fi
+          if [ -z "${COMFY_NODE_CHANGELOG// /}" ]; then
+            echo '::error::The changelog input is empty; the Registry shows it as the release note.'
+            exit 1
+          fi
           comfy --skip-prompt --no-enable-telemetry node publish --token "$REGISTRY_ACCESS_TOKEN"
       - name: Report Registry review status
         if: always() && steps.publish.outcome != 'skipped'

CHANGELOG.md

@@ -4,6 +4,118 @@ All notable changes to ComfyUI-AusBoss are documented here.
 
 ## Unreleased
 
+- **ComfyUI starts when the pack is installed twice.** Manager installs it in
+  `custom_nodes/ausboss-nodes` and a git clone in `custom_nodes/ComfyUI-AusBoss`.
+  With both there, ComfyUI used to stop at startup. Now the second copy loads
+  nothing, and the console names both folders so you can delete one.
+
+## 2.23.0 - 2026-11-09
+
+- **Mask by Touch keeps your picks when the picture changes.** Your clicks
+  and paint move onto the new picture, in the same places, so an edit before
+  the node no longer means picking everything again. On a picture of another
+  size they are scaled to fit. A click finds whatever is at that spot now;
+  paint stays exactly as painted. For the old way, set **New picture**, under
+  More, to **start over**.
+
+- **Workflow Switches: a switch that changes a setting no longer turns its
+  node off.** The node it sets keeps running. LoRA choices keep every field
+  that differs between them, and the add-choice button shows as soon as a
+  node is selected.
+
+- **Mask by Touch clears a stopped run's message once a run works.** When
+  a run stopped at the node, its message stayed on the picture after the
+  next run from the Run button had worked. It now goes as soon as the new
+  result comes in.
+
+- **Video Crop + Rotate + Pad → Clip: the fixed_frames input sits on its own
+  row again.** In workflows saved by an earlier release, newer ComfyUI drew
+  fixed_frames on top of force_rate, so a link could not be dropped on it.
+  Every input the pack moves into the input column now gets its own row.
+
+- **Node colours stay after a save and reload.** A colour picked from the
+  right-click menu now survives saving, reloading and pasting. In Nodes 2.0,
+  About this node is in the right-click menu, and dragging a node's corner
+  snaps to nearby lines (hold Shift to skip the snap).
+
+- **Image Folder shows the right pictures when you change folders.**
+  Switching folders or reloading a workflow no longer shows old or mixed-up
+  results, a very large folder keeps its newest files, and thumbnails refresh
+  when a picture is saved over.
+
+- **Crop for Inpaint keeps the whole soft edge inside the crop.** The blend
+  at the seam is now complete. Crops and blend masks can come out slightly
+  different from earlier releases for the same inputs.
+
+- **Compare, the preview bar and Save Image no longer show a stale picture.**
+  A late reply is ignored once the picture has changed, and Save Image
+  forgets its old saved file when the folder changes. Save Image also takes
+  bfloat16 and one-channel images, and a blank linked caption writes no
+  caption file.
+
+- **Color Match leaves a picture alone when matched to itself.** When the
+  reference is the same picture, or the same colours at another size, the
+  picture now comes back unchanged instead of shifting colour. Other matches
+  can differ from earlier releases by less than one shade step.
+
+- **Krea 2 Outpaint Model Patch no longer reuses an old reference.** On a
+  fresh server's first run, its reference cache could hand back a stale
+  reference, so the new area came out different from a run without the
+  cache. Now both match exactly. Other model patches on the same model also
+  apply alongside it.
+
+- **Three example workflow notes now match their graphs.** Krea 2 Rotate +
+  Outpaint says its tone match is on, Qwen Image 2.1 Inpaint says its seed is
+  fixed, and Qwen Image 2.1 Upscale + Restore says the redraw is at least
+  about 2 MP.
+
+- **The pack's own checks are stricter.** They read pyproject.toml properly
+  and catch more ways a node could be hidden from the Registry's scanners.
+  Nothing changes in your workflows.
+
+## 2.22.0 - 2026-11-07
+
+- **Node cards have a calmer, easier-to-read look.** Number boxes, choices,
+  switches, fields and buttons are now one solid gray with no outlines, on a
+  dark card. Labels, units and section names are lighter and easier to read,
+  and every control in a card row is the same height. The bar above a result
+  picture (the picture arrows, the Preview steps and Preview switches, and
+  buttons such as AUTO) and the picture's frame match the cards. The colors
+  live in one shared file, so the rest of the pack can follow.
+
+- **Mask by Touch 🆎 no longer fills holes unless you ask.** Fill small
+  holes, under More, now starts off, so a hole you pick stays a hole. Saved
+  workflows keep their setting.
+
+- **H3 Prompt Writer: a swap no longer makes the new person talk to noise.** With
+  **Keep the clip's sound** on and no words typed, the writer told H3 the new
+  person speaks as in the video whenever the clip's sound was loud, so a train
+  or a beat made their mouth move. It now does that only when it hears a real
+  voice: half a second or more of clear speech.
+
+- **Mask by Touch shows a changed picture without unplugging it.** When the
+  picture coming in changes and the run stops because the picks were made on
+  the old one, the new picture now shows on the node, ready to pick from. A
+  new reload button beside Undo shows it any time, without running the
+  workflow.
+- **Save Image and Save Video: the Steps switch is now called Preview steps.** It
+  shows the picture or the clip's first frame while it is being made, and "Steps"
+  read like a sampler's step count. It works the same, and saved workflows keep
+  their setting.
+
+## 2.21.2 - 2026-11-07
+
+- **H3 Prompt Writer reads a plain swap sentence.** "Replace the man in the red
+  shirt with @1", "Swap the woman for @1" and similar phrasings now name only the
+  person who goes, instead of putting the whole sentence into the prompt.
+- **A swapped-in person is there from the first frame.** Swaps with a picture
+  always ask for the replacement throughout, with no transition or morph.
+- **A text model on H3 Prompt Writer's `clip` input writes the `@1 looks like`
+  line in a swap.** It describes the person's hair and face from the picture
+  when no line is typed. Without a model on `clip`, nothing changes.
+- **Workflow Note tiles start compact in the classic canvas again.** A leftover
+  image preview filed under the node's id made the classic canvas grow a new
+  tile to hold the picture; notes now stand that preview down.
 - **Colored link buttons and pop-out notes keep their tile layout when shared.**
   Callout Tile and Workflow Note Tile save as distinct node types, so an older
   install can report what is missing. Tiles have larger editors and visible

README.md

@@ -8,6 +8,8 @@
     <a href="https://github.com/ausboss/ComfyUI-AusBoss/releases/latest"><img src="assets/readme/release.svg" alt="Latest release"></a>
     <a href="https://www.youtube.com/@ausbossdev"><img src="https://img.shields.io/badge/YouTube-%40ausbossdev-00b4aa?style=flat-square&logo=youtube&logoColor=white" alt="YouTube @ausbossdev"></a>
     <a href="https://discord.gg/RwVxY9Fuaj"><img src="https://img.shields.io/badge/Discord-AusBoss-00b4aa?style=flat-square&logo=discord&logoColor=white" alt="Discord: AusBoss"></a>
+    <a href="https://huggingface.co/ausboss"><img src="https://img.shields.io/badge/Hugging%20Face-ausboss-00b4aa?style=flat-square&logo=huggingface&logoColor=white" alt="Hugging Face: ausboss"></a>
+    <a href="https://x.com/Zanzibased"><img src="https://img.shields.io/badge/X-%40Zanzibased-00b4aa?style=flat-square&logo=x&logoColor=white" alt="X @Zanzibased"></a>
   </p>
 </div>
 
@@ -27,7 +29,7 @@ Most of them are for image and video work. ComfyUI's core nodes already cover th
 - **[LoRA Loader](#lora-loader):** a whole LoRA stack in one node, each row with its own switch and strength.
 - **[Workflow Switches](#workflow-switches):** turn parts of a workflow off and on from one small card.
 
-The **?** in a node's title bar opens a short card with its inputs and outputs, and every node has a longer help page in ComfyUI's node help panel. I post the workflows I make with them on [Civitai](https://civitai.com/user/AusBoss) and [X @Zanzibased](https://x.com/Zanzibased), and videos of them on [YouTube @ausbossdev](https://www.youtube.com/@ausbossdev). Can't open Civitai? All my workflows are on [my Discord](https://discord.gg/RwVxY9Fuaj) too. If a node saves you time, a star on the repo helps other people find it.
+The **?** in a classic node's title bar opens a short card with its inputs and outputs. In Nodes 2.0, right-click the node and choose **About this node**. Every node also has a longer help page in ComfyUI's node help panel. I post the workflows I make with them on [Civitai](https://civitai.com/user/AusBoss) and [X @Zanzibased](https://x.com/Zanzibased), and videos of them on [YouTube @ausbossdev](https://www.youtube.com/@ausbossdev). Can't open Civitai? All my workflows are on [my Discord](https://discord.gg/RwVxY9Fuaj) too. If a node saves you time, a star on the repo helps other people find it.
 
 ## Install
 
@@ -40,6 +42,8 @@ git clone https://github.com/ausboss/ComfyUI-AusBoss.git
 
 Restart ComfyUI and search the node library for **AusBoss**.
 
+Install it one way, not both. Manager puts the pack in `custom_nodes/ausboss-nodes` and a clone in `custom_nodes/ComfyUI-AusBoss`. They are the same pack, so if both folders are there, delete one. The console says which copy it skipped.
+
 After an update, through Manager or `git pull`, restart ComfyUI and hard-refresh the browser with **Ctrl+Shift+R**. Otherwise the browser keeps the old JavaScript, and the pack warns you about it. Manager can install a version or two behind while the Comfy Registry reviews a new release. To get the newest one, pick it in Manager's version list, or update by hand: delete the pack's folder in `ComfyUI/custom_nodes` and clone the repository as shown above.
 
 The pack uses the Pillow, NumPy, Torch and PyAV that come with ComfyUI. Each example lists the models it needs on its Workflow Note. LaMa Inpaint also needs [`big-lama.pt`](https://github.com/Sanster/models/releases/download/add_big_lama/big-lama.pt) in `ComfyUI/models/lama/`. The pack never downloads weights by itself.
@@ -199,7 +203,7 @@ It returns the new frames and their fps. It doesn't touch audio, so carry the so
 
 Saves a frame batch or a core `VIDEO` as MP4 (H.264 or H.265), WebM (VP9 or AV1), ProRes MOV, lossless FFV1 MKV, GIF or WebP. Which encoders you get depends on your FFmpeg and PyAV build, and H.264 and H.265 come in CPU and NVENC versions. The videos carry color tags, and optionally audio and the workflow.
 
-**Ping-pong** plays forward and then back without repeating the turnaround frames. A wired `VIDEO` brings its own frame rate; otherwise wire fps from Load Video or Frame Interpolate. The player on the node shows the saved file, and **STEPS** shows the clip's first frame while it is being made, with a **STOP** button. Drop a saved video back on the canvas to load the workflow inside it, for the formats that can hold one. The [help page](js/docs/AUSBOSS_NODES_SaveVideo.md) has the format and audio details.
+**Ping-pong** plays forward and then back without repeating the turnaround frames. A wired `VIDEO` brings its own frame rate; otherwise wire fps from Load Video or Frame Interpolate. The player on the node shows the saved file, and **Preview steps** shows the clip's first frame while it is being made, with a **STOP** button. Drop a saved video back on the canvas to load the workflow inside it, for the formats that can hold one. The [help page](js/docs/AUSBOSS_NODES_SaveVideo.md) has the format and audio details.
 
 ## Mask and inpaint nodes
 
@@ -433,7 +437,7 @@ People who download your workflow get the nodes through ComfyUI-Manager's missin
 
 ## Pack-wide tools
 
-- **Help cards:** the **?** in a node's title bar opens its description, inputs and outputs. Run Timer has no title bar, so it has **About this node** in its right-click menu.
+- **Help cards:** the **?** in a classic node's title bar opens its description, inputs and outputs. Nodes 2.0 and titleless nodes such as Run Timer have **About this node** in their right-click menu.
 - **Recreate node 🆎** (right-click an AusBoss node) rebuilds a node saved by an older version from the current definition. It keeps the values, links, position and colors.
 - **Replace with AusBoss nodes 🆎** (canvas right-click or the command palette) finds third-party nodes this pack can stand in for, such as VideoHelperSuite's Load Video and Video Combine or KJNodes' Color Match. It previews each swap and replaces the ones you leave ticked.
 - **Snap into line:** a node, group or selection you drag lines up with the nodes and groups around it, edge to edge or middle to middle, and a teal line shows what it lines up with. Pulling a corner to resize lines up the same way. Hold Shift while you drag to skip it, or turn it off in Settings → 🆎 AusBoss → Canvas.

__init__.py

@@ -7,12 +7,26 @@ name to NODE_MODULES below — nothing else to wire up.
 
 A module that fails to import is skipped with a console warning instead
 of taking the whole pack down, so one broken node never hides the rest.
+
+Only one copy of the pack loads. People install it from ComfyUI-Manager
+(custom_nodes/ausboss-nodes) and from GitHub (custom_nodes/ComfyUI-AusBoss),
+and two copies used to register the same server routes, which stopped
+ComfyUI at startup. A second copy now loads nothing and says which folder
+to delete.
 """
 
 import importlib
 import os
-import re
+import sys
+import tomllib
 import traceback
+import types
+
+_HERE = os.path.dirname(os.path.abspath(__file__))
+_FIRST_COPY = sys.modules.setdefault(
+    "_ausboss_nodes_first_copy", types.SimpleNamespace(folder=_HERE)
+)
+_IS_SECOND_COPY = _FIRST_COPY.folder != _HERE
 
 # One entry per file in nodes/, kept alphabetical. The order has no
 # functional effect.
@@ -64,6 +78,8 @@ NODE_DISPLAY_NAME_MAPPINGS = {}
 _failed_modules = []
 
 for _module_name in NODE_MODULES:
+    if _IS_SECOND_COPY:
+        break
     try:
         _module = importlib.import_module(f".nodes.{_module_name}", __name__)
         NODE_CLASS_MAPPINGS.update(getattr(_module, "NODE_CLASS_MAPPINGS", {}))
@@ -76,18 +92,18 @@ for _module_name in NODE_MODULES:
 
 # Folder ComfyUI serves to the browser; every .js file in it is loaded as a
 # frontend extension. Shared modules use .mjs so they are import-only.
-WEB_DIRECTORY = "./js"
+WEB_DIRECTORY = None if _IS_SECOND_COPY else "./js"
 
 __all__ = ["NODE_CLASS_MAPPINGS", "NODE_DISPLAY_NAME_MAPPINGS", "WEB_DIRECTORY"]
 
 
-def _read_version():
+def _read_version(folder=None):
     """Version straight from pyproject.toml so it is never duplicated."""
     try:
-        pyproject = os.path.join(os.path.dirname(__file__), "pyproject.toml")
-        with open(pyproject, "r", encoding="utf-8") as f:
-            match = re.search(r'^version\s*=\s*"([^"]+)"', f.read(), re.MULTILINE)
-        return match.group(1) if match else "unknown"
+        pyproject = os.path.join(folder or os.path.dirname(__file__), "pyproject.toml")
+        with open(pyproject, "rb") as f:
+            version = tomllib.load(f).get("project", {}).get("version")
+        return version if isinstance(version, str) and version.strip() else "unknown"
     except Exception:
         return "unknown"
 
@@ -102,6 +118,17 @@ def _print_banner():
     bar = f"{teal}{'-' * 70}{reset}"
 
     print(bar)
+    if _IS_SECOND_COPY:
+        def where(folder):
+            text = f"{os.path.basename(folder)} (v{_read_version(folder)})"
+            return text.encode("ascii", "replace").decode("ascii")
+
+        print(f"  {red}AusBoss is installed twice, so this copy is not loaded.{reset}")
+        print(f"  In use:  custom_nodes/{where(_FIRST_COPY.folder)}")
+        print(f"  Skipped: custom_nodes/{where(_HERE)}")
+        print("  Delete one of the two folders and restart ComfyUI.")
+        print(bar)
+        return
     print(
         f"  {teal}AusBoss{reset} v{_read_version()}  |  "
         f"{len(NODE_CLASS_MAPPINGS)} nodes loaded"
@@ -113,9 +140,10 @@ def _print_banner():
 
 
 try:
-    from .nodes._frontend_cache import register_frontend_cache_guard
+    if not _IS_SECOND_COPY:
+        from .nodes._frontend_cache import register_frontend_cache_guard
 
-    register_frontend_cache_guard()
+        register_frontend_cache_guard()
 except Exception:
     traceback.print_exc()
 

assets/readme/release.svg

@@ -1,9 +1,9 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="105" height="20" role="img" aria-label="release: v2.21.1">
-  <title>release: v2.21.1</title>
+<svg xmlns="http://www.w3.org/2000/svg" width="105" height="20" role="img" aria-label="release: v2.23.0">
+  <title>release: v2.23.0</title>
   <path fill="#555" d="M0 0h48v20H0z"/>
   <path fill="#00b4aa" d="M48 0h57v20H48z"/>
   <g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" font-size="11">
     <text x="24" y="14">release</text>
-    <text x="76.5" y="14">v2.21.1</text>
+    <text x="76.5" y="14">v2.23.0</text>
   </g>
 </svg>

example_workflows/Krea 2 Inpaint Masked (AusBoss).json

@@ -1913,7 +1913,7 @@
               "The painted area, grown a little, is filled with flat gray, so Krea 2 knows where to paint. The plain crop goes along too."
             ],
             "widgets_values_named": {
-              "text": "The painted area, grown a little, is filled with flat gray. Krea 2 never sees what you are replacing."
+              "text": "The painted area, grown a little, is filled with flat gray, so Krea 2 knows where to paint. The plain crop goes along too."
             },
             "color": "#1f2c38",
             "bgcolor": "#2a3b4a"
@@ -3052,7 +3052,7 @@
               "The gray-filled crop is the reference. Painting starts from the plain crop, inside the noise mask: the painted area, widened by 24 px."
             ],
             "widgets_values_named": {
-              "text": "The gray-filled crop is the reference. The noise mask is the grown painted area, widened by 24 px. Krea 2 paints only inside it."
+              "text": "The gray-filled crop is the reference. Painting starts from the plain crop, inside the noise mask: the painted area, widened by 24 px."
             },
             "color": "#1f2c38",
             "bgcolor": "#2a3b4a"
@@ -3482,4 +3482,4 @@
     "frontendVersion": "1.53.6"
   },
   "version": 0.4
-}
+}

example_workflows/Krea 2 Rotate + Outpaint (AusBoss).json

@@ -2139,10 +2139,10 @@
             "title": "Note",
             "properties": {},
             "widgets_values": [
-              "Blend in fades the model's picture into yours just inside its edge, with no tone shift. The new area stays as painted."
+              "Blend in fades the model's picture into yours just inside its edge. Tone match is fully on, so the new area is adjusted to your picture's tone."
             ],
             "widgets_values_named": {
-              "text": "Blend in fades the model's picture into yours just inside its edge, with no tone shift. The new area stays as painted."
+              "text": "Blend in fades the model's picture into yours just inside its edge. Tone match is fully on, so the new area is adjusted to your picture's tone."
             },
             "color": "#1f2c38",
             "bgcolor": "#2a3b4a"

example_workflows/Mask by Touch (AusBoss).json

@@ -439,7 +439,7 @@
     0,
     0,
     0,
-    true,
+    false,
     "stop the run",
     false,
     false,
@@ -451,7 +451,7 @@
     "grow": 0,
     "soften": 0,
     "smooth": 0,
-    "fill_holes": true,
+    "fill_holes": false,
     "if_nothing": "stop the run",
     "free_vram": false,
     "invert": false,

example_workflows/Qwen Image 2.1 Inpaint (AusBoss).json

@@ -37,10 +37,10 @@
     "Node name for S&R": "AUSBOSS_NODES_WorkflowNote"
    },
    "widgets_values": [
-    "{\"v\": 1, \"title\": \"Qwen Image 2.1 Inpaint\", \"subtitle\": \"Click a thing in your picture and say what to change. Only that part is repainted.\", \"author\": \"AusBoss\", \"layout\": \"card\", \"accent\": \"\", \"body\": \"1. Load your image. You can crop it right there with the blue handles.\\n2. On **Mask by Touch**, click the thing you want to change. It lights up before you click.\\n3. In **What to change**, say it the way you would ask a person: \\\"Replace the cup with a glass of orange juice.\\\"\\n4. Press **Run**.\\n\\nOnly the picked part is repainted. Everything outside it stays your own picture.\\n\\n### Tips\\n- Wrong thing picked? The arrows under the picture swap it for the next thing it could mean.\\n- Name everything that should go: \\\"the iced coffee and its straw\\\". What you do not name can stay.\\n- To remove something, pick it and write \\\"Remove the cup.\\\" Pick its shadow too, or the shadow stays.\\n- To add something, switch to **Paint** and paint where it should go, with some room. Say how big: \\\"Add small black sunglasses on her eyes.\\\"\\n- Not what you wanted? Run it again. The seed changes each run.\\n\\n### Switches\\n- **Fast** on: 8 steps with the Viggle Turbo LoRA from the list below. Off: 25 steps without it, about twice as long.\\n\\nNeeds ComfyUI 0.38 or newer and AusBoss nodes 2.12.0 or newer (update first).\", \"models\": [{\"name\": \"qwen_image_2.1_int8_convrot.safetensors\", \"dir\": \"diffusion_models\", \"size\": \"7.26 GB\", \"url\": \"https://huggingface.co/Comfy-Org/Qwen-Image-2.1/resolve/main/diffusion_models/qwen_image_2.1_int8_convrot.safetensors\", \"note\": \"\"}, {\"name\": \"qwen3vl_8b_int8_convrot.safetensors\", \"dir\": \"text_encoders\", \"size\": \"9.35 GB\", \"url\": \"https://huggingface.co/Comfy-Org/Qwen-Image-2.1/resolve/main/text_encoders/qwen3vl_8b_int8_convrot.safetensors\", \"note\": \"\"}, {\"name\": \"qwen_image_2.1_vae_bf16.safetensors\", \"dir\": \"vae\", \"size\": \"676 MB\", \"url\": \"https://huggingface.co/Comfy-Org/Qwen-Image-2.1/resolve/main/vae/qwen_image_2.1_vae_bf16.safetensors\", \"note\": \"\"}, {\"name\": \"sam3.1_multiplex_fp16.safetensors\", \"dir\": \"checkpoints\", \"size\": \"1.75 GB\", \"url\": \"https://huggingface.co/Comfy-Org/sam3.1/resolve/main/checkpoints/sam3.1_multiplex_fp16.safetensors\", \"note\": \"by Meta, packaged by Comfy-Org\"}, {\"name\": \"Qwen-Image-2.1-viggle-turbo-v0.3-6step-lora-r128.safetensors\", \"dir\": \"loras\", \"size\": \"680 MB\", \"url\": \"https://huggingface.co/Viggle/Qwen-Image-2.1-viggle-turbo/resolve/main/Qwen-Image-2.1-viggle-turbo-v0.3-6step-lora-r128.safetensors\", \"note\": \"optional, for Fast · Qwen Research License, research use\"}], \"packs\": [{\"name\": \"ComfyUI-AusBoss\", \"url\": \"https://github.com/ausboss/ComfyUI-AusBoss\", \"node\": \"AUSBOSS_NODES_MaskByTouch\"}], \"links\": [{\"label\": \"YouTube · this workflow\", \"url\": \"https://youtu.be/iMgaiXoB0v4\"}, {\"label\": \"GitHub · ausboss\", \"url\": \"https://github.com/ausboss\"}, {\"label\": \"Civitai · AusBoss\", \"url\": \"https://civitai.com/user/AusBoss\"}, {\"label\": \"X · Zanzibased\", \"url\": \"https://x.com/Zanzibased\"}]}"
+    "{\"v\": 1, \"title\": \"Qwen Image 2.1 Inpaint\", \"subtitle\": \"Click a thing in your picture and say what to change. Only that part is repainted.\", \"author\": \"AusBoss\", \"layout\": \"card\", \"accent\": \"\", \"body\": \"1. Load your image. You can crop it right there with the blue handles.\\n2. On **Mask by Touch**, click the thing you want to change. It lights up before you click.\\n3. In **What to change**, say it the way you would ask a person: \\\"Replace the cup with a glass of orange juice.\\\"\\n4. Press **Run**.\\n\\nOnly the picked part is repainted. Everything outside it stays your own picture.\\n\\n### Tips\\n- Wrong thing picked? The arrows under the picture swap it for the next thing it could mean.\\n- Name everything that should go: \\\"the iced coffee and its straw\\\". What you do not name can stay.\\n- To remove something, pick it and write \\\"Remove the cup.\\\" Pick its shadow too, or the shadow stays.\\n- To add something, switch to **Paint** and paint where it should go, with some room. Say how big: \\\"Add small black sunglasses on her eyes.\\\"\\n- Not what you wanted? Change **Seed** and run it again. It stays fixed between runs.\\n\\n### Switches\\n- **Fast** on: 8 steps with the Viggle Turbo LoRA from the list below. Off: 25 steps without it, about twice as long.\\n\\nNeeds ComfyUI 0.38 or newer and AusBoss nodes 2.12.0 or newer (update first).\", \"models\": [{\"name\": \"qwen_image_2.1_int8_convrot.safetensors\", \"dir\": \"diffusion_models\", \"size\": \"7.26 GB\", \"url\": \"https://huggingface.co/Comfy-Org/Qwen-Image-2.1/resolve/main/diffusion_models/qwen_image_2.1_int8_convrot.safetensors\", \"note\": \"\"}, {\"name\": \"qwen3vl_8b_int8_convrot.safetensors\", \"dir\": \"text_encoders\", \"size\": \"9.35 GB\", \"url\": \"https://huggingface.co/Comfy-Org/Qwen-Image-2.1/resolve/main/text_encoders/qwen3vl_8b_int8_convrot.safetensors\", \"note\": \"\"}, {\"name\": \"qwen_image_2.1_vae_bf16.safetensors\", \"dir\": \"vae\", \"size\": \"676 MB\", \"url\": \"https://huggingface.co/Comfy-Org/Qwen-Image-2.1/resolve/main/vae/qwen_image_2.1_vae_bf16.safetensors\", \"note\": \"\"}, {\"name\": \"sam3.1_multiplex_fp16.safetensors\", \"dir\": \"checkpoints\", \"size\": \"1.75 GB\", \"url\": \"https://huggingface.co/Comfy-Org/sam3.1/resolve/main/checkpoints/sam3.1_multiplex_fp16.safetensors\", \"note\": \"by Meta, packaged by Comfy-Org\"}, {\"name\": \"Qwen-Image-2.1-viggle-turbo-v0.3-6step-lora-r128.safetensors\", \"dir\": \"loras\", \"size\": \"680 MB\", \"url\": \"https://huggingface.co/Viggle/Qwen-Image-2.1-viggle-turbo/resolve/main/Qwen-Image-2.1-viggle-turbo-v0.3-6step-lora-r128.safetensors\", \"note\": \"optional, for Fast · Qwen Research License, research use\"}], \"packs\": [{\"name\": \"ComfyUI-AusBoss\", \"url\": \"https://github.com/ausboss/ComfyUI-AusBoss\", \"node\": \"AUSBOSS_NODES_MaskByTouch\"}], \"links\": [{\"label\": \"YouTube · this workflow\", \"url\": \"https://youtu.be/iMgaiXoB0v4\"}, {\"label\": \"GitHub · ausboss\", \"url\": \"https://github.com/ausboss\"}, {\"label\": \"Civitai · AusBoss\", \"url\": \"https://civitai.com/user/AusBoss\"}, {\"label\": \"X · Zanzibased\", \"url\": \"https://x.com/Zanzibased\"}]}"
    ],
    "widgets_values_named": {
-    "note": "{\"v\": 1, \"title\": \"Qwen Image 2.1 Inpaint\", \"subtitle\": \"Click a thing in your picture and say what to change. Only that part is repainted.\", \"author\": \"AusBoss\", \"layout\": \"card\", \"accent\": \"\", \"body\": \"1. Load your image. You can crop it right there with the blue handles.\\n2. On **Mask by Touch**, click the thing you want to change. It lights up before you click.\\n3. In **What to change**, say it the way you would ask a person: \\\"Replace the cup with a glass of orange juice.\\\"\\n4. Press **Run**.\\n\\nOnly the picked part is repainted. Everything outside it stays your own picture.\\n\\n### Tips\\n- Wrong thing picked? The arrows under the picture swap it for the next thing it could mean.\\n- Name everything that should go: \\\"the iced coffee and its straw\\\". What you do not name can stay.\\n- To remove something, pick it and write \\\"Remove the cup.\\\" Pick its shadow too, or the shadow stays.\\n- To add something, switch to **Paint** and paint where it should go, with some room. Say how big: \\\"Add small black sunglasses on her eyes.\\\"\\n- Not what you wanted? Run it again. The seed changes each run.\\n\\n### Switches\\n- **Fast** on: 8 steps with the Viggle Turbo LoRA from the list below. Off: 25 steps without it, about twice as long.\\n\\nNeeds ComfyUI 0.38 or newer and AusBoss nodes 2.12.0 or newer (update first).\", \"models\": [{\"name\": \"qwen_image_2.1_int8_convrot.safetensors\", \"dir\": \"diffusion_models\", \"size\": \"7.26 GB\", \"url\": \"https://huggingface.co/Comfy-Org/Qwen-Image-2.1/resolve/main/diffusion_models/qwen_image_2.1_int8_convrot.safetensors\", \"note\": \"\"}, {\"name\": \"qwen3vl_8b_int8_convrot.safetensors\", \"dir\": \"text_encoders\", \"size\": \"9.35 GB\", \"url\": \"https://huggingface.co/Comfy-Org/Qwen-Image-2.1/resolve/main/text_encoders/qwen3vl_8b_int8_convrot.safetensors\", \"note\": \"\"}, {\"name\": \"qwen_image_2.1_vae_bf16.safetensors\", \"dir\": \"vae\", \"size\": \"676 MB\", \"url\": \"https://huggingface.co/Comfy-Org/Qwen-Image-2.1/resolve/main/vae/qwen_image_2.1_vae_bf16.safetensors\", \"note\": \"\"}, {\"name\": \"sam3.1_multiplex_fp16.safetensors\", \"dir\": \"checkpoints\", \"size\": \"1.75 GB\", \"url\": \"https://huggingface.co/Comfy-Org/sam3.1/resolve/main/checkpoints/sam3.1_multiplex_fp16.safetensors\", \"note\": \"by Meta, packaged by Comfy-Org\"}, {\"name\": \"Qwen-Image-2.1-viggle-turbo-v0.3-6step-lora-r128.safetensors\", \"dir\": \"loras\", \"size\": \"680 MB\", \"url\": \"https://huggingface.co/Viggle/Qwen-Image-2.1-viggle-turbo/resolve/main/Qwen-Image-2.1-viggle-turbo-v0.3-6step-lora-r128.safetensors\", \"note\": \"optional, for Fast · Qwen Research License, research use\"}], \"packs\": [{\"name\": \"ComfyUI-AusBoss\", \"url\": \"https://github.com/ausboss/ComfyUI-AusBoss\", \"node\": \"AUSBOSS_NODES_MaskByTouch\"}], \"links\": [{\"label\": \"YouTube · this workflow\", \"url\": \"https://youtu.be/iMgaiXoB0v4\"}, {\"label\": \"GitHub · ausboss\", \"url\": \"https://github.com/ausboss\"}, {\"label\": \"Civitai · AusBoss\", \"url\": \"https://civitai.com/user/AusBoss\"}, {\"label\": \"X · Zanzibased\", \"url\": \"https://x.com/Zanzibased\"}]}"
+    "note": "{\"v\": 1, \"title\": \"Qwen Image 2.1 Inpaint\", \"subtitle\": \"Click a thing in your picture and say what to change. Only that part is repainted.\", \"author\": \"AusBoss\", \"layout\": \"card\", \"accent\": \"\", \"body\": \"1. Load your image. You can crop it right there with the blue handles.\\n2. On **Mask by Touch**, click the thing you want to change. It lights up before you click.\\n3. In **What to change**, say it the way you would ask a person: \\\"Replace the cup with a glass of orange juice.\\\"\\n4. Press **Run**.\\n\\nOnly the picked part is repainted. Everything outside it stays your own picture.\\n\\n### Tips\\n- Wrong thing picked? The arrows under the picture swap it for the next thing it could mean.\\n- Name everything that should go: \\\"the iced coffee and its straw\\\". What you do not name can stay.\\n- To remove something, pick it and write \\\"Remove the cup.\\\" Pick its shadow too, or the shadow stays.\\n- To add something, switch to **Paint** and paint where it should go, with some room. Say how big: \\\"Add small black sunglasses on her eyes.\\\"\\n- Not what you wanted? Change **Seed** and run it again. It stays fixed between runs.\\n\\n### Switches\\n- **Fast** on: 8 steps with the Viggle Turbo LoRA from the list below. Off: 25 steps without it, about twice as long.\\n\\nNeeds ComfyUI 0.38 or newer and AusBoss nodes 2.12.0 or newer (update first).\", \"models\": [{\"name\": \"qwen_image_2.1_int8_convrot.safetensors\", \"dir\": \"diffusion_models\", \"size\": \"7.26 GB\", \"url\": \"https://huggingface.co/Comfy-Org/Qwen-Image-2.1/resolve/main/diffusion_models/qwen_image_2.1_int8_convrot.safetensors\", \"note\": \"\"}, {\"name\": \"qwen3vl_8b_int8_convrot.safetensors\", \"dir\": \"text_encoders\", \"size\": \"9.35 GB\", \"url\": \"https://huggingface.co/Comfy-Org/Qwen-Image-2.1/resolve/main/text_encoders/qwen3vl_8b_int8_convrot.safetensors\", \"note\": \"\"}, {\"name\": \"qwen_image_2.1_vae_bf16.safetensors\", \"dir\": \"vae\", \"size\": \"676 MB\", \"url\": \"https://huggingface.co/Comfy-Org/Qwen-Image-2.1/resolve/main/vae/qwen_image_2.1_vae_bf16.safetensors\", \"note\": \"\"}, {\"name\": \"sam3.1_multiplex_fp16.safetensors\", \"dir\": \"checkpoints\", \"size\": \"1.75 GB\", \"url\": \"https://huggingface.co/Comfy-Org/sam3.1/resolve/main/checkpoints/sam3.1_multiplex_fp16.safetensors\", \"note\": \"by Meta, packaged by Comfy-Org\"}, {\"name\": \"Qwen-Image-2.1-viggle-turbo-v0.3-6step-lora-r128.safetensors\", \"dir\": \"loras\", \"size\": \"680 MB\", \"url\": \"https://huggingface.co/Viggle/Qwen-Image-2.1-viggle-turbo/resolve/main/Qwen-Image-2.1-viggle-turbo-v0.3-6step-lora-r128.safetensors\", \"note\": \"optional, for Fast · Qwen Research License, research use\"}], \"packs\": [{\"name\": \"ComfyUI-AusBoss\", \"url\": \"https://github.com/ausboss/ComfyUI-AusBoss\", \"node\": \"AUSBOSS_NODES_MaskByTouch\"}], \"links\": [{\"label\": \"YouTube · this workflow\", \"url\": \"https://youtu.be/iMgaiXoB0v4\"}, {\"label\": \"GitHub · ausboss\", \"url\": \"https://github.com/ausboss\"}, {\"label\": \"Civitai · AusBoss\", \"url\": \"https://civitai.com/user/AusBoss\"}, {\"label\": \"X · Zanzibased\", \"url\": \"https://x.com/Zanzibased\"}]}"
    },
    "color": "#14424d",
    "bgcolor": "#161f21"

example_workflows/Qwen Image 2.1 Upscale + Restore (AusBoss).json

@@ -37,10 +37,10 @@
     "ver": "2.9.0"
    },
    "widgets_values": [
-    "{\"v\": 1, \"title\": \"Qwen Image 2.1 Upscale + Restore\", \"subtitle\": \"Load a small, soft or worn picture. Qwen Image 2.1 redraws it sharp at the megapixels you set, in its own colors.\", \"author\": \"AusBoss\", \"layout\": \"card\", \"accent\": \"\", \"body\": \"[▶ AusBoss on YouTube](https://www.youtube.com/@ausbossdev) · videos on these nodes and workflows\\n\\n---\\n\\n1. Load your image. You can crop it right there with the blue handles.\\n2. Set **Megapixels**: the size of the result.\\n3. Press **Run**.\\n4. Slide **Before and after** to compare. The result is saved as a PNG.\\n\\n### What you get\\n\\n- Your picture redrawn sharp, at the size you asked for.\\n- Its own colors, also on a noisy or faded photo.\\n\\n### Megapixels\\n\\n- Up to about 2: one pass.\\n- Over that: redrawn in tiles of about 2 megapixels and joined. 4 takes two tiles, 8 takes four.\\n- A small picture is redrawn at up to 8 times its own megapixels, then enlarged the plain way.\\n- A picture of 1 megapixel or more only looks better when it grows about 1.6 times per side.\\n\\n### Switches\\n\\n- **Fast** on: 8 steps with the Viggle Turbo LoRA. Off: 25 steps without it, about three times as long.\\n\\n### Tips\\n\\n- It is a redraw. Fine detail is made up to fit, so a face stays the same person, not the same pixels.\\n- Small lettering on signs and labels can come back misspelled.\\n- Each tile is matched to your picture's colors. To let Qwen's own colors through, lower **Keep colors** inside the box.\\n- If the run stops at a red **LoRA Loader**, a LoRA that is switched on is missing. Download it from the list below.\\n- Not tested on blur from a moving camera or missed focus.\\n\\nNeeds ComfyUI 0.38 or newer and AusBoss nodes 2.9.0 or newer (update first).\", \"models\": [{\"name\": \"qwen_image_2.1_int8_convrot.safetensors\", \"dir\": \"diffusion_models\", \"size\": \"7.26 GB\", \"url\": \"https://huggingface.co/Comfy-Org/Qwen-Image-2.1/resolve/main/diffusion_models/qwen_image_2.1_int8_convrot.safetensors\", \"note\": \"\"}, {\"name\": \"qwen3vl_8b_int8_convrot.safetensors\", \"dir\": \"text_encoders\", \"size\": \"9.35 GB\", \"url\": \"https://huggingface.co/Comfy-Org/Qwen-Image-2.1/resolve/main/text_encoders/qwen3vl_8b_int8_convrot.safetensors\", \"note\": \"\"}, {\"name\": \"qwen_image_2.1_vae_bf16.safetensors\", \"dir\": \"vae\", \"size\": \"676 MB\", \"url\": \"https://huggingface.co/Comfy-Org/Qwen-Image-2.1/resolve/main/vae/qwen_image_2.1_vae_bf16.safetensors\", \"note\": \"\"}, {\"name\": \"qwen-image-2.1-restore.safetensors\", \"dir\": \"loras\", \"size\": \"159 MB\", \"url\": \"https://huggingface.co/ausboss/Qwen-Image-2.1-Restore-LoRA/resolve/main/qwen-image-2.1-restore.safetensors\", \"note\": \"keeps the result close to your picture\"}, {\"name\": \"Qwen-Image-2.1-viggle-turbo-v0.3-6step-lora-r128.safetensors\", \"dir\": \"loras\", \"size\": \"680 MB\", \"url\": \"https://huggingface.co/Viggle/Qwen-Image-2.1-viggle-turbo/resolve/main/Qwen-Image-2.1-viggle-turbo-v0.3-6step-lora-r128.safetensors\", \"note\": \"for Fast on · Qwen Research License, research use\"}], \"packs\": [{\"name\": \"ComfyUI-AusBoss\", \"url\": \"https://github.com/ausboss/ComfyUI-AusBoss\", \"node\": \"AUSBOSS_NODES_TiledUpscale\"}], \"links\": [{\"label\": \"YouTube · ausbossdev\", \"url\": \"https://www.youtube.com/@ausbossdev\"}, {\"label\": \"GitHub · ausboss\", \"url\": \"https://github.com/ausboss\"}, {\"label\": \"Civitai · AusBoss\", \"url\": \"https://civitai.com/user/AusBoss\"}, {\"label\": \"X · Zanzibased\", \"url\": \"https://x.com/Zanzibased\"}]}"
+    "{\"v\": 1, \"title\": \"Qwen Image 2.1 Upscale + Restore\", \"subtitle\": \"Load a small, soft or worn picture. Qwen Image 2.1 redraws it sharp at the megapixels you set, in its own colors.\", \"author\": \"AusBoss\", \"layout\": \"card\", \"accent\": \"\", \"body\": \"[▶ AusBoss on YouTube](https://www.youtube.com/@ausbossdev) · videos on these nodes and workflows\\n\\n---\\n\\n1. Load your image. You can crop it right there with the blue handles.\\n2. Set **Megapixels**: the size of the result.\\n3. Press **Run**.\\n4. Slide **Before and after** to compare. The result is saved as a PNG.\\n\\n### What you get\\n\\n- Your picture redrawn sharp, at the size you asked for.\\n- Its own colors, also on a noisy or faded photo.\\n\\n### Megapixels\\n\\n- Up to about 2: one pass.\\n- Over that: redrawn in tiles of about 2 megapixels and joined. 4 takes two tiles, 8 takes four.\\n- The redraw limit for a small picture is 8 times its own megapixels or one roughly 2 megapixel tile, whichever is larger. The rest is enlarged the plain way.\\n- A picture of 1 megapixel or more only looks better when it grows about 1.6 times per side.\\n\\n### Switches\\n\\n- **Fast** on: 8 steps with the Viggle Turbo LoRA. Off: 25 steps without it, about three times as long.\\n\\n### Tips\\n\\n- It is a redraw. Fine detail is made up to fit, so a face stays the same person, not the same pixels.\\n- Small lettering on signs and labels can come back misspelled.\\n- Each tile is matched to your picture's colors. To let Qwen's own colors through, lower **Keep colors** inside the box.\\n- If the run stops at a red **LoRA Loader**, a LoRA that is switched on is missing. Download it from the list below.\\n- Not tested on blur from a moving camera or missed focus.\\n\\nNeeds ComfyUI 0.38 or newer and AusBoss nodes 2.9.0 or newer (update first).\", \"models\": [{\"name\": \"qwen_image_2.1_int8_convrot.safetensors\", \"dir\": \"diffusion_models\", \"size\": \"7.26 GB\", \"url\": \"https://huggingface.co/Comfy-Org/Qwen-Image-2.1/resolve/main/diffusion_models/qwen_image_2.1_int8_convrot.safetensors\", \"note\": \"\"}, {\"name\": \"qwen3vl_8b_int8_convrot.safetensors\", \"dir\": \"text_encoders\", \"size\": \"9.35 GB\", \"url\": \"https://huggingface.co/Comfy-Org/Qwen-Image-2.1/resolve/main/text_encoders/qwen3vl_8b_int8_convrot.safetensors\", \"note\": \"\"}, {\"name\": \"qwen_image_2.1_vae_bf16.safetensors\", \"dir\": \"vae\", \"size\": \"676 MB\", \"url\": \"https://huggingface.co/Comfy-Org/Qwen-Image-2.1/resolve/main/vae/qwen_image_2.1_vae_bf16.safetensors\", \"note\": \"\"}, {\"name\": \"qwen-image-2.1-restore.safetensors\", \"dir\": \"loras\", \"size\": \"159 MB\", \"url\": \"https://huggingface.co/ausboss/Qwen-Image-2.1-Restore-LoRA/resolve/main/qwen-image-2.1-restore.safetensors\", \"note\": \"keeps the result close to your picture\"}, {\"name\": \"Qwen-Image-2.1-viggle-turbo-v0.3-6step-lora-r128.safetensors\", \"dir\": \"loras\", \"size\": \"680 MB\", \"url\": \"https://huggingface.co/Viggle/Qwen-Image-2.1-viggle-turbo/resolve/main/Qwen-Image-2.1-viggle-turbo-v0.3-6step-lora-r128.safetensors\", \"note\": \"for Fast on · Qwen Research License, research use\"}], \"packs\": [{\"name\": \"ComfyUI-AusBoss\", \"url\": \"https://github.com/ausboss/ComfyUI-AusBoss\", \"node\": \"AUSBOSS_NODES_TiledUpscale\"}], \"links\": [{\"label\": \"YouTube · ausbossdev\", \"url\": \"https://www.youtube.com/@ausbossdev\"}, {\"label\": \"GitHub · ausboss\", \"url\": \"https://github.com/ausboss\"}, {\"label\": \"Civitai · AusBoss\", \"url\": \"https://civitai.com/user/AusBoss\"}, {\"label\": \"X · Zanzibased\", \"url\": \"https://x.com/Zanzibased\"}]}"
    ],
    "widgets_values_named": {
-    "note": "{\"v\": 1, \"title\": \"Qwen Image 2.1 Upscale + Restore\", \"subtitle\": \"Load a small, soft or worn picture. Qwen Image 2.1 redraws it sharp at the megapixels you set, in its own colors.\", \"author\": \"AusBoss\", \"layout\": \"card\", \"accent\": \"\", \"body\": \"[▶ AusBoss on YouTube](https://www.youtube.com/@ausbossdev) · videos on these nodes and workflows\\n\\n---\\n\\n1. Load your image. You can crop it right there with the blue handles.\\n2. Set **Megapixels**: the size of the result.\\n3. Press **Run**.\\n4. Slide **Before and after** to compare. The result is saved as a PNG.\\n\\n### What you get\\n\\n- Your picture redrawn sharp, at the size you asked for.\\n- Its own colors, also on a noisy or faded photo.\\n\\n### Megapixels\\n\\n- Up to about 2: one pass.\\n- Over that: redrawn in tiles of about 2 megapixels and joined. 4 takes two tiles, 8 takes four.\\n- A small picture is redrawn at up to 8 times its own megapixels, then enlarged the plain way.\\n- A picture of 1 megapixel or more only looks better when it grows about 1.6 times per side.\\n\\n### Switches\\n\\n- **Fast** on: 8 steps with the Viggle Turbo LoRA. Off: 25 steps without it, about three times as long.\\n\\n### Tips\\n\\n- It is a redraw. Fine detail is made up to fit, so a face stays the same person, not the same pixels.\\n- Small lettering on signs and labels can come back misspelled.\\n- Each tile is matched to your picture's colors. To let Qwen's own colors through, lower **Keep colors** inside the box.\\n- If the run stops at a red **LoRA Loader**, a LoRA that is switched on is missing. Download it from the list below.\\n- Not tested on blur from a moving camera or missed focus.\\n\\nNeeds ComfyUI 0.38 or newer and AusBoss nodes 2.9.0 or newer (update first).\", \"models\": [{\"name\": \"qwen_image_2.1_int8_convrot.safetensors\", \"dir\": \"diffusion_models\", \"size\": \"7.26 GB\", \"url\": \"https://huggingface.co/Comfy-Org/Qwen-Image-2.1/resolve/main/diffusion_models/qwen_image_2.1_int8_convrot.safetensors\", \"note\": \"\"}, {\"name\": \"qwen3vl_8b_int8_convrot.safetensors\", \"dir\": \"text_encoders\", \"size\": \"9.35 GB\", \"url\": \"https://huggingface.co/Comfy-Org/Qwen-Image-2.1/resolve/main/text_encoders/qwen3vl_8b_int8_convrot.safetensors\", \"note\": \"\"}, {\"name\": \"qwen_image_2.1_vae_bf16.safetensors\", \"dir\": \"vae\", \"size\": \"676 MB\", \"url\": \"https://huggingface.co/Comfy-Org/Qwen-Image-2.1/resolve/main/vae/qwen_image_2.1_vae_bf16.safetensors\", \"note\": \"\"}, {\"name\": \"qwen-image-2.1-restore.safetensors\", \"dir\": \"loras\", \"size\": \"159 MB\", \"url\": \"https://huggingface.co/ausboss/Qwen-Image-2.1-Restore-LoRA/resolve/main/qwen-image-2.1-restore.safetensors\", \"note\": \"keeps the result close to your picture\"}, {\"name\": \"Qwen-Image-2.1-viggle-turbo-v0.3-6step-lora-r128.safetensors\", \"dir\": \"loras\", \"size\": \"680 MB\", \"url\": \"https://huggingface.co/Viggle/Qwen-Image-2.1-viggle-turbo/resolve/main/Qwen-Image-2.1-viggle-turbo-v0.3-6step-lora-r128.safetensors\", \"note\": \"for Fast on · Qwen Research License, research use\"}], \"packs\": [{\"name\": \"ComfyUI-AusBoss\", \"url\": \"https://github.com/ausboss/ComfyUI-AusBoss\", \"node\": \"AUSBOSS_NODES_TiledUpscale\"}], \"links\": [{\"label\": \"YouTube · ausbossdev\", \"url\": \"https://www.youtube.com/@ausbossdev\"}, {\"label\": \"GitHub · ausboss\", \"url\": \"https://github.com/ausboss\"}, {\"label\": \"Civitai · AusBoss\", \"url\": \"https://civitai.com/user/AusBoss\"}, {\"label\": \"X · Zanzibased\", \"url\": \"https://x.com/Zanzibased\"}]}"
+    "note": "{\"v\": 1, \"title\": \"Qwen Image 2.1 Upscale + Restore\", \"subtitle\": \"Load a small, soft or worn picture. Qwen Image 2.1 redraws it sharp at the megapixels you set, in its own colors.\", \"author\": \"AusBoss\", \"layout\": \"card\", \"accent\": \"\", \"body\": \"[▶ AusBoss on YouTube](https://www.youtube.com/@ausbossdev) · videos on these nodes and workflows\\n\\n---\\n\\n1. Load your image. You can crop it right there with the blue handles.\\n2. Set **Megapixels**: the size of the result.\\n3. Press **Run**.\\n4. Slide **Before and after** to compare. The result is saved as a PNG.\\n\\n### What you get\\n\\n- Your picture redrawn sharp, at the size you asked for.\\n- Its own colors, also on a noisy or faded photo.\\n\\n### Megapixels\\n\\n- Up to about 2: one pass.\\n- Over that: redrawn in tiles of about 2 megapixels and joined. 4 takes two tiles, 8 takes four.\\n- The redraw limit for a small picture is 8 times its own megapixels or one roughly 2 megapixel tile, whichever is larger. The rest is enlarged the plain way.\\n- A picture of 1 megapixel or more only looks better when it grows about 1.6 times per side.\\n\\n### Switches\\n\\n- **Fast** on: 8 steps with the Viggle Turbo LoRA. Off: 25 steps without it, about three times as long.\\n\\n### Tips\\n\\n- It is a redraw. Fine detail is made up to fit, so a face stays the same person, not the same pixels.\\n- Small lettering on signs and labels can come back misspelled.\\n- Each tile is matched to your picture's colors. To let Qwen's own colors through, lower **Keep colors** inside the box.\\n- If the run stops at a red **LoRA Loader**, a LoRA that is switched on is missing. Download it from the list below.\\n- Not tested on blur from a moving camera or missed focus.\\n\\nNeeds ComfyUI 0.38 or newer and AusBoss nodes 2.9.0 or newer (update first).\", \"models\": [{\"name\": \"qwen_image_2.1_int8_convrot.safetensors\", \"dir\": \"diffusion_models\", \"size\": \"7.26 GB\", \"url\": \"https://huggingface.co/Comfy-Org/Qwen-Image-2.1/resolve/main/diffusion_models/qwen_image_2.1_int8_convrot.safetensors\", \"note\": \"\"}, {\"name\": \"qwen3vl_8b_int8_convrot.safetensors\", \"dir\": \"text_encoders\", \"size\": \"9.35 GB\", \"url\": \"https://huggingface.co/Comfy-Org/Qwen-Image-2.1/resolve/main/text_encoders/qwen3vl_8b_int8_convrot.safetensors\", \"note\": \"\"}, {\"name\": \"qwen_image_2.1_vae_bf16.safetensors\", \"dir\": \"vae\", \"size\": \"676 MB\", \"url\": \"https://huggingface.co/Comfy-Org/Qwen-Image-2.1/resolve/main/vae/qwen_image_2.1_vae_bf16.safetensors\", \"note\": \"\"}, {\"name\": \"qwen-image-2.1-restore.safetensors\", \"dir\": \"loras\", \"size\": \"159 MB\", \"url\": \"https://huggingface.co/ausboss/Qwen-Image-2.1-Restore-LoRA/resolve/main/qwen-image-2.1-restore.safetensors\", \"note\": \"keeps the result close to your picture\"}, {\"name\": \"Qwen-Image-2.1-viggle-turbo-v0.3-6step-lora-r128.safetensors\", \"dir\": \"loras\", \"size\": \"680 MB\", \"url\": \"https://huggingface.co/Viggle/Qwen-Image-2.1-viggle-turbo/resolve/main/Qwen-Image-2.1-viggle-turbo-v0.3-6step-lora-r128.safetensors\", \"note\": \"for Fast on · Qwen Research License, research use\"}], \"packs\": [{\"name\": \"ComfyUI-AusBoss\", \"url\": \"https://github.com/ausboss/ComfyUI-AusBoss\", \"node\": \"AUSBOSS_NODES_TiledUpscale\"}], \"links\": [{\"label\": \"YouTube · ausbossdev\", \"url\": \"https://www.youtube.com/@ausbossdev\"}, {\"label\": \"GitHub · ausboss\", \"url\": \"https://github.com/ausboss\"}, {\"label\": \"Civitai · AusBoss\", \"url\": \"https://civitai.com/user/AusBoss\"}, {\"label\": \"X · Zanzibased\", \"url\": \"https://x.com/Zanzibased\"}]}"
    },
    "color": "#14424d",
    "bgcolor": "#161f21"

js/appearance/index.js

@@ -23,6 +23,7 @@ import { openInfoCard } from "../shared/settings_menu.mjs";
 
 const SETTING_ID = "AusBoss.Appearance.NodeColor";
 const CUSTOM_SETTING_ID = "AusBoss.Appearance.CustomColor";
+const COLOR_OVERRIDE = "ausbossColor";
 
 // Stored bare (no "#") to match the color setting's storage contract.
 const DEFAULT_CUSTOM_COLOR = "00b4aa";
@@ -40,6 +41,7 @@ let activeCustomColor = DEFAULT_CUSTOM_COLOR;
 let activeCustomTitle = normalizeHexColor(DEFAULT_CUSTOM_COLOR);
 
 function setActiveCustomColor(value) {
+  if (!normalizeHexColor(value)) return;
   activeCustomColor = value;
   activeCustomTitle = normalizeHexColor(value);
 }
@@ -56,6 +58,7 @@ function applyScheme(node, colors) {
 function repaintAll(next, previous) {
   for (const node of collectGraphNodes(app.graph)) {
     if (!isAusbossNode(node)) continue;
+    if (Object.hasOwn(node.properties ?? {}, COLOR_OVERRIDE)) continue;
     if (!shouldRecolor(node, previous)) continue;
     applyScheme(node, next);
   }
@@ -149,8 +152,8 @@ app.registerExtension({
   },
   getNodeMenuItems(node) {
     if (!isAusbossNode(node)) return [];
-    // A title-less node has no bar for the "?" badge; its card opens here.
-    const about = isTitleless(node)
+    // Vue nodes skip the canvas badge callbacks; title-less nodes have no bar.
+    const about = isTitleless(node) || globalThis.LiteGraph?.vueNodesMode === true
       ? [{ content: "About this node", callback: () => openHelpCard(node, null) }]
       : [];
     return [
@@ -162,12 +165,14 @@ app.registerExtension({
           options: SCHEME_NAMES.map((name) => ({
             content: name,
             callback: () => {
-              // A menu pick writes the colors directly; shouldRecolor then
-              // treats them as the user's choice during setting sweeps.
+              // Keep an explicit choice, including no colors, through saves
+              // and setting changes. Custom stores the pair picked today.
               const colors = schemeColors(name, activeCustomColor);
               // Custom with an unusable stored color resolves to null, which
               // would wrongly read as "Theme default" — do nothing instead.
               if (name === CUSTOM_SCHEME && !colors) return;
+              node.properties ??= {};
+              node.properties[COLOR_OVERRIDE] = colors ? { ...colors } : null;
               applyScheme(node, colors);
               app.graph?.setDirtyCanvas?.(true, true);
             },
@@ -179,16 +184,26 @@ app.registerExtension({
   nodeCreated(node) {
     if (!isAusbossNode(node)) return;
     installHelpBadge(node);
-    // Colors restored from a saved workflow (and manual picks) land before
-    // this hook runs — an already-colored node is left alone, unless it
-    // wears a retired flagship pair: those colors were ours, so the node
-    // upgrades to the active scheme instead of keeping them forever.
-    if ((node.color || node.bgcolor) && !wearsLegacyScheme(node)) return;
-    const colors = schemeColors(activeScheme, activeCustomColor);
-    if (colors) applyScheme(node, colors);
+    restoreAppearance(node);
+    // Construction precedes saved fields; reload, paste and undo restore
+    // their colors and properties before this callback runs.
+    chainCallback(node, "onConfigure", function (saved) {
+      restoreAppearance(this, saved);
+    });
   },
 });
 
+function restoreAppearance(node, saved) {
+  if (Object.hasOwn(node.properties ?? {}, COLOR_OVERRIDE)) {
+    // A later pick in ComfyUI's own color menu is saved in the native fields.
+    if (saved?.color || saved?.bgcolor) return;
+    applyScheme(node, node.properties[COLOR_OVERRIDE]);
+    return;
+  }
+  if ((node.color || node.bgcolor) && !wearsLegacyScheme(node)) return;
+  applyScheme(node, schemeColors(activeScheme, activeCustomColor));
+}
+
 function isTitleless(node) {
   return (node.title_mode ?? node.constructor?.title_mode) === (globalThis.LiteGraph?.NO_TITLE ?? 1);
 }
@@ -204,9 +219,8 @@ function openHelpCard(node, event) {
   });
 }
 
-// Every AusBoss node gets a quiet "?" in the title bar; clicking it opens a
-// card built from the node's own DESCRIPTION and tooltips, so the docs on
-// screen are exactly the docs in the source.
+// Classic nodes get a quiet "?" in the title bar. Vue nodes open the same
+// card from their context menu. Its text comes from DESCRIPTION and tooltips.
 function installHelpBadge(node) {
   // A title-less node (Run Timer) has no bar to hang the badge on; its
   // card opens from the node's context menu instead.

js/compare/index.js

@@ -463,8 +463,9 @@ app.registerExtension({
       ]);
     });
     chainCallback(nodeType.prototype, "onConfigure", function () {
+      const state = this.__ausbossCompare;
       queueMicrotask(() => {
-        const state = buildPanel(this);
+        if (!state || this.__ausbossCompare !== state || state.abort.signal.aborted) return;
         state.showingB = this.properties?.ausboss_compare_side === "B";
         syncErase(state);
         // The saved paint, if the pictures are already up.

js/docs/AUSBOSS_NODES_CropForInpaint.md

@@ -110,7 +110,7 @@ parts back.
 
 ## Technical details
 
-- Starting values: Context `1.2`, Blend `16` px, Multiple `8`; Grow, Blur,
+- Starting values: Context `1.2`, Blend `16` px, Multiple `32`; Grow, Blur,
   Extra context, the Target rows and the Extend rows start at `0`.
 - With no Target size set, the crop is still rounded up to **Multiple**, so
   with **Stay in picture** on it can still reach a few pixels (at most

js/docs/AUSBOSS_NODES_MaskByTouch.md

@@ -120,6 +120,8 @@ or an area you painted.
 
 ## The tools on the node
 
+- **Reload** (the round arrow) shows the picture coming in now: see
+  **Which picture the picks belong to**, below.
 - **Undo** takes back the last change, or a Clear. Ctrl+Z works as well: it
   is ComfyUI's own undo, and every change counts.
 - **Clear** picks nothing.
@@ -152,11 +154,15 @@ or an area you painted.
 - **More → Smooth** (`smooth`): rounds off a ragged outline by this many
   pixels.
 - **More → Fill small holes** (`fill_holes`): closes pinholes inside the
-  picked area. Larger openings stay open, like a mug's handle.
+  picked area. Larger openings stay open, like a mug's handle. Off by
+  default, so a hole you pick stays a hole.
 - **More → Invert** (`invert`): turns the mask round. On, the mask is
   everything except what you picked.
 - **More → If nothing** (`if_nothing`): **stop the run** or **empty mask**,
   see below.
+- **More → New picture** (`new_picture`): **keep picks** or **start over**,
+  for when a different picture comes in. See "Which picture the picks belong
+  to" below.
 - **More → Free VRAM** (`free_vram`): takes SAM 3 out of the graphics card's
   memory right after the search, so the next model has the room. Turn it on
   in a workflow that loads a big model after this node.
@@ -206,10 +212,21 @@ nothing instead.
 
 ## Which picture the picks belong to
 
-Picks belong to the picture they were made on. Load another picture and the
-node shows it with nothing picked, and says the old picks are not used.
-If the workflow runs before the node has shown the new picture, the run
-stops and says the picks were made on another picture.
+Picks belong to the picture they were made on. When a different picture
+comes in, **New picture** (under More) decides what happens to them:
+
+- **Keep picks** (the default): your clicks and paint move onto the new
+  picture, in the same places. On a picture of another size they are
+  scaled to fit it. A click finds whatever is at that spot now; paint stays
+  exactly as painted. Press **Clear** to start over.
+- **Start over**: the node shows the new picture with nothing picked. If the
+  workflow runs before you pick again, the run stops and says the picks
+  were made on another picture. The new picture shows on the node then,
+  ready to pick from.
+
+- **The reload button** (the round arrow beside Undo) shows the picture
+  coming in now. Use it after you change the picture before this node, for
+  example with an edit. It runs only this node and what comes before it.
 
 - With a Load Image wired straight in, or through Reroute nodes, the
   picture shows as soon as you choose a file.
@@ -316,7 +333,10 @@ no browser:
   used.
 - **`paint`**: exactly the stroke's own area. SAM 3 is not asked.
 - **`key`** names the picture the picks were made on: its size and a
-  fingerprint of every pixel. Picks made on another picture are ignored.
+  fingerprint of every pixel. Picks made on another picture are moved onto
+  the one that came in, scaled from the size in their key to its size, and
+  the face is sent the moved touches. With `new_picture` set to `start
+  over` they are ignored instead.
   Leave `key` out when you write `touches` by hand.
 
 ### How an area is tidied

js/docs/AUSBOSS_NODES_RealignToSource.md

@@ -31,8 +31,8 @@ names from here on; how it measures may still improve.
   moved a boat keeps the boat where it drew it, so the result lines up
   closely, not pixel for pixel.
 - **Leaves alone:** a picture it can't measure, or a zoom bigger than
-  **Max zoom**. That picture only comes out resized, and the report says
-  why.
+  **Max zoom** after allowing for padded reframing. That picture only
+  comes out resized, and the report says why.
 
 ## Controls
 
@@ -50,8 +50,10 @@ names from here on; how it measures may still improve.
   with nothing in it. `edge` (the default) stretches the nearest pixels
   into it, `source` fills it from the original, `gray` fills it flat gray
   for inpainting. With a big enough margin there is no strip.
-- **Max zoom**: the biggest zoom it will undo, in percent (20 by default).
-  Anything bigger is treated as a change you meant and left alone.
+- **Max zoom**: the zoom limit in percent (20 by default). For a padded
+  picture, zooming in to fill the padding gets an extra allowance; the
+  setting limits zoom beyond that. Zooming out still uses the stated limit.
+  Anything beyond those limits is treated as a change you meant and left alone.
 
 ## Outputs
 
@@ -121,6 +123,10 @@ new cloud, are left out. It trusts the fit when at least 10 blocks, and at
 least a quarter of them, agree. With a stitcher, the blocks tile the
 picture's area only.
 
+For padded reframing, the extra zoom-in allowance on each axis is the
+canvas size divided by the source picture's size, minus one. It is added
+to **Max zoom**; zooming out gets no extra allowance.
+
 It runs on the CPU in a fraction of a second per 1 MP frame. No new
 dependencies, and no model.
 

js/docs/AUSBOSS_NODES_SaveImage.md

@@ -52,7 +52,7 @@ file's name. A caption on the `caption_text` input writes the paired `.txt`.
   still lists it. When a run saves more than one image (a batch, or a list
   such as a folder of images), arrows beside the switch (‹ 2 / 5 ›) step
   through them.
-- **Steps** (`step_preview`, off by default): the switch left of
+- **Preview steps** (`step_preview`, off by default): the switch left of
   **preview** shows the picture while it is being made, one step at a time,
   where the saved image goes, with a **STOP** button on the bar. Stop a run
   that is going wrong after the first steps instead of waiting for the end;

js/docs/AUSBOSS_NODES_SaveVideo.md

@@ -9,7 +9,7 @@ duration, shows a tall video whole, and has a **LOOP** control. `gif` and
 `webp` are shown as pictures with just the file name, since a video player
 cannot play either.
 
-**Steps** above the player (`step_preview`, off by default) shows the clip's first frame in
+**Preview steps** above the player (`step_preview`, off by default) shows the clip's first frame in
 the player while it is being made, one step at a time, with a **STOP**
 button on the player. Stop a clip that is going wrong after the first steps
 instead of waiting for the end; a stopped run saves nothing. The saved

js/docs/AUSBOSS_NODES_StitchInpaint.md

@@ -67,9 +67,11 @@ are in the model's own picture.
   Tone match 0 the new area is bit-identical to what the model painted, and
   the whole stitch is the 2.4.0 blend in, pixel for pixel.
 - With the classic seam, feeding the crop back unchanged reproduces the
-  original image exactly (with `fix_edge_halo` off; the fix rewrites the
-  feathered band on purpose). Blend in does not promise this: it keeps the
-  model's version of the thin strip at your picture's edge.
+  original image exactly only when there is no resizing in either direction,
+  with Tone match at 0 and `fix_edge_halo` off. Resizing can lose detail even
+  when the crop comes back unchanged; the halo fix rewrites the feathered
+  band on purpose. Blend in does not promise this: it keeps the model's
+  version of the thin strip at your picture's edge.
 - A stitcher built from one image broadcasts over any number of inpainted
   frames. A stitcher built from **more** frames than came back is trimmed to
   the leading ones with a console note - video models keep 8n+1 (LTX) or

js/image_folder/index.js

@@ -26,6 +26,7 @@ import {
   childOf,
   countLine,
   foldersAddress,
+  folderContext,
   isPicked,
   listAddress,
   nameAt,
@@ -274,6 +275,7 @@ async function refresh(state) {
 }
 
 function scheduleRefresh(state, delay = 160) {
+  ++state.token;
   clearTimeout(state.timer);
   state.timer = setTimeout(() => refresh(state), delay);
 }
@@ -342,6 +344,7 @@ async function upload(file, subfolder, overwrite) {
 
 // Loose pictures go into the folder the node shows.
 async function addFiles(state, files) {
+  if (!state.alive) return false;
   const now = settings(state.node);
   const images = [...(files ?? [])].filter(isPicture);
   if (!images.length) return false;
@@ -352,10 +355,13 @@ async function addFiles(state, files) {
   const added = [];
   let failed = 0;
   for (const file of images) {
+    if (!state.alive) return true;
     const name = await upload(file, now.folder, false);
+    if (!state.alive) return true;
     if (name) added.push(name); else failed += 1;
   }
   await refresh(state);
+  if (!state.alive) return true;
   // A hand-made pick takes the new pictures in: they were just put there to be used.
   const picked = parsePicked(settings(state.node).pictures);
   if (picked !== null && added.length) setPicked(state, [...picked, ...added.filter((name) => state.names.includes(name))]);
@@ -388,6 +394,7 @@ function closeAsk(answer = false) {
 }
 
 function askBig(state, name, pictures) {
+  if (!state.alive) return Promise.resolve(false);
   const bytes = pictures.reduce((sum, item) => sum + (Number(item.file?.size) || 0), 0);
   if (pictures.length <= BIG_COUNT && bytes <= BIG_BYTES) return Promise.resolve(true);
   closeAsk(false);
@@ -404,7 +411,7 @@ function askBig(state, name, pictures) {
     foot.append(cancel, go);
     root.append(foot);
     const abort = new AbortController();
-    openAsk = { root, abort, done };
+    openAsk = { root, abort, done, state };
     cancel.addEventListener("click", () => closeAsk(false));
     go.addEventListener("click", () => closeAsk(true));
     document.body.append(root);
@@ -420,7 +427,17 @@ function askBig(state, name, pictures) {
 // input/<its name>, folders inside it too, and the node moves there. Copying
 // the same folder again writes over its copies instead of piling up doubles.
 async function copyFolder(state, name, pictures) {
-  if (!(await askBig(state, name, pictures)) || !state.alive) return;
+  if (!state.alive || state.copyLocked) return;
+  state.copyLocked = true;
+  try {
+    if (!(await askBig(state, name, pictures)) || !state.alive) return;
+    await copyPictures(state, name, pictures);
+  } finally {
+    state.copyLocked = false;
+  }
+}
+
+async function copyPictures(state, name, pictures) {
   const target = folderName(name);
   const queue = pictures.slice(0, COPY_LIMIT);
   state.copying = { done: 0, total: queue.length, name, target };
@@ -431,7 +448,9 @@ async function copyFolder(state, name, pictures) {
     for (;;) {
       const next = queue.shift();
       if (!next || !state.alive) return;
-      if (await upload(next.file, next.folder ? `${target}/${next.folder}` : target, true)) copied += 1;
+      const added = await upload(next.file, next.folder ? `${target}/${next.folder}` : target, true);
+      if (!state.alive) return;
+      if (added) copied += 1;
       state.copying.done += 1;
       paint(state);
       cover(state);
@@ -444,6 +463,7 @@ async function copyFolder(state, name, pictures) {
   if (!state.alive) return;
   const moved = write(state.node, "source", "input") | write(state.node, "folder", target);
   if (moved) notifyAusbossChange(); else await refresh(state);
+  if (!state.alive) return;
   paint(state);
   showToast({ detail: `Copied ${copied} picture${copied === 1 ? "" : "s"} from "${name}" into your ComfyUI input folder (input/${target}).` });
   if (copied < total) showToast({ severity: "warn", detail: `${total - copied} could not be copied.` });
@@ -506,7 +526,7 @@ function addMenu(state, anchor) {
   closeMenu();
   const root = el("div", "ausboss-if-menu");
   const abort = new AbortController();
-  openMenu = { root, abort };
+  openMenu = { root, abort, state };
   const row = (text, title, run) => {
     const button = el("button", "ausboss-if-browse-row", text);
     button.type = "button"; button.title = title;
@@ -545,19 +565,25 @@ async function browse(state, anchor) {
   foot.append(cancel, use);
   root.append(path, list, foot);
   const abort = new AbortController();
-  openBrowse = { root, abort };
+  openBrowse = { root, abort, state };
   let at = now.folder;
+  let source = now.source;
+  let navigation = 0;
 
   const show = async (folder) => {
+    const token = ++navigation;
+    use.disabled = true;
     let data = null;
     try {
-      const response = await api.fetchApi(foldersAddress({ source: now.source, folder }));
+      const response = await api.fetchApi(foldersAddress({ source, folder }));
       if (response.ok) data = await response.json();
     } catch { /* shown as an empty list below */ }
-    if (openBrowse?.root !== root) return;
+    if (openBrowse?.root !== root || token !== navigation || !state.alive) return;
     if (!data && folder) return show("");          // a folder that is gone: start at the top
     at = data?.folder ?? "";
-    path.replaceChildren(document.createTextNode(`${now.source} / `), el("b", "", at || "(the folder itself)"));
+    source = data?.source ?? source;
+    use.disabled = false;
+    path.replaceChildren(document.createTextNode(`${source} / `), el("b", "", at || "(the folder itself)"));
     list.replaceChildren();
     if (at) {
       const up = el("button", "ausboss-if-browse-row up", "↑ up");
@@ -582,7 +608,9 @@ async function browse(state, anchor) {
   };
 
   use.addEventListener("click", () => {
-    if (write(state.node, "folder", at)) notifyAusbossChange();
+    if (use.disabled || !state.alive) return;
+    const moved = write(state.node, "source", source) | write(state.node, "folder", at);
+    if (moved) notifyAusbossChange();
     closeBrowse();
   });
   cancel.addEventListener("click", closeBrowse);
@@ -706,6 +734,12 @@ function buildPanel(node) {
       const now = settings(node);
       const key = `${now.source}|${now.folder}|${now.subfolders}|${now.sort}`;
       if (key === state.key) { paint(state); return; }
+      const context = folderContext(now);
+      if (context !== state.context) {
+        state.done.clear();
+        state.loadedLine = "";
+        state.context = context;
+      }
       // Another folder holds other names: a pick made in the old one means nothing there.
       const moved = state.key && (now.source !== state.shown.source || now.folder !== state.shown.folder || now.subfolders !== state.shown.subfolders);
       state.key = key;
@@ -725,7 +759,9 @@ function buildPanel(node) {
       const now = settings(node);
       if (now.run !== "one per run" || isLinked(node, "position")) return;
       const count = pickedNames(parsePicked(now.pictures), state.names).length;
-      const next = nextPosition(now.position, count, now.afterRun, now.atTheEnd);
+      // The folder can change on disk or arrive through a link. Only the
+      // backend knows where it ends; a cached gallery must not cap "next".
+      const next = nextPosition(now.position, now.afterRun === "next" ? null : count, now.afterRun, now.atTheEnd);
       if (next !== now.position) { position.value = next; position.callback?.(next); }
     });
   }
@@ -748,6 +784,7 @@ function buildPanel(node) {
   });
 
   const now = settings(node);
+  state.context = folderContext(now);
   state.key = `${now.source}|${now.folder}|${now.subfolders}|${now.sort}`;
   rebuild(state);
   scheduleRefresh(state, 60);
@@ -773,12 +810,18 @@ app.registerExtension({
     });
     chainCallback(nodeType.prototype, "onConfigure", function (info) {
       const state = buildPanel(this);
+      ++state.token;
+      clearTimeout(state.timer);
+      state.done.clear();
+      state.loadedLine = "";
       // A node that comes with a size keeps it, the smallest one too.
       if (info?.size) state.sized = true;
       // A loaded workflow brings its own folder and its own pick.
       state.restoring = true;
       queueMicrotask(() => {
+        if (!state.alive) return;
         const now = settings(this);
+        state.context = folderContext(now);
         state.key = `${now.source}|${now.folder}|${now.subfolders}|${now.sort}`;
         state.restoring = false;
         scheduleRefresh(state, 30);
@@ -789,6 +832,7 @@ app.registerExtension({
       const state = this.__ausbossImageFolder;
       const note = output?.ausboss_image_folder?.[0];
       if (!state?.alive || !note) return;
+      if (!note.context || folderContext(note.context) !== folderContext(settings(this))) return;
       for (const name of note.names ?? []) state.done.add(name);
       const loaded = note.loaded ?? [];
       state.loadedLine = loaded.length === 1
@@ -805,9 +849,9 @@ app.registerExtension({
       state.abort.abort();
       state.choosing?.abort();
       clearTimeout(state.dropTimer);
-      if (openBrowse) closeBrowse();
-      if (openMenu) closeMenu();
-      if (openAsk?.root && state.grid.isConnected === false) closeAsk(false);
+      if (openBrowse?.state === state) closeBrowse();
+      if (openMenu?.state === state) closeMenu();
+      if (openAsk?.state === state) closeAsk(false);
     });
   },
 });

js/input_preview/index.js

@@ -19,7 +19,8 @@ import { api } from "../../../scripts/api.js";
 import { app } from "../../../scripts/app.js";
 import { isForeignRun } from "../shared/prompt_scope.mjs";
 import { executionIdOf, nodeByExecutionId } from "../shared/graph_ids.mjs";
-import { BRAND, chainCallback, keepDomWidgetWidthAuto, notifyAusbossChange } from "../shared/index.mjs";
+import { FONT_UI, RADIUS_CONTROL, RADIUS_XS, THEME as T } from "../shared/theme.mjs";
+import { chainCallback, keepDomWidgetWidthAuto, notifyAusbossChange } from "../shared/index.mjs";
 import { ensureNodeMinHeight, fillNodeHeight, growToNodeFloor } from "../shared/panel_layout.mjs";
 import { suppressCoreImagePreview } from "../shared/core_preview.mjs";
 import { autoMaskValues } from "../shared/mask_auto.mjs";
@@ -130,28 +131,29 @@ function ensureCss() {
   style.textContent = `
 .ausboss-input-preview{box-sizing:border-box;display:flex;flex-direction:column;gap:4px;width:100%;height:100%;padding:0 6px 6px;pointer-events:none;overflow:hidden;}
 .ausboss-input-preview-bar{box-sizing:border-box;flex:none;display:flex;align-items:center;gap:${BAR_GAP}px;height:${BAR_HEIGHT}px;padding:0 ${BAR_PADDING}px;pointer-events:none;}
-.ausboss-input-preview-stage{position:relative;flex:1 1 auto;min-height:0;display:flex;align-items:center;justify-content:center;width:100%;overflow:hidden;border:1px solid rgba(0,180,170,.27);border-radius:6px;background:rgba(0,0,0,.28);}
+.ausboss-input-preview-stage{position:relative;flex:1 1 auto;min-height:0;display:flex;align-items:center;justify-content:center;width:100%;overflow:hidden;border:1px solid ${T.rule};border-radius:${RADIUS_CONTROL}px;background:${T.well};}
 [data-node-id] .ausboss-input-preview-stage{box-sizing:border-box;min-height:${STAGE_HEIGHT}px;}
 .ausboss-input-preview.preview-off .ausboss-input-preview-stage{display:none;}
 .ausboss-input-preview.preview-off .ausboss-stepper{display:none;}
 .ausboss-input-preview-stage img,.ausboss-input-preview-stage video{display:none;position:absolute;inset:0;margin:auto;max-width:100%;max-height:100%;object-fit:contain;}
 .ausboss-input-preview-stage.show-image img{display:block;}
 .ausboss-input-preview-stage.show-video video{display:block;}
-.ausboss-input-preview-hint{display:none;max-width:86%;color:#78908e;font:11px/1.35 -apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif;text-align:center;}
+.ausboss-input-preview-hint{display:none;max-width:86%;color:${T.faint};font:11px/1.35 ${FONT_UI};text-align:center;}
 .ausboss-input-preview-stage:not(.show-image):not(.show-video) .ausboss-input-preview-hint{display:block;}
 .ausboss-input-preview-tools{display:flex;gap:4px;pointer-events:auto;}
-.ausboss-input-preview-tool{box-sizing:border-box;height:${BAR_HEIGHT}px;min-width:24px;padding:0 6px;border:1px solid rgba(0,180,170,.52);border-radius:4px;background:rgba(0,0,0,.7);color:#c8dddd;font:700 9px/18px "Segoe UI",sans-serif;cursor:pointer;}
-.ausboss-input-preview-tool:hover{border-color:${BRAND};color:#fff;background:rgba(0,79,75,.78);}
-.ausboss-input-preview-tool.active{border-color:${BRAND};color:${BRAND};}
+.ausboss-input-preview-tool{box-sizing:border-box;height:${BAR_HEIGHT}px;min-width:24px;padding:0 6px;border:1px solid transparent;border-radius:${RADIUS_XS}px;background:${T.fill};color:${T.label};font:600 9.5px/18px ${FONT_UI};letter-spacing:.02em;cursor:pointer;}
+.ausboss-input-preview-tool:hover{color:${T.ink};background:${T.fillHover};}
+.ausboss-input-preview-tool.active{color:${T.brandInk};background:${T.brandSoft};}
+.ausboss-input-preview-tool:focus-visible{outline:2px solid ${T.brand};outline-offset:1px;}
 .ausboss-input-preview:not(.preview-off) .ausboss-panel-switch.steps + .ausboss-panel-switch{margin-left:0;}
 .ausboss-input-preview.preview-off .ausboss-panel-switch.steps{display:none;}
 .ausboss-input-preview-tool.ausboss-steps-stop{visibility:hidden;}
 .ausboss-input-preview-tool.ausboss-steps-stop.live{visibility:visible;pointer-events:auto;}
-.ausboss-input-preview-readout{box-sizing:border-box;height:${BAR_HEIGHT}px;padding:0 7px;border:1px solid rgba(0,180,170,.5);border-radius:10px;background:rgba(0,180,170,.14);color:${BRAND};font:700 9.5px/18px "Segoe UI",sans-serif;white-space:nowrap;pointer-events:none;}
+.ausboss-input-preview-readout{box-sizing:border-box;height:${BAR_HEIGHT}px;padding:0 7px;border:1px solid transparent;border-radius:999px;background:${T.brandSoft};color:${T.brandInk};font:600 9.5px/18px ${FONT_UI};font-variant-numeric:tabular-nums;white-space:nowrap;pointer-events:none;}
 .ausboss-input-preview-readout:empty{display:none;}
-.ausboss-input-preview-readout.warn{border-color:#c98a2b;background:rgba(201,138,43,.16);color:#ffd9a0;}
-.ausboss-input-preview-note{display:none;position:absolute;left:6px;right:6px;bottom:6px;z-index:6;padding:6px 8px;border:1px solid #c98a2b;border-radius:6px;background:rgba(20,10,0,.86);color:#ffd9a0;font:600 11px/1.35 -apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif;text-align:center;pointer-events:none;}
-.ausboss-input-preview-toast{position:absolute;left:50%;bottom:6px;z-index:5;max-width:88%;padding:3px 7px;border-radius:4px;background:rgba(0,0,0,.78);color:#b8d3d1;font:10px/1.3 "Segoe UI",sans-serif;text-align:center;transform:translateX(-50%);pointer-events:none;}
+.ausboss-input-preview-readout.warn{background:${T.warnSoft};color:${T.warnInk};}
+.ausboss-input-preview-note{display:none;position:absolute;left:6px;right:6px;bottom:6px;z-index:6;padding:6px 8px;border:1px solid ${T.warn};border-radius:${RADIUS_CONTROL}px;background:${T.warnSoft};color:${T.warnInk};font:600 11px/1.35 ${FONT_UI};text-align:center;pointer-events:none;}
+.ausboss-input-preview-toast{position:absolute;left:50%;bottom:6px;z-index:5;max-width:88%;padding:3px 7px;border-radius:${RADIUS_XS}px;background:${T.fill};color:${T.inkSoft};font:10px/1.3 ${FONT_UI};text-align:center;transform:translateX(-50%);pointer-events:none;}
 `;
   document.head.appendChild(style);
 }
@@ -334,7 +336,7 @@ function installStepsSwitch(state, signal) {
   if (!widget) return;
   state.stepsWidget = widget;
   hideWidget(widget);
-  const button = panelSwitch("Steps", "Show the picture here while it is being made, one step at a time, with a Stop button. Off by default.");
+  const button = panelSwitch("Preview steps", "Show the picture here while it is being made, one step at a time, with a Stop button. Off by default.");
   button.classList.add("steps");
   button.addEventListener("pointerdown", (event) => event.stopPropagation(), { signal });
   button.addEventListener("click", (event) => {
@@ -444,7 +446,7 @@ function syncPreviewMode(state, resize) {
   }
   if (!enabled) {
     // Nothing to show and nothing to fetch while it is off.
-    state.img.removeAttribute("src");
+    clearMedia(state);
   }
   if (resize) {
     const node = state.node;
@@ -517,14 +519,16 @@ function clearMedia(state) {
   state.video.removeAttribute("src");
 }
 
-// Restore the watched widget's callback if our hook is still the tail of the
-// chain; if someone chained after us the hook simply goes inert via
-// state.alive. We never create object URLs, so there is nothing to revoke.
+// Each source has one hook, with subscribers that can leave in any order.
+const sourceWatchers = new WeakMap();
 function unwatchSource(state) {
   const watched = state.watched;
   state.watched = null;
-  if (watched && watched.widget.callback === watched.hook) {
+  if (!watched) return;
+  watched.subscribers.delete(state);
+  if (!watched.subscribers.size && watched.widget.callback === watched.hook) {
     watched.widget.callback = watched.prior;
+    sourceWatchers.delete(watched.widget);
   }
 }
 
@@ -533,14 +537,21 @@ function rewatchSource(state, source) {
   if (state.watched?.widget === widget) return;
   unwatchSource(state);
   if (!widget) return;
-  const prior = widget.callback;
-  const hook = function (...args) {
-    const result = prior?.apply(this, args);
-    if (state.alive) scheduleRefresh(state);
-    return result;
-  };
-  widget.callback = hook;
-  state.watched = { widget, prior, hook };
+  let watched = sourceWatchers.get(widget);
+  if (!watched) {
+    const prior = widget.callback;
+    const subscribers = new Set();
+    const hook = function (...args) {
+      const result = prior?.apply(this, args);
+      for (const subscriber of subscribers) if (subscriber.alive) scheduleRefresh(subscriber);
+      return result;
+    };
+    watched = { widget, prior, hook, subscribers };
+    sourceWatchers.set(widget, watched);
+    widget.callback = hook;
+  }
+  watched.subscribers.add(state);
+  state.watched = watched;
 }
 
 // The node's stored output as a /view URL, for Nodes 2.0, where node.imgs
@@ -584,6 +595,10 @@ function stepPicture(state, step) {
 
 function refresh(state) {
   if (!state.alive) return;
+  if (!previewEnabled(state)) {
+    clearMedia(state);
+    return;
+  }
   const source = upstreamNode(state.node, state.inputName);
   rewatchSource(state, source);
   const count = resultCount(state);
@@ -825,9 +840,9 @@ app.registerExtension({
       if (state) scheduleRefresh(state);
     });
     chainCallback(nodeType.prototype, "onConfigure", function () {
+      const state = this.__ausbossInputPreview;
       queueMicrotask(() => {
-        const state = buildPanel(this, config);
-        if (!state) return;
+        if (!state?.alive || this.__ausbossInputPreview !== state) return;
         // onNodeCreated already built the panel before this node's saved
         // properties existed, so the advanced toggle has to be re-applied
         // here or a workflow always reopens in the simple state.

js/line_up/index.js

@@ -288,6 +288,9 @@ function syncSizes() {
   const grabbed = together.grabbed;
   if (!grabbed) return;
   const was = together.before.get(grabbed);
+  // A handle click is not a resize. Once a drag starts, keep syncing even
+  // when it returns to its starting size so the other nodes follow it back.
+  if (!together.sides && grabbed.size[0] === was.size[0] && grabbed.size[1] === was.size[1]) return;
   together.sides ??= sharedSides(
     [...together.before.values()].map(({ pos, size }) => ({ x: pos[0], y: pos[1], w: size[0], h: size[1] })),
   );

js/mask_by_touch/index.js

@@ -168,13 +168,18 @@ api.addEventListener("execution_error", ({ detail }) => {
 api.addEventListener("execution_interrupted", () => settleAll());
 // A look is one long, quiet run. The node sends what it has found every
 // second or two, so things light up while it is still looking.
+// A run that stops at the node (nothing picked on this picture) sends the
+// picture that came in first, so a picture that changed upstream shows at
+// once. It is shown like a kept note: it starts no run of its own.
 api.addEventListener(LOOK_EVENT, ({ detail }) => {
   try {
     if (!faces.size || !detail?.note) return;
     const id = String(detail.node ?? "");
     const root = app.rootGraph ?? app.graph;
     for (const face of faces) {
-      if (face.alive && face.inFlight && executionIdOf(root, face.node) === id) face.takeNote(detail.note, { interim: true });
+      if (!face.alive || executionIdOf(root, face.node) !== id) continue;
+      if (detail.stopped) face.takeNote(detail.note, { restored: true });
+      else if (face.inFlight) face.takeNote(detail.note, { interim: true });
     }
   } catch {
     // Never in the way of a run.

js/resolution/index.js

@@ -30,7 +30,7 @@ import {
 } from "../shared/index.mjs";
 import { WIDGET_FRAME, fillNodeHeight, holdVueNodeMinWidth } from "../shared/panel_layout.mjs";
 import { hideInputsInDef, hideWidget } from "../shared/widget_visibility.mjs";
-import { markSocketless } from "../shared/widget_card_math.mjs";
+import { liftSlot, markSocketless } from "../shared/widget_card_math.mjs";
 import { makeScrubInput } from "../shared/scrub_input.mjs";
 import {
   closeSettingsMenu,
@@ -1014,8 +1014,7 @@ function installResolutionNode(node) {
   const liftSockets = () => {
     for (const input of node.inputs ?? []) {
       if (["width", "height", "latent", "batch_size"].includes(input.widget?.name)) {
-        delete input.widget;
-        input._widget = undefined;
+        liftSlot(input);
       }
     }
   };

js/save_image/index.js

@@ -146,7 +146,7 @@ async function openBrowse(state, anchor) {
     }
     path = listing.path;
     const use = el("button", "use", path ? `Use “${path}”` : "Use the output folder");
-    use.addEventListener("click", () => { setValue(state.node, "output_dir", path); state.refresh(); notifyAusbossChange(); closeBrowse(); });
+    use.addEventListener("click", () => { state.savedPath = null; setValue(state.node, "output_dir", path); state.refresh(); notifyAusbossChange(); closeBrowse(); });
     popup.append(use);
     if (path) {
       const up = el("button", "", "↑ up one level");
@@ -370,7 +370,8 @@ function buildCard(node) {
   chainCallback(node, "onExecuted", (output) => {
     if (isForeignRun()) return;
     const saved = output?.ausboss_saved_path?.[0];
-    if (typeof saved === "string" && saved) { state.savedPath = saved; state.refresh(); }
+    state.savedPath = typeof saved === "string" && saved ? saved : null;
+    state.refresh();
   });
   chainCallback(node, "onRemoved", () => { state.alive = false; closeBrowse(); });
   state.refresh();

js/save_video/index.js

@@ -39,7 +39,7 @@ function getLoopEnabled(node) {
   return !!node.properties.ausboss_save_video_loop;
 }
 
-// The STEPS button: the hidden `step_preview` widget (the card hides it).
+// The Preview steps switch: the hidden `step_preview` widget (the card hides it).
 // On, the player shows each step of the clip's first frame while it is
 // being made, and a STOP button joins the tools for the run.
 function stepsOn(state) {
@@ -131,7 +131,7 @@ function buildPreview(node) {
   loopButton.classList.add("ausboss-steps-loop");
   const stopButton = makeToolButton("STOP", "Stop this run now. The next run in the queue still starts.");
   stopButton.classList.add("ausboss-steps-stop");
-  const stepsButton = panelSwitch("Steps", "Show the clip's first frame here while it is being made, one step at a time, with a Stop button. Off by default.");
+  const stepsButton = panelSwitch("Preview steps", "Show the clip's first frame here while it is being made, one step at a time, with a Stop button. Off by default.");
   tools.classList.add("ausboss-steps-tools");
   tools.append(stopButton, loopButton);
   stage.append(video, image, status, tools);

js/shared/canvas_passthrough.mjs

@@ -10,11 +10,15 @@
 
 // The wheel belongs to the panel while it can still scroll that way (a long
 // text box, a list of rows), or while a text field has the keyboard.
-export function canScrollFurther(element, deltaY) {
-  if (!element || !deltaY) return false;
-  const room = element.scrollHeight - element.clientHeight;
+export function canScrollFurther(element, delta, axis = "y") {
+  if (!element || !delta) return false;
+  const horizontal = axis === "x";
+  const size = horizontal ? element.scrollWidth : element.scrollHeight;
+  const visible = horizontal ? element.clientWidth : element.clientHeight;
+  const start = horizontal ? element.scrollLeft : element.scrollTop;
+  const room = size - visible;
   if (room <= 1) return false;
-  return deltaY > 0 ? element.scrollTop + element.clientHeight < element.scrollHeight - 1 : element.scrollTop > 0;
+  return delta > 0 ? start + visible < size - 1 : start > 0;
 }
 
 // Does the wheel belong to something inside the panel, between the target
@@ -25,8 +29,11 @@ export function panelKeepsWheel(target, event, { root, host, styleOf, activeElem
   for (let element = target; element && element !== root && element !== host; element = element.parentElement) {
     const tag = String(element.tagName ?? "").toUpperCase();
     if ((tag === "TEXTAREA" || tag === "INPUT") && element === activeElement) return true;
-    const overflow = styleOf(element)?.overflowY;
+    const style = styleOf(element);
+    const overflow = style?.overflowY;
     if ((overflow === "auto" || overflow === "scroll") && canScrollFurther(element, event.deltaY)) return true;
+    const overflowX = style?.overflowX;
+    if ((overflowX === "auto" || overflowX === "scroll") && canScrollFurther(element, event.deltaX, "x")) return true;
   }
   return false;
 }

js/shared/compare_erase_stage.mjs

@@ -628,7 +628,7 @@ function installPointer(er, signal) {
 }
 
 async function save(er) {
-  if (er.saving || !er.refs) return;
+  if (er.signal.aborted || er.saving || !er.refs) return;
   er.saving = true;
   syncTools(er);
   try {
@@ -644,6 +644,7 @@ async function save(er) {
       })),
     });
     const answer = await response.json().catch(() => null);
+    if (er.signal.aborted) return;
     if (!response.ok) {
       // No words from the route: this ComfyUI started before the update.
       const missing = (response.status === 404 || response.status === 405) && !answer?.error;
@@ -652,10 +653,11 @@ async function save(er) {
     showToast({ severity: "success", summary: "Image Compare", detail: savedMessage(answer?.files) });
     er.onSaved?.(answer?.files ?? []);
   } catch (error) {
+    if (er.signal.aborted) return;
     showToast({ severity: "error", summary: "Image Compare", detail: String(error?.message ?? error), life: 8000 });
   } finally {
     er.saving = false;
-    syncTools(er);
+    if (!er.signal.aborted) syncTools(er);
   }
 }
 
@@ -663,20 +665,24 @@ async function save(er) {
 // to B as it came. The panel swaps in the pictures; Save and Copy then use
 // the lined-up B, and the paint stays where it is.
 async function align(er) {
-  if (er.aligning || !er.refs) return;
+  if (er.signal.aborted || er.aligning || !er.refs) return;
   if (er.refs.aligned) {
     er.onAligned?.(er.refs.original);
     return;
   }
   er.aligning = true;
+  const refs = er.refs;
+  const picturesVersion = er.picturesVersion;
+  const current = () => !er.signal.aborted && er.refs === refs && er.picturesVersion === picturesVersion;
   syncTools(er);
   try {
     const response = await api.fetchApi(ALIGN_ROUTE, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ pair: er.refs.pair }),
+      body: JSON.stringify({ pair: refs.pair }),
     });
     const answer = await response.json().catch(() => null);
+    if (!current()) return;
     if (!response.ok) {
       // No words from the route: this ComfyUI started before the update.
       const missing = (response.status === 404 || response.status === 405) && !answer?.error;
@@ -684,15 +690,16 @@ async function align(er) {
     }
     if (answer?.aligned && answer.b?.filename && typeof answer.pair === "string") {
       showToast({ severity: "success", summary: "Image Compare", detail: answer.message, life: 4000 });
-      er.onAligned?.({ ...er.refs, b: answer.b, pair: answer.pair, aligned: true, original: er.refs });
+      er.onAligned?.({ ...refs, b: answer.b, pair: answer.pair, aligned: true, original: refs });
     } else {
       showToast({ severity: "info", summary: "Image Compare", detail: answer?.message || "B was left as it is.", life: 6000 });
     }
   } catch (error) {
+    if (!current()) return;
     showToast({ severity: "error", summary: "Image Compare", detail: String(error?.message ?? error), life: 8000 });
   } finally {
     er.aligning = false;
-    syncTools(er);
+    if (!er.signal.aborted) syncTools(er);
   }
 }
 
@@ -764,7 +771,7 @@ function copy(er) {
 // pictures change.
 export function makeEraser({ node, root, stage, imageA, imageB, signal, onSaved, onAligned }) {
   const er = {
-    node, root, stage, imageA, imageB, onSaved, onAligned,
+    node, root, stage, imageA, imageB, signal, onSaved, onAligned,
     canvas: document.createElement("canvas"),
     mask: document.createElement("canvas"),
     live: document.createElement("canvas"),
@@ -772,7 +779,7 @@ export function makeEraser({ node, root, stage, imageA, imageB, signal, onSaved,
     dab: document.createElement("canvas"),
     dabKey: "",
     maskScale: 1,
-    refs: null, width: 0, height: 0, fit: null,
+    refs: null, picturesVersion: 0, width: 0, height: 0, fit: null,
     strokes: [], history: [],
     active: false, stroke: null, adjust: null, pointer: null, back: false, flipKey: false,
     saving: false, copying: false, frame: 0, keys: null,
@@ -985,6 +992,7 @@ export function makeEraser({ node, root, stage, imageA, imageB, signal, onSaved,
     // Both pictures are loaded (or, with null, on their way). The paint is
     // read from the node, and kept only while the picture keeps its size.
     setPictures(refs) {
+      er.picturesVersion += 1;
       const ready = Boolean(refs && imageA.naturalWidth > 0 && imageB.naturalWidth > 0);
       er.refs = ready ? refs : null;
       finishStroke(er, null, true);

js/shared/image_folder.mjs

@@ -93,8 +93,10 @@ export function nameAt(picked, names, position, atTheEnd) {
 // the first, so Picture always names a real picture. A Picture already past
 // the end (saved by an older version) steps on from the picture it loaded.
 // "random" jumps to any picked picture (`roll` is 0..1, for tests).
+// With an unknown count, "next" keeps advancing and the backend handles the end.
 export function nextPosition(position, count, afterRun, atTheEnd = "stop the run", roll = Math.random()) {
   const place = Math.max(1, Math.round(Number(position) || 1));
+  if (count == null) return afterRun === "next" ? place + 1 : place;
   if (count < 1) return place;
   if (afterRun === "random") return Math.min(count, Math.floor(roll * count) + 1);
   if (afterRun !== "next") return place;
@@ -124,6 +126,12 @@ export function childOf(folder, name) {
   return [...String(folder ?? "").split("/").filter(Boolean), name].join("/");
 }
 
+// A relative name belongs to one folder, even when another has the same name.
+export function folderContext({ source, folder, subfolders }) {
+  const relative = String(folder ?? "").trim().replaceAll("\\", "/").split("/").filter(part => part && part !== ".").join("/");
+  return JSON.stringify([source, relative, Boolean(subfolders)]);
+}
+
 // A query string. Every value is typed by a person or saved in a workflow.
 export function query(params) {
   return Object.entries(params)

js/shared/index.mjs

@@ -9,7 +9,7 @@ import { app } from "../../../scripts/app.js";
 // Must match `version` in pyproject.toml — scripts/release_preflight.py
 // enforces it. The backend serves its copy at /ausboss/pack_version; a
 // mismatch means the browser cached JavaScript from an older install.
-export const AUSBOSS_JS_VERSION = "2.21.1";
+export const AUSBOSS_JS_VERSION = "2.23.0";
 
 export const BRAND = "#00b4aa"; // AusBoss teal — keep node accents consistent.
 export const BRAND_DARK = "#007f78";

js/shared/panel_controls.mjs

@@ -1,30 +1,31 @@
 // Shared controls for compact node panels. Only elements explicitly given one
 // of these classes are styled; the owning panel decides where they sit.
-import { BRAND } from "./index.mjs";
+import { FONT_UI, RADIUS_XS, THEME as T } from "./theme.mjs";
 
 export const PANEL_LABELS = Object.freeze({
   load: "Load", sources: { input: "Inputs", output: "Outputs" },
   embed: "Embed workflow", off: "Off", on: "On",
 });
 
-const controlFont = 'system-ui, sans-serif';
-export const CAPTION_TYPE = `font:600 11px/1.25 ${controlFont};color:#b2c6c3;`;
-export const HINT_TYPE = `font:400 10px/1.25 ${controlFont};color:#95aba8;`;
+const controlFont = FONT_UI;
+export const CAPTION_TYPE = `font:600 11px/1.25 ${controlFont};color:${T.label};`;
+export const HINT_TYPE = `font:400 10px/1.25 ${controlFont};color:${T.faint};`;
 
 export function ensurePanelControls() {
   if (document.getElementById("ausboss-panel-controls")) return;
   const style = document.createElement("style");
   style.id = "ausboss-panel-controls";
   style.textContent = `
-.ausboss-compact-action{box-sizing:border-box;flex:none;height:22px;min-width:24px;padding:0 7px;border:1px solid #365957;border-radius:4px;background:#111b1c;color:#bdd8d5;font:600 11px/1 ${controlFont};white-space:nowrap;cursor:pointer;pointer-events:auto}
-.ausboss-compact-action:hover:enabled,.ausboss-compact-action.active{color:#dbfffb;border-color:${BRAND};background:#173332}
+.ausboss-compact-action{box-sizing:border-box;flex:none;height:22px;min-width:24px;padding:0 7px;border:1px solid transparent;border-radius:${RADIUS_XS}px;background:${T.fill};color:${T.inkSoft};font:600 11px/1 ${controlFont};white-space:nowrap;cursor:pointer;pointer-events:auto}
+.ausboss-compact-action:hover:enabled{color:${T.ink};background:${T.fillHover}}
+.ausboss-compact-action.active{color:${T.brandInk};background:${T.brandSoft}}
 .ausboss-compact-action:disabled{opacity:.5;cursor:default}
-.ausboss-panel-switch{display:inline-flex;align-items:center;gap:6px;align-self:flex-end;flex:none;box-sizing:border-box;min-height:20px;margin-left:auto;padding:0 2px;background:transparent;border:0;color:#b2c6c3;font:600 11px/1 ${controlFont};cursor:pointer;user-select:none;pointer-events:auto}
-.ausboss-panel-switch i{position:relative;width:24px;height:13px;border-radius:7px;background:#3a4445}
-.ausboss-panel-switch i::after{content:"";position:absolute;top:2px;left:2px;width:9px;height:9px;border-radius:50%;background:#b6c4c3}
-.ausboss-panel-switch[aria-checked=true] i{background:${BRAND}}
-.ausboss-panel-switch[aria-checked=true] i::after{left:13px;background:#fff}
-.ausboss-compact-action:focus-visible,.ausboss-panel-switch:focus-visible{outline:2px solid ${BRAND};outline-offset:1px}
+.ausboss-panel-switch{display:inline-flex;align-items:center;gap:6px;align-self:flex-end;flex:none;box-sizing:border-box;min-height:20px;margin-left:auto;padding:0 2px;background:transparent;border:0;color:${T.label};font:600 11px/1 ${controlFont};cursor:pointer;user-select:none;pointer-events:auto}
+.ausboss-panel-switch i{position:relative;width:24px;height:13px;border-radius:7px;background:${T.switchOff}}
+.ausboss-panel-switch i::after{content:"";position:absolute;top:2px;left:2px;width:9px;height:9px;border-radius:50%;background:${T.inkSoft}}
+.ausboss-panel-switch[aria-checked=true] i{background:${T.brand}}
+.ausboss-panel-switch[aria-checked=true] i::after{left:13px;background:${T.inkHover}}
+.ausboss-compact-action:focus-visible,.ausboss-panel-switch:focus-visible{outline:2px solid ${T.brand};outline-offset:1px}
 `;
   document.head.append(style);
 }

js/shared/picture_stepper.mjs

@@ -3,7 +3,7 @@
 // steps through its pairs with it, and the preview panel of Save Image and
 // the other preview nodes through their results. It hides itself while
 // there is one picture or none, so a single picture looks as it always did.
-import { BRAND } from "./index.mjs";
+import { FONT_UI, RADIUS_CONTROL, RADIUS_XS, THEME as T } from "./theme.mjs";
 import { stepperLabel } from "./picture_steps.mjs";
 
 const CSS_ID = "ausboss-picture-stepper-v1";
@@ -13,12 +13,12 @@ function ensureCss() {
   const style = document.createElement("style");
   style.id = CSS_ID;
   style.textContent = `
-.ausboss-stepper{box-sizing:border-box;flex:none;display:flex;align-items:stretch;height:var(--ausboss-stepper-height,24px);padding:1px;border:1px solid #2a3437;border-radius:6px;background:#0f1516;pointer-events:auto;user-select:none;}
+.ausboss-stepper{box-sizing:border-box;flex:none;display:flex;align-items:stretch;height:var(--ausboss-stepper-height,24px);padding:1px;border:1px solid transparent;border-radius:${RADIUS_CONTROL}px;background:${T.fill};pointer-events:auto;user-select:none;}
 .ausboss-stepper[hidden]{display:none;}
-.ausboss-stepper button{box-sizing:border-box;width:20px;margin:0;padding:0;border:none;border-radius:4px;background:transparent;color:#8ba3a1;font:700 13px/1 -apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif;cursor:pointer;}
-.ausboss-stepper button:hover{color:#fff;background:rgba(0,79,75,.78);}
-.ausboss-stepper button:focus-visible{outline:1px solid ${BRAND};outline-offset:-1px;}
-.ausboss-stepper span{min-width:34px;padding:0 3px;color:#d8eeee;font:700 10px/1 -apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif;font-variant-numeric:tabular-nums;text-align:center;white-space:nowrap;align-self:center;}
+.ausboss-stepper button{box-sizing:border-box;width:20px;margin:0;padding:0;border:none;border-radius:${RADIUS_XS}px;background:transparent;color:${T.label};font:600 13px/1 ${FONT_UI};cursor:pointer;}
+.ausboss-stepper button:hover{color:${T.ink};background:${T.fillHover};}
+.ausboss-stepper button:focus-visible{outline:1px solid ${T.brand};outline-offset:-1px;}
+.ausboss-stepper span{min-width:34px;padding:0 3px;color:${T.ink};font:600 10px/1 ${FONT_UI};font-variant-numeric:tabular-nums;text-align:center;white-space:nowrap;align-self:center;}
 `;
   document.head.appendChild(style);
 }

js/shared/scrub_input.mjs

@@ -25,10 +25,8 @@
 // Shift's fine step and typed values are never snapped.
 
 import { keepKeyInField } from "./canvas_passthrough.mjs";
-
-// Keep in sync with BRAND in shared/index.mjs - importing it would pull
-// /scripts/app.js into node:test, and this module's math must stay testable.
-const BRAND = "#00b4aa";
+// theme.mjs has no imports, so this module's math stays testable in node:test.
+import { FONT_UI, RADIUS_CONTROL, THEME as T } from "./theme.mjs";
 
 // Horizontal pixels of drag per step; small enough to feel light, large
 // enough that a shaky click cannot change the value. The dead zone keeps a
@@ -181,19 +179,19 @@ function ensureScrubCss() {
   // for one) carry blanket `section input` rules, and these must outrank
   // them wherever the control is mounted.
   style.textContent = `
-  .ausboss-scrub{display:flex;width:72px;height:24px;border:1px solid #3a4047;border-radius:5px;
-    background:#23272c;overflow:hidden;flex:none;color:#d7dde2;font:12px system-ui}
-  .ausboss-scrub:focus-within{border-color:${BRAND}}
+  .ausboss-scrub{display:flex;width:72px;height:24px;border:1px solid transparent;border-radius:${RADIUS_CONTROL}px;
+    background:${T.fill};overflow:hidden;flex:none;color:${T.ink};font:500 12px ${FONT_UI};font-variant-numeric:tabular-nums}
+  .ausboss-scrub:focus-within{border-color:${T.brand}}
   .ausboss-scrub>.ausboss-scrub-input{flex:1 1 auto;min-width:0;width:100%;height:100%;border:none;
     padding:0;margin:0;background:transparent;color:inherit;text-align:center;cursor:ew-resize;
     user-select:none;font:inherit;outline:none;border-radius:0}
   .ausboss-scrub>.ausboss-scrub-input:focus{cursor:text;user-select:text}
-  .ausboss-scrub>.ausboss-scrub-unit{flex:none;align-self:center;padding:0 3px 0 1px;color:#5f7674;font-size:9.5px;letter-spacing:.06em;text-transform:uppercase;text-align:center;user-select:none;pointer-events:none}
+  .ausboss-scrub>.ausboss-scrub-unit{flex:none;align-self:center;padding:0 3px 0 1px;color:${T.faint};font:600 10px ${FONT_UI};letter-spacing:.04em;text-transform:uppercase;text-align:center;user-select:none;pointer-events:none}
   .ausboss-scrub>.ausboss-scrub-step{flex:none;width:14px;display:flex;flex-direction:column;
-    border-left:1px solid #3a4047}
+    border-left:1px solid transparent;background:${T.fillHover}}
   .ausboss-scrub>.ausboss-scrub-step>button{flex:1 1 0;min-height:0;border:none;background:transparent;
-    color:#9ba2aa;cursor:pointer;padding:0;margin:0;display:grid;place-items:center;border-radius:0}
-  .ausboss-scrub>.ausboss-scrub-step>button:hover{color:${BRAND};background:rgba(255,255,255,.05)}
+    color:${T.label};cursor:pointer;padding:0;margin:0;display:grid;place-items:center;border-radius:0}
+  .ausboss-scrub>.ausboss-scrub-step>button:hover{color:${T.brand};background:rgba(255,255,255,.05)}
   `;
   document.head.append(style);
 }

js/shared/slide_switch.mjs

@@ -2,7 +2,7 @@
 // chosen one: the mode row of Image Compare A/B, and its off | on choices.
 // The choices share one width, so the marker only has to move. With `fit`
 // each choice is as wide as its own name, and the marker is measured.
-import { BRAND } from "./index.mjs";
+import { FONT_UI, RADIUS_CONTROL, RADIUS_XS, THEME as T } from "./theme.mjs";
 
 const CSS_ID = "ausboss-slide-switch-v1";
 
@@ -11,17 +11,17 @@ function ensureCss() {
   const style = document.createElement("style");
   style.id = CSS_ID;
   style.textContent = `
-.ausboss-slide{position:relative;box-sizing:border-box;flex:none;display:grid;grid-auto-flow:column;grid-auto-columns:1fr;height:24px;padding:2px;border:1px solid #2a3437;border-radius:6px;background:#0f1516;}
+.ausboss-slide{position:relative;box-sizing:border-box;flex:none;display:grid;grid-auto-flow:column;grid-auto-columns:1fr;height:24px;padding:2px;border:1px solid transparent;border-radius:${RADIUS_CONTROL}px;background:${T.fill};}
 .ausboss-slide.fit{grid-auto-columns:max-content;}
 .ausboss-slide.fit button{padding:0 7px;}
-.ausboss-slide-mark{position:absolute;top:2px;bottom:2px;left:2px;border-radius:4px;background:${BRAND};box-shadow:0 0 7px rgba(0,180,170,.3);transition:transform .16s ease,width .16s ease;pointer-events:none;}
+.ausboss-slide-mark{position:absolute;top:2px;bottom:2px;left:2px;border-radius:${RADIUS_XS}px;background:${T.brand};transition:transform .16s ease,width .16s ease;pointer-events:none;}
 .ausboss-slide.none .ausboss-slide-mark{display:none;}
-.ausboss-slide button{position:relative;box-sizing:border-box;min-width:0;height:100%;margin:0;padding:0 9px;border:none;border-radius:4px;background:transparent;color:#8ba3a1;font:700 10px/1 -apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif;letter-spacing:.02em;white-space:nowrap;cursor:pointer;transition:color .16s ease;}
-.ausboss-slide button:hover{color:#fff;}
-.ausboss-slide button.on,.ausboss-slide button.on:hover{color:#04201d;}
-.ausboss-slide.off-left button.on:first-of-type,.ausboss-slide.off-left button.on:first-of-type:hover{color:#d8eeee;}
-.ausboss-slide.off-left.is-off .ausboss-slide-mark{background:#33423f;box-shadow:none;}
-.ausboss-slide button:focus-visible{outline:1px solid ${BRAND};outline-offset:1px;}
+.ausboss-slide button{position:relative;box-sizing:border-box;min-width:0;height:100%;margin:0;padding:0 9px;border:none;border-radius:${RADIUS_XS}px;background:transparent;color:${T.label};font:600 11px/1 ${FONT_UI};white-space:nowrap;cursor:pointer;transition:color .16s ease;}
+.ausboss-slide button:hover{color:${T.inkHover};}
+.ausboss-slide button.on,.ausboss-slide button.on:hover{color:${T.onBrand};}
+.ausboss-slide.off-left button.on:first-of-type,.ausboss-slide.off-left button.on:first-of-type:hover{color:${T.ink};}
+.ausboss-slide.off-left.is-off .ausboss-slide-mark{background:${T.switchOff};}
+.ausboss-slide button:focus-visible{outline:1px solid ${T.brand};outline-offset:1px;}
 @media (prefers-reduced-motion: reduce){.ausboss-slide-mark,.ausboss-slide button{transition:none;}}
 `;
   document.head.appendChild(style);

js/shared/step_preview.mjs

@@ -12,7 +12,7 @@
 import { api } from "../../../scripts/api.js";
 import { app } from "../../../scripts/app.js";
 import { nodeByExecutionId } from "./graph_ids.mjs";
-import { BRAND } from "./index.mjs";
+import { FONT_UI, RADIUS_CONTROL, THEME as T } from "./theme.mjs";
 import { outputRecordQuery } from "./input_preview.mjs";
 import { isForeignRun } from "./prompt_scope.mjs";
 import {
@@ -213,15 +213,15 @@ export function ensureStepCss() {
 .ausboss-steps.on{display:block;}
 .ausboss-steps-showing>img,.ausboss-steps-showing>video,.ausboss-steps-showing>.ausboss-input-preview-hint,.ausboss-steps-showing>.ausboss-video-status{visibility:hidden;}
 .ausboss-steps img,.ausboss-steps.on img{display:block;position:absolute;inset:0;width:100%;height:100%;max-width:none;max-height:none;margin:0;object-fit:contain;visibility:visible;}
-.ausboss-steps-line{position:absolute;left:0;top:0;height:3px;width:0;background:${BRAND};box-shadow:0 0 6px rgba(0,180,170,.5);transition:width .15s linear;}
-.ausboss-steps-chip{position:absolute;left:6px;right:6px;bottom:6px;box-sizing:border-box;padding:4px 7px;border:1px solid rgba(255,255,255,.08);border-radius:5px;background:rgba(8,12,13,.84);color:#d8ecea;font:600 10.5px/1.35 ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}
+.ausboss-steps-line{position:absolute;left:0;top:0;height:3px;width:0;background:${T.brand};transition:width .15s linear;}
+.ausboss-steps-chip{position:absolute;left:6px;right:6px;bottom:6px;box-sizing:border-box;padding:4px 7px;border:1px solid transparent;border-radius:${RADIUS_CONTROL}px;background:rgba(21,24,26,.88);color:${T.inkSoft};font:600 10.5px/1.35 ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}
 .ausboss-steps.stopped img{filter:brightness(.55) saturate(.7);}
 .ausboss-steps.stopped .ausboss-steps-line{display:none;}
-.ausboss-steps.stopped .ausboss-steps-chip{border-color:rgba(224,96,90,.55);color:#ffd0cc;}
-.ausboss-steps-hint{position:absolute;left:50%;top:50%;max-width:86%;transform:translate(-50%,-50%);color:#78908e;font:11px/1.35 -apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif;text-align:center;}
-.ausboss-steps-stop{border-color:rgba(224,96,90,.8)!important;background:rgba(58,28,27,.9)!important;color:#ffd9d6!important;}
-.ausboss-steps-stop:hover{background:rgba(120,38,33,.95)!important;color:#fff!important;}
-.ausboss-steps-stop::before{content:"";display:inline-block;width:6px;height:6px;margin-right:5px;border-radius:1px;background:#e0605a;vertical-align:1px;}
+.ausboss-steps.stopped .ausboss-steps-chip{border-color:${T.danger};color:${T.dangerInk};}
+.ausboss-steps-hint{position:absolute;left:50%;top:50%;max-width:86%;transform:translate(-50%,-50%);color:${T.faint};font:11px/1.35 ${FONT_UI};text-align:center;}
+.ausboss-steps-stop{border-color:transparent!important;background:${T.dangerSoft}!important;color:${T.dangerInk}!important;}
+.ausboss-steps-stop:hover{background:rgba(120,38,33,.95)!important;color:${T.inkHover}!important;}
+.ausboss-steps-stop::before{content:"";display:inline-block;width:6px;height:6px;margin-right:5px;border-radius:1px;background:${T.danger};vertical-align:1px;}
 .ausboss-video-tool.ausboss-steps-stop{display:none;}
 .ausboss-video-tool.ausboss-steps-stop.live{display:inline-block;}
 .ausboss-video-stage.is-still .ausboss-video-tools.ausboss-steps-tools{display:flex;}

js/shared/theme.mjs

@@ -0,0 +1,50 @@
+// The pack's node-face palette, in one place. Cards, number boxes and
+// switches read their colours, font and sizes from here instead of
+// carrying their own literals.
+//
+// The look: solid gray controls with no outlines on a near-black card,
+// neutral grays, and one teal accent for whatever is on or picked.
+//
+// No imports on purpose: scrub_input.mjs and the node:test suites load
+// this file without the ComfyUI app.
+
+export const THEME = Object.freeze({
+  brand: "#00b4aa",          // the one accent: picked segment, switch on, focus ring
+  onBrand: "#04201d",        // text on a brand fill
+  brandSoft: "rgba(0,180,170,.16)", // chip fill
+  brandSoftHover: "rgba(0,180,170,.26)",
+  brandInk: "#45d6cb",       // chip text on brandSoft
+  brandGlow: "#6fe0d6",      // the big text look
+
+  card: "#101214",           // widget card ground
+  fill: "#2d3134",           // every control: solid, no border
+  fillHover: "#383c40",      // control hover, the chevron column
+  well: "#0f1112",           // picture stage ground
+  rule: "#2b2f32",           // hairline after a section label
+  switchOff: "#62676d",      // the mark of a switch sitting on off
+
+  ink: "#f6f7f8",            // values: numbers, picked options, typed text
+  inkSoft: "#e0e3e5",        // default card text
+  inkHover: "#ffffff",
+  label: "#b4b9bd",          // row labels, unselected segments, chevrons
+  faint: "#979da2",          // units, section labels, placeholders, muted rows
+
+  danger: "#e0605a",         // stop: the dot on the Stop button
+  dangerInk: "#ffd9d6",
+  dangerSoft: "#3a1c1b",
+
+  warn: "#e0a040",
+  warnInk: "#ffdca8",
+  warnSoft: "#3a2a10",
+});
+
+export const FONT_UI = `system-ui,-apple-system,"Segoe UI",Roboto,sans-serif`;
+
+// Every control in a card row is as tall as the row.
+export const CONTROL_HEIGHT = 26;
+export const RADIUS_XS = 4;
+export const RADIUS_CONTROL = 6;
+export const RADIUS_CARD = 10;
+
+// The select's chevron, drawn in `label`.
+export const SELECT_CHEVRON = `url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='10' height='6' viewBox='0 0 10 6'%3E%3Cpath d='M1 1l4 4 4-4' fill='none' stroke='%23b4b9bd' stroke-width='1.5'/%3E%3C/svg%3E")`;

js/shared/touch_math.mjs

@@ -268,6 +268,15 @@ export function encodeTouches(key, items) {
   return JSON.stringify({ v: 1, key: String(key ?? ""), items: clean });
 }
 
+// The picks the node moved onto a new picture (New picture: keep picks), as
+// the text to write: only while the widget still holds the picks they were
+// moved from (`current`). Anything picked since is kept, and then this is null.
+export function movedTouches(note, current) {
+  const moved = note?.moved;
+  if (!moved || typeof moved.touches !== "string" || typeof moved.from !== "string") return null;
+  return stampOf(String(current ?? "")) === moved.from ? moved.touches : null;
+}
+
 // Whether two runs of touches pick the same things. How they are written
 // decides, so a touch fresh from a click and the same one read back from the
 // widget compare equal.

js/shared/touch_stage.mjs

@@ -63,6 +63,7 @@ import {
   loaderSignature,
   maskOn,
   maskShare,
+  movedTouches,
   nameShown,
   nextGroup,
   numberChip,
@@ -95,8 +96,9 @@ export const NOTE_KEY = "ausboss_mask_by_touch";
 const TOOLS_HEIGHT = 24;
 const BAR_HEIGHT = 20;
 const STAGE_MIN = 150;
-// Wide enough for the bar under the picture: the arrows, a pick's name, Subject and Background.
-export const PANEL_MIN_WIDTH = 400;
+// Wide enough for the tools over the picture (Reload, Undo, Clear and the eye
+// included) and the bar under it: the arrows, a pick's name, Subject and Background.
+export const PANEL_MIN_WIDTH = 428;
 // What the panel's element needs at its smallest: tools, stage and bar, two
 // gaps and the padding under them.
 const CHIPS_HEIGHT = 22;
@@ -104,9 +106,9 @@ const CHIPS_HEIGHT = 22;
 const CHIP_ROWS = 3;
 // A node this wide has room for the names in front of the brush's two
 // numbers. A narrower one shows the numbers alone.
-const LABELS_FROM = 440;
+const LABELS_FROM = 470;
 // The width a new node opens with: the names fit.
-export const OPENING_WIDTH = 460;
+export const OPENING_WIDTH = 490;
 const PANEL_NEEDS = TOOLS_HEIGHT + STAGE_MIN + BAR_HEIGHT + CHIPS_HEIGHT + 12 + 6;
 // Saved with the workflow: the brush size once it was set by hand, the snap
 // switch, and how the picked area is shown.
@@ -134,6 +136,8 @@ const EYE_TITLES = {
 // The eye beside Undo and Clear, drawn here: an almond and its pupil.
 const EYE_ICON = '<svg width="16" height="16" viewBox="-8 -8 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linejoin="round" aria-hidden="true">'
   + '<path d="M-6.6 0Q0 -6 6.6 0Q0 6 -6.6 0Z"/><circle r="2" fill="currentColor" stroke="none"/></svg>';
+const RELOAD_ICON = '<svg width="14" height="14" viewBox="-8 -8 16 16" fill="none" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">'
+  + '<path d="M5.6 -2.4A6 6 0 1 0 5.2 3"/><path d="M6 -6.2V-2.2H2"/></svg>';
 // The brush size, across the picture, in picture pixels.
 const BRUSH_SIZE = [4, 1000];
 // A brush mark counts as touching an area within this many pixels of the
@@ -241,7 +245,7 @@ function ensureCss() {
 .ausboss-touch.narrow .ausboss-touch-tools{gap:3px;}
 .ausboss-touch.narrow .ausboss-touch-field.size .ausboss-scrub{width:56px !important;}
 .ausboss-touch.narrow .ausboss-touch-field.soft .ausboss-scrub{width:48px !important;}
-.ausboss-touch-btn.eye{display:inline-flex;align-items:center;justify-content:center;width:26px;min-width:26px;padding:0;}
+.ausboss-touch-btn.eye,.ausboss-touch-btn.reload{display:inline-flex;align-items:center;justify-content:center;width:26px;min-width:26px;padding:0;}
 .ausboss-touch-btn.eye.on{border-color:${BRAND};background:${BRAND};color:#04201f;}
 .ausboss-touch-btn.arrow{min-width:20px;width:20px;padding:0;font-size:14px;line-height:16px;}
 .ausboss-touch-swatch{box-sizing:border-box;flex:none;width:${BAR_HEIGHT}px;height:${BAR_HEIGHT}px;border-radius:4px;background:#0b1113;border:1px solid rgba(0,180,170,.3);pointer-events:auto;}
@@ -742,7 +746,7 @@ function settings(face) {
     grow: Math.round(number("grow")),
     soften: Math.max(0, number("soften")),
     smooth: Math.max(0, Math.round(number("smooth"))),
-    fill: widgetByName(face.node, "fill_holes")?.value !== false,
+    fill: widgetByName(face.node, "fill_holes")?.value === true,
     invert: widgetByName(face.node, "invert")?.value === true,
     fine: fineChoice(widgetByName(face.node, "fine_edges")?.value),
   };
@@ -1403,6 +1407,7 @@ function syncTools(face) {
   const waiting = live && face.pending.length > 0;
   face.undo.disabled = !live || (!some && !face.past.length && !waiting);
   face.clear.disabled = !some && !waiting;
+  face.reload.disabled = !live || face.inFlight;
   if (face.lookButton) {
     const offer = live && face.snap && !face.held && !face.inFlight && !face.pic.scoped && Boolean(face.host.lookOnButton?.());
     face.lookButton.style.display = offer ? "" : "none";
@@ -1529,6 +1534,9 @@ function followOwnLoader(face, now = false) {
 }
 
 const OTHER_PICTURE = "This is another picture. The picks made on the last one are not used.";
+// With New picture on keep picks, the node moves them onto it instead.
+const PICKS_CARRY = "This is another picture. Your picks carry over once the node looks at it or the workflow runs.";
+const otherPictureNote = (face) => (widgetByName(face.node, "new_picture")?.value === "start over" ? OTHER_PICTURE : PICKS_CARRY);
 
 function dropPicture(face) {
   dropPending(face);
@@ -1596,7 +1604,7 @@ function syncSource(face) {
     });
     readItems(face);
     face.itemNotes = null;
-    if (face.other) setNote(face, OTHER_PICTURE, { life: 6000 });
+    if (face.other) setNote(face, otherPictureNote(face), { life: 6000 });
     resolve(face);
     syncState(face);
     draw(face);
@@ -1642,6 +1650,7 @@ function syncState(face) {
 
 function setNote(face, text, { life = 0 } = {}) {
   clearTimeout(face.noteTimer);
+  face.stopNote = false;
   face.noteEl.textContent = text;
   face.noteEl.classList.toggle("on", Boolean(text));
   if (text && life) face.noteTimer = setTimeout(() => setNote(face, ""), life);
@@ -1700,7 +1709,15 @@ function adopt(face, entry) {
 
 function show(face, entry, note, answered, { restored = false, own = false, interim = false, areas = null } = {}) {
   const before = face.pic;
+  // A run that stopped left its message up. A result since says it is over.
+  if (face.stopNote && !interim && !restored) setNote(face, "");
   adopt(face, entry);
+  // Picks made on another picture that the node moved onto this one (New
+  // picture: keep picks) come back moved. They are taken only while the
+  // widget still holds the picks they were moved from: anything picked
+  // since stays.
+  const moved = movedTouches(note, face.touches?.value);
+  if (moved !== null) writeTouches(face, moved);
   readItems(face);
   let items = face.items;
   let mine = Boolean(answered) && note.stamp === face.stamp;
@@ -1781,7 +1798,7 @@ function show(face, entry, note, answered, { restored = false, own = false, inte
     readItems(face);
     face.itemNotes = notes;
   }
-  if (face.other) setNote(face, OTHER_PICTURE, { life: 6000 });
+  if (face.other) setNote(face, otherPictureNote(face), { life: 6000 });
   if (face.shownPieces !== entry.piecesTag) {
     face.shownPieces = entry.piecesTag;
     face.hover = -1;
@@ -2877,9 +2894,9 @@ export function mountTouchStage(node, host) {
   };
   readProperties(face);
 
+  const showPicture = () => { if (!face.inFlight) { face.retries = 0; if (face.pic) face.pic.paused = false; requestRun(face, "scope"); } };
   face.start = button("ausboss-touch-start", "Show picture",
-    "Runs only this node, so the picture shows here and its pieces light up under the pointer.",
-    () => { if (!face.inFlight) { face.retries = 0; if (face.pic) face.pic.paused = false; requestRun(face, "scope"); } }, signal);
+    "Runs only this node, so the picture shows here and its pieces light up under the pointer.", showPicture, signal);
   wake.append(face.start, hint);
 
   // Tools: what a press does, the brush, undo and clear; on the right, how
@@ -2976,7 +2993,13 @@ export function mountTouchStage(node, host) {
     if (event.shiftKey) face.setView(face.view === "cut" ? "mask" : face.view === "mask" ? "cut" : face.result === "cut" ? "mask" : "cut");
     else face.setView(face.view === "tint" ? face.result : "tint");
   }, { signal });
-  tools.append(face.toolSwitch.root, face.sizeField, face.softField, el("div", "ausboss-touch-gap"), face.undo, face.clear, face.eye);
+  // The picture coming in changed (an edit made upstream): this shows the
+  // new one, the same way Show picture does.
+  face.reload = button("ausboss-touch-btn reload", "",
+    "Reload the picture: runs only this node, so a picture that changed upstream shows here.", showPicture, signal);
+  face.reload.innerHTML = RELOAD_ICON;
+  face.reload.setAttribute("aria-label", "Reload the picture");
+  tools.append(face.toolSwitch.root, face.sizeField, face.softField, el("div", "ausboss-touch-gap"), face.reload, face.undo, face.clear, face.eye);
   newButton.addEventListener("click", (event) => {
     event.preventDefault();
     event.stopPropagation();
@@ -3074,6 +3097,8 @@ export function mountTouchStage(node, host) {
   face.stopped = (message) => {
     settle(face);
     setNote(face, String(message ?? ""));
+    // It stays up until something else is said or the next result comes in.
+    face.stopNote = true;
   };
   // A setting on the node changed: the edge follows it.
   face.settingsChanged = () => {

js/shared/widget_card.mjs

@@ -30,17 +30,18 @@
 // Pure decisions (which rows show, how tall the card is, how a number
 // scrubs, where a socket sits) live in widget_card_math.mjs for node:test;
 // this file is the DOM.
-import { BRAND, chainCallback, keepDomWidgetWidthAuto, notifyAusbossChange } from "./index.mjs";
+import { chainCallback, keepDomWidgetWidthAuto, notifyAusbossChange } from "./index.mjs";
 import { keepKeyInField } from "./canvas_passthrough.mjs";
 import { createMediaPicker } from "./media_picker.mjs";
 import { ensureNodeMinHeight, fillNodeHeight, holdNodeMinWidth, nodeHeightAfterCardChange, pinVuePanelHeight } from "./panel_layout.mjs";
 import { makeScrubInput, quantizeScrubValue, stepDecimals } from "./scrub_input.mjs";
+import { CONTROL_HEIGHT, FONT_UI, RADIUS_CARD, RADIUS_CONTROL, RADIUS_XS, SELECT_CHEVRON, THEME as T } from "./theme.mjs";
 import { limitsLabel, narrowedRange } from "./wired_limits.mjs";
 import { hideWidget } from "./widget_visibility.mjs";
 import {
   CARD_PADDING, GROUP_HEIGHT, ROW_GAP, ROW_HEIGHT, SECTION_HEIGHT, SLOT_OFFSET, UNIT_SLOT_WIDTH,
   cardChangeRestore, cardHeight, choiceLabel, commitWidgetValue, comboValues, rowHeight, rowInLook, rowKind, rowMuted, rowTops, scrubSteps, socketWidgetY, visibleRows,
-  widgetTooltip,
+  liftSocket, widgetTooltip,
 } from "./widget_card_math.mjs";
 
 export * from "./widget_card_math.mjs";
@@ -55,7 +56,7 @@ const WRAPPER_INSET = 16;
 // widget's layout y (DomWidgets: margin 10 per side).
 const WRAPPER_TOP = 10;
 
-const FONT = `-apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif`;
+const FONT = FONT_UI;
 // A boolean pill's state labels must fit half a control; longer text is a
 // tooltip, and the pill says on / off.
 const SWITCH_LABEL_MAX = 16;
@@ -78,76 +79,80 @@ export function ensureCardCss() {
   const style = document.createElement("style");
   style.id = CSS_ID;
   style.textContent = `
-.ausboss-card{position:relative;box-sizing:border-box;width:100%;height:100%;display:flex;flex-direction:column;gap:${ROW_GAP}px;padding:${CARD_PADDING}px 8px;overflow:hidden;border:1px solid rgba(0,180,170,.22);border-radius:8px;background:rgba(0,0,0,.28);font:12px/1.3 ${FONT};color:#c8dddd;pointer-events:none}
+.ausboss-card{position:relative;box-sizing:border-box;width:100%;height:100%;display:flex;flex-direction:column;gap:${ROW_GAP}px;padding:${CARD_PADDING}px 8px;overflow:hidden;border:1px solid transparent;border-radius:${RADIUS_CARD}px;background:${T.card};font:12px/1.3 ${FONT};color:${T.inkSoft};pointer-events:none}
 .ausboss-card-row{display:grid;grid-template-columns:minmax(56px,30%) 1fr;align-items:center;gap:8px;height:${ROW_HEIGHT}px;flex:none;pointer-events:auto}
 .ausboss-card-row.hidden{display:none}
 .ausboss-card-row.linked{opacity:.5}
 .ausboss-card-row.linked .ausboss-card-control{pointer-events:none}
 .ausboss-card-row.muted .ausboss-card-control{opacity:.35;pointer-events:none}
-.ausboss-card-row.muted .ausboss-card-label{color:#566b69}
-.ausboss-card-range{margin-left:6px;color:#5f7674;font-size:10px;font-weight:600;letter-spacing:.02em;white-space:nowrap}
+.ausboss-card-row.muted .ausboss-card-label{color:${T.faint}}
+.ausboss-card-range{margin-left:6px;color:${T.faint};font-size:10px;font-weight:600;letter-spacing:.02em;white-space:nowrap}
 .ausboss-card.has-corner .ausboss-card-control{margin-right:var(--ausboss-card-corner,0px)}
 .ausboss-card-corner{position:absolute;top:${CARD_PADDING}px;right:8px;height:${ROW_HEIGHT}px;display:flex;align-items:center;justify-content:flex-end;gap:5px;pointer-events:auto}
-.ausboss-card-gear{width:24px;height:24px;flex:none;display:grid;place-items:center;padding:0;border:1px solid #2a3437;border-radius:6px;background:#0f1516;color:#8ba3a1;cursor:pointer}
-.ausboss-card-gear:hover{border-color:${BRAND};color:${BRAND}}
-.ausboss-card-chip{height:20px;flex:none;padding:0 8px;border:1px solid rgba(0,180,170,.5);border-radius:10px;background:rgba(0,180,170,.14);color:${BRAND};font:600 10px/1 ${FONT};letter-spacing:.02em;white-space:nowrap;cursor:pointer}
-.ausboss-card-chip:hover{background:rgba(0,180,170,.24);color:#fff}
+.ausboss-card-gear{width:24px;height:24px;flex:none;display:grid;place-items:center;padding:0;border:1px solid transparent;border-radius:${RADIUS_CONTROL}px;background:${T.fill};color:${T.label};cursor:pointer}
+.ausboss-card-gear:hover{background:${T.fillHover};color:${T.inkHover}}
+.ausboss-card-chip{height:20px;flex:none;padding:0 9px;border:none;border-radius:999px;background:${T.brandSoft};color:${T.brandInk};font:600 10px/1 ${FONT};letter-spacing:.02em;font-variant-numeric:tabular-nums;white-space:nowrap;cursor:pointer}
+.ausboss-card-chip:hover{background:${T.brandSoftHover};color:${T.inkHover}}
 .ausboss-card-chip[hidden]{display:none}
 .ausboss-card-row.area{display:block}
 .ausboss-card-row.panel{display:block}
 .ausboss-card-row.area.grow{flex:1 1 auto;height:auto}
-.ausboss-card-label{overflow:hidden;white-space:nowrap;text-overflow:ellipsis;color:#8ba3a1;font-size:11px;user-select:none}
+.ausboss-card-label{overflow:hidden;white-space:nowrap;text-overflow:ellipsis;color:${T.label};font-size:11px;user-select:none}
 .ausboss-card-control{display:flex;align-items:center;gap:6px;min-width:0;height:100%}
 .ausboss-card-field{display:flex;align-items:center;gap:6px;flex:1 1 0;min-width:0;height:100%}
 .ausboss-card-field.linked{opacity:.5;pointer-events:none}
+.ausboss-card .ausboss-scrub{height:${CONTROL_HEIGHT}px}
 .ausboss-card-field>.ausboss-scrub{flex:1 1 0;width:auto;min-width:0}
 .ausboss-card-field>.ausboss-scrub .ausboss-scrub-input{width:100%}
-.ausboss-card-sep{flex:none;color:#5f7674;font-size:11px}
-.ausboss-card-suffix{flex:none;color:#5f7674;font-size:10px;letter-spacing:.06em;text-transform:uppercase;user-select:none}
-.ausboss-card-section{height:${SECTION_HEIGHT}px;flex:none;display:flex;align-items:flex-end;color:#5f7674;font-size:9.5px;letter-spacing:.12em;text-transform:uppercase;user-select:none}
+.ausboss-card-sep{flex:none;color:${T.faint};font-size:11px}
+.ausboss-card-suffix{flex:none;color:${T.faint};font:600 10px ${FONT};letter-spacing:.1em;text-transform:uppercase;user-select:none}
+.ausboss-card-section{height:${SECTION_HEIGHT}px;flex:none;display:flex;align-items:flex-end;gap:8px;color:${T.faint};font:600 10px/1 ${FONT};letter-spacing:.1em;text-transform:uppercase;user-select:none}
+.ausboss-card-section::after{content:"";flex:1;height:1px;margin-bottom:4px;background:${T.rule}}
 .ausboss-card-section.hidden{display:none}
-.ausboss-card-group{height:${GROUP_HEIGHT}px;flex:none;display:flex;align-items:center;gap:6px;padding:0 4px;border:1px solid transparent;border-radius:6px;background:transparent;color:#78908e;font:600 10.5px/1 ${FONT};letter-spacing:.06em;text-transform:uppercase;cursor:pointer;text-align:left;pointer-events:auto}
-.ausboss-card-group:hover{color:#fff;border-color:#2a3437}
+.ausboss-card-group{height:${GROUP_HEIGHT}px;flex:none;display:flex;align-items:center;gap:6px;padding:0 4px;border:1px solid transparent;border-radius:${RADIUS_CONTROL}px;background:transparent;color:${T.faint};font:600 10px/1 ${FONT};letter-spacing:.1em;text-transform:uppercase;cursor:pointer;text-align:left;pointer-events:auto}
+.ausboss-card-group:hover{color:${T.inkHover}}
 .ausboss-card-group .glyph{display:inline-block;width:10px;transition:transform .12s}
 .ausboss-card-group.open .glyph{transform:rotate(90deg)}
-.ausboss-card-seg{display:grid;grid-auto-flow:column;grid-auto-columns:1fr;width:100%;height:${ROW_HEIGHT}px;padding:2px;box-sizing:border-box;border:1px solid #2a3437;border-radius:6px;background:#0f1516}
-.ausboss-card-seg button{min-width:0;border:none;border-radius:4px;padding:0 2px;background:transparent;color:#8ba3a1;font:600 10.5px/1 ${FONT};cursor:pointer;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
-.ausboss-card-seg button:hover{color:#fff}
-.ausboss-card-seg button.on{background:${BRAND};color:#04201d}
-.ausboss-card-select{width:100%;height:${ROW_HEIGHT}px;padding:0 24px 0 8px;box-sizing:border-box;border:1px solid #2a3437;border-radius:6px;background:#0b0f10 url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='10' height='6' viewBox='0 0 10 6'%3E%3Cpath d='M1 1l4 4 4-4' fill='none' stroke='%238ba3a1' stroke-width='1.5'/%3E%3C/svg%3E") no-repeat right 8px center;color:#d8ecea;font:600 11.5px ${FONT};appearance:none;-webkit-appearance:none;cursor:pointer;overflow:hidden;text-overflow:ellipsis}
-.ausboss-card-select:hover{border-color:${BRAND}}
-.ausboss-card-select:focus-visible{outline:2px solid ${BRAND};outline-offset:1px}
-.ausboss-card-text{width:100%;height:${ROW_HEIGHT}px;padding:0 8px;box-sizing:border-box;border:1px solid #2a3437;border-radius:6px;background:#0b0f10;color:#d8ecea;font:12px ${FONT};min-width:0}
-.ausboss-card-text:focus{outline:none;border-color:${BRAND}}
-.ausboss-card-text::placeholder{color:#4f6462}
-.ausboss-card-area{display:block;width:100%;height:100%;padding:5px 8px;box-sizing:border-box;border:1px solid #2a3437;border-radius:6px;background:#0b0f10;color:#d8ecea;font:12px/1.4 ${FONT};resize:none;overflow:auto;min-width:0}
-.ausboss-card-area:focus{outline:none;border-color:${BRAND}}
-.ausboss-card-area::placeholder{color:#4f6462}
-.ausboss-card.look-big .ausboss-card-row.area .ausboss-card-field{position:relative;display:block;border:1px solid #2a3437;border-radius:6px;background:#0b0f10;cursor:text}
-.ausboss-card.look-big .ausboss-card-row.area .ausboss-card-field:focus-within{border-color:${BRAND}}
-.ausboss-card.look-big .ausboss-card-area{position:absolute;left:0;right:0;top:0;bottom:0;margin:auto 0;max-height:100%;padding:${BIG_PAD_Y}px ${BIG_PAD_X}px;border:none;border-radius:5px;background:transparent;color:#6fe0d6;text-shadow:0 0 .35em rgba(0,180,170,.55);font:600 ${BIG_FONT}px/${BIG_LINE}px ${FONT};text-align:center;scrollbar-width:thin;scrollbar-color:#2f3d3c transparent}
-.ausboss-card.look-big .ausboss-card-area::placeholder{color:#4f6462;text-shadow:none}
+.ausboss-card-seg{display:grid;grid-auto-flow:column;grid-auto-columns:1fr;width:100%;height:${ROW_HEIGHT}px;padding:2px;box-sizing:border-box;border:1px solid transparent;border-radius:${RADIUS_CONTROL}px;background:${T.fill}}
+.ausboss-card-seg button{min-width:0;border:none;border-radius:${RADIUS_XS}px;padding:0 2px;background:transparent;color:${T.label};font:600 11px/1 ${FONT};cursor:pointer;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
+.ausboss-card-seg button:hover{color:${T.inkHover}}
+.ausboss-card-seg button.on{background:${T.brand};color:${T.onBrand}}
+.ausboss-card-bool button.on:first-child{background:${T.switchOff};color:${T.ink}}
+.ausboss-card-select{width:100%;height:${ROW_HEIGHT}px;padding:0 24px 0 8px;box-sizing:border-box;border:1px solid transparent;border-radius:${RADIUS_CONTROL}px;background:${T.fill} ${SELECT_CHEVRON} no-repeat right 9px center;color:${T.ink};font:500 12px ${FONT};appearance:none;-webkit-appearance:none;cursor:pointer;overflow:hidden;text-overflow:ellipsis}
+.ausboss-card-select:hover{background-color:${T.fillHover}}
+.ausboss-card-select:focus-visible{outline:2px solid ${T.brand};outline-offset:1px}
+.ausboss-card-text{width:100%;height:${ROW_HEIGHT}px;padding:0 8px;box-sizing:border-box;border:1px solid transparent;border-radius:${RADIUS_CONTROL}px;background:${T.fill};color:${T.ink};font:12px ${FONT};min-width:0}
+.ausboss-card-text:focus{outline:none;border-color:${T.brand}}
+.ausboss-card-text::placeholder{color:${T.faint}}
+.ausboss-card-area{display:block;width:100%;height:100%;padding:5px 8px;box-sizing:border-box;border:1px solid transparent;border-radius:${RADIUS_CONTROL}px;background:${T.fill};color:${T.ink};font:12px/1.4 ${FONT};resize:none;overflow:auto;min-width:0}
+.ausboss-card-area:focus{outline:none;border-color:${T.brand}}
+.ausboss-card-area::placeholder{color:${T.faint}}
+.ausboss-card.look-big .ausboss-card-row.area .ausboss-card-field{position:relative;display:block;border:1px solid transparent;border-radius:${RADIUS_CONTROL}px;background:${T.fill};cursor:text}
+.ausboss-card.look-big .ausboss-card-row.area .ausboss-card-field:focus-within{border-color:${T.brand}}
+.ausboss-card.look-big .ausboss-card-area{position:absolute;left:0;right:0;top:0;bottom:0;margin:auto 0;max-height:100%;padding:${BIG_PAD_Y}px ${BIG_PAD_X}px;border:none;border-radius:5px;background:transparent;color:${T.brandGlow};text-shadow:0 0 .35em rgba(0,180,170,.55);font:600 ${BIG_FONT}px/${BIG_LINE}px ${FONT};text-align:center;scrollbar-width:thin;scrollbar-color:${T.fillHover} transparent}
+.ausboss-card.look-big .ausboss-card-area::placeholder{color:${T.faint};text-shadow:none}
 .ausboss-card.look-big .ausboss-card-row:not(.area){display:block}
 .ausboss-card.look-big .ausboss-card-row:not(.area) .ausboss-card-label{display:none}
 .ausboss-card.look-big .ausboss-card-row:not(.area) .ausboss-card-control{margin:0}
-.ausboss-card.look-big .ausboss-card-field>.ausboss-scrub{height:100%;justify-content:center;align-items:center;gap:4px;border-color:#2a3437;border-radius:6px;background:#0b0f10}
-.ausboss-card.look-big .ausboss-card-field>.ausboss-scrub:focus-within{border-color:${BRAND}}
-.ausboss-card.look-big .ausboss-card-field>.ausboss-scrub>.ausboss-scrub-input{order:1;flex:0 0 auto;width:auto;min-width:2ch;max-width:60%;field-sizing:content;color:#6fe0d6;text-shadow:0 0 .35em rgba(0,180,170,.55);font:600 ${BIG_NUMBER_FONT}px ${FONT}}
+.ausboss-card.look-big .ausboss-card-field>.ausboss-scrub{height:100%;justify-content:center;align-items:center;gap:4px;border-color:transparent;border-radius:${RADIUS_CONTROL}px;background:${T.fill}}
+.ausboss-card.look-big .ausboss-card-field>.ausboss-scrub:focus-within{border-color:${T.brand}}
+.ausboss-card.look-big .ausboss-card-field>.ausboss-scrub>.ausboss-scrub-input{order:1;flex:0 0 auto;width:auto;min-width:2ch;max-width:60%;field-sizing:content;color:${T.brandGlow};text-shadow:0 0 .35em rgba(0,180,170,.55);font:600 ${BIG_NUMBER_FONT}px ${FONT}}
 .ausboss-card.look-big .ausboss-card-field>.ausboss-scrub>.ausboss-scrub-unit{order:2}
 .ausboss-card.look-big .ausboss-card-field>.ausboss-scrub>.ausboss-scrub-unit:empty{display:none}
 .ausboss-card.look-big .ausboss-card-field>.ausboss-scrub>.ausboss-scrub-step{display:contents}
-.ausboss-card.look-big .ausboss-card-field>.ausboss-scrub>.ausboss-scrub-step>button{flex:none;width:30px;height:30px;border-radius:15px;color:#6f8886}
+.ausboss-card.look-big .ausboss-card-field>.ausboss-scrub>.ausboss-scrub-step>button{flex:none;width:30px;height:30px;border-radius:15px;color:${T.label}}
 .ausboss-card.look-big .ausboss-card-field>.ausboss-scrub>.ausboss-scrub-step>button:first-child{order:3}
 .ausboss-card.look-big .ausboss-card-field>.ausboss-scrub>.ausboss-scrub-step>button:last-child{order:0}
 .ausboss-card.look-big .ausboss-card-field>.ausboss-scrub>.ausboss-scrub-step>button>svg{transform:rotate(90deg) scale(1.6)}
 .ausboss-card.look-big .ausboss-card-corner{top:${CARD_PADDING + 4}px;right:12px;height:22px}
 .ausboss-card.look-big .ausboss-card-gear{width:22px;height:22px;border-color:transparent;background:transparent}
-.ausboss-card.look-big .ausboss-card-gear:hover{border-color:${BRAND}}
-.ausboss-card-swatch{flex:none;width:${ROW_HEIGHT}px;height:${ROW_HEIGHT}px;padding:0;border:1px solid #2a3437;border-radius:6px;background:#0b0f10;cursor:pointer}
+.ausboss-card.look-big .ausboss-card-gear:hover{background:${T.fillHover}}
+.ausboss-card-swatch{flex:none;width:${ROW_HEIGHT}px;height:${ROW_HEIGHT}px;padding:0;border:1px solid transparent;border-radius:${RADIUS_CONTROL}px;background:${T.fill};cursor:pointer}
 .ausboss-card-swatch::-webkit-color-swatch-wrapper{padding:3px}
 .ausboss-card-swatch::-webkit-color-swatch{border:none;border-radius:3px}
-.ausboss-card-btn{flex:none;height:${ROW_HEIGHT}px;padding:0 10px;border:1px solid #2a3437;border-radius:6px;background:#16201f;color:#d8ecea;font:600 11px/1 ${FONT};cursor:pointer;white-space:nowrap}
-.ausboss-card-btn:hover{border-color:${BRAND};color:#fff}
+.ausboss-card-btn{flex:none;height:${ROW_HEIGHT}px;padding:0 10px;border:1px solid transparent;border-radius:${RADIUS_CONTROL}px;background:${T.fill};color:${T.inkSoft};font:600 11px/1 ${FONT};cursor:pointer;white-space:nowrap}
+.ausboss-card-btn:hover{background:${T.fillHover};color:${T.inkHover}}
+.ausboss-card-btn:focus-visible{outline:2px solid ${T.brand};outline-offset:1px}
 `;
   document.head.append(style);
 }
@@ -169,17 +174,6 @@ function widgetSlot(node, name) {
   return node.inputs?.find((input) => input?.widget?.name === name || input?.name === name) ?? null;
 }
 
-// A `top: true` row's widgets keep their input slots but the slots stop
-// being widget inputs: the frontend then measures and draws them in the
-// node's slot column, and a link into one is resolved by input name.
-export function liftSocket(node, name) {
-  const slot = node.inputs?.find((input) => input?.widget?.name === name);
-  if (!slot) return false;
-  delete slot.widget;
-  slot._widget = undefined;
-  return true;
-}
-
 function widgetLinked(node, name) {
   const slot = widgetSlot(node, name);
   return Boolean(slot && slot.link !== null && slot.link !== undefined);

js/shared/widget_card_math.mjs

@@ -218,3 +218,23 @@ export function widgetTooltip(node, name, widget = null) {
   const text = Array.isArray(spec) ? spec[1]?.tooltip : undefined;
   return typeof text === "string" ? text : "";
 }
+
+// A `top: true` row's widgets keep their input slots but the slots stop
+// being widget inputs: the frontend then measures and draws them in the
+// node's slot column, and a link into one is resolved by input name.
+// Newer frontends also stamp a widget's socket with the position of its
+// row (`slot.pos`) and keep honouring it once the widget is gone, so every
+// lifted socket would sit on the first slot's row. The stamp goes too.
+export function liftSocket(node, name) {
+  const slot = node.inputs?.find((input) => input?.widget?.name === name);
+  if (!slot) return false;
+  liftSlot(slot);
+  return true;
+}
+
+// The same lift for a slot already in hand (a loop over `node.inputs`).
+export function liftSlot(slot) {
+  delete slot.widget;
+  slot._widget = undefined;
+  delete slot.pos;
+}

js/shared/workflow_note.mjs

@@ -166,6 +166,14 @@ export function noteIsEmpty(note) {
   );
 }
 
+// A note shows its tile face when it is in tile layout and has anything to
+// show. The node is then just a button: the note itself opens in a dialog,
+// so there is no card inside the node whose height needs fitting.
+export function noteShowsTileFace(note) {
+  if (!note || typeof note !== "object") return false;
+  return note.layout === "tile" && !noteIsEmpty(note);
+}
+
 // "ComfyUI/models/loras" - the folder hint under each group of rows.
 export function folderPath(dir) {
   if (!dir) return "ComfyUI/models";

js/shared/workflow_switches.mjs

@@ -62,7 +62,8 @@ const CHOICES = {
 };
 
 export function cleanTitle(title) {
-  return String(title ?? "").replace(/\s+/g, " ").trim().slice(0, TITLE_MAX);
+  const text = ["string", "number", "boolean"].includes(typeof title) ? String(title) : "";
+  return text.replace(/\s+/g, " ").trim().slice(0, TITLE_MAX);
 }
 
 // Node and group ids as a workflow file stores them: numbers, or text for a
@@ -135,7 +136,7 @@ export function normalizeSwitches(raw) {
   const used = new Set();
   for (const item of Array.isArray(raw) ? raw : []) {
     if (!item || typeof item !== "object") continue;
-    let id = Number(item.id);
+    let id = typeof item.id === "number" || typeof item.id === "string" ? Number(item.id) : NaN;
     if (!Number.isInteger(id) || id < 1 || used.has(id)) {
       id = 1;
       while (used.has(id)) id += 1;
@@ -357,7 +358,7 @@ export function stackRows(value) {
   } catch {
     return null;
   }
-  if (!Array.isArray(rows) || !rows.length) return null;
+  if (!Array.isArray(rows)) return null;
   const isRow = (row) => row && typeof row === "object" && typeof row.name === "string" && typeof row.enabled === "boolean";
   return rows.every(isRow) ? rows : null;
 }
@@ -484,7 +485,12 @@ export function choicePairs(entry, switches) {
   for (const other of switches ?? []) {
     if (other === entry || !other.choice) continue;
     for (const pair of valuePairs({ on: entry.on, off: other.on })) {
-      if (!found.has(pairKey(pair))) found.set(pairKey(pair), { ...pair, choice: true });
+      const previous = found.get(pairKey(pair));
+      if (!previous) found.set(pairKey(pair), { ...pair, choice: true });
+      else if (pair.row !== undefined) {
+        previous.on = { ...previous.on, ...pair.on };
+        previous.off = { ...pair.off, ...previous.off };
+      }
     }
   }
   return [...found.values()];
@@ -539,8 +545,9 @@ export function stackRowOwners(boards, nodeId, widget, rowName) {
   const owners = [];
   if (!rowName) return owners;
   for (const { node, settings } of boards ?? []) {
-    for (const entry of normalizeSettings(settings).switches) {
-      const moves = valuePairs(entry).some(
+    const { switches } = normalizeSettings(settings);
+    for (const entry of switches) {
+      const moves = (entry.choice ? choicePairs(entry, switches) : valuePairs(entry)).some(
         (pair) => pair.row !== undefined && String(pair.node) === String(nodeId) && pair.widget === widget && sameFile(pair.row, rowName),
       );
       if (moves) owners.push({ node, id: entry.id, title: entry.title });
@@ -555,8 +562,9 @@ export function stackGroupOwners(boards, nodeId, widget, group) {
   const owners = [];
   if (!group) return owners;
   for (const { node, settings } of boards ?? []) {
-    for (const entry of normalizeSettings(settings).switches) {
-      const moves = valuePairs(entry).some(
+    const { switches } = normalizeSettings(settings);
+    for (const entry of switches) {
+      const moves = (entry.choice ? choicePairs(entry, switches) : valuePairs(entry)).some(
         (pair) => pair.group === group && String(pair.node) === String(nodeId) && pair.widget === widget,
       );
       if (moves) owners.push({ node, id: entry.id, title: entry.title });
@@ -642,7 +650,9 @@ export function readGroups(groups, placed, { counts = () => true } = {}) {
       group,
       rect,
       title: String(group.title ?? ""),
-      color: typeof group.color === "string" && group.color ? group.color : null,
+      // Group colors come from a hex picker; a CSS background must never
+      // receive URL functions or references from a saved workflow.
+      color: typeof group.color === "string" && /^#(?:[\da-f]{3,4}|[\da-f]{6}|[\da-f]{8})$/i.test(group.color.trim()) ? group.color.trim() : null,
       members,
       ...partState(members, counts),
     };
@@ -668,6 +678,7 @@ export function readSwitches(switches, placed, groupRows, { counts = () => true
     if (id !== undefined && id !== null && !groupById.has(String(id))) groupById.set(String(id), row);
   }
   return (switches ?? []).map((entry) => {
+    const sides = new Set([...Object.keys(entry.on ?? {}), ...Object.keys(entry.off ?? {})]);
     const members = [];
     const offMembers = [];
     const seen = new Set();
@@ -675,6 +686,7 @@ export function readSwitches(switches, placed, groupRows, { counts = () => true
     let gone = 0;
     const takeNodes = (ids, into) => {
       for (const id of ids ?? []) {
+        if (sides.has(String(id))) continue;
         const hit = nodeById.get(String(id));
         if (!hit) {
           gone += 1;
@@ -695,7 +707,7 @@ export function readSwitches(switches, placed, groupRows, { counts = () => true
         }
         rects.push(row.rect);
         for (const node of row.members) {
-          if (seen.has(node)) continue;
+          if (seen.has(node) || sides.has(String(node.id))) continue;
           seen.add(node);
           into.push(node);
         }
@@ -708,7 +720,6 @@ export function readSwitches(switches, placed, groupRows, { counts = () => true
     // The nodes whose settings it changes: listed, framed and selected with
     // the rest, but never turned off by it.
     const valueNodes = [];
-    const sides = new Set([...Object.keys(entry.on ?? {}), ...Object.keys(entry.off ?? {})]);
     for (const id of sides) {
       const hit = nodeById.get(id);
       if (!hit) {

js/snap_lines/index.js

@@ -37,7 +37,8 @@ const OVERHANG_PX = 6;
 const state = {
   enabled: true,
   before: null, // Map item -> { pos, size, rect } taken when the button went down
-  corner: null, // the corner a classic resize pulls, such as "SE"
+  corner: null, // the corner a resize pulls, such as "SE"
+  resizingNode: null, // the node whose Vue corner handle took the press
   drag: null, // the running move, or { idle: true } for a gesture left alone
   guides: [],
   frame: 0,
@@ -199,8 +200,8 @@ function stepMove(canvas, drag, event) {
   canvas.setDirty?.(true, true);
 }
 
-// Classic look: LiteGraph has just sized the node from its corner, so pull
-// the moving edges onto any line within reach.
+// The frontend has just sized the node from its corner, so pull the moving
+// edges onto any line within reach.
 function stepNodeResize(canvas, node, event) {
   // LiteGraph forgets the corner once the pointer leaves the node, so use the
   // one it had when the button went down.
@@ -238,6 +239,7 @@ function step(event) {
   const canvas = app.canvas;
   if (!state.before || !canvas?.graph || !canvas.canvas || !canvas.ds) return;
   if (canvas.resizing_node) return stepNodeResize(canvas, canvas.resizing_node, event);
+  if (state.resizingNode) return stepNodeResize(canvas, state.resizingNode, event);
   if (canvas.resizingGroup) return stepGroupResize(canvas, canvas.resizingGroup, event);
   if (!state.drag) state.drag = startMove(canvas, event);
   if (state.drag && !state.drag.idle) stepMove(canvas, state.drag, event);
@@ -250,6 +252,20 @@ function onPointerDown(event) {
   if (OTHER_SNAPPERS.some(settingOn)) return;
   if (app.canvas?.graph && app.canvas.canvas && app.canvas.ds) state.before = takeBefore(app.canvas);
   state.corner = cornerOf(app.canvas);
+  if (vueNodes() && state.before) {
+    const handle = event.target?.closest?.("[data-corner]");
+    const id = handle?.closest?.("[data-node-id]")?.dataset?.nodeId;
+    const corner = handle?.dataset?.corner;
+    if (id != null && ["SE", "SW", "NE", "NW"].includes(corner)) {
+      for (const [item, was] of state.before) {
+        if (was.kind === "node" && String(item.id) === id) {
+          state.resizingNode = item;
+          state.corner = corner;
+          break;
+        }
+      }
+    }
+  }
 }
 
 function cornerOf(canvas) {
@@ -259,7 +275,7 @@ function cornerOf(canvas) {
 
 // Behind LiteGraph's own pointerdown, which names the corner a resize pulls.
 function afterPointerDown() {
-  if (state.before) state.corner = cornerOf(app.canvas) ?? state.corner;
+  if (state.before && !state.resizingNode) state.corner = cornerOf(app.canvas) ?? state.corner;
 }
 
 function onPointerMove(event) {
@@ -281,6 +297,7 @@ function onPointerMove(event) {
 function end() {
   state.before = null;
   state.corner = null;
+  state.resizingNode = null;
   state.drag = null;
   state.pending = null;
   setGuides([]);

js/widget_cards/index.js

@@ -14,6 +14,7 @@ import { castChips } from "../shared/h3_cast_chips.mjs";
 import { clipSetsDuration } from "../shared/h3_duration.mjs";
 import { momentStrip } from "../shared/moment_strip.mjs";
 import { mountWidgetCard } from "../shared/widget_card.mjs";
+import { FONT_UI, THEME } from "../shared/theme.mjs";
 import { SOCKETLESS_CHOICE, SOCKETLESS_TEXT, commitWidgetValue, markSocketless, resetUnknownValues } from "../shared/widget_card_math.mjs";
 import { mediaViewQuery } from "../shared/media_list.mjs";
 import { gearIconSvg, openSettingsMenu } from "../shared/settings_menu.mjs";
@@ -59,7 +60,7 @@ function seamCorner(node, card) {
   const note = document.createElement("div");
   note.append("not used", document.createElement("br"), "by blend in");
   note.style.cssText = "position:absolute;top:33px;right:2px;text-align:right;white-space:nowrap;"
-    + "color:#6f8886;font:9px/11px -apple-system,BlinkMacSystemFont,'Segoe UI',sans-serif;"
+    + `color:${THEME.faint};font:9px/11px ${FONT_UI};`
     + "pointer-events:none";
   tools.append(chip, gear, note);
   return {
@@ -242,6 +243,8 @@ const CARDS = {
       { widget: "fill_holes", label: "Fill small holes", group: "advanced" },
       { widget: "invert", label: "Invert", group: "advanced" },
       { widget: "if_nothing", label: "If nothing", kind: "segment", group: "advanced" },
+      // What a different picture coming in does to the picks.
+      { widget: "new_picture", label: "New picture", kind: "segment", group: "advanced" },
       { widget: "free_vram", label: "Free VRAM", group: "advanced" },
     ],
   },
@@ -416,7 +419,7 @@ const CARDS = {
     ],
   },
   AUSBOSS_NODES_SaveVideo: {
-    // step_preview is the STEPS button on the player (js/save_video).
+    // step_preview is the Preview steps switch on the player (js/save_video).
     minWidth: 320, first: true, hide: ["step_preview"],
     rows: [
       { widget: "filename_prefix", label: "Prefix", placeholder: "video" },

js/workflow_note/index.js

@@ -21,6 +21,7 @@ import { copyToClipboard } from "../shared/clipboard.mjs";
 import { confirmDiscard } from "../shared/discard_prompt.mjs";
 import { WIDGET_FRAME, fillNodeHeight, holdNodeMinHeight } from "../shared/panel_layout.mjs";
 import { hideInputsInDef, hideWidget } from "../shared/widget_visibility.mjs";
+import { suppressCoreImagePreview } from "../shared/core_preview.mjs";
 import {
   COMMON_FOLDERS,
   INPUT_FOLDER,
@@ -34,6 +35,7 @@ import {
   matchInstalled,
   noteFit,
   noteIsEmpty,
+  noteShowsTileFace,
   normalizeNote,
   packsFromGraph,
   parseMarkdown,
@@ -708,13 +710,13 @@ function naturalHeight(state, width) {
 // as the node's floor. It never shrinks the node: a taller note keeps its
 // empty space until someone drags it shorter.
 function fitNote(state) {
-  // A tile opens its content in a dialog. Keep its chosen canvas size,
-  // rather than growing it to a full note's measured height.
-  if (state.note.layout === "tile") {
+  if (!classicCanvas()) return;
+  // A tile face is a button, not a card: fitting it would measure the note
+  // behind the button and grow a new tile straight back to full height.
+  if (noteShowsTileFace(state.note)) {
     state.fitHeight = undefined;
     return;
   }
-  if (!classicCanvas()) return;
   const { node, root, domWidget } = state;
   const width = node.size[0] - WIDGET_FRAME;
   if (!(width > 0)) return;
@@ -1119,6 +1121,11 @@ function buildPanel(node) {
   const widget = node.widgets?.find((item) => item.name === "note");
   if (!widget) return null;
   hideWidget(widget);
+  // A note never has output images of its own. The frontend files previews
+  // by node id, so one left over from another node can still land here, and
+  // in the classic canvas its widget asks for the picture's full height:
+  // the node grows to hold it and a tile stops starting as a tile.
+  suppressCoreImagePreview(node);
 
   const root = el("div", "ausboss-note");
   const card = el("div", "ausboss-note-card");

js/workflow_switches/index.js

@@ -604,7 +604,7 @@ function newSwitch(state) {
 // has choices the nodes they hold, so the next one takes no selecting.
 function choiceSnapshots(state, nodes) {
   const graph = state.node.graph;
-  const held = choiceNodeIds(settingsOf(state.node)).map((id) => graph?.getNodeById?.(Number(id))).filter(Boolean);
+  const held = choiceNodeIds(settingsOf(state.node)).map((id) => graph?.getNodeById?.(id)).filter(Boolean);
   return [...new Set([...nodes, ...held])]
     .map((node) => ({ id: node.id, values: snapshotNode(node) }))
     .filter((item) => Object.keys(item.values).length);
@@ -1156,7 +1156,7 @@ function refresh(state) {
   // The selection only shows in the edit view (the + Switch bar).
   const pick = edit ? picked(state) : { nodes: [], groups: [], count: 0 };
   const signature = [
-    rowsSignature(rows, settings, rowKey), groups.length, edit, settingsOpen(node), pick.count,
+    rowsSignature(rows, settings, rowKey), groups.length, edit, settingsOpen(node), pick.count, pick.nodes.length,
   ].join("|");
   if (signature === state.signature) return;
   state.signature = signature;
@@ -1166,7 +1166,7 @@ function refresh(state) {
 // Called on every canvas redraw: read the graph again at most every
 // RECHECK_MS, and always once after the last redraw.
 function scheduleCheck(state) {
-  if (state.disposed || state.timer !== null) return;
+  if (state.disposed || !state.node.graph || state.timer !== null) return;
   const shown = app.canvas?.getCurrentGraph?.() ?? app.canvas?.graph;
   if (state.node.graph && shown && state.node.graph !== shown) return;
   const wait = Math.max(0, state.checkedAt + RECHECK_MS - performance.now());
@@ -1254,7 +1254,6 @@ function buildPanel(node) {
   trimNodeBottom(node);
   state.widget = widget;
 
-  live.add(state);
   ensureRedrawHook();
   return state;
 }

nodes/_color_helpers.py

@@ -208,7 +208,7 @@ def _weighted_mean_cov(
 def _matrix_sqrt(matrix: torch.Tensor, inverse: bool = False) -> torch.Tensor:
     """Symmetric PSD square root (or inverse square root) via eigh."""
     values, vectors = torch.linalg.eigh(matrix.double())
-    values = values.clamp_min(1e-10)
+    values = values.clamp_min(1e-10 if inverse else 0.0)
     roots = values.rsqrt() if inverse else values.sqrt()
     return (vectors @ torch.diag(roots) @ vectors.T).to(matrix.dtype)
 
@@ -229,18 +229,36 @@ def _mkl_matched(
         weights = None
         if mask is not None:
             weights = mask[index if mask.shape[0] > 1 else 0].reshape(-1)
-        img_mean, img_cov = _weighted_mean_cov(pixels, weights)
+        img_mean, img_cov = _weighted_mean_cov(
+            pixels.double(), weights.double() if weights is not None else None
+        )
         ref_pixels = reference[index if reference.shape[0] > 1 else 0].reshape(-1, 3)
-        ref_mean, ref_cov = _weighted_mean_cov(ref_pixels, None)
+        ref_mean, ref_cov = _weighted_mean_cov(ref_pixels.double(), None)
+        # Regularize both covariances in the same units. Their product has
+        # squared units, so its square root must not use that absolute floor.
+        regularizer = torch.eye(3, dtype=img_cov.dtype, device=img_cov.device) * 1e-10
+        img_cov = img_cov + regularizer
+        ref_cov = ref_cov + regularizer
         img_root = _matrix_sqrt(img_cov)
         img_root_inv = _matrix_sqrt(img_cov, inverse=True)
-        middle = _matrix_sqrt(img_root @ ref_cov @ img_root)
+        # SVD gives the middle square root without squaring the condition
+        # number of nearly singular covariances in an eigendecomposition.
+        _, singular, right = torch.linalg.svd(_matrix_sqrt(ref_cov) @ img_root)
+        middle = right.T @ torch.diag(singular) @ right
         mapping = img_root_inv @ middle @ img_root_inv
         matched = (pixels - img_mean) @ mapping.T + ref_mean
-        frames.append(matched.reshape(rgb.shape[1], rgb.shape[2], 3))
+        frames.append(matched.to(rgb.dtype).reshape(rgb.shape[1], rgb.shape[2], 3))
     return torch.stack(frames, dim=0).clamp(0.0, 1.0)
 
 
+def _interpolate(values: torch.Tensor, positions: torch.Tensor, samples: torch.Tensor) -> torch.Tensor:
+    """Linear interpolation with constant endpoints, including a singleton."""
+    high = torch.searchsorted(positions, values.contiguous()).clamp_max(positions.numel() - 1)
+    low = (high - 1).clamp_min(0)
+    fraction = ((values - positions[low]) / (positions[high] - positions[low]).clamp_min(1e-20)).clamp(0, 1)
+    return samples[low] + fraction * (samples[high] - samples[low])
+
+
 def _histogram_matched(
     rgb: torch.Tensor, reference: torch.Tensor, mask: torch.Tensor | None
 ) -> torch.Tensor:
@@ -263,18 +281,14 @@ def _histogram_matched(
         for channel in range(3):
             values = frame[..., channel]
             pool = values[selected] if selected is not None else values.reshape(-1)
-            sorted_pool, _ = pool.reshape(-1).sort()
-            sorted_ref, _ = ref[..., channel].reshape(-1).sort()
-            # Rank every pixel against the measured pool, then read the same
-            # quantile off the reference.
-            ranks = torch.searchsorted(sorted_pool, values.reshape(-1).contiguous())
-            ranks = ranks.clamp_max(sorted_pool.numel() - 1)
-            quantiles = ranks.float() / max(1, sorted_pool.numel() - 1)
-            positions = quantiles * (sorted_ref.numel() - 1)
-            low = positions.floor().long()
-            high = positions.ceil().long()
-            fraction = positions - low.float()
-            mapped = sorted_ref[low] * (1.0 - fraction) + sorted_ref[high] * fraction
+            source_values, source_counts = torch.unique(pool, sorted=True, return_counts=True)
+            ref_values, ref_counts = torch.unique(ref[..., channel], sorted=True, return_counts=True)
+            source_quantiles = source_counts.cumsum(0).float() / pool.numel()
+            ref_quantiles = ref_counts.cumsum(0).float() / ref[..., channel].numel()
+            # Equal values share their cumulative probability, independent
+            # of how many pixels were used to represent the distribution.
+            mapping = _interpolate(source_quantiles, ref_quantiles, ref_values)
+            mapped = _interpolate(values.reshape(-1), source_values, mapping)
             channels.append(mapped.reshape(values.shape))
         frames.append(torch.stack(channels, dim=-1))
     return torch.stack(frames, dim=0).clamp(0.0, 1.0)

nodes/_compare_helpers.py

@@ -36,7 +36,7 @@ import torch
 from PIL import Image
 
 from ._brush_helpers import brush_core, brush_sigma, stroke_cover  # noqa: F401 - the brush's numbers are read from here too
-from ._image_save_helpers import next_free_counter, require_output_path, strip_image_extension
+from ._image_save_helpers import IMAGE_SAVE_LOCK, next_free_counter, require_output_path, strip_image_extension
 from ._psd_helpers import PSD_MAX_SIDE, write_psd
 from ._realign_helpers import crop_if_shift, measure, warp_to_source
 
@@ -72,7 +72,6 @@ ALIGN_FAILED = (
     "or have too little detail to measure."
 )
 
-_save_lock = threading.Lock()
 _pairs: OrderedDict[str, tuple[Path, Path, str]] = OrderedDict()
 _pairs_lock = threading.Lock()
 
@@ -361,7 +360,7 @@ def save_mix(*, picture_a, picture_b, output_dir, top="A", strokes=None, layers=
     mixed = mix_pictures(upper, under, gone)
 
     folder = Path(output_dir)
-    with _save_lock:
+    with IMAGE_SAVE_LOCK:
         folder.mkdir(parents=True, exist_ok=True)
         counter = next_free_counter((entry.name for entry in folder.iterdir()), name)
         while True:

nodes/_h3_cast_helpers.py

@@ -102,6 +102,33 @@ ONE_GOES = "the original person"
 APPEARANCE_LINE = re.compile(r'^\s*@([1-4])\s+looks like\s+([^"\n]+?)\s*$', re.I)
 
 
+# Hair and face only, no clothes, expression or background. When the line names clothes that differ from what the
+# person in the clip wears, H3 tends to open on the picture's own backdrop before cutting to the clip.
+DESCRIBE_PERSON = (
+    "Describe only the hair and face of the person in this picture, in one short line for a video prompt: hair colour "
+    "and style, and glasses, a beard or other face details you can see. No clothes, no expression, no background. "
+    "Start with 'a man' or 'a woman'."
+)
+
+
+def add_looks(text, jobs, describe):
+    """A swap's script with an @N looks like line for each new person who has none, written by describe(slot), a
+    small picture-reading model shown that person's picture. Without such a line H3 kept the original person for the
+    first seconds (2026-11-07), so a connected model writes it when the user didn't."""
+    typed = {int(match.group(1)) for match in map(APPEARANCE_LINE.match, text.splitlines()) if match}
+    for slot in sorted(jobs):
+        if jobs[slot] not in (PERSON, SHEET) or slot in typed:
+            continue
+        words = next((line for line in str(describe(slot) or "").splitlines() if line.strip()), "")
+        words = re.sub(r'["\u201c\u201d]', "", words).strip(" .,;:")
+        words = re.sub(r"^(?:the\s+)?(?:person|subject)\s+(?:in\s+the\s+picture\s+)?(?:is|looks\s+like)\s+", "", words, flags=re.I)
+        # "and no visible beard": naming what isn't there can put it in the picture.
+        words = re.sub(r",?\s*(?:and\s+|with\s+)*(?:no|without)\s+(?:visible\s+)?[^,.;]*", "", words, flags=re.I).strip(" .,;:")
+        if words:
+            text = f"{text.rstrip()}\n@{slot} looks like {words[:1].lower() + words[1:]}"
+    return text
+
+
 def swap_appearances(text, jobs, video):
     """An optional separate @1 looks like line describes a replacement, not who goes.
 
@@ -143,6 +170,21 @@ REPLACES = re.compile(
     r"|swaps?\s+(?:in\s+)?for|goes\s+in\s+for|stands?\s+in\s+for)\s+",
     re.I,
 )
+# A plain sentence: "Replace the man in red with @1", "swap the guy for @1", "make the dancer look like @1",
+# "swap @1 in for the singer". The words caught are who goes.
+ASKS = re.compile(
+    r"^\s*(?:please\s+)?(?:replace|swap(?:\s+out)?|switch(?:\s+out)?|change|turn|make)\s+(?!@\d)(.+?)\s+"
+    r"(?:with|for|to|into|by|look\s+like|become)\s+@\d\b"
+    r"|^\s*(?:please\s+)?(?:swap|put|place|drop|switch)\s+@\d\s+(?:in\s+)?(?:with|for|over|on|onto|in\s+place\s+of)\s+(.+)",
+    re.I,
+)
+# "the cashier is now @1", "the man on the left becomes @1".
+BECOMES = re.compile(
+    r"^\s*(.+?)\s+(?:is\s+now|becomes|turns\s+into|is\s+replaced\s+(?:by|with)|gets\s+replaced\s+(?:by|with)"
+    r"|is\s+swapped\s+(?:for|with|to)|gets\s+swapped\s+(?:for|with)|->|\u2192)\s*@\d\b",
+    re.I,
+)
+IN_THE_CLIP = re.compile(r"\s+(?:in|from|of)\s+the\s+(?:clip|video|original(?:\s+(?:clip|video))?)\b", re.I)
 # "Elon is @1," names the new person, not the one who goes.
 # "the man on the left, Dario is" ends where the next person's name starts.
 NAMES_NEXT = re.compile(r",?\s*(?:[A-Z][\w'.-]*\s+)+(?:is|as|plays)\s*$")
@@ -189,9 +231,16 @@ REVOICE_KEPT = (
 
 def who_goes_in(text):
     """Who a typed swap line says goes, without the rest of the line: "Elon is @1, he replaces the man at the
-    counter" is the man at the counter."""
+    counter" is the man at the counter, and so is "Replace the man at the counter with @1."."""
     replaces = REPLACES.search(text)
-    text = text[replaces.end() :] if replaces else NAMES_THE_NEW.sub("", text)
+    plain = None if replaces else next((match for match in (ASKS.search(text), BECOMES.search(text)) if match), None)
+    if replaces:
+        text = text[replaces.end() :]
+    elif plain:
+        text = next(group for group in plain.groups() if group)
+    else:
+        text = NAMES_THE_NEW.sub("", text)
+    text = IN_THE_CLIP.sub("", text)
     text = re.split(r"[.;!?]", text.strip(" .;!?"), maxsplit=1)[0]
     text = NAMES_NEXT.sub("", text)
     text = SAYS_WHO.sub("", TOKEN.sub("", text).strip(" .,;")).strip(" .,;")

nodes/_h3_prompt_helpers.py

@@ -340,14 +340,16 @@ def write_prompt(script, seconds=15.0, camera="", look="", sound="", language="E
             cast.clip_sound = True
             # With no words typed, the clip's own speech is still heard, so the new person says it as the video does.
             cast.typed_lines = any(moment.speech for moment in scene.moments)
-            cast.speaks_as_video = bool(speech) and not cast.typed_lines
+            # Only a voice makes them speak: a train or a beat is loud in the voice band too, but has no clear pitch,
+            # and the line made the new person mouth along to it (subway clip, 2026-11-07: 0.0 s of clear voice).
+            cast.speaks_as_video = heard_a_voice(speech) and not cast.typed_lines
             time_from_sound(scene.moments, speech)
             scene.moments = [moment for moment in scene.moments if not (moment.voice or moment.other)]
         if not scene.moments:
             scene.moments.append(Moment(ACTION_GOES_ON if video == KEEP else ""))
         if voice and not any(moment.speech for moment in scene.moments):
             raise ValueError(VOICE_NO_WORDS)
-        if ask is not None:
+        if ask is not None and video != SWAP:  # A swap keeps the clip's own action; its model only writes the looks.
             add_moments(scene, seconds, ask, jobs)
             add_sound(scene, ask, jobs)
         audio += soundtrack and video == KEEP
@@ -438,6 +440,14 @@ LONGEST_LINE = 12  # Stretches of speech one line can take.
 GAP_WEIGHT, INNER_GAP_WEIGHT, NOISE_WEIGHT, PITCH_WEIGHT = 1.0, 1.0, 1.5, 6.0
 
 
+SPEAKING_VOICE = 0.5  # Seconds of clear voice before the clip counts as someone talking.
+
+
+def heard_a_voice(speech):
+    """Whether find_speech heard someone talk: enough clear voice, not just loud sound in the voice band."""
+    return sum(stretch[3] for stretch in speech or ()) >= SPEAKING_VOICE
+
+
 def find_speech(samples, rate):
     """[(start, end, pitch, voiced), ...]: the stretches of a mono track loud
     enough in the voice band to be words, in seconds, with each stretch's

nodes/_h3_script_helpers.py

@@ -727,11 +727,16 @@ def before_the_action(number, text, cast, wearers):
         for _, who, new in cast.swaps:
             picture = next((p for p in cast.swappers if subject_label(p.subject) == new), None)
             appearance = cast.appearances.get(picture.slot) if picture else None
-            if appearance:
+            if picture:
+                # Every swap gets the firm wording. Without it H3 kept the original person for the first seconds,
+                # or for the whole clip at Fast preview; with it the new
+                # person is there from the first frame. An @1 looks like line only adds its own words.
+                looks = (f"has the defined appearance from {picture_label(picture.picture)}: {appearance}" if appearance
+                         else f"has the face, hair and clothes of the person in {picture_label(picture.picture)}")
                 notes.append(
                     f"{new} occupies the starting position of {who} and follows the same route, movements, timing and pace. "
-                    f"{new} has the defined appearance from {picture_label(picture.picture)}: {appearance}. "
-                    f"The replacement stays present throughout, ending at the original performance's final position. "
+                    f"{new} {looks}. "
+                    f"The replacement stays present throughout, from the first frame, ending at the original performance's final position. "
                     f"Do not show {who} in that role at any time; there is no transition or morph into the replacement."
                 )
             else:

nodes/_image_folder_helpers.py

@@ -10,6 +10,7 @@ as a path below that root, and anything that leaves it is refused.
 from __future__ import annotations
 
 import hashlib
+import heapq
 import json
 import os
 import re
@@ -125,45 +126,44 @@ def list_folders(root, folder, source: str = "input") -> list[str]:
 def list_pictures(root, folder, subfolders: bool = False, sort: str = "name", source: str = "input",
                   limit: int = MAX_PICTURES) -> list[dict]:
     """Every picture in the folder: {"name": path below the folder, "path",
-    "mtime", "size"}, in the chosen order. Hidden files, links that lead out
-    of the root and anything that is not a picture are left out."""
+    "mtime", "mtime_ns", "size"}, in the chosen order. Hidden files, links
+    that lead out of the root and anything that is not a picture are left out."""
     base = safe_folder(root, folder, source)
     top = Path(root).resolve()
-    found: list[dict] = []
     if subfolders:
         walker = os.walk(base, followlinks=False)
     else:
         walker = [(str(base), [], sorted(os.listdir(base)))]
-    for directory, folders, files in walker:
-        folders[:] = sorted(name for name in folders if not name.startswith("."))
-        for name in files:
-            if name.startswith(".") or not name.lower().endswith(IMAGE_EXTENSIONS):
-                continue
-            path = Path(directory) / name
-            try:
-                real = path.resolve()
-                if top not in real.parents or not real.is_file():
+
+    def candidates():
+        for directory, folders, files in walker:
+            folders[:] = sorted(name for name in folders if not name.startswith("."))
+            for name in files:
+                if name.startswith(".") or not name.lower().endswith(IMAGE_EXTENSIONS):
                     continue
-                stat = real.stat()
-            except OSError:
-                continue
-            found.append({
-                "name": path.relative_to(base).as_posix(),
-                "path": real,
-                "mtime": float(stat.st_mtime),
-                "size": int(stat.st_size),
-            })
-            if len(found) >= limit:
-                break
-        if len(found) >= limit:
-            break
+                path = Path(directory) / name
+                try:
+                    real = path.resolve()
+                    if top not in real.parents or not real.is_file():
+                        continue
+                    stat = real.stat()
+                except (OSError, RuntimeError):
+                    continue
+                yield {
+                    "name": path.relative_to(base).as_posix(),
+                    "path": real,
+                    "mtime": float(stat.st_mtime),
+                    "mtime_ns": int(stat.st_mtime_ns),
+                    "size": int(stat.st_size),
+                }
+
     if sort == "newest first":
-        found.sort(key=lambda item: (-item["mtime"], natural_key(item["name"])))
+        order = lambda item: (-item["mtime_ns"], natural_key(item["name"]))
     elif sort == "oldest first":
-        found.sort(key=lambda item: (item["mtime"], natural_key(item["name"])))
+        order = lambda item: (item["mtime_ns"], natural_key(item["name"]))
     else:
-        found.sort(key=lambda item: natural_key(item["name"]))
-    return found
+        order = lambda item: natural_key(item["name"])
+    return heapq.nsmallest(limit, candidates(), key=order)
 
 
 def parse_picked(text) -> list[str] | None:
@@ -216,7 +216,7 @@ def output_name(name: str) -> str:
 
 
 def _has_see_through(frame: Image.Image) -> bool:
-    return frame.mode in ("RGBA", "LA", "PA") or (frame.mode == "P" and "transparency" in frame.info)
+    return frame.mode in ("RGBA", "LA", "PA") or "transparency" in frame.info
 
 
 def load_picture(path) -> tuple[torch.Tensor, torch.Tensor]:

nodes/_image_save_helpers.py

@@ -10,6 +10,7 @@ from __future__ import annotations
 
 import json
 import re
+import threading
 from datetime import datetime
 from pathlib import Path, PurePosixPath, PureWindowsPath
 
@@ -32,6 +33,8 @@ FORMAT_EXTENSIONS = {"png": "png", "webp lossless": "webp", "jxl lossless": "jxl
 
 COUNTER_WIDTH = 5
 BATCH_WIDTH = 3
+# Save Image and Compare choose counters and write under this same lock.
+IMAGE_SAVE_LOCK = threading.Lock()
 
 
 def metadata_disabled() -> bool:
@@ -262,7 +265,9 @@ def sidecar_path(image_path: Path) -> Path:
 
 
 def frame_to_pil(frame: torch.Tensor) -> Image.Image:
-    array = np.clip(frame.detach().cpu().numpy() * 255.0, 0, 255).astype(np.uint8)
+    array = np.clip(frame.detach().cpu().float().numpy() * 255.0, 0, 255).astype(np.uint8)
+    if array.ndim == 3 and array.shape[-1] == 1:
+        array = array[..., 0]
     return Image.fromarray(array)
 
 
@@ -333,6 +338,7 @@ __all__ = [
     "FORMAT_EXTENSIONS",
     "IMAGE_EXTENSIONS",
     "IMAGE_FORMATS",
+    "IMAGE_SAVE_LOCK",
     "OUTPUT_DIR_RULE",
     "counter_pattern",
     "encode_image",

nodes/_inpaint_crop_helpers.py

@@ -434,6 +434,15 @@ def build_crop(
     blur_sigma = max(0.0, float(mask_blur))
     if blur_sigma > 0.0:
         mask = blur_mask(mask, blur_sigma).clamp(0.0, 1.0)
+    # New space must stay fully paintable, even after shrinking or softening.
+    if ext_l:
+        mask[:, :, :ext_l] = 1.0
+    if ext_r:
+        mask[:, :, -ext_r:] = 1.0
+    if ext_u:
+        mask[:, :ext_u, :] = 1.0
+    if ext_d:
+        mask[:, -ext_d:, :] = 1.0
     height, width = image.shape[1], image.shape[2]
     multiple = max(1, int(output_multiple))
     blend_px = max(0, int(blend_pixels))
@@ -449,6 +458,7 @@ def build_crop(
         )
 
     bbox = mask_bbox(mask)
+    keep_box = bbox
     if bbox is None:
         rect = (0, 0, width, height)
     else:
@@ -460,6 +470,17 @@ def build_crop(
                 rect[2] + 2 * context_px,
                 rect[3] + 2 * context_px,
             )
+        if blend_px:
+            # Feathering dilates by blend_px, then blurs over another
+            # ceil(3 * sigma) pixels. Keep all of that support in the crop.
+            reach = blend_px + math.ceil(3.0 * (blend_px / 3.0))
+            bx, by, bw, bh = bbox
+            x0, y0 = max(0, bx - reach), max(0, by - reach)
+            x1, y1 = min(width, bx + bw + reach), min(height, by + bh + reach)
+            keep_box = (x0, y0, x1 - x0, y1 - y0)
+            x0, y0 = min(rect[0], x0), min(rect[1], y0)
+            x1, y1 = max(rect[0] + rect[2], x1), max(rect[1] + rect[3], y1)
+            rect = (x0, y0, x1 - x0, y1 - y0)
         if keep_inside:
             rect = clamp_rect_to_bounds(rect, width, height)
         rect = fit_rect(rect, width, height)
@@ -480,7 +501,7 @@ def build_crop(
             target_h = max(1, round(rect[3] * target_w / rect[2]))
         target_w = round_up_to_multiple(target_w, multiple)
         target_h = round_up_to_multiple(target_h, multiple)
-        keep_box = bbox if bbox is not None else (0, 0, width, height)
+        keep_box = keep_box if keep_box is not None else (0, 0, width, height)
         rect = match_rect_shape(rect, target_w, target_h, width, height, keep_inside, keep_box)
     else:
         # Native sizing: the crop itself must satisfy the sampler multiple.
@@ -1056,7 +1077,11 @@ def stitch_blend_mask(stitcher: dict, frames: int = 1, seam: str = SEAM_CLASSIC)
             # One depth map serves every frame, so the weight broadcasts.
             weight = blend_in_weight(plan["depth"], plan["tone"])[:, oy : oy + oh, ox : ox + ow]
             return weight.expand(frames, -1, -1).contiguous()
-    mask = blend[:, oy : oy + oh, ox : ox + ow]
+    # Older stitchers may have a feather wider than the actual paste window.
+    cx, cy, cw, ch = stitcher["crop_to_canvas"]
+    mask = torch.zeros_like(blend)
+    mask[:, cy : cy + ch, cx : cx + cw] = blend[:, cy : cy + ch, cx : cx + cw]
+    mask = mask[:, oy : oy + oh, ox : ox + ow]
     if mask.shape[0] == 1 and frames > 1:
         mask = mask.expand(frames, -1, -1)
     return mask.contiguous()

nodes/_krea2_core.py

@@ -14,6 +14,8 @@ tested against.
 
 from __future__ import annotations
 
+import hashlib
+
 import torch
 import torch.nn.functional as F
 from einops import rearrange
@@ -91,6 +93,13 @@ def _attn_kv(
     k = rearrange(k, "B L (H D) -> B H L D", H=attn.kvheads)
     v = rearrange(v, "B L (H D) -> B H L D", H=attn.kvheads)
     q, k = attn.qknorm(q, k)
+    patches = transformer_options.get("patches", {})
+    extra_options = transformer_options.copy()
+    if "block_index" in transformer_options:
+        for callback in patches.get("attn1_patch", ()):
+            changes = callback(q, k, v, pe=freqs, attn_mask=mask, extra_options=extra_options)
+            q, k, v = changes.get("q", q), changes.get("k", k), changes.get("v", v)
+            freqs, mask = changes.get("pe", freqs), changes.get("attn_mask", mask)
     if freqs is not None:
         q, k = apply_rope(q, k, freqs)
     if kv_capture is not None:
@@ -111,6 +120,9 @@ def _attn_kv(
         skip_reshape=True,
         transformer_options=transformer_options,
     )
+    if "block_index" in transformer_options:
+        for callback in patches.get("attn1_output_patch", ()):
+            out = callback(out, extra_options)
     return attn.wo(out * F.sigmoid(gate))
 
 
@@ -153,7 +165,10 @@ def _precompute_ref_kv(
     freqs = dit.pe_embedder(refpos)
 
     ref_kv = []
-    for block in dit.blocks:
+    transformer_options = {**transformer_options, "total_blocks": len(dit.blocks),
+                           "block_type": "single", "img_slice": [0, h.shape[1]]}
+    for index, block in enumerate(dit.blocks):
+        transformer_options["block_index"] = index
         cap = []
         h = _block_kv_forward(
             block,
@@ -204,7 +219,10 @@ def _forward_with_cached_refs(
 
     freqs = dit.pe_embedder(pos)
 
-    for block, kv in zip(dit.blocks, ref_kv):
+    transformer_options = {**transformer_options, "total_blocks": len(dit.blocks),
+                           "block_type": "single", "img_slice": [txtlen, combined.shape[1]]}
+    for index, (block, kv) in enumerate(zip(dit.blocks, ref_kv)):
+        transformer_options["block_index"] = index
         combined = _block_kv_forward(
             block,
             combined,
@@ -232,8 +250,13 @@ def _forward_with_cached_refs(
 
 
 def _ref_fingerprint(ref_latents, bs: int, bbox_norm: list[float] | None):
-    key = [bs, tuple(round(v, 6) for v in bbox_norm) if bbox_norm is not None else None]
+    key = [bs, tuple(bbox_norm) if bbox_norm is not None else None]
     for r in ref_latents:
-        rf = r.float()
-        key.append((tuple(r.shape), float(rf.sum()), float(rf.square().sum())))
+        try:
+            version = r._version
+        except RuntimeError:
+            # Inference tensors have no mutation counter. Hash their bytes
+            # rather than treating equal summary statistics as equal pixels.
+            version = hashlib.sha256(r.detach().contiguous().view(torch.uint8).cpu().numpy().tobytes()).digest()
+        key.append((id(r), version, tuple(r.shape), tuple(r.stride()), r.dtype, r.device))
     return tuple(key)

nodes/_mask_by_touch_helpers.py

@@ -123,6 +123,15 @@ OTHER_PICTURE = (
     "coming into this node has changed since, so none of them are used. "
     "Click a thing on the node's picture, or paint over it, then run again."
 )
+MOVED_NOTHING = (
+    "Mask by Touch: the picks made on the last picture found nothing on "
+    "this one. Click a thing on the node's picture, or paint over it, then "
+    "run again."
+)
+# What happens to the picks when another picture comes in: they are used on
+# it, in the same places, or the run stops until something is picked anew.
+NEW_PICTURE = ("keep picks", "start over")
+KEEP_PICKS, START_OVER = NEW_PICTURE
 NOT_TOUCHES = (
     "Mask by Touch could not read what was picked. Press Clear on the node "
     "and pick again."
@@ -183,6 +192,53 @@ def touch_stamp(text) -> str:
     return f"{value:08x}"
 
 
+# A picture key starts with the picture's size: "<width>x<height>-".
+_KEY_SIZE = re.compile(r"(\d{1,9})x(\d{1,9})-")
+
+
+def _number(value) -> bool:
+    return not isinstance(value, bool) and isinstance(value, (int, float)) and math.isfinite(value)
+
+
+def move_touches(text, key: str) -> str:
+    """Touches made on another picture, moved onto the picture `key` names.
+
+    Every touch keeps its place: the same pixels on a picture of the same
+    size, the same spot scaled on one of another size, a brush's width
+    scaled with it. Everything else in a touch (its word, its chip, how soft
+    it was) stays as written. The face writes this text back as it is, so
+    the node and the face go on from the same touches. Whole pixels round
+    half up, as the face rounds.
+    """
+    data = json.loads(str(text))
+    old = _KEY_SIZE.match(str(data.get("key") or ""))
+    new = _KEY_SIZE.match(str(key))
+    across, down = 1.0, 1.0
+    if old and new and int(old.group(1)) > 0 and int(old.group(2)) > 0:
+        across = int(new.group(1)) / int(old.group(1))
+        down = int(new.group(2)) / int(old.group(2))
+    if (across, down) != (1.0, 1.0):
+        def at(x, y):
+            return math.floor(x * across + 0.5), math.floor(y * down + 0.5)
+
+        for entry in data.get("items", []):
+            if not isinstance(entry, dict):
+                continue
+            if _number(entry.get("x")) and _number(entry.get("y")):
+                entry["x"], entry["y"] = at(entry["x"], entry["y"])
+            if _number(entry.get("r")):
+                entry["r"] = max(1, math.floor(entry["r"] * math.sqrt(across * down) + 0.5))
+            if isinstance(entry.get("pts"), list):
+                entry["pts"] = [
+                    [*at(point[0], point[1]), *point[2:]]
+                    if isinstance(point, list) and len(point) >= 2 and _number(point[0]) and _number(point[1])
+                    else point
+                    for point in entry["pts"]
+                ]
+    data["key"] = str(key)
+    return json.dumps(data, ensure_ascii=False, separators=(",", ":"))
+
+
 def _whole(value) -> int:
     """A coordinate as a whole pixel. Text, a missing value or a number that
     is not finite is an error."""
@@ -1134,10 +1190,13 @@ __all__ = [
     "HOLE_SHARE",
     "ITEMS_MAX",
     "Item",
+    "KEEP_PICKS",
     "MATCHES_MAX",
     "Memory",
+    "MOVED_NOTHING",
     "NEEDS_SAM3",
     "NEWER_TOUCHES",
+    "NEW_PICTURE",
     "NOTHING_PICKED",
     "NOT_A_PICTURE",
     "NOT_SAM3",
@@ -1149,6 +1208,7 @@ __all__ = [
     "POINTS_MAX",
     "PieceSieve",
     "SMALL_SIDE",
+    "START_OVER",
     "TEXT_MAX",
     "TOO_MUCH",
     "Touches",
@@ -1168,6 +1228,7 @@ __all__ = [
     "keep_touched",
     "match_points",
     "match_under",
+    "move_touches",
     "pack_planes",
     "parse_touches",
     "picture_key",

nodes/node_h3_prompt_writer.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import sys
 
-from ._h3_cast_helpers import EDIT, JOBS, KEEP, KEEPS_ITS_LENGTH, PERSON, PLACE, START, SWAP, THING, VIDEO_JOBS
+from ._h3_cast_helpers import DESCRIBE_PERSON, add_looks, EDIT, JOBS, KEEP, KEEPS_ITS_LENGTH, PERSON, PLACE, START, SWAP, THING, VIDEO_JOBS
 from ._h3_prompt_helpers import find_beats, find_speech, split_sections, write_prompt
 from ._h3_script_helpers import CAMERAS, LOOKS, script_report
 from ._route_errors import safe_route_error
@@ -177,7 +177,8 @@ class AusBossH3PromptWriter:
                     {
                         "tooltip": (
                             "Optional: a small text model such as Qwen3-VL 8B. It adds "
-                            "moments after a one-line idea and matches the sound to the place."
+                            "moments after a one-line idea and matches the sound to the place. "
+                            "In a swap it writes what the new person looks like, from their picture."
                         ),
                     },
                 ),
@@ -335,6 +336,9 @@ class AusBossH3PromptWriter:
         kinds = {1: job_1, 2: job_2, 3: job_3, 4: job_4}
         jobs = {slot: kinds[slot] for slot in given}
         video_job = "" if video is None else video_job
+        if clip is not None and video_job == SWAP:
+            # The model on clip writes each new person's @N looks like line from their picture, when none is typed.
+            script = add_looks(script, jobs, lambda slot: model_asker(clip, given[slot])(DESCRIBE_PERSON, 60))
         frames = clip_frames(seconds)
         if video_job in KEEPS_ITS_LENGTH:
             frames = video_frames(video.shape[0])

nodes/node_image_folder.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 from pathlib import Path
 
 from ._execution_helpers import ignore_extra_inputs
+from ._route_errors import safe_route_error
 from ._image_folder_helpers import (
     AFTER_RUN,
     AT_THE_END,
@@ -86,7 +87,7 @@ def _register_routes() -> None:
         return str(request.rel_url.query.get(name, "")).strip()
 
     def refused(error: Exception):
-        return web.json_response({"error": str(error)}, status=400)
+        return web.json_response({"error": safe_route_error(error, "This folder cannot be read.")}, status=400)
 
     @routes.get("/ausboss/image_folder/folders")
     async def folders(request):
@@ -95,7 +96,7 @@ def _register_routes() -> None:
             source, folder = _settle(source, query(request, "folder"))
             shown = clean_folder(folder)
             names = list_folders(_root(source), shown, source)
-        except (ValueError, RuntimeError) as error:
+        except (ValueError, RuntimeError, OSError) as error:
             return refused(error)
         return web.json_response({"source": source, "folder": shown, "folders": names})
 
@@ -110,13 +111,13 @@ def _register_routes() -> None:
             listed = list_pictures(
                 _root(source), shown, query(request, "subfolders") == "1", query(request, "sort") or "name", source
             )
-        except (ValueError, RuntimeError) as error:
+        except (ValueError, RuntimeError, OSError) as error:
             return refused(error)
         return web.json_response({
             "source": source,
             "folder": shown,
             "full": len(listed) >= MAX_PICTURES,
-            "pictures": [{"name": item["name"], "v": int(item["mtime"])} for item in listed],
+            "pictures": [{"name": item["name"], "v": f"{item['mtime_ns']}-{item['size']}"} for item in listed],
         })
 
     @routes.get("/ausboss/image_folder/thumb")
@@ -273,6 +274,7 @@ class AusBossImageFolder:
 
     def load(self, source, folder, subfolders, sort, pictures, run, position, after_run, at_the_end):
         # after_run is the editor's: it moves Picture on after a run is queued. A run loads what Picture says.
+        source, folder = _settle(source, folder)
         chosen = _picked(source, folder, subfolders, sort, pictures)
         count = len(chosen)
         images, masks, names, numbers = [], [], [], []
@@ -283,7 +285,10 @@ class AusBossImageFolder:
             masks.append(mask)
             names.append(output_name(item["name"]))
             numbers.append(place + 1)
-        note = [{"count": count, "loaded": numbers[:64], "names": [chosen[n - 1]["name"] for n in numbers[:64]]}]
+        note = [{
+            "count": count, "loaded": numbers, "names": [chosen[n - 1]["name"] for n in numbers],
+            "context": {"source": source, "folder": clean_folder(folder), "subfolders": bool(subfolders)},
+        }]
         return {"ui": {UI_KEY: note}, "result": (images, masks, names, numbers, count)}
 
 

nodes/node_krea2_model_patch.py

@@ -93,6 +93,7 @@ class AusBossKrea2OutpaintModelPatch:
 
     def patch(self, model, stitcher, kv_cache=True, placement="source rectangle"):
         import comfy.conds
+        from comfy.patcher_extension import CallbacksMP
 
         from . import _krea2_core as core
 
@@ -132,6 +133,13 @@ class AusBossKrea2OutpaintModelPatch:
 
         state = {"last_sigma": None, "caches": {}}
 
+        def clear_cache(*_):
+            state["caches"].clear()
+            state["last_sigma"] = None
+
+        patched.add_callback(CallbacksMP.ON_PRE_RUN, clear_cache)
+        patched.add_callback(CallbacksMP.ON_CLEANUP, clear_cache)
+
         def forward(
             x,
             timesteps,
@@ -171,8 +179,11 @@ class AusBossKrea2OutpaintModelPatch:
             ref_kv = None
             key = None
             if kv_cache:
-                key = core._ref_fingerprint(ref_latents, batch, bbox_norm)
-                ref_kv = state["caches"].get(key)
+                key = (tuple(x.shape), x.dtype, x.device,
+                       core._ref_fingerprint(ref_latents, batch, bbox_norm))
+                cached = state["caches"].get(key)
+                if cached is not None:
+                    ref_kv = cached[1]
             if ref_kv is None:
                 ref_kv = core._precompute_ref_kv(
                     dit,
@@ -183,7 +194,9 @@ class AusBossKrea2OutpaintModelPatch:
                     bbox_norm=bbox_norm,
                 )
                 if kv_cache:
-                    state["caches"][key] = ref_kv
+                    # Keep the references alive while their identities are
+                    # keys, so a later tensor cannot reuse a released id.
+                    state["caches"][key] = (tuple(ref_latents), ref_kv)
             return core._forward_with_cached_refs(
                 dit, x, timesteps, context, ref_kv, transformer_options
             )

nodes/node_mask_by_touch.py

@@ -28,12 +28,16 @@ from ._fine_edge_helpers import (
 )
 from ._mask_by_name_helpers import IF_NOTHING, cut_out
 from ._mask_by_touch_helpers import (
+    KEEP_PICKS,
+    MOVED_NOTHING,
     NEEDS_SAM3,
+    NEW_PICTURE,
     NOTHING_PICKED,
     NOT_A_PICTURE,
     NOT_SAM3,
     NO_TEXT_READER,
     OTHER_PICTURE,
+    START_OVER,
     WORDS_FIRST,
     WORDS_MORE,
     Memory,
@@ -47,6 +51,7 @@ from ._mask_by_touch_helpers import (
     finish_mask,
     match_points,
     match_under,
+    move_touches,
     pack_planes,
     parse_touches,
     picture_key,
@@ -212,19 +217,19 @@ def _server():
         return None
 
 
-def _tell(node_id, note: dict, end: bool) -> bool:
+def _tell(node_id, note: dict, end: bool, stopped: bool = False) -> bool:
     """Tell the node's face what a look has found, over ComfyUI's own channel
     to its page. It goes to the page that asked for the run. True when it
-    was sent; a failure never stops the look."""
+    was sent; a failure never stops the look. `stopped`: the run stops at
+    this node, and the face is only shown the picture that came in."""
     server = _server()
     if server is None or node_id is None:
         return False
+    event = {"node": str(node_id), "note": note, "end": bool(end)}
+    if stopped:
+        event["stopped"] = True
     try:
-        server.send_sync(
-            LOOK_EVENT,
-            {"node": str(node_id), "note": note, "end": bool(end)},
-            getattr(server, "client_id", None),
-        )
+        server.send_sync(LOOK_EVENT, event, getattr(server, "client_id", None))
     except Exception:  # noqa: BLE001
         return False
     return True
@@ -720,10 +725,10 @@ class AusBossMaskByTouch:
                 "fill_holes": (
                     "BOOLEAN",
                     {
-                        "default": True,
+                        "default": False,
                         "tooltip": (
                             "Closes pinholes inside the picked area. Larger openings "
-                            "stay open, like a mug's handle."
+                            "stay open, like a mug's handle. Off keeps every hole you pick."
                         ),
                     },
                 ),
@@ -786,6 +791,18 @@ class AusBossMaskByTouch:
                         ),
                     },
                 ),
+                "new_picture": (
+                    list(NEW_PICTURE),
+                    {
+                        "default": KEEP_PICKS,
+                        "tooltip": (
+                            "When a different picture comes in. Keep picks uses your "
+                            "clicks and paint on it, in the same places (scaled if the "
+                            "size changed). Start over drops them, and the run stops "
+                            "until you pick again."
+                        ),
+                    },
+                ),
             },
             # ComfyUI hands the node its own id here, so a look can tell this
             # node's face what it has found. Not a widget and not a socket.
@@ -1105,6 +1122,30 @@ class AusBossMaskByTouch:
             entry = self._keep(("picture", key), self._write(picture, "picture", "jpg", format="JPEG", quality=90))
         return entry
 
+    def _show_picture(self, session, image, key: str, unique_id, moved=None) -> bool:
+        """Send the face the picture that came in, with nothing picked on it,
+        for a run that stops at this node, and the picks moved onto it if
+        they were. A failure never changes why the run stops."""
+        if unique_id is None or _server() is None:
+            return False
+        try:
+            height, width = int(image.shape[1]), int(image.shape[2])
+            small_width, small_height, scale = small_size(width, height)
+            picture = self._picture_file(image, key, small_width, small_height)
+            if picture is None:
+                return False
+            note = {
+                "key": key, "width": width, "height": height, "scale": scale, "stamp": "",
+                "picture": picture, "selection": None, "items": [], "share": 0.0,
+                "pieces": self._pieces_note(_MEMORY.get_pieces((session.token, session.reader, key))),
+                "fine": None, "areas": None,
+            }
+            if moved:
+                note["moved"] = moved
+        except Exception:  # noqa: BLE001
+            return False
+        return _tell(unique_id, note, True, stopped=True)
+
     def _pieces_note(self, pieces):
         if pieces is None:
             return None
@@ -1144,12 +1185,13 @@ class AusBossMaskByTouch:
 
     def pick(
         self, image, model, clip, touches, grow, soften, smooth, fill_holes, if_nothing,
-        free_vram=False, invert=False, ask="", fine_edges=FINE_OFF, unique_id=None,
+        free_vram=False, invert=False, ask="", fine_edges=FINE_OFF, new_picture=KEEP_PICKS, unique_id=None,
     ):
         session = _Session(model, clip)
         try:
             return self._run(
-                session, image, touches, grow, soften, smooth, fill_holes, if_nothing, invert, ask, unique_id, fine_edges
+                session, image, touches, grow, soften, smooth, fill_holes, if_nothing, invert, ask, unique_id, fine_edges,
+                new_picture,
             )
         finally:
             session.close()
@@ -1163,7 +1205,7 @@ class AusBossMaskByTouch:
 
     def _run(
         self, session, image, touches, grow, soften, smooth, fill_holes, if_nothing, invert, ask, unique_id,
-        fine_edges=FINE_OFF,
+        fine_edges=FINE_OFF, new_picture=KEEP_PICKS,
     ):
         if not isinstance(image, torch.Tensor) or image.ndim != 4 or 0 in image.shape:
             raise ValueError(NOT_A_PICTURE)
@@ -1173,6 +1215,15 @@ class AusBossMaskByTouch:
         picked = parse_touches(touches)
         # Touches made on another picture are not this picture's.
         elsewhere = picked.key not in (None, key) and bool(picked.items)
+        moved = None
+        if elsewhere and str(new_picture) != START_OVER:
+            # Unless the node starts over, they are moved onto this one: the
+            # same places, scaled to its size. The face is sent the moved
+            # touches, and the stamp of the ones they were moved from.
+            moved = {"from": touch_stamp(touches), "touches": move_touches(touches, key)}
+            touches = moved["touches"]
+            picked = parse_touches(touches)
+            elsewhere = False
         items = () if elsewhere else picked.items
         strokes, selections, painted, item_notes = {}, [], [], []
         # Each picked thing's own area on the first picture, for the face.
@@ -1239,9 +1290,13 @@ class AusBossMaskByTouch:
         raw = torch.stack(selections)
         soft = raw.dtype != torch.bool
         if not bool(raw.any()) and not asked and str(if_nothing) != IF_NOTHING[1]:
+            # The run stops here, but the face is shown the picture that
+            # came in first: a picture that changed upstream is there to
+            # pick from at once, without unplugging it.
+            self._show_picture(session, image, key, unique_id, moved)
             # Picks the face may still show, made before the picture
             # changed: say so, not that nothing is picked.
-            raise RuntimeError(OTHER_PICTURE if elsewhere else NOTHING_PICKED)
+            raise RuntimeError(OTHER_PICTURE if elsewhere else MOVED_NOTHING if moved else NOTHING_PICKED)
         # A look for pieces (scope) returns no mask anyone uses: no fine edge then.
         fine = wants_fine_edges(fine_edges) and asked != "scope" and bool(raw.any())
         some = raw.flatten(1).any(dim=1)[:, None, None]
@@ -1307,7 +1362,7 @@ class AusBossMaskByTouch:
         areas_note = self._areas_note(key, stamp, things, small_width, small_height)
 
         def note(pieces) -> dict:
-            return {
+            told = {
                 "key": key,
                 "width": width,
                 "height": height,
@@ -1321,6 +1376,9 @@ class AusBossMaskByTouch:
                 "fine": fine_note,
                 "areas": areas_note,
             }
+            if moved:
+                told["moved"] = moved
+            return told
 
         pieces_key = (session.token, session.reader, key)
         pieces = _MEMORY.get_pieces(pieces_key)

nodes/node_save_image.py

@@ -10,6 +10,7 @@ from ._image_save_helpers import (
     EXISTING_POLICIES,
     FORMAT_EXTENSIONS,
     IMAGE_FORMATS,
+    IMAGE_SAVE_LOCK,
     encode_image,
     existing_action,
     fill_name_tokens,
@@ -319,8 +320,7 @@ class AusBossSaveImage:
         embed = save_metadata and not metadata_disabled()
         metadata = workflow_metadata(prompt, extra_pnginfo) if embed else None
         # A linked caption wins over the legacy text box; blank means no sidecar.
-        linked_caption = str(caption_text or "") if caption_text is not None else ""
-        caption_value = linked_caption if linked_caption.strip() else str(caption or "")
+        caption_value = str(caption_text) if caption_text is not None else str(caption or "")
         output_root = Path(folder_paths.get_output_directory())
         root = resolve_output_root(output_dir, output_root)
         count = int(images.shape[0])
@@ -343,51 +343,55 @@ class AusBossSaveImage:
         else:
             exact = sanitize_exact_name(exact_name)
 
-        planned: list[tuple[Path, str]] = []  # (path, collision policy)
-        if exact:
-            base = strip_image_extension(exact)
-            for name in plan_exact_names(base, extension, count):
-                planned.append((root / name, on_existing))
-        else:
-            subfolder, base = split_prefix(filename_prefix)
-            folder = root / subfolder if subfolder else root
-            require_output_path(folder, output_root)
-            stem = name_stem(
-                base,
-                {"date": bool(name_date), "time": bool(name_time), "size": bool(name_size)},
-                now,
-                width,
-                height,
-            )
-            counter = bool(name_counter)
-            existing = [entry.name for entry in folder.iterdir()] if folder.is_dir() else []
-            names = plan_local_names(
-                stem, extension, count, counter=counter, batch=bool(name_batch),
-                next_counter=next_free_counter(existing, stem),
-            )
-            # The counter is collision-safe by construction; without it the
-            # legacy policy decides, and its default deliberately overwrites.
-            policy = "overwrite" if counter else on_existing
-            planned.extend((folder / name, policy) for name in names)
+        with IMAGE_SAVE_LOCK:
+            planned: list[tuple[Path, str]] = []  # (path, collision policy)
+            if exact:
+                base = strip_image_extension(exact)
+                for name in plan_exact_names(base, extension, count):
+                    planned.append((root / name, on_existing))
+            else:
+                subfolder, base = split_prefix(filename_prefix)
+                folder = root / subfolder if subfolder else root
+                require_output_path(folder, output_root)
+                stem = name_stem(
+                    base,
+                    {"date": bool(name_date), "time": bool(name_time), "size": bool(name_size)},
+                    now,
+                    width,
+                    height,
+                )
+                counter = bool(name_counter)
+                existing = [entry.name for entry in folder.iterdir()] if folder.is_dir() else []
+                names = plan_local_names(
+                    stem, extension, count, counter=counter, batch=bool(name_batch),
+                    next_counter=next_free_counter(existing, stem),
+                )
+                # The shared lock keeps this counter free until writing finishes.
+                # Without it, the legacy policy decides whether to overwrite.
+                policy = "overwrite" if counter else on_existing
+                planned.extend((folder / name, policy) for name in names)
 
-        # Validate the whole batch before any write, including caption targets,
-        # then settle every collision: an "error" on a later frame must stop
-        # the run before the first frame lands, not after.
-        for path, _policy in planned:
-            require_output_path(path, output_root)
-            if caption_value.strip():
-                require_output_path(sidecar_path(path), output_root)
-        actions = [existing_action(path.exists(), policy) for path, policy in planned]
+            # Validate the whole batch before any write, including caption targets,
+            # then settle every collision: an "error" on a later frame must stop
+            # the run before the first frame lands, not after.
+            for path, _policy in planned:
+                require_output_path(path, output_root)
+                if caption_value.strip():
+                    require_output_path(sidecar_path(path), output_root)
+            actions = [
+                existing_action(path.exists() or (bool(caption_value.strip()) and sidecar_path(path).exists()), policy)
+                for path, policy in planned
+            ]
 
-        saved: list[Path] = []
-        for (path, _policy), action, frame in zip(planned, actions, images):
-            if action == "skip":
-                continue
-            path.parent.mkdir(parents=True, exist_ok=True)
-            encode_image(path, frame, format, metadata)
-            if caption_value.strip():
-                sidecar_path(path).write_text(caption_value, encoding="utf-8")
-            saved.append(path)
+            saved: list[Path] = []
+            for (path, _policy), action, frame in zip(planned, actions, images):
+                if action == "skip":
+                    continue
+                path.parent.mkdir(parents=True, exist_ok=True)
+                encode_image(path, frame, format, metadata)
+                if caption_value.strip():
+                    sidecar_path(path).write_text(caption_value, encoding="utf-8")
+                saved.append(path)
 
         # Every destination was confined to the output folder above, so each
         # saved file previews from there and is shown relative to it. The

pyproject.toml

@@ -3,7 +3,7 @@ name = "ausboss-nodes"
 # Manager/registry search matches against this text, so it names the actual
 # nodes instead of describing the collection abstractly.
 description = "ComfyUI-AusBoss (AusBoss nodes): image and video nodes with compact controls: Image and Video Crop + Rotate + Pad (frame or clip), Load Image + Pad, Image Folder, Image Resize, Align Image, Image Size, Color Match, Image Compare A/B, Realign to Source (experimental), Save Image (PNG, WebP/JXL, captions), Load Video, Load Audio, Save Video, Select Frame, Frame Interpolate, Mask Refine, Mask by Name and Mask by Touch (type a name or click a thing, get its mask), LaMa Inpaint, Crop For Inpaint, Stitch Inpaint, Tiled Upscale and Tiled Upscale Stitch, LoRA Loader, Krea 2 Encode and Outpaint Model Patch, Latent Size, Layout Boxes, Seed, Select Every Nth, Split Batch, Merge Batches, Text, H3 Prompt Writer, Integer, Float, Math Expression, Show Text, Free Memory, Workflow Note, Workflow Note Tile, Callout, Callout Tile, Workflow Switches, Run Timer, and Step Preview (stop bad runs). Example workflows for Qwen Image 2.1, Krea 2, Klein 9B and LTX 2.3."
-version = "2.21.1"
+version = "2.23.0"
 # comfy-cli serializes this to JSON verbatim, so `file` publishes the literal
 # string {"file": "LICENSE"} to the registry listing. `text` puts a readable
 # name there instead. Both forms are supported; the LICENSE file is unchanged.

scripts/changelog_notes.py

@@ -28,6 +28,7 @@ import os
 from pathlib import Path
 import re
 import sys
+import tomllib
 
 ROOT = Path(__file__).resolve().parent.parent
 # The Registry shows the notes in a small box: a long release is cut to its
@@ -101,10 +102,10 @@ def notes_for(version: str, text: str) -> str:
 
 def pyproject_version() -> str:
     raw = (ROOT / "pyproject.toml").read_text(encoding="utf-8")
-    found = re.search(r'^version\s*=\s*"([^"]+)"', raw, re.MULTILINE)
-    if not found:
-        raise ValueError('pyproject.toml has no version = "..." line')
-    return found.group(1)
+    version = tomllib.loads(raw).get("project", {}).get("version")
+    if not isinstance(version, str) or not version.strip():
+        raise ValueError("pyproject.toml needs a nonempty project.version string")
+    return version
 
 
 def main(argv: list[str] | None = None) -> int:

scripts/compat_boot.py

@@ -53,12 +53,21 @@ def example_nodes(data: dict):
             yield f" in subgraph '{graph.get('name') or graph.get('id')}'", node
 
 
-def given_names(node: dict) -> set[str]:
-    """The inputs a saved node has a socket or a named value for."""
-    names = {entry.get("name") for entry in node.get("inputs") or [] if isinstance(entry, dict)}
-    named = node.get("widgets_values_named")
-    if isinstance(named, dict):
-        names.update(named)
+def _widget(spec) -> bool:
+    if not isinstance(spec, (list, tuple)) or not spec:
+        return False
+    options = spec[1] if len(spec) > 1 and isinstance(spec[1], dict) else {}
+    return not options.get("forceInput") and (isinstance(spec[0], list) or spec[0] in ("INT", "FLOAT", "BOOLEAN", "STRING", "COMBO"))
+
+
+def given_names(node: dict, info: dict) -> set[str]:
+    """Connected sockets and usable serialized widget values."""
+    names = {entry.get("name") for entry in node.get("inputs") or []
+             if isinstance(entry, dict) and entry.get("link") is not None}
+    for saved in (node.get("widgets_values"), node.get("widgets_values_named")):
+        if isinstance(saved, dict):
+            names.update(name for name, value in saved.items()
+                         if value is not None and _widget(required_of(info, name)))
     return {name for name in names if name}
 
 
@@ -82,25 +91,29 @@ def example_problems(directory: Path, offered: dict) -> list[str]:
             continue
         if not isinstance(data, dict) or not isinstance(data.get("nodes"), list):
             continue
+        subgraphs = {graph.get("id") for graph in (data.get("definitions") or {}).get("subgraphs") or []}
         for where, node in example_nodes(data):
             kind = str(node.get("type"))
-            if kind in FRONTEND_ONLY or SUBGRAPH.match(kind):
+            if kind in FRONTEND_ONLY or kind in subgraphs:
+                continue
+            if SUBGRAPH.fullmatch(kind):
+                problems.append(f"{path.name}: unresolved subgraph '{kind}' (#{node.get('id')}{where})")
                 continue
             info = offered.get(kind)
             if info is None:
                 problems.append(f"{path.name}: this ComfyUI has no node '{kind}' (#{node.get('id')}{where})")
                 continue
             required = set((info.get("input") or {}).get("required") or {})
-            # A saved node without named values (an older save) cannot be
-            # checked by name; its sockets alone would raise false alarms.
-            if not isinstance(node.get("widgets_values_named"), dict) and node.get("widgets_values"):
-                continue
-            given = given_names(node)
+            # Older positional saves cannot identify widgets by name, but
+            # required sockets still need a connection.
+            positional = not isinstance(node.get("widgets_values_named"), dict) and isinstance(node.get("widgets_values"), list) and bool(node["widgets_values"])
+            given = given_names(node, info)
             # An input that grows (values.a, values.b, ...) is saved under
             # its parts' names, and may have none of them filled.
             roots = given | {name.split(".", 1)[0] for name in given}
             for name in sorted(required - roots):
-                if _grows(required_of(info, name)):
+                spec = required_of(info, name)
+                if _grows(spec) or (positional and _widget(spec)):
                     continue
                 problems.append(f"{path.name}: '{kind}' (#{node.get('id')}{where}) now requires '{name}', and the example has no value for it")
     return problems

scripts/dev/face_smoke.mjs

@@ -94,7 +94,10 @@ for (const type of types) {
   const seen = await evalJs(`(async () => {
     const { app } = window;
     app.canvas.linkConnector?.reset?.();
-    app.graph.clear(); app.graph.last_node_id += 50;
+    // clear() resets the counter, but frontend preview caches can outlive
+    // the graph. Reserve fresh ids before clearing so probes stay isolated.
+    const nextNodeId = app.graph.last_node_id + 50;
+    app.graph.clear(); app.graph.last_node_id = nextNodeId;
     let node;
     try { node = window.LiteGraph.createNode(${JSON.stringify(type)}); } catch (error) { return { error: "createNode threw: " + (error?.message ?? error) }; }
     if (!node) return { error: "createNode gave nothing" };

scripts/registry_contract.py

@@ -63,6 +63,23 @@ def _parent_map(tree: ast.AST) -> dict[int, ast.AST]:
     return parents
 
 
+def _bound_names(node: ast.AST) -> set[str]:
+    """Bindings stored as strings rather than ast.Name nodes."""
+    if isinstance(node, ast.Import):
+        return {alias.asname or alias.name.split(".")[0] for alias in node.names}
+    if isinstance(node, ast.ImportFrom):
+        return {alias.asname or alias.name for alias in node.names}
+    if isinstance(node, (ast.FunctionDef, ast.AsyncFunctionDef, ast.ClassDef)):
+        return {node.name}
+    if isinstance(node, ast.arg):
+        return {node.arg}
+    if isinstance(node, (ast.ExceptHandler, ast.MatchAs, ast.MatchStar)):
+        return {node.name} if node.name else set()
+    if isinstance(node, ast.MatchMapping):
+        return {node.rest} if node.rest else set()
+    return set()
+
+
 def _reference_problem(name: str, ref: ast.Name, parents: dict[int, ast.AST]) -> str:
     """Why this mention of a mapping outside its own assignment is refused.
 
@@ -188,6 +205,13 @@ def mapping_problems(source: str, label: str) -> list[str]:
                 f"{label}:{ref.lineno}: {_reference_problem(name, ref, parents)}"
                 " - a scanner reads only the literal"
             )
+        for node in ast.walk(tree):
+            bindings = _bound_names(node)
+            if name in bindings or "*" in bindings:
+                problems.append(
+                    f"{label}:{node.lineno}: {name} may be rebound here "
+                    "- a scanner reads only the literal"
+                )
 
     # The two mappings describe the same nodes, so they carry the same keys.
     if len(literals) == 2:
@@ -248,20 +272,45 @@ def module_list(source: str, name: str = "NODE_MODULES") -> set[str] | None:
         tree = ast.parse(source)
     except SyntaxError:
         return None
-    for node in tree.body:
-        if (
+    declarations = [node for node in tree.body if (
             isinstance(node, ast.Assign)
             and len(node.targets) == 1
             and isinstance(node.targets[0], ast.Name)
             and node.targets[0].id == name
-        ):
-            try:
-                value = ast.literal_eval(node.value)
-            except (ValueError, SyntaxError):
+        )]
+    if len(declarations) != 1:
+        return None
+    declaration = declarations[0]
+    try:
+        value = ast.literal_eval(declaration.value)
+    except (ValueError, SyntaxError):
+        return None
+    if not isinstance(value, (list, tuple, set)) or not all(isinstance(item, str) for item in value):
+        return None
+    parents = _parent_map(tree)
+    for node in ast.walk(tree):
+        bindings = _bound_names(node)
+        if name in bindings or "*" in bindings:
+            return None
+        if isinstance(node, ast.Name) and node.id == name and node is not declaration.targets[0]:
+            parent = parents.get(id(node))
+            # The loader only iterates the list. Passing or aliasing it could
+            # change it somewhere this check cannot follow.
+            if not isinstance(parent, ast.For) or parent.iter is not node:
                 return None
-            if not isinstance(value, (list, tuple, set)):
-                return None
-            return {item for item in value if isinstance(item, str)}
+    return set(value)
+
+
+def registered_class(tree: ast.Module, key: str) -> ast.ClassDef | None:
+    """Resolve a literal registration to its module-level class declaration."""
+    for node in tree.body:
+        if not (isinstance(node, ast.Assign) and isinstance(node.value, ast.Dict)
+                and any(isinstance(t, ast.Name) and t.id == "NODE_CLASS_MAPPINGS" for t in node.targets)):
+            continue
+        for ident, value in zip(node.value.keys, node.value.values):
+            if isinstance(ident, ast.Constant) and ident.value == key and isinstance(value, ast.Name):
+                classes = [item for item in tree.body if isinstance(item, ast.ClassDef) and item.name == value.id]
+                return classes[0] if len(classes) == 1 else None
     return None
 
 

scripts/release_preflight.py

@@ -33,9 +33,11 @@ Checks:
 Exit code 0 = ready to release, 1 = problems printed below.
 """
 
+import ast
 import pathlib
 import re
 import sys
+import tomllib
 
 from changelog_notes import notes_for
 from registry_contract import git_paths
@@ -56,20 +58,27 @@ except OSError as exc:
 if raw.startswith(b"\xef\xbb\xbf"):
     errors.append("pyproject.toml starts with a UTF-8 BOM; save it without one")
 
-match = re.search(rb'^version\s*=\s*"([^"]+)"', raw, re.MULTILINE)
-if match:
-    pyproject_version = match.group(1).decode("ascii", "replace")
+try:
+    project = tomllib.loads(raw.decode("utf-8")).get("project", {})
+except (ValueError, UnicodeError) as exc:
+    errors.append(f"could not parse pyproject.toml: {exc}")
+    project = {}
+version = project.get("version")
+if isinstance(version, str) and version.strip():
+    pyproject_version = version
 else:
-    errors.append('pyproject.toml has no version = "..." line')
+    errors.append("pyproject.toml needs a nonempty project.version string")
 
 # The Registry refuses an upload whose description is over 1000 bytes
 # ("description is too long"), and it says so only after the version is
 # on main.
 DESCRIPTION_LIMIT = 1000
-match = re.search(rb'^description\s*=\s*"([^"]*)"', raw, re.MULTILINE)
-if match and len(match.group(1)) > DESCRIPTION_LIMIT:
+description = project.get("description")
+if not isinstance(description, str) or not description.strip():
+    errors.append("pyproject.toml needs a nonempty project.description string")
+elif len(description.encode("utf-8")) > DESCRIPTION_LIMIT:
     errors.append(
-        f"the pyproject description is {len(match.group(1))} bytes; "
+        f"the pyproject description is {len(description.encode('utf-8'))} bytes; "
         f"the Registry takes {DESCRIPTION_LIMIT} at most"
     )
 
@@ -286,6 +295,7 @@ NETWORK_PATTERNS = {
     ".js": (".connect(",),
     ".mjs": (".connect(",),
 }
+NETWORK_IMPORTS = {"requests", "httpx", "socket", "urllib.request", "http.client", "aiohttp.ClientSession"}
 shipped_source = [ROOT / "__init__.py", *sorted((ROOT / "nodes").rglob("*.py"))]
 shipped_source += sorted(p for p in (ROOT / "js").rglob("*") if p.suffix in (".js", ".mjs"))
 for path in shipped_source:
@@ -296,6 +306,21 @@ for path in shipped_source:
     except OSError as exc:
         errors.append(f"could not read {path.relative_to(ROOT)}: {exc}")
         continue
+    if path.suffix == ".py":
+        try:
+            tree = ast.parse(text)
+        except SyntaxError as exc:
+            errors.append(f"{path.relative_to(ROOT)} cannot be parsed: {exc}")
+            continue
+        imports = []
+        for node in ast.walk(tree):
+            if isinstance(node, ast.Import):
+                imports.extend(alias.name for alias in node.names)
+            elif isinstance(node, ast.ImportFrom) and not node.level:
+                imports.extend(f"{node.module}.{alias.name}" for alias in node.names)
+        for imported in imports:
+            if any(imported == name or imported.startswith(name + ".") for name in NETWORK_IMPORTS):
+                errors.append(f"{path.relative_to(ROOT)} imports {imported}; shipped code makes no network requests")
     for pattern in NETWORK_PATTERNS[path.suffix]:
         if pattern in text:
             errors.append(
@@ -315,7 +340,7 @@ for path in shipped_source:
     relative = path.relative_to(ROOT).as_posix()
     if relative in FETCH_ALLOWED:
         continue
-    if re.search(r"(?<![\w.])fetch\(", path.read_text(encoding="utf-8")):
+    if re.search(r"(?<![\w$])fetch\s*(?:\?\.\s*)?\(", path.read_text(encoding="utf-8")):
         errors.append(
             f"{relative} calls fetch(); only {sorted(FETCH_ALLOWED)} may. "
             "Use api.fetchApi for the pack's own routes."

scripts/validate_nodes.py

@@ -43,6 +43,7 @@ from registry_contract import (
     duplicate_key_problems,
     mapping_problems,
     module_list,
+    registered_class,
     scanned_python_files,
 )
 
@@ -210,9 +211,12 @@ for path in node_files:
     text = path.read_text(encoding="utf-8")
     if path.stem in {"node_image_crop_rotate_pad", "node_video_crop_rotate_pad"}:
         tree = ast.parse(text)
+        key = {"node_image_crop_rotate_pad": "AUSBOSS_NODES_ImageCropRotatePad",
+               "node_video_crop_rotate_pad": "AUSBOSS_NODES_VideoCropRotatePad"}[path.stem]
+        cls = registered_class(tree, key)
         return_types = None
         return_names = None
-        for node in ast.walk(tree):
+        for node in cls.body if cls is not None else []:
             if not isinstance(node, ast.Assign):
                 continue
             for target in node.targets:
@@ -257,13 +261,13 @@ for unlisted_id in sorted(mapping_keys - RELEASED_NODE_IDS):
 # import ever registers, and Manager offered the pack for workflows using
 # them. Fixtures live as .py.txt for this reason - real source, not a module.
 for path in python_files:
-    if path.parent == ROOT / "nodes":
+    if path in node_files:
         continue
     stray = class_mapping_keys(path.read_text(encoding="utf-8"))
     for key in sorted(stray):
         errors.append(
             f"{path.relative_to(ROOT)}: declares mapping key {key} outside "
-            "nodes/, where registry scanners will advertise it as a node"
+            "a registered node module, where registry scanners will advertise it as a node"
         )
 
 # --- 6. public display names carry the pack suffix ---------------------------

scripts/workflow_contract.py

@@ -2,9 +2,14 @@
 
 from __future__ import annotations
 
+import ast
+from functools import lru_cache
 import json
 import re
 from pathlib import Path
+from urllib.parse import unquote, urlsplit
+
+from registry_contract import class_mapping_keys, registered_class
 
 UUID = re.compile(r"[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}")
 # Below this saved zoom the frontend stops drawing widget text (about 0.57 on
@@ -18,6 +23,93 @@ PREFIX_SLOT = {"AUSBOSS_NODES_SaveImage": 0, "AUSBOSS_NODES_SaveVideo": 1}
 # loaders (its CLIP toggle covers the model-only case).
 CORE_LORA_LOADERS = {"LoraLoader", "LoraLoaderModelOnly"}
 
+# Serialized widget slots for the core/frontend nodes used by the examples.
+# Keep this independent of each saved object's named-copy insertion order.
+CORE_WIDGETS = {
+    "UNETLoader": "unet_name weight_dtype",
+    "CLIPLoader": "clip_name type device",
+    "DualCLIPLoader": "clip_name1 clip_name2 type device",
+    "VAELoader": "vae_name",
+    "CheckpointLoaderSimple": "ckpt_name",
+    "MarkdownNote": "text",
+    "Note": "text",
+    "ImageScaleToMaxDimension": "upscale_method largest_size",
+    "TextGenerate": "prompt max_length sampling_mode sampling_mode.temperature sampling_mode.top_k sampling_mode.top_p sampling_mode.min_p sampling_mode.repetition_penalty sampling_mode.seed sampling_mode.presence_penalty thinking use_default_template mtp",
+    "StringConcatenate": "string_a string_b delimiter",
+    "StringFormat": "f_string",
+    "CLIPTextEncode": "text",
+    "KSampler": "seed control_after_generate steps cfg sampler_name scheduler denoise",
+    "LoadImage": "image upload",
+    "EmptyImage": "width height batch_size color",
+    "ImageCompositeMasked": "x y resize_source",
+    "GrowMask": "expand tapered_corners",
+    "LTXVPreprocess": "img_compression",
+    "LTXVConditioning": "frame_rate",
+    "EmptyLTXVLatentVideo": "width height length batch_size",
+    "LTXVAddGuide": "frame_idx strength",
+    "VAEDecodeTiled": "tile_size overlap temporal_size temporal_overlap",
+    "TextEncodeQwenImage21": "prompt negative_prompt resolution",
+    "QwenImage21Cache": "device dtype",
+    "SAM3_Detect": "threshold refine_iterations individual_masks",
+}
+
+
+@lru_cache(maxsize=1)
+def pack_widget_names() -> dict[str, list[str]]:
+    """Read the pack's widget order without importing any node or library."""
+    result = {}
+    for path in sorted((Path(__file__).resolve().parent.parent / "nodes").glob("node_*.py")):
+        source = path.read_text(encoding="utf-8")
+        tree = ast.parse(source)
+        for key in class_mapping_keys(source):
+            cls = registered_class(tree, key)
+            if cls is None:
+                continue
+            names = []
+            upload = False
+            for fn in cls.body:
+                if not isinstance(fn, ast.FunctionDef) or fn.name != "INPUT_TYPES":
+                    continue
+                returned = [n.value for n in ast.walk(fn) if isinstance(n, ast.Return)]
+                if len(returned) != 1 or not isinstance(returned[0], ast.Dict):
+                    continue
+                groups = {k.value: v for k, v in zip(returned[0].keys, returned[0].values) if isinstance(k, ast.Constant)}
+                for group in ("required", "optional"):
+                    inputs = groups.get(group)
+                    if not isinstance(inputs, ast.Dict):
+                        continue
+                    for name, spec in zip(inputs.keys, inputs.values):
+                        if not isinstance(name, ast.Constant) or not isinstance(spec, ast.Tuple) or not spec.elts:
+                            continue
+                        kind = spec.elts[0]
+                        options = spec.elts[1] if len(spec.elts) > 1 else None
+                        flags = {k.value: v.value for k, v in zip(options.keys, options.values)
+                                 if isinstance(k, ast.Constant) and isinstance(v, ast.Constant)} if isinstance(options, ast.Dict) else {}
+                        primitive = isinstance(kind, ast.Constant) and kind.value in ("INT", "FLOAT", "BOOLEAN", "STRING")
+                        combo = isinstance(kind, (ast.List, ast.Call)) or isinstance(kind, ast.Name) and kind.id != "WILDCARD"
+                        if flags.get("forceInput") or not (primitive or combo):
+                            continue
+                        names.append(name.value)
+                        if flags.get("control_after_generate"):
+                            names.append("control_after_generate")
+                        if flags.get("image_upload") or flags.get("video_upload") or flags.get("audio_upload"):
+                            upload = True
+            if upload:
+                names.append("upload")
+            result[key] = names
+    return result
+
+
+def serialized_widget_names(node: dict) -> list[str] | None:
+    kind = node.get("type")
+    if kind in CORE_WIDGETS:
+        return CORE_WIDGETS[kind].split()
+    if kind in pack_widget_names():
+        return pack_widget_names()[kind]
+    if isinstance(kind, str) and UUID.fullmatch(kind):
+        return [entry["widget"]["name"] for entry in node.get("inputs", []) if isinstance(entry.get("widget"), dict)]
+    return None
+
 
 def widget_value_list(node: dict) -> list:
     values = node.get("widgets_values")
@@ -51,19 +143,37 @@ def named_copy_problems(node: dict) -> list[str]:
     values = node.get("widgets_values")
     if not isinstance(named, dict):
         return []
+    placeholders = {key for key, value in named.items() if key.startswith("ausboss_") and value in ("", None)}
+    keys = set(named) - placeholders
     if isinstance(values, dict):
+        # Upload buttons and old panels can have an empty named value even
+        # though the frontend does not serialize them into the primary copy.
+        if "upload" not in values:
+            keys.discard("upload")
         pairs = [(key, named[key], values[key]) for key in named if key in values]
+        unmatched = keys ^ set(values)
     elif isinstance(values, list):
-        # Panel widgets the frontend saves as "" have no positional twin.
-        keys = [key for key in named if not (key.startswith("ausboss_") and named[key] in ("", None))]
-        pairs = [(key, named[key], value) for key, value in zip(keys, values)]
+        slots = serialized_widget_names(node)
+        if slots is None:
+            return [f"node {node['id']} has no known serialized widget slot mapping"]
+        last = max((slots.index(key) for key in keys if key in slots), default=-1) + 1
+        unmatched = keys - set(slots)
+        unmatched.update(key for index, key in enumerate(slots[:last]) if key not in keys or index >= len(values))
+        pairs = [(key, named[key], values[index]) for index, key in enumerate(slots)
+                 if key in keys and index < len(values)]
+        trailing = values[last:]
+        if len(trailing) > len(placeholders) or any(value not in ("", None) for value in trailing):
+            unmatched.add("extra positional values")
     else:
-        return []
+        return [f"node {node['id']} has named widgets without serialized values"]
     stale = [key for key, saved, loaded in pairs if saved != loaded]
-    return [f"node {node['id']} has stale named widget values: {', '.join(stale)}"] if stale else []
+    problems = [f"node {node['id']} has stale named widget values: {', '.join(stale)}"] if stale else []
+    if unmatched:
+        problems.append(f"node {node['id']} has unmatched widget values: {', '.join(sorted(unmatched))}")
+    return problems
 
 
-def workflow_problems(data: dict) -> list[str]:
+def workflow_problems(data: dict, *, _subgraph: bool = False) -> list[str]:
     problems = []
     nodes = data.get("nodes", [])
     if not isinstance(nodes, list) or not nodes:
@@ -71,7 +181,21 @@ def workflow_problems(data: dict) -> list[str]:
     by_id = {n["id"]: n for n in nodes}
     if len(by_id) != len(nodes):
         problems.append("duplicate node ids")
+    if _subgraph:
+        # Boundary nodes are stored separately, with their sockets on the
+        # graph itself. Treat them like nodes for the same link checks.
+        by_id[data["inputNode"]["id"]] = {
+            "id": data["inputNode"]["id"],
+            "outputs": [{"links": entry.get("linkIds", [])} for entry in data.get("inputs", [])],
+        }
+        by_id[data["outputNode"]["id"]] = {
+            "id": data["outputNode"]["id"],
+            "inputs": [{"boundary_links": entry.get("linkIds", [])} for entry in data.get("outputs", [])],
+        }
     links = data.get("links", [])
+    if _subgraph:
+        fields = ("id", "origin_id", "origin_slot", "target_id", "target_slot", "type")
+        links = [[link[key] for key in fields] if isinstance(link, dict) and all(key in link for key in fields) else link for link in links]
     by_link = {link[0]: link for link in links if isinstance(link, list) and len(link) == 6}
     if len(by_link) != len(links):
         problems.append("duplicate or malformed links (expected six fields)")
@@ -88,20 +212,21 @@ def workflow_problems(data: dict) -> list[str]:
             problems.append(f"link {ident} is missing from its source output")
         if not isinstance(target_slot, int) or not 0 <= target_slot < len(inputs):
             problems.append(f"link {ident} has an invalid target slot")
-        elif inputs[target_slot].get("link") != ident:
+        elif ident not in inputs[target_slot].get("boundary_links", [inputs[target_slot].get("link")]):
             problems.append(f"link {ident} is missing from its target input")
-    for n in nodes:
+    for n in by_id.values():
         for slot, inp in enumerate(n.get("inputs", [])):
-            ident = inp.get("link")
-            if ident is not None and (ident not in by_link or by_link[ident][3:5] != [n["id"], slot]):
-                problems.append(f"node {n['id']} input {slot} has a stale link")
+            for ident in inp.get("boundary_links", [inp.get("link")]):
+                if ident is not None and (ident not in by_link or by_link[ident][3:5] != [n["id"], slot]):
+                    problems.append(f"node {n['id']} input {slot} has a stale link")
         for slot, output in enumerate(n.get("outputs", [])):
             for ident in output.get("links") or []:
                 if ident not in by_link or by_link[ident][1:3] != [n["id"], slot]:
                     problems.append(f"node {n['id']} output {slot} has a stale link")
-    if data.get("last_node_id", -1) < max(by_id):
+    counters = data.get("state", {}) if _subgraph else data
+    if counters.get("lastNodeId" if _subgraph else "last_node_id", -1) < max(by_id):
         problems.append("last_node_id is behind the graph")
-    if by_link and data.get("last_link_id", -1) < max(by_link):
+    if by_link and counters.get("lastLinkId" if _subgraph else "last_link_id", -1) < max(by_link):
         problems.append("last_link_id is behind the graph")
 
     ident = data.get("id")
@@ -117,8 +242,19 @@ def workflow_problems(data: dict) -> list[str]:
         selected = selected_files(n)
         for model in (n.get("properties") or {}).get("models") or []:
             name = model.get("name") if isinstance(model, dict) else None
+            if not isinstance(model, dict) or any(not isinstance(model.get(key), str) or not model[key].strip() for key in ("name", "url", "directory")):
+                problems.append(f"node {n['id']} download info needs nonempty name, url and directory strings")
+                continue
             if name and name not in selected:
                 problems.append(f"node {n['id']} carries download info for {name}, which it does not select")
+            try:
+                url = urlsplit(model["url"])
+                valid_url = url.scheme in ("http", "https") and bool(url.netloc)
+                filename = unquote(url.path.rsplit("/", 1)[-1])
+            except ValueError:
+                valid_url, filename = False, ""
+            if not valid_url or filename != name:
+                problems.append(f"node {n['id']} download URL must end with the selected filename {name}")
         if n["type"] in PREFIX_SLOT:
             saved = n.get("widgets_values")
             prefix = saved.get("filename_prefix") if isinstance(saved, dict) else (
@@ -130,7 +266,7 @@ def workflow_problems(data: dict) -> list[str]:
     if not groups:
         problems.append("no stage groups")
     notes = [n for n in nodes if n["type"] in {"AUSBOSS_NODES_WorkflowNote", "AUSBOSS_NODES_WorkflowNoteTile"}]
-    if not notes:
+    if not notes and not _subgraph:
         problems.append("no Workflow Note with setup instructions")
     for n in notes:
         try:
@@ -172,6 +308,9 @@ def workflow_problems(data: dict) -> list[str]:
         for other, ox0, oy0, ox1, oy1 in rectangles[i + 1:]:
             if min(x1, ox1) > max(x0, ox0) + 1 and min(y1, oy1) > max(y0, oy0) + 1:
                 problems.append(f"nodes {ident} and {other} overlap (including title bars)")
+    for graph in (data.get("definitions") or {}).get("subgraphs") or []:
+        label = graph.get("name") or graph.get("id")
+        problems.extend(f"subgraph {label}: {issue}" for issue in workflow_problems(graph, _subgraph=True))
     return problems
 
 

tests/canvas_extensions.test.mjs

@@ -0,0 +1,243 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+import { readFileSync } from "node:fs";
+import vm from "node:vm";
+
+import * as appearance from "../js/shared/appearance.mjs";
+import * as help from "../js/shared/help_badge.mjs";
+import * as line from "../js/shared/line_up.mjs";
+import * as snap from "../js/shared/snap_lines.mjs";
+import { boundsOf } from "../js/shared/outline.mjs";
+
+// Run the real extension entry with a small page and graph in place of ComfyUI.
+function page(name, nodes, { vue = false, hooks = [] } = {}) {
+  const graph = { _nodes: nodes, _groups: [], setDirtyCanvas() {} };
+  const canvas = {
+    graph, selectedItems: new Set(nodes), setDirty() {},
+    canvas: { getBoundingClientRect: () => ({ left: 0, top: 0 }) },
+    ds: { scale: 1, offset: [0, 0] },
+  };
+  const app = { graph, canvas, registerExtension(extension) { this.extension = extension; } };
+  const frames = new Map();
+  let frameId = 0;
+  const cards = [];
+  const context = vm.createContext({
+    ...appearance, ...help, ...line, ...snap, boundsOf,
+    outlineOf: boundsOf, nodeElements: () => new Map(),
+    app, LiteGraph: { vueNodesMode: vue },
+    window: { addEventListener() {}, removeEventListener() {}, innerWidth: 1000 },
+    document: { querySelector: () => null },
+    requestAnimationFrame(fn) { frames.set(++frameId, fn); return frameId; },
+    cancelAnimationFrame(id) { frames.delete(id); },
+    chainCallback(object, key, fn) {
+      const prior = object[key];
+      object[key] = function (...args) {
+        const result = prior?.apply(this, args);
+        fn.apply(this, args);
+        return result;
+      };
+    },
+    chainHandler(object, key, fn) {
+      const prior = object[key];
+      object[key] = function (...args) {
+        const result = prior?.apply(this, args);
+        const handled = fn.apply(this, args);
+        return result || handled;
+      };
+    },
+    isAusbossNode: (node) => node.comfyClass?.startsWith("AUSBOSS_NODES_"),
+    openInfoCard: (card) => cards.push(card),
+    BRAND: "#00b4aa", notifyAusbossChange() {}, showToast() {},
+  });
+  const source = readFileSync(new URL(`../js/${name}/index.js`, import.meta.url), "utf8")
+    .replace(/^import[\s\S]*?;\s*/gm, "");
+  vm.runInContext(`${source}\nglobalThis.hooks = {${hooks.join(",")}};`, context);
+  return {
+    app, extension: app.extension, hooks: context.hooks, cards,
+    flush() { for (const [id, fn] of frames) { frames.delete(id); fn(); } },
+  };
+}
+
+function node(id, x = 0, y = 0, w = 200, h = 100) {
+  return {
+    id, pos: [x, y], size: [w, h], properties: {}, flags: {},
+    comfyClass: "AUSBOSS_NODES_Seed", title: "Seed", constructor: {},
+    get boundingRect() { return [this.pos[0], this.pos[1] - 30, this.size[0], this.size[1] + 30]; },
+    computeSize: () => [100, 50],
+    setSize(size) { this.size = size; },
+  };
+}
+
+function pointer(node, corner = "SE", extra = {}) {
+  const face = { dataset: { nodeId: String(node.id) } };
+  const handle = { dataset: { corner }, closest: () => face };
+  return {
+    button: 0, buttons: 1, clientX: 0, clientY: 0,
+    target: { closest: () => handle }, ...extra,
+  };
+}
+
+function pick(page, node, name) {
+  page.extension.getNodeMenuItems(node).find((item) => item.content === "AusBoss color")
+    .submenu.options.find((item) => item.content === name).callback();
+}
+
+function setting(page, suffix, value) {
+  page.extension.settings.find((item) => item.id.endsWith(suffix)).onChange(value);
+}
+
+function restore(page, saved) {
+  const copy = node(99);
+  page.extension.nodeCreated(copy); // construction precedes saved field restoration
+  Object.assign(copy, JSON.parse(JSON.stringify(saved)));
+  copy.onConfigure?.(saved);
+  return copy;
+}
+
+test("pressing and releasing a resize handle leaves the other selected nodes alone", () => {
+  for (const vue of [false, true]) {
+    const a = node(1), b = node(2, 0, 300, 400);
+    const p = page("line_up", [a, b], { vue, hooks: ["onTogetherDown", "onTogetherMove", "onTogetherUp"] });
+    p.hooks.onTogetherDown(pointer(a));
+    if (!vue) p.app.canvas.resizing_node = a;
+    p.hooks.onTogetherMove(pointer(a));
+    p.flush();
+    p.hooks.onTogetherUp();
+    assert.equal(b.size[0], 400);
+  }
+});
+
+test("resize together still propagates a drag and its return to the starting size", () => {
+  const a = node(1), b = node(2, 0, 300, 400);
+  const p = page("line_up", [a, b], { hooks: ["onTogetherDown", "onTogetherMove", "onTogetherUp"] });
+  p.hooks.onTogetherDown(pointer(a));
+  a.size[0] = 240;
+  p.hooks.onTogetherMove(pointer(a));
+  p.flush();
+  assert.equal(b.size[0], 240);
+  a.size[0] = 200;
+  p.hooks.onTogetherUp();
+  assert.equal(b.size[0], 200);
+});
+
+test("per-node Theme default survives serialization, reload and paste", () => {
+  const a = node(1);
+  const p = page("appearance", [a]);
+  p.extension.nodeCreated(a);
+  pick(p, a, "Theme default");
+  const saved = JSON.parse(JSON.stringify({ properties: a.properties, color: a.color, bgcolor: a.bgcolor }));
+  for (let i = 0; i < 2; i++) {
+    const copy = restore(p, saved);
+    assert.equal(copy.color, undefined);
+    assert.equal(copy.bgcolor, undefined);
+  }
+});
+
+test("explicit color choices keep following the node instead of the global scheme", () => {
+  for (const name of ["AusBoss", "Theme default", "Custom"]) {
+    const a = node(1);
+    const p = page("appearance", [a]);
+    p.extension.nodeCreated(a);
+    pick(p, a, name);
+    const chosen = { color: a.color, bgcolor: a.bgcolor };
+    setting(p, "NodeColor", "Slate");
+    assert.deepEqual({ color: a.color, bgcolor: a.bgcolor }, chosen, name);
+    const copy = restore(p, { properties: a.properties, ...chosen });
+    assert.deepEqual({ color: copy.color, bgcolor: copy.bgcolor }, chosen, name);
+  }
+});
+
+for (const corner of ["SE", "NE", "SW", "NW"]) {
+  test(`Nodes 2.0 ${corner} resize snaps only the moving edges`, () => {
+    const a = node(1, 0, 0, 280, 100);
+    const west = corner.includes("W"), north = corner.includes("N");
+    const b = node(2, west ? -20 : 300, north ? -200 : 400, 100, 100);
+    const p = page("snap_lines", [a, b], { vue: true, hooks: ["onPointerDown", "onPointerMove", "end"] });
+    p.hooks.onPointerDown(pointer(a, corner));
+    if (west) { a.pos[0] = -16; a.size[0] = 296; }
+    else a.size[0] = 296;
+    if (north) { a.pos[1] = -66; a.size[1] = 166; }
+    p.hooks.onPointerMove(pointer(a, corner));
+    p.flush();
+    assert.equal(a.size[0], 300);
+    assert.equal(a.pos[0], west ? -20 : 0);
+    assert.equal(a.pos[0] + a.size[0], west ? 280 : 300);
+    if (north) {
+      assert.equal(a.pos[1], -70);
+      assert.equal(a.pos[1] + a.size[1], 100);
+    }
+    p.hooks.end();
+    a.size[0] = 296;
+    p.hooks.onPointerMove(pointer(a, corner));
+    p.flush();
+    assert.equal(a.size[0], 296, "release clears the captured handle");
+  });
+}
+
+test("Nodes 2.0 resize lets Shift bypass snapping", () => {
+  const a = node(1, 0, 0, 280), b = node(2, 300, 400, 100);
+  const p = page("snap_lines", [a, b], { vue: true, hooks: ["onPointerDown", "onPointerMove"] });
+  p.hooks.onPointerDown(pointer(a));
+  a.size[0] = 296;
+  p.hooks.onPointerMove(pointer(a, "SE", { shiftKey: true }));
+  p.flush();
+  assert.equal(a.size[0], 296);
+});
+
+test("titled Nodes 2.0 nodes offer an About card in the context menu", () => {
+  const a = node(1);
+  const p = page("appearance", [a], { vue: true });
+  p.extension.nodeCreated(a);
+  const about = p.extension.getNodeMenuItems(a).find((item) => item.content === "About this node");
+  assert.ok(about);
+  about.callback();
+  assert.equal(p.cards[0].title, "Seed");
+});
+
+test("an invalid Custom edit preserves the last valid color for later sweeps", () => {
+  const a = node(1);
+  const p = page("appearance", [a]);
+  p.extension.nodeCreated(a);
+  setting(p, "NodeColor", "Custom");
+  const before = a.color;
+  setting(p, "CustomColor", "bad");
+  assert.equal(a.color, before);
+  setting(p, "CustomColor", "ff0000");
+  assert.equal(a.color, "#ff0000");
+  setting(p, "NodeColor", "Slate");
+  assert.equal(a.color, appearance.schemeColors("Slate").title);
+});
+
+test("saved legacy colors migrate after configuration, including Theme default", () => {
+  for (const name of ["AusBoss", "Slate", "Theme default"]) {
+    const p = page("appearance", []);
+    setting(p, "NodeColor", name);
+    const old = appearance.LEGACY_SCHEME_PAIRS[0];
+    const copy = restore(p, { color: old.title, bgcolor: old.body, properties: {} });
+    assert.equal(copy.color, appearance.schemeColors(name)?.title);
+    assert.equal(copy.bgcolor, appearance.schemeColors(name)?.body);
+  }
+});
+
+test("restoration preserves manual colors and chains the existing configure callback", () => {
+  const a = node(1);
+  const p = page("appearance", [a]);
+  let calls = 0;
+  a.onConfigure = function () { assert.equal(this, a); calls++; return 42; };
+  p.extension.nodeCreated(a);
+  Object.assign(a, { color: "#123456", bgcolor: "#654321" });
+  assert.equal(a.onConfigure({}), 42);
+  assert.equal(calls, 1);
+  assert.equal(a.color, "#123456");
+  assert.equal(a.bgcolor, "#654321");
+});
+
+test("a later manual color edit wins over an earlier menu choice on reload", () => {
+  const a = node(1);
+  const p = page("appearance", [a]);
+  p.extension.nodeCreated(a);
+  pick(p, a, "Theme default");
+  const copy = restore(p, { properties: a.properties, color: "#123456", bgcolor: "#654321" });
+  assert.equal(copy.color, "#123456");
+  assert.equal(copy.bgcolor, "#654321");
+});

tests/canvas_passthrough.test.mjs

@@ -45,6 +45,30 @@ test("middle button and Ctrl+Shift drag go to the graph; ordinary clicks do not"
   assert.equal(graphDragStarts({ button: 0, buttons: 1, ctrlKey: true }, on), false);
 });
 
+test("horizontal wheel stays in a scrollable code block until its edge", () => {
+  const root = { parentElement: null };
+  const code = {
+    tagName: "PRE", parentElement: root,
+    scrollWidth: 1000, clientWidth: 200, scrollLeft: 0,
+    scrollHeight: 50, clientHeight: 50, scrollTop: 0,
+  };
+  const context = { root, styleOf: () => ({ overflowX: "auto", overflowY: "auto" }) };
+  const keeps = (deltaX, deltaY = 0) => panelKeepsWheel(code, { deltaX, deltaY }, context);
+  assert.equal(keeps(80), true);
+  assert.equal(keeps(-80), false);
+  code.scrollLeft = 400;
+  assert.equal(keeps(-80), true);
+  assert.equal(keeps(80, 80), true, "diagonal scroll with horizontal room");
+  code.scrollLeft = 800;
+  assert.equal(keeps(80), false);
+  assert.equal(keeps(-80), true);
+  code.scrollWidth = 200;
+  assert.equal(keeps(80), false);
+  code.scrollWidth = 1000;
+  context.styleOf = () => ({ overflowX: "hidden" });
+  assert.equal(keeps(-80), false, "hidden overflow cannot keep the wheel");
+});
+
 test("only the pack's own panels count, in both node renderers", () => {
   const chain = (host, ...classes) => {
     let parent = host;

tests/face_smoke.test.mjs

@@ -0,0 +1,28 @@
+import assert from "node:assert/strict";
+import { readFileSync } from "node:fs";
+import test from "node:test";
+import vm from "node:vm";
+
+test("face smoke gives each probe a fresh node id after clearing the graph", () => {
+  const source = readFileSync(new URL("../scripts/dev/face_smoke.mjs", import.meta.url), "utf8");
+  // Run the browser setup used by every probe. ComfyUI clears the node-id
+  // counter with the graph, but output/preview caches can retain those ids.
+  const setup = source.match(/const seen = await evalJs\(`\(async \(\) => \{([\s\S]*?)\n    let node;/)?.[1];
+  assert.ok(setup, "the browser probe setup must be exercised");
+  const previews = new Map();
+  const graph = { last_node_id: 0, clear() { this.last_node_id = 0; } };
+  let resets = 0;
+  const context = vm.createContext({ window: { app: {
+    graph, canvas: { linkConnector: { reset() { resets++; } } },
+  } } });
+  const ids = [];
+  for (let probe = 0; probe < 48; probe++) {
+    vm.runInContext(`(() => { ${setup} })()`, context);
+    const id = ++graph.last_node_id;
+    assert.equal(previews.has(id), false, "a later node must not inherit an earlier node's preview");
+    previews.set(id, `preview-${probe}`);
+    ids.push(id);
+  }
+  assert.equal(new Set(ids).size, 48);
+  assert.equal(resets, 48);
+});

tests/fixtures/node_api.json

@@ -687,7 +687,8 @@
       "free_vram",
       "invert",
       "ask",
-      "fine_edges"
+      "fine_edges",
+      "new_picture"
     ],
     "outputs": [
       [

tests/image_folder_lifecycle.test.mjs

@@ -0,0 +1,238 @@
+import assert from 'node:assert/strict';
+import fs from 'node:fs';
+import vm from 'node:vm';
+import { getEventListeners, setMaxListeners } from 'node:events';
+import test from 'node:test';
+import * as helpers from '../js/shared/image_folder.mjs';
+import * as scope from '../js/shared/prompt_scope.mjs';
+import * as math from '../js/shared/widget_card_math.mjs';
+import * as layout from '../js/shared/panel_layout.mjs';
+class Element extends EventTarget {
+  constructor(tag = 'div') {
+    super(); setMaxListeners(0, this); this.tagName = tag.toUpperCase(); this.children = []; this.style = {}; this.dataset = {}; this.className = ''; this.textContent = ''; this.parentElement = null; this.isConnected = true;
+    this.classList = {
+      contains: name => this.className.split(' ').includes(name),
+      add: name => { if (!this.classList.contains(name)) this.className += ` ${name}`; },
+      remove: name => { this.className = this.className.split(' ').filter(x => x !== name).join(' '); },
+      toggle: (name, on) => on ? this.classList.add(name) : this.classList.remove(name)
+    };
+  }
+  append(...items) { for (const item of items) { this.children.push(item); item.parentElement = this; } }
+  appendChild(item) { this.append(item); return item; }
+  replaceChildren(...items) { this.children = []; this.append(...items); }
+  remove() { if (this.parentElement) this.parentElement.children = this.parentElement.children.filter(x => x !== this); this.isConnected = false; }
+  contains(target) { return this === target || this.children.some(x => x.contains(target)); }
+  matches(query) { return query.startsWith('.') ? this.classList.contains(query.slice(1)) : this.tagName.toLowerCase() === query; }
+  closest(query) { return this.matches(query) ? this : this.parentElement?.closest(query) ?? null; }
+  querySelector(query) { for (const child of this.children) { if (child.matches(query)) return child; const found = child.querySelector(query); if (found) return found; } return null; }
+  get firstChild() { return this.children[0]; }
+  get lastChild() { return this.children.at(-1); }
+  getBoundingClientRect() { return {left: 20, top: 20, bottom: 200, width: 340}; }
+  click() { this.dispatchEvent(new Event('click')); }
+}
+
+function harness() {
+  const timers = new Map(); let timerId = 0;
+  const document = { head: new Element('head'), body: new Element('body'), createElement: tag => new Element(tag), createTextNode: text => Object.assign(new Element('text'), {textContent: text}), getElementById: () => null };
+  const window = Object.assign(new EventTarget(), {innerWidth: 1000, innerHeight: 800});
+  const messages = [];
+  const app = {canvas: {}, registerExtension(extension) { this.extension = extension; }, extensionManager: {toast: {add(message) { messages.push(message); }}}};
+  const pending = [];
+  const api = {apiURL: x => x, fetchApi: (url, options) => new Promise((resolve, reject) => pending.push({url, options, resolve, reject}))};
+  class FormData { constructor() { this.fields = {}; } append(key, value) { this.fields[key] = value; } }
+  const context = vm.createContext({console, document, window, app, api, AbortController: class extends AbortController { constructor() { super(); setMaxListeners(0, this.signal); } }, performance, FormData, queueMicrotask, ...helpers, ...scope, commitWidgetValue: math.commitWidgetValue, fillNodeHeight: layout.fillNodeHeight,
+    setTimeout: (fn, delay) => { const id = ++timerId; timers.set(id, {fn, delay}); return id; }, clearTimeout: id => timers.delete(id)});
+  function strip(source) { return source.replace(/^import[\s\S]*?;\n/gm, '').replace(/^export /gm, ''); }
+  vm.runInContext(strip(fs.readFileSync(new URL('../js/shared/index.mjs', import.meta.url), 'utf8')), context);
+  vm.runInContext(strip(fs.readFileSync(new URL('../js/image_folder/index.js', import.meta.url), 'utf8')) + '\nglobalThis.review = {buildPanel, refresh, write, copyFolder, addFiles, browse, closeBrowse, addMenu, closeMenu, askBig, closeAsk, paint, scheduleRefresh};', context);
+  const r = context.review;
+  class FolderNode {
+    constructor(values = {}) {
+      this.widgets = Object.entries({source:'input', folder:'', subfolders:false, sort:'name', pictures:'', run:'all in one run', position:1, after_run:'next', at_the_end:'stop the run', ...values}).map(([name,value]) => ({name,value}));
+      this.inputs = []; this.size = [340,400]; this.onNodeCreated();
+    }
+    addDOMWidget(name, type, element, options) { const w = {name,type,element,options,node:this}; this.widgets.push(w); return w; }
+    computeSize() { return [320,300]; }
+    setSize(size) { this.size = size; }
+  }
+  app.extension.beforeRegisterNodeDef(FolderNode, {name:'AUSBOSS_NODES_ImageFolder'});
+  const value = (node, name) => node.widgets.find(w => w.name === name).value;
+  const flush = async () => { for (let i=0;i<10;i++) await Promise.resolve(); };
+  const ok = data => ({ok:true, json:async () => data});
+  const newNode = values => { const n = new FolderNode(values); timers.clear(); return n; };
+  const image = name => ({file:{name,size:1,type:'image/png'},folder:''});
+
+  return {r, newNode, pending, messages, document, window, timers, value, flush, ok, image};
+}
+
+for (const change of ['edit', 'configure']) {
+  test(`a pending listing cannot overwrite a later ${change}`, async () => {
+    const {r, newNode, pending, value, ok, flush} = harness();
+    const n = newNode({folder: 'a//'}), s = n.__ausbossImageFolder;
+    const task = r.refresh(s), old = pending.shift();
+    if (change === 'edit') r.write(n, 'folder', 'b');
+    else {
+      n.widgets.find(w => w.name === 'folder').value = 'b';
+      n.onConfigure({size: [320, 400]});
+      await flush();
+    }
+    old.resolve(ok({source: 'input', folder: 'a', pictures: [{name: 'old.png'}]}));
+    await task;
+    assert.equal(value(n, 'folder'), 'b');
+    assert.equal(s.list.length, 0);
+  });
+}
+
+test('folder copies lock before confirmation and release after completion', async () => {
+  const {r, newNode, pending, value, ok, flush, image} = harness();
+  const n = newNode(), s = n.__ausbossImageFolder;
+  const first = r.copyFolder(s, 'first', [image('a.png')]);
+  const second = r.copyFolder(s, 'second', [image('b.png')]);
+  await flush();
+  assert.equal(pending.length, 1);
+  pending.shift().resolve(ok({name: 'a.png'}));
+  await Promise.all([first, second]);
+  assert.equal(value(n, 'folder'), 'first');
+  const third = r.copyFolder(s, 'third', [image('c.png')]);
+  await flush();
+  assert.equal(pending.length, 1);
+  pending.shift().resolve(ok({name: 'c.png'}));
+  await third;
+  assert.equal(value(n, 'folder'), 'third');
+});
+
+test('confirmation also holds the folder-copy lock', async () => {
+  const {r, newNode, pending, ok, flush, image} = harness();
+  const s = newNode().__ausbossImageFolder;
+  const first = r.copyFolder(s, 'big', Array.from({length: 301}, () => image('a.png')));
+  const second = r.copyFolder(s, 'second', [image('b.png')]);
+  await flush();
+  assert.equal(pending.length, 0);
+  r.closeAsk(false);
+  await Promise.all([first, second]);
+  const next = r.copyFolder(s, 'next', [image('c.png')]);
+  await flush();
+  pending.shift().resolve(ok({name: 'c.png'}));
+  await next;
+});
+
+for (const at_the_end of ['stop the run', 'start over']) {
+  test(`queue advancement ignores missing and stale listings with ${at_the_end}`, () => {
+    const {newNode, value} = harness();
+    const n = newNode({run: 'one per run', at_the_end}), s = n.__ausbossImageFolder;
+    const position = n.widgets.find(w => w.name === 'position');
+    for (let i = 1; i <= 3; i++) {
+      assert.equal(value(n, 'position'), i);
+      position.afterQueued({isPartialExecution: false});
+    }
+    s.names = ['a.png', 'b.png'];
+    n.inputs.push({name: 'folder', link: 42});
+    for (let i = 4; i <= 8; i++) {
+      assert.equal(value(n, 'position'), i);
+      position.afterQueued({isPartialExecution: false});
+    }
+    position.afterQueued({isPartialExecution: true});
+    assert.equal(value(n, 'position'), 9);
+    n.inputs.push({name: 'position', link: 43});
+    position.afterQueued({isPartialExecution: false});
+    assert.equal(value(n, 'position'), 9);
+  });
+}
+
+test('removing a node stops loose uploads and completion work', async () => {
+  const {r, newNode, pending, messages, ok} = harness();
+  const n = newNode(), s = n.__ausbossImageFolder;
+  const task = r.addFiles(s, [{name: 'a.png'}, {name: 'b.png'}]);
+  const first = pending.shift();
+  n.onRemoved();
+  first.resolve(ok({name: 'a.png'}));
+  // Let a broken implementation finish so a failure does not leave a pending test.
+  for (let i = 0; i < 20; i++) await Promise.resolve();
+  const extra = pending.splice(0);
+  for (const request of extra) request.resolve(ok({name: 'b.png'}));
+  await task;
+  assert.equal(extra.length, 0);
+  assert.equal(messages.length, 0);
+});
+
+test('Browse accepts only the newest navigation response', async () => {
+  const {r, newNode, pending, document, value, ok, flush} = harness();
+  const n = newNode({folder: 'album'});
+  const task = r.browse(n.__ausbossImageFolder);
+  pending.shift().resolve(ok({source: 'input', folder: 'album', folders: ['a', 'b']}));
+  await task;
+  const root = document.body.querySelector('.ausboss-if-browse');
+  const list = root.querySelector('.ausboss-if-browse-list');
+  list.children.find(x => x.textContent === 'a').click();
+  list.children.find(x => x.textContent === 'b').click();
+  const a = pending.shift(), b = pending.shift();
+  b.resolve(ok({source: 'input', folder: 'album/b', folders: []}));
+  await flush();
+  a.resolve(ok({source: 'input', folder: 'album/a', folders: []}));
+  await flush();
+  root.querySelector('.use').click();
+  assert.equal(value(n, 'folder'), 'album/b');
+});
+
+test('Browse keeps the returned source through navigation and selection', async () => {
+  const {r, newNode, pending, document, value, ok, flush} = harness();
+  const n = newNode({folder: '/server/output/album'});
+  const task = r.browse(n.__ausbossImageFolder);
+  pending.shift().resolve(ok({source: 'output', folder: 'album', folders: ['child']}));
+  await task;
+  const root = document.body.querySelector('.ausboss-if-browse');
+  root.querySelector('.ausboss-if-browse-list').children.find(x => x.textContent === 'child').click();
+  const request = pending.shift();
+  assert.match(request.url, /source=output/);
+  request.resolve(ok({source: 'output', folder: 'album/child', folders: []}));
+  await flush();
+  root.querySelector('.use').click();
+  assert.equal(value(n, 'source'), 'output');
+  assert.equal(value(n, 'folder'), 'album/child');
+});
+
+for (const kind of ['menu', 'browse', 'ask']) {
+  test(`removal closes only the owner's ${kind}, even with a connected grid`, async () => {
+    const {r, newNode, pending, document, window, ok, image} = harness();
+    const a = newNode(), b = newNode(), s = b.__ausbossImageFolder;
+    let task;
+    if (kind === 'menu') r.addMenu(s, s.add);
+    if (kind === 'browse') {
+      task = r.browse(s);
+      pending.shift().resolve(ok({source: 'input', folder: '', folders: []}));
+      await task;
+    }
+    if (kind === 'ask') task = r.askBig(s, 'big', Array.from({length: 301}, () => image('a.png')));
+    const selector = `.ausboss-if-${kind}`;
+    const listenerCount = getEventListeners(window, 'keydown').length;
+    assert.ok(listenerCount > 0);
+    a.onRemoved();
+    assert.ok(document.body.querySelector(selector));
+    assert.equal(getEventListeners(window, 'keydown').length, listenerCount);
+    assert.equal(s.grid.isConnected, true);
+    b.onRemoved();
+    assert.equal(document.body.querySelector(selector), null);
+    assert.equal(getEventListeners(window, 'keydown').length, 0);
+    if (kind === 'ask') assert.equal(await task, false);
+    window.dispatchEvent(new Event('keydown'));
+  });
+}
+
+test('completion marks reset for another folder and reject old results', async () => {
+  const {r, newNode, pending, ok} = harness();
+  const n = newNode({folder: 'album-a'}), s = n.__ausbossImageFolder;
+  const note = {count: 1, loaded: [1], names: ['same.png'], context: {source: 'input', folder: 'album-a', subfolders: false}};
+  n.onExecuted({ausboss_image_folder: [note]});
+  assert.equal(s.done.has('same.png'), true);
+  r.write(n, 'folder', 'album-b');
+  assert.equal(s.done.size, 0);
+  assert.equal(s.loadedLine, '');
+  n.onExecuted({ausboss_image_folder: [note]});
+  assert.equal(s.done.size, 0);
+  const task = r.refresh(s);
+  pending.shift().resolve(ok({source: 'input', folder: 'album-b', pictures: [{name: 'same.png'}]}));
+  await task;
+  assert.equal(s.cells.get('same.png').classList.contains('done'), false);
+  n.onExecuted({ausboss_image_folder: [{...note, context: {...note.context, folder: 'album-b'}}]});
+  assert.equal(s.done.has('same.png'), true);
+});

tests/inpaint_help.test.mjs

@@ -0,0 +1,26 @@
+import assert from "node:assert/strict";
+import { readFileSync } from "node:fs";
+import test from "node:test";
+
+const read = (path) => readFileSync(new URL(`../${path}`, import.meta.url), "utf8");
+
+test("the unchanged-crop guarantee excludes resizing", () => {
+  const help = read("js/docs/AUSBOSS_NODES_StitchInpaint.md");
+  const guarantee = help.match(/- With the classic seam, feeding the crop[\s\S]*?(?=\n- )/)[0];
+  assert.match(guarantee, /no resizing|never resized/);
+});
+
+test("Max zoom explains the extra allowance for padded reframing", () => {
+  const help = read("js/docs/AUSBOSS_NODES_RealignToSource.md");
+  const control = help.match(/- \*\*Max zoom\*\*:[\s\S]*?(?=\n\n)/)[0];
+  assert.match(control, /padded[\s\S]*extra allowance/);
+  assert.match(control, /Zooming out[\s\S]*stated limit/);
+});
+
+test("the technical starting Multiple agrees with the node default", () => {
+  const help = read("js/docs/AUSBOSS_NODES_CropForInpaint.md");
+  const source = read("nodes/node_inpaint_crop_stitch.py");
+  const defaultMultiple = source.match(/"output_multiple"[\s\S]*?"default": (\d+)/)[1];
+  const documented = help.match(/Starting values:[\s\S]*?Multiple `(\d+)`/)[1];
+  assert.equal(documented, defaultMultiple);
+});

tests/preview_lifecycle.test.mjs

@@ -0,0 +1,270 @@
+import assert from "node:assert/strict";
+import { readFileSync } from "node:fs";
+import test from "node:test";
+import vm from "node:vm";
+
+import * as preview from "../js/shared/input_preview.mjs";
+import { saveRequest, savedMessage } from "../js/shared/compare_erase.mjs";
+
+const read = (file) => readFileSync(new URL(`../${file}`, import.meta.url), "utf8");
+const COMPARE = "js/compare/index.js";
+const ERASE = "js/shared/compare_erase_stage.mjs";
+const PREVIEW = "js/input_preview/index.js";
+const SAVER = "js/save_image/index.js";
+
+function part(file, start, end) {
+  const source = read(file);
+  const first = source.indexOf(start);
+  const last = source.indexOf(end, first + start.length);
+  assert.ok(first >= 0 && last > first, `Missing function boundary in ${file}`);
+  return source.slice(first, last);
+}
+
+function chainCallback(target, name, callback) {
+  const prior = target[name];
+  target[name] = function (...args) {
+    const result = prior?.apply(this, args);
+    callback.apply(this, args);
+    return result;
+  };
+}
+
+function pendingRequest() {
+  let resolve;
+  const pending = new Promise((done) => { resolve = done; });
+  return {
+    api: { fetchApi: () => pending },
+    reply: (answer, ok = true) => resolve({ ok, status: ok ? 200 : 400, json: async () => answer }),
+  };
+}
+
+function eraseContext(request) {
+  const toasts = [];
+  const context = vm.createContext({
+    api: request.api, ALIGN_ROUTE: "/align", SAVE_ROUTE: "/save",
+    LAYERS_PROPERTY: "layers", NAME_PROPERTY: "name", saveRequest, savedMessage,
+    syncTools() {}, topOf: () => "A", showToast: (message) => toasts.push(message),
+  });
+  vm.runInContext(part(ERASE, "async function save(er)", "// The mix as a PNG"), context);
+  return { context, toasts };
+}
+
+const pair = (index) => ({ a: { filename: `a${index}.png` }, b: { filename: `b${index}.png` }, pair: `pair${index}` });
+const aligned = { aligned: true, b: { filename: "aligned-b1.png" }, pair: "aligned1" };
+
+test("Align ignores a reply after changing pairs or removing its panel", async () => {
+  for (const change of ["pair", "removed", "reload"]) {
+    const request = pendingRequest();
+    const { context, toasts } = eraseContext(request);
+    const abort = new AbortController();
+    const received = [];
+    const er = { refs: pair(1), picturesVersion: 1, signal: abort.signal, onAligned: (refs) => received.push(refs) };
+    const pending = context.align(er);
+    if (change === "pair") er.refs = pair(2);
+    if (change === "removed") abort.abort();
+    if (change === "reload") er.picturesVersion += 1;
+    request.reply(aligned);
+    await pending;
+    assert.equal(received.length, 0, change);
+    assert.equal(toasts.length, 0, change);
+    assert.equal(er.aligning, false);
+  }
+});
+
+test("Align keeps the requested A and original pair on a current reply", async () => {
+  const request = pendingRequest();
+  const { context, toasts } = eraseContext(request);
+  const original = pair(1);
+  let received;
+  const er = { refs: original, picturesVersion: 1, signal: new AbortController().signal, onAligned: (refs) => { received = refs; } };
+  const pending = context.align(er);
+  request.reply(aligned);
+  await pending;
+  assert.equal(received.a, original.a);
+  assert.equal(received.b, aligned.b);
+  assert.equal(received.original, original);
+  assert.equal(received.pair, aligned.pair);
+  assert.equal(toasts[0].severity, "success");
+});
+
+test("Save ignores UI callbacks after removal, for successful and failed replies", async () => {
+  for (const ok of [true, false]) {
+    const request = pendingRequest();
+    const { context, toasts } = eraseContext(request);
+    const abort = new AbortController();
+    let callbacks = 0;
+    const er = {
+      refs: pair(1), node: { properties: {} }, strokes: [], signal: abort.signal,
+      onSaved() { callbacks += 1; throw new Error("Removed panel"); },
+    };
+    const pending = context.save(er);
+    abort.abort();
+    request.reply({ files: [{ filename: "mix.png" }], error: "save failed" }, ok);
+    await pending;
+    assert.equal(callbacks, 0);
+    assert.equal(toasts.length, 0);
+    assert.equal(er.saving, false);
+  }
+});
+
+test("Save still reports success and delivers files while its panel is alive", async () => {
+  const request = pendingRequest();
+  const { context, toasts } = eraseContext(request);
+  const files = [{ filename: "mix.png" }];
+  let received;
+  const er = { refs: pair(1), node: {}, strokes: [], signal: new AbortController().signal, onSaved: (value) => { received = value; } };
+  const pending = context.save(er);
+  request.reply({ files });
+  await pending;
+  assert.equal(received, files);
+  assert.deepEqual(toasts.map((toast) => toast.severity), ["success"]);
+});
+
+function previewContext(extra = {}) {
+  const context = vm.createContext({
+    ...preview, BRAND: "#00b4aa", chainCallback,
+    api: { addEventListener() {}, apiURL: (url) => url },
+    app: { registerExtension(extension) { this.extension = extension; } },
+    setTimeout, clearTimeout, queueMicrotask, stepRun: () => ({}), ...extra,
+  });
+  const source = read(PREVIEW).replace(/^import\s[\s\S]*?from\s+"[^"]+";\s*/gm, "");
+  vm.runInContext(source, context);
+  return context;
+}
+
+test("shared source watchers unsubscribe in either order without retaining callbacks", () => {
+  const refreshed = [];
+  const context = previewContext();
+  context.scheduleRefresh = (state) => refreshed.push(state);
+  let calls = 0;
+  const receiver = {};
+  const original = function (value) { assert.equal(this, receiver); calls += 1; return value; };
+  const widget = { name: "image", callback: original };
+  const source = { widgets: [widget] };
+  for (const order of [[0, 1], [1, 0]]) {
+    for (let cycle = 0; cycle < 100; cycle += 1) {
+      const states = [{ alive: true }, { alive: true }];
+      states.forEach((state) => context.rewatchSource(state, source));
+      refreshed.length = 0;
+      assert.equal(widget.callback.call(receiver, 17), 17);
+      assert.deepEqual(refreshed, states);
+      context.unwatchSource(states[order[0]]);
+      refreshed.length = 0;
+      widget.callback.call(receiver, 18);
+      assert.deepEqual(refreshed, [states[order[1]]]);
+      context.unwatchSource(states[order[1]]);
+      assert.equal(widget.callback, original);
+    }
+  }
+  assert.equal(calls, 400);
+});
+
+function media() {
+  return {
+    attributes: new Map(), assigned: [], pauses: 0,
+    getAttribute(name) { return this.attributes.get(name) ?? null; },
+    removeAttribute(name) { this.attributes.delete(name); },
+    set src(url) { this.attributes.set("src", url); this.assigned.push(url); },
+    pause() { this.pauses += 1; }, load() {},
+  };
+}
+const classes = () => ({ remove() {}, toggle() {} });
+
+test("disabled previews clear images and videos and refresh never fetches them", () => {
+  const context = previewContext({
+    keepIndex: () => 0, growToNodeFloor() {},
+    app: { nodeOutputs: { 7: { images: [{ filename: "saved.png", type: "output" }] } }, registerExtension() {} },
+  });
+  const graph = { getNodeById() { return null; } };
+  graph.rootGraph = graph;
+  const state = {
+    alive: true, node: { id: 7, graph, inputs: [], imgs: [] }, inputName: "images", index: 0,
+    previewWidget: { value: false }, root: { classList: classes() }, stage: { classList: classes() },
+    img: media(), video: media(), stepper: { root: { hidden: true }, set() {} }, hint: {},
+  };
+  state.img.src = "old.png";
+  state.video.src = "old.mp4";
+  context.syncPreviewMode(state, false);
+  assert.equal(state.img.getAttribute("src"), null);
+  assert.equal(state.video.getAttribute("src"), null);
+  context.refresh(state);
+  assert.equal(state.img.getAttribute("src"), null);
+  assert.equal(state.video.getAttribute("src"), null);
+  assert.equal(state.img.assigned.length, 1);
+  assert.equal(state.video.assigned.length, 1);
+  assert.ok(state.video.pauses > 0);
+  state.previewWidget.value = true;
+  context.refresh(state);
+  assert.match(state.img.getAttribute("src"), /saved\.png/);
+});
+
+test("deferred configuration cannot recreate removed or replaced panels", () => {
+  for (const kind of ["compare", "preview"]) {
+    for (const replace of [false, true]) {
+      const queued = [];
+      let rebuilt = 0;
+      const context = vm.createContext({
+        app: { registerExtension(extension) { this.extension = extension; } },
+        chainCallback, queueMicrotask: (fn) => queued.push(fn), clearTimeout,
+        hideInputsInDef() {}, livePanels: new Set(), unwatchSource() {}, clearMedia() {},
+        buildPanel() { rebuilt += 1; return { eraser: {}, alive: true }; },
+        syncErase() {}, syncAdvanced() {}, scheduleRefresh() {}, getMode: () => "slide", updateModeButtons() {},
+      });
+      const file = kind === "compare" ? COMPARE : PREVIEW;
+      vm.runInContext('const NODE_NAME="Compare"; const REST_SETTING="test"; const NODE_CONFIG={Preview:{}}; const INPUT_SIDE=1;'
+        + read(file).slice(read(file).indexOf("app.registerExtension({")), context);
+      function Node() {}
+      context.app.extension.beforeRegisterNodeDef(Node, { name: kind === "compare" ? "Compare" : "Preview" });
+      const node = new Node();
+      const key = kind === "compare" ? "__ausbossCompare" : "__ausbossInputPreview";
+      const abort = new AbortController();
+      const state = { abort, alive: true };
+      node[key] = state;
+      node.onConfigure();
+      node.onRemoved();
+      const replacement = replace ? { abort: new AbortController(), alive: true } : null;
+      node[key] = replacement;
+      queued.forEach((fn) => fn());
+      assert.equal(rebuilt, 0, kind);
+      assert.equal(node[key], replacement);
+    }
+  }
+});
+
+test("Browse invalidates the old saved path when changing destination", async () => {
+  const elements = [];
+  function el(tag, className = "", textContent = "") {
+    return {
+      tag, className, textContent, style: {}, children: [], events: {},
+      append(...items) { this.children.push(...items); },
+      addEventListener(name, fn) { this.events[name] = fn; }, remove() {}, contains() { return false; },
+    };
+  }
+  const state = { node: {}, savedPath: "old/shot_00001.png", refresh() {} };
+  let folder = "old";
+  const context = vm.createContext({
+    el, document: { body: { append: (element) => elements.push(element) } },
+    window: { innerWidth: 1000, addEventListener() {} }, AbortController,
+    value: () => folder, setValue: (_node, _name, next) => { folder = next; }, notifyAusbossChange() {},
+    api: { fetchApi: async () => ({ ok: true, json: async () => ({ path: "new", folders: [] }) }) },
+  });
+  vm.runInContext(part(SAVER, "let openPopup = null;", "// ---------- the card"), context);
+  await context.openBrowse(state, { getBoundingClientRect: () => ({ left: 0, bottom: 40 }) });
+  elements[0].children.find((child) => child.className === "use").events.click();
+  assert.equal(folder, "new");
+  assert.equal(state.savedPath, null);
+});
+
+test("an execution with no saved file clears the old path", () => {
+  const state = { savedPath: "old.png", refreshes: 0, refresh() { this.refreshes += 1; } };
+  const node = {};
+  const context = vm.createContext({ node, state, chainCallback, isForeignRun: () => false });
+  vm.runInContext(part(SAVER, 'chainCallback(node, "onExecuted",', 'chainCallback(node, "onRemoved",'), context);
+  node.onExecuted({ ausboss_saved_path: [] });
+  assert.equal(state.savedPath, null);
+  assert.equal(state.refreshes, 1);
+  node.onExecuted({ ausboss_saved_path: ["new.png"] });
+  assert.equal(state.savedPath, "new.png");
+  node.onExecuted({});
+  assert.equal(state.savedPath, null);
+});

tests/test_check_regressions.py

@@ -0,0 +1,240 @@
+"""Offline checks must reject source and saved graphs that cannot work."""
+
+import ast
+import copy
+import json
+import os
+from pathlib import Path
+import shutil
+import subprocess
+import sys
+import tempfile
+import unittest
+from unittest.mock import patch
+
+ROOT = Path(__file__).resolve().parent.parent
+sys.path.insert(0, str(ROOT / "scripts"))
+import changelog_notes
+import compat_boot
+from registry_contract import mapping_problems, module_list
+from workflow_contract import named_copy_problems, workflow_problems
+
+
+class SourceTests(unittest.TestCase):
+    def test_module_list_cannot_change_after_its_declaration(self):
+        declaration = 'NODE_MODULES = ["node_a"]\n'
+        self.assertEqual(module_list(declaration + 'for name in NODE_MODULES:\n    pass\n'), {"node_a"})
+        for extra in (
+            'NODE_MODULES.clear()\n', 'NODE_MODULES = []\n',
+            'NODE_MODULES[0] = "node_b"\n', 'NODE_MODULES += ["node_b"]\n',
+            'alias = NODE_MODULES\n', 'change(NODE_MODULES)\n',
+            'from other import NODE_MODULES\n', 'del NODE_MODULES\n',
+        ):
+            with self.subTest(extra=extra):
+                self.assertIsNone(module_list(declaration + extra))
+        self.assertIsNone(module_list('NODE_MODULES = ["node_a", 7]\n'))
+
+    def test_reserved_mapping_names_cannot_be_rebound(self):
+        valid = ('class Node: pass\nNODE_CLASS_MAPPINGS = {"A": Node}\n'
+                 'NODE_DISPLAY_NAME_MAPPINGS = {"A": "A"}\n')
+        for binding in (
+            'from other import NODE_CLASS_MAPPINGS',
+            'from other import value as NODE_CLASS_MAPPINGS',
+            'import other as NODE_CLASS_MAPPINGS',
+            'def NODE_CLASS_MAPPINGS(): pass',
+            'class NODE_CLASS_MAPPINGS: pass',
+            'try:\n    pass\nexcept Exception as NODE_CLASS_MAPPINGS:\n    pass',
+            'match value:\n    case {"key": NODE_CLASS_MAPPINGS}: pass',
+        ):
+            with self.subTest(binding=binding):
+                self.assertTrue(mapping_problems(valid + binding + '\n', "sample.py"))
+
+
+class WorkflowTests(unittest.TestCase):
+    def klein(self):
+        return json.loads((ROOT / "example_workflows" / "Klein 9B Outpaint (AusBoss).json").read_text())
+
+    def test_subgraph_links_widgets_and_local_counters_are_checked(self):
+        data = self.klein()
+        graph = data["definitions"]["subgraphs"][0]
+        graph["links"][0]["target_id"] = 999999
+        self.assertIn("missing node", " ".join(workflow_problems(data)))
+        data = self.klein()
+        graph = data["definitions"]["subgraphs"][0]
+        graph["nodes"][0]["widgets_values_named"]["upscale_method"] = "wrong"
+        self.assertIn("stale named", " ".join(workflow_problems(data)))
+        for counter in ("lastNodeId", "lastLinkId"):
+            data = self.klein()
+            data["definitions"]["subgraphs"][0]["state"][counter] = 0
+            self.assertIn("behind the graph", " ".join(workflow_problems(data)))
+
+    def test_subgraph_boundary_links_are_checked_in_both_directions(self):
+        data = self.klein()
+        self.assertEqual(workflow_problems(data), [])
+        graph = data["definitions"]["subgraphs"][0]
+        graph["inputs"][0]["linkIds"] = []
+        self.assertIn("source output", " ".join(workflow_problems(data)))
+        data = self.klein()
+        graph = data["definitions"]["subgraphs"][0]
+        graph["outputs"][0]["linkIds"] = [999999]
+        self.assertIn("stale link", " ".join(workflow_problems(data)))
+
+    def test_named_values_follow_widget_slots_instead_of_object_order(self):
+        node = {"id": 1, "type": "AUSBOSS_NODES_Resolution",
+                "widgets_values": [640, 480, "16ch", 1],
+                "widgets_values_named": {"height": 640, "width": 480, "latent": "16ch", "batch_size": 1}}
+        self.assertTrue(named_copy_problems(node))
+        node["widgets_values_named"].update(height=480, width=640)
+        self.assertEqual(named_copy_problems(node), [])
+        node["widgets_values"].append("unmatched")
+        self.assertTrue(named_copy_problems(node))
+        node["widgets_values"] = [640, 480, "16ch"]
+        self.assertTrue(named_copy_problems(node))
+        node["widgets_values"] = [640, 480, "16ch", 1]
+        del node["widgets_values_named"]["width"]
+        self.assertTrue(named_copy_problems(node))
+
+    def test_frontend_seed_control_has_its_own_slot(self):
+        node = {"id": 1, "type": "AUSBOSS_NODES_Seed", "widgets_values": [7, "fixed", ""],
+                "widgets_values_named": {"control_after_generate": "fixed", "seed": 7, "ausboss_seed_panel": ""}}
+        self.assertEqual(named_copy_problems(node), [])
+        node["widgets_values"] = [7]
+        self.assertTrue(named_copy_problems(node))
+
+    def test_dict_values_report_unmatched_real_entries(self):
+        node = {"id": 1, "widgets_values": {"width": 640}, "widgets_values_named": {"width": 640, "height": 480}}
+        self.assertTrue(named_copy_problems(node))
+        node["widgets_values_named"] = {}
+        self.assertTrue(named_copy_problems(node))
+
+    def test_download_metadata_must_name_the_selected_url_file(self):
+        data = self.klein()
+        node = next(n for n in data["nodes"] if n.get("properties", {}).get("models"))
+        model = node["properties"]["models"][0]
+        original = copy.deepcopy(model)
+        for field in ("name", "url", "directory"):
+            for value in (None, "", 7):
+                model.clear()
+                model.update(original)
+                model[field] = value
+                self.assertTrue(workflow_problems(data), (field, value))
+        model.clear()
+        model.update(original, url="https://example.invalid/wrong.safetensors")
+        self.assertIn("URL", " ".join(workflow_problems(data)))
+        model["url"] = "https://example.invalid/" + original["name"].replace("-", "%2D") + "?download=1"
+        self.assertEqual(workflow_problems(data), [])
+
+
+class CompatibilityTests(unittest.TestCase):
+    def problems(self, data, offered):
+        with tempfile.TemporaryDirectory() as folder:
+            Path(folder, "sample.json").write_text(json.dumps(data))
+            return compat_boot.example_problems(Path(folder), offered)
+
+    def test_only_defined_subgraph_types_are_skipped(self):
+        kind = "12345678-1234-4234-8234-123456789abc"
+        data = {"nodes": [{"id": 1, "type": kind}]}
+        self.assertTrue(self.problems(data, {}))
+        data["definitions"] = {"subgraphs": [{"id": kind, "nodes": [{"id": 2, "type": "Missing"}]}]}
+        self.assertIn("Missing", " ".join(self.problems(data, {})))
+        self.assertEqual(self.problems(data, {"Missing": {}}), [])
+
+    def test_required_socket_needs_a_link_even_in_older_saves(self):
+        offered = {"NeedsImage": {"input": {"required": {"image": ["IMAGE", {"forceInput": True}]}}}}
+        node = {"id": 1, "type": "NeedsImage", "inputs": [{"name": "image", "link": None}],
+                "widgets_values_named": {"image": None}}
+        self.assertTrue(self.problems({"nodes": [node]}, offered))
+        node["inputs"][0]["link"] = 1
+        self.assertEqual(self.problems({"nodes": [node]}, offered), [])
+        node["inputs"][0]["link"] = None
+        del node["widgets_values_named"]
+        node["widgets_values"] = ["an unrelated legacy value"]
+        self.assertTrue(self.problems({"nodes": [node]}, offered))
+
+    def test_serialized_false_and_zero_are_usable_widget_values(self):
+        offered = {"Options": {"input": {"required": {"count": ["INT", {}], "enabled": ["BOOLEAN", {}]}}}}
+        node = {"id": 1, "type": "Options", "widgets_values_named": {"count": 0, "enabled": False}}
+        self.assertEqual(self.problems({"nodes": [node]}, offered), [])
+
+    def test_newer_combo_format_counts_as_a_widget(self):
+        offered = {"Cache": {"input": {"required": {"device": ["COMBO", {"options": ["auto", "cpu"]}]}}}}
+        node = {"id": 1, "type": "Cache", "widgets_values": ["auto"], "widgets_values_named": {"device": "auto"}}
+        self.assertEqual(self.problems({"nodes": [node]}, offered), [])
+
+
+class CommandTests(unittest.TestCase):
+    def setUp(self):
+        self.temp = tempfile.TemporaryDirectory()
+        self.addCleanup(self.temp.cleanup)
+        self.root = Path(self.temp.name)
+        for folder in ("scripts", "nodes", "js", "example_workflows", "locales", "assets"):
+            shutil.copytree(ROOT / folder, self.root / folder, ignore=shutil.ignore_patterns("__pycache__"))
+        for name in ("__init__.py", "pyproject.toml", "README.md", "LICENSE", "CHANGELOG.md", ".comfyignore", "ausboss_presets_example.json"):
+            shutil.copy2(ROOT / name, self.root / name)
+
+    def run_check(self, script):
+        return subprocess.run([sys.executable, str(self.root / "scripts" / script)],
+                              capture_output=True, text=True, env={**os.environ, "PYTHONDONTWRITEBYTECODE": "1"})
+
+    def test_network_imports_and_qualified_fetch_are_rejected_without_execution(self):
+        path = self.root / "nodes" / "_network_probe.py"
+        for source in ('from requests import get\n', 'from httpx import Client\n',
+                       'import requests as r\n', 'from urllib import request\n',
+                       'from http import client\n', 'from aiohttp import ClientSession\n'):
+            path.write_text(source)
+            result = self.run_check("release_preflight.py")
+            self.assertNotEqual(result.returncode, 0, source)
+            self.assertIn("network", result.stdout)
+        path.unlink()
+        path = self.root / "js" / "shared" / "network_probe.mjs"
+        for call in ('fetch ("https://example.invalid")', 'globalThis.fetch("https://example.invalid")',
+                     'window . fetch ("https://example.invalid")', 'self.fetch\n("https://example.invalid")'):
+            path.write_text("export function lookup() { return " + call + "; }\n")
+            result = self.run_check("release_preflight.py")
+            self.assertNotEqual(result.returncode, 0, call)
+            self.assertIn("calls fetch", result.stdout)
+
+    def test_unrelated_class_cannot_supply_registered_transform_outputs(self):
+        path = self.root / "nodes" / "node_image_crop_rotate_pad.py"
+        source = path.read_text().replace('RETURN_TYPES = ("IMAGE", "MASK",', 'RETURN_TYPES = ("MASK", "IMAGE",', 1)
+        source = source.replace('RETURN_NAMES = ("image", "mask",', 'RETURN_NAMES = ("mask", "image",', 1)
+        source += '\nclass ExtraMetadata:\n    RETURN_TYPES = ("IMAGE", "MASK", "AUSBOSS_STITCHER", "IMAGE")\n    RETURN_NAMES = ("image", "mask", "stitcher", "original")\n'
+        path.write_text(source)
+        result = self.run_check("validate_nodes.py")
+        self.assertNotEqual(result.returncode, 0)
+        self.assertIn("first outputs", result.stdout)
+
+    def test_helper_cannot_advertise_an_unregistered_node(self):
+        (self.root / "nodes" / "_extra_helpers.py").write_text(
+            'class Extra: pass\nNODE_CLASS_MAPPINGS = {"AUSBOSS_NODES_Extra": Extra}\n'
+            'NODE_DISPLAY_NAME_MAPPINGS = {"AUSBOSS_NODES_Extra": "Extra"}\n')
+        result = self.run_check("validate_nodes.py")
+        self.assertNotEqual(result.returncode, 0)
+        self.assertIn("_extra_helpers.py", result.stdout)
+
+    def test_toml_description_limit_uses_decoded_utf8_bytes(self):
+        path = self.root / "pyproject.toml"
+        lines = path.read_text().splitlines()
+        path.write_text("\n".join('description = "\\\"' + 'x' * 1001 + '"' if line.startswith("description =") else line for line in lines) + "\n")
+        result = self.run_check("release_preflight.py")
+        self.assertNotEqual(result.returncode, 0)
+        self.assertIn("1002 bytes", result.stdout)
+
+    def test_literal_version_uses_project_table_in_all_readers(self):
+        path = self.root / "pyproject.toml"
+        source = path.read_text()
+        version = changelog_notes.pyproject_version()
+        path.write_text(source.replace('version = "' + version + '"', "version = '" + version + "'"))
+        result = self.run_check("release_preflight.py")
+        self.assertEqual(result.returncode, 0, result.stdout + result.stderr)
+        with patch.object(changelog_notes, "ROOT", self.root):
+            self.assertEqual(changelog_notes.pyproject_version(), version)
+        tree = ast.parse((ROOT / "__init__.py").read_text())
+        body = [n for n in tree.body if isinstance(n, (ast.Import, ast.ImportFrom)) or isinstance(n, ast.FunctionDef) and n.name == "_read_version"]
+        scope = {"__file__": str(self.root / "__init__.py")}
+        exec(compile(ast.Module(body=body, type_ignores=[]), "version_reader", "exec"), scope)
+        self.assertEqual(scope["_read_version"](), version)
+
+
+if __name__ == "__main__":
+    unittest.main()

tests/test_color_match.py

@@ -47,6 +47,28 @@ class LabConversionTests(unittest.TestCase):
 
 
 class MatchColorsTests(unittest.TestCase):
+    def test_mkl_preserves_tiny_variations_in_its_own_reference(self):
+        import itertools
+
+        image = torch.tensor(list(itertools.product([0.4999, 0.5001], repeat=3)))
+        image = image.reshape(1, 2, 4, 3)
+        out = match_colors(image, image.clone(), 1.0, method="mkl")
+        self.assertTrue(torch.allclose(out, image, atol=1e-6, rtol=0))
+
+    def test_mkl_preserves_a_nearly_singular_self_reference(self):
+        ramp = torch.linspace(0.2, 0.8, 64).reshape(1, 8, 8, 1)
+        image = ramp.expand(-1, -1, -1, 3) + rand_image(1, 8, 8, 10) * 1e-4
+        out = match_colors(image, image.clone(), 1.0, method="mkl")
+        self.assertTrue(torch.allclose(out, image, atol=1e-6, rtol=0))
+
+    def test_histogram_preserves_equal_distributions_at_different_sizes(self):
+        source = torch.tensor([0., 0., 0.5, 0.5, 1., 1.]).reshape(1, 1, 6, 1)
+        reference = torch.tensor([0., 0.5, 1.]).reshape(1, 1, 3, 1)
+        source = source.expand(-1, -1, -1, 3)
+        reference = reference.expand(-1, -1, -1, 3)
+        for image, ref in ((source, reference), (reference, source)):
+            self.assertTrue(torch.equal(match_colors(image, ref, 1., method="histogram"), image))
+
     def test_identity_reference_is_nearly_unchanged(self):
         image = rand_image(1, 48, 48, seed=2)
         out = match_colors(image, image, 1.0)

tests/test_frontend_cache.py

@@ -53,7 +53,7 @@ class MiddlewareTests(unittest.TestCase):
     def test_header_is_set_on_pack_modules_only(self):
         try:
             from aiohttp import web
-            from aiohttp.test_utils import TestClient, TestServer
+            from aiohttp.test_utils import make_mocked_request
         except ImportError:
             self.skipTest("aiohttp is not installed")
 
@@ -61,20 +61,17 @@ class MiddlewareTests(unittest.TestCase):
             return web.Response(text="export const a = 1;", content_type="text/javascript")
 
         async def run():
-            app = web.Application(middlewares=[make_revalidate_middleware("ausboss-nodes")])
-            app.router.add_get("/extensions/ausboss-nodes/shared/index.mjs", modules_get)
-            app.router.add_get("/extensions/ausboss-nodes/seed/index.js", modules_get)
-            app.router.add_get("/extensions/other-pack/shared/index.mjs", modules_get)
-            async with TestClient(TestServer(app)) as client:
-                seen = {}
-                for path in (
-                    "/extensions/ausboss-nodes/shared/index.mjs",
-                    "/extensions/ausboss-nodes/seed/index.js",
-                    "/extensions/other-pack/shared/index.mjs",
-                ):
-                    response = await client.get(path)
-                    seen[path] = response.headers.get("Cache-Control")
-                return seen
+            middleware = make_revalidate_middleware("ausboss-nodes")
+            seen = {}
+            for path in (
+                "/extensions/ausboss-nodes/shared/index.mjs",
+                "/extensions/ausboss-nodes/seed/index.js",
+                "/extensions/other-pack/shared/index.mjs",
+            ):
+                request = make_mocked_request("GET", path)
+                response = await middleware(request, modules_get)
+                seen[path] = response.headers.get("Cache-Control")
+            return seen
 
         seen = asyncio.run(run())
         self.assertEqual(seen["/extensions/ausboss-nodes/shared/index.mjs"], "no-cache")
@@ -169,10 +166,10 @@ class VersionedServingTests(unittest.TestCase):
     def setUp(self):
         try:
             from aiohttp import web
-            from aiohttp.test_utils import TestClient, TestServer
+            from aiohttp.test_utils import make_mocked_request
         except ImportError:
             self.skipTest("aiohttp is not installed")
-        self.web, self.TestClient, self.TestServer = web, TestClient, TestServer
+        self.web, self.make_request = web, make_mocked_request
         self.folder = tempfile.TemporaryDirectory()
         self.addCleanup(self.folder.cleanup)
         base = Path(self.folder.name)
@@ -193,14 +190,13 @@ class VersionedServingTests(unittest.TestCase):
 
         async def run():
             root = self.js if js_root == "default" else js_root
-            app = web.Application(middlewares=[make_revalidate_middleware("ausboss-nodes", root, token)])
-            app.router.add_get("/extensions/{tail:.*}", handled)
-            async with self.TestClient(self.TestServer(app)) as client:
-                out = {}
-                for path in paths:
-                    response = await client.get(path, headers=headers)
-                    out[path] = (response.status, await response.text(), response.headers)
-                return out
+            middleware = make_revalidate_middleware("ausboss-nodes", root, token)
+            out = {}
+            for path in paths:
+                request = self.make_request("GET", path, headers=headers)
+                response = await middleware(request, handled)
+                out[path] = (response.status, response.text or "", response.headers)
+            return out
 
         return asyncio.run(run())
 

tests/test_h3_prompt_writer.py

@@ -733,6 +733,63 @@ class VideoJobTests(unittest.TestCase):
         self.assertIn("<Video 1>: partially_preserved", parts["retention_analysis"])
         self.assertIn("the background of <Picture 1> is not transferred", parts["retention_analysis"])
 
+    def test_a_connected_model_writes_the_new_persons_looks_in_a_swap(self):
+        from nodes._h3_cast_helpers import add_looks
+        asked = []
+
+        def describe(slot):
+            asked.append(slot)
+            return '"A man with curly brown hair, wearing glasses."\nExtra line.'
+
+        script = add_looks("Replace the guy with @1.", {1: "person"}, describe)
+        self.assertEqual(script, "Replace the guy with @1.\n@1 looks like a man with curly brown hair, wearing glasses")
+        self.assertEqual(asked, [1])
+        text = write_prompt(script, seconds=8.0, jobs={1: "person"}, video="swap the person")
+        self.assertIn("<Subject 2> has the defined appearance from <Picture 1>: a man with curly brown hair", text)
+        # A typed line wins, places and empty answers add nothing.
+        typed = "Replace the guy with @1.\n@1 looks like a tall woman."
+        self.assertEqual(add_looks(typed, {1: "person"}, describe), typed)
+        self.assertEqual(add_looks("Swap him for @1.", {1: "place"}, describe), "Swap him for @1.")
+        self.assertEqual(add_looks("Swap him for @1.", {1: "person"}, lambda slot: ""), "Swap him for @1.")
+        said = "a man with curly brown hair, wearing dark-framed glasses, and no visible beard or facial hair."
+        self.assertEqual(add_looks("Swap him for @1.", {1: "person"}, lambda slot: said),
+                         "Swap him for @1.\n@1 looks like a man with curly brown hair, wearing dark-framed glasses")
+
+    def test_a_swap_gets_the_firm_wording_without_a_looks_like_line(self):
+        text = write_prompt("Replace the guy with @1.", seconds=8.0, jobs={1: "person"}, video="swap the person")
+        self.assertIn("<Subject 2> has the face, hair and clothes of the person in <Picture 1>", text)
+        self.assertIn("stays present throughout, from the first frame", text)
+        self.assertIn("Do not show the guy in that role at any time", text)
+
+    def test_a_swap_with_a_model_adds_no_moments(self):
+        node = AusBossH3PromptWriter()
+        calls = []
+        import nodes.node_h3_prompt_writer as writer
+        real = writer.model_asker
+        writer.model_asker = lambda clip, image: (lambda question, longest: calls.append(question) or "a woman with a dark bob")
+        try:
+            text = node.write("Swap the woman for @1.", 6, clip=object(), picture_1=torch.zeros(1, 8, 8, 3),
+                              video=torch.zeros(40, 8, 8, 3), video_job="swap the person")[0]
+        finally:
+            writer.model_asker = real
+        self.assertEqual(len(calls), 1)
+        self.assertIn("a woman with a dark bob", text)
+        self.assertNotIn("[Shot 2]", text)
+
+    def test_a_plain_swap_sentence_names_only_who_goes(self):
+        for script, who in (
+            ("Replace the man in the red shirt with @1.", "the man in the red shirt"),
+            ("swap the guy with @1", "the guy"),
+            ("swap out the guy in the hat for @1 in the clip", "the guy in the hat"),
+            ("the cashier is now @1", "the cashier"),
+            ("make the dancer look like @1", "the dancer"),
+            ("swap @1 in for the drummer", "the drummer"),
+            ("Replace the woman with black hair with @1.\n@1 looks like a woman with platinum hair.", "the woman with black hair"),
+        ):
+            text = write_prompt(script, seconds=8.0, jobs={1: "person"}, video="swap the person")
+            self.assertIn(f"<Subject 1> is {who} in <Video 1>, selected for replacement.", text)
+            self.assertNotIn("@1", text)
+
     def test_typed_words_in_a_swap_say_who_goes(self):
         parts = parts_of("The child in the seat.", jobs={1: "person"}, video="swap the person")
         self.assertIn("<Subject 1> is the child in the seat in <Video 1>", parts["subject_definitions"])
@@ -748,7 +805,8 @@ class VideoJobTests(unittest.TestCase):
         self.assertIn("<Subject 4> is the person in <Picture 2>", parts["subject_definitions"])
         self.assertIn("replace the person on the right with <Subject 4>", parts["retention_analysis"])
         self.assertIn("change only the people", parts["retention_analysis"])
-        self.assertIn("<Subject 4> takes the place of the person on the right", parts["detailed_description"])
+        self.assertIn("<Subject 4> occupies the starting position of the person on the right", parts["detailed_description"])
+        self.assertIn("<Subject 4> has the face, hair and clothes of the person in <Picture 2>", parts["detailed_description"])
         self.assertNotIn("Show one person", parts["detailed_description"])
 
     def test_a_swap_with_two_people_reads_who_goes_from_the_script(self):
@@ -1420,6 +1478,16 @@ class ClipSoundTests(unittest.TestCase):
         self.assertNotIn("lips", line)
         self.assertNotIn("speaks as in", line)
 
+    def test_loud_sound_with_no_voice_does_not_make_them_speak(self):
+        # The subway clip: one long stretch of train noise, loud in the voice band, no clear pitch.
+        noise = heard([(1.1, 5.42, None, 0.0)])
+        line = parts_of("@1 replaces the woman on the platform.", clip_sound=True, speech=noise, **SWAP_JOBS)["detailed_description"]
+        self.assertNotIn("speaks as in", line)
+        self.assertNotIn("lips", line)
+        a_word = heard([(1.0, 1.3, 150.0, 0.2)])  # A cough or one short sound: under half a second of voice.
+        line = parts_of("@1 replaces the woman on the platform.", clip_sound=True, speech=a_word, **SWAP_JOBS)["detailed_description"]
+        self.assertNotIn("speaks as in", line)
+
     def test_a_typed_sound_wins_over_the_clips_sound(self):
         parts = parts_of("@1 replaces the man in the hat.\nsound: rain on the roof", clip_sound=True, speech=plain([(0.4, 1.9)]), **SWAP_JOBS)
         self.assertIn("rain on the roof", parts["overall_soundscape"].lower())

tests/test_image_folder.py

@@ -5,11 +5,15 @@ root is a temp folder, so these run without ComfyUI."""
 from __future__ import annotations
 
 import json
+import asyncio
 import os
+from io import BytesIO
 from pathlib import Path
 import sys
 import tempfile
+from types import SimpleNamespace
 import unittest
+from unittest.mock import patch
 
 from PIL import Image
 
@@ -22,6 +26,7 @@ from nodes import node_image_folder  # noqa: E402
 from nodes._image_folder_helpers import (  # noqa: E402
     AT_THE_END,
     BAD_PICKS,
+    MAX_PICTURES,
     NO_MASK_SIZE,
     NONE_LEFT,
     NONE_PICKED,
@@ -78,6 +83,28 @@ class FolderCase(unittest.TestCase):
 
 
 class ListingTests(FolderCase):
+    def test_the_limit_is_applied_in_the_requested_order(self):
+        base = self.root / "ordered"
+        for name, stamp in [("a10.png", 100), ("a2.png", 200), ("z.png", 300)]:
+            picture(base / name)
+            os.utime(base / name, (stamp, stamp))
+        self.assertEqual(self.names("ordered", sort="name", limit=2), ["a2.png", "a10.png"])
+        self.assertEqual(self.names("ordered", sort="newest first", limit=2), ["z.png", "a2.png"])
+        self.assertEqual(self.names("ordered", sort="oldest first", limit=2), ["a10.png", "a2.png"])
+
+    def test_the_production_limit_keeps_the_newest_file(self):
+        base = self.root / "many"
+        base.mkdir()
+        for number in range(MAX_PICTURES):
+            path = base / f"a{number:04d}.png"
+            path.touch()
+            os.utime(path, (100, 100))
+        picture(base / "z-newest.png")
+        os.utime(base / "z-newest.png", (200, 200))
+        names = self.names("many", sort="newest first")
+        self.assertEqual(len(names), MAX_PICTURES)
+        self.assertEqual(names[0], "z-newest.png")
+
     def test_a_folder_lists_its_pictures_in_natural_order(self):
         self.assertEqual(self.names("people"), ["Anna.jpg", "photo_2.png", "photo_10.png"])
         self.assertEqual(natural_key("photo_2") < natural_key("photo_10"), True)
@@ -184,6 +211,18 @@ class PickingTests(FolderCase):
 
 
 class LoadingTests(FolderCase):
+    def test_rgb_and_grayscale_transparency_produce_masks_and_dark_thumbnails(self):
+        for mode, color, transparency in [("RGB", (255, 0, 0), (255, 0, 0)), ("L", 0, 0)]:
+            with self.subTest(mode=mode):
+                path = self.root / f"transparent-{mode}.png"
+                Image.new(mode, (3, 2), color).save(path, transparency=transparency)
+                _image, mask = load_picture(path)
+                self.assertEqual(tuple(mask.shape), (1, 2, 3))
+                self.assertEqual(float(mask.sum()), 6.0)
+                with Image.open(BytesIO(thumbnail(path))) as small:
+                    pixel = small.getpixel((0, 0))
+                self.assertTrue(all(abs(a - b) <= 3 for a, b in zip(pixel, (27, 35, 38))))
+
     def test_a_picture_loads_as_image_and_the_no_mask_stand_in(self):
         image, mask = load_picture(self.root / "people" / "photo_2.png")
         self.assertEqual(tuple(image.shape), (1, 30, 40, 3))
@@ -229,6 +268,18 @@ class LoadingTests(FolderCase):
 
 
 class NodeTests(FolderCase):
+    def test_runs_above_64_report_every_loaded_picture(self):
+        for number in range(65):
+            picture(self.root / "many" / f"{number}.png", size=(2, 2))
+        out = self.run_node(folder="many")
+        note = out["ui"][node_image_folder.UI_KEY][0]
+        self.assertEqual(note["loaded"], out["result"][3])
+        self.assertEqual(len(note["names"]), 65)
+
+    def test_completion_records_identify_the_folder_used_by_the_run(self):
+        note = self.run_node()["ui"][node_image_folder.UI_KEY][0]
+        self.assertEqual(note.get("context"), {"source": "input", "folder": "people", "subfolders": False})
+
     def test_all_in_one_run_gives_a_list_of_everything(self):
         out = self.run_node()
         images, masks, names, numbers, count = out["result"]
@@ -246,7 +297,10 @@ class NodeTests(FolderCase):
         out = self.run_node(run=RUNS[1], position=2)
         _images, _masks, names, numbers, count = out["result"]
         self.assertEqual((names, numbers, count), (["photo_2"], [2], 3))
-        self.assertEqual(out["ui"]["ausboss_image_folder"][0], {"count": 3, "loaded": [2], "names": ["photo_2.png"]})
+        self.assertEqual(out["ui"]["ausboss_image_folder"][0], {
+            "count": 3, "loaded": [2], "names": ["photo_2.png"],
+            "context": {"source": "input", "folder": "people", "subfolders": False},
+        })
 
     def test_one_per_run_stops_after_the_last_or_starts_over(self):
         with self.assertRaises(RuntimeError) as stopped:
@@ -295,5 +349,53 @@ class NodeTests(FolderCase):
             text.encode("ascii")
 
 
+class RouteTests(FolderCase):
+    def setUp(self):
+        super().setUp()
+        self.handlers = {}
+        handlers = self.handlers
+
+        class Routes:
+            def get(self, address):
+                def register(fn):
+                    handlers[address] = fn
+                    return fn
+                return register
+
+        server = SimpleNamespace(PromptServer=SimpleNamespace(instance=SimpleNamespace(routes=Routes())))
+        with patch.dict(sys.modules, {"server": server}):
+            node_image_folder._register_routes()
+
+    def request(self, route, **query):
+        request = SimpleNamespace(rel_url=SimpleNamespace(query=query))
+        return asyncio.run(self.handlers[f"/ausboss/image_folder/{route}"](request))
+
+    def test_route_errors_hide_server_paths(self):
+        (self.root / "loop").symlink_to("loop", target_is_directory=True)
+        for route, query in [("list", {"folder": "loop"}), ("folders", {"folder": "loop"}),
+                             ("thumb", {"name": "loop/picture.png"})]:
+            with self.subTest(route=route):
+                response = self.request(route, **query)
+                self.assertEqual(response.status, 400)
+                self.assertNotIn(str(self.root), json.loads(response.text)["error"])
+
+    def test_thumbnail_versions_change_with_subsecond_rewrites_and_size(self):
+        path = self.root / "top.png"
+        os.utime(path, ns=(1_700_000_000_100_000_000,) * 2)
+        def version():
+            response = self.request("list")
+            self.assertEqual(response.status, 200)
+            return json.loads(response.text)["pictures"][0]["v"]
+        first = version()
+        picture(path, color=(0, 0, 255))
+        os.utime(path, ns=(1_700_000_000_800_000_000,) * 2)
+        second = version()
+        self.assertNotEqual(first, second)
+        self.assertIsInstance(second, str)
+        picture(path, size=(80, 90))
+        os.utime(path, ns=(1_700_000_000_800_000_000,) * 2)
+        self.assertNotEqual(second, version())
+
+
 if __name__ == "__main__":
     unittest.main()

tests/test_image_save_helpers.py

@@ -2,7 +2,9 @@ from __future__ import annotations
 
 import sys
 import tempfile
+import threading
 import unittest
+from concurrent.futures import ThreadPoolExecutor, TimeoutError
 from datetime import datetime
 from pathlib import Path
 from unittest.mock import patch
@@ -122,6 +124,17 @@ class NamingTests(unittest.TestCase):
 
 
 class EncodeTests(unittest.TestCase):
+    def test_bfloat16_and_single_channel_frames_roundtrip(self):
+        for dtype, channels in ((torch.bfloat16, 3), (torch.float32, 1), (torch.bfloat16, 1)):
+            for format_name, extension in (("png", "png"), ("webp lossless", "webp")):
+                with self.subTest(dtype=dtype, channels=channels, format=format_name), tempfile.TemporaryDirectory() as tmp:
+                    frame = torch.full((2, 2, channels), 0.5, dtype=dtype, device="cpu")
+                    path = Path(tmp) / f"frame.{extension}"
+                    encode_image(path, frame, format_name, None)
+                    with Image.open(path) as image:
+                        self.assertEqual(image.size, (2, 2))
+                        self.assertEqual(image.convert("RGB").getpixel((0, 0)), (127, 127, 127))
+
     def test_png_roundtrips_and_embeds_metadata(self):
         with tempfile.TemporaryDirectory() as tmp:
             path = Path(tmp) / "one.png"
@@ -173,6 +186,71 @@ class NameTokenTests(unittest.TestCase):
 
 
 class SaveImageNodeTests(unittest.TestCase):
+    def test_counter_save_and_compare_save_keep_both_images(self):
+        from nodes import _compare_helpers as compare
+
+        with tempfile.TemporaryDirectory() as tmp:
+            root = Path(tmp)
+            picture_a, picture_b = root / "a.png", root / "b.png"
+            Image.new("RGB", (16, 8), "green").save(picture_a)
+            Image.new("RGB", (16, 8), "blue").save(picture_b)
+            entered, proceed, comparing = threading.Event(), threading.Event(), threading.Event()
+            encode = node_save_image.encode_image
+
+            def paused_encode(*args):
+                entered.set()
+                if not proceed.wait(5):
+                    raise TimeoutError("Timed out waiting to finish encoding.")
+                return encode(*args)
+
+            def save_compare():
+                comparing.set()
+                return compare.save_mix(picture_a=picture_a, picture_b=picture_b, output_dir=root, name="shot")
+
+            with patch.object(node_save_image, "encode_image", paused_encode), ThreadPoolExecutor(max_workers=2) as pool:
+                first = pool.submit(self.run_node, root, filename_prefix="shot")
+                try:
+                    self.assertTrue(entered.wait(5))
+                    second = pool.submit(save_compare)
+                    self.assertTrue(comparing.wait(5))
+                    try:
+                        second.result(timeout=0.2)
+                    except TimeoutError:
+                        pass
+                finally:
+                    proceed.set()
+                saved = Path(first.result(timeout=5)["result"][0])
+                mixed = root / second.result(timeout=5)["files"][0]["filename"]
+            self.assertNotEqual(saved, mixed)
+            with Image.open(saved) as image:
+                self.assertEqual(image.getpixel((0, 0)), (0, 0, 0))
+            with Image.open(mixed) as image:
+                self.assertEqual(image.getpixel((0, 0)), (0, 128, 0))
+
+    def test_caption_only_collision_obeys_each_policy(self):
+        for naming in ({"exact_name": "photo"}, {"filename_prefix": "photo", "name_counter": False}):
+            for policy in ("error", "skip", "overwrite"):
+                with self.subTest(**naming, policy=policy), tempfile.TemporaryDirectory() as tmp:
+                    caption = Path(tmp) / "photo.txt"
+                    caption.write_text("original", encoding="utf-8")
+                    if policy == "error":
+                        with self.assertRaisesRegex(ValueError, "already exists"):
+                            self.run_node(tmp, caption_text="replacement", on_existing=policy, **naming)
+                    else:
+                        result = self.run_node(tmp, caption_text="replacement", on_existing=policy, **naming)
+                        self.assertEqual(bool(result["result"][0]), policy == "overwrite")
+                    self.assertEqual(caption.read_text(encoding="utf-8"), "replacement" if policy == "overwrite" else "original")
+                    self.assertEqual((Path(tmp) / "photo.png").exists(), policy == "overwrite")
+
+    def test_later_caption_collision_stops_batch_before_any_write(self):
+        with tempfile.TemporaryDirectory() as tmp:
+            caption = Path(tmp) / "shot_002.txt"
+            caption.write_text("original", encoding="utf-8")
+            with self.assertRaisesRegex(ValueError, "already exists"):
+                self.run_node(tmp, images=gradient_batch(2, 8, 16), exact_name="shot", caption_text="new", on_existing="error")
+            self.assertEqual([p.name for p in Path(tmp).iterdir()], ["shot_002.txt"])
+            self.assertEqual(caption.read_text(encoding="utf-8"), "original")
+
     def test_name_tokens_in_the_prefix_and_in_an_exact_name(self):
         with tempfile.TemporaryDirectory() as tmp:
             result = self.run_node(tmp, filename_prefix="sets/%width%x%height%/img_%year%", name_counter=False)
@@ -415,8 +493,12 @@ class SaveImageLocalModeTests(SaveImageNodeTests):
         with tempfile.TemporaryDirectory() as tmp:
             self.run_node(tmp, exact_name="photo", caption="old", caption_text="new caption")
             self.assertEqual((Path(tmp) / "photo.txt").read_text(encoding="utf-8"), "new caption")
-            self.run_node(tmp, exact_name="photo2", caption="old", caption_text="")
-            self.assertEqual((Path(tmp) / "photo2.txt").read_text(encoding="utf-8"), "old")
+            for index, caption in enumerate(("", "   ", "\n")):
+                name = f"blank{index}"
+                self.run_node(tmp, exact_name=name, caption="old", caption_text=caption)
+                self.assertFalse((Path(tmp) / f"{name}.txt").exists())
+            self.run_node(tmp, exact_name="legacy", caption="old", caption_text=None)
+            self.assertEqual((Path(tmp) / "legacy.txt").read_text(encoding="utf-8"), "old")
 
     def test_prefix_validation_rejects_escapes(self):
         node = node_save_image.AusBossSaveImage

tests/test_inpaint_crop_helpers.py

@@ -198,9 +198,9 @@ class CropContractTests(unittest.TestCase):
         image = rand_image(1, 40, 40, seed=1)
         mask = box_mask(40, 40, 10, 20, 10, 20)
         _, sampling, stitcher = build_crop(image, mask, 2.0, 16, 1)
-        # context 2.0 on a 10x10 bbox with multiple 1 -> rect (5, 5, 20, 20)
-        self.assertEqual(stitcher["crop_to_canvas"], (5, 5, 20, 20))
-        self.assertTrue(torch.equal(sampling, mask[:, 5:25, 5:25]))
+        # The feather needs the full picture; only the paste mask is softened.
+        self.assertEqual(stitcher["crop_to_canvas"], (0, 0, 40, 40))
+        self.assertTrue(torch.equal(sampling, mask))
         values = torch.unique(sampling)
         self.assertTrue(all(v in (0.0, 1.0) for v in values.tolist()))
         # The blend mask is feathered: it must contain intermediate values.
@@ -262,6 +262,20 @@ class CropContractTests(unittest.TestCase):
 
 
 class StitchExactnessTests(unittest.TestCase):
+    def test_the_crop_contains_the_whole_feather(self):
+        image = torch.zeros((1, 128, 128, 3))
+        mask = box_mask(128, 128, 54, 74, 54, 74)
+        expected = stitch_blend_from_mask(mask, 16)
+        for options in ({}, {"target_width": 32, "target_height": 64}):
+            with self.subTest(options=options):
+                cropped, sampling, stitcher = build_crop(
+                    image, mask, 1.2, 16, 32, keep_inside=True, **options
+                )
+                out = apply_stitch(stitcher, torch.ones_like(cropped))
+                torch.testing.assert_close(out[..., 0], expected, atol=1e-6, rtol=0)
+                torch.testing.assert_close(stitch_blend_mask(stitcher), expected, atol=1e-6, rtol=0)
+                self.assertTrue(all(v in (0.0, 1.0) for v in sampling.unique().tolist()))
+
     def test_identity_round_trip_is_bit_exact(self):
         image = rand_image(1, 64, 96, seed=10)
         mask = box_mask(64, 96, 24, 40, 40, 56)
@@ -753,6 +767,22 @@ class RescaleAlgorithmTests(unittest.TestCase):
 
 
 class OutpaintExtendTests(unittest.TestCase):
+    def test_mask_shaping_cannot_erase_the_extension_bands(self):
+        image = torch.zeros((1, 32, 32, 3))
+        for side in ("left", "right", "up", "down"):
+            for blur in (0.0, 2.0):
+                with self.subTest(side=side, blur=blur):
+                    cropped, sampling, stitcher = build_crop(
+                        image, torch.zeros((1, 32, 32)), 1.0, 0, 1,
+                        mask_grow=-8, mask_blur=blur, **{f"extend_{side}": 8},
+                    )
+                    self.assertTrue(torch.equal(sampling, torch.ones_like(sampling)))
+                    out = apply_stitch(stitcher, torch.ones_like(cropped))
+                    expected = torch.ones_like(stitcher["blend"])
+                    x, y = (8 if side == "left" else 0), (8 if side == "up" else 0)
+                    expected[:, y : y + 32, x : x + 32] = 0.0
+                    self.assertTrue(torch.equal(out[..., 0], expected))
+
     def test_extension_grows_the_stitched_output(self):
         image = rand_image(1, 32, 32, seed=36)
         empty = torch.zeros((1, 32, 32), dtype=torch.float32)
@@ -848,6 +878,20 @@ class BlendMaskOutputTests(unittest.TestCase):
         self.image = rand_image(1, 64, 96, seed=50)
         self.mask = box_mask(64, 96, 24, 40, 40, 56)
 
+    def test_a_partial_paste_window_limits_the_reported_mask(self):
+        # A previously built stitcher can carry a feather wider than its crop.
+        for original in ((0, 0, 96, 64), (8, 4, 80, 56)):
+            with self.subTest(original=original):
+                stitcher = build_canvas_stitcher(
+                    torch.zeros_like(self.image), torch.ones_like(self.mask)
+                )
+                stitcher["crop_to_canvas"] = (24, 16, 32, 32)
+                stitcher["canvas_to_original"] = original
+                out = apply_stitch(stitcher, torch.ones((3, 32, 32, 3)))
+                reported = stitch_blend_mask(stitcher, frames=3)
+                self.assertTrue(torch.equal(reported, out[..., 0]))
+                self.assertTrue(torch.equal(stitcher["blend"], torch.ones_like(self.mask)))
+
     def test_matches_the_blend_over_the_original_window(self):
         _c, _s, stitcher = build_crop(self.image, self.mask, 1.5, 8, 8)
         out_mask = stitch_blend_mask(stitcher)

tests/test_krea2_core.py

@@ -0,0 +1,140 @@
+"""CPU probes for reference attention, without importing model runtime code."""
+from __future__ import annotations
+
+import ast
+import hashlib
+from pathlib import Path
+import sys
+import types
+import unittest
+from unittest.mock import patch
+
+import torch
+from einops import rearrange
+
+ROOT = Path(__file__).resolve().parent.parent
+sys.path.insert(0, str(ROOT))
+tree = ast.parse((ROOT / "nodes/_krea2_core.py").read_text())
+core = types.ModuleType("nodes._krea2_core")
+core.__dict__.update(torch=torch, F=torch.nn.functional, rearrange=rearrange, hashlib=hashlib)
+exec(compile(ast.Module(body=[n for n in tree.body if isinstance(n, ast.FunctionDef)], type_ignores=[]),
+             "reference helpers", "exec"), core.__dict__)
+
+
+class CacheTests(unittest.TestCase):
+    def setUp(self):
+        class StubModel:
+            def __init__(self):
+                self.model = types.SimpleNamespace(extra_conds=lambda **kw: {}, extra_conds_shapes=lambda **kw: {})
+                self.dit = types.SimpleNamespace(forward=lambda *a, **kw: "original")
+                self.patches, self.callbacks = {}, {}
+
+            def clone(self): return StubModel()
+            def get_model_object(self, name): return self.dit
+            def add_object_patch(self, name, value): self.patches[name] = value
+            def add_callback(self, name, value): self.callbacks[name] = value
+
+        comfy = types.ModuleType("comfy")
+        comfy.conds = types.ModuleType("comfy.conds")
+        comfy.patcher_extension = types.ModuleType("comfy.patcher_extension")
+        comfy.patcher_extension.CallbacksMP = types.SimpleNamespace(ON_PRE_RUN="pre", ON_CLEANUP="cleanup")
+        self.modules = patch.dict(sys.modules, {"comfy": comfy, "comfy.conds": comfy.conds,
+            "comfy.patcher_extension": comfy.patcher_extension, "nodes._krea2_core": core})
+        self.modules.start()
+        from nodes.node_krea2_model_patch import AusBossKrea2OutpaintModelPatch
+        import nodes
+        self.package = patch.object(nodes, "_krea2_core", core, create=True)
+        self.package.start()
+        self.calls = []
+
+        def precompute(dit, x, t, refs, opts, **kw):
+            result = object()
+            self.calls.append(result)
+            return result
+
+        self.precompute = patch.object(core, "_precompute_ref_kv", precompute)
+        self.compute = patch.object(core, "_forward_with_cached_refs", lambda dit, x, t, c, kv, opts: kv)
+        self.precompute.start()
+        self.compute.start()
+        self.model = AusBossKrea2OutpaintModelPatch().patch(StubModel(), None)[0]
+        self.ref = torch.arange(64, dtype=torch.float32).reshape(1, 16, 2, 2)
+
+    def tearDown(self):
+        self.compute.stop()
+        self.precompute.stop()
+        self.package.stop()
+        self.modules.stop()
+
+    def run_forward(self, size=4, ref=None):
+        return self.model.patches["diffusion_model.forward"](
+            torch.zeros(1, 16, size, size), torch.ones(1), None,
+            ref_latents=[self.ref if ref is None else ref])
+
+    def test_same_reference_and_canvas_reuse_the_cache(self):
+        self.assertIs(self.run_forward(), self.run_forward())
+        self.assertEqual(len(self.calls), 1)
+
+    def test_canvas_size_changes_invalidate_the_cache_at_the_same_sigma(self):
+        self.assertIsNot(self.run_forward(), self.run_forward(size=8))
+
+    def test_reordered_reference_pixels_do_not_collide(self):
+        self.assertIsNot(self.run_forward(), self.run_forward(ref=self.ref.flip(-1)))
+
+    def test_in_place_reference_changes_invalidate_the_cache(self):
+        before = self.run_forward()
+        self.ref.copy_(self.ref.flip(-1))
+        self.assertIsNot(before, self.run_forward())
+
+    def test_inference_reference_changes_invalidate_the_cache(self):
+        with torch.inference_mode():
+            ref = self.ref.clone()
+            before = self.run_forward(ref=ref)
+            ref.copy_(ref.flip(-1))
+            self.assertIsNot(before, self.run_forward(ref=ref))
+
+    def test_sampler_boundaries_clear_the_cache_even_at_the_same_sigma(self):
+        for boundary in ("pre", "cleanup"):
+            before = self.run_forward()
+            self.assertIn(boundary, self.model.callbacks)
+            self.model.callbacks[boundary](self.model)
+            self.assertIsNot(before, self.run_forward())
+
+
+class AttentionTests(unittest.TestCase):
+    def test_attention_patches_run_in_order_and_keep_their_metadata(self):
+        seen = []
+        options = {"block_index": 2, "block_type": "single", "total_blocks": 3, "img_slice": [1, 2]}
+
+        def input_patch(q, k, v, pe, attn_mask, extra_options):
+            seen.append(("input", extra_options.copy()))
+            return {"q": q + 2, "v": v + 3, "pe": "rotary", "attn_mask": "mask"}
+
+        def rope(q, k, freqs):
+            self.assertEqual(freqs, "rotary")
+            return q + 4, k
+
+        def attention(q, k, v, heads, **kwargs):
+            seen.append(("attention", kwargs["mask"]))
+            self.assertTrue(torch.equal(q, torch.full_like(q, 7)))
+            self.assertEqual(k.shape[2], 3)
+            self.assertTrue(torch.equal(v[:, :, :2], torch.full_like(v[:, :, :2], 4)))
+            return torch.zeros(1, 2, 3)
+
+        def output_patch(out, extra_options):
+            seen.append(("output", extra_options.copy()))
+            return out + 10
+
+        options["patches"] = {"attn1_patch": [input_patch], "attn1_output_patch": [output_patch]}
+        attn = types.SimpleNamespace(wq=lambda x: x, wk=lambda x: x, wv=lambda x: x,
+            gate=torch.zeros_like, qknorm=lambda q, k: (q, k), heads=1, kvheads=1, wo=lambda x: x)
+        with patch.dict(core.__dict__, optimized_attention_masked=attention, apply_rope=rope):
+            out = core._attn_kv(attn, torch.ones(1, 2, 3), None,
+                kv_cache=(torch.zeros(1, 1, 1, 3), torch.zeros(1, 1, 1, 3)), transformer_options=options)
+        self.assertEqual([item[0] for item in seen], ["input", "attention", "output"])
+        self.assertEqual(seen[0][1], options)
+        self.assertEqual(seen[2][1], options)
+        self.assertTrue(torch.equal(out, torch.full_like(out, 5)))
+
+
+if __name__ == "__main__":
+    unittest.main()

tests/test_mask_by_touch.py

@@ -26,6 +26,7 @@ if "nodes" in sys.modules and not hasattr(sys.modules["nodes"], "__path__"):
 from nodes import node_mask_by_touch as node_module  # noqa: E402
 from nodes._mask_by_name_helpers import IF_NOTHING  # noqa: E402
 from nodes._mask_by_touch_helpers import (  # noqa: E402
+    MOVED_NOTHING,
     NEEDS_SAM3,
     NOTHING_PICKED,
     NOT_A_PICTURE,
@@ -35,6 +36,8 @@ from nodes._mask_by_touch_helpers import (  # noqa: E402
     OTHER_PICTURE,
     WORDS_FIRST,
     WORDS_MORE,
+    move_touches,
+    parse_touches,
     picture_key,
     scope_points,
     stroke_area,
@@ -533,17 +536,67 @@ class NothingPickedTests(TouchCase):
             self.assertIsNone(note["selection"])
 
     def test_picks_made_on_another_picture_are_not_this_pictures(self):
+        # With New picture on start over: the node's way before keep picks.
         text = touches(tap(75, 34), name("face", 60, 45), key="160x120-0000000000000000")
         with self.assertRaises(RuntimeError) as stopped:
-            self.run_node(text)
+            self.run_node(text, new_picture="start over")
         self.assertEqual(str(stopped.exception), OTHER_PICTURE, "the picks are there, on another picture")
-        out = self.run_node(text, if_nothing="empty mask")
+        out = self.run_node(text, if_nothing="empty mask", new_picture="start over")
         self.assertEqual(float(out["result"][0].sum()), 0.0, "empty mask still lets the run go on")
-        note = self.note(self.run_node(text, ask="look"))
+        note = self.note(self.run_node(text, ask="look", new_picture="start over"))
+        self.assertNotIn("moved", note)
         self.assertEqual((note["items"], note["key"], note["stamp"]), ([], picture_key(self.picture), touch_stamp(text)))
         self.assertEqual(FakeSam.calls, [])
         self.assertEqual(len(self.note(self.run_node(touches(tap(75, 34), key=picture_key(self.picture))))["items"]), 1)
 
+    def test_picks_made_on_another_picture_move_onto_this_one(self):
+        # Issue 301: a new picture keeps the picks, in the same places.
+        here = picture_key(self.picture)
+        made = [tap(75, 34), paint([[10, 100], [40, 100]], r=6)]
+        other = touches(*made, key="160x120-0000000000000000")
+        out = self.run_node(other)
+        same = self.run_node(touches(*made, key=here))
+        self.assertTrue(torch.equal(out["result"][0], same["result"][0]), "the same mask as picks made on this picture")
+        note = self.note(out)
+        moved = note["moved"]
+        self.assertEqual(moved["from"], touch_stamp(other), "the face knows which picks were moved")
+        self.assertEqual(note["stamp"], touch_stamp(moved["touches"]), "the answer is for the moved picks")
+        self.assertEqual(parse_touches(moved["touches"]), parse_touches(touches(*made, key=here)))
+        self.assertNotIn("moved", self.note(same), "picks made here are not moved")
+
+    def test_picks_from_a_picture_of_another_size_are_scaled_to_this_one(self):
+        # Made on a picture twice the size: every place and the brush halve.
+        big = touches(paint([[20, 200], [80, 200]], r=12), key="320x240-0000000000000000")
+        out = self.run_node(big)
+        small = touches(paint([[10, 100], [40, 100]], r=6), key=picture_key(self.picture))
+        self.assertTrue(torch.equal(out["result"][0], self.run_node(small)["result"][0]))
+
+    def test_moved_picks_that_find_nothing_say_so(self):
+        text = touches(tap(*WALL), key="160x120-0000000000000000")
+        with self.assertRaises(RuntimeError) as stopped:
+            self.run_node(text)
+        self.assertEqual(str(stopped.exception), MOVED_NOTHING)
+
+    def test_moving_touches_keeps_everything_but_the_places(self):
+        text = json.dumps({"v": 1, "key": "320x240-00", "items": [
+            {"t": "tap", "op": 1, "x": 101, "y": 51, "g": 1},
+            {"t": "name", "op": 0, "w": "mug", "x": 10, "y": 10, "q": 1},
+            {"t": "paint", "op": 1, "r": 9, "pts": [[3, 5], [7, 9]], "s": 40, "g": 2},
+            {"t": "all", "op": 1, "w": "hand"},
+            {"t": "subject", "op": 1},
+        ]})
+        moved = json.loads(move_touches(text, "160x120-11"))
+        self.assertEqual(moved["key"], "160x120-11")
+        self.assertEqual(moved["items"], [
+            {"t": "tap", "op": 1, "x": 51, "y": 26, "g": 1},  # halves round up, as the face rounds
+            {"t": "name", "op": 0, "w": "mug", "x": 5, "y": 5, "q": 1},
+            {"t": "paint", "op": 1, "r": 5, "pts": [[2, 3], [4, 5]], "s": 40, "g": 2},
+            {"t": "all", "op": 1, "w": "hand"},
+            {"t": "subject", "op": 1},
+        ])
+        same_size = json.loads(move_touches(text, "320x240-22"))
+        self.assertEqual((same_size["key"], same_size["items"]), ("320x240-22", json.loads(text)["items"]), "the same size only takes the new key")
+
     def test_text_that_is_not_touches_stops_before_any_search(self):
         for ask in ("", "look"):
             with self.assertRaises(ValueError) as stopped:
@@ -1775,6 +1828,36 @@ class TellTests(TouchCase):
         self.swap("_server", lambda: None)
         self.assertEqual(self.note(self.run_node("", ask="scope", unique_id=7))["pieces"]["list"], told["pieces"]["list"])
 
+    def test_a_run_that_stops_still_shows_the_face_the_picture_that_came_in(self):
+        # Issue 301: the picture changed upstream, the run stopped, and the
+        # face kept the old one until the image was unplugged and plugged in.
+        other = touches(tap(75, 34), key="160x120-0000000000000000")
+        for text, message in ((other, OTHER_PICTURE), ("", NOTHING_PICKED)):
+            self.sent.clear()
+            with self.assertRaises(RuntimeError) as stopped:
+                self.run_node(text, unique_id=7, new_picture="start over")
+            self.assertEqual(str(stopped.exception), message, "the run still stops, for the same reason")
+            [(event, data, sid)] = self.sent
+            self.assertEqual((event, data["node"], data["end"], data["stopped"], sid), (node_module.LOOK_EVENT, "7", True, True, "the page that asked"))
+            note = data["note"]
+            self.assertEqual((note["key"], note["width"], note["height"]), (picture_key(self.picture), W, H))
+            self.assertEqual((note["items"], note["selection"], note["stamp"]), ([], None, ""), "nothing picked on it")
+            self.assertEqual(self.opened(note["picture"]).size[0] > 0, True)
+        self.assertEqual(FakeSam.calls, [], "showing the picture asks SAM 3 nothing")
+
+    def test_a_stop_that_cannot_tell_the_face_stops_for_the_same_reason(self):
+        def broken(*_args):
+            raise ConnectionError("the page is gone")
+
+        self.server.send_sync = broken
+        with self.assertRaises(RuntimeError) as stopped:
+            self.run_node("", unique_id=7)
+        self.assertEqual(str(stopped.exception), NOTHING_PICKED)
+        self.server.send_sync = lambda *args: self.sent.append(args)
+        with self.assertRaises(RuntimeError):
+            self.run_node("")
+        self.assertEqual(self.sent, [], "no id: nobody to tell")
+
     def test_a_page_that_cannot_be_told_never_stops_the_look(self):
         def broken(*_args):
             raise ConnectionError("the page is gone")
@@ -2033,7 +2116,9 @@ class ContractTests(unittest.TestCase):
     def test_inputs_and_outputs_are_the_contracts(self):
         inputs = self.cls.INPUT_TYPES()
         self.assertEqual(list(inputs["required"]), ["image", "model", "clip", "touches", "grow", "soften", "smooth", "fill_holes", "if_nothing"])
-        self.assertEqual(list(inputs["optional"]), ["free_vram", "invert", "ask", "fine_edges"])
+        self.assertEqual(list(inputs["optional"]), ["free_vram", "invert", "ask", "fine_edges", "new_picture"])
+        # Picks carry over to a new picture unless the node starts over.
+        self.assertEqual((inputs["optional"]["new_picture"][0], inputs["optional"]["new_picture"][1]["default"]), (["keep picks", "start over"], "keep picks"))
         # Off until the user picks a model file: an API prompt without it runs as before.
         self.assertEqual((optional_first := inputs["optional"]["fine_edges"])[1]["default"], "off")
         self.assertEqual(optional_first[0][0], "off", "off is always offered, and comes first")
@@ -2048,7 +2133,7 @@ class ContractTests(unittest.TestCase):
         self.assertEqual((required["soften"][0], soften["default"], soften["min"], soften["max"], soften["step"]), ("FLOAT", 0.0, 0.0, 100.0, 0.1))
         smooth = required["smooth"][1]
         self.assertEqual((required["smooth"][0], smooth["default"], smooth["min"], smooth["max"]), ("INT", 0, 0, 64))
-        self.assertEqual((required["fill_holes"][0], required["fill_holes"][1]["default"]), ("BOOLEAN", True))
+        self.assertEqual((required["fill_holes"][0], required["fill_holes"][1]["default"]), ("BOOLEAN", False))
         self.assertEqual((required["if_nothing"][0], required["if_nothing"][1]["default"]), (list(IF_NOTHING), "stop the run"))
         self.assertEqual((optional["ask"][0], optional["ask"][1]["default"]), ("STRING", ""))
         self.assertEqual((optional["invert"][0], optional["invert"][1]["default"]), ("BOOLEAN", False))

tests/test_media_upload.py

@@ -1,15 +1,17 @@
 from __future__ import annotations
 
 import io
+import json
 from pathlib import Path
 import sys
 import tempfile
 import unittest
+from unittest.mock import Mock
 
 import av
 import numpy as np
-from aiohttp import FormData, web
-from aiohttp.test_utils import TestClient, TestServer
+from aiohttp import FormData, StreamReader, web
+from aiohttp.test_utils import make_mocked_request
 
 ROOT = Path(__file__).resolve().parent.parent
 sys.path.insert(0, str(ROOT))
@@ -43,22 +45,29 @@ class UploadTests(unittest.IsolatedAsyncioTestCase):
                 return web.json_response(await stream_video_upload(request, self.root, {'.mp4', '.mov'}))
             except Exception as exc:
                 return web.json_response({'error': str(exc)}, status=400)
-        app = web.Application(client_max_size=1024)
-        app.router.add_post('/upload', handler)
-        self.client = TestClient(TestServer(app))
-        await self.client.start_server()
-        self.addAsyncCleanup(self.client.close)
+        self.handler = handler
 
     async def upload(self, body, filename='clip.mp4'):
         form = FormData()
         form.add_field('image', io.BytesIO(body), filename=filename, content_type='video/mp4')
-        return await self.client.post('/upload', data=form)
+        payload = form()
+        stream = StreamReader(Mock(_reading_paused=False), limit=1024)
+
+        class Writer:
+            async def write(self, chunk):
+                stream.feed_data(chunk)
+
+        await payload.write(Writer())
+        stream.feed_eof()
+        request = make_mocked_request('POST', '/upload', headers=payload.headers,
+                                      payload=stream, client_max_size=1024)
+        return await self.handler(request)
 
     async def test_stream_exceeds_buffered_body_limit_and_retains_bytes(self):
         body = self.body + b'\0' * (2 * 1024 * 1024)
         response = await self.upload(body)
-        self.assertEqual(response.status, 200, await response.text())
-        result = await response.json()
+        self.assertEqual(response.status, 200, response.text)
+        result = json.loads(response.text)
         self.assertEqual((self.root / result['name']).read_bytes(), body)
 
     async def test_collision_and_symlink_never_overwrite(self):
@@ -66,7 +75,7 @@ class UploadTests(unittest.IsolatedAsyncioTestCase):
         (self.root / 'clip.mp4').symlink_to(self.root / 'kept.txt')
         response = await self.upload(self.body)
         self.assertEqual(response.status, 200)
-        self.assertEqual((await response.json())['name'], 'clip_1.mp4')
+        self.assertEqual(json.loads(response.text)['name'], 'clip_1.mp4')
         self.assertEqual((self.root / 'kept.txt').read_text(), 'keep')
 
     async def test_invalid_media_is_removed(self):

tests/test_second_copy.py

@@ -0,0 +1,128 @@
+"""A second install of the pack loads nothing, so ComfyUI still starts.
+
+People install the pack from ComfyUI-Manager (custom_nodes/ausboss-nodes) and
+from GitHub (custom_nodes/ComfyUI-AusBoss). With both folders present, the two
+copies registered the same server routes, and ComfyUI stopped at startup with
+"Added route will never be executed, method HEAD is already registered".
+
+This loads the pack twice, from two folders, in one fresh standard-library
+Python with the same stand-ins as tests/test_node_api.py. The second copy must
+add no routes, no nodes and no browser files, and must name both folders.
+"""
+
+from __future__ import annotations
+
+from pathlib import Path
+import contextlib
+import importlib.util
+import io
+import json
+import subprocess
+import sys
+import tempfile
+import types
+import unittest
+
+ROOT = Path(__file__).resolve().parent.parent
+ROUTES: list[tuple[str, str]] = []
+
+
+def stub_server():
+    """A PromptServer whose route table records every route, the way aiohttp will add them."""
+
+    class Routes:
+        def __getattr__(self, method):
+            def register(path, *_args, **_kwargs):
+                ROUTES.append((method.upper(), path))
+                return lambda handler: handler
+
+            return register
+
+    class Instance:
+        routes = Routes()
+
+        def __getattr__(self, _name):
+            return lambda *_args, **_kwargs: None
+
+    module = types.ModuleType("server")
+    module.PromptServer = type("PromptServer", (), {"instance": Instance()})
+    sys.modules["server"] = module
+
+
+def load_copy(name: str, folder: Path):
+    spec = importlib.util.spec_from_file_location(
+        name, folder / "__init__.py", submodule_search_locations=[str(folder)]
+    )
+    pack = importlib.util.module_from_spec(spec)
+    sys.modules[name] = pack
+    out = io.StringIO()
+    with contextlib.redirect_stdout(out):
+        spec.loader.exec_module(pack)
+    return pack, out.getvalue()
+
+
+def child(tmp: Path, report: Path):
+    sys.path.insert(0, str(ROOT / "tests"))
+    from test_node_api import StandInFinder, StandInModule
+
+    sys.meta_path.insert(0, StandInFinder())
+    sys.modules["aiohttp"] = StandInModule("aiohttp")  # route helpers import aiohttp.web first
+    stub_server()
+    # The two folder names people end up with: a git clone and Manager's install.
+    first, second = tmp / "ComfyUI-AusBoss", tmp / "ausboss-nodes"
+    first.symlink_to(ROOT, target_is_directory=True)
+    second.symlink_to(ROOT, target_is_directory=True)
+
+    first_pack, _ = load_copy("ComfyUI-AusBoss", first)
+    first_routes = list(ROUTES)
+    second_pack, second_out = load_copy("ausboss-nodes", second)
+    report.write_text(json.dumps({
+        "first_nodes": len(first_pack.NODE_CLASS_MAPPINGS),
+        "first_web": first_pack.WEB_DIRECTORY,
+        "first_routes": len(first_routes),
+        "second_nodes": len(second_pack.NODE_CLASS_MAPPINGS),
+        "second_web": second_pack.WEB_DIRECTORY,
+        "second_routes": len(ROUTES) - len(first_routes),
+        "duplicates": sorted({f"{m} {p}" for m, p in ROUTES if ROUTES.count((m, p)) > 1}),
+        "second_out": second_out,
+    }), encoding="utf-8")
+
+
+class SecondCopyTest(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        with tempfile.TemporaryDirectory() as tmp:
+            report = Path(tmp) / "report.json"
+            result = subprocess.run(
+                [sys.executable, "-S", str(Path(__file__).resolve()), "--child", tmp, str(report)],
+                cwd=ROOT, capture_output=True, text=True, timeout=120,
+            )
+            if result.returncode or not report.exists():
+                raise AssertionError(f"Loading two copies failed:\n{result.stdout}\n{result.stderr}")
+            cls.found = json.loads(report.read_text(encoding="utf-8"))
+
+    def test_first_copy_loads_as_usual(self):
+        self.assertGreater(self.found["first_nodes"], 0)
+        self.assertGreater(self.found["first_routes"], 0)
+        self.assertEqual(self.found["first_web"], "./js")
+
+    def test_second_copy_adds_no_routes(self):
+        self.assertEqual(self.found["duplicates"], [])
+        self.assertEqual(self.found["second_routes"], 0)
+
+    def test_second_copy_adds_no_nodes_or_browser_files(self):
+        self.assertEqual(self.found["second_nodes"], 0)
+        self.assertIsNone(self.found["second_web"])
+
+    def test_second_copy_names_both_folders(self):
+        out = self.found["second_out"]
+        self.assertIn("ComfyUI-AusBoss", out)
+        self.assertIn("ausboss-nodes", out)
+        out.encode("ascii")  # cp1252 consoles: the message must be plain ASCII
+
+
+if __name__ == "__main__":
+    if len(sys.argv) == 4 and sys.argv[1] == "--child":
+        child(Path(sys.argv[2]), Path(sys.argv[3]))
+    else:
+        unittest.main()

tests/test_stitch_classic_pins.py

@@ -6,6 +6,8 @@ outpaint stitches a clip. People who update the pack must get the same
 picture. Each case below builds its stitcher the way its node does, stitches a
 fixed patch at color_match 0, 0.5 and 1 through the node, and compares the
 image and blend_mask with the output the 2.3.0 code gave.
+The legacy inpaint crop keeps its original geometry here; its expected
+mask is limited to the paste window. Crop sizing is tested separately.
 
 Blend in with Tone match at 0 is pinned the same way, to the 2.4.0 code:
 the published Qwen Image 2.1 Rotate + Outpaint workflow stitches that way.
@@ -122,7 +124,12 @@ def crop_for_inpaint():
     mask = torch.zeros((1, 64, 80))
     mask[:, 20:44, 30:58] = 1.0
     cropped, _sampling, stitcher = AusBossCropForInpaint().crop(image, mask, 1.5, 16, 8)
+    # Freeze the released crop window so this checks the seam independently
+    # of the corrected crop sizing, without regenerating release fixtures.
+    stitcher["crop_to_canvas"] = (20, 12, 48, 40)
+    stitcher["sampler_size"] = (48, 40)
     cx, cy, cw, ch = stitcher["crop_to_canvas"]
+    cropped = image[:, cy : cy + ch, cx : cx + cw]
     return stitcher, model_output(cropped, stitcher["blend"][:, cy : cy + ch, cx : cx + cw], 13)
 
 
@@ -201,7 +208,13 @@ class ClassicSeamPinTests(unittest.TestCase):
                     stitcher, patch_image = build()
                     image, blend_mask = stitch(stitcher, patch_image, strength)
                     assert_released_image(image, reference_image(name, strength))
-                    assert_released_image(blend_mask, reference_mask(name))
+                    expected_mask = reference_mask(name)
+                    if name == "crop for inpaint":
+                        cx, cy, cw, ch = stitcher["crop_to_canvas"]
+                        pasted = torch.zeros_like(expected_mask)
+                        pasted[:, cy : cy + ch, cx : cx + cw] = expected_mask[:, cy : cy + ch, cx : cx + cw]
+                        expected_mask = pasted
+                    assert_released_image(blend_mask, expected_mask)
 
     def test_the_mask_references_are_the_pinned_masks(self):
         # Reads the files only, so every machine gives the same answer.

tests/test_workflow_contract.py

@@ -35,6 +35,7 @@ class WorkflowContractTests(unittest.TestCase):
 
     def test_named_widget_copy_must_match_the_loaded_values(self):
         graph = good_graph()
+        graph["nodes"][0]["type"] = "AUSBOSS_NODES_Seed"
         graph["nodes"][0]["widgets_values"] = [7, "fixed", ""]
         graph["nodes"][0]["widgets_values_named"] = {"seed": 7, "control_after_generate": "fixed", "ausboss_seed_panel": ""}
         self.assertEqual(workflow_problems(graph), [])

tests/theme.test.mjs

@@ -0,0 +1,43 @@
+import assert from "node:assert/strict";
+import { readFileSync } from "node:fs";
+import test from "node:test";
+
+import { THEME } from "../js/shared/theme.mjs";
+
+// The card, the number box, the switch and the picture bar take every colour
+// from theme.mjs, so the palette is changed in one place.
+const ON_THEME = [
+  "js/shared/widget_card.mjs", "js/shared/scrub_input.mjs", "js/shared/slide_switch.mjs",
+  "js/input_preview/index.js", "js/shared/panel_controls.mjs", "js/shared/picture_stepper.mjs",
+  "js/shared/step_preview.mjs",
+];
+
+test("the card, number box, switch and picture bar carry no colour of their own", () => {
+  for (const file of ON_THEME) {
+    const source = readFileSync(new URL(`../${file}`, import.meta.url), "utf8");
+    const hex = source.match(/#[0-9a-fA-F]{3,8}\b/g) ?? [];
+    assert.deepEqual(hex, [], `${file} has colour literals; add them to js/shared/theme.mjs`);
+  }
+});
+
+const luminance = (hex) => {
+  const channels = [1, 3, 5].map((i) => parseInt(hex.slice(i, i + 2), 16) / 255)
+    .map((c) => (c <= 0.03928 ? c / 12.92 : ((c + 0.055) / 1.055) ** 2.4));
+  return 0.2126 * channels[0] + 0.7152 * channels[1] + 0.0722 * channels[2];
+};
+const contrast = (a, b) => {
+  const [hi, lo] = [luminance(a), luminance(b)].sort((x, y) => y - x);
+  return (hi + 0.05) / (lo + 0.05);
+};
+
+test("text a person reads holds 4.5:1 on the card and on a control", () => {
+  const pairs = [
+    ["ink", "fill"], ["inkSoft", "card"], ["label", "card"], ["label", "fill"],
+    ["faint", "card"], ["faint", "fill"], ["onBrand", "brand"], ["ink", "switchOff"], ["warnInk", "warnSoft"],
+    ["dangerInk", "dangerSoft"], ["faint", "well"], ["inkSoft", "fill"],
+  ];
+  for (const [text, ground] of pairs) {
+    const ratio = contrast(THEME[text], THEME[ground]);
+    assert.ok(ratio >= 4.5, `${text} on ${ground} is ${ratio.toFixed(2)}:1`);
+  }
+});

tests/touch_math.test.mjs

@@ -34,6 +34,7 @@ import {
   growMask,
   loaderSignature,
   maskShare,
+  movedTouches,
   nameShown,
   packPlanes,
   paintCover,
@@ -1047,3 +1048,17 @@ test("while the node still looks at a picture it says so, a lit thing is taken a
   assert.match(stage.slice(stage.indexOf("function syncReadout"), stage.indexOf("function removeChip")), /syncLooking\(face\)/);
   assert.match(stage.slice(stage.indexOf("function syncState"), stage.indexOf("function setNote")), /syncLooking\(face\)/);
 });
+
+test("picks the node moved onto a new picture are taken only while nothing was picked since", () => {
+  // Issue 301: New picture on keep picks. The node moves the picks and sends
+  // the stamp of the ones it moved them from.
+  const before = encodeTouches("320x240-aa", [{ t: "tap", op: 1, x: 100, y: 50 }]);
+  const after = encodeTouches("160x120-bb", [{ t: "tap", op: 1, x: 50, y: 25 }]);
+  const note = { key: "160x120-bb", moved: { from: stampOf(before), touches: after } };
+  assert.equal(movedTouches(note, before), after, "the widget still holds what was moved: take the moved picks");
+  const since = encodeTouches("320x240-aa", [{ t: "tap", op: 1, x: 100, y: 50 }, { t: "tap", op: 1, x: 9, y: 9 }]);
+  assert.equal(movedTouches(note, since), null, "a pick made since is kept");
+  assert.equal(movedTouches({ key: "160x120-bb" }, before), null, "nothing was moved");
+  assert.equal(movedTouches({ moved: { from: 7, touches: after } }, before), null, "a note that is not this shape moves nothing");
+  assert.equal(movedTouches(null, before), null);
+});

tests/touch_stop_note.test.mjs

@@ -0,0 +1,64 @@
+// A stopped run's message on Mask by Touch goes once the next result comes in.
+//
+// When a run stops at Mask by Touch (nothing picked, picks made on another
+// picture), its message goes on the node's face and stays there, so the
+// person can read it. It used to stay after the next run from the Run button
+// had worked, until something else on the face was said. The face's own
+// runs cleared it; a workflow run's result did not.
+//
+// touch_stage.mjs imports ComfyUI's api, so it cannot be loaded here. This
+// file runs its setNote for real and holds the stop and the result to the
+// lines that clear the message. The live proof is a stopped run followed by
+// a good one on a real canvas.
+
+import assert from "node:assert/strict";
+import test from "node:test";
+import { readFileSync } from "node:fs";
+
+const SOURCE = readFileSync(new URL("../js/shared/touch_stage.mjs", import.meta.url), "utf-8");
+
+function functionSource(name) {
+  const start = SOURCE.indexOf(`function ${name}(`);
+  assert.ok(start >= 0, `touch_stage.mjs has no function ${name}`);
+  const end = SOURCE.indexOf("\n}\n", start);
+  return SOURCE.slice(start, end + 2);
+}
+
+// The face's note, with setNote as touch_stage.mjs has it.
+function noteFace() {
+  const setNote = new Function(`${functionSource("setNote")}\nreturn setNote;`)();
+  const classes = new Set();
+  const face = {
+    noteTimer: 0,
+    noteEl: { textContent: "", classList: { toggle: (name, on) => (on ? classes.add(name) : classes.delete(name)) } },
+  };
+  return { face, setNote, shown: () => (classes.has("on") ? face.noteEl.textContent : "") };
+}
+
+test("a stopped run's message stays up until the next result, then goes", () => {
+  const { face, setNote, shown } = noteFace();
+  const stopped = SOURCE.match(/face\.stopped = \(message\) => \{([\s\S]*?)\n {2}\};/)?.[1];
+  assert.ok(stopped, "touch_stage.mjs has no face.stopped");
+  assert.match(stopped, /setNote\(face, String\(message \?\? ""\)\);\s*(?:\/\/[^\n]*\n\s*)*face\.stopNote = true;/,
+    "a stop marks its message as a stop message, after it is set");
+  // What face.stopped does to the note.
+  setNote(face, "Mask by Touch: nothing is picked.");
+  face.stopNote = true;
+  assert.equal(shown(), "Mask by Touch: nothing is picked.");
+
+  // The next result clears it, as the head of show() does.
+  const head = functionSource("show").split("\n").slice(0, 6).join("\n");
+  assert.match(head, /if \(face\.stopNote && !interim && !restored\) setNote\(face, ""\);/,
+    "show() clears a stop message when a result comes in");
+  if (face.stopNote) setNote(face, "");
+  assert.equal(shown(), "");
+});
+
+test("any other message ends the stop message's hold", () => {
+  const { face, setNote } = noteFace();
+  setNote(face, "Mask by Touch: nothing is picked.");
+  face.stopNote = true;
+  setNote(face, "Nothing found there.", { life: 1 });
+  clearTimeout(face.noteTimer);
+  assert.equal(face.stopNote, false, "a note said since is not cleared by the next result");
+});

tests/widget_card.test.mjs

@@ -6,7 +6,7 @@ import { fileURLToPath } from "node:url";
 
 import {
   CARD_PADDING, GROUP_HEIGHT, ROW_GAP, ROW_HEIGHT, SECTION_HEIGHT, SLOT_OFFSET, SOCKETLESS_CHOICE, SOCKETLESS_TEXT,
-  cardHeight, choiceLabel, commitWidgetValue, holdsUnknownValue, markSocketless, resetUnknownValues, rowHeight, rowInLook, rowKind, rowMuted, rowTops,
+  cardHeight, choiceLabel, commitWidgetValue, holdsUnknownValue, liftSlot, liftSocket, markSocketless, resetUnknownValues, rowHeight, rowInLook, rowKind, rowMuted, rowTops,
   scrubSteps, segmentFits, socketWidgetY, visibleRows, widgetTooltip,
 } from "../js/shared/widget_card_math.mjs";
 
@@ -418,3 +418,20 @@ test("a choice's words come from the row: a map, or a function for lists only th
   // The pill or the list is chosen from the words a person reads, so two long file names still make a short pill.
   assert.equal(rowKind({ widget: "fine_edges", labels: row.labels }, { type: "combo", options: { values: ["off", "vitmatte-small-composition-1k/model.safetensors"] } }), "segment");
 });
+
+test("a lifted socket loses the row position the frontend stamped on it", () => {
+  // Newer frontends set `slot.pos` to the widget's row and keep using it
+  // after the widget is gone, which drew fixed_frames on top of force_rate.
+  const stamped = () => ({ name: "fixed_frames", widget: { name: "fixed_frames" }, _widget: {}, pos: [10, 10], link: null });
+  const node = { inputs: [{ name: "force_rate" }, stamped()] };
+  assert.equal(liftSocket(node, "fixed_frames"), true);
+  const slot = node.inputs[1];
+  assert.equal(slot.widget, undefined);
+  assert.equal(slot._widget, undefined);
+  assert.equal("pos" in slot, false);
+  assert.equal(liftSocket(node, "fixed_frames"), false);
+  const loose = stamped();
+  liftSlot(loose);
+  assert.equal("pos" in loose, false);
+  assert.equal(loose.widget, undefined);
+});

tests/workflow_note.test.mjs

@@ -15,6 +15,7 @@ import {
   matchInstalled,
   noteFit,
   noteIsEmpty,
+  noteShowsTileFace,
   normalizeNote,
   packsFromGraph,
   parseInline,
@@ -198,6 +199,23 @@ test("noteFit ignores a card it could not measure", () => {
   assert.deepEqual(noteFit({ natural: 794.125, nodeHeight: undefined, chrome: 22 }), { fit: null, grow: false });
 });
 
+test("a tile face shows only for a tile layout note that has content", () => {
+  assert.equal(noteShowsTileFace(normalizeNote('{"title":"Workflow info","layout":"tile"}')), true);
+  assert.equal(noteShowsTileFace(normalizeNote('{"title":"Workflow info","layout":"card"}')), false);
+  assert.equal(noteShowsTileFace(normalizeNote('{"layout":"tile"}')), false);
+  assert.equal(noteShowsTileFace(normalizeNote("")), false);
+  assert.equal(noteShowsTileFace(null), false);
+});
+
+test("the classic fit leaves a tile face compact", () => {
+  const source = readFileSync(new URL("../js/workflow_note/index.js", import.meta.url), "utf-8");
+  assert.match(
+    source,
+    /function fitNote\(state\) \{\n  if \(!classicCanvas\(\)\) return;\n  \/\/ A tile face is a button, not a card: fitting it would measure the note\n  \/\/ behind the button and grow a new tile straight back to full height\.\n  if \(noteShowsTileFace\(state\.note\)\) \{\n    state\.fitHeight = undefined;\n    return;\n  \}/,
+    "fitNote skips a note that shows its tile face, so a new tile keeps its compact start",
+  );
+});
+
 test("parseInline handles bold, italic, code and safe links", () => {
   assert.deepEqual(parseInline("a **b** *c* `d` [e](https://f.g) [h](javascript:x) i"), [
     { type: "text", text: "a " },
@@ -309,34 +327,8 @@ test("note formatting leaves old prose, unsafe markup and code literal", () => {
   assert.equal(parseMarkdown("```\n|a|\n|---|\n```")[0].type, "code");
 });
 
-// Exercise the actual browser fitter with measured layout inputs. Keeping the
-// DOM read behind a stub also proves a tile never measures its dialog content.
-const noteFrontend = readFileSync(new URL("../js/workflow_note/index.js", import.meta.url), "utf-8");
-const fitNoteSource = noteFrontend.slice(noteFrontend.indexOf("function fitNote(state) {"), noteFrontend.indexOf("// Every list widget", noteFrontend.indexOf("function fitNote(state) {")));
-const runFitNote = new Function("classicCanvas", "naturalHeight", "noteFit", "WIDGET_FRAME", "PANEL_TOP", `${fitNoteSource}; return fitNote;`);
-
-test("tile fitting preserves default and saved heights despite a stale widget position", () => {
-  const fit = runFitNote(() => true, () => 50, noteFit, 8, 2);
-  for (const height of [80, 110, 160]) {
-    const state = { note: { layout: "tile" }, fitHeight: 284,
-      node: { size: [380, height], setSize: () => assert.fail("tile fitting must preserve its size") },
-      root: { isConnected: true }, domWidget: { computedHeight: 50, y: 226 } };
-    fit(state);
-    assert.equal(state.fitHeight, undefined, "a tile must not retain a full note's resize floor");
-    assert.equal(state.node.size[1], height);
-  }
-});
-
-test("card and banner fitting still grows to measured content and keeps taller saved sizes", () => {
-  const fit = runFitNote(() => true, () => 300, noteFit, 8, 2);
-  for (const layout of ["card", "banner"]) {
-    for (const height of [80, 500]) {
-      const state = { note: { layout }, node: { size: [380, height],
-        setSize(size) { this.size = size; }, setDirtyCanvas() {} },
-        root: { isConnected: true }, domWidget: { computedHeight: 50, y: 2 } };
-      fit(state);
-      assert.equal(state.fitHeight, 310);
-      assert.equal(state.node.size[1], Math.max(height, 310));
-    }
-  }
+test("note panels stand down the frontend image preview", () => {
+  const source = readFileSync(new URL("../js/workflow_note/index.js", import.meta.url), "utf-8");
+  assert.match(source, /import \{ suppressCoreImagePreview \} from "\.\.\/shared\/core_preview\.mjs";/, "the note imports the pack's preview suppression");
+  assert.match(source, /suppressCoreImagePreview\(node\);/, "building a note panel stands the core image preview down");
 });

tests/workflow_switches.test.mjs

@@ -400,7 +400,7 @@ test("a switch changes only the settings that differ between its on and its off"
   assert.deepEqual(valuePairs({}), []);
   // Text that only looks like a stack on one side is switched whole.
   assert.deepEqual(valuePairs({ on: { 5: { text: "[1, 2]" } }, off: { 5: { text: "plain" } } }), [{ node: "5", widget: "text", on: "[1, 2]", off: "plain" }]);
-  assert.equal(stackRows("[]"), null);
+  assert.deepEqual(stackRows("[]"), []);
   assert.equal(stackRows('[{"name":"a"}]'), null);
   assert.equal(stackRows("not json ["), null);
 });

tests/workflow_switches_frontend.test.mjs

@@ -0,0 +1,172 @@
+import assert from "node:assert/strict";
+import { readFileSync } from "node:fs";
+import test from "node:test";
+import vm from "node:vm";
+import * as logic from "../js/shared/workflow_switches.mjs";
+import { cardHeight } from "../js/shared/widget_card_math.mjs";
+
+class Element extends EventTarget {
+  constructor(tag = "div") {
+    super();
+    this.tagName = tag.toUpperCase();
+    this.children = [];
+    this.className = "";
+    this.style = { setProperty(key, value) { this[key] = value; } };
+  }
+  get classList() {
+    const classes = () => this.className.split(/\s+/).filter(Boolean);
+    return {
+      contains: (name) => classes().includes(name),
+      add: (...names) => { this.className = [...new Set([...classes(), ...names])].join(" "); },
+      remove: (...names) => { this.className = classes().filter((name) => !names.includes(name)).join(" "); },
+      toggle: (name, force) => {
+        const on = force ?? !classes().includes(name);
+        this.className = [...classes().filter((value) => value !== name), ...(on ? [name] : [])].join(" ");
+        return on;
+      },
+    };
+  }
+  append(...nodes) { for (const node of nodes) this.insertBefore(node, null); }
+  insertBefore(node, cursor) {
+    node.remove();
+    node.parentElement = this;
+    this.children.splice(cursor ? this.children.indexOf(cursor) : this.children.length, 0, node);
+  }
+  remove() {
+    if (!this.parentElement) return;
+    const siblings = this.parentElement.children;
+    siblings.splice(siblings.indexOf(this), 1);
+    this.parentElement = null;
+  }
+  replaceChildren(...nodes) {
+    for (const node of [...this.children]) node.remove();
+    this.append(...nodes);
+  }
+  get firstElementChild() { return this.children[0] ?? null; }
+  get nextElementSibling() {
+    const siblings = this.parentElement?.children ?? [];
+    return siblings[siblings.indexOf(this) + 1] ?? null;
+  }
+  setAttribute(name, value) { this[name] = value; }
+  querySelector(selector) {
+    for (const child of this.children) {
+      if (selector.startsWith(".") && child.classList.contains(selector.slice(1))) return child;
+      const found = child.querySelector(selector);
+      if (found) return found;
+    }
+    return null;
+  }
+  contains(target) { return this === target || this.children.some((child) => child.contains(target)); }
+  getContext() { return { measureText: (text) => ({ width: String(text).length * 6 }) }; }
+}
+
+function page() {
+  class Node {
+    constructor() {
+      this.type = "AUSBOSS_NODES_WorkflowSwitches";
+      this.properties = {};
+      this.widgets = [];
+      this.size = [320, 100];
+      this.pos = [0, 0];
+    }
+    addDOMWidget(name, type, element, options) {
+      const widget = { name, type, element, options };
+      this.widgets.push(widget);
+      return widget;
+    }
+    computeSize() { return [320, 100]; }
+    setSize(size) { this.size = size; }
+  }
+  class Group {}
+  const timers = new Map();
+  const microtasks = [];
+  let nextTimer = 0;
+  const app = {
+    canvas: { graph: { nodes: [], groups: [] } },
+    registerExtension(extension) { this.extension = extension; },
+  };
+  const document = {
+    head: new Element(), body: new Element(), activeElement: null,
+    createElement: (tag) => new Element(tag), createElementNS: (_ns, tag) => new Element(tag),
+    getElementById: () => null,
+  };
+  const context = vm.createContext({
+    ...logic, app, document, performance, console, cardHeight,
+    LiteGraph: { LGraphNode: Node, LGraphGroup: Group }, BRAND: "#00b4aa",
+    chainCallback(proto, name, callback) {
+      const previous = proto[name];
+      proto[name] = function (...args) { const result = previous?.apply(this, args); callback.apply(this, args); return result; };
+    },
+    keepDomWidgetWidthAuto() {}, holdNodeMinWidth() {}, holdVueNodeMinWidth() {}, pinVuePanelHeight() {},
+    ensureCardCss() {}, keepKeyInField() {}, notifyAusbossChange() {}, showToast() {}, commitWidgetValue() {}, onPaste() {},
+    queueMicrotask: (callback) => microtasks.push(callback),
+    setTimeout: (callback) => { const id = ++nextTimer; timers.set(id, callback); return id; },
+    clearTimeout: (id) => timers.delete(id),
+  });
+  const source = readFileSync(new URL("../js/workflow_switches/index.js", import.meta.url), "utf8");
+  vm.runInContext(source.replace(/^import\s[\s\S]*?from\s+"[^"]+";\n/gm, "")
+    + "\nglobalThis.hooks = { live, refresh, scheduleCheck, choiceSnapshots };", context);
+  app.extension.beforeRegisterNodeDef(Node, { name: "AUSBOSS_NODES_WorkflowSwitches" });
+  const flush = () => { for (const callback of microtasks.splice(0)) callback(); };
+  const makeCard = () => {
+    const node = new Node();
+    node.onNodeCreated();
+    node.graph = app.canvas.graph;
+    node.graph.nodes.push(node);
+    node.onAdded();
+    flush();
+    return node;
+  };
+  return { app, Node, Group, timers, flush, makeCard, ...context.hooks };
+}
+
+test("copy serialization clones do not retain live states or schedule redraw timers", () => {
+  const p = page();
+  const real = p.makeCard();
+  const clones = Array.from({ length: 5 }, () => {
+    const clone = new p.Node();
+    clone.onNodeCreated();
+    clone.onConfigure();
+    return clone;
+  });
+  p.flush();
+  assert.equal(p.live.size, 1);
+  real.onRemoved();
+  p.app.canvas.onDrawForeground();
+  for (const clone of clones) p.scheduleCheck(clone.__ausbossWorkflowSwitches);
+  assert.equal(p.live.size, 0);
+  assert.equal(p.timers.size, 0);
+  real.onAdded();
+  p.flush();
+  assert.equal(p.live.size, 1, "undoing removal registers the card again");
+});
+
+test("selection-free choice capture preserves text node ids", () => {
+  const p = page();
+  const card = p.makeCard();
+  const target = { id: "node-value", widgets: [{ name: "value", value: 20 }] };
+  card.properties.ausboss_workflow_switches = { switches: [{ id: 1, choice: true, on: { "node-value": { value: 8 } } }] };
+  card.graph.getNodeById = (id) => id === target.id ? target : null;
+  const snapshots = p.choiceSnapshots(card.__ausbossWorkflowSwitches, []);
+  assert.equal(snapshots.length, 1);
+  assert.equal(snapshots[0].id, "node-value");
+  assert.equal(snapshots[0].values.value, 20);
+});
+
+test("selecting a node after one group reveals the choice button without another graph change", () => {
+  const p = page();
+  const card = p.makeCard();
+  card.properties.ausboss_workflow_switches.groups = "none";
+  const group = new p.Group();
+  group.id = 9;
+  p.app.canvas.selectedItems = new Set([group]);
+  p.refresh(card.__ausbossWorkflowSwitches);
+  assert.equal(card.__ausbossWorkflowSwitches.choose.classList.contains("hidden"), true);
+  const target = new p.Node();
+  target.type = "Integer";
+  target.id = 4;
+  target.widgets = [{ name: "value", value: 8 }];
+  p.app.canvas.selectedItems = new Set([target]);
+  p.refresh(card.__ausbossWorkflowSwitches);
+  assert.equal(card.__ausbossWorkflowSwitches.choose.classList.contains("hidden"), false);
+});

tests/workflow_switches_regressions.test.mjs

@@ -0,0 +1,106 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+import {
+  choicePairs, choosePlan, normalizeSettings, pairValue, placeNodes, readGroups, readSwitches,
+  releaseStackGroup, releaseStackRow, stackGroupOwners, stackRowOwners, stackRows, switchPlan, valuePlan,
+} from "../js/shared/workflow_switches.mjs";
+
+const stack = (...rows) => JSON.stringify(rows);
+const lora = (name, enabled = true, strength = 1, extra = {}) => ({ name, enabled, strength, ...extra });
+const target = (id, name, value) => ({ id, mode: 0, pos: [0, 30], size: [100, 100], widgets: [{ name, value }] });
+const choices = (...values) => normalizeSettings({ switches: values.map((value, index) => ({
+  id: index + 1, title: String(index + 1), choice: true, on: { 5: { loras: value } },
+})) });
+
+test("taking over a row leaves an empty saved stack safe and preserves unrelated live rows", () => {
+  const a = lora("a");
+  const b = lora("b");
+  const saved = { switches: [{ id: 1, on: { 5: { loras: stack(a, b), steps: 8 } }, off: { 5: { loras: stack(b), steps: 20 } } }] };
+  const settings = releaseStackRow(saved, 1, 5, "loras", "b");
+  const current = stack(a, b, lora("unrelated"));
+  const live = target(5, "loras", current);
+  live.widgets.push({ name: "steps", value: 8 });
+  const rows = readSwitches(settings.switches, placeNodes([live]), []);
+  for (const [pair, side] of valuePlan(rows, rows[0], false, settings)) {
+    pair.control.value = pairValue(pair, side, pair.control.value);
+  }
+  assert.equal(live.widgets[0].value, current);
+  assert.equal(live.widgets[1].value, 20);
+  assert.deepEqual(stackRows("[]"), []);
+});
+
+test("settings targets remain running when either side includes their group", () => {
+  for (const side of ["groups", "groups_off"]) {
+    const live = target(5, "steps", 8);
+    const neighbor = target(6, "steps", 12);
+    const settings = normalizeSettings({ switches: [{ id: 1, [side]: [2], on: { 5: { steps: 8 } }, off: { 5: { steps: 20 } } }] });
+    const placed = placeNodes([live, neighbor]);
+    const groups = readGroups([{ id: 2, boundingRect: [0, 0, 300, 300] }], placed);
+    const rows = readSwitches(settings.switches, placed, groups);
+    for (const on of [false, true]) {
+      for (const [node, mode] of switchPlan(rows, rows[0], on, settings)) node.mode = mode;
+      for (const [pair, valueSide] of valuePlan(rows, rows[0], on, settings)) pair.control.value = pairValue(pair, valueSide, pair.control.value);
+      assert.equal(live.mode, 0, side);
+    }
+    assert.deepEqual(rows[0].valueNodes, [live]);
+    assert.equal(rows[0].members.includes(live), false);
+    assert.equal(rows[0].offMembers.includes(live), false);
+  }
+});
+
+test("three LoRA choices retain every differing field regardless of comparison order", () => {
+  const saves = [stack(lora("a", true, 1)), stack(lora("a", false, 1)), stack(lora("a", true, 2))];
+  for (const order of [saves, [saves[0], saves[2], saves[1]]]) {
+    const settings = choices(...order);
+    const live = target(5, "loras", saves[2]);
+    const rows = readSwitches(settings.switches, placeNodes([live]), []);
+    assert.equal(rows[0].state, "off");
+    const plan = choosePlan(rows, rows[0], settings);
+    for (const [pair, side] of plan.values) pair.control.value = pairValue(pair, side, pair.control.value);
+    assert.deepEqual(stackRows(live.widgets[0].value), [lora("a", true, 1, { strength_clip: 1 })]);
+    assert.equal(readSwitches(settings.switches, placeNodes([live]), [])[0].state, "on");
+  }
+});
+
+test("ordinary JSON with object ids and titles falls back without coercion errors", () => {
+  const malformed = JSON.parse('{"switches":[{"id":{"toString":null},"title":{"toString":null}},{"id":[2],"title":["oops"]},{"id":"4","title":"Valid"}]}');
+  const normalized = normalizeSettings(malformed);
+  assert.deepEqual(normalized.switches.map(({ id, title }) => [id, title]), [[1, "Switch 1"], [2, "Switch 2"], [4, "Valid"]]);
+});
+
+test("group chips accept hex colors and reject CSS that can load resources", () => {
+  const colorOf = (color) => readGroups([{ color, boundingRect: [0, 0, 100, 100] }], [])[0].color;
+  for (const color of ["#335", "#abcd", "#123456", "#12345678"]) assert.equal(colorOf(color), color);
+  for (const color of ["url(https://example.invalid/pixel)", "image-set(url(//example.invalid/pixel) 1x)", "var(--external)", "#335; background:url(x)", "#12345", {}, null]) {
+    assert.equal(colorOf(color), null);
+  }
+});
+
+test("LoRA choices expose row locks and taking over releases every choice without changing other rows", () => {
+  const settings = choices(
+    stack(lora("a", true), lora("b", true)),
+    stack(lora("a", false), lora("b", false)),
+    stack(lora("a", true, 2), lora("b", false)),
+  );
+  const boards = [{ node: "card", settings }];
+  const owners = stackRowOwners(boards, 5, "loras", "a");
+  assert.deepEqual(owners.map(({ id }) => id), [1, 2, 3]);
+  let released = settings;
+  for (const { id } of owners) released = releaseStackRow(released, id, 5, "loras", "a");
+  assert.deepEqual(stackRowOwners([{ node: "card", settings: released }], 5, "loras", "a"), []);
+  assert.ok(choicePairs(released.switches[0], released.switches).some((pair) => pair.row === "b"));
+  assert.equal(settings.switches[0].on[5].loras, stack(lora("a", true), lora("b", true)));
+});
+
+test("LoRA group choices expose locks and taking over keeps row choices intact", () => {
+  const settings = choices(
+    stack(lora("a", true, 1, { group: "Look" })),
+    stack(lora("a", false, 1, { group: "Look", group_off: true })),
+  );
+  const owners = stackGroupOwners([{ node: "card", settings }], 5, "loras", "Look");
+  assert.deepEqual(owners.map(({ id }) => id), [1, 2]);
+  let released = settings;
+  for (const { id } of owners) released = releaseStackGroup(released, id, 5, "loras", "Look");
+  assert.deepEqual(stackGroupOwners([{ node: "card", settings: released }], 5, "loras", "Look"), []);
+  assert.equal(stackRowOwners([{ node: "card", settings: released }], 5, "loras", "a").length, 2);
+});