chore(release): bump version to v1.1.6

fix(registry): store nodes per-client to prevent multi-tab race condition
Move NodeRegistry from a single global _nodes dict to a per-client (_tab_nodes) structure so that multiple ComfyUI browser tabs no longer overwrite each other's workflow node data during a lora_registry_refresh cycle. The merged result is a union of all known tabs' target nodes, eliminating the non-deterministic failure where send-to-workflow could randomly target a tab lacking valid targets. - NodeRegistry.register_nodes(sid, nodes) replaces per-tab data without affecting other tabs. - NodeRegistry.get_merged_registry() returns the union across all connected clients, together with tab_count / per-tab metadata. - prepare_for_refresh() snapshots the current active sockets; caller re-reads before merging so that newly-connected tabs are not pruned. - workflow_registry.js sends api.clientId in the POST body so the backend can identify which tab is registering.
2026-08-07 14:30:15 -03:00 · 2026-06-28 22:17:02 +08:00 · 2026-06-28 17:57:58 +08:00 · 2026-06-27 22:22:48 +08:00 · 2026-06-27 17:05:38 +08:00 · 2026-06-27 08:56:11 +08:00
18 changed files with 709 additions and 255 deletions
--- a/data/supporters.json
+++ b/data/supporters.json
@@ -11,8 +11,8 @@
    "Insomnia Art Designs",
    "2018cfh",
    "Arlecchino Shion",
-    "Rob Williams",
    "Charles Blakemore",
+    "Rob Williams",
    "W+K+White",
    "$MetaSamsara",
    "wackop",
@@ -21,6 +21,8 @@
    "stone9k",
    "Rosenthal",
    "Francisco Tatis",
+    "JongWon Han",
+    "FreelancerZ",
    "Polymorphic Indeterminate",
    "Skalabananen",
    "Marc Whiffen",
@@ -38,24 +40,32 @@
    "Estragon",
    "J\\B/ 8r0wns0n",
    "ClockDaemon",
+    "KD",
+    "Omnidex",
+    "Tyler Trebuchon",
+    "Release Cabrakan",
    "Tobi_Swagg",
    "SG",
+    "James Dooley",
    "zenbound",
+    "Buzzard",
    "jmack",
    "Andrew Wilson",
    "Greybush",
+    "Mark Corneglio",
    "Ricky Carter",
    "James Todd",
-    "JongWon Han",
+    "Steven Pfeiffer",
    "VantAI",
    "レプサイ",
+    "Lisster",
    "Michael Wong",
    "runte3221",
    "Illrigger",
    "Tom Corrigan",
    "JackieWang",
-    "FreelancerZ",
    "fnkylove",
+    "Yushio",
    "Vik71it",
    "Echo",
    "Lilleman",
@@ -65,50 +75,48 @@
    "Fraser Cross",
    "Liam MacDougal",
    "Sterilized",
+    "BadassArabianMofo",
    "JORGE+LUIZ+HUSSNI+MESSIAS",
    "quarz",
    "Greg",
+    "jean jahren",
    "JSST",
    "Snaggwort",
+    "lmsupporter",
    "Takkan",
    "wfpearl",
    "Matt+J",
    "Baekdoosixt",
    "Jonathan Ross",
-    "KD",
-    "Omnidex",
+    "Jack B Nimble",
    "Nazono_hito",
    "Melville Parrish",
    "daniel dove",
    "Lustre",
-    "Tyler Trebuchon",
-    "Release Cabrakan",
    "JW Sin",
    "Alex",
    "bh",
    "carozzz",
    "Marlon Daniels",
-    "James Dooley",
-    "Buzzard",
+    "Starkselle",
    "Aaron Bleuer",
    "LacesOut!",
+    "greebles",
    "Adam Shaw",
-    "Mark Corneglio",
    "SarcasticHashtag",
    "Anthony Rizzo",
    "iamresist",
+    "M Postkasse",
    "RedrockVP",
    "Wolffen",
    "Wicked Choices by ASLPro3D",
    "Jacob Hoehler",
    "FinalyFree",
    "Weasyl",
-    "Steven Pfeiffer",
    "Timmy",
    "Johnny",
    "Cory Paza",
    "Tak",
-    "Lisster",
    "Big Red",
    "whudunit",
    "Luc Job",
@@ -116,37 +124,36 @@
    "Philip Hempel",
    "corde",
    "nwalker94",
-    "Yushio",
    "Bishoujoker",
+    "aai",
    "Todd Keck",
    "Briton Heilbrun",
    "Tori",
    "wildnut",
    "Aleksander Wujczyk",
    "AM Kuro",
-    "BadassArabianMofo",
    "Pascal Dahle",
    "Sangheili460",
    "MagnaInsomnia",
    "Akira_HentAI",
    "Karl P.",
-    "lmsupporter",
    "andrew.tappan",
    "N/A",
+    "The Spawn",
    "graysock",
    "Greenmoustache",
    "zounic",
    "fancypants",
-    "Eldithor",
-    "Jack B Nimble",
+    "Digital",
    "JaxMax",
    "contrite831",
    "Jwk0205",
-    "Starkselle",
+    "Bro Xie",
+    "batblue",
+    "carey6409",
    "Olive",
-    "greebles",
+    "太郎 ゲーム",
    "Some Guy Named Barry",
-    "M Postkasse",
    "AELOX",
    "Gooohokrbe",
    "Nicfit23",
@@ -162,12 +169,12 @@
    "Serge Bekenkamp",
    "Jimmy Ledbetter",
    "LeoZero",
+    "Antonio Pontes",
+    "nahinahi9",
    "Dustin Chen",
    "dan",
-    "aai",
    "Mouthlessman",
    "otaku fra",
-    "jean jahren",
    "MiraiKuriyamaSy",
    "Ran C",
    "ViperC",
@@ -176,7 +183,6 @@
    "Adam Taylor",
    "AbstractAss",
    "Weird_With_A_Beard",
-    "The Spawn",
    "Pozadine1",
    "Qarob",
    "AIGooner",
@@ -187,18 +193,16 @@
    "Hasturkun",
    "Jon Sandman",
    "Ubivis",
+    "CloudValley",
+    "linnfrey",
    "Jackthemind",
+    "griffin+dahlberg",
    "Joboshy",
-    "Digital",
    "takyamtom",
    "Bohemian Corporal",
    "Dan",
-    "Bro Xie",
    "yer fey",
-    "batblue",
    "Error_Rule34_Not_found",
-    "carey6409",
-    "太郎 ゲーム",
    "Roslynd",
    "jinxedx",
    "Neco28",
@@ -210,22 +214,21 @@
    "Frank Nitty",
    "Magic Noob",
    "DougPeterson",
-    "Antonio Pontes",
    "ApathyJones",
+    "Jeff",
    "Bruce",
-    "Julian V",
    "Steven Owens",
-    "nahinahi9",
    "Kevin John Duck",
    "Kevin Christopher",
    "Blackfish95",
+    "dd",
    "Paul Kroll",
    "Bas Imagineer",
    "John Statham",
    "yuxz69",
    "esthe",
+    "AlexDuKaNa",
    "decoy",
-    "CloudValley",
    "thesoftwaredruid",
    "wundershark",
    "mr_dinosaur",
@@ -233,15 +236,20 @@
    "Ray Wing",
    "Ranzitho",
    "Gus",
+    "地獄の禄",
    "MJG",
    "David LaVallee",
-    "linnfrey",
    "ae",
    "Tr4shP4nda",
    "capn",
    "Joseph",
+    "Mirko Katzula",
+    "dan",
+    "Piccio08",
+    "kumakichi",
+    "cppbel",
    "IamAyam",
-    "skaterb949",
+    "jeaness",
    "Brian M",
    "Josef Lanzl",
    "Nerezza",
@@ -261,37 +269,32 @@
    "Eris3D",
    "Max Marklund",
    "m",
+    "Pierce McBride",
    "Pronredn",
+    "Mikko Hemilä",
    "Jamie Ogletree",
    "a _",
-    "Jeff",
    "lh qwe",
    "James Coleman",
+    "Martial",
    "conner",
    "Ouro Boros",
    "Chad Idk",
-    "dd",
    "Princess Bright Eyes",
    "Yuji Kaneko",
    "Dušan Ryban",
    "Felipe dos Santos",
+    "Rops Alot",
    "Sam",
    "sjon kreutz",
    "Ace Ventura",
    "Douglas Gaspar",
    "Metryman55",
-    "AlexDuKaNa",
    "George",
    "dw",
-    "地獄の禄",
    "Gamalonia",
    "WRL_SPR",
    "momokai",
-    "Mirko Katzula",
-    "dan",
-    "Piccio08",
-    "kumakichi",
-    "cppbel",
    "Moon Knight",
    "몽타주",
    "Kland",
@@ -313,12 +316,15 @@
    "kyoumei",
    "RadStorm04",
    "JohnDoe42054",
+    "BillyHill",
+    "emyth",
    "gzmzmvp",
    "Richard",
    "奚明 刘",
    "Andrew",
    "Robert Wegemund",
    "Littlehuggy",
+    "Gregory Kozhemiak",
    "준희 김",
    "Brian Buie",
    "Sadlip",
@@ -328,16 +334,16 @@
    "Tomohiro Baba",
    "Mike Simone",
    "Noora",
-    "Pierce McBride",
    "Joshua Gray",
    "Mattssn",
-    "Mikko Hemilä",
+    "Morgandel",
    "Jacob McDaniel",
+    "X",
+    "Sloan Steddy",
    "Temikus",
    "Artokun",
    "Michael Taylor",
    "Derek Baker",
-    "Martial",
    "Michael Anthony Scott",
    "Emil Andersson",
    "Atilla Berke Pekduyar",
@@ -345,7 +351,6 @@
    "CryptoTraderJK",
    "Decx _",
    "Davaitamin",
-    "Rops Alot",
    "tedcor",
    "Fotek Design",
    "四糸凜音",
@@ -358,8 +363,6 @@
    "starbugx",
    "dc7431",
    "Crocket",
-    "BillyHill",
-    "emyth",
    "chriphost",
    "KitKatM",
    "socrasteeze",
@@ -383,35 +386,40 @@
    "g9p0o",
    "TheHolySheep",
    "Monte Won",
-    "Gregory Kozhemiak",
+    "SpringBootisTrash",
+    "carsten",
+    "ikok",
+    "Wolfe7D1",
    "Draven T",
-    "mrjuan",
    "elleshar666",
+    "ACTUALLY_the_Real_Willem_Dafoe",
    "Aquatic Coffee",
+    "Kauffy",
    "John J Linehan",
    "ethanfel",
    "Elliot E",
-    "Morgandel",
    "Theerat Jiramate",
    "Focuschannel",
    "Edward Kennedy",
    "Noah",
-    "X",
-    "Sloan Steddy",
    "Vane Holzer",
+    "psytrax",
    "hexxish",
    "Anthony Faxlandez",
    "battu",
    "notedfakes",
    "Nathan",
    "NICHOLAS BAXLEY",
+    "Michael Scott",
    "Pat Hen",
    "Xeeosat",
    "Saya",
    "Ed Wang",
    "Jordan Shaw",
+    "Wes Sims",
    "g unit",
    "Srdb",
+    "Filippo Ferrari",
    "JC",
    "Prompt Pirate",
    "uwutismxd",
@@ -427,9 +435,8 @@
    "Pkrsky",
    "nanana",
    "raf8osz",
-    "SpringBootisTrash",
-    "carsten",
-    "ikok",
+    "FeralOpticsAI",
+    "Pavlaki",
    "Doug+Rintoul",
    "Noor",
    "Yorunai",
@@ -446,36 +453,34 @@
    "cocona",
    "ElitaSSJ4",
    "David Schenck",
-    "Wolfe7D1",
    "blikkies",
    "Chris",
    "Time Valentine",
    "Shock Shockor",
-    "ACTUALLY_the_Real_Willem_Dafoe",
    "Михал Михалыч",
    "Matt",
    "Goldwaters",
-    "Kauffy",
    "Zude",
+    "Frogmilk",
    "SPJ",
    "Kyler",
+    "Bryan Rutkowski",
    "Justin Blaylock",
    "aRtFuL_DodGeR",
    "Nick Kage",
-    "psytrax",
    "Cyrus Fett",
    "Xenon Xue",
    "Edward Ten Eyck",
    "Billy Gladky",
-    "Michael Scott",
    "Probis",
    "Solixer",
-    "Wes Sims",
    "ItsGeneralButtNaked",
    "Donor4115",
+    "jinksta187",
    "Distortik",
    "Manu Thetug",
-    "Filippo Ferrari",
+    "Karlanx",
+    "operationancut",
    "Youguang",
    "andrewzpong",
    "BossGame",
@@ -486,11 +491,18 @@
    "Kevinj",
    "Mitchell Robson",
    "POPPIN",
+    "YassineKhaled",
+    "Y",
+    "MatteKey",
+    "Flob",
+    "ShiroSenpai",
+    "Inkognito",
    "G",
    "Tan+Huynh",
    "Bob+Barker",
    "D",
    "Dark_Pest",
+    "Eldithor",
    "Alex",
    "Karru",
    "ChaChanoKo",
@@ -503,13 +515,10 @@
    "g",
    "J",
    "Alan+Cano",
-    "FeralOpticsAI",
-    "Pavlaki",
    "BillyBoy84",
    "Buecyb99",
    "Welkor",
    "John Martin",
-    "Ink Temptation",
    "JBsuede",
    "moranqianlong",
    "Kalli Core",
@@ -519,13 +528,12 @@
    "Dave Abraham",
    "Joaquin Hierrezuelo",
    "Locrospiel",
-    "Frogmilk",
    "Sean voets",
+    "Jarrid Lee",
    "Kor",
    "Joseph Hanson",
    "John Rednoulf",
    "Kyron Mahan",
-    "Bryan Rutkowski",
    "Boba Smith",
    "TBitz33",
    "Anonym dkjglfleeoeldldldlkf",
@@ -544,15 +552,12 @@
    "Pete Pain",
    "Jacob Winter",
    "Ryan Presley Ng",
-    "jinksta187",
    "RHopkirk",
    "Andrew Wilkinson",
-    "Karlanx",
    "Lyavph",
    "Maxim",
    "David",
    "Meilo",
-    "operationancut",
    "shinonomeiro",
    "Snille",
    "MaartenAlbers",
@@ -571,6 +576,8 @@
    "Scott",
    "Muratoraccio",
    "D",
+    "Akkas+Haque",
+    "Kachac",
    "SAVEagleBasement",
    "Kevin+Isom",
    "Rune+Osnes",
@@ -600,12 +607,6 @@
    "Lev+Lanevskiy",
    "low9",
    "Winged",
-    "YassineKhaled",
-    "Y",
-    "MatteKey",
-    "Flob",
-    "ShiroSenpai",
-    "Inkognito",
    "Jacky+Ho",
    "generic404",
    "abattoirblues",
@@ -614,29 +615,34 @@
    "hayden",
    "Obsidian.Studios",
    "ahoystan",
+    "Zomba Mann",
    "edk",
    "Tú Nguyễn Lý Hoàng",
    "shira1011",
+    "Neko Desco",
    "Ben D",
    "G",
+    "Vinarus",
    "ja s",
    "Leslie Andrew Ridings",
    "Doug Mason",
    "scoreswazey",
    "Owen Gwosdz",
-    "Jarrid Lee",
    "Poophead27 Blyat",
    "Mythspire",
    "AZ Party Oasis",
    "Devil Lude",
    "David Murcko",
+    "TheFusion",
    "MR.Bear",
    "Jack Dole",
    "matt",
    "somethingtosay8",
+    "3zS4QNQ4",
    "Terminuz",
    "ivistorm",
    "max blo",
+    "Ivan Imes",
    "CptNeo",
    "Jack Lawfield",
    "Borte",
@@ -645,7 +651,7 @@
    "Sage Himeros",
    "Eric Ketchum",
    "Kevin Wallace",
-    "David Spearing",
+    "Zeeble",
    "ChicRic",
    "Tigon",
    "BastardSama",
@@ -706,6 +712,9 @@
    "SelfishMedic",
    "adderleighn",
    "EnragedAntelope",
+    "Somebody",
+    "Jasper",
+    "megameganck",
    "thomasand01",
    "Shiba+Sama",
    "miduzza",
@@ -730,8 +739,6 @@
    "matter",
    "SRCRCOSS",
    "imer",
-    "Akkas+Haque",
-    "Kachac",
    "jcx29",
    "Drizzly",
    "Nebuleux",
@@ -751,24 +758,23 @@
    "KUJYAKU",
    "Coeur+de+cochon",
    "han b",
-    "Zomba Mann",
    "Aquaneo",
    "Nico",
    "Maximilian Krischan",
    "Banana Joe",
    "proto merp",
    "_ G3n",
+    "Brandon Thomas",
    "Donovan Jenkins",
    "Hans Meier",
    "sicarius",
    "Michael Eid",
    "Wolf and Fox Legends",
    "beersandbacon",
-    "Neko Desco",
    "Bob barker",
    "Ninja Tom",
    "karim ben brik",
-    "Vinarus",
+    "Elemnt",
    "Josh Snyder",
    "Michael Zhu",
    "Nemisu",
@@ -792,16 +798,15 @@
    "Forbidden Atelier",
    "Thomas Sankowski",
    "DrB",
+    "Nimhloth",
    "Adictedtohumping",
    "Snorklebort",
    "vinter",
    "Towelie",
-    "TheFusion",
    "Jean-françois SEMA",
-    "3zS4QNQ4",
    "Kurt",
+    "Andrew Ly",
    "Matt M.",
-    "Ivan Imes",
    "J M",
    "Slacks",
    "Bouya shaka",
@@ -837,5 +842,5 @@
    "Somebody",
    "CK"
  ],
-  "totalCount": 834
+  "totalCount": 839
 }
--- a/py/recipes/parsers/civitai_image.py
+++ b/py/recipes/parsers/civitai_image.py
@@ -514,11 +514,21 @@ class CivitaiApiMetadataParser(RecipeMetadataParser):

                        result["loras"].append(lora_entry)

-            # Process modelVersionIds from Civitai image API
-            # These are model version IDs returned at root level when meta doesn't contain resources
-            if "modelVersionIds" in metadata and isinstance(
-                metadata["modelVersionIds"], list
+            # Process modelVersionIds from Civitai image API.
+            # These are version IDs returned at root level of the API response.
+            # When resources or civitaiResources are already present in metadata
+            # (which they are when ?withMeta=true is passed), those sections have
+            # complete hash/type information — modelVersionIds is a fallback for
+            # when meta is null and only the flat ID list is available. Skipping
+            # it here avoids duplicates: the same file hash often resolves to
+            # different version IDs via hash lookup (resources) vs the original
+            # version ID in modelVersionIds, and both paths would create entries.
+            if (
+                "modelVersionIds" in metadata
+                and isinstance(metadata["modelVersionIds"], list)
+                and not result.get("loras")
            ):
+
                for version_id in metadata["modelVersionIds"]:
                    version_id_str = str(version_id)

@@ -526,6 +536,13 @@ class CivitaiApiMetadataParser(RecipeMetadataParser):
                    if version_id_str in added_loras:
                        continue

+                    # Skip if this version ID is already the recipe's checkpoint
+                    # (resolved earlier from embedded resources/Model hash,
+                    # avoiding a duplicate CivitAI API call).
+                    existing_model = result.get("model")
+                    if existing_model and str(existing_model.get("id")) == version_id_str:
+                        continue
+
                    # Initialize lora entry with version ID
                    lora_entry = {
                        "id": version_id,
@@ -559,9 +576,40 @@ class CivitaiApiMetadataParser(RecipeMetadataParser):
                            )

                            if populated_entry is None:
-                                continue  # Skip invalid LoRA types
+                                # Not a LoRA — try as checkpoint (only if we
+                                # don't already have one).  Reuses the same
+                                # civitai_info from the API call above so no
+                                # extra query is made.
+                                if result["model"] is None:
+                                    checkpoint_entry = {
+                                        "id": version_id,
+                                        "modelId": 0,
+                                        "name": "Unknown Model",
+                                        "version": "",
+                                        "type": "checkpoint",
+                                        "existsLocally": False,
+                                        "localPath": None,
+                                        "file_name": "",
+                                        "hash": "",
+                                        "thumbnailUrl": (
+                                            "/loras_static/images/no-preview.png"
+                                        ),
+                                        "baseModel": "",
+                                        "size": 0,
+                                        "downloadUrl": "",
+                                        "isDeleted": False,
+                                    }
+                                    cp_populated = await (
+                                        self.populate_checkpoint_from_civitai(
+                                            checkpoint_entry, civitai_info
+                                        )
+                                    )
+                                    if cp_populated.get("modelId"):
+                                        result["model"] = cp_populated
+                                continue  # Not a LoRA, don't add to loras

                            lora_entry = populated_entry
+
                        except Exception as e:
                            logger.error(
                                f"Error fetching Civitai info for model version {version_id}: {e}"
--- a/py/routes/handlers/misc_handlers.py
+++ b/py/routes/handlers/misc_handlers.py
@@ -414,9 +414,10 @@ class PromptServerProtocol(Protocol):
    """Subset of PromptServer used by the handlers."""

    instance: "PromptServerProtocol"
+    sockets: dict  # maps clientId (sid) → WebSocketResponse

    def send_sync(
-        self, event: str, payload: dict
+        self, event: str, payload: dict | None = None, sid: str | None = None
    ) -> None:  # pragma: no cover - protocol
        ...

@@ -471,90 +472,154 @@ class BackupServiceProtocol(Protocol):


 class NodeRegistry:
-    """Thread-safe registry for tracking LoRA nodes in active workflows."""
+    """Thread-safe registry for tracking LoRA nodes across ComfyUI tabs.
+
+    Each connected ComfyUI browser tab (identified by its ``sid`` / ``clientId``)
+    registers its own set of workflow nodes.  Queries merge all known tabs into
+    a single result so that the calling LM panel always sees *every* available
+    target node, regardless of which tab responded fastest.
+    """

    def __init__(self) -> None:
        self._lock = asyncio.Lock()
-        self._nodes: Dict[str, dict] = {}
-        self._registry_updated = asyncio.Event()
+        # sid → {unique_id → node_info}
+        self._tab_nodes: Dict[str, Dict[str, dict]] = {}
+        self._ready = asyncio.Event()
+        self._waiting_clients: set[str] = set()
+
+    @property
+    def pending_client_count(self) -> int:
+        """Number of clients that have not yet responded in the current refresh cycle."""
+        return len(self._waiting_clients)
+
+    # ------------------------------------------------------------------
+    # Helpers to build one node dict (extracted so it's reused for each tab)
+    # ------------------------------------------------------------------
+    @staticmethod
+    def _build_node_dict(node: dict) -> dict:
+        node_id = node["node_id"]
+        graph_id = str(node["graph_id"])
+        unique_id = f"{graph_id}:{node_id}"
+        node_type = node.get("type", "")
+        type_id = NODE_TYPES.get(node_type, 0)
+        bgcolor = node.get("bgcolor") or DEFAULT_NODE_COLOR
+
+        raw_capabilities = node.get("capabilities")
+        capabilities: dict = {}
+        if isinstance(raw_capabilities, dict):
+            capabilities = dict(raw_capabilities)
+
+        raw_widget_names: list | None = node.get("widget_names")
+        if not isinstance(raw_widget_names, list):
+            capability_widget_names = capabilities.get("widget_names")
+            raw_widget_names = (
+                capability_widget_names
+                if isinstance(capability_widget_names, list)
+                else None
+            )
+
+        widget_names: list[str] = []
+        if isinstance(raw_widget_names, list):
+            widget_names = [
+                str(widget_name)
+                for widget_name in raw_widget_names
+                if isinstance(widget_name, str) and widget_name
+            ]
+
+        if widget_names:
+            capabilities["widget_names"] = widget_names
+        else:
+            capabilities.pop("widget_names", None)
+
+        if "supports_lora" in capabilities:
+            capabilities["supports_lora"] = bool(capabilities["supports_lora"])
+
+        comfy_class = node.get("comfy_class")
+        if not isinstance(comfy_class, str) or not comfy_class:
+            comfy_class = node_type if isinstance(node_type, str) else None
+
+        return {
+            "id": node_id,
+            "graph_id": graph_id,
+            "graph_name": node.get("graph_name"),
+            "unique_id": unique_id,
+            "bgcolor": bgcolor,
+            "title": node.get("title"),
+            "type": type_id,
+            "type_name": node_type,
+            "comfy_class": comfy_class,
+            "capabilities": capabilities,
+            "widget_names": widget_names,
+            "mode": node.get("mode"),
+            "marker_role": node.get("marker_role"),
+        }
+
+    # ------------------------------------------------------------------
+    # Public API
+    # ------------------------------------------------------------------
+    async def register_nodes(self, sid: str, nodes: list[dict]) -> None:
+        """Register/replace the node list for a single ComfyUI tab (identified by *sid*)."""
+        tab_nodes: dict[str, dict] = {}
+        for node in nodes:
+            nd = self._build_node_dict(node)
+            tab_nodes[nd["unique_id"]] = nd

-    async def register_nodes(self, nodes: list[dict]) -> None:
        async with self._lock:
-            self._nodes.clear()
-            for node in nodes:
-                node_id = node["node_id"]
-                graph_id = str(node["graph_id"])
-                unique_id = f"{graph_id}:{node_id}"
-                node_type = node.get("type", "")
-                type_id = NODE_TYPES.get(node_type, 0)
-                bgcolor = node.get("bgcolor") or DEFAULT_NODE_COLOR
-                raw_capabilities = node.get("capabilities")
-                capabilities: dict = {}
-                if isinstance(raw_capabilities, dict):
-                    capabilities = dict(raw_capabilities)
+            self._tab_nodes[sid] = tab_nodes
+            self._waiting_clients.discard(sid)
+            if not self._waiting_clients:
+                self._ready.set()

-                raw_widget_names: list | None = node.get("widget_names")
-                if not isinstance(raw_widget_names, list):
-                    capability_widget_names = capabilities.get("widget_names")
-                    raw_widget_names = (
-                        capability_widget_names
-                        if isinstance(capability_widget_names, list)
-                        else None
-                    )
+        logger.debug("Registered %s nodes from client %s", len(nodes), sid)

-                widget_names: list[str] = []
-                if isinstance(raw_widget_names, list):
-                    widget_names = [
-                        str(widget_name)
-                        for widget_name in raw_widget_names
-                        if isinstance(widget_name, str) and widget_name
-                    ]
+    def prepare_for_refresh(self, active_sids: list[str]) -> None:
+        """Set the list of client IDs we expect to hear from during the next refresh cycle."""
+        self._ready.clear()
+        self._waiting_clients = set(active_sids)

-                if widget_names:
-                    capabilities["widget_names"] = widget_names
-                else:
-                    capabilities.pop("widget_names", None)
-
-                if "supports_lora" in capabilities:
-                    capabilities["supports_lora"] = bool(capabilities["supports_lora"])
-
-                comfy_class = node.get("comfy_class")
-                if not isinstance(comfy_class, str) or not comfy_class:
-                    comfy_class = node_type if isinstance(node_type, str) else None
-
-                self._nodes[unique_id] = {
-                    "id": node_id,
-                    "graph_id": graph_id,
-                    "graph_name": node.get("graph_name"),
-                    "unique_id": unique_id,
-                    "bgcolor": bgcolor,
-                    "title": node.get("title"),
-                    "type": type_id,
-                    "type_name": node_type,
-                    "comfy_class": comfy_class,
-                    "capabilities": capabilities,
-                    "widget_names": widget_names,
-                    "mode": node.get("mode"),
-                    "marker_role": node.get("marker_role"),
-                }
-            logger.debug("Registered %s nodes in registry", len(nodes))
-            self._registry_updated.set()
-
-    async def get_registry(self) -> dict:
-        async with self._lock:
-            return {
-                "nodes": dict(self._nodes),
-                "node_count": len(self._nodes),
-            }
-
-    async def wait_for_update(self, timeout: float = 1.0) -> bool:
-        self._registry_updated.clear()
+    async def wait_for_all(self, timeout: float = 2.0) -> bool:
+        """Block until every client in the current waiting set has responded
+        (or *timeout* seconds elapse).  Returns ``True`` if all responded."""
+        if not self._waiting_clients:
+            return True
        try:
-            await asyncio.wait_for(self._registry_updated.wait(), timeout=timeout)
+            await asyncio.wait_for(self._ready.wait(), timeout=timeout)
            return True
        except asyncio.TimeoutError:
            return False

+    async def get_merged_registry(self, active_sids: set[str] | None = None) -> dict:
+        """Return the union of all known tab nodes, pruning any tab that is no
+        longer connected."""
+        async with self._lock:
+            # Garbage-collect stale entries (disconnected tabs)
+            if active_sids is not None:
+                for sid in list(self._tab_nodes):
+                    if sid not in active_sids:
+                        del self._tab_nodes[sid]
+
+            merged: dict[str, dict] = {}
+            tab_info: dict[str, dict] = {}
+            for sid, nodes in self._tab_nodes.items():
+                tab_info[sid] = {
+                    "node_count": len(nodes),
+                    "graph_names": list(
+                        {
+                            n.get("graph_name")
+                            for n in nodes.values()
+                            if n.get("graph_name")
+                        }
+                    ),
+                }
+                merged.update(nodes)
+
+            return {
+                "nodes": merged,
+                "node_count": len(merged),
+                "tab_count": len(self._tab_nodes),
+                "tabs": tab_info,
+            }
+

 class HealthCheckHandler:
    async def health_check(self, request: web.Request) -> web.Response:
@@ -2995,10 +3060,21 @@ class NodeRegistryHandler:
        try:
            data = await request.json()
            nodes = data.get("nodes", [])
+            client_id = data.get("client_id")
            if not isinstance(nodes, list):
                return web.json_response(
                    {"success": False, "error": "nodes must be a list"}, status=400
                )
+
+            if not isinstance(client_id, str) or not client_id:
+                return web.json_response(
+                    {
+                        "success": False,
+                        "error": "Missing client_id parameter",
+                    },
+                    status=400,
+                )
+
            for index, node in enumerate(nodes):
                if not isinstance(node, dict):
                    return web.json_response(
@@ -3042,7 +3118,7 @@ class NodeRegistryHandler:
                else:
                    node["graph_name"] = str(graph_name)

-            await self._node_registry.register_nodes(nodes)
+            await self._node_registry.register_nodes(client_id, nodes)
            return web.json_response(
                {
                    "success": True,
@@ -3066,9 +3142,15 @@ class NodeRegistryHandler:
                    status=503,
                )

+            # Snapshot of currently-connected ComfyUI tabs
+            active_sids = list(self._prompt_server.instance.sockets.keys())
+            self._node_registry.prepare_for_refresh(active_sids)
+
            try:
                self._prompt_server.instance.send_sync("lora_registry_refresh", {})
-                logger.debug("Sent registry refresh request to frontend")
+                logger.debug(
+                    "Sent registry refresh request (expecting %s clients)", len(active_sids)
+                )
            except Exception as exc:
                logger.error("Failed to send registry refresh message: %s", exc)
                return web.json_response(
@@ -3080,19 +3162,31 @@ class NodeRegistryHandler:
                    status=500,
                )

-            registry_updated = await self._node_registry.wait_for_update(timeout=1.0)
-            if not registry_updated:
-                logger.warning("Registry refresh timeout after 1 second")
+            if not await self._node_registry.wait_for_all(timeout=2.0):
+                logger.warning(
+                    "Registry refresh timeout after 2s (%s/%s clients responded)",
+                    len(active_sids) - self._node_registry.pending_client_count,
+                    len(active_sids),
+                )
+
+            # Re-read current sockets after the wait: a tab may have connected
+            # while we were waiting, and we don't want to garbage-collect it.
+            current_sids = set(self._prompt_server.instance.sockets.keys())
+            registry_info = await self._node_registry.get_merged_registry(
+                active_sids=current_sids
+            )
+
+            if registry_info["node_count"] == 0:
+                logger.warning("No nodes registered after refresh")
                return web.json_response(
                    {
                        "success": False,
-                        "error": "Timeout Error",
-                        "message": "Registry refresh timeout - ComfyUI frontend may not be responsive",
+                        "error": "Empty Registry",
+                        "message": "No workflow nodes found — ensure ComfyUI is open and the extension is loaded.",
                    },
                    status=408,
                )

-            registry_info = await self._node_registry.get_registry()
            return web.json_response({"success": True, "data": registry_info})
        except Exception as exc:  # pragma: no cover - defensive logging
            logger.error("Failed to get registry: %s", exc, exc_info=True)
--- a/py/routes/handlers/recipe_handlers.py
+++ b/py/routes/handlers/recipe_handlers.py
@@ -32,6 +32,7 @@ from ...utils.civitai_utils import (
    extract_civitai_image_id_from_cdn_url,
    rewrite_preview_url,
 )
+from ...utils.constants import NSFW_LEVELS
 from ...utils.exif_utils import ExifUtils
 from ...recipes.merger import GenParamsMerger
 from ...recipes.enrichment import RecipeEnricher
@@ -1120,6 +1121,13 @@ class RecipeManagementHandler:
            if parsed_embedded.get("base_model") and not metadata.get("base_model"):
                metadata["base_model"] = parsed_embedded["base_model"]

+        # Extract preview_nsfw_level from the CivitAI API response
+        # (injected into civitai_meta_raw by _download_remote_media).
+        if isinstance(civitai_meta_raw, dict):
+            bl = civitai_meta_raw.get("browsingLevel")
+            if isinstance(bl, int) and bl > 0:
+                metadata["preview_nsfw_level"] = bl
+
        civitai_client = self._civitai_client_getter()
        await RecipeEnricher.enrich_recipe(
            recipe=metadata,
@@ -1515,8 +1523,31 @@ class RecipeManagementHandler:
                    # CivitAI API returns modelVersionIds at the root level of
                    # the image response, NOT inside the meta object.
                    mvids = image_info.get("modelVersionIds")
-                    if mvids and isinstance(civitai_meta_raw, dict):
-                        civitai_meta_raw["modelVersionIds"] = mvids
+                    if mvids:
+                        if isinstance(civitai_meta_raw, dict):
+                            civitai_meta_raw["modelVersionIds"] = mvids
+                        else:
+                            # meta is null but modelVersionIds exists — create a
+                            # minimal dict so downstream parsers can discover
+                            # LoRAs and checkpoints from the API response.
+                            civitai_meta_raw = {"modelVersionIds": mvids}
+
+                    # Inject browsingLevel (canonical integer) so the recipe's
+                    # preview_nsfw_level can be set, enabling proper NSFW blur
+                    # of the preview image.  Fall back to nsfwLevel (string)
+                    # when browsingLevel is absent.
+                    if isinstance(civitai_meta_raw, dict):
+                        browsing_level = image_info.get("browsingLevel")
+                        nsfw_level_str = image_info.get("nsfwLevel")
+                        if isinstance(browsing_level, int) and browsing_level > 0:
+                            civitai_meta_raw["browsingLevel"] = browsing_level
+                        elif (
+                            isinstance(nsfw_level_str, str)
+                            and nsfw_level_str in NSFW_LEVELS
+                        ):
+                            civitai_meta_raw["browsingLevel"] = NSFW_LEVELS[
+                                nsfw_level_str
+                            ]

                original_url = (
                    image_info.get("url") if civitai_image_id and image_info else None
@@ -1796,6 +1827,13 @@ class RecipeManagementHandler:
            "source_path": image_url,
        }

+        # Extract preview_nsfw_level from the CivitAI API response
+        # (injected into civitai_meta_raw by _download_remote_media).
+        if isinstance(civitai_meta_raw, dict):
+            bl = civitai_meta_raw.get("browsingLevel")
+            if isinstance(bl, int) and bl > 0:
+                metadata["preview_nsfw_level"] = bl
+
        if civitai_parsed:
            civitai_loras = civitai_parsed.get("loras", [])
            if civitai_loras and not metadata.get("loras"):
--- a/py/services/batch_import_service.py
+++ b/py/services/batch_import_service.py
@@ -523,6 +523,10 @@ class BatchImportService:
                if payload.get("checkpoint"):
                    metadata["checkpoint"] = payload["checkpoint"]

+                nsfw = payload.get("preview_nsfw_level")
+                if isinstance(nsfw, int) and nsfw > 0:
+                    metadata["preview_nsfw_level"] = nsfw
+
                image_bytes = None
                image_base64 = payload.get("image_base64")

--- a/py/services/civarchive_client.py
+++ b/py/services/civarchive_client.py
@@ -417,7 +417,7 @@ class CivArchiveClient:

            if version_id is not None:
                raw_id = version_data.get("id")
-                if raw_id != version_id:
+                if raw_id is not None and str(raw_id) != str(version_id):
                    logger.warning(
                        "Requested version %s doesn't match default version %s for model %s",
                        version_id,
--- a/py/services/civitai_client.py
+++ b/py/services/civitai_client.py
@@ -56,7 +56,7 @@ class CivitaiClient:
        self._MAX_CACHE_ENTRIES = 500

    def _build_image_info_url(self, image_id: str) -> str:
-        return f"{self.base_url}/images?imageId={image_id}&nsfw=X"
+        return f"{self.base_url}/images?imageId={image_id}&nsfw=X&withMeta=true"

    async def _make_request(
        self,
--- a/py/services/download_manager.py
+++ b/py/services/download_manager.py
@@ -1288,10 +1288,24 @@ class DownloadManager:
                    "download_id": download_id,
                }

-            # Check if this checkpoint should be treated as a diffusion model based on baseModel
+            # Check if this checkpoint should be treated as a diffusion model
+            # Priority: (1) any file has type "UNet" or "Diffusion Model",
+            #            (2) baseModel is in DIFFUSION_MODEL_BASE_MODELS
            is_diffusion_model = False
            if model_type == "checkpoint":
-                if base_model_value in DIFFUSION_MODEL_BASE_MODELS:
+                # Check file types first (more direct signal from CivitAI)
+                version_files = version_info.get("files", [])
+                for f in version_files:
+                    f_type = f.get("type", "")
+                    if f_type in ("UNet", "Diffusion Model"):
+                        is_diffusion_model = True
+                        logger.info(
+                            f"File type '{f_type}' detected, routing checkpoint to unet folder"
+                        )
+                        break
+
+                # Fallback to baseModel name check
+                if not is_diffusion_model and base_model_value in DIFFUSION_MODEL_BASE_MODELS:
                    is_diffusion_model = True
                    logger.info(
                        f"baseModel '{base_model_value}' is a known diffusion model, routing to unet folder"
@@ -1420,7 +1434,7 @@ class DownloadManager:
                            f
                            for f in files
                            if f.get("primary")
-                            and f.get("type") in ("Model", "Negative", "Diffusion Model")
+                            and f.get("type") in ("Model", "Negative", "Diffusion Model", "UNet")
                        ),
                        None,
                    )
@@ -1451,7 +1465,7 @@ class DownloadManager:
                    (
                        f
                        for f in files
-                        if f.get("primary") and f.get("type") in ("Model", "Negative", "Diffusion Model")
+                        if f.get("primary") and f.get("type") in ("Model", "Negative", "Diffusion Model", "UNet")
                    ),
                    None,
                )
--- a/py/services/recipes/analysis_service.py
+++ b/py/services/recipes/analysis_service.py
@@ -146,11 +146,38 @@ class RecipeAnalysisService:
                ):
                    metadata = metadata["meta"]

-                # Include modelVersionIds from root level if available
-                # Civitai API returns modelVersionIds at root level, not in meta
+                # Include modelVersionIds from root level if available.
+                # CivitAI API returns modelVersionIds at root level, not in meta.
+                # When meta is null (None), create a minimal dict so downstream
+                # parsers can still discover LoRAs and checkpoints.
                model_version_ids = image_info.get("modelVersionIds")
-                if model_version_ids and isinstance(metadata, dict):
-                    metadata["modelVersionIds"] = model_version_ids
+                if model_version_ids:
+                    if isinstance(metadata, dict):
+                        metadata["modelVersionIds"] = model_version_ids
+                    else:
+                        metadata = {"modelVersionIds": model_version_ids}
+
+                # Inject browsingLevel (canonical integer) so the recipe's
+                # preview_nsfw_level can be set, enabling proper NSFW blur
+                # of the preview image.  Fall back to nsfwLevel (string)
+                # when browsingLevel is absent.
+                if isinstance(metadata, dict):
+                    browsing_level = image_info.get("browsingLevel")
+                    nsfw_level_str = image_info.get("nsfwLevel")
+                    if isinstance(browsing_level, int) and browsing_level > 0:
+                        metadata["browsingLevel"] = browsing_level
+                    elif (
+                        isinstance(nsfw_level_str, str)
+                        and nsfw_level_str
+                        in (
+                            "PG", "PG13", "R", "X", "XXX", "Blocked",
+                        )
+                    ):
+                        from ...utils.constants import NSFW_LEVELS
+
+                        metadata["browsingLevel"] = NSFW_LEVELS.get(
+                            nsfw_level_str, 0
+                        )

                # Validate that metadata contains meaningful recipe fields
                # If not, treat as None to trigger EXIF extraction from downloaded image
@@ -171,12 +198,19 @@ class RecipeAnalysisService:
                temp_path = self._create_temp_path(suffix=extension)
                await self._download_image(url, temp_path)

-            if metadata is None and not is_video:
-                metadata = await asyncio.to_thread(
+            # Always extract EXIF from the downloaded image for generation
+            # params (prompt, negative prompt, sampler, steps, etc.).
+            # Previously this was gated on ``metadata is None``, but that
+            # skipped EXIF entirely when API metadata (modelVersionIds,
+            # browsingLevel) is present, losing all generation parameters.
+            exif_metadata = None
+            if not is_video:
+                exif_metadata = await asyncio.to_thread(
                    self._exif_utils.extract_image_metadata, temp_path
                )

-            if not metadata and civitai_image_id and image_info:
+            # Fallback: try the original (non-optimized) image for EXIF data
+            if not exif_metadata and civitai_image_id and image_info:
                original_url = image_info.get("url")
                if original_url:
                    self._logger.debug(
@@ -187,15 +221,38 @@ class RecipeAnalysisService:
                    orig_temp_path = self._create_temp_path(suffix=".png")
                    try:
                        await self._download_image(original_url, orig_temp_path)
-                        metadata = await asyncio.to_thread(
+                        exif_metadata = await asyncio.to_thread(
                            self._exif_utils.extract_image_metadata,
                            orig_temp_path,
                        )
                    finally:
                        self._safe_cleanup(orig_temp_path)

+            # Parse EXIF data (typically a string like parameters/prompt/workflow)
+            # and API metadata (dict with modelVersionIds, browsingLevel) separately,
+            # then merge: API loras/checkpoint override, EXIF gen_params fill in gaps.
+            # This mirrors the two-pass approach in _do_import_from_url.
+            exif_parsed_result = None
+            if isinstance(exif_metadata, str):
+                exif_parser = self._recipe_parser_factory.create_parser(exif_metadata)
+                if exif_parser:
+                    exif_data = await exif_parser.parse_metadata(
+                        exif_metadata, recipe_scanner=recipe_scanner,
+                    )
+                    if exif_data and not exif_data.get("error"):
+                        exif_parsed_result = exif_data
+
+            # Merge API metadata (dict) with EXIF data (if dict) for the
+            # CivitaiApiMetadataParser.  If EXIF data is a string it was
+            # parsed above — don't try to merge a string into a dict.
+            merged = {}
+            if isinstance(exif_metadata, dict):
+                merged.update(exif_metadata)
+            if isinstance(metadata, dict):
+                merged.update(metadata)
+
            result = await self._parse_metadata(
-                metadata or {},
+                merged,
                recipe_scanner=recipe_scanner,
                image_path=temp_path,
                include_image_base64=True,
@@ -203,13 +260,23 @@ class RecipeAnalysisService:
                extension=extension,
            )

-            if civitai_image_id and image_info and not result.payload.get("error"):
-                mvid = image_info.get("modelVersionId")
-                if not mvid:
-                    mvids = image_info.get("modelVersionIds")
-                    if isinstance(mvids, list) and mvids:
-                        mvid = mvids[0]
+            # Merge EXIF string-parsed gen_params into the API result.
+            # API gen_params take priority (they come later via update).
+            if exif_parsed_result and not result.payload.get("error"):
+                exif_gp = exif_parsed_result.get("gen_params") or {}
+                result_gp = result.payload.get("gen_params") or {}
+                merged_gp = {**exif_gp, **result_gp}
+                if merged_gp:
+                    result.payload["gen_params"] = merged_gp

+            if civitai_image_id and image_info and not result.payload.get("error"):
+                # Use the metadata dict we built (may contain modelVersionIds
+                # and browsingLevel from the API root level).  Do NOT pass
+                # image_info.get("meta") — it is null for images whose meta
+                # lives at the root level only.  Also do NOT derive
+                # model_version_id from modelVersionIds[0] — that array mixes
+                # checkpoints, LoRAs, and other types without ordering
+                # guarantees; the parser already resolved them correctly.
                recipe_for_enrich = {
                    "gen_params": result.payload.get("gen_params", {}),
                    "loras": result.payload.get("loras", []),
@@ -222,8 +289,10 @@ class RecipeAnalysisService:
                    recipe=recipe_for_enrich,
                    civitai_client=civitai_client,
                    request_params=None,
-                    prefetched_civitai_meta_raw=image_info.get("meta"),
-                    prefetched_model_version_id=mvid,
+                    prefetched_civitai_meta_raw=(
+                        metadata if isinstance(metadata, dict) else None
+                    ),
+                    prefetched_model_version_id=None,
                )

                result.payload["gen_params"] = recipe_for_enrich["gen_params"]
@@ -232,6 +301,12 @@ class RecipeAnalysisService:
                if recipe_for_enrich.get("base_model"):
                    result.payload["base_model"] = recipe_for_enrich["base_model"]

+                # Extract browsingLevel from our constructed metadata for NSFW blur
+                if isinstance(metadata, dict):
+                    bl = metadata.get("browsingLevel")
+                    if isinstance(bl, int) and bl > 0:
+                        result.payload["preview_nsfw_level"] = bl
+
            return result
        finally:
            if temp_path:
@@ -314,6 +389,10 @@ class RecipeAnalysisService:
            "prompt_type",
            "positive",
            "negative",
+            # modelVersionIds is injected at the root level by CivitAI's image
+            # API when meta is null. It carries the version IDs of ALL models
+            # (checkpoint + LoRAs) used to generate the image.
+            "modelVersionIds",
        }
        return any(field in metadata for field in recipe_fields)

--- a/py/utils/constants.py
+++ b/py/utils/constants.py
@@ -147,6 +147,8 @@ DIFFUSION_MODEL_BASE_MODELS = frozenset(
        "Qwen",
        "ZImageBase",
        "ZImageTurbo",
+        # Krea 2 — loaded via UNETLoader in ComfyUI
+        "Krea 2",
    ]
 )

--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,7 @@
 [project]
 name = "comfyui-lora-manager"
 description = "Revolutionize your workflow with the ultimate LoRA companion for ComfyUI!"
-version = "1.1.5"
+version = "1.1.6"
 license = {file = "LICENSE"}
 dependencies = [
    "aiohttp",
--- a/static/js/managers/BulkManager.js
+++ b/static/js/managers/BulkManager.js
@@ -21,6 +21,7 @@ export class BulkManager {
        this.isMarqueeActive = false;
        this.isDragging = false;
        this.marqueeStart = { x: 0, y: 0 };
+        this.marqueeStartDoc = { x: 0, y: 0 }; // Marquee start in document coordinates
        this.marqueeElement = null;
        this.initialSelectedModels = new Set();

@@ -29,6 +30,11 @@ export class BulkManager {
        this.mouseDownTime = 0;
        this.mouseDownPosition = { x: 0, y: 0 };

+        // Auto-scroll properties for marquee
+        this.lastClientX = 0;
+        this.lastClientY = 0;
+        this.autoScrollRaf = null;
+
        // Model type specific action configurations
        this.actionConfig = {
            [MODEL_TYPES.LORA]: {
@@ -168,7 +174,10 @@ export class BulkManager {

        eventManager.addHandler('mousemove', 'bulkManager-marquee-move', (e) => {
            if (this.isMarqueeActive) {
+                this.lastClientX = e.clientX;
+                this.lastClientY = e.clientY;
                this.updateMarqueeSelection(e);
+                this.startAutoScroll();
            } else if (this.mouseDownTime && !this.isDragging) {
                // Check if we've moved enough to consider it a drag
                const dx = e.clientX - this.mouseDownPosition.x;
@@ -237,6 +246,7 @@ export class BulkManager {
     * Clean up event handlers
     */
    cleanup() {
+        this.stopAutoScroll();
        eventManager.removeAllHandlersForSource('bulkManager-keyboard');
        eventManager.removeAllHandlersForSource('bulkManager-marquee-start');
        eventManager.removeAllHandlersForSource('bulkManager-marquee-move');
@@ -1727,10 +1737,15 @@ export class BulkManager {
     * @param {boolean} isDragging - Whether this is triggered from a drag operation
     */
    startMarqueeSelection(e, isDragging = false) {
-        // Store initial mouse position
+        // Store initial mouse position (viewport coordinates for visual element)
        this.marqueeStart.x = this.mouseDownPosition.x;
        this.marqueeStart.y = this.mouseDownPosition.y;

+        // Store initial mouse position in document coordinates (for logical selection)
+        const container = document.querySelector('.page-content');
+        this.marqueeStartDoc.x = this.mouseDownPosition.x + (container?.scrollLeft || 0);
+        this.marqueeStartDoc.y = this.mouseDownPosition.y + (container?.scrollTop || 0);
+
        // Store initial selection state
        this.initialSelectedModels = new Set(state.selectedModels);

@@ -1776,46 +1791,67 @@ export class BulkManager {
     */
    updateMarqueeSelection(e) {
        if (!this.marqueeElement) return;
-
-        const currentX = e.clientX;
-        const currentY = e.clientY;
-
-        // Calculate rectangle bounds
-        const left = Math.min(this.marqueeStart.x, currentX);
-        const top = Math.min(this.marqueeStart.y, currentY);
-        const width = Math.abs(currentX - this.marqueeStart.x);
-        const height = Math.abs(currentY - this.marqueeStart.y);
-
-        // Update marquee element position and size
-        this.marqueeElement.style.left = left + 'px';
-        this.marqueeElement.style.top = top + 'px';
-        this.marqueeElement.style.width = width + 'px';
-        this.marqueeElement.style.height = height + 'px';
-
-        // Check which cards intersect with marquee
-        this.updateCardSelection(left, top, left + width, top + height);
+        this.updateMarqueeSelectionFromPosition(e.clientX, e.clientY);
    }

    /**
-     * Update card selection based on marquee bounds
+     * Update marquee from raw client coordinates (used by both mousemove and auto-scroll loop)
     */
-    updateCardSelection(left, top, right, bottom) {
-        const cards = document.querySelectorAll('.model-card');
+    updateMarqueeSelectionFromPosition(clientX, clientY) {
+        if (!this.marqueeElement) return;
+
+        const container = document.querySelector('.page-content');
+        const scrollX = container?.scrollLeft || 0;
+        const scrollY = container?.scrollTop || 0;
+
+        // Current position in document coordinates
+        const currentDocX = clientX + scrollX;
+        const currentDocY = clientY + scrollY;
+
+        // Calculate marquee rectangle in document coordinates
+        const docLeft = Math.min(this.marqueeStartDoc.x, currentDocX);
+        const docTop = Math.min(this.marqueeStartDoc.y, currentDocY);
+        const docRight = Math.max(this.marqueeStartDoc.x, currentDocX);
+        const docBottom = Math.max(this.marqueeStartDoc.y, currentDocY);
+
+        // Update visual marquee element (position: fixed, so subtract scroll offset)
+        this.marqueeElement.style.left = (docLeft - scrollX) + 'px';
+        this.marqueeElement.style.top = (docTop - scrollY) + 'px';
+        this.marqueeElement.style.width = (docRight - docLeft) + 'px';
+        this.marqueeElement.style.height = (docBottom - docTop) + 'px';
+
+        // Check which cards intersect with marquee
+        this.updateCardSelection(docLeft, docTop, docRight, docBottom);
+    }
+
+    /**
+     * Update card selection based on marquee bounds (document coordinates).
+     * Uses dual detection: DOM cards for visible ones + VirtualScroller layout for off-screen cards.
+     */
+    updateCardSelection(docLeft, docTop, docRight, docBottom) {
+        const vs = state.virtualScroller;
+        const container = document.querySelector('.page-content');
+        const scrollX = container?.scrollLeft || 0;
+        const scrollY = container?.scrollTop || 0;
        const newSelection = new Set(this.initialSelectedModels);
+        const visibleFilepaths = new Set();

-        cards.forEach(card => {
-            const rect = card.getBoundingClientRect();
-
-            // Check if card intersects with marquee rectangle
-            const intersects = !(rect.right < left ||
-                rect.left > right ||
-                rect.bottom < top ||
-                rect.top > bottom);
-
+        // Step 1: Process visible DOM cards using getBoundingClientRect + scroll offset
+        document.querySelectorAll('.model-card').forEach(card => {
            const filepath = card.dataset.filepath;
+            if (!filepath) return;
+            visibleFilepaths.add(filepath);
+
+            const rect = card.getBoundingClientRect();
+            const cardLeft = rect.left + scrollX;
+            const cardTop = rect.top + scrollY;
+            const cardRight = rect.right + scrollX;
+            const cardBottom = rect.bottom + scrollY;
+
+            const intersects = !(cardRight < docLeft || cardLeft > docRight ||
+                                 cardBottom < docTop || cardTop > docBottom);

            if (intersects) {
-                // Add to selection if intersecting
                newSelection.add(filepath);
                card.classList.add('selected');

@@ -1825,12 +1861,43 @@ export class BulkManager {
                    this.updateMetadataCacheFromCard(filepath, card);
                }
            } else if (!this.initialSelectedModels.has(filepath)) {
-                // Remove from selection if not intersecting and wasn't initially selected
                newSelection.delete(filepath);
                card.classList.remove('selected');
            }
        });

+        // Step 2: Process off-screen cards via VirtualScroller layout calculation.
+        // Since VirtualScroller removes off-screen DOM elements, we compute
+        // each card's position from its index and the VS layout parameters.
+        if (vs?.gridElement && vs.items && vs.columnsCount > 0) {
+            const gridRect = vs.gridElement.getBoundingClientRect();
+            // Grid origin in scroll-container content coordinates
+            const originX = gridRect.left + scrollX;
+            const originY = gridRect.top + scrollY;
+
+            for (let i = 0; i < vs.items.length; i++) {
+                const filepath = vs.items[i]?.file_path;
+                if (!filepath || visibleFilepaths.has(filepath)) continue;
+
+                const row = Math.floor(i / vs.columnsCount);
+                const col = i % vs.columnsCount;
+
+                const cLeft = originX + col * (vs.itemWidth + vs.columnGap);
+                const cTop = originY + (vs.containerPaddingTop || 0) + row * (vs.itemHeight + (vs.rowGap || 0));
+                const cRight = cLeft + vs.itemWidth;
+                const cBottom = cTop + vs.itemHeight;
+
+                const intersects = !(cRight < docLeft || cLeft > docRight ||
+                                     cBottom < docTop || cTop > docBottom);
+
+                if (intersects) {
+                    newSelection.add(filepath);
+                } else if (!this.initialSelectedModels.has(filepath)) {
+                    newSelection.delete(filepath);
+                }
+            }
+        }
+
        // Update global selection state
        state.selectedModels = newSelection;

@@ -1849,6 +1916,9 @@ export class BulkManager {
        this.isDragging = false;
        this.mouseDownTime = 0;

+        // Stop any active auto-scroll
+        this.stopAutoScroll();
+
        // Update event manager state
        eventManager.setState('marqueeActive', false);

@@ -1874,6 +1944,79 @@ export class BulkManager {
        // Clear initial selection state
        this.initialSelectedModels.clear();
    }
+
+    /**
+     * Start auto-scroll loop when mouse approaches viewport edge during marquee
+     */
+    startAutoScroll() {
+        if (this.autoScrollRaf) return;
+        this.autoScrollLoop();
+    }
+
+    /**
+     * Stop auto-scroll loop
+     */
+    stopAutoScroll() {
+        if (this.autoScrollRaf) {
+            cancelAnimationFrame(this.autoScrollRaf);
+            this.autoScrollRaf = null;
+        }
+    }
+
+    /**
+     * Auto-scroll loop: scrolls the page when mouse is near viewport edges
+     * and re-evaluates marquee selection after each scroll.
+     */
+    autoScrollLoop() {
+        if (!this.isMarqueeActive) {
+            this.autoScrollRaf = null;
+            return;
+        }
+
+        const container = document.querySelector('.page-content');
+        if (!container) {
+            this.autoScrollRaf = null;
+            return;
+        }
+
+        const MARGIN = 30;      // Px from edge to trigger scroll
+        const BASE_SPEED = 12;   // Pixels per frame at edge boundary
+        const MAX_SPEED = 40;    // Maximum scroll speed
+        const rect = container.getBoundingClientRect();
+        let dx = 0;
+        let dy = 0;
+
+        // Vertical auto-scroll - speed increases the further the cursor is past the edge
+        if (this.lastClientY !== undefined) {
+            if (this.lastClientY < rect.top + MARGIN) {
+                const dist = Math.max(0, (rect.top + MARGIN) - this.lastClientY);
+                dy = -Math.min(BASE_SPEED + dist * 0.5, MAX_SPEED);
+            } else if (this.lastClientY > rect.bottom - MARGIN) {
+                const dist = Math.max(0, this.lastClientY - (rect.bottom - MARGIN));
+                dy = Math.min(BASE_SPEED + dist * 0.5, MAX_SPEED);
+            }
+        }
+
+        // Horizontal auto-scroll
+        if (this.lastClientX !== undefined) {
+            if (this.lastClientX < rect.left + MARGIN) {
+                const dist = Math.max(0, (rect.left + MARGIN) - this.lastClientX);
+                dx = -Math.min(BASE_SPEED + dist * 0.5, MAX_SPEED);
+            } else if (this.lastClientX > rect.right - MARGIN) {
+                const dist = Math.max(0, this.lastClientX - (rect.right - MARGIN));
+                dx = Math.min(BASE_SPEED + dist * 0.5, MAX_SPEED);
+            }
+        }
+
+        if (dx !== 0 || dy !== 0) {
+            container.scrollBy(dx, dy);
+            // Re-evaluate marquee selection with the new scroll position
+            this.updateMarqueeSelectionFromPosition(this.lastClientX, this.lastClientY);
+            this.autoScrollRaf = requestAnimationFrame(() => this.autoScrollLoop());
+        } else {
+            this.autoScrollRaf = null;
+        }
+    }
 }

 export const bulkManager = new BulkManager();
--- a/static/js/managers/DownloadManager.js
+++ b/static/js/managers/DownloadManager.js
@@ -351,7 +351,7 @@ export class DownloadManager {
            const thumbnailUrl = firstImage ? firstImage.url : '/loras_static/images/no-preview.png';

            // Count model-type files per version
-            const modelFiles = (version.files || []).filter(f => f.type === 'Model');
+            const modelFiles = (version.files || []).filter(f => f.type === 'Model' || f.type === 'UNet' || f.type === 'Diffusion Model');
            const primaryFile = modelFiles.find(f => f.primary) || modelFiles[0] || {};
            const fileSize = version.modelSizeKB ?
                (version.modelSizeKB / 1024).toFixed(2) :
@@ -478,7 +478,7 @@ export class DownloadManager {
        if (!version) return;

        this.currentVersion = version;
-        const modelFiles = (version.files || []).filter(f => f.type === 'Model');
+        const modelFiles = (version.files || []).filter(f => f.type === 'Model' || f.type === 'UNet' || f.type === 'Diffusion Model');

        document.getElementById('versionStep').style.display = 'none';
        document.getElementById('fileSelectionStep').style.display = 'block';
@@ -534,7 +534,7 @@ export class DownloadManager {
        const version = this.currentVersion;
        if (!version) return;

-        const modelFiles = (version.files || []).filter(f => f.type === 'Model');
+        const modelFiles = (version.files || []).filter(f => f.type === 'Model' || f.type === 'UNet' || f.type === 'Diffusion Model');
        this.selectedFile = modelFiles.find(f => f.id.toString() === selectedRadio.value);

        document.getElementById('fileSelectionStep').style.display = 'none';
@@ -954,7 +954,7 @@ export class DownloadManager {
        }
        if (!this.isBatchMode) {
            const fileParams = this.selectedFile ? {
-                type: 'Model',
+                type: this.selectedFile.type || 'Model',
                format: this.selectedFile.metadata?.format || 'SafeTensor',
                size: this.selectedFile.metadata?.size || 'full',
                fp: this.selectedFile.metadata?.fp,
--- a/static/js/managers/import/DownloadManager.js
+++ b/static/js/managers/import/DownloadManager.js
@@ -57,9 +57,16 @@ export class DownloadManager {
                    base_model: this.importManager.recipeData.base_model || "",
                    loras: this.importManager.recipeData.loras || [],
                    gen_params: this.importManager.recipeData.gen_params || {},
-                    raw_metadata: this.importManager.recipeData.raw_metadata || {}
+                    raw_metadata: this.importManager.recipeData.raw_metadata || {},
                };

+                // Preserve preview_nsfw_level from analysis so the saved
+                // recipe applies the correct NSFW blur on the preview image.
+                const nsfwLevel = this.importManager.recipeData.preview_nsfw_level;
+                if (nsfwLevel !== undefined && nsfwLevel !== null) {
+                    completeMetadata.preview_nsfw_level = nsfwLevel;
+                }
+
                const checkpointMetadata =
                    this.importManager.recipeData.checkpoint ||
                    this.importManager.recipeData.model ||
--- a/tests/routes/test_api_snapshots.py
+++ b/tests/routes/test_api_snapshots.py
@@ -60,7 +60,9 @@ class FakePromptServer:
    sent = []

    class Instance:
-        def send_sync(self, event, payload):
+        sockets: dict = {}
+
+        def send_sync(self, event, payload, sid=None):
            FakePromptServer.sent.append((event, payload))

    instance = Instance()
@@ -148,7 +150,8 @@ class TestNodeRegistryHandlerSnapshots:
                        "type": "Lora Loader (LoraManager)",
                        "title": "Test Loader",
                    }
-                ]
+                ],
+                "client_id": "test-client-1",
            }
        )

@@ -167,7 +170,7 @@ class TestNodeRegistryHandlerSnapshots:
            standalone_mode=False,
        )

-        request = FakeRequest(json_data={"nodes": []})
+        request = FakeRequest(json_data={"nodes": [], "client_id": "test-client-1"})
        response = await handler.register_nodes(request)
        payload = json.loads(response.text)

--- a/tests/routes/test_misc_routes.py
+++ b/tests/routes/test_misc_routes.py
@@ -586,7 +586,9 @@ class FakePromptServer:
    sent = []

    class Instance:
-        def send_sync(self, event, payload):
+        sockets: dict = {}
+
+        def send_sync(self, event, payload, sid=None):
            FakePromptServer.sent.append((event, payload))

    instance = Instance()
@@ -601,7 +603,12 @@ async def test_register_nodes_requires_graph_id():
        standalone_mode=False,
    )

-    request = FakeRequest(json_data={"nodes": [{"node_id": 1}]})
+    request = FakeRequest(
+        json_data={
+            "nodes": [{"node_id": 1}],
+            "client_id": "test-client-1",
+        }
+    )
    response = await handler.register_nodes(request)
    payload = json.loads(response.text)

@@ -629,7 +636,8 @@ async def test_register_nodes_stores_graph_identifier():
                    "type": "Lora Loader (LoraManager)",
                    "title": "Loader",
                }
-            ]
+            ],
+            "client_id": "test-client-1",
        }
    )

@@ -638,7 +646,7 @@ async def test_register_nodes_stores_graph_identifier():

    assert payload["success"] is True

-    registry = await node_registry.get_registry()
+    registry = await node_registry.get_merged_registry()
    assert registry["node_count"] == 1
    stored_node = next(iter(registry["nodes"].values()))
    assert stored_node["graph_id"] == "graph-123"
@@ -664,7 +672,8 @@ async def test_register_nodes_defaults_graph_name_to_none():
                    "type": "Lora Loader (LoraManager)",
                    "title": "Root Loader",
                }
-            ]
+            ],
+            "client_id": "test-client-1",
        }
    )

@@ -673,7 +682,7 @@ async def test_register_nodes_defaults_graph_name_to_none():

    assert payload["success"] is True

-    registry = await node_registry.get_registry()
+    registry = await node_registry.get_merged_registry()
    stored_node = next(iter(registry["nodes"].values()))
    assert stored_node["graph_name"] is None

@@ -700,7 +709,8 @@ async def test_register_nodes_includes_capabilities():
                        "widget_names": ["ckpt_name", "", 42],
                    },
                }
-            ]
+            ],
+            "client_id": "test-client-1",
        }
    )

@@ -709,7 +719,7 @@ async def test_register_nodes_includes_capabilities():

    assert payload["success"] is True

-    registry = await node_registry.get_registry()
+    registry = await node_registry.get_merged_registry()
    stored_node = next(iter(registry["nodes"].values()))
    assert stored_node["capabilities"] == {
        "supports_lora": False,
@@ -724,7 +734,9 @@ async def test_update_node_widget_sends_payload():

    class RecordingPromptServer:
        class Instance:
-            def send_sync(self, event, payload):
+            sockets: dict = {}
+
+            def send_sync(self, event, payload, sid=None):
                send_calls.append((event, payload))

        instance = Instance()
@@ -768,7 +780,9 @@ async def test_update_lora_code_includes_graph_identifier():

    class RecordingPromptServer:
        class Instance:
-            def send_sync(self, event, payload):
+            sockets: dict = {}
+
+            def send_sync(self, event, payload, sid=None):
                send_calls.append((event, payload))

        instance = Instance()
--- a/tests/services/test_civitai_client.py
+++ b/tests/services/test_civitai_client.py
@@ -568,7 +568,7 @@ async def test_get_image_info_prefers_red_host_for_red_source(monkeypatch, downl

    assert result == {"id": 124950237, "name": "target"}
    assert requested_urls == [
-        "https://civitai.red/api/v1/images?imageId=124950237&nsfw=X"
+        "https://civitai.red/api/v1/images?imageId=124950237&nsfw=X&withMeta=true"
    ]


@@ -589,7 +589,7 @@ async def test_get_image_info_uses_red_host_even_for_red_source(monkeypatch, dow

    assert result == {"id": 124950237, "name": "target"}
    assert requested_urls == [
-        "https://civitai.red/api/v1/images?imageId=124950237&nsfw=X",
+        "https://civitai.red/api/v1/images?imageId=124950237&nsfw=X&withMeta=true",
    ]


@@ -610,7 +610,7 @@ async def test_get_image_info_does_not_fall_back_after_request_failure(monkeypat

    assert result is None
    assert requested_urls == [
-        "https://civitai.red/api/v1/images?imageId=124950237&nsfw=X",
+        "https://civitai.red/api/v1/images?imageId=124950237&nsfw=X&withMeta=true",
    ]


--- a/web/comfyui/workflow_registry.js
+++ b/web/comfyui/workflow_registry.js
@@ -151,7 +151,10 @@ app.registerExtension({
                headers: {
                    "Content-Type": "application/json",
                },
-                body: JSON.stringify({ nodes: workflowNodes }),
+                body: JSON.stringify({
+                    nodes: workflowNodes,
+                    client_id: api.clientId ?? api.initialClientId ?? "",
+                }),
            });

            if (!response.ok) {
Author	SHA1	Message	Date
Will Miao	3e303ab316	chore(release): bump version to v1.1.6	2026-06-28 22:17:02 +08:00
Will Miao	e9e8c31ad1	fix(registry): store nodes per-client to prevent multi-tab race condition Move NodeRegistry from a single global _nodes dict to a per-client (_tab_nodes) structure so that multiple ComfyUI browser tabs no longer overwrite each other's workflow node data during a lora_registry_refresh cycle. The merged result is a union of all known tabs' target nodes, eliminating the non-deterministic failure where send-to-workflow could randomly target a tab lacking valid targets. - NodeRegistry.register_nodes(sid, nodes) replaces per-tab data without affecting other tabs. - NodeRegistry.get_merged_registry() returns the union across all connected clients, together with tab_count / per-tab metadata. - prepare_for_refresh() snapshots the current active sockets; caller re-reads before merging so that newly-connected tabs are not pruned. - workflow_registry.js sends api.clientId in the POST body so the backend can identify which tab is registering.	2026-06-28 17:57:58 +08:00
Will Miao	703a6a4ea0	fix(import): request withMeta=true from CivitAI API, fix checkpoint type guard and CivArchive version lookup - Add &withMeta=true to image info URL so API returns full generation metadata (resources with hash/type) instead of null meta - Fix checkpoint assignment guard: check modelId instead of id so non- checkpoint types (upscaler) are not wrongly set as recipe checkpoint - Skip modelVersionIds loop when resources/civitaiResources already provided LoRAs, preventing hash-resolved duplicates - Fix int/str type comparison in CivArchive get_model_version so version ID matching works correctly	2026-06-27 22:22:48 +08:00
Will Miao	283730cf38	fix(import): discover LoRA + checkpoint from modelVersionIds when API meta is null When CivitAI image API returns meta=null and modelVersionIds at root level, the import flow now: - Injects modelVersionIds + browsingLevel into a minimal metadata dict so the parser can discover LoRAs and checkpoints (both import-from-url and analyze-image paths) - Adds checkpoint dedup + fallback in the parser's modelVersionIds handler to avoid duplicate API calls - Runs EXIF extraction unconditionally in analyze-image path, then merges with API metadata (fixes gen params loss) - Propagates preview_nsfw_level through all three import paths: import-from-url, analyze-image (UI Import), and batch-import, plus the frontend save flow	2026-06-27 17:05:38 +08:00
Will Miao	20417797e8	fix(download): accept UNet and Diffusion Model file types from CivitAI - Prefer file type (UNet/Diffusion Model) over baseModel name when deciding whether a checkpoint routes to the unet folder - Add UNet to backend primary file type whitelist - Add Krea 2 to DIFFUSION_MODEL_BASE_MODELS - Include UNet/Diffusion Model files in frontend file selection UI - Use actual file type from CivitAI in download params instead of hardcoded 'Model'	2026-06-27 08:56:11 +08:00
Will Miao	004c69b9ef	fix(marquee): use document coordinates, add auto-scroll, support VirtualScroller off-screen cards - Convert marquee selection from viewport to document coordinates so scrolling during a drag no longer deselects off-screen cards. - Add RAF-based auto-scroll when dragging near viewport edges. - Compute off-screen card positions from VirtualScroller layout parameters instead of relying on DOM queries.	2026-06-27 08:21:21 +08:00