Merge pull request #346 from ausboss/fix/playhead-readout-hint

Release 2.25.3

CHANGELOG.md

@@ -2,6 +2,32 @@
 
 All notable changes to ComfyUI-AusBoss are documented here.
 
+## 2.25.3 - 2026-11-13
+
+- **The video clip's frame readout explains itself.** On Video Crop + Rotate
+  + Pad (Clip), the small `fr 52 · 0:02.17` beside Play now says in plain
+  words, when you point at it, which frame the picture shows and how many
+  seconds into the video it is. The help page explains it too.
+
+## 2.25.2 - 2026-11-13
+
+- **The video clip's IN handle always drags.** On Video Crop + Rotate + Pad
+  (Clip), a Length as long as the clip or longer used to lock IN, and the
+  only way to trim the start was to turn Length off. Now IN drags anyway:
+  the Length then only caps the clip, and the clip's own end is OUT. A
+  Length shorter than the clip works as before.
+
+## 2.25.1 - 2026-11-13
+
+- **Edit Lock Restore 🆎 takes out the pink tint.** MiniMax H3 Image gives
+  every edit a faint pink, slightly lighter tint over the whole picture.
+  Edit Lock already removed it wherever it locked, but when it stepped
+  aside (a new hair color, a new background, rain) the tint stayed. A new
+  **Remove tint** switch, on by default, reads the tint from the part of
+  the picture the edit left alone and takes it out of the whole picture.
+  Edits meant to recolor everything, such as golden hour or red light, are
+  left as they are. Turn it off to get the old behavior.
+
 ## 2.25.0 - 2026-11-12
 
 - **New node: Load Image.** Loads a picture and sets its size in the same

CONTRIBUTING.md

@@ -193,7 +193,7 @@ example_workflows/  # example workflows (regular workflow JSON, not API JSON)
   drag). Messages to the user go through `showToast`, never `alert()`.
 - The mouse wheel over a node zooms the graph, on every part of its face.
   `js/canvas_passthrough/` hands the wheel on from the pack's panels, and
-  keeps it only for a box that can still scroll or a field being typed in,
+  keeps it only for a box that can still scroll, typed in or not,
   so a panel adds no wheel listener of its own
   (`tests/canvas_passthrough.test.mjs` lists the few that exist). After a
   change to a node face, `scripts/dev/wheel_sweep.mjs` turns the wheel at

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.25.0">
-  <title>release: v2.25.0</title>
+<svg xmlns="http://www.w3.org/2000/svg" width="105" height="20" role="img" aria-label="release: v2.25.3">
+  <title>release: v2.25.3</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.25.0</text>
+    <text x="76.5" y="14">v2.25.3</text>
   </g>
 </svg>

js/callout/index.js

@@ -649,7 +649,6 @@ function startEdit(state) {
     if (event.target !== area) event.preventDefault();
   });
   wrap.addEventListener("pointerdown", (event) => event.stopPropagation());
-  wrap.addEventListener("wheel", (event) => event.stopPropagation(), { passive: true });
   // Clicking another node on the canvas takes the keyboard from the text box.
   // That is how the link is picked, so the edit stays open then; a click on
   // empty canvas, or on the note itself, ends it.

js/canvas_passthrough/index.js

@@ -5,7 +5,7 @@
 // zooming stopped over Compare, the crop previews, the video viewers and every
 // control on a card. One listener here hands those gestures back, the same way
 // ComfyUI does for its own text boxes. A panel that wants the wheel for itself
-// (a scrolling list, a focused text field, an editor) still keeps it.
+// (a scrolling list, a long text box) keeps it while it can still scroll.
 //
 // A file dragged in from the desktop, or a picture's card from the Assets
 // panel, has the same problem in the classic renderer: dropped on a node's
@@ -31,7 +31,7 @@ function onWheel(event) {
   const root = panelRoot(target);
   const lgCanvas = canvas();
   if (!root || !lgCanvas || event.defaultPrevented) return;
-  if (panelKeepsWheel(target, event, { root, host: panelHost(target), styleOf: (el) => getComputedStyle(el), activeElement: document.activeElement })) return;
+  if (panelKeepsWheel(target, event, { root, host: panelHost(target), styleOf: (el) => getComputedStyle(el) })) return;
   event.preventDefault();
   lgCanvas.processMouseWheel(event);
 }

js/docs/AUSBOSS_NODES_EditLockRestore.md

@@ -1,6 +1,7 @@
 # Edit Lock Restore
 
-Puts your picture's own pixels back in every part the edit did not change.
+Puts your picture's own pixels back in every part the edit did not change,
+and takes out the faint pink tint some edit models add to the whole picture.
 
 **Edit Lock 🆎** keeps the untouched parts in place while the picture is
 made. They still pass through the VAE, which softens fine detail a little.
@@ -22,6 +23,14 @@ your picture pixel for pixel. Only the edit is new.
 - **Feather** (`feather`): how softly your original fades into the edit,
   in pixels. 16 is the default. The fade lies outside the edit, so the
   edit itself is never mixed with the old picture.
+- **Remove tint** (`remove_tint`): on by default. MiniMax H3 Image makes
+  every edit a little pinker and lighter all over. This reads that tint
+  from the part of the picture the edit left alone and takes it out of the
+  whole picture, the edit included. It matters most when Edit Lock stepped
+  aside, such as for a new hair color, a new background or rain, because
+  then nothing else removes it. Edits meant to recolor everything (golden
+  hour, red light, a new art style) are left alone. Turn it off if a color
+  change you asked for comes out weaker.
 
 ## Outputs
 
@@ -30,13 +39,15 @@ your picture pixel for pixel. Only the edit is new.
   what the lock decided, or for a later step that should only touch the
   edit.
 - **report**: one line, such as "Edit Lock kept 82% of your picture as it
-  was and left 18% to the edit".
+  was and left 18% to the edit". When the tint was taken out it adds a
+  sentence that says so.
 
 ## When nothing was locked
 
-The picture passes through unchanged, the mask is all white, and the
+Your original pixels are not pasted back, the mask is all white, and the
 report says why: the edit changed the whole picture, the lock was off, or
-the picture and the result were different sizes.
+the picture and the result were different sizes. Remove tint still works
+here, so the picture can come out with the tint taken out.
 
 ## Technical details
 
@@ -46,3 +57,17 @@ by the same amount, and used to blend the decoded picture with your
 original. If the decoded picture is not the size of your original (after
 an upscale), the original is resized to fit first, which costs it some
 sharpness. That is why this node goes before an upscaler.
+
+**Remove tint.** The edit is lined up with your original (edits often come
+back about one percent larger or a little shifted), both are averaged
+into coarse cells of about 8 px at 1 megapixel, and their difference is
+taken in Lab color. The tint is the even shift most cells share: it starts
+at the median and keeps only cells within 4 Lab units of it, five times
+over, so a new background or new hair drops out of the count. It is taken
+out only when it looks like the model's own tint: a between +0.5 and +10,
+b between -8 and 0, L between -1 and +6, read on at least 15% of the
+picture. On 21 test edits at 16 megapixels it took out the tint on the 5
+it should (a +2.6 to +6.5 down to +0.4 or less) and left the other 16
+alone, golden hour, red light and an anime restyle included. It cannot
+tell this tint from an edit that asks for a slightly pinker, lighter look
+over the whole picture; turn it off for one of those.

js/docs/AUSBOSS_NODES_VideoCropRotatePadClip.md

@@ -26,7 +26,8 @@ model that paints black regions.
 - **Play / Pause** beside the scrubber previews the selected frames and stops at OUT. Press Play at OUT to start from IN again.
 - **Timeline** (right under the preview and size line): The rail on the node and in the editor is one timeline. Press or
   drag anywhere on it to scrub the **playhead**, with Length on or off; the stage shows
-  that frame. Drag the **IN** or **OUT** handle to trim: the playhead rides on the handle, so what you see
+  that frame. The small readout beside Play names it: `fr 52 · 0:02.17` means frame 52,
+  2.17 seconds into the video. Drag the **IN** or **OUT** handle to trim: the playhead rides on the handle, so what you see
   is the first (IN) or last (OUT) frame the run keeps, and it stays there when you let
   go. IN and OUT are frames, snapped to the source's frame grid; the boxes under the
   rail take a frame number, and `start_seconds` / `end_seconds` are derived from them
@@ -60,8 +61,9 @@ model that paints black regions.
   sits that many frames after IN and follows it when you drag IN, and dragging OUT or
   typing the number changes the Length. To move the whole clip, drag IN or the small
   grip in the middle of the kept part (the grip also slides a trimmed window with
-  Length off). When the Length is the whole clip there is nowhere to move it, and the
-  row says so: "= the whole clip. Shorten it to move IN." The Length stays when you
+  Length off). When the Length is as long as the clip or longer, the row says
+  "= the whole clip": the clip's own end is OUT, and dragging IN starts the clip
+  later without changing the Length. The Length stays when you
   swap the video, so a workflow built for 97 frames keeps taking 97. Turning it on or
   off never moves anything: the count becomes the OUT, or the OUT the count. If the
   source ends first, the footer says how many frames are left. **To start** moves IN

js/shared/canvas_passthrough.mjs

@@ -9,7 +9,9 @@
 // in js/canvas_passthrough/ wires them to the page.
 
 // 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.
+// text box, a list of rows). A text box with the cursor in it is no
+// exception: when it has nothing left to scroll, the wheel zooms the graph,
+// as it does over ComfyUI's own text boxes.
 export function canScrollFurther(element, delta, axis = "y") {
   if (!element || !delta) return false;
   const horizontal = axis === "x";
@@ -25,10 +27,11 @@ export function canScrollFurther(element, delta, axis = "y") {
 // and the panel's own root? `styleOf` is getComputedStyle, passed in so this
 // stays testable without a page. `host` is the frontend's wrapper around the
 // panel: a pointer on the wrapper itself is on nothing inside the panel.
-export function panelKeepsWheel(target, event, { root, host, styleOf, activeElement }) {
+// Ctrl + wheel, which is also how a trackpad pinch arrives, always zooms the
+// graph; left to a scrolling box it would zoom the whole page.
+export function panelKeepsWheel(target, event, { root, host, styleOf }) {
+  if (event.ctrlKey || event.metaKey) return false;
   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 style = styleOf(element);
     const overflow = style?.overflowY;
     if ((overflow === "auto" || overflow === "scroll") && canScrollFurther(element, event.deltaY)) return true;

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.25.0";
+export const AUSBOSS_JS_VERSION = "2.25.3";
 
 export const BRAND = "#00b4aa"; // AusBoss teal — keep node accents consistent.
 export const BRAND_DARK = "#007f78";

js/shared/timeline_math.mjs

@@ -217,6 +217,16 @@ export function latestFirstFor(info, frames, everyNth = 1) {
   return Math.max(0, info.count - 1 - (lastFrameFor(0, frames, everyNth)));
 }
 
+// How far a drag can move IN while a Length is on. A Length that fits stops
+// IN where OUT meets the source's end, so the count stays whole. A Length
+// as long as the clip or longer cannot keep its count anywhere: it only caps
+// the clip, the source's end is OUT, and IN moves over the whole clip.
+export function latestInFor(info, frames, everyNth = 1) {
+  if (!info?.count) return 0;
+  const latest = latestFirstFor(info, frames, everyNth);
+  return latest > 0 ? latest : info.count - 1;
+}
+
 // Everything the rail draws for the clip node, from the stored values:
 //   mode        which way sets the length (lengthMode)
 //   first       IN, the first source frame the run keeps

js/shared/transform_trim.mjs

@@ -32,7 +32,7 @@ import {
   framesThrough,
   keyboardStep,
   lastFrameFor,
-  latestFirstFor,
+  latestInFor,
   railZone,
   setTrimFrame,
   slideRange,
@@ -235,8 +235,9 @@ export function mountTransformTrim({ get, set, has = () => true, driven = () =>
     let parked;
     if (edge === "start") {
       if (current.mode === "length") {
-        // A Length drags the whole window, stopping where OUT meets the end.
-        parked = Math.max(0, Math.min(clampFrame(frame, clip), latestFirstFor(clip, current.requested ?? get("max_frames", 1), nth)));
+        // A Length drags the whole window, stopping where OUT meets the end;
+        // a Length past the clip's end only caps it, so IN moves freely.
+        parked = Math.max(0, Math.min(clampFrame(frame, clip), latestInFor(clip, current.requested ?? get("max_frames", 1), nth)));
         set("end_seconds", 0);
       } else if (current.mode === "wired" && current.latestStart != null && !countAtRunTime()) {
         parked = Math.min(clampFrame(frame, clip), current.latestStart);
@@ -321,7 +322,7 @@ export function mountTransformTrim({ get, set, has = () => true, driven = () =>
     readout.replaceChildren();
     if (clip.count) {
       readout.append(el("b", "", `fr ${head}`), document.createTextNode(` · ${formatTimecode(frameTime(head, clip))}`));
-      readout.title = `Playhead: frame ${head} of ${clip.count} at ${frameTime(head, clip).toFixed(3)} s. Press or drag the rail to scrub; ${trim ? "the trim handles carry it with them." : "this is the frame the node outputs."}`;
+      readout.title = `The picture shows frame ${head} of ${clip.count}, ${frameTime(head, clip).toFixed(2)} seconds into the video. Press or drag the bar to look at another frame; ${trim ? "dragging IN or OUT brings it along." : "this is the frame the node outputs."}`;
     }
     controls.frame?.set(head);
     if (!trim) return;
@@ -359,7 +360,7 @@ export function mountTransformTrim({ get, set, has = () => true, driven = () =>
       handle.title = isLocked ? lockTip(edge)
         : edge === "start"
           ? current.mode === "free" ? "Drag IN to trim; Shift + arrow moves one frame."
-            : fills ? "The Length is the whole clip, so IN has nowhere to go. Shorten the Length to move IN."
+            : fills ? "Drag IN to start later. The Length is as long as the clip, so the clip's end is OUT."
               : "Drag IN to move the clip; OUT follows at the Length. Shift + arrow moves one frame."
           : current.mode === "free" ? "Drag OUT to trim; it lands on the last frame the run keeps." : "Drag OUT to change the Length; IN stays.";
       handle.setAttribute("aria-valuemin", "0");
@@ -606,9 +607,9 @@ export function mountTransformTrim({ get, set, has = () => true, driven = () =>
       count.set(blocked ? (current.requested ?? current.frames ?? 0) : (current.requested ?? get("max_frames", 1)));
       disableControl(count, blocked, lockTip("end"));
       const fills = lengthFillsClip(info(), current, everyNth());
-      hint.textContent = blocked ? `from ${wired}` : current.mode === "fixed" ? "exact (older setting)" : fills ? "= the whole clip. Shorten it to move IN" : active ? "" : "OUT ends the clip";
+      hint.textContent = blocked ? `from ${wired}` : current.mode === "fixed" ? "exact (older setting)" : fills ? "= the whole clip" : active ? "" : "OUT ends the clip";
       hint.classList.toggle("note", fills && !blocked);
-      hint.title = fills && !blocked ? `The Length (${current.requested ?? current.frames} frames) covers the whole clip, so IN and the clip cannot move. The bar still scrubs.` : "";
+      hint.title = fills && !blocked ? `The Length (${current.requested ?? current.frames} frames) is as long as the clip, so the clip's end is OUT. Drag IN to start later; drag OUT or type a smaller Length to end sooner.` : "";
     };
   }
 

js/widget_cards/index.js

@@ -133,7 +133,13 @@ const CARDS = {
       { widget: "tolerance", label: "Tolerance", decimals: 2, suffix: "×" },
     ],
   },
-  AUSBOSS_NODES_EditLockRestore: { minWidth: 300, rows: [{ widget: "feather", label: "Feather", suffix: "px" }] },
+  AUSBOSS_NODES_EditLockRestore: {
+    minWidth: 300,
+    rows: [
+      { widget: "feather", label: "Feather", suffix: "px" },
+      { widget: "remove_tint", label: "Remove tint" },
+    ],
+  },
   AUSBOSS_NODES_ColorMatch: {
     minWidth: 300,
     rows: [

nodes/_edit_tint_helpers.py

@@ -0,0 +1,153 @@
+"""Edit Lock Restore's tint fix: take out the even tint an edit model adds to the whole picture.
+
+MiniMax H3 Image gives every edit one even color shift: a little lighter,
+pinker and bluer (Lab L +1 to +3, a +2 to +7, b -1 to -6 at 16 MP). Edit
+Lock removes it wherever it locks, because those parts are your picture
+again. When the lock steps aside (new hair color, new background, rain) the
+shift stays. Here it is read from the part of the picture the edit left
+alone and subtracted from every pixel.
+
+A shift is only taken out when it looks like that tint. An edit that is
+meant to recolor everything (golden hour, red light, a restyle) moves the
+colors much further or the other way, or leaves too little of the picture
+alone to read anything, and passes through untouched.
+
+Pure torch, no ComfyUI imports.
+"""
+
+from __future__ import annotations
+
+import math
+
+import torch
+import torch.nn.functional as F
+
+from ._realign_helpers import measure, warp_to_source
+
+# The pictures are compared at this long side; the fit is sub-pixel there.
+WORK = 1536
+# Cells closer than this to the running estimate count as "left alone".
+NEAR = 4.0
+# The tint as measured on 57 edits: lighter, pinker, bluer, within these
+# bounds (Lab units). Smaller than MIN_A is not worth touching.
+MIN_A = 0.5
+MAX_A = 10.0
+MAX_B = 0.0
+MIN_B = -8.0
+MIN_L = -1.0
+MAX_L = 6.0
+# At least this share of the picture must be left alone to read the tint.
+MIN_SHARE = 0.15
+
+_D65 = (0.95047, 1.0, 1.08883)
+_TO_XYZ = ((0.4124564, 0.3575761, 0.1804375),
+           (0.2126729, 0.7151522, 0.0721750),
+           (0.0193339, 0.1191920, 0.9503041))
+_TO_RGB = ((3.2404542, -1.5371385, -0.4985314),
+           (-0.9692660, 1.8760108, 0.0415560),
+           (0.0556434, -0.2040259, 1.0572252))
+
+
+def rgb_to_lab(rgb: torch.Tensor) -> torch.Tensor:
+    """sRGB in 0..1, [..., 3] -> CIE Lab, float64."""
+    x = rgb.double().clamp(0.0, 1.0)
+    linear = torch.where(x > 0.04045, ((x + 0.055) / 1.055) ** 2.4, x / 12.92)
+    xyz = linear @ torch.tensor(_TO_XYZ, dtype=torch.float64).T / torch.tensor(_D65, dtype=torch.float64)
+    f = torch.where(xyz > 0.008856, xyz.clamp(min=1e-9) ** (1.0 / 3.0), 7.787 * xyz + 16.0 / 116.0)
+    return torch.stack([116.0 * f[..., 1] - 16.0, 500.0 * (f[..., 0] - f[..., 1]),
+                        200.0 * (f[..., 1] - f[..., 2])], -1)
+
+
+def lab_to_rgb(lab: torch.Tensor) -> torch.Tensor:
+    """CIE Lab, [..., 3] -> sRGB in 0..1, float64."""
+    fy = (lab[..., 0] + 16.0) / 116.0
+    f = torch.stack([fy + lab[..., 1] / 500.0, fy, fy - lab[..., 2] / 200.0], -1)
+    xyz = torch.where(f > 0.206893, f ** 3, (f - 16.0 / 116.0) / 7.787) * torch.tensor(_D65, dtype=torch.float64)
+    linear = (xyz @ torch.tensor(_TO_RGB, dtype=torch.float64).T).clamp(0.0, 1.0)
+    return torch.where(linear > 0.0031308, 1.055 * linear ** (1.0 / 2.4) - 0.055, 12.92 * linear).clamp(0.0, 1.0)
+
+
+def _fit(image: torch.Tensor, long_side: int) -> torch.Tensor:
+    """HWC float at most long_side px on its long side."""
+    height, width = int(image.shape[0]), int(image.shape[1])
+    scale = long_side / max(height, width)
+    if scale >= 1.0:
+        return image.float()
+    size = (max(1, round(height * scale)), max(1, round(width * scale)))
+    return F.interpolate(image.movedim(-1, 0)[None].float(), size=size, mode="bilinear",
+                         align_corners=False, antialias=True)[0].movedim(0, -1)
+
+
+def measure_tint(result: torch.Tensor, source: torch.Tensor) -> tuple[list[float] | None, float]:
+    """The even shift in (L, a, b) from source to result, read where the edit left the picture alone.
+
+    result, source: HWC float in 0..1, any sizes. Returns (shift or None, the
+    share of the picture it was read on). The result is lined up with the
+    source first, since edits often come back slightly zoomed or moved.
+    """
+    src = _fit(source[..., :3], WORK)
+    edit = _fit(result[..., :3], WORK)
+    fit = measure(src, edit, mode="zoom + shift")
+    if not fit.reliable:
+        return None, 0.0
+    height, width = int(src.shape[0]), int(src.shape[1])
+    scaled = F.interpolate(edit.movedim(-1, 0)[None], size=(height, width), mode="bilinear",
+                           align_corners=False)[0].movedim(0, -1)
+    try:
+        warped = warp_to_source(scaled, fit.matrix, width, height)
+        warped = warped[0] if isinstance(warped, tuple) else warped
+    except Exception:
+        warped = scaled
+    # coarse cells of about 8 px at 1 MP, so grain and small detail drop out
+    cell = max(4, round(8 / math.sqrt(1e6 / (width * height))))
+
+    def cells(img: torch.Tensor) -> torch.Tensor:
+        return F.avg_pool2d(img.movedim(-1, 0)[None], cell, stride=cell)[0].movedim(0, -1)
+
+    diff = rgb_to_lab(cells(warped)) - rgb_to_lab(cells(src))
+    margin = max(1, int(diff.shape[0]) // 12)  # the edges carry the warp's filled strip
+    diff = diff[margin:-margin, margin:-margin].reshape(-1, 3)
+    if diff.shape[0] < 50:
+        return None, 0.0
+    centre = diff.median(0).values
+    share = 1.0
+    # start at the median change, then keep only the cells near it: a new
+    # background or new hair is a big change, but not the same one everywhere
+    for _ in range(5):
+        near = (diff - centre).norm(dim=1) < NEAR
+        if int(near.sum()) < 50:
+            break
+        centre = diff[near].mean(0)
+        share = float(near.double().mean())
+    return [float(v) for v in centre], share
+
+
+def looks_like_tint(shift: list[float] | None, share: float) -> bool:
+    """True for the model's own lighter-pinker-bluer shift; False for an intended recolor."""
+    if shift is None or share < MIN_SHARE:
+        return False
+    light, a, b = shift
+    return MIN_A <= a <= MAX_A and MIN_B <= b <= MAX_B and MIN_L <= light <= MAX_L
+
+
+def remove_tint(image: torch.Tensor, shift: list[float]) -> torch.Tensor:
+    """Subtract one (L, a, b) shift from every pixel. image: [B, H, W, C] in 0..1."""
+    lab = rgb_to_lab(image[..., :3]) - torch.tensor(shift, dtype=torch.float64)
+    out = image.clone()
+    out[..., :3] = lab_to_rgb(lab).to(image.dtype)
+    return out
+
+
+def take_out_tint(images: torch.Tensor, source: torch.Tensor) -> tuple[torch.Tensor, list[float] | None]:
+    """Each picture of the batch with its tint taken out when it looks like the model's tint.
+
+    Returns the pictures and the largest shift taken out (None when none was)."""
+    out = images.clone()
+    taken: list[float] | None = None
+    for index in range(int(images.shape[0])):
+        shift, share = measure_tint(images[index], source[0])
+        if looks_like_tint(shift, share):
+            out[index:index + 1] = remove_tint(images[index:index + 1], shift)
+            if taken is None or abs(shift[1]) > abs(taken[1]):
+                taken = shift
+    return out, taken

nodes/node_edit_lock.py

@@ -19,6 +19,7 @@ from ._edit_lock_helpers import (
     describe,
     restore_pixels,
 )
+from ._edit_tint_helpers import take_out_tint
 
 
 class AusBossEditLock:
@@ -141,8 +142,10 @@ class AusBossEditLockRestore:
         "Puts your picture's own pixels back in every part the edit did not "
         "change. Use it right after the VAE decode, with the edit_lock "
         "output of Edit Lock 🆎. The untouched parts then match your "
-        "original pixel for pixel; only the edit is new. When the lock "
-        "stepped aside the picture passes through unchanged."
+        "original pixel for pixel; only the edit is new. It also takes out "
+        "the faint pink tint some edit models add to the whole picture, "
+        "which matters most when the lock stepped aside (a new hair color, "
+        "background or weather)."
     )
     SEARCH_ALIASES = [
         "edit lock restore",
@@ -178,6 +181,19 @@ class AusBossEditLockRestore:
                     },
                 ),
             },
+            "optional": {
+                "remove_tint": (
+                    "BOOLEAN",
+                    {
+                        "default": True,
+                        "tooltip": (
+                            "Takes out the faint pink tint the edit model adds "
+                            "to the whole picture. Edits meant to recolor "
+                            "everything, like golden hour, are left alone."
+                        ),
+                    },
+                ),
+            },
         }
 
     RETURN_TYPES = ("IMAGE", "MASK", "STRING")
@@ -189,17 +205,30 @@ class AusBossEditLockRestore:
     )
     FUNCTION = "restore"
 
-    def restore(self, image, edit_lock, feather):
+    def restore(self, image, edit_lock, feather, remove_tint=True):
         if image.ndim != 4:
             raise ValueError("Edit Lock Restore: image must be an IMAGE batch.")
         if not isinstance(edit_lock, EditLock):
             raise ValueError("Edit Lock Restore: edit_lock needs the output of Edit Lock.")
         height, width = int(image.shape[1]), int(image.shape[2])
+        report = describe(edit_lock)
+        if remove_tint and edit_lock.source is not None:
+            # before the paste, so the edit itself loses the tint too and meets the original evenly
+            image, taken = take_out_tint(image, edit_lock.source)
+            if taken is not None:
+                report += " " + tint_report(taken)
         mask = edit_lock.pixel_mask(height, width)
         if mask is None or edit_lock.source is None:
-            return (image, torch.ones((int(image.shape[0]), height, width)), describe(edit_lock))
+            return (image, torch.ones((int(image.shape[0]), height, width)), report)
         result, edit_mask = restore_pixels(image, edit_lock.source, mask, int(feather))
-        return (result, edit_mask, describe(edit_lock))
+        return (result, edit_mask, report)
+
+
+def tint_report(shift):
+    """One plain sentence; the numbers are Lab units, for anyone who wants them."""
+    light, a, b = shift
+    return (f"It also took out the faint pink tint the model added to the whole picture "
+            f"(L {light:+.1f}, a {a:+.1f}, b {b:+.1f}).")
 
 
 NODE_CLASS_MAPPINGS = {

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, 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, LaMa Inpaint, Crop For Inpaint, Stitch Inpaint, Tiled Upscale and Tiled Upscale Stitch, FlashVSR Upscale, Edit Lock and Edit Lock Restore, LoRA Loader, Krea 2 Encode and Outpaint Model Patch, Latent Size, Layout Boxes, Seed, Select Every Nth, Split Batch, Merge Batches, Text, Text Lines, Prompt Variations, 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. Example workflows for Qwen Image 2.1, Krea 2, Klein 9B and LTX 2.3."
-version = "2.25.0"
+version = "2.25.3"
 # 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.

tests/canvas_passthrough.test.mjs

@@ -27,12 +27,19 @@ test("the graph gets the wheel unless the panel has a use for it", () => {
   const list = { tagName: "DIV", parentElement: root, ...box() };
   const field = { tagName: "INPUT", parentElement: root };
   const styleOf = (el) => ({ overflowY: el === list ? "auto" : "visible" });
-  const ctx = (extra = {}) => ({ root, styleOf, activeElement: null, ...extra });
+  const ctx = (extra = {}) => ({ root, styleOf, ...extra });
   assert.equal(panelKeepsWheel(stage, { deltaY: -100 }, ctx()), false, "plain picture stage");
   assert.equal(panelKeepsWheel(list, { deltaY: 100 }, ctx()), true, "list with room to scroll");
   assert.equal(panelKeepsWheel(list, { deltaY: -100 }, ctx()), false, "list at its top, wheel up zooms");
   assert.equal(panelKeepsWheel(field, { deltaY: 100 }, ctx()), false, "idle field");
-  assert.equal(panelKeepsWheel(field, { deltaY: 100 }, ctx({ activeElement: field })), true, "field being typed in");
+  // A text box with the cursor in it and nothing to scroll: the graph zooms
+  // (issue #115, the prompt box in a workflow).
+  assert.equal(panelKeepsWheel(field, { deltaY: 100 }, ctx({ activeElement: field })), false, "field being typed in, nothing to scroll");
+  const prompt = { tagName: "TEXTAREA", parentElement: root, ...box() };
+  const scrolls = (el) => ({ overflowY: el === prompt || el === list ? "auto" : "visible" });
+  assert.equal(panelKeepsWheel(prompt, { deltaY: 100 }, ctx({ styleOf: scrolls })), true, "long text still scrolls");
+  assert.equal(panelKeepsWheel(prompt, { deltaY: -100 }, ctx({ styleOf: scrolls })), false, "long text at its top, wheel up zooms");
+  assert.equal(panelKeepsWheel(list, { deltaY: 100, ctrlKey: true }, ctx()), false, "Ctrl + wheel and pinch always zoom the graph");
 });
 
 test("middle button and Ctrl+Shift drag go to the graph; ordinary clicks do not", () => {
@@ -131,7 +138,6 @@ test("only the listed parts of the pack listen for the wheel", () => {
   // face of the node.
   const js = join(dirname(fileURLToPath(import.meta.url)), "..", "js");
   const listed = [
-    "callout/index.js wrap", // the text box while a note is being edited
     "canvas_passthrough/index.js window", // hands the wheel to the graph
     "image_folder/index.js root", // the copy question, a window over the page
     "image_folder/index.js root", // the folder list, a window over the page

tests/fixtures/node_api.json

@@ -144,7 +144,9 @@
       "edit_lock",
       "feather"
     ],
-    "optional": [],
+    "optional": [
+      "remove_tint"
+    ],
     "outputs": [
       [
         "IMAGE",

tests/test_edit_tint_helpers.py

@@ -0,0 +1,118 @@
+"""Edit Lock Restore's tint fix: the model's pink tint goes, an intended recolor stays."""
+
+from __future__ import annotations
+
+import sys
+import unittest
+from pathlib import Path
+
+import torch
+import torch.nn.functional as F
+
+ROOT = Path(__file__).resolve().parent.parent
+sys.path.insert(0, str(ROOT))
+if "nodes" in sys.modules and not hasattr(sys.modules["nodes"], "__path__"):
+    del sys.modules["nodes"]
+
+from nodes._edit_lock_helpers import EditLock  # noqa: E402
+from nodes._edit_tint_helpers import (  # noqa: E402
+    lab_to_rgb,
+    looks_like_tint,
+    measure_tint,
+    remove_tint,
+    rgb_to_lab,
+    take_out_tint,
+)
+from nodes.node_edit_lock import AusBossEditLockRestore  # noqa: E402
+
+TINT = [2.0, 5.0, -3.0]  # what MiniMax H3 Image adds: lighter, pinker, bluer
+
+
+def picture(seed: int = 0, size: int = 384) -> torch.Tensor:
+    """A textured photo stand-in, [1, H, W, 3], mid tones so a shift never clips."""
+    gen = torch.Generator().manual_seed(seed)
+    coarse = torch.rand(1, 3, size // 16, size // 16, generator=gen)
+    fine = torch.rand(1, 3, size // 4, size // 4, generator=gen)
+    img = 0.6 * F.interpolate(coarse, size=(size, size), mode="bicubic", align_corners=False)
+    img = img + 0.4 * F.interpolate(fine, size=(size, size), mode="bilinear", align_corners=False)
+    return (0.2 + 0.6 * img).clamp(0.0, 1.0).movedim(1, -1)
+
+
+def shifted(image: torch.Tensor, shift) -> torch.Tensor:
+    return lab_to_rgb(rgb_to_lab(image) + torch.tensor(shift, dtype=torch.float64)).float()
+
+
+def edited(source: torch.Tensor, shift) -> torch.Tensor:
+    """A local edit (a new patch) on top of an even shift of the whole picture."""
+    out = shifted(source, shift)
+    out[:, 120:260, 140:280] = torch.tensor([0.85, 0.85, 0.88])
+    return out
+
+
+class TintTests(unittest.TestCase):
+    def test_lab_round_trip(self):
+        img = picture(1)
+        self.assertLess(float((lab_to_rgb(rgb_to_lab(img)).float() - img).abs().max()), 1e-4)
+
+    def test_reads_the_tint_on_the_untouched_part(self):
+        source = picture(2)
+        shift, share = measure_tint(edited(source, TINT)[0], source[0])
+        self.assertIsNotNone(shift)
+        for got, want in zip(shift, TINT):
+            self.assertAlmostEqual(got, want, delta=0.4)
+        self.assertGreater(share, 0.5)
+
+    def test_takes_the_tint_out(self):
+        source = picture(3)
+        out, taken = take_out_tint(edited(source, TINT), source)
+        self.assertIsNotNone(taken)
+        outside = (slice(0, 100), slice(0, 384))
+        self.assertLess(float((out[0][outside] - source[0][outside]).abs().mean()), 0.004)
+
+    def test_leaves_an_intended_recolor(self):
+        source = picture(4)
+        golden = [6.0, 20.0, 30.0]  # golden hour: warmer and much yellower
+        image = edited(source, golden)
+        out, taken = take_out_tint(image, source)
+        self.assertIsNone(taken)
+        self.assertTrue(torch.equal(out, image))
+
+    def test_the_tint_rule(self):
+        self.assertTrue(looks_like_tint([2.6, 6.3, -3.4], 0.49))      # silver hair
+        self.assertTrue(looks_like_tint([1.8, 3.5, -1.8], 0.62))      # rain
+        self.assertFalse(looks_like_tint([-2.0, 29.4, 2.9], 0.05))    # red light
+        self.assertFalse(looks_like_tint([19.5, 2.5, -5.5], 0.07))    # anime restyle
+        self.assertFalse(looks_like_tint([7.8, 23.9, 31.3], 1.0))     # golden hour
+        self.assertFalse(looks_like_tint([0.0, 0.1, -0.1], 0.9))      # already clean
+        self.assertFalse(looks_like_tint(None, 0.0))
+
+    def test_noise_is_left_alone(self):
+        gen = torch.Generator().manual_seed(5)
+        image = torch.rand(1, 64, 64, 3, generator=gen)
+        out, taken = take_out_tint(image, torch.rand(1, 64, 64, 3, generator=gen))
+        self.assertIsNone(taken)
+        self.assertTrue(torch.equal(out, image))
+
+    def test_restore_node_takes_it_out_when_the_lock_stepped_aside(self):
+        source = picture(6)
+        lock = EditLock()
+        lock.status = "whole picture"
+        lock.source = source
+        image = edited(source, TINT)
+        out, mask, report = AusBossEditLockRestore().restore(image, lock, 16)
+        self.assertLess(float((out[0, :100] - source[0, :100]).abs().mean()), 0.004)
+        self.assertIn("tint", report)
+        self.assertTrue(torch.all(mask == 1.0))
+        # switched off, it passes through as before
+        out, _, report = AusBossEditLockRestore().restore(image, lock, 16, remove_tint=False)
+        self.assertTrue(torch.equal(out, image))
+        self.assertNotIn("tint", report)
+
+    def test_remove_tint_keeps_alpha(self):
+        image = torch.cat([picture(7), torch.ones(1, 384, 384, 1)], -1)
+        out = remove_tint(image, TINT)
+        self.assertTrue(torch.equal(out[..., 3], image[..., 3]))
+
+
+if __name__ == "__main__":
+    unittest.main()

tests/timeline_math.test.mjs

@@ -181,7 +181,7 @@ test("fixed frame duration follows output fps while position follows source fps"
 });
 
 // --- One way to set the length -------------------------------------------------
-import { clipLengthPlan, framesThrough, lastFrameFor, latestFirstFor, lengthMode, snapStep, snapToValid } from "../js/shared/timeline_math.mjs";
+import { clipLengthPlan, framesThrough, lastFrameFor, latestFirstFor, latestInFor, lengthMode, snapStep, snapToValid } from "../js/shared/timeline_math.mjs";
 
 test("one mode sets the length: a wired input, an old fixed count, a Length, or OUT", () => {
   assert.equal(lengthMode({}), "free");
@@ -214,6 +214,16 @@ test("OUT lands on a frame the run keeps", () => {
   assert.equal(latestFirstFor(info, 20), 77);
   assert.equal(latestFirstFor(info, 97), 0);
   assert.equal(latestFirstFor(info, 200), 0);
+  // A Length that fits stops IN where OUT meets the end; one as long as the
+  // clip or longer only caps it, so IN reaches every frame (a 240-frame
+  // Length on a 116-frame clip used to pin IN at 0).
+  assert.equal(latestInFor(info, 20), 77);
+  assert.equal(latestInFor(info, 97), 96);
+  assert.equal(latestInFor(info, 200), 96);
+  const short = clipInfo({ fps: 24, frame_count: 116, duration: 116 / 24 });
+  assert.equal(latestInFor(short, 240), 115);
+  const late = clipLengthPlan(short, { start: windowSeconds(short, 40, 40).start_seconds, end: 0, maxFrames: 240 });
+  assert.deepEqual([late.first, late.last, late.frames, late.truncated], [40, 115, 76, true]);
 });
 
 test("free trim: the handles are IN and the last frame the run keeps", () => {