feat(ui): add View on Hugging Face button, plumb hf_url through full cache pipeline

fix(download): harden HF download path validation, fix WebSocket leak, add URL detection tests (#965 , #977 )
Security hardening: - Validate repo format with strict regex (reject .. traversal) - Validate filename rejects path separators and .. - Validate relative_path rejects absolute paths and .. - Verify model_root is within configured scanner roots using realpath + os.sep guard to prevent prefix-match bypass - Add realpath-based escape detection for final dest_path Bug fixes: - Fix WebSocket leak in _downloadHfSingle: wrap ws.close() in try/finally so it closes even if downloadHfModel() throws - Same fix for batch HF download per-file WebSocket loop Frontend hardening: - Tighten HF repo regex: require huggingface.co for full URLs, reject bare .. patterns - Add 12 unit tests for detectUrlType() covering HF resolve, HF repo, CivitAI, CivArchive, direct HTTP, edge cases
2026-10-04 17:15:33 -03:00 · 2026-07-01 08:38:16 +08:00 · 2026-07-01 05:51:58 +08:00 · 2026-06-30 23:28:35 +08:00 · 2026-06-30 22:41:17 +08:00 · 2026-06-30 19:42:30 +08:00
151 changed files with 28236 additions and 20753 deletions
@@ -7,6 +7,10 @@ py/run_test.py
 .vscode/
 cache/
 civitai/
+stats/
+wildcards/
+backups/
+logs/
 node_modules/
 coverage/
 .coverage
@@ -19,6 +23,7 @@ model_cache/
 .codex
 .omo
 reasonix.toml
+.reasonix/
 .codegraph/

 # Vue widgets development cache (but keep build output)
@@ -11,42 +11,62 @@
    "Insomnia Art Designs",
    "2018cfh",
    "Arlecchino Shion",
+    "Charles Blakemore",
    "Rob Williams",
    "W+K+White",
    "$MetaSamsara",
    "wackop",
    "Phil",
    "Carl G.",
-    "Charles Blakemore",
    "stone9k",
+    "Rosenthal",
+    "Francisco Tatis",
+    "JongWon Han",
+    "FreelancerZ",
+    "Polymorphic Indeterminate",
+    "Skalabananen",
+    "Marc Whiffen",
+    "Birdy",
    "itismyelement",
    "Mozzel",
    "Gingko Biloba",
    "Kiba",
+    "Reno Lam",
    "onesecondinosaur",
+    "sig",
    "Christian Byrne",
    "DM",
    "Sen314",
    "Estragon",
-    "Rosenthal",
+    "J\\B/ 8r0wns0n",
    "ClockDaemon",
-    "Francisco Tatis",
+    "KD",
+    "Omnidex",
+    "Tyler Trebuchon",
+    "Release Cabrakan",
    "Tobi_Swagg",
    "SG",
+    "James Dooley",
+    "zenbound",
+    "Buzzard",
    "jmack",
    "Andrew Wilson",
    "Greybush",
+    "Mark Corneglio",
    "Ricky Carter",
-    "JongWon Han",
+    "James Todd",
+    "Steven Pfeiffer",
    "VantAI",
    "レプサイ",
+    "Lisster",
    "Michael Wong",
    "runte3221",
    "Illrigger",
    "Tom Corrigan",
    "JackieWang",
-    "FreelancerZ",
    "fnkylove",
+    "Yushio",
+    "Vik71it",
    "Echo",
    "Lilleman",
    "Robert Stacey",
@@ -54,174 +74,161 @@
    "Edgar Tejeda",
    "Fraser Cross",
    "Liam MacDougal",
-    "Polymorphic Indeterminate",
    "Sterilized",
+    "BadassArabianMofo",
    "JORGE+LUIZ+HUSSNI+MESSIAS",
-    "Marc Whiffen",
-    "Skalabananen",
-    "Birdy",
    "quarz",
-    "Reno Lam",
+    "Greg",
+    "jean jahren",
    "JSST",
-    "sig",
-    "J\\B/ 8r0wns0n",
    "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",
-    "zenbound",
-    "Buzzard",
+    "Starkselle",
+    "Aaron Bleuer",
+    "LacesOut!",
+    "greebles",
    "Adam Shaw",
-    "Mark Corneglio",
    "SarcasticHashtag",
    "Anthony Rizzo",
    "iamresist",
+    "M Postkasse",
    "RedrockVP",
    "Wolffen",
-    "James Todd",
    "Wicked Choices by ASLPro3D",
+    "Jacob Hoehler",
    "FinalyFree",
-    "Steven Pfeiffer",
+    "Weasyl",
    "Timmy",
    "Johnny",
+    "Cory Paza",
    "Tak",
-    "Lisster",
    "Big Red",
    "whudunit",
    "Luc Job",
    "dl0901dm",
+    "Philip Hempel",
    "corde",
-    "Nick Walker",
-    "Yushio",
-    "Vik71it",
+    "nwalker94",
    "Bishoujoker",
+    "aai",
    "Todd Keck",
    "Briton Heilbrun",
    "Tori",
    "wildnut",
    "Aleksander Wujczyk",
    "AM Kuro",
-    "BadassArabianMofo",
    "Pascal Dahle",
-    "Greg",
+    "Sangheili460",
+    "MagnaInsomnia",
    "Akira_HentAI",
-    "lmsupporter",
+    "Karl P.",
    "andrew.tappan",
+    "N/A",
+    "The Spawn",
+    "graysock",
    "Greenmoustache",
    "zounic",
-    "wfpearl",
-    "Eldithor",
-    "Jack B Nimble",
+    "fancypants",
+    "Digital",
    "JaxMax",
    "contrite831",
-    "bh",
    "Jwk0205",
-    "Starkselle",
+    "Bro Xie",
+    "batblue",
+    "carey6409",
    "Olive",
-    "Aaron Bleuer",
-    "LacesOut!",
-    "greebles",
+    "太郎 ゲーム",
    "Some Guy Named Barry",
-    "M Postkasse",
+    "AELOX",
    "Gooohokrbe",
+    "Nicfit23",
+    "wamekukyouzin",
    "OldBones",
-    "Jacob Hoehler",
+    "drum matthieu",
+    "Dogmaster",
    "Matt Wenzel",
-    "Weasyl",
    "Lex Song",
-    "Cory Paza",
+    "Christopher Michel",
    "Gonzalo Andre Allendes Lopez",
    "Zach Gonser",
    "Serge Bekenkamp",
    "Jimmy Ledbetter",
-    "Philip Hempel",
+    "LeoZero",
+    "Antonio Pontes",
+    "nahinahi9",
+    "Dustin Chen",
    "dan",
-    "aai",
+    "Mouthlessman",
    "otaku fra",
-    "jean jahren",
    "MiraiKuriyamaSy",
    "Ran C",
    "ViperC",
    "Penfore",
-    "Sangheili460",
-    "MagnaInsomnia",
-    "Karl P.",
    "Gordon Cole",
    "Adam Taylor",
    "AbstractAss",
    "Weird_With_A_Beard",
-    "N/A",
-    "The Spawn",
-    "graysock",
    "Pozadine1",
    "Qarob",
    "AIGooner",
    "Luc",
    "ProtonPrince",
    "DiffDuck",
-    "Jackthemind",
-    "fancypants",
-    "Joboshy",
-    "Digital",
-    "takyamtom",
-    "Bohemian Corporal",
-    "Dan",
-    "Bro Xie",
-    "yer fey",
-    "batblue",
-    "carey6409",
-    "太郎 ゲーム",
-    "Roslynd",
-    "jinxedx",
-    "Cosmosis",
-    "AELOX",
-    "Dankin",
-    "Nicfit23",
-    "FloPro4Sho",
-    "Cristian Vazquez",
-    "wamekukyouzin",
-    "drum matthieu",
-    "Dogmaster",
-    "Frank Nitty",
-    "Magic Noob",
-    "Christopher Michel",
-    "DougPeterson",
-    "LeoZero",
-    "Antonio Pontes",
-    "ApathyJones",
-    "Bruce",
-    "Julian V",
-    "Steven Owens",
-    "nahinahi9",
-    "Kevin John Duck",
-    "Dustin Chen",
-    "Blackfish95",
-    "Mouthlessman",
-    "Paul Kroll",
-    "Bas Imagineer",
-    "John Statham",
-    "yuxz69",
-    "esthe",
-    "decoy",
    "elu3199",
    "Hasturkun",
    "Jon Sandman",
    "Ubivis",
    "CloudValley",
+    "linnfrey",
+    "Jackthemind",
+    "griffin+dahlberg",
+    "Joboshy",
+    "takyamtom",
+    "Bohemian Corporal",
+    "Dan",
+    "yer fey",
+    "Error_Rule34_Not_found",
+    "Roslynd",
+    "jinxedx",
+    "Neco28",
+    "Cosmosis",
+    "David Ortega",
+    "Dankin",
+    "FloPro4Sho",
+    "Cristian Vazquez",
+    "Frank Nitty",
+    "Magic Noob",
+    "DougPeterson",
+    "ApathyJones",
+    "Jeff",
+    "Bruce",
+    "Steven Owens",
+    "Kevin John Duck",
+    "Kevin Christopher",
+    "Blackfish95",
+    "dd",
+    "Paul Kroll",
+    "Bas Imagineer",
+    "John Statham",
+    "yuxz69",
+    "esthe",
+    "AlexDuKaNa",
+    "decoy",
    "thesoftwaredruid",
    "wundershark",
    "mr_dinosaur",
@@ -229,53 +236,11 @@
    "Ray Wing",
    "Ranzitho",
    "Gus",
+    "地獄の禄",
    "MJG",
    "David LaVallee",
-    "linnfrey",
-    "IamAyam",
-    "skaterb949",
-    "Josef Lanzl",
-    "Nerezza",
-    "sanborondon",
-    "confiscated Zyra",
-    "Error_Rule34_Not_found",
-    "Taylor Funk",
-    "aezin",
-    "jcay015",
-    "Gerald Welly",
-    "Erik Lopez",
-    "Mateo Curić",
-    "Tee Gee",
-    "Geolog",
-    "tarek helmi",
-    "Neco28",
-    "Eris3D",
-    "Max Marklund",
-    "David Ortega",
-    "Pronredn",
-    "a _",
-    "Jeff",
-    "lh qwe",
-    "James Coleman",
-    "conner",
-    "Kevin Christopher",
-    "Chad Idk",
-    "dd",
-    "Princess Bright Eyes",
-    "Dušan Ryban",
-    "Felipe dos Santos",
-    "Sam",
-    "sjon kreutz",
-    "Douglas Gaspar",
-    "Metryman55",
-    "AlexDuKaNa",
-    "George",
-    "dw",
-    "地獄の禄",
    "ae",
    "Tr4shP4nda",
-    "Gamalonia",
-    "WRL_SPR",
    "capn",
    "Joseph",
    "Mirko Katzula",
@@ -283,64 +248,64 @@
    "Piccio08",
    "kumakichi",
    "cppbel",
+    "IamAyam",
+    "jeaness",
+    "Brian M",
+    "Josef Lanzl",
+    "Nerezza",
+    "sanborondon",
+    "confiscated Zyra",
+    "Taylor Funk",
+    "aezin",
+    "Thought2Form",
+    "jcay015",
+    "Gerald Welly",
+    "Kevin Picco",
+    "Erik Lopez",
+    "Mateo Curić",
+    "Tee Gee",
+    "Geolog",
+    "tarek helmi",
+    "Eris3D",
+    "Max Marklund",
+    "m",
+    "Pierce McBride",
+    "Pronredn",
+    "Mikko Hemilä",
+    "Jamie Ogletree",
+    "a _",
+    "lh qwe",
+    "James Coleman",
+    "Martial",
+    "conner",
+    "Ouro Boros",
+    "Chad Idk",
+    "Princess Bright Eyes",
+    "Yuji Kaneko",
+    "Dušan Ryban",
+    "Felipe dos Santos",
+    "Rops Alot",
+    "Sam",
+    "sjon kreutz",
+    "Ace Ventura",
+    "Douglas Gaspar",
+    "Metryman55",
+    "George",
+    "dw",
+    "Gamalonia",
+    "WRL_SPR",
+    "momokai",
    "Moon Knight",
    "몽타주",
    "Kland",
    "Hailshem",
    "kudari",
    "Naomi Hale Danchi",
+    "ken",
    "epicgamer0020690",
    "Joshua Porrata",
-    "SuBu",
-    "Richard",
-    "奚明 刘",
-    "Andrew",
-    "Brian M",
-    "Robert Wegemund",
-    "Littlehuggy",
-    "준희 김",
-    "Brian Buie",
-    "Thought2Form",
-    "Kevin Picco",
-    "Sadlip",
-    "Tomohiro Baba",
-    "m",
-    "Noora",
-    "Pierce McBride",
-    "Joshua Gray",
-    "Mattssn",
-    "Mikko Hemilä",
-    "Jacob McDaniel",
-    "Jamie Ogletree",
-    "Temikus",
-    "Artokun",
-    "Michael Taylor",
-    "Martial",
-    "Michael Anthony Scott",
-    "Emil Andersson",
-    "Ouro Boros",
-    "Atilla Berke Pekduyar",
-    "Steam Steam",
-    "CryptoTraderJK",
-    "Decx _",
-    "Yuji Kaneko",
-    "Davaitamin",
-    "Rops Alot",
-    "tedcor",
-    "Fotek Design",
-    "Ace Ventura",
-    "四糸凜音",
-    "Nihongasuki",
-    "LarsesFPC",
-    "MadSpin",
-    "inbijiburu",
-    "Nick “Loadstone” D",
-    "momokai",
-    "starbugx",
-    "dc7431",
-    "ken",
-    "Crocket",
    "keemun",
+    "SuBu",
    "RedPIXel",
    "Wind",
    "Nexus",
@@ -353,6 +318,51 @@
    "JohnDoe42054",
    "BillyHill",
    "emyth",
+    "gzmzmvp",
+    "Richard",
+    "奚明 刘",
+    "Andrew",
+    "Robert Wegemund",
+    "Littlehuggy",
+    "Gregory Kozhemiak",
+    "준희 김",
+    "Brian Buie",
+    "Sadlip",
+    "Eric Whitney",
+    "Joey Callahan",
+    "Ivan Tadic",
+    "Tomohiro Baba",
+    "Mike Simone",
+    "Noora",
+    "Joshua Gray",
+    "Mattssn",
+    "Morgandel",
+    "Jacob McDaniel",
+    "X",
+    "Sloan Steddy",
+    "Temikus",
+    "Artokun",
+    "Michael Taylor",
+    "Derek Baker",
+    "Michael Anthony Scott",
+    "Emil Andersson",
+    "Atilla Berke Pekduyar",
+    "Steam Steam",
+    "CryptoTraderJK",
+    "Decx _",
+    "Davaitamin",
+    "tedcor",
+    "Fotek Design",
+    "四糸凜音",
+    "Nihongasuki",
+    "LarsesFPC",
+    "MadSpin",
+    "FrxzenSnxw",
+    "inbijiburu",
+    "Nick “Loadstone” D",
+    "starbugx",
+    "dc7431",
+    "Crocket",
    "chriphost",
    "KitKatM",
    "socrasteeze",
@@ -370,59 +380,66 @@
    "Vir",
    "Skyfire83",
    "Adam Rinehart",
-    "gzmzmvp",
-    "Gregory Kozhemiak",
+    "Pitpe11",
+    "TheD1rtyD03",
+    "moonpetal",
+    "g9p0o",
+    "TheHolySheep",
+    "Monte Won",
+    "SpringBootisTrash",
+    "carsten",
+    "ikok",
+    "Wolfe7D1",
    "Draven T",
-    "mrjuan",
-    "Eric Whitney",
-    "Joey Callahan",
+    "elleshar666",
+    "ACTUALLY_the_Real_Willem_Dafoe",
    "Aquatic Coffee",
-    "Ivan Tadic",
-    "Mike Simone",
+    "Kauffy",
    "John J Linehan",
    "ethanfel",
    "Elliot E",
-    "Morgandel",
    "Theerat Jiramate",
    "Focuschannel",
+    "Edward Kennedy",
    "Noah",
-    "X",
-    "Sloan Steddy",
+    "Vane Holzer",
+    "psytrax",
    "hexxish",
-    "Derek Baker",
    "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",
-    "FrxzenSnxw",
    "zenobeus",
    "ryoma",
+    "Whitepinetrader",
    "Stryker",
    "Ginnie",
    "Raku",
    "smart.edge5178",
    "Menard",
-    "Pitpe11",
-    "TheD1rtyD03",
-    "moonpetal",
    "SomeDude",
-    "g9p0o",
    "Pkrsky",
-    "TheHolySheep",
+    "nanana",
    "raf8osz",
-    "Monte Won",
-    "SpringBootisTrash",
-    "carsten",
-    "ikok",
+    "FeralOpticsAI",
+    "Pavlaki",
+    "Doug+Rintoul",
+    "Noor",
+    "Yorunai",
    "quantenmecha",
    "Jason+Nash",
    "DarkRoast",
@@ -436,38 +453,35 @@
    "cocona",
    "ElitaSSJ4",
    "David Schenck",
-    "Wolfe7D1",
    "blikkies",
    "Chris",
    "Time Valentine",
-    "elleshar666",
    "Shock Shockor",
-    "ACTUALLY_the_Real_Willem_Dafoe",
    "Михал Михалыч",
+    "Matt",
    "Goldwaters",
-    "Kauffy",
    "Zude",
+    "Frogmilk",
+    "SPJ",
    "Kyler",
-    "Edward Kennedy",
+    "Bryan Rutkowski",
    "Justin Blaylock",
    "aRtFuL_DodGeR",
    "Nick Kage",
-    "Vane Holzer",
-    "psytrax",
    "Cyrus Fett",
    "Xenon Xue",
-    "notedfakes",
+    "Edward Ten Eyck",
    "Billy Gladky",
-    "Michael Scott",
    "Probis",
    "Solixer",
-    "Wes Sims",
    "ItsGeneralButtNaked",
    "Donor4115",
+    "jinksta187",
    "Distortik",
-    "Filippo Ferrari",
+    "Manu Thetug",
+    "Karlanx",
+    "operationancut",
    "Youguang",
-    "Saya",
    "andrewzpong",
    "BossGame",
    "lrdchs",
@@ -476,9 +490,19 @@
    "AIVORY3D",
    "Kevinj",
    "Mitchell Robson",
-    "Whitepinetrader",
    "POPPIN",
-    "nanana",
+    "YassineKhaled",
+    "Y",
+    "MatteKey",
+    "Flob",
+    "ShiroSenpai",
+    "Inkognito",
+    "G",
+    "Tan+Huynh",
+    "Bob+Barker",
+    "D",
+    "Dark_Pest",
+    "Eldithor",
    "Alex",
    "Karru",
    "ChaChanoKo",
@@ -491,38 +515,36 @@
    "g",
    "J",
    "Alan+Cano",
-    "FeralOpticsAI",
-    "Pavlaki",
-    "Doug+Rintoul",
-    "Noor",
-    "Yorunai",
    "BillyBoy84",
    "Buecyb99",
    "Welkor",
    "John Martin",
-    "Ink Temptation",
    "JBsuede",
    "moranqianlong",
    "Kalli Core",
+    "Ronan Delevacq",
    "Christian Schäfer",
    "りん あめ",
-    "Matt",
+    "Dave Abraham",
+    "Joaquin Hierrezuelo",
    "Locrospiel",
-    "Frogmilk",
-    "SPJ",
+    "Sean voets",
+    "Jarrid Lee",
    "Kor",
    "Joseph Hanson",
+    "John Rednoulf",
    "Kyron Mahan",
-    "Bryan Rutkowski",
+    "Boba Smith",
    "TBitz33",
    "Anonym dkjglfleeoeldldldlkf",
    "Ezokewn",
    "SendingRavens",
+    "Sauv",
+    "Steven",
    "JackJohnnyJim",
    "TenaciousD",
    "Dmitry Ryzhov",
    "Khánh Đặng",
-    "Edward Ten Eyck",
    "Michael Docherty",
    "Jimmy Borup",
    "Paul Hartsuyker",
@@ -530,16 +552,12 @@
    "Pete Pain",
    "Jacob Winter",
    "Ryan Presley Ng",
-    "jinksta187",
    "RHopkirk",
    "Andrew Wilkinson",
-    "Manu Thetug",
-    "Karlanx",
    "Lyavph",
    "Maxim",
    "David",
    "Meilo",
-    "operationancut",
    "shinonomeiro",
    "Snille",
    "MaartenAlbers",
@@ -558,6 +576,20 @@
    "Scott",
    "Muratoraccio",
    "D",
+    "Akkas+Haque",
+    "Kachac",
+    "SAVEagleBasement",
+    "Kevin+Isom",
+    "Rune+Osnes",
+    "you+halo9",
+    "cloudghost",
+    "Yongkwan+Lee",
+    "PoorStudent",
+    "lucites",
+    "Alex+Zaw",
+    "Mobius2020",
+    "ExLightSaber",
+    "YaboiRay",
    "nickname",
    "Sildoren",
    "Darv",
@@ -575,61 +607,51 @@
    "Lev+Lanevskiy",
    "low9",
    "Winged",
-    "YassineKhaled",
-    "Y",
-    "MatteKey",
-    "Flob",
-    "ShiroSenpai",
-    "Inkognito",
-    "G",
-    "Tan+Huynh",
-    "D",
-    "Dark_Pest",
    "Jacky+Ho",
    "generic404",
    "abattoirblues",
    "zounik",
    "4IXplr0r3r",
    "hayden",
+    "Obsidian.Studios",
    "ahoystan",
-    "Bob Barker",
+    "Zomba Mann",
    "edk",
    "Tú Nguyễn Lý Hoàng",
    "shira1011",
+    "Neko Desco",
    "Ben D",
    "G",
-    "Ronan Delevacq",
+    "Vinarus",
    "ja s",
    "Leslie Andrew Ridings",
    "Doug Mason",
-    "Jeremy Townsend",
-    "Dave Abraham",
-    "Joaquin Hierrezuelo",
-    "Sean voets",
+    "scoreswazey",
    "Owen Gwosdz",
-    "Jarrid Lee",
    "Poophead27 Blyat",
-    "John Rednoulf",
-    "Spire",
+    "Mythspire",
    "AZ Party Oasis",
-    "Boba Smith",
    "Devil Lude",
    "David Murcko",
+    "TheFusion",
    "MR.Bear",
    "Jack Dole",
    "matt",
    "somethingtosay8",
+    "3zS4QNQ4",
+    "Terminuz",
    "ivistorm",
    "max blo",
-    "Sauv",
-    "Steven",
+    "Ivan Imes",
    "CptNeo",
+    "Jack Lawfield",
+    "Borte",
    "Maso",
    "Ted Cart",
    "Sage Himeros",
    "Eric Ketchum",
    "Kevin Wallace",
-    "David Spearing",
+    "Zeeble",
    "ChicRic",
    "Tigon",
    "BastardSama",
@@ -637,11 +659,13 @@
    "SkibidiRizzler",
    "Tania Nayelli Fernandez",
    "Draconach",
+    "Kalle Björk",
    "Yavizu3d",
    "Yves Poezevara",
    "Teriak47",
    "Just me",
    "Raf Stahelin",
+    "Nacho Ferrando",
    "Вячеслав Маринин",
    "Marcos Tortosa Carmona",
    "Dkommander22",
@@ -688,6 +712,15 @@
    "SelfishMedic",
    "adderleighn",
    "EnragedAntelope",
+    "Somebody",
+    "Jasper",
+    "megameganck",
+    "thomasand01",
+    "Shiba+Sama",
+    "miduzza",
+    "KB",
+    "shw",
+    "Celestial+Kitten",
    "bakeliteboy",
    "TequiTequi",
    "Homero+Banda",
@@ -706,26 +739,12 @@
    "matter",
    "SRCRCOSS",
    "imer",
-    "Akkas+Haque",
-    "Kachac",
-    "tyrant2811",
-    "Kevin",
-    "Rune+Osnes",
    "jcx29",
-    "cloudghost",
-    "Yongkwan+Lee",
-    "PoorStudent",
-    "lucites",
-    "Alex+Zaw",
-    "Mobius2020",
-    "ExLightSaber",
-    "YaboiRay",
    "Drizzly",
    "Nebuleux",
    "Join+Chun",
    "GDS+DEV",
    "4rt+r3d",
-    "you+halo9",
    "Somebody",
    "Somebody",
    "Crescent~San",
@@ -738,34 +757,37 @@
    "Bula",
    "KUJYAKU",
    "Coeur+de+cochon",
-    "Obsidian.Studios",
    "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",
    "Seraphy",
    "雨の心 落",
    "AllTimeNoobie",
+    "swra",
+    "JollRodrigo",
    "jumpd",
    "John C",
    "Rim",
+    "Oliverfish",
+    "yfx507",
    "Room Light",
    "Jairus Knudsen",
    "Xan Dionysus",
@@ -776,30 +798,29 @@
    "Forbidden Atelier",
    "Thomas Sankowski",
    "DrB",
+    "Nimhloth",
    "Adictedtohumping",
    "Snorklebort",
    "vinter",
    "Towelie",
-    "TheFusion",
    "Jean-françois SEMA",
-    "3zS4QNQ4",
-    "Terminuz",
    "Kurt",
+    "Andrew Ly",
    "Matt M.",
-    "Ivan Imes",
    "J M",
+    "Slacks",
    "Bouya shaka",
+    "john Greene",
    "Faburizu",
-    "Jack Lawfield",
    "jimyjomson",
-    "Borte",
    "JaeHyun Jang",
    "Homero Banda",
    "Chase Kwon",
+    "Bob Ling",
    "yyuvuvu",
    "Inyoshu",
    "Chad Barnes",
-    "Person Y",
+    "Adam Gardner",
    "Nomki",
    "inusanorthcape",
    "James Ming",
@@ -821,5 +842,5 @@
    "Somebody",
    "CK"
  ],
-  "totalCount": 818
+  "totalCount": 839
 }
@@ -105,6 +105,7 @@
            "removeFromFavorites": "Remove from favorites",
            "viewOnCivitai": "View on Civitai",
            "notAvailableFromCivitai": "Not available from Civitai",
+            "viewOnHuggingFace": "View on Hugging Face",
            "sendToWorkflow": "Send to ComfyUI (Click: Append, Shift+Click: Replace)",
            "copyLoRASyntax": "Copy LoRA Syntax",
            "checkpointNameCopied": "Checkpoint name copied",
@@ -145,6 +146,10 @@
        },
        "usage": {
            "timesUsed": "Times used"
+        },
+        "footer": {
+            "versionCount": "{count} versions",
+            "viewAllVersions": "View all local versions"
        }
    },
    "globalContextMenu": {
@@ -183,6 +188,9 @@
        },
        "manageExcludedModels": {
            "label": "Manage Excluded Models"
+        },
+        "groupByModel": {
+            "label": "Group by Model"
        }
    },
    "header": {
@@ -195,13 +203,7 @@
            "statistics": "Stats"
        },
        "search": {
-            "placeholder": "Search...",
-            "placeholders": {
-                "loras": "Search LoRAs...",
-                "recipes": "Search recipes...",
-                "checkpoints": "Search checkpoints...",
-                "embeddings": "Search embeddings..."
-            },
+            "placeholder": "Search",
            "options": "Search Options",
            "searchIn": "Search In:",
            "notAvailable": "Search not available on statistics page",
@@ -251,7 +253,18 @@
            "toggle": "Toggle theme",
            "switchToLight": "Switch to light theme",
            "switchToDark": "Switch to dark theme",
-            "switchToAuto": "Switch to auto theme"
+            "switchToAuto": "Switch to auto theme",
+            "presets": "Theme Presets",
+            "default": "Default",
+            "nord": "Nord",
+            "midnight": "Midnight",
+            "monokai": "Monokai",
+            "dracula": "Dracula",
+            "solarized": "Solarized",
+            "mode": "Mode",
+            "light": "Light",
+            "dark": "Dark",
+            "auto": "Auto"
        },
        "actions": {
            "checkUpdates": "Check Updates",
@@ -263,6 +276,9 @@
        "civitaiApiKey": "Civitai API Key",
        "civitaiApiKeyPlaceholder": "Enter your Civitai API key",
        "civitaiApiKeyHelp": "Used for authentication when downloading models from Civitai",
+        "civitaiApiKeyConfigured": "Configured",
+        "civitaiApiKeyNotConfigured": "Not configured",
+        "civitaiApiKeySet": "Set up",
        "civitaiHost": {
            "label": "Civitai host",
            "help": "Choose which Civitai site opens when using View on Civitai links.",
@@ -303,6 +319,7 @@
            "downloads": "Downloads",
            "videoSettings": "Video Settings",
            "layoutSettings": "Layout Settings",
+            "licenseIcons": "License Icons",
            "misc": "Miscellaneous",
            "backup": "Backups",
            "folderSettings": "Default Roots",
@@ -310,7 +327,7 @@
            "extraFolderPaths": "Extra Folder Paths",
            "downloadPathTemplates": "Download Path Templates",
            "priorityTags": "Priority Tags",
-            "updateFlags": "Update Flags",
+            "versionScope": "Version Scope",
            "exampleImages": "Example Images",
            "autoOrganize": "Auto-organize",
            "metadata": "Metadata",
@@ -415,6 +432,8 @@
            "help": "When enabled, versions downloaded before will be skipped."
        },
        "layoutSettings": {
+            "groupByModel": "Group by Model",
+            "groupByModelHelp": "When enabled, only the latest version of each Civitai model is shown as a single card. Older versions are hidden.",
            "displayDensity": "Display Density",
            "displayDensityOptions": {
                "default": "Default",
@@ -571,18 +590,22 @@
            "download": "Download",
            "restartRequired": "Requires restart"
        },
-        "updateFlagStrategy": {
-            "label": "Update Flag Strategy",
-            "help": "Decide whether update badges should only appear when a new release shares the same base model as your local files or whenever any newer version exists for that model.",
+        "versionGrouping": {
+            "label": "Version Grouping",
+            "help": "Decide how versions are grouped for display: by base model or all together. Also controls update badge logic and the VLM version list filtering.",
            "options": {
-                "sameBase": "Match updates by base model",
-                "any": "Flag any available update"
+                "sameBase": "Group by base model (same_base)",
+                "any": "Show all versions (any)"
            }
        },
        "hideEarlyAccessUpdates": {
            "label": "Hide Early Access Updates",
            "help": "When enabled, models with only early access updates will not show 'Update available' badge"
        },
+        "licenseIcons": {
+            "useNewStyle": "Use updated license icons",
+            "useNewStyleHelp": "Display license permissions with colored indicators (new style) or restriction-only icons (classic style). Mirroring the current CivitAI design."
+        },
        "misc": {
            "includeTriggerWords": "Include Trigger Words in LoRA Syntax",
            "includeTriggerWordsHelp": "Include trained trigger words when copying LoRA syntax to clipboard",
@@ -651,7 +674,11 @@
                "sizeAsc": "Smallest",
                "usage": "Use Count",
                "usageDesc": "Most",
-                "usageAsc": "Least"
+                "usageAsc": "Least",
+                "versionsCount": "Local Versions",
+                "versionsCountDesc": "Most versions first",
+                "versionsCountAsc": "Fewest versions first",
+                "versionIdDesc": "Newest version first"
            },
            "refresh": {
                "title": "Refresh model list",
@@ -997,6 +1024,18 @@
            "storage": "Storage",
            "insights": "Insights"
        },
+        "metrics": {
+            "totalModels": "Total Models",
+            "totalStorage": "Total Storage",
+            "totalGenerations": "Total Generations",
+            "usageRate": "Usage Rate",
+            "loras": "LoRAs",
+            "checkpoints": "Checkpoints",
+            "embeddings": "Embeddings",
+            "uniqueTags": "Unique Tags",
+            "unusedModels": "Unused Models",
+            "avgUsesPerModel": "Avg. Uses/Model"
+        },
        "usage": {
            "mostUsedLoras": "Most Used LoRAs",
            "mostUsedCheckpoints": "Most Used Checkpoints",
@@ -1014,13 +1053,77 @@
        },
        "insights": {
            "smartInsights": "Smart Insights",
-            "recommendations": "Recommendations"
+            "recommendations": "Recommendations",
+            "noInsights": "No insights available",
+            "unusedLoras": {
+                "high": {
+                    "title": "High Number of Unused LoRAs",
+                    "description": "{percent}% of your LoRAs ({count}/{total}) have never been used.",
+                    "suggestion": "Consider organizing or archiving unused models to free up storage space."
+                }
+            },
+            "unusedCheckpoints": {
+                "detected": {
+                    "title": "Unused Checkpoints Detected",
+                    "description": "{percent}% of your checkpoints ({count}/{total}) have never been used.",
+                    "suggestion": "Review and consider removing checkpoints you no longer need."
+                }
+            },
+            "unusedEmbeddings": {
+                "high": {
+                    "title": "High Number of Unused Embeddings",
+                    "description": "{percent}% of your embeddings ({count}/{total}) have never been used.",
+                    "suggestion": "Consider organizing or archiving unused embeddings to optimize your collection."
+                }
+            },
+            "collection": {
+                "large": {
+                    "title": "Large Collection Detected",
+                    "description": "Your model collection is using {size} of storage.",
+                    "suggestion": "Consider using external storage or cloud solutions for better organization."
+                }
+            },
+            "activity": {
+                "active": {
+                    "title": "Active User",
+                    "description": "You've completed {count} generations so far!",
+                    "suggestion": "Keep exploring and creating amazing content with your models."
+                }
+            }
        },
        "charts": {
            "collectionOverview": "Collection Overview",
            "baseModelDistribution": "Base Model Distribution",
            "usageTrends": "Usage Trends (Last 30 Days)",
-            "usageDistribution": "Usage Distribution"
+            "usageDistribution": "Usage Distribution",
+            "date": "Date",
+            "usageCount": "Usage Count",
+            "fileSizeBytes": "File Size (bytes)",
+            "models": "Models",
+            "loraUsage": "LoRA Usage",
+            "checkpointUsage": "Checkpoint Usage",
+            "embeddingUsage": "Embedding Usage"
+        },
+        "modelTypes": {
+            "lora": "LoRA",
+            "locon": "LyCORIS",
+            "dora": "DoRA",
+            "checkpoint": "Checkpoint",
+            "diffusion_model": "Diffusion Model",
+            "embedding": "Embeddings"
+        },
+        "placeholders": {
+            "loading": "Loading...",
+            "noModels": "No models found",
+            "errorLoading": "Error loading data",
+            "noStorageData": "No storage data available",
+            "rootFolder": "Root",
+            "chartLibraryMissing": "Chart requires Chart.js library"
+        },
+        "tooltips": {
+            "tagCount": "{tag}: {count} models",
+            "chartUsage": "{name}: {size}, {count} uses",
+            "chartPercentage": "{label}: {value} ({pct}%)"
        }
    },
    "modals": {
@@ -1032,7 +1135,10 @@
            "titleWithType": "Download {type} from URL",
            "civitaiUrl": "Civitai URL(s):",
            "placeholder": "https://civitai.com/models/...",
-            "urlHint": "Enter one CivitAI or CivArchive URL per line. Supports multiple URLs for batch download.",
+            "urlHint": "Enter one CivitAI, CivArchive, or Hugging Face URL per line. Supports multiple URLs for batch download.",
+            "selectHfFiles": "Select file(s) to download from this repository:",
+            "selectAll": "Select All",
+            "fetchingRepoFiles": "Fetching repository files...",
            "locationPreview": "Download Location Preview",
            "useDefaultPath": "Use Default Path",
            "useDefaultPathTooltip": "When enabled, files are automatically organized using configured path templates",
@@ -1061,7 +1167,9 @@
            },
            "errors": {
                "invalidUrl": "Invalid Civitai URL format",
-                "noVersions": "No versions available for this model"
+                "noVersions": "No versions available for this model",
+                "mixedSources": "Cannot mix CivitAI and Hugging Face URLs in the same batch.",
+                "noModelFiles": "No model files found in this repository."
            },
            "status": {
                "preparing": "Preparing download...",
@@ -1212,6 +1320,8 @@
                "editVersionName": "Edit version name",
                "viewOnCivitai": "View on Civitai",
                "viewOnCivitaiText": "View on Civitai",
+                "viewOnHuggingFace": "View on Hugging Face",
+                "viewOnHuggingFaceText": "View on Hugging Face",
                "viewCreatorProfile": "View Creator Profile",
                "openFileLocation": "Open File Location",
                "sendToWorkflow": "Send to ComfyUI",
@@ -1368,7 +1478,7 @@
                    "resumeModelUpdates": "Resume updates for this model",
                    "ignoreModelUpdates": "Ignore updates for this model",
                    "viewLocalVersions": "View all local versions",
-                    "viewLocalTooltip": "Coming soon"
+                    "viewLocalTooltip": "Show all local versions of this model on the main page"
                },
                "filters": {
                    "label": "Base filter",
@@ -1513,12 +1623,15 @@
            "modelUpdated": "Model updated in workflow",
            "modelFailed": "Failed to update model node",
            "embeddingAdded": "Embedding added to workflow",
-            "embeddingFailed": "Failed to add embedding"
+            "embeddingFailed": "Failed to add embedding",
+            "promptSent": "Prompt sent to workflow",
+            "promptFailed": "Failed to send prompt"
        },
        "nodeSelector": {
            "recipe": "Recipe",
            "lora": "LoRA",
            "embedding": "Embedding",
+            "prompt": "Prompt",
            "replace": "Replace",
            "append": "Append",
            "selectTargetNode": "Select target node",
@@ -1705,6 +1818,7 @@
            "enterLoraName": "Please enter a LoRA name or syntax",
            "reconnectedSuccessfully": "LoRA reconnected successfully",
            "reconnectFailed": "Error reconnecting LoRA: {message}",
+            "noPromptToSend": "No prompt to send",
            "cannotSend": "Cannot send recipe: Missing recipe ID",
            "sendFailed": "Failed to send recipe to workflow",
            "sendError": "Error sending recipe to workflow",
@@ -901,6 +901,55 @@ class LoraLoaderManagerExtractor(NodeMetadataExtractor):
                "node_id": node_id
            }

+class LoraTextLoaderManagerExtractor(NodeMetadataExtractor):
+    """Extract LoRA metadata from LoraTextLoaderLM (LoRA Text Loader).
+
+    The node accepts a `lora_syntax` STRING containing <lora:name:strength> tags
+    (same format as the ComfyUI prompt), plus an optional `lora_stack`.
+    This extractor parses the syntax string using the same regex as the node.
+    """
+    @staticmethod
+    def extract(node_id, inputs, outputs, metadata):
+        if not inputs:
+            return
+
+        active_loras = []
+
+        # Process lora_stack if available (optional input)
+        if "lora_stack" in inputs:
+            lora_stack = inputs.get("lora_stack", [])
+            for item in lora_stack:
+                # lora_stack entries are (path, model_strength, clip_strength) tuples
+                if isinstance(item, (list, tuple)) and len(item) >= 2:
+                    lora_path = item[0]
+                    model_strength = item[1]
+                    lora_name = os.path.splitext(os.path.basename(lora_path))[0]
+                    active_loras.append({
+                        "name": lora_name,
+                        "strength": round(float(model_strength), 2)
+                    })
+
+        # Process lora_syntax string input
+        if "lora_syntax" in inputs:
+            lora_syntax = inputs.get("lora_syntax", "")
+            if lora_syntax and isinstance(lora_syntax, str):
+                pattern = r"<lora:([^:>]+):([^:>]+)(?::([^:>]+))?>"
+                matches = re.findall(pattern, lora_syntax, re.IGNORECASE)
+                for match in matches:
+                    lora_name = match[0]
+                    model_strength = float(match[1])
+                    active_loras.append({
+                        "name": lora_name,
+                        "strength": round(model_strength, 2)
+                    })
+
+        if active_loras:
+            metadata[LORAS][node_id] = {
+                "lora_list": active_loras,
+                "node_id": node_id
+            }
+
+
 class FluxGuidanceExtractor(NodeMetadataExtractor):
    @staticmethod
    def extract(node_id, inputs, outputs, metadata):
@@ -1146,6 +1195,7 @@ NODE_EXTRACTORS = {
    "UNETLoaderLM": UNETLoaderExtractor,  # LoRA Manager
    "LoraLoader": LoraLoaderExtractor,
    "LoraLoaderLM": LoraLoaderManagerExtractor,
+    "LoraTextLoaderLM": LoraTextLoaderManagerExtractor,
    "RgthreePowerLoraLoader": RgthreePowerLoraLoaderExtractor,
    "TensorRTLoader": TensorRTLoaderExtractor,
    # Conditioning
@@ -608,7 +608,7 @@ class SaveImageLM:
            img = Image.fromarray(np.clip(img, 0, 255).astype(np.uint8))

            # Generate filename with counter if needed
-            base_filename = filename
+            base_filename = filename.replace("%batch_num%", str(i))
            if add_counter_to_filename:
                # Use counter + i to ensure unique filenames for all images in batch
                current_counter = counter + i
@@ -123,24 +123,39 @@ class AutomaticMetadataParser(RecipeMetadataParser):
                        if model_hash_from_hashes:
                            metadata["model_hash"] = model_hash_from_hashes
                    
-                    # Extract Lora hashes in alternative format
+                    # Extract Lora hashes in alternative format.
+                    # Run unconditionally (not just as fallback) so that
+                    # non-empty hashes from Lora hashes fill in the gaps left
+                    # by empty values in the Hashes JSON dict.  Some WebUI
+                    # builds write real hash values only to Lora hashes and
+                    # leave the Hashes JSON values empty.
                    lora_hashes_match = re.search(self.LORA_HASHES_REGEX, params_section)
-                    if not hashes_match and lora_hashes_match:
+                    if lora_hashes_match:
                        try:
                            lora_hashes_str = lora_hashes_match.group(1)
                            lora_hash_entries = lora_hashes_str.split(', ')
-                            
-                            # Initialize hashes dict if it doesn't exist
-                            if "hashes" not in metadata:
-                                metadata["hashes"] = {}
-                                
+
                            # Parse each lora hash entry (format: "name: hash")
                            for entry in lora_hash_entries:
                                if ': ' in entry:
                                    lora_name, lora_hash = entry.split(': ', 1)
-                                    # Add as lora type in the same format as regular hashes
-                                    metadata["hashes"][f"lora:{lora_name}"] = lora_hash.strip()
-                            
+                                    lora_hash = lora_hash.strip()
+                                    if not lora_hash:
+                                        # Skip entries without a hash value
+                                        continue
+                                    # Initialize hashes dict if it doesn't exist
+                                    if "hashes" not in metadata:
+                                        metadata["hashes"] = {}
+                                    # Add as lora type in the same format as
+                                    # regular hashes.  Only override an
+                                    # existing entry if its value is empty
+                                    # (Lora hashes is the more reliable
+                                    # source when Hashes JSON has blanks).
+                                    key = f"lora:{lora_name}"
+                                    existing = metadata["hashes"].get(key, "")
+                                    if not existing:
+                                        metadata["hashes"][key] = lora_hash
+
                            # Remove lora hashes from params section
                            params_section = params_section.replace(lora_hashes_match.group(0), '')
                        except Exception as e:
@@ -362,6 +377,12 @@ class AutomaticMetadataParser(RecipeMetadataParser):
                        # Only process lora or hypernet types
                        if not hash_key.startswith(("lora:", "hypernet:")):
                            continue
+                        
+                        # Skip entries without a hash value — they can't be
+                        # resolved via CivitAI and would only produce a
+                        # useless "Deleted" entry in the recipe.
+                        if not lora_hash:
+                            continue
                            
                        lora_type, lora_name = hash_key.split(':', 1)
                        
@@ -387,11 +408,7 @@ class AutomaticMetadataParser(RecipeMetadataParser):
                        # Try to get info from Civitai
                        if metadata_provider:
                            try:
-                                if lora_hash:
-                                    # If we have hash, use it for lookup
-                                    civitai_info = await metadata_provider.get_model_by_hash(lora_hash)
-                                else:
-                                    civitai_info = None
+                                civitai_info = await metadata_provider.get_model_by_hash(lora_hash)
                                
                                populated_entry = await self.populate_lora_from_civitai(
                                    lora_entry, 
@@ -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}"
@@ -0,0 +1,409 @@
+"""Handlers for Hugging Face model listing and download.
+
+Minimal MVP implementation — uses direct HTTP to the HF API for file
+listing and the project's existing aiohttp-based Downloader for
+downloading.  No huggingface_hub dependency required.
+"""
+
+from __future__ import annotations
+
+import json
+import logging
+import os
+import re
+from typing import Any
+
+import aiohttp
+from aiohttp import web
+
+from ...config import config
+from ...services.downloader import (
+    DownloadProgress,
+    get_downloader,
+)
+from ...services.aria2_downloader import Aria2Downloader
+from ...services.settings_manager import get_settings_manager
+from ...services.service_registry import ServiceRegistry
+from ...services.websocket_manager import ws_manager
+from ...utils.constants import MODEL_FILE_EXTENSIONS
+from ...utils.metadata_manager import MetadataManager
+from ...utils.models import LoraMetadata, CheckpointMetadata, EmbeddingMetadata
+
+logger = logging.getLogger(__name__)
+
+_DEFAULT_MODEL_CLASS = LoraMetadata
+_DEFAULT_SCANNER_GETTER = "get_lora_scanner"
+
+# Shared aiohttp session for HF API calls (created on first use)
+_hf_api_session: aiohttp.ClientSession | None = None
+
+
+async def _get_hf_api_session() -> aiohttp.ClientSession:
+    """Get or create the shared aiohttp session for HF API calls."""
+    global _hf_api_session  # needed because we reassign the module-level name
+    if _hf_api_session is None or _hf_api_session.closed:
+        _hf_api_session = aiohttp.ClientSession(
+            headers={"User-Agent": "ComfyUI-LoRA-Manager/1.0"},
+            timeout=aiohttp.ClientTimeout(total=30),
+        )
+    return _hf_api_session
+
+
+def _infer_model_type(model_root: str) -> tuple[Any, str]:
+    """Determine model class and scanner by matching ``model_root`` against the
+    configured root paths for each model type (from ``Config``).
+
+    The ``model_root`` value comes from the frontend's model-root dropdown,
+    which is populated from the current page's scanner roots.  By checking
+    which scanner's root list it belongs to, we avoid fragile heuristics
+    like substring-matching path names.
+    """
+    norm = os.path.normpath(model_root).replace(os.sep, "/")
+
+    # LoRA roots
+    for p in (config.loras_roots or []) + (config.extra_loras_roots or []):
+        if os.path.normpath(p).replace(os.sep, "/") == norm:
+            return LoraMetadata, "get_lora_scanner"
+
+    # Checkpoint / UNet roots
+    for p in (
+        (config.checkpoints_roots or [])
+        + (config.extra_checkpoints_roots or [])
+        + (config.unet_roots or [])
+        + (config.extra_unet_roots or [])
+    ):
+        if os.path.normpath(p).replace(os.sep, "/") == norm:
+            return CheckpointMetadata, "get_checkpoint_scanner"
+
+    # Embedding roots
+    for p in (config.embeddings_roots or []) + (config.extra_embeddings_roots or []):
+        if os.path.normpath(p).replace(os.sep, "/") == norm:
+            return EmbeddingMetadata, "get_embedding_scanner"
+
+    # Fallback — should not happen in normal use
+    logger.warning(
+        "Could not determine model type for root '%s'; defaulting to LoRA",
+        model_root,
+    )
+    return _DEFAULT_MODEL_CLASS, _DEFAULT_SCANNER_GETTER
+
+
+async def _save_hf_metadata(dest_path: str, repo: str, model_root: str) -> None:
+    """Create a proper .metadata.json and add the model to the scanner cache.
+
+    Uses ``MetadataManager.create_default_metadata()`` which computes the
+    SHA256 hash, extracts safetensors header metadata (base_model), and
+    produces a fully-populated ``LoraMetadata`` (or ``CheckpointMetadata`` /
+    ``EmbeddingMetadata``) object.  We then overlay HF-specific fields and
+    register the model in the in-memory scanner cache so it appears
+    immediately without a full filesystem walk.
+    """
+    try:
+        hf_url = f"https://huggingface.co/{repo}"
+        model_class, scanner_getter_name = _infer_model_type(model_root)
+
+        # 1. Create proper metadata (computes SHA256, reads safetensors headers)
+        metadata = await MetadataManager.create_default_metadata(
+            dest_path, model_class=model_class
+        )
+        if metadata is None:
+            logger.warning("create_default_metadata returned None for %s", dest_path)
+            return
+
+        # 2. Overlay HF-specific fields
+        metadata._unknown_fields["hf_url"] = hf_url
+        metadata.from_civitai = False  # HF models are not from CivitAI
+
+        # 3. Save metadata atomically
+        await MetadataManager.save_metadata(dest_path, metadata)
+        logger.info("Saved HF metadata (with hf_url) for %s", dest_path)
+
+        # 4. Determine relative folder path for cache
+        #    model_root is an absolute path; dest_path is under it
+        folder = ""
+        if os.path.isabs(model_root) and dest_path.startswith(model_root):
+            rel = os.path.relpath(os.path.dirname(dest_path), model_root)
+            folder = rel.replace(os.sep, "/") if rel != "." else ""
+
+        # 5. Add to scanner cache (same as CivitAI's _execute_download does)
+        scanner_getter = getattr(ServiceRegistry, scanner_getter_name, None)
+        if scanner_getter is not None:
+            scanner = await scanner_getter()
+            if scanner is not None:
+                metadata_dict = metadata.to_dict()
+                metadata_dict["hf_url"] = hf_url
+                await scanner.add_model_to_cache(metadata_dict, folder)
+                logger.info("Added %s to scanner cache (folder=%s)", dest_path, folder)
+
+    except Exception as exc:
+        logger.warning("Failed to save HF metadata for %s: %s", dest_path, exc)
+
+
+class HfHandler:
+    """Handle Hugging Face model browsing and download."""
+
+    async def get_hf_repo_files(self, request: web.Request) -> web.Response:
+        """List model-weight files from a HF repo with real file sizes.
+
+        Uses the HF tree API endpoint which returns accurate file sizes
+        (including LFS-tracked files), unlike the model info endpoint.
+        """
+        repo = request.query.get("repo", "").strip()
+        if not repo or "/" not in repo:
+            return web.json_response(
+                {"error": "Missing or invalid 'repo' parameter (expected user/repo)"},
+                status=400,
+            )
+
+        url = f"https://huggingface.co/api/models/{repo}/tree/main"
+
+        try:
+            session = await _get_hf_api_session()
+            async with session.get(url) as resp:
+                if resp.status == 404:
+                    return web.json_response(
+                        {"error": f"Repo '{repo}' not found"}, status=404
+                    )
+                if resp.status != 200:
+                    text = await resp.text()
+                    return web.json_response(
+                        {"error": f"HF API error {resp.status}: {text[:200]}"},
+                        status=resp.status,
+                    )
+                tree: list[dict[str, Any]] = await resp.json()
+        except Exception as exc:
+            logger.error("Failed to fetch HF repo files: %s", exc)
+            return web.json_response({"error": str(exc)}, status=502)
+
+        files: list[dict[str, Any]] = []
+        for entry in tree:
+            path: str = entry.get("path", "")
+            ext = os.path.splitext(path)[1].lower()
+            if ext not in MODEL_FILE_EXTENSIONS:
+                continue
+            size = entry.get("size", 0) or 0
+            if size == 0 and "lfs" in entry:
+                size = entry["lfs"].get("size", 0) or 0
+            files.append({
+                "filename": path,
+                "size": size,
+            })
+
+        files.sort(key=lambda f: f["size"], reverse=True)
+        return web.json_response(files)
+
+    async def download_hf_model(self, request: web.Request) -> web.Response:
+        """Download a single file from Hugging Face into the model directory.
+
+        POST JSON body::
+
+            {
+              "repo": "dx8152/Flux2-Klein-9B-Consistency",
+              "filename": "Flux2-Klein-9B-consistency-V2.safetensors",
+              "revision": "main",
+              "model_root": "loras",
+              "relative_path": "",
+              "use_default_paths": false,
+              "download_id": "optional-batch-id"
+            }
+
+        If ``download_id`` is provided, real-time progress (bytes, speed,
+        percentage) is broadcast via the WebSocket progress system, matching
+        the CivitAI download experience.
+
+        Respects the ``download_backend`` setting (``aria2`` or ``default``).
+        """
+        try:
+            payload: dict[str, Any] = await request.json()
+        except json.JSONDecodeError:
+            return web.json_response({"error": "Invalid JSON"}, status=400)
+
+        repo = (payload.get("repo") or "").strip()
+        filename = (payload.get("filename") or "").strip()
+        revision = (payload.get("revision") or "main").strip()
+        model_root = (payload.get("model_root") or "").strip()
+        relative_path = (payload.get("relative_path") or "").strip()
+        use_default_paths = bool(payload.get("use_default_paths", False))
+        download_id: str | None = payload.get("download_id")
+
+        logger.info(
+            "download_hf_model: repo=%s file=%s root=%s download_id=%s",
+            repo, filename, model_root, download_id,
+        )
+
+        if not repo or not filename:
+            return web.json_response(
+                {"error": "Missing required fields: 'repo' and 'filename'"}, status=400
+            )
+
+        # Validate repo format — must be user/repo_name
+        if repo.count("/") != 1 or not re.match(r"^[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+$", repo):
+            return web.json_response({"error": f"Invalid repo format: {repo}"}, status=400)
+        author, repo_name = repo.split("/", 1)
+        if ".." in (author, repo_name) or "." in (author, repo_name):
+            return web.json_response({"error": f"Invalid repo format: {repo}"}, status=400)
+
+        # Validate filename — must not contain path separators or ..
+        if "/" in filename or "\\" in filename or ".." in filename:
+            return web.json_response({"error": "Invalid filename"}, status=400)
+
+        # Validate relative_path — must not be absolute or escape base directory
+        if relative_path:
+            if os.path.isabs(relative_path):
+                return web.json_response({"error": "relative_path must not be absolute"}, status=400)
+            if ".." in relative_path.split("/") or "\\" in relative_path:
+                return web.json_response({"error": "Invalid relative_path"}, status=400)
+
+        # Validate model_root — must not contain path traversal
+        if not os.path.isabs(model_root):
+            # For relative model_root, check it doesn't escape
+            resolved_model_root = os.path.realpath(
+                os.path.join(os.getcwd(), "models", model_root)
+            )
+        else:
+            resolved_model_root = os.path.realpath(model_root)
+
+        # Verify model_root is within a configured scanner root
+        allowed_roots = set()
+        for root_list in (
+            config.loras_roots or [],
+            config.extra_loras_roots or [],
+            config.checkpoints_roots or [],
+            config.extra_checkpoints_roots or [],
+            config.unet_roots or [],
+            config.extra_unet_roots or [],
+            config.embeddings_roots or [],
+            config.extra_embeddings_roots or [],
+        ):
+            for r in root_list:
+                allowed_roots.add(os.path.realpath(r))
+
+        if not any(resolved_model_root == root or resolved_model_root.startswith(root + os.sep) for root in allowed_roots):
+            logger.warning("Invalid model_root rejected: %s", model_root)
+            return web.json_response({"error": f"Invalid model_root: {model_root}"}, status=400)
+
+        base_dir = resolved_model_root
+
+        if use_default_paths:
+            target_dir = os.path.join(base_dir, "huggingface", author, repo_name)
+        elif relative_path:
+            target_dir = os.path.join(base_dir, relative_path)
+        else:
+            target_dir = base_dir
+
+        os.makedirs(target_dir, exist_ok=True)
+        dest_path = os.path.join(target_dir, filename)
+
+        # Resolve symlinks and check for path traversal escape
+        real_dest = os.path.realpath(dest_path)
+        real_base = os.path.realpath(target_dir)
+        if not real_dest.startswith(real_base + os.sep):
+            logger.warning("Path traversal blocked: %s -> %s", dest_path, real_dest)
+            return web.json_response({"error": "Path traversal detected"}, status=400)
+
+        # Check if already exists (simple skip)
+        if os.path.exists(dest_path) and os.path.getsize(dest_path) > 0:
+            logger.info("download_hf_model: file already exists, skipping — %s", dest_path)
+            return web.json_response({
+                "success": True,
+                "message": f"File already exists: {dest_path}",
+                "path": dest_path,
+            })
+
+        # Build HF resolve URL
+        resolve_url = (
+            f"https://huggingface.co/{repo}/resolve/{revision}/{filename}"
+        )
+
+        # Set up progress callback if download_id is provided
+        progress_callback = None
+        if download_id:
+
+            async def _progress_callback(
+                progress: float | DownloadProgress,
+                snapshot: DownloadProgress | None = None,
+            ) -> None:
+                percent = 0.0
+                metrics = snapshot if isinstance(snapshot, DownloadProgress) else None
+
+                if isinstance(progress, DownloadProgress):
+                    percent = progress.percent_complete
+                    metrics = progress
+                elif isinstance(snapshot, DownloadProgress):
+                    percent = snapshot.percent_complete
+                else:
+                    percent = float(progress)
+
+                broadcast: dict[str, Any] = {
+                    "status": "progress",
+                    "progress": round(percent),
+                }
+                if metrics:
+                    broadcast["bytes_downloaded"] = metrics.bytes_downloaded
+                    broadcast["total_bytes"] = metrics.total_bytes
+                    broadcast["bytes_per_second"] = metrics.bytes_per_second
+
+                await ws_manager.broadcast_download_progress(download_id, broadcast)
+
+            progress_callback = _progress_callback
+
+        # Respect download backend setting (aria2 vs default)
+        download_backend = (
+            get_settings_manager().get("download_backend", "default")
+        )
+
+        if download_backend == "aria2":
+            aria2 = await Aria2Downloader.get_instance()
+            aid = download_id or f"hf_{repo}_{filename}"
+            try:
+                hf_success, hf_result = await aria2.download_file(
+                    url=resolve_url,
+                    save_path=dest_path,
+                    download_id=aid,
+                    progress_callback=progress_callback,
+                )
+                if hf_success:
+                    await _save_hf_metadata(dest_path, repo, model_root)
+                    return web.json_response({
+                        "success": True,
+                        "message": f"Downloaded to {dest_path}",
+                        "path": dest_path,
+                    })
+                else:
+                    return web.json_response(
+                        {"success": False, "error": hf_result or "aria2 download failed"},
+                        status=500,
+                    )
+            except Exception as exc:
+                logger.error("HF download (aria2) failed: %s", exc)
+                return web.json_response(
+                    {"success": False, "error": str(exc)}, status=500
+                )
+
+        # Default: use built-in aiohttp Downloader
+        downloader = await get_downloader()
+        try:
+            success, result = await downloader.download_file(
+                url=resolve_url,
+                save_path=dest_path,
+                use_auth=False,
+                allow_resume=True,
+                progress_callback=progress_callback,
+            )
+            if success:
+                await _save_hf_metadata(dest_path, repo, model_root)
+                return web.json_response({
+                    "success": True,
+                    "message": f"Downloaded to {result}",
+                    "path": result,
+                })
+            else:
+                return web.json_response(
+                    {"success": False, "error": result or "Download failed"},
+                    status=500,
+                )
+        except Exception as exc:
+            logger.error("HF download failed: %s", exc)
+            return web.json_response(
+                {"success": False, "error": str(exc)}, status=500
+            )
@@ -48,8 +48,12 @@ from ...utils.constants import (
    SUPPORTED_MEDIA_EXTENSIONS,
    VALID_LORA_TYPES,
 )
+from .hf_handlers import HfHandler
 from ...utils.civitai_utils import rewrite_preview_url
-from ...utils.example_images_paths import is_valid_example_images_root
+from ...utils.example_images_paths import (
+    find_non_compliant_items_in_example_images_root,
+    is_valid_example_images_root,
+)
 from ...utils.lora_metadata import extract_trained_words
 from ...utils.session_logging import get_standalone_session_log_snapshot
 from ...utils.usage_stats import UsageStats
@@ -411,9 +415,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
        ...

@@ -468,89 +473,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"),
-                }
-            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:
@@ -1328,6 +1398,9 @@ class SettingsHandler:
            "folder_paths",
            "libraries",
            "active_library",
+            # Sensitive — never expose the actual value to the frontend;
+            # frontend receives a boolean instead (civitai_api_key_set).
+            "civitai_api_key",
        }
    )

@@ -1382,6 +1455,9 @@ class SettingsHandler:
                    value = self._settings.get(key)
                    if value is not None:
                        response_data[key] = value
+            # Sensitive fields: only expose a boolean indicating whether set
+            raw_key = self._settings.get("civitai_api_key")
+            response_data["civitai_api_key_set"] = bool(raw_key)
            settings_file = getattr(self._settings, "settings_file", None)
            if settings_file:
                response_data["settings_file"] = settings_file
@@ -1492,6 +1568,16 @@ class SettingsHandler:
        if not os.path.isdir(folder_path):
            return "Please set a dedicated folder for example images."
        if not self._is_dedicated_example_images_folder(folder_path):
+            offending = find_non_compliant_items_in_example_images_root(folder_path)
+            if offending:
+                items_str = ", ".join(repr(item) for item in offending[:5])
+                if len(offending) > 5:
+                    items_str += f" … and {len(offending) - 5} more"
+                return (
+                    f"The folder contains items that are not valid example image "
+                    f"folders: {items_str}. Please use a dedicated, empty folder "
+                    f"for example images to prevent accidental data loss."
+                )
            return "Please set a dedicated folder for example images."
        return None

@@ -2975,10 +3061,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(
@@ -3022,7 +3119,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,
@@ -3046,9 +3143,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(
@@ -3060,19 +3163,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)
@@ -3085,13 +3200,17 @@ class NodeRegistryHandler:
        try:
            data = await request.json()
            widget_name = data.get("widget_name")
+            action = data.get("action")
            value = data.get("value")
            mode = data.get("mode", "replace")
            node_ids = data.get("node_ids")

-            if not isinstance(widget_name, str) or not widget_name:
+            if not action and (not isinstance(widget_name, str) or not widget_name):
                return web.json_response(
-                    {"success": False, "error": "Missing widget_name parameter"},
+                    {
+                        "success": False,
+                        "error": "Missing parameter: provide either 'action' or 'widget_name'",
+                    },
                    status=400,
                )

@@ -3130,12 +3249,15 @@ class NodeRegistryHandler:
                except (TypeError, ValueError):
                    parsed_node_id = node_identifier

-                payload = {
+                payload: dict = {
                    "id": parsed_node_id,
-                    "widget_name": widget_name,
                    "value": value,
                    "mode": mode,
                }
+                if action:
+                    payload["action"] = action
+                if widget_name:
+                    payload["widget_name"] = widget_name

                if graph_identifier is not None:
                    payload["graph_id"] = str(graph_identifier)
@@ -3194,6 +3316,7 @@ class MiscHandlerSet:
        doctor: DoctorHandler,
        example_workflows: ExampleWorkflowsHandler,
        base_model: BaseModelHandlerSet,
+        hf_handler: HfHandler | None = None,
    ) -> None:
        self.health = health
        self.settings = settings
@@ -3212,6 +3335,7 @@ class MiscHandlerSet:
        self.doctor = doctor
        self.example_workflows = example_workflows
        self.base_model = base_model
+        self.hf_handler = hf_handler

    def to_route_mapping(
        self,
@@ -3257,6 +3381,9 @@ class MiscHandlerSet:
            "get_supporters": self.supporters.get_supporters,
            "get_example_workflows": self.example_workflows.get_example_workflows,
            "get_example_workflow": self.example_workflows.get_example_workflow,
+            # Hugging Face handlers
+            "get_hf_repo_files": self.hf_handler.get_hf_repo_files,
+            "download_hf_model": self.hf_handler.download_hf_model,
            # Base model handlers
            "get_base_models": self.base_model.get_base_models,
            "refresh_base_models": self.base_model.refresh_base_models,
@@ -203,11 +203,17 @@ class ModelListingHandler:
            result = await self._service.get_paginated_data(**params)

            format_start = time.perf_counter()
+            formatted_raw = [
+                await self._service.format_response(entry)
+                for entry in result["items"]
+            ]
+            # Filter out None entries returned for corrupted cache rows (issue #730).
+            # Note: "total" intentionally remains the pre-filter count to reflect
+            # the true number of models in the cache; corrupted entries are rare
+            # and adjusting total would cause pagination drift on every page.
+            formatted_items = [item for item in formatted_raw if item is not None]
            formatted_result = {
-                "items": [
-                    await self._service.format_response(item)
-                    for item in result["items"]
-                ],
+                "items": formatted_items,
                "total": result["total"],
                "page": result["page"],
                "page_size": result["page_size"],
@@ -233,14 +239,20 @@ class ModelListingHandler:
        start_time = time.perf_counter()
        try:
            params = self._parse_common_params(request)
+            # group_by_model is meaningless for excluded view; strip it
+            params.pop("group_by_model", None)
            result = await self._service.get_excluded_paginated_data(**params)

            format_start = time.perf_counter()
+            formatted_raw = [
+                await self._service.format_response(entry)
+                for entry in result["items"]
+            ]
+            # Filter out None entries returned for corrupted cache rows (issue #730).
+            # "total" stays at the pre-filter count; see get_models for rationale.
+            formatted_items = [item for item in formatted_raw if item is not None]
            formatted_result = {
-                "items": [
-                    await self._service.format_response(item)
-                    for item in result["items"]
-                ],
+                "items": formatted_items,
                "total": result["total"],
                "page": result["page"],
                "page_size": result["page_size"],
@@ -366,6 +378,19 @@ class ModelListingHandler:
            request.query.get("name_pattern_use_regex", "false").lower() == "true"
        )

+        # Group-by-model flag: deduplicate versions sharing the same civitai modelId
+        group_by_model = (
+            request.query.get("group_by_model", "false").lower() == "true"
+        )
+
+        # View-local-versions filter: show all local versions of a specific model
+        civitai_model_id = request.query.get("civitai_model_id")
+        if civitai_model_id is not None:
+            try:
+                civitai_model_id = int(civitai_model_id)
+            except (TypeError, ValueError):
+                civitai_model_id = None
+
        return {
            "page": page,
            "page_size": page_size,
@@ -389,6 +414,8 @@ class ModelListingHandler:
            "name_pattern_include": name_pattern_include,
            "name_pattern_exclude": name_pattern_exclude,
            "name_pattern_use_regex": name_pattern_use_regex,
+            "group_by_model": group_by_model,
+            "civitai_model_id": civitai_model_id,
            **self._parse_specific_params(request),
        }

@@ -516,8 +543,13 @@ class ModelManagementHandler:
            if not success:
                return web.json_response({"success": False, "error": error})

-            formatted_metadata = await self._service.format_response(model_data)
-            return web.json_response({"success": True, "metadata": formatted_metadata})
+            formatted = await self._service.format_response(model_data)
+            if formatted is None:
+                return web.json_response(
+                    {"success": False, "error": "Model entry is corrupted (missing file_path)"},
+                    status=500,
+                )
+            return web.json_response({"success": True, "metadata": formatted})
        except Exception as exc:
            if is_expected_offline_error(str(exc)):
                return web.json_response(
@@ -1074,10 +1106,12 @@ class ModelQueryHandler:
                # Sort: originals first, copies last
                sorted_models = self._sort_duplicate_group(filtered)

-                # Format response
+                # Format response, filtering out corrupted entries (issue #730)
                group = {"hash": sha256, "models": []}
                for model in sorted_models:
-                    group["models"].append(await self._service.format_response(model))
+                    formatted = await self._service.format_response(model)
+                    if formatted is not None:
+                        group["models"].append(formatted)

                # Only include groups with 2+ models after filtering
                if len(group["models"]) > 1:
@@ -1194,9 +1228,9 @@ class ModelQueryHandler:
                        (m for m in cache.raw_data if m["file_path"] == path), None
                    )
                    if model:
-                        group["models"].append(
-                            await self._service.format_response(model)
-                        )
+                        formatted = await self._service.format_response(model)
+                        if formatted is not None:
+                            group["models"].append(formatted)
                hash_val = self._service.scanner.get_hash_by_filename(filename)
                if hash_val:
                    main_path = self._service.get_path_by_hash(hash_val)
@@ -1206,9 +1240,9 @@ class ModelQueryHandler:
                            None,
                        )
                        if main_model:
-                            group["models"].insert(
-                                0, await self._service.format_response(main_model)
-                            )
+                            formatted = await self._service.format_response(main_model)
+                            if formatted is not None:
+                                group["models"].insert(0, formatted)
                if group["models"]:
                    result.append(group)
            return web.json_response(
@@ -1272,6 +1306,14 @@ class ModelQueryHandler:
                    license_flags = (model_data or {}).get("license_flags")
                    if license_flags is not None:
                        response_payload["license_flags"] = int(license_flags)
+                    # Include the user's license icon style preference so the
+                    # ComfyUI tooltip can pick the right set without a separate
+                    # API call.
+                    try:
+                        settings = get_settings_manager()
+                        response_payload["use_new_license_icons"] = settings.get("use_new_license_icons", True)
+                    except Exception:
+                        pass
                return web.json_response(response_payload)
            return web.json_response(
                {
@@ -1820,6 +1862,39 @@ class ModelDownloadHandler:
            )
            return web.json_response({"success": False, "error": str(exc)}, status=500)

+    async def update_download_queue_status(self, request: web.Request) -> web.Response:
+        """Update the status of a queue item (non-terminal transitions).
+
+        Supported transitions include ``queued → downloading``,
+        ``downloading → paused``, ``paused → downloading``, etc.
+        Terminal transitions (``completed``, ``failed``, ``canceled``)
+        should use ``complete_download_in_queue`` instead.
+        """
+        try:
+            download_id = request.query.get("download_id")
+            status = request.query.get("status")
+            if not download_id or not status:
+                return web.json_response(
+                    {
+                        "success": False,
+                        "error": "download_id and status are required",
+                    },
+                    status=400,
+                )
+            service = await DownloadQueueService.get_instance()
+            updated = await service.update_status(download_id, status)
+            if not updated:
+                return web.json_response(
+                    {"success": False, "error": "Download not found in queue"},
+                    status=404,
+                )
+            return web.json_response({"success": True})
+        except Exception as exc:
+            self._logger.error(
+                "Error updating download queue status: %s", exc, exc_info=True
+            )
+            return web.json_response({"success": False, "error": str(exc)}, status=500)
+

 class ModelCivitaiHandler:
    """CivitAI integration endpoints."""
@@ -2864,6 +2939,7 @@ class ModelHandlerSet:
            "retry_all_failed_downloads": self.download.retry_all_failed_downloads,
            "complete_download_in_queue": self.download.complete_download_in_queue,
            "get_download_stats": self.download.get_download_stats,
+            "update_download_queue_status": self.download.update_download_queue_status,
            "get_civitai_versions": self.civitai.get_civitai_versions,
            "get_civitai_model_by_version": self.civitai.get_civitai_model_by_version,
            "get_civitai_model_by_hash": self.civitai.get_civitai_model_by_hash,
@@ -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"):
@@ -94,6 +94,13 @@ MISC_ROUTE_DEFINITIONS: tuple[RouteDefinition, ...] = (
    RouteDefinition(
        "GET", "/api/lm/delete-model-version", "delete_model_version"
    ),
+    # Hugging Face model endpoints
+    RouteDefinition(
+        "GET", "/api/lm/hf-repo-files", "get_hf_repo_files"
+    ),
+    RouteDefinition(
+        "POST", "/api/lm/download-hf-model", "download_hf_model"
+    ),
 )


@@ -39,6 +39,7 @@ from .handlers.misc_handlers import (
    build_service_registry_adapter,
 )
 from .handlers.base_model_handlers import BaseModelHandlerSet
+from .handlers.hf_handlers import HfHandler
 from .misc_route_registrar import MiscRouteRegistrar

 logger = logging.getLogger(__name__)
@@ -136,6 +137,7 @@ class MiscRoutes:
        doctor = DoctorHandler(settings_service=self._settings)
        example_workflows = ExampleWorkflowsHandler()
        base_model = BaseModelHandlerSet()
+        hf_handler = HfHandler()

        return self._handler_set_factory(
            health=health,
@@ -155,6 +157,7 @@ class MiscRoutes:
            doctor=doctor,
            example_workflows=example_workflows,
            base_model=base_model,
+            hf_handler=hf_handler,
        )


@@ -138,6 +138,9 @@ COMMON_ROUTE_DEFINITIONS: tuple[RouteDefinition, ...] = (
    RouteDefinition(
        "GET", "/api/lm/downloads/queue/complete", "complete_download_in_queue"
    ),
+    RouteDefinition(
+        "GET", "/api/lm/downloads/queue/status", "update_download_queue_status"
+    ),
    RouteDefinition("POST", "/api/lm/{prefix}/cancel-task", "cancel_task"),
    RouteDefinition("GET", "/{prefix}", "handle_models_page"),
 )
@@ -11,6 +11,8 @@ from ..config import config
 from ..services.settings_manager import get_settings_manager
 from ..services.server_i18n import server_i18n
 from ..services.service_registry import ServiceRegistry
+from ..services.model_query import normalize_sub_type, resolve_sub_type
+from ..utils.constants import VALID_LORA_SUB_TYPES, VALID_CHECKPOINT_SUB_TYPES
 from ..utils.usage_stats import UsageStats

 logger = logging.getLogger(__name__)
@@ -140,6 +142,21 @@ class StatsRoutes:
            # Get usage statistics
            usage_data = await self.usage_stats.get_stats()
            
+            # CivitAI model type distribution across all model types
+            # Use the same logic as the filter panel: normalize_sub_type(resolve_sub_type(entry))
+            # with sub-type validation per model type
+            model_types_counter: Counter[str] = Counter()
+            for entry in lora_cache.raw_data:
+                ntype = normalize_sub_type(resolve_sub_type(entry))
+                if ntype and ntype in VALID_LORA_SUB_TYPES:
+                    model_types_counter[ntype] += 1
+            for entry in checkpoint_cache.raw_data:
+                ntype = normalize_sub_type(resolve_sub_type(entry))
+                if ntype and ntype in VALID_CHECKPOINT_SUB_TYPES:
+                    model_types_counter[ntype] += 1
+            # Embeddings: always count as "embedding" regardless of CivitAI sub-type
+            model_types_counter['embedding'] = len(embedding_cache.raw_data)
+            
            return web.json_response({
                'success': True,
                'data': {
@@ -154,7 +171,8 @@ class StatsRoutes:
                    'total_generations': usage_data.get('total_executions', 0),
                    'unused_loras': self._count_unused_models(lora_cache.raw_data, usage_data.get('loras', {})),
                    'unused_checkpoints': self._count_unused_models(checkpoint_cache.raw_data, usage_data.get('checkpoints', {})),
-                    'unused_embeddings': self._count_unused_models(embedding_cache.raw_data, usage_data.get('embeddings', {}))
+                    'unused_embeddings': self._count_unused_models(embedding_cache.raw_data, usage_data.get('embeddings', {})),
+                    'model_types_distribution': dict(model_types_counter.most_common())
                }
            })
            
@@ -459,9 +477,12 @@ class StatsRoutes:
                if unused_lora_percent > 50:
                    insights.append({
                        'type': 'warning',
-                        'title': 'High Number of Unused LoRAs',
-                        'description': f'{unused_lora_percent:.1f}% of your LoRAs ({unused_loras}/{total_loras}) have never been used.',
-                        'suggestion': 'Consider organizing or archiving unused models to free up storage space.'
+                        'key': 'insights.unusedLoras.high',
+                        'params': {
+                            'percent': f'{unused_lora_percent:.1f}',
+                            'count': str(unused_loras),
+                            'total': str(total_loras)
+                        }
                    })
            
            if total_checkpoints > 0:
@@ -469,9 +490,12 @@ class StatsRoutes:
                if unused_checkpoint_percent > 30:
                    insights.append({
                        'type': 'warning',
-                        'title': 'Unused Checkpoints Detected',
-                        'description': f'{unused_checkpoint_percent:.1f}% of your checkpoints ({unused_checkpoints}/{total_checkpoints}) have never been used.',
-                        'suggestion': 'Review and consider removing checkpoints you no longer need.'
+                        'key': 'insights.unusedCheckpoints.detected',
+                        'params': {
+                            'percent': f'{unused_checkpoint_percent:.1f}',
+                            'count': str(unused_checkpoints),
+                            'total': str(total_checkpoints)
+                        }
                    })
            
            if total_embeddings > 0:
@@ -479,9 +503,12 @@ class StatsRoutes:
                if unused_embedding_percent > 50:
                    insights.append({
                        'type': 'warning',
-                        'title': 'High Number of Unused Embeddings',
-                        'description': f'{unused_embedding_percent:.1f}% of your embeddings ({unused_embeddings}/{total_embeddings}) have never been used.',
-                        'suggestion': 'Consider organizing or archiving unused embeddings to optimize your collection.'
+                        'key': 'insights.unusedEmbeddings.high',
+                        'params': {
+                            'percent': f'{unused_embedding_percent:.1f}',
+                            'count': str(unused_embeddings),
+                            'total': str(total_embeddings)
+                        }
                    })
            
            # Storage insights
@@ -492,18 +519,20 @@ class StatsRoutes:
            if total_size > 100 * 1024 * 1024 * 1024:  # 100GB
                insights.append({
                    'type': 'info',
-                    'title': 'Large Collection Detected',
-                    'description': f'Your model collection is using {self._format_size(total_size)} of storage.',
-                    'suggestion': 'Consider using external storage or cloud solutions for better organization.'
+                    'key': 'insights.collection.large',
+                    'params': {
+                        'size': self._format_size(total_size)
+                    }
                })
            
            # Recent activity insight
            if usage_data.get('total_executions', 0) > 100:
                insights.append({
                    'type': 'success',
-                    'title': 'Active User',
-                    'description': f'You\'ve completed {usage_data["total_executions"]} generations so far!',
-                    'suggestion': 'Keep exploring and creating amazing content with your models.'
+                    'key': 'insights.activity.active',
+                    'params': {
+                        'count': str(usage_data['total_executions'])
+                    }
                })
            
            return web.json_response({
@@ -16,6 +16,27 @@ logger = logging.getLogger(__name__)

 NETWORK_EXCEPTIONS = (ClientError, OSError, asyncio.TimeoutError)

+# User-managed directories that live inside the plugin folder (portable
+# mode) and must survive a Git-based update. ``git clean -fd`` would
+# otherwise delete them because they are untracked and, in released tags,
+# not listed in ``.gitignore``. ``-e`` excludes a path from cleaning
+# regardless of whether it is ignored.
+_PRESERVE_DIRS = ('settings.json', 'civitai', 'wildcards', 'backups', 'stats', 'logs', 'cache', 'model_cache')
+
+
+def _clean_excludes() -> List[str]:
+    """Build the ``-e`` arguments for ``git clean`` from :data:`_PRESERVE_DIRS`."""
+    excludes: List[str] = []
+    for name in _PRESERVE_DIRS:
+        excludes.append('-e')
+        excludes.append(name)
+        # For directories, also exclude nested matches explicitly
+        # (``-e dir`` alone matches the dir entry; ``-e dir/**`` guards
+        # contents under all git versions as defense-in-depth).
+        excludes.append('-e')
+        excludes.append(f'{name}/**')
+    return excludes
+

 class UpdateRoutes:
    """Routes for handling plugin update checks"""
@@ -365,6 +386,8 @@ class UpdateRoutes:
            )
            return False, ""

+        clean_excludes = _clean_excludes()
+
        try:
            # Open the Git repository
            repo = git.Repo(plugin_root)
@@ -376,8 +399,9 @@ class UpdateRoutes:
            if nightly:
                # Reset to discard any local changes
                repo.git.reset('--hard')
-                # Clean untracked files
-                repo.git.clean('-fd')
+                # Clean untracked files, but preserve user-managed directories
+                # (wildcards, backups, stats, civitai, caches, settings.json).
+                repo.git.clean('-fd', *clean_excludes)
                
                # Switch to main branch and pull latest
                main_branch = 'main'
@@ -394,8 +418,9 @@ class UpdateRoutes:
            else:
                # Reset to discard any local changes
                repo.git.reset('--hard')
-                # Clean untracked files
-                repo.git.clean('-fd')
+                # Clean untracked files, but preserve user-managed directories
+                # (wildcards, backups, stats, civitai, caches, settings.json).
+                repo.git.clean('-fd', *clean_excludes)
                
                # Get latest release tag
                tags = sorted(repo.tags, key=lambda t: t.commit.committed_datetime, reverse=True)
@@ -84,6 +84,7 @@ class Aria2Downloader:
        self._transfers: Dict[str, Aria2Transfer] = {}
        self._poll_interval = 0.5
        self._state_store = Aria2TransferStateStore()
+        self._stderr_reader_task: Optional[asyncio.Task] = None

    @property
    def is_running(self) -> bool:
@@ -115,7 +116,7 @@ class Aria2Downloader:

        try:
            while True:
-                status = await self.get_status(download_id)
+                status = await self._get_status_with_retry(download_id)
                if status is None:
                    return False, "aria2 download not found"

@@ -136,6 +137,35 @@ class Aria2Downloader:
        finally:
            self._transfers.pop(download_id, None)

+    async def _get_status_with_retry(
+        self, download_id: str, *, max_retries: int = 4, retry_delay: float = 3.0
+    ) -> Optional[Dict[str, Any]]:
+        """Call get_status with retry for transient RPC failures.
+
+        Only retries on :exc:`Aria2Error` (RPC-level failure).  Returns
+        ``None`` immediately when the download_id is not tracked (a missing
+        transfer is not a transient condition, so retrying is pointless).
+
+        A single failed RPC call should not immediately fail the download,
+        because aria2 may be temporarily busy (e.g. finalizing multiple
+        concurrent downloads) and a retry will often succeed.
+        """
+        last_exc: Optional[Exception] = None
+        for attempt in range(max_retries):
+            try:
+                return await self.get_status(download_id)
+            except Aria2Error as exc:
+                last_exc = exc
+                if attempt < max_retries - 1:
+                    logger.warning(
+                        "aria2 get_status transient failure (attempt %d/%d) for %s: %s",
+                        attempt + 1, max_retries, download_id, exc,
+                    )
+                    await asyncio.sleep(retry_delay)
+        raise Aria2Error(
+            f"Failed to query aria2 download status after {max_retries} attempts: {last_exc}"
+        ) from last_exc
+
    async def _schedule_download(
        self,
        url: str,
@@ -312,6 +342,16 @@ class Aria2Downloader:
    async def close(self) -> None:
        """Shut down the RPC process and session."""

+        # Cancel the background stderr reader first so it stops reading
+        # from the pipe before the subprocess is terminated.
+        if self._stderr_reader_task is not None:
+            self._stderr_reader_task.cancel()
+            try:
+                await asyncio.wait_for(self._stderr_reader_task, timeout=2.0)
+            except (asyncio.CancelledError, asyncio.TimeoutError):
+                pass
+            self._stderr_reader_task = None
+
        if self._rpc_session is not None:
            await self._rpc_session.close()
            self._rpc_session = None
@@ -331,6 +371,23 @@ class Aria2Downloader:
                process.kill()
                await process.wait()

+    async def _drain_stderr(self) -> None:
+        """Continuously drain aria2's stderr pipe so it never blocks.
+
+        When the 64 KB pipe buffer fills up, aria2's ``write()`` to stderr
+        blocks, which freezes the entire ``aria2c`` process — including its
+        RPC handler.  This background task reads lines from stderr as they
+        arrive and forwards them to Python's logger.
+        """
+        try:
+            assert self._process is not None and self._process.stderr is not None
+            async for line in self._process.stderr:
+                text = line.decode("utf-8", errors="replace").rstrip()
+                if text:
+                    logger.debug("aria2 stderr: %s", text)
+        except Exception:
+            pass
+
    async def _dispatch_progress(self, callback, snapshot: DownloadProgress) -> None:
        try:
            result = callback(snapshot, snapshot)
@@ -465,6 +522,17 @@ class Aria2Downloader:

            await self._wait_until_ready()

+            # Drain aria2's stderr in a background task so the pipe buffer
+            # never fills up.  If the pipe blocks, aria2 itself freezes and
+            # cannot respond to RPC — this was the root cause of the
+            # "Failed to query aria2 download status" timeout bug.
+            # Must start AFTER _wait_until_ready to avoid a race where the
+            # drain task consumes aria2's early-exit error message before
+            # _wait_until_ready can read it.
+            self._stderr_reader_task = asyncio.create_task(
+                self._drain_stderr()
+            )
+
    def _resolve_executable(self) -> str:
        settings = get_settings_manager()
        configured_path = (settings.get("aria2c_path") or "").strip()
@@ -584,7 +652,9 @@ class Aria2Downloader:
        if self._rpc_session is None or self._rpc_session.closed:
            async with self._rpc_session_lock:
                if self._rpc_session is None or self._rpc_session.closed:
-                    timeout = aiohttp.ClientTimeout(total=30)
+                    timeout = aiohttp.ClientTimeout(
+                        total=None, sock_connect=10, sock_read=60
+                    )
                    self._rpc_session = aiohttp.ClientSession(timeout=timeout)
        return self._rpc_session

@@ -104,6 +104,100 @@ class BaseModelService(ABC):
        fetch_duration = time.perf_counter() - t0
        initial_count = len(sorted_data)

+        # Optionally filter by civitai model ID (shows all local versions of a specific model)
+        civitai_model_id = kwargs.get("civitai_model_id")
+        if civitai_model_id is not None:
+            sorted_data = [
+                item for item in sorted_data
+                if self._extract_model_id(item) == civitai_model_id
+            ]
+            # VLM mode: always sort by version ID descending (newest version first),
+            # regardless of the current sort_by preference.
+            sorted_data.sort(
+                key=lambda x: self._extract_version_id(x) or 0,
+                reverse=True,
+            )
+
+        # Optionally group by civitai modelId, showing only the latest version per model
+        dedup_lost = 0
+        if kwargs.get("group_by_model") and civitai_model_id is None:
+            # Determine whether to further sub-group by base model
+            # When version_grouping is "same_base", versions with different
+            # base models are effectively different groups — the dedup key
+            # needs to include base_model so the version count and VLM flow
+            # stay consistent (card shows correct count for its base model).
+            ufs = self.settings.get("version_grouping", "same_base")
+            group_by_base = ufs == "same_base"
+
+            dedup_map = {}  # (modelId [,base_model]) -> (item, version_id)
+            version_counter = {}  # same-key -> count
+            standalone = []
+            for item in sorted_data:
+                mid = self._extract_model_id(item)
+                if mid is None:
+                    standalone.append(item)
+                    continue
+                key = (mid, item.get("base_model") or "") if group_by_base else mid
+                # Count all versions per key
+                version_counter[key] = version_counter.get(key, 0) + 1
+                vid = self._extract_version_id(item) or 0
+                if key not in dedup_map or vid > dedup_map[key][1]:
+                    dedup_map[key] = (item, vid)
+            # Attach version_count to each surviving grouped item (shallow copy
+            # to avoid mutating cached dicts — the cache is shared across requests)
+            for key, (item, vid) in dedup_map.items():
+                item = dict(item)
+                item["version_count"] = version_counter[key]
+                dedup_map[key] = (item, vid)
+            dedup_lost = len(sorted_data) - (len(dedup_map) + len(standalone))
+            sorted_data = [entry[0] for entry in dedup_map.values()] + standalone
+
+        # Re-sort by version_count (grouped: after dedup; non-grouped: group internally, sort, expand)
+        if sort_params.key == "versions_count" and civitai_model_id is None:
+            reverse = sort_params.order == "desc"
+            if kwargs.get("group_by_model"):
+                # Grouped mode: items are already dedup'd with version_count attached
+                sorted_data.sort(
+                    key=lambda x: (
+                        x.get("version_count", 0),
+                        (x.get("model_name") or x.get("file_name") or "").lower(),
+                        x.get("file_path", "").lower(),
+                    ),
+                    reverse=reverse,
+                )
+            else:
+                # Non-grouped mode: group internally, sort groups by count, expand
+                # Respect the version_grouping setting (same logic as grouped dedup)
+                ufs = self.settings.get("version_grouping", "same_base")
+                group_by_base = ufs == "same_base"
+
+                model_groups: Dict[Any, List[Dict]] = {}
+                ungrouped_standalone: List[Dict] = []
+                for item in sorted_data:
+                    mid = self._extract_model_id(item)
+                    if mid is None:
+                        ungrouped_standalone.append(item)
+                        continue
+                    key = (mid, item.get("base_model") or "") if group_by_base else mid
+                    model_groups.setdefault(key, []).append(item)
+                # Sort versions within each group by version id descending
+                for items in model_groups.values():
+                    items.sort(
+                        key=lambda x: self._extract_version_id(x) or 0,
+                        reverse=True,
+                    )
+                # Sort groups by version count
+                sorted_groups = sorted(
+                    model_groups.values(),
+                    key=lambda items: len(items),
+                    reverse=reverse,
+                )
+                # Flatten: grouped items first, standalone items last
+                sorted_data = []
+                for items in sorted_groups:
+                    sorted_data.extend(items)
+                sorted_data.extend(ungrouped_standalone)
+
        t1 = time.perf_counter()
        if hash_filters:
            filtered_data = await self._apply_hash_filters(sorted_data, hash_filters)
@@ -172,7 +266,7 @@ class BaseModelService(ABC):
        overall_duration = time.perf_counter() - overall_start
        logger.debug(
            "%s.get_paginated_data took %.3fs (fetch: %.3fs, filter: %.3fs, update_filter: %.3fs, pagination: %.3fs, annotate: %.3fs). "
-            "Counts: initial=%d, post_filter=%d, final=%d",
+            "Counts: initial=%d, dedup=%d, post_filter=%d, final=%d",
            self.__class__.__name__,
            overall_duration,
            fetch_duration,
@@ -181,6 +275,7 @@ class BaseModelService(ABC):
            pagination_duration,
            annotate_duration,
            initial_count,
+            dedup_lost,
            post_filter_count,
            final_count,
        )
@@ -495,7 +590,7 @@ class BaseModelService(ABC):
        if not ordered_ids:
            return annotated

-        strategy_value = self.settings.get("update_flag_strategy")
+        strategy_value = self.settings.get("version_grouping")
        if isinstance(strategy_value, str) and strategy_value.strip():
            strategy = strategy_value.strip().lower()
        else:
@@ -696,8 +791,12 @@ class BaseModelService(ABC):
        }

    @abstractmethod
-    async def format_response(self, model_data: Dict) -> Dict:
-        """Format model data for API response - must be implemented by subclasses"""
+    async def format_response(self, model_data: Dict) -> Optional[Dict]:
+        """Format model data for API response - must be implemented by subclasses.
+
+        Subclasses should return None for corrupted entries so the handler
+        layer can filter them out. See issue #730.
+        """
        pass

    # Common service methods that delegate to scanner
@@ -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")

@@ -1,6 +1,6 @@
 import os
 import logging
-from typing import Dict
+from typing import Dict, Optional

 from .base_model_service import BaseModelService
 from .auto_tag_service import extract_auto_tags
@@ -21,20 +21,37 @@ class CheckpointService(BaseModelService):
        """
        super().__init__("checkpoint", scanner, CheckpointMetadata, update_service=update_service)
    
-    async def format_response(self, checkpoint_data: Dict) -> Dict:
-        """Format Checkpoint data for API response"""
+    async def format_response(self, checkpoint_data: Dict) -> Optional[Dict]:
+        """Format Checkpoint data for API response.
+
+        Returns None when the entry is missing critical fields (corrupted cache
+        row), so the handler layer can filter it out. See issue #730.
+        """
+        # Guard against corrupted cache entries missing critical fields
+        file_path = checkpoint_data.get("file_path")
+        if not file_path or not isinstance(file_path, str):
+            logger.warning(
+                "Skipping corrupted checkpoint entry (missing file_path): %s",
+                checkpoint_data.get("file_name", "<unknown>"),
+            )
+            return None
+
        # Get sub_type from cache entry (new canonical field)
        sub_type = checkpoint_data.get("sub_type", "checkpoint")
-        
+
+        file_name = checkpoint_data.get("file_name") or ""
+        model_name = checkpoint_data.get("model_name") or file_name
+        folder = checkpoint_data.get("folder") or ""
+
        return {
-            "model_name": checkpoint_data["model_name"],
-            "file_name": checkpoint_data["file_name"],
+            "model_name": model_name,
+            "file_name": file_name,
            "preview_url": config.get_preview_static_url(checkpoint_data.get("preview_url", "")),
            "preview_nsfw_level": checkpoint_data.get("preview_nsfw_level", 0),
            "base_model": checkpoint_data.get("base_model", ""),
-            "folder": checkpoint_data["folder"],
+            "folder": folder,
            "sha256": checkpoint_data.get("sha256", ""),
-            "file_path": checkpoint_data["file_path"].replace(os.sep, "/"),
+            "file_path": file_path.replace(os.sep, "/"),
            "file_size": checkpoint_data.get("size", 0),
            "modified": checkpoint_data.get("modified", ""),
            "tags": checkpoint_data.get("tags", []),
@@ -48,6 +65,8 @@ class CheckpointService(BaseModelService):
            "skip_metadata_refresh": bool(checkpoint_data.get("skip_metadata_refresh", False)),
            "civitai": self.filter_civitai_data(checkpoint_data.get("civitai", {}), minimal=True),
            "auto_tags": checkpoint_data.get("auto_tags") or extract_auto_tags(checkpoint_data),
+            "version_count": checkpoint_data.get("version_count"),
+            "hf_url": checkpoint_data.get("hf_url", ""),
        }
    
    def find_duplicate_hashes(self) -> Dict:
@@ -327,7 +327,7 @@ class CivArchiveClient:
            if resolved:
                return resolved, None

-            logger.error("Error fetching version of CivArchive model by hash %s", model_hash[:10])
+            logger.debug("Error fetching version of CivArchive model by hash %s", model_hash[:10])
            return None, "No version data found"

        except RateLimitError:
@@ -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,
@@ -196,6 +196,7 @@ class CivitaiBaseModelService:
            "ernie": "ERNI",
            "ernie turbo": "ETRB",
            "nucleus": "NUCL",
+            "krea 2": "KR2",
            "svd": "SVD",
            "ltxv": "LTXV",
            "ltxv2": "LTV2",
@@ -424,6 +425,7 @@ class CivitaiBaseModelService:
                "Ernie",
                "Ernie Turbo",
                "Nucleus",
+                "Krea 2",
            ],
        }

@@ -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,
@@ -29,6 +29,7 @@ from .metadata_service import get_default_metadata_provider, get_metadata_provid
 from .downloader import get_downloader, DownloadProgress, DownloadStreamControl
 from .aria2_downloader import Aria2Error, get_aria2_downloader
 from .aria2_transfer_state import Aria2TransferStateStore
+from .download_queue_service import DownloadQueueService

 # Download to temporary file first
 import tempfile
@@ -360,6 +361,15 @@ class DownloadManager:
                    if self._active_downloads[task_id].get("transfer_backend") == "aria2":
                        await self._persist_aria2_state(task_id)

+                # Update SQLite queue status to 'downloading'
+                try:
+                    queue_service = await DownloadQueueService.get_instance()
+                    await queue_service.update_status(task_id, "downloading")
+                except Exception:
+                    logger.warning(
+                        "Failed to update queue status for %s", task_id, exc_info=True
+                    )
+
                # Use original download implementation
                try:
                    # Check for cancellation before starting
@@ -396,6 +406,22 @@ class DownloadManager:
                        if self._active_downloads[task_id].get("transfer_backend") == "aria2":
                            await self._persist_aria2_state(task_id)

+                    # Move queue item to history on completion
+                    try:
+                        queue_service = await DownloadQueueService.get_instance()
+                        await queue_service.complete_download(
+                            download_id=task_id,
+                            status=result.get("status", "completed") if result.get("success") else "failed",
+                            error=result.get("error") if not result.get("success") else None,
+                            file_path=result.get("file_path"),
+                            bytes_downloaded=self._active_downloads.get(task_id, {}).get("bytes_downloaded", 0),
+                            total_bytes=self._active_downloads.get(task_id, {}).get("total_bytes"),
+                        )
+                    except Exception:
+                        logger.warning(
+                            "Failed to complete queue item for %s", task_id, exc_info=True
+                        )
+
                    return result
                except asyncio.CancelledError:
                    # Handle cancellation
@@ -404,6 +430,19 @@ class DownloadManager:
                        self._active_downloads[task_id]["bytes_per_second"] = 0.0
                        if self._active_downloads[task_id].get("transfer_backend") == "aria2":
                            await self._persist_aria2_state(task_id)
+
+                    # Move queue item to history as canceled
+                    try:
+                        queue_service = await DownloadQueueService.get_instance()
+                        await queue_service.complete_download(
+                            download_id=task_id,
+                            status="canceled",
+                        )
+                    except Exception:
+                        logger.warning(
+                            "Failed to cancel queue item for %s", task_id, exc_info=True
+                        )
+
                    logger.info(f"Download cancelled for task {task_id}")
                    raise
                except Exception as e:
@@ -417,6 +456,22 @@ class DownloadManager:
                        self._active_downloads[task_id]["bytes_per_second"] = 0.0
                        if self._active_downloads[task_id].get("transfer_backend") == "aria2":
                            await self._persist_aria2_state(task_id)
+
+                    # Move queue item to history as failed
+                    try:
+                        queue_service = await DownloadQueueService.get_instance()
+                        await queue_service.complete_download(
+                            download_id=task_id,
+                            status="failed",
+                            error=str(e),
+                            bytes_downloaded=self._active_downloads.get(task_id, {}).get("bytes_downloaded", 0),
+                            total_bytes=self._active_downloads.get(task_id, {}).get("total_bytes"),
+                        )
+                    except Exception:
+                        logger.warning(
+                            "Failed to complete queue item for %s", task_id, exc_info=True
+                        )
+
                    return {"success": False, "error": str(e)}
        finally:
            # Schedule cleanup of download record after delay
@@ -1233,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"
@@ -1365,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,
                    )
@@ -1396,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,
                )
@@ -1974,7 +2043,21 @@ class DownloadManager:
                    break

                last_error = result
-                if os.path.exists(save_path):
+                # For aria2: if the .aria2 control file is missing, aria2 considers
+                # the download complete.  A transient RPC failure may have made us
+                # think the download failed even though the file is fully on disk.
+                # Keep the file so a retry can find it already complete.
+                if (
+                    transfer_backend == "aria2"
+                    and os.path.exists(save_path)
+                    and not os.path.exists(f"{save_path}.aria2")
+                ):
+                    logger.warning(
+                        "aria2 download reported failure but .aria2 file is absent "
+                        "for %s — the file is likely complete.  Preserving it for retry.",
+                        save_path,
+                    )
+                elif os.path.exists(save_path):
                    try:
                        os.remove(save_path)
                    except Exception as e:
@@ -1,6 +1,6 @@
 import os
 import logging
-from typing import Dict
+from typing import Dict, Optional

 from .base_model_service import BaseModelService
 from .auto_tag_service import extract_auto_tags
@@ -21,20 +21,37 @@ class EmbeddingService(BaseModelService):
        """
        super().__init__("embedding", scanner, EmbeddingMetadata, update_service=update_service)
    
-    async def format_response(self, embedding_data: Dict) -> Dict:
-        """Format Embedding data for API response"""
+    async def format_response(self, embedding_data: Dict) -> Optional[Dict]:
+        """Format Embedding data for API response.
+
+        Returns None when the entry is missing critical fields (corrupted cache
+        row), so the handler layer can filter it out. See issue #730.
+        """
+        # Guard against corrupted cache entries missing critical fields
+        file_path = embedding_data.get("file_path")
+        if not file_path or not isinstance(file_path, str):
+            logger.warning(
+                "Skipping corrupted embedding entry (missing file_path): %s",
+                embedding_data.get("file_name", "<unknown>"),
+            )
+            return None
+
        # Get sub_type from cache entry (new canonical field)
        sub_type = embedding_data.get("sub_type", "embedding")
-        
+
+        file_name = embedding_data.get("file_name") or ""
+        model_name = embedding_data.get("model_name") or file_name
+        folder = embedding_data.get("folder") or ""
+
        return {
-            "model_name": embedding_data["model_name"],
-            "file_name": embedding_data["file_name"],
+            "model_name": model_name,
+            "file_name": file_name,
            "preview_url": config.get_preview_static_url(embedding_data.get("preview_url", "")),
            "preview_nsfw_level": embedding_data.get("preview_nsfw_level", 0),
            "base_model": embedding_data.get("base_model", ""),
-            "folder": embedding_data["folder"],
+            "folder": folder,
            "sha256": embedding_data.get("sha256", ""),
-            "file_path": embedding_data["file_path"].replace(os.sep, "/"),
+            "file_path": file_path.replace(os.sep, "/"),
            "file_size": embedding_data.get("size", 0),
            "modified": embedding_data.get("modified", ""),
            "tags": embedding_data.get("tags", []),
@@ -48,6 +65,8 @@ class EmbeddingService(BaseModelService):
            "skip_metadata_refresh": bool(embedding_data.get("skip_metadata_refresh", False)),
            "civitai": self.filter_civitai_data(embedding_data.get("civitai", {}), minimal=True),
            "auto_tags": embedding_data.get("auto_tags") or extract_auto_tags(embedding_data),
+            "version_count": embedding_data.get("version_count"),
+            "hf_url": embedding_data.get("hf_url", ""),
        }
    
    def find_duplicate_hashes(self) -> Dict:
@@ -24,23 +24,41 @@ class LoraService(BaseModelService):
        """
        super().__init__("lora", scanner, LoraMetadata, update_service=update_service)

-    async def format_response(self, lora_data: Dict) -> Dict:
-        """Format LoRA data for API response"""
+    async def format_response(self, lora_data: Dict) -> Optional[Dict]:
+        """Format LoRA data for API response.
+
+        Returns None when the entry is missing critical fields (corrupted cache
+        row), so the handler layer can filter it out instead of crashing the
+        whole listing request. See issue #730.
+        """
+        # Guard against corrupted cache entries missing critical fields
+        file_path = lora_data.get("file_path")
+        if not file_path or not isinstance(file_path, str):
+            logger.warning(
+                "Skipping corrupted LoRA entry (missing file_path): %s",
+                lora_data.get("file_name", "<unknown>"),
+            )
+            return None
+
        # Resolve sub_type using priority: sub_type > model_type > civitai.model.type > default
        # Normalize to lowercase for consistent API responses
        sub_type = resolve_sub_type(lora_data).lower()

+        file_name = lora_data.get("file_name") or ""
+        model_name = lora_data.get("model_name") or file_name
+        folder = lora_data.get("folder") or ""
+
        return {
-            "model_name": lora_data["model_name"],
-            "file_name": lora_data["file_name"],
+            "model_name": model_name,
+            "file_name": file_name,
            "preview_url": config.get_preview_static_url(
                lora_data.get("preview_url", "")
            ),
            "preview_nsfw_level": lora_data.get("preview_nsfw_level", 0),
            "base_model": lora_data.get("base_model", ""),
-            "folder": lora_data["folder"],
+            "folder": folder,
            "sha256": lora_data.get("sha256", ""),
-            "file_path": lora_data["file_path"].replace(os.sep, "/"),
+            "file_path": file_path.replace(os.sep, "/"),
            "file_size": lora_data.get("size", 0),
            "modified": lora_data.get("modified", ""),
            "tags": lora_data.get("tags", []),
@@ -59,6 +77,8 @@ class LoraService(BaseModelService):
                lora_data.get("civitai", {}), minimal=True
            ),
            "auto_tags": lora_data.get("auto_tags") or extract_auto_tags(lora_data),
+            "version_count": lora_data.get("version_count"),
+            "hf_url": lora_data.get("hf_url", ""),
        }

    async def _apply_specific_filters(self, data: List[Dict], **kwargs) -> List[Dict]:
@@ -427,7 +427,18 @@ class MetadataSyncService:
        metadata = await metadata_loader(metadata_path)

        for key, value in updates.items():
-            if isinstance(value, dict) and isinstance(metadata.get(key), dict):
+            if key == "tags" and isinstance(value, list):
+                # Normalize tags: trim, lowercase, deduplicate
+                normalized = []
+                seen = set()
+                for tag in value:
+                    if isinstance(tag, str):
+                        t = tag.strip().lower()
+                        if t and t not in seen:
+                            normalized.append(t)
+                            seen.add(t)
+                metadata[key] = normalized
+            elif isinstance(value, dict) and isinstance(metadata.get(key), dict):
                metadata[key].update(value)
            else:
                metadata[key] = value
@@ -18,6 +18,8 @@ SUPPORTED_SORT_MODES = [
    ('size', 'desc'),
    ('usage', 'asc'),
    ('usage', 'desc'),
+    ('versions_count', 'asc'),
+    ('versions_count', 'desc'),
 ]
 # Is this in use?

@@ -263,6 +265,17 @@ class ModelCache:
                ),
                reverse=reverse
            )
+        elif sort_key == 'versions_count':
+            # Pre-dedup sort: fall back to name sort.
+            # Actual re-sort by version_count happens in get_paginated_data after dedup.
+            result = natsorted(
+                data,
+                key=lambda x: (
+                    self._get_display_name(x).lower(),
+                    x.get('file_path', '').lower()
+                ),
+                reverse=reverse
+            )
        else:
            # Fallback: no sort
            result = list(data)
@@ -294,12 +294,14 @@ class ModelFilterSet:
                for tag, state in tag_filters.items():
                    if not tag:
                        continue
+                    # Normalize to lowercase for case-insensitive matching
+                    normalized = tag.strip().lower()
                    if state == "exclude":
-                        exclude_tags.add(tag)
+                        exclude_tags.add(normalized)
                    else:
-                        include_tags.add(tag)
+                        include_tags.add(normalized)
            else:
-                include_tags = {tag for tag in tag_filters if tag}
+                include_tags = {tag.strip().lower() for tag in tag_filters if tag}

            if include_tags:
                tag_logic = criteria.tag_logic.lower() if criteria.tag_logic else "any"
@@ -318,13 +320,17 @@ class ModelFilterSet:
                                return True
                            # Otherwise, check if all non-special tags match
                            if non_special_tags:
-                                return all(tag in (item_tags or []) for tag in non_special_tags)
+                                # Case-insensitive: normalize item tags too
+                                normalized_item_tags = {t.strip().lower() for t in (item_tags or []) if isinstance(t, str)}
+                                return all(tag in normalized_item_tags for tag in non_special_tags)
                            return True
-                        # Normal case: all tags must match
-                        return all(tag in (item_tags or []) for tag in non_special_tags)
+                        # Normal case: all tags must match (case-insensitive)
+                        normalized_item_tags = {t.strip().lower() for t in (item_tags or []) if isinstance(t, str)}
+                        return all(tag in normalized_item_tags for tag in non_special_tags)
                    else:
-                        # OR logic (default): item must have ANY include tag
-                        return any(tag in include_tags for tag in (item_tags or []))
+                        # OR logic (default): item must have ANY include tag (case-insensitive)
+                        normalized_item_tags = {t.strip().lower() for t in (item_tags or []) if isinstance(t, str)}
+                        return bool(normalized_item_tags & include_tags)

                items = [item for item in items if matches_include(item.get("tags"))]

@@ -333,7 +339,9 @@ class ModelFilterSet:
                def matches_exclude(item_tags):
                    if not item_tags and "__no_tags__" in exclude_tags:
                        return True
-                    return any(tag in exclude_tags for tag in (item_tags or []))
+                    # Case-insensitive: normalize item tags
+                    normalized_item_tags = {t.strip().lower() for t in (item_tags or []) if isinstance(t, str)}
+                    return bool(normalized_item_tags & exclude_tags)

                items = [
                    item for item in items if not matches_exclude(item.get("tags"))
@@ -248,6 +248,7 @@ class ModelScanner:
            'civitai': civitai_slim,
            'civitai_deleted': bool(get_value('civitai_deleted', False)),
            'skip_metadata_refresh': bool(get_value('skip_metadata_refresh', False)),
+            'hf_url': get_value('hf_url', '') or '',
        }

        license_source: Dict[str, Any] = {}
@@ -476,11 +477,20 @@ class ModelScanner:
            for tag in adjusted_item.get('tags') or []:
                tags_count[tag] = tags_count.get(tag, 0) + 1

-        # Validate cache entries and check health
+        # Validate cache entries and check health.
+        # Always use the validated/repaired entries — even when there are no
+        # invalid entries, auto_repair may have filled in missing optional
+        # fields (model_name, file_name, folder) with safe defaults on a copied
+        # working_entry.  Without this unconditional replacement the repaired
+        # copies are discarded and None values propagate to format_response.
+        # See issue #730.
        valid_entries, invalid_entries = CacheEntryValidator.validate_batch(
            adjusted_raw_data, auto_repair=True
        )

+        # Always use the validated entries (repaired copies)
+        adjusted_raw_data = valid_entries
+
        if invalid_entries:
            monitor = CacheHealthMonitor()
            report = monitor.check_health(adjusted_raw_data, auto_repair=True)
@@ -724,6 +724,16 @@ class ModelUpdateService:
            "Refreshing update metadata for %d %s models", total_models, model_type
        )

+        # When filtering by folder, also collect the cross-folder version set
+        # so that versions already present in other folders are not reported
+        # as available updates. See issue #997.
+        all_local_versions: Optional[Dict[int, List[int]]] = None
+        if folder_path is not None:
+            all_local_versions = await self._collect_local_versions(
+                scanner,
+                target_model_ids=target_filter,
+            )
+
        results: Dict[int, ModelUpdateRecord] = {}
        prefetched: Dict[int, Mapping] = {}

@@ -762,6 +772,12 @@ class ModelUpdateService:
        for index, (model_id, version_ids) in enumerate(
            local_versions.items(), start=1
        ):
+            # Use cross-folder version IDs for is_in_library if available
+            all_vids: Sequence[int] = (
+                all_local_versions.get(model_id, [])
+                if all_local_versions is not None
+                else version_ids
+            )
            record = await self._refresh_single_model(
                model_type,
                model_id,
@@ -769,6 +785,7 @@ class ModelUpdateService:
                metadata_provider,
                force_refresh=force_refresh,
                prefetched_response=prefetched.get(model_id),
+                all_local_version_ids=all_vids,
            )
            if scanner.is_cancelled():
                logger.info(f"{model_type.capitalize()} Update Service: Refresh cancelled by user")
@@ -964,8 +981,16 @@ class ModelUpdateService:
        *,
        force_refresh: bool = False,
        prefetched_response: Optional[Mapping] = None,
+        all_local_version_ids: Optional[Sequence[int]] = None,
    ) -> Optional[ModelUpdateRecord]:
        normalized_local = self._normalize_sequence(local_versions)
+        # When folder-filtering, this carries the cross-folder version set
+        # for is_in_library; otherwise it falls back to normalized_local.
+        normalized_all = (
+            self._normalize_sequence(all_local_version_ids)
+            if all_local_version_ids is not None
+            else normalized_local
+        )
        now = time.time()
        async with self._lock:
            existing = self._get_record(model_type, model_id)
@@ -973,6 +998,7 @@ class ModelUpdateService:
                record = self._merge_with_local_versions(
                    existing,
                    normalized_local,
+                    all_local_version_ids=normalized_all,
                )
                self._upsert_record(record)
                return record
@@ -1048,6 +1074,7 @@ class ModelUpdateService:
                record = self._merge_with_local_versions(
                    existing,
                    normalized_local,
+                    all_local_version_ids=normalized_all,
                )
                self._upsert_record(record)
                return record
@@ -1059,6 +1086,7 @@ class ModelUpdateService:
                    model_type=model_type,
                    model_id=model_id,
                    last_checked_at=now,
+                    all_local_version_ids=normalized_all,
                )
                record = replace(record, should_ignore_model=True)
                self._upsert_record(record)
@@ -1077,6 +1105,7 @@ class ModelUpdateService:
                    fetched_versions,
                    existing,
                    now,
+                    all_local_version_ids=normalized_all,
                )
            else:
                record = self._merge_with_local_versions(
@@ -1085,6 +1114,7 @@ class ModelUpdateService:
                    model_type=model_type,
                    model_id=model_id,
                    last_checked_at=existing.last_checked_at if existing else None,
+                    all_local_version_ids=normalized_all,
                )
            self._upsert_record(record)
            return record
@@ -1322,12 +1352,20 @@ class ModelUpdateService:
        existing: Optional[ModelUpdateRecord],
        normalized_local: Sequence[int],
        *,
+        all_local_version_ids: Optional[Sequence[int]] = None,
        model_type: Optional[str] = None,
        model_id: Optional[int] = None,
        last_checked_at: Optional[float] = None,
        version_info: Optional[Mapping] = None,
    ) -> ModelUpdateRecord:
        local_set = set(normalized_local)
+        # When folder-filtering, also consider versions in other folders
+        # as in-library so they are not reported as available updates.
+        effective_local_set: set[int] = (
+            local_set | set(all_local_version_ids)
+            if all_local_version_ids is not None
+            else local_set
+        )
        versions: List[ModelVersionRecord] = []
        ignore_map: Dict[int, bool] = {}
        if existing:
@@ -1339,7 +1377,7 @@ class ModelUpdateService:
                versions.append(
                    replace(
                        version,
-                        is_in_library=version.version_id in local_set,
+                        is_in_library=version.version_id in effective_local_set,
                    )
                )
        elif model_type is None or model_id is None:
@@ -1386,8 +1424,17 @@ class ModelUpdateService:
        remote_versions: Sequence[ModelVersionRecord],
        existing: Optional[ModelUpdateRecord],
        timestamp: float,
+        *,
+        all_local_version_ids: Optional[Sequence[int]] = None,
    ) -> ModelUpdateRecord:
        local_set = set(local_versions)
+        # When folder-filtering, also consider versions in other folders
+        # as in-library so they are not reported as available updates.
+        effective_local_set: set[int] = (
+            local_set | set(all_local_version_ids)
+            if all_local_version_ids is not None
+            else local_set
+        )
        ignore_map = {version.version_id: version.should_ignore for version in existing.versions} if existing else {}
        preview_map = {version.version_id: version.preview_url for version in existing.versions} if existing else {}
        sort_map = {version.version_id: version.sort_index for version in existing.versions} if existing else {}
@@ -1406,7 +1453,7 @@ class ModelUpdateService:
                    released_at=remote_version.released_at,
                    size_bytes=remote_version.size_bytes,
                    preview_url=remote_version.preview_url or preview_map.get(version_id),
-                    is_in_library=version_id in local_set,
+                    is_in_library=version_id in effective_local_set,
                    should_ignore=ignore_map.get(version_id, remote_version.should_ignore),
                    sort_index=sort_map.get(version_id, index),
                    early_access_ends_at=remote_version.early_access_ends_at,
@@ -57,6 +57,7 @@ class PersistentModelCache:
        "db_checked",
        "last_checked_at",
        "hash_status",
+        "hf_url",
    )
    _MODEL_UPDATE_COLUMNS: Tuple[str, ...] = _MODEL_COLUMNS[2:]
    _instances: Dict[str, "PersistentModelCache"] = {}
@@ -165,8 +166,8 @@ class PersistentModelCache:

            item = {
                "file_path": file_path,
-                "file_name": row["file_name"],
-                "model_name": row["model_name"],
+                "file_name": row["file_name"] or "",
+                "model_name": row["model_name"] or "",
                "folder": row["folder"] or "",
                "size": row["size"] or 0,
                "modified": row["modified"] or 0.0,
@@ -188,6 +189,7 @@ class PersistentModelCache:
                "skip_metadata_refresh": bool(row["skip_metadata_refresh"]),
                "license_flags": int(license_value),
                "hash_status": row["hash_status"] or "completed",
+                "hf_url": row["hf_url"] or "",
            }
            raw_data.append(item)

@@ -452,6 +454,7 @@ class PersistentModelCache:
                            db_checked INTEGER,
                            last_checked_at REAL,
                            hash_status TEXT,
+                            hf_url TEXT DEFAULT '',
                            PRIMARY KEY (model_type, file_path)
                        );

@@ -500,6 +503,7 @@ class PersistentModelCache:
            # Persisting without explicit flags should assume CivitAI's documented defaults (0b111001 == 57).
            "license_flags": f"INTEGER DEFAULT {DEFAULT_LICENSE_FLAGS}",
            "hash_status": "TEXT DEFAULT 'completed'",
+            "hf_url": "TEXT DEFAULT ''",
        }

        for column, definition in required_columns.items():
@@ -548,19 +552,19 @@ class PersistentModelCache:
        return (
            model_type,
            item.get("file_path"),
-            item.get("file_name"),
-            item.get("model_name"),
-            item.get("folder"),
+            item.get("file_name") or "",
+            item.get("model_name") or "",
+            item.get("folder") or "",
            int(item.get("size") or 0),
            float(item.get("modified") or 0.0),
            (item.get("sha256") or "").lower() or None,
-            item.get("base_model"),
-            item.get("preview_url"),
+            item.get("base_model") or "",
+            item.get("preview_url") or "",
            int(item.get("preview_nsfw_level") or 0),
            1 if item.get("from_civitai", True) else 0,
            1 if item.get("favorite") else 0,
-            item.get("notes"),
-            item.get("usage_tips"),
+            item.get("notes") or "",
+            item.get("usage_tips") or "",
            metadata_source,
            civitai.get("id"),
            civitai.get("modelId"),
@@ -575,6 +579,7 @@ class PersistentModelCache:
            1 if item.get("db_checked") else 0,
            float(item.get("last_checked_at") or 0.0),
            item.get("hash_status", "completed"),
+            item.get("hf_url") or "",
        )

    def _insert_model_sql(self) -> str:
@@ -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)

@@ -98,13 +98,15 @@ DEFAULT_SETTINGS: Dict[str, Any] = {
    "lora_syntax_format": "legacy",
    "model_card_footer_action": "replace_preview",
    "show_version_on_card": True,
-    "update_flag_strategy": "same_base",
+    "version_grouping": "same_base",
    "auto_organize_exclusions": [],
    "metadata_refresh_skip_paths": [],
    "skip_previously_downloaded_model_versions": False,
    "download_skip_base_models": [],
    "backup_auto_enabled": True,
    "backup_retention_count": 5,
+    "use_new_license_icons": True,
+    "group_by_model": False,
 }


@@ -133,6 +135,9 @@ class SettingsManager:
        self._template_path = (
            Path(__file__).resolve().parents[2] / "settings.json.example"
        )
+        # Known placeholder value in settings.json.example; any file containing
+        # this value should be treated as "not configured".
+        self._TEMPLATE_PLACEHOLDER_API_KEY = "your_civitai_api_key_here"
        self.settings = self._load_settings()
        self._migrate_setting_keys()
        self._ensure_default_settings()
@@ -164,6 +169,12 @@ class SettingsManager:
                    self._original_disk_payload = copy.deepcopy(data)
                    if self._matches_template_payload(data):
                        self._preserve_disk_template = True
+                    # Clean up the template placeholder so it is not treated
+                    # as a real key (affects both the frontend boolean and
+                    # the downloader's Authorization header).
+                    placeholder = self._TEMPLATE_PLACEHOLDER_API_KEY
+                    if data.get("civitai_api_key") == placeholder:
+                        data["civitai_api_key"] = ""
                return data
            except json.JSONDecodeError as exc:
                logger.error("Failed to parse settings.json: %s", exc)
@@ -734,6 +745,7 @@ class SettingsManager:
            "includeTriggerWords": "include_trigger_words",
            "compactMode": "compact_mode",
            "modelCardFooterAction": "model_card_footer_action",
+            "update_flag_strategy": "version_grouping",
        }

        updated = False
@@ -1556,7 +1568,7 @@ class SettingsManager:
        previous_dir = os.path.dirname(previous_path) or target_dir

        if os.path.abspath(previous_path) != os.path.abspath(target_path):
-            self._copy_model_cache_directory(previous_dir, target_dir)
+            self._migrate_settings_directory_content(previous_dir, target_dir)
            logger.info("Switching settings file to: %s", target_path)

        self._pending_portable_switch = {"other_path": other_path}
@@ -1591,46 +1603,52 @@ class SettingsManager:
        finally:
            self._pending_portable_switch = None

-    def _copy_model_cache_directory(self, source_dir: str, target_dir: str) -> None:
-        """Copy model_cache artifacts when switching storage locations."""
+    def _migrate_settings_directory_content(
+        self, source_dir: str, target_dir: str
+    ) -> None:
+        """Migrate settings directory subdirectories when switching storage locations.
+
+        Copies the canonical subdirectories (cache, backups, logs, stats, wildcards)
+        from the old settings directory to the new one. Legacy cache artifacts
+        (model_cache, recipe_cache, etc.) are migrated lazily by
+        ``resolve_cache_path_with_migration`` on first access.
+
+        Args:
+            source_dir: The previous settings directory path.
+            target_dir: The new settings directory path.
+        """

        if not source_dir or not target_dir:
            return

-        source_cache_dir = os.path.join(source_dir, "model_cache")
-        target_cache_dir = os.path.join(target_dir, "model_cache")
-        if os.path.isdir(source_cache_dir) and os.path.abspath(
-            source_cache_dir
-        ) != os.path.abspath(target_cache_dir):
-            try:
-                shutil.copytree(
-                    source_cache_dir,
-                    target_cache_dir,
-                    dirs_exist_ok=True,
-                    ignore=shutil.ignore_patterns("*.sqlite-shm", "*.sqlite-wal"),
-                )
-            except Exception as exc:
-                logger.warning(
-                    "Failed to copy model_cache directory from %s to %s: %s",
-                    source_cache_dir,
-                    target_cache_dir,
-                    exc,
-                )
+        def _copy_dir(name: str) -> None:
+            source = os.path.join(source_dir, name)
+            target = os.path.join(target_dir, name)
+            if os.path.isdir(source) and os.path.abspath(source) != os.path.abspath(
+                target
+            ):
+                try:
+                    shutil.copytree(
+                        source,
+                        target,
+                        dirs_exist_ok=True,
+                        ignore=shutil.ignore_patterns("*.sqlite-shm", "*.sqlite-wal"),
+                    )
+                except Exception as exc:
+                    logger.warning(
+                        "Failed to copy directory %s from %s to %s: %s",
+                        name,
+                        source,
+                        target,
+                        exc,
+                    )

-        source_cache_file = os.path.join(source_dir, "model_cache.sqlite")
-        target_cache_file = os.path.join(target_dir, "model_cache.sqlite")
-        if os.path.isfile(source_cache_file) and os.path.abspath(
-            source_cache_file
-        ) != os.path.abspath(target_cache_file):
-            try:
-                shutil.copy2(source_cache_file, target_cache_file)
-            except Exception as exc:
-                logger.warning(
-                    "Failed to copy model_cache.sqlite from %s to %s: %s",
-                    source_cache_file,
-                    target_cache_file,
-                    exc,
-                )
+        # Managed subdirectories under settings_dir
+        _copy_dir("cache")
+        _copy_dir("backups")
+        _copy_dir("logs")
+        _copy_dir("stats")
+        _copy_dir("wildcards")

    def _get_user_config_directory(self) -> str:
        """Return the user configuration directory, falling back to ~/.config."""
@@ -36,9 +36,9 @@ class TagUpdateService:
            if isinstance(tag, str) and tag.strip():
                # Convert all tags to lowercase to avoid case sensitivity issues on Windows
                normalized = tag.strip().lower()
-                if normalized.lower() not in existing_lower:
+                if normalized not in existing_lower:
                    existing_tags.append(normalized)
-                    existing_lower.append(normalized.lower())
+                    existing_lower.append(normalized)
                    tags_added.append(normalized)

        metadata["tags"] = existing_tags
@@ -47,6 +47,20 @@ SUPPORTED_MEDIA_EXTENSIONS = {
    "videos": [".mp4", ".webm"],
 }

+# Model weight file extensions recognised by scanners.
+# This is the union of all scanner extensions (lora, checkpoint, embedding).
+MODEL_FILE_EXTENSIONS = {
+    ".safetensors",
+    ".ckpt",
+    ".pt",
+    ".pt2",
+    ".bin",
+    ".pth",
+    ".pkl",
+    ".sft",
+    ".gguf",
+}
+
 # Valid sub-types for each scanner type
 VALID_LORA_SUB_TYPES = ["lora", "locon", "dora"]
 VALID_CHECKPOINT_SUB_TYPES = ["checkpoint", "diffusion_model"]
@@ -147,6 +161,8 @@ DIFFUSION_MODEL_BASE_MODELS = frozenset(
        "Qwen",
        "ZImageBase",
        "ZImageTurbo",
+        # Krea 2 — loaded via UNETLoader in ComfyUI
+        "Krea 2",
    ]
 )

@@ -213,5 +229,6 @@ SUPPORTED_DOWNLOAD_SKIP_BASE_MODELS = frozenset(
        "Ernie",
        "Ernie Turbo",
        "Nucleus",
+        "Krea 2",
    ]
 )
@@ -12,6 +12,18 @@ from ..services.settings_manager import get_settings_manager

 _HEX_PATTERN = re.compile(r"[a-fA-F0-9]{64}")

+# Filesystem/metadata files that are never created by the example images system
+# and are safe to ignore during validation. The cleanup service only operates on
+# directories, so these files pose no data-loss risk.
+_SAFE_FILENAMES: frozenset[str] = frozenset({
+    ".DS_Store",       # macOS folder metadata
+    "Thumbs.db",       # Windows thumbnail cache
+    "desktop.ini",     # Windows folder customization
+    ".localized",      # macOS folder name localization
+    ".gitkeep",        # Placeholder to keep empty dirs in git
+    ".gitignore",      # Git ignore rules
+})
+
 logger = logging.getLogger(__name__)


@@ -180,6 +192,22 @@ def is_hash_folder(name: str) -> bool:
    return bool(_HEX_PATTERN.fullmatch(name or ""))


+def _is_safe_ignorable_entry(item: str, item_path: str) -> bool:
+    """Return True if *item* is a harmless system/hidden file we can skip.
+
+    These files are never created by the example images system and are safe to
+    ignore because the cleanup/delete operations only act on **directories**,
+    never on individual files (other than ``.download_progress.json``).
+    """
+    if item in _SAFE_FILENAMES:
+        return True
+    # Hide Unix hidden files (dotfiles) that are regular files,
+    # since the cleanup system never deletes or moves files.
+    if item.startswith(".") and os.path.isfile(item_path):
+        return True
+    return False
+
+
 def is_valid_example_images_root(folder_path: str) -> bool:
    """Check whether a folder looks like a dedicated example images root."""

@@ -190,9 +218,16 @@ def is_valid_example_images_root(folder_path: str) -> bool:

    for item in items:
        item_path = os.path.join(folder_path, item)
+
+        # .download_progress.json is an expected metadata file — check before
+        # the generic dotfile rule so it stays explicitly documented.
        if item == ".download_progress.json" and os.path.isfile(item_path):
            continue

+        # Skip harmless system/hidden files — cleanup only touches directories
+        if _is_safe_ignorable_entry(item, item_path):
+            continue
+
        if os.path.isdir(item_path):
            if is_hash_folder(item):
                continue
@@ -211,6 +246,41 @@ def is_valid_example_images_root(folder_path: str) -> bool:
    return True


+def find_non_compliant_items_in_example_images_root(folder_path: str) -> list[str]:
+    """Return the names of items that prevent *folder_path* from being a valid
+    example images root, or an empty list if the folder is valid.
+
+    This mirrors ``is_valid_example_images_root`` but **returns** the offending
+    names instead of a boolean, so callers can produce actionable error messages.
+    """
+    try:
+        items = os.listdir(folder_path)
+    except OSError as exc:
+        return [f"<cannot list directory: {exc}>"]
+
+    offending: list[str] = []
+
+    for item in items:
+        item_path = os.path.join(folder_path, item)
+
+        # Same skip rules as is_valid_example_images_root
+        if item == ".download_progress.json" and os.path.isfile(item_path):
+            continue
+        if _is_safe_ignorable_entry(item, item_path):
+            continue
+        if os.path.isdir(item_path):
+            if is_hash_folder(item):
+                continue
+            if item == "_deleted":
+                continue
+            if _library_folder_has_only_hash_dirs(item_path):
+                continue
+
+        offending.append(item)
+
+    return offending
+
+
 def _library_folder_has_only_hash_dirs(path: str) -> bool:
    """Return True when a library subfolder only contains hash folders or metadata files."""

@@ -1,7 +1,7 @@
 [project]
 name = "comfyui-lora-manager"
 description = "Revolutionize your workflow with the ultimate LoRA companion for ComfyUI!"
-version = "1.1.3"
+version = "1.1.6"
 license = {file = "LICENSE"}
 dependencies = [
    "aiohttp",
@@ -1,134 +0,0 @@
-{
-    "id": 1746460,
-    "name": "Mixplin Style [Illustrious]",
-    "type": "LORA",
-    "description": "description",
-    "username": "Ty_Lee",
-    "downloadCount": 4207,
-    "favoriteCount": 0,
-    "commentCount": 8,
-    "ratingCount": 0,
-    "rating": 0,
-    "is_nsfw": true,
-    "nsfw_level": 31,
-    "createdAt": "2025-07-06T01:51:42.859Z",
-    "updatedAt": "2025-10-10T23:15:26.714Z",
-    "deletedAt": null,
-    "tags": [
-        "art",
-        "style",
-        "artist style",
-        "styles",
-        "mixplin",
-        "artiststyle"
-    ],
-    "creator_id": "Ty_Lee",
-    "creator_username": "Ty_Lee",
-    "creator_name": "Ty_Lee",
-    "creator_url": "/users/Ty_Lee",
-    "versions": [
-        {
-            "id": 2042594,
-            "name": "v2.0",
-            "href": "/models/1746460?modelVersionId=2042594"
-        },
-        {
-            "id": 1976567,
-            "name": "v1.0",
-            "href": "/models/1746460?modelVersionId=1976567"
-        }
-    ],
-    "version": {
-        "id": 1976567,
-        "modelId": 1746460,
-        "name": "v1.0",
-        "baseModel": "Illustrious",
-        "baseModelType": "Standard",
-        "description": null,
-        "downloadCount": 437,
-        "ratingCount": 0,
-        "rating": 0,
-        "is_nsfw": true,
-        "nsfw_level": 31,
-        "createdAt": "2025-07-05T10:17:28.716Z",
-        "updatedAt": "2025-10-10T23:15:26.756Z",
-        "deletedAt": null,
-        "files": [
-            {
-                "id": 1874043,
-                "name": "mxpln-illustrious-ty_lee.safetensors",
-                "type": "Model",
-                "sizeKB": 223124.37109375,
-                "downloadUrl": "https://civitai.com/api/download/models/1976567",
-                "modelId": 1746460,
-                "modelName": "Mixplin Style [Illustrious]",
-                "modelVersionId": 1976567,
-                "is_nsfw": true,
-                "nsfw_level": 31,
-                "sha256": "e2b7a280d6539556f23f380b3f71e4e22bc4524445c4c96526e117c6005c6ad3",
-                "createdAt": "2025-07-05T10:17:28.716Z",
-                "updatedAt": "2025-10-10T23:15:26.766Z",
-                "is_primary": false,
-                "mirrors": [
-                    {
-                        "filename": "mxpln-illustrious-ty_lee.safetensors",
-                        "url": "https://civitai.com/api/download/models/1976567",
-                        "source": "civitai",
-                        "model_id": 1746460,
-                        "model_version_id": 1976567,
-                        "deletedAt": null,
-                        "is_gated": false,
-                        "is_paid": false
-                    }
-                ]
-            }
-        ],
-        "images": [
-            {
-                "id": 86403595,
-                "url": "https://img.genur.art/sig/width:450/quality:85/aHR0cHM6Ly9jLmdlbnVyLmFydC9hNmE3Njc2YS0wMWQ3LTQ1YzAtOWEzYS1mNWJiYTU4MDNiMDE=",
-                "nsfwLevel": 1,
-                "width": 1560,
-                "height": 2280,
-                "hash": "U7G8Zp0w02%IA6%N00-;D]-W~VNG0nMw-.IV",
-                "type": "image",
-                "minor": false,
-                "poi": false,
-                "hasMeta": true,
-                "hasPositivePrompt": true,
-                "onSite": false,
-                "remixOfId": null,
-                "image_url": "https://img.genur.art/sig/width:450/quality:85/aHR0cHM6Ly9jLmdlbnVyLmFydC9hNmE3Njc2YS0wMWQ3LTQ1YzAtOWEzYS1mNWJiYTU4MDNiMDE=",
-                "link": "https://genur.art/posts/86403595"
-            }
-        ],
-        "trigger": [
-            "mxpln"
-        ],
-        "allow_download": true,
-        "download_url": "/api/download/models/1976567",
-        "platform_url": "https://civitai.com/models/1746460?modelVersionId=1976567",
-        "civitai_model_id": 1746460,
-        "civitai_model_version_id": 1976567,
-        "href": "/models/1746460?modelVersionId=1976567",
-        "mirrors": [
-            {
-                "platform": "tensorart",
-                "href": "/tensorart/models/904473536033245448/versions/904473536033245448",
-                "platform_url": "https://tensor.art/models/904473536033245448",
-                "name": "Mixplin Style MXP",
-                "version_name": "Mixplin",
-                "id": "904473536033245448",
-                "version_id": "904473536033245448"
-            }
-        ]
-    },
-    "platform": "civitai",
-    "platform_name": "CivitAI",
-    "meta": {
-        "title": "Mixplin Style [Illustrious] - v1.0 - CivitAI Archive",
-        "description": "Mixplin Style [Illustrious] v1.0 is a Illustrious LORA AI model created by Ty_Lee for generating images of art, style, artist style, styles, mixplin, artiststyle",
-        "image": "https://img.genur.art/sig/width:450/quality:85/aHR0cHM6Ly9jLmdlbnVyLmFydC9hNmE3Njc2YS0wMWQ3LTQ1YzAtOWEzYS1mNWJiYTU4MDNiMDE=",
-        "canonical": "https://civarchive.com/models/1746460?modelVersionId=1976567"
-    }
-}
@@ -1,38 +0,0 @@
-CREATE TABLE models (
-            id         INTEGER PRIMARY KEY,
-            name       TEXT NOT NULL,
-            type       TEXT NOT NULL,
-            username   TEXT,
-            data       TEXT NOT NULL,
-            created_at INTEGER NOT NULL,
-            updated_at INTEGER NOT NULL
-        ) STRICT;
-CREATE TABLE model_versions (
-            id           INTEGER PRIMARY KEY,
-            model_id     INTEGER NOT NULL,
-            position     INTEGER NOT NULL,
-            name         TEXT NOT NULL,
-            base_model   TEXT NOT NULL,
-            published_at INTEGER,
-            data         TEXT NOT NULL,
-            created_at   INTEGER NOT NULL,
-            updated_at   INTEGER NOT NULL
-        ) STRICT;
-CREATE INDEX model_versions_model_id_idx ON model_versions (model_id);
-CREATE TABLE model_files (
-            id               INTEGER PRIMARY KEY,
-            model_id         INTEGER NOT NULL,
-            version_id       INTEGER NOT NULL,
-            type             TEXT NOT NULL,
-            sha256           TEXT,
-            data             TEXT NOT NULL,
-            created_at       INTEGER NOT NULL,
-            updated_at       INTEGER NOT NULL
-        ) STRICT;
-CREATE INDEX model_files_model_id_idx ON model_files (model_id);
-CREATE INDEX model_files_version_id_idx ON model_files (version_id);
-CREATE TABLE archived_model_files (
-            file_id INTEGER PRIMARY KEY,
-            model_id INTEGER NOT NULL,
-            version_id INTEGER NOT NULL
-        ) STRICT;
@@ -1,110 +0,0 @@
-{
-    "id": 1231067,
-    "name": "Vivid Impressions Storybook Style",
-    "description": "<h3 id=\"if-you'd-like-to-support-me-feel-free-to-visit-my-ko-fi-page.-please-share-your-images-using-the-&quot;+add-post&quot;-button-below.-it-supports-the-creators.-thanks!-nnfwkvfly\">If you'd like to support me, feel free to visit my <a target=\"_blank\" rel=\"ugc\" href=\"https://ko-fi.com/pixelpawsai\">Ko-Fi</a> page. ❤️<br /><br />Please share your images using the \"<span style=\"color:rgb(250, 82, 82)\">+add post</span>\" button below. It supports the creators. Thanks! 💕</h3><h3 id=\"if-you-like-my-lora-please-like-comment-or-donate-some-buzz.-much-appreciated!-vyeqok3go\">If you like my LoRA, please<span style=\"color:rgb(230, 73, 128)\"> </span><span style=\"color:rgb(250, 82, 82)\">like</span>, <span style=\"color:rgb(250, 82, 82)\">comment</span>, or <span style=\"color:#fa5252\">donate some Buzz</span>. Much appreciated! ❤️</h3><h3 id=\"-lo912t8rj\"></h3><h3 id=\"trigger-word:-ppstorybook-wlggllim2\"><strong><span style=\"color:rgb(253, 126, 20)\">Trigger word: </span></strong>ppstorybook</h3><h3 id=\"strength:-0.8-experiment-as-you-like-luvhks6za\"><strong><span style=\"color:rgb(253, 126, 20)\">Strength: </span></strong>0.8, experiment as you like</h3>",
-    "allowNoCredit": true,
-    "allowCommercialUse": [
-        "Image",
-        "RentCivit",
-        "Rent",
-        "Sell"
-    ],
-    "allowDerivatives": true,
-    "allowDifferentLicense": true,
-    "type": "LORA",
-    "minor": false,
-    "sfwOnly": false,
-    "poi": false,
-    "nsfw": false,
-    "nsfwLevel": 1,
-    "availability": "Public",
-    "cosmetic": null,
-    "supportsGeneration": true,
-    "stats": {
-        "downloadCount": 2183,
-        "favoriteCount": 0,
-        "thumbsUpCount": 416,
-        "thumbsDownCount": 0,
-        "commentCount": 12,
-        "ratingCount": 0,
-        "rating": 0,
-        "tippedAmountCount": 360
-    },
-    "creator": {
-        "username": "PixelPawsAI",
-        "image": "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/f3a1aa7c-0159-4dd8-884a-1e7ceb350f96/width=96/PixelPawsAI.jpeg"
-    },
-    "tags": [
-        "style",
-        "illustration",
-        "storybook"
-    ],
-    "modelVersions": [
-        {
-            "id": 1387174,
-            "index": 0,
-            "name": "v1.0",
-            "baseModel": "Flux.1 D",
-            "baseModelType": "Standard",
-            "createdAt": "2025-02-08T11:15:47.197Z",
-            "publishedAt": "2025-02-08T11:29:04.487Z",
-            "status": "Published",
-            "availability": "Public",
-            "nsfwLevel": 1,
-            "trainedWords": [
-                "ppstorybook"
-            ],
-            "covered": true,
-            "stats": {
-                "downloadCount": 2183,
-                "ratingCount": 0,
-                "rating": 0,
-                "thumbsUpCount": 416,
-                "thumbsDownCount": 0
-            },
-            "files": [
-                {
-                    "id": 1289799,
-                    "sizeKB": 18829.1484375,
-                    "name": "pp-storybook_rank2_bf16.safetensors",
-                    "type": "Model",
-                    "pickleScanResult": "Success",
-                    "pickleScanMessage": "No Pickle imports",
-                    "virusScanResult": "Success",
-                    "virusScanMessage": null,
-                    "scannedAt": "2025-02-08T11:21:04.247Z",
-                    "metadata": {
-                        "format": "SafeTensor"
-                    },
-                    "hashes": {
-                        "AutoV1": "F414C813",
-                        "AutoV2": "9753338AB6",
-                        "SHA256": "9753338AB693CA82BF89ED77A5D1912879E40051463EC6E330FB9866CE798668",
-                        "CRC32": "A65AE7B3",
-                        "BLAKE3": "A5F8AB95AC2486345E4ACCAE541FF19D97ED53EFB0A7CC9226636975A0437591",
-                        "AutoV3": "34A22376739D"
-                    },
-                    "downloadUrl": "https://civitai.com/api/download/models/1387174",
-                    "primary": true
-                }
-            ],
-            "images": [
-                {
-                    "url": "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/42b875cf-c62b-41fa-a349-383b7f074351/original=true/56547310.jpeg",
-                    "nsfwLevel": 1,
-                    "width": 832,
-                    "height": 1216,
-                    "hash": "U5IiO6s-4Vn+0~EO^5xa00VsL#IU_O?E7yWC",
-                    "type": "image",
-                    "minor": false,
-                    "poi": false,
-                    "hasMeta": true,
-                    "hasPositivePrompt": true,
-                    "onSite": false,
-                    "remixOfId": null
-                }
-            ],
-            "downloadUrl": "https://civitai.com/api/download/models/1387174"
-        }
-    ]
-}
@@ -1,100 +0,0 @@
-{
-    "id": 1387174,
-    "modelId": 1231067,
-    "name": "v1.0",
-    "createdAt": "2025-02-08T11:15:47.197Z",
-    "updatedAt": "2025-02-08T11:29:04.526Z",
-    "status": "Published",
-    "publishedAt": "2025-02-08T11:29:04.487Z",
-    "trainedWords": [
-        "ppstorybook"
-    ],
-    "trainingStatus": null,
-    "trainingDetails": null,
-    "baseModel": "Flux.1 D",
-    "baseModelType": null,
-    "earlyAccessEndsAt": null,
-    "earlyAccessConfig": null,
-    "description": null,
-    "uploadType": "Created",
-    "usageControl": "Download",
-    "air": "urn:air:flux1:lora:civitai:1231067@1387174",
-    "stats": {
-        "downloadCount": 1436,
-        "ratingCount": 0,
-        "rating": 0,
-        "thumbsUpCount": 316
-    },
-    "model": {
-        "name": "Vivid Impressions Storybook Style",
-        "type": "LORA",
-        "nsfw": false,
-        "poi": false
-    },
-    "files": [
-        {
-            "id": 1289799,
-            "sizeKB": 18829.1484375,
-            "name": "pp-storybook_rank2_bf16.safetensors",
-            "type": "Model",
-            "pickleScanResult": "Success",
-            "pickleScanMessage": "No Pickle imports",
-            "virusScanResult": "Success",
-            "virusScanMessage": null,
-            "scannedAt": "2025-02-08T11:21:04.247Z",
-            "metadata": {
-                "format": "SafeTensor",
-                "size": null,
-                "fp": null
-            },
-            "hashes": {
-                "AutoV1": "F414C813",
-                "AutoV2": "9753338AB6",
-                "SHA256": "9753338AB693CA82BF89ED77A5D1912879E40051463EC6E330FB9866CE798668",
-                "CRC32": "A65AE7B3",
-                "BLAKE3": "A5F8AB95AC2486345E4ACCAE541FF19D97ED53EFB0A7CC9226636975A0437591",
-                "AutoV3": "34A22376739D"
-            },
-            "primary": true,
-            "downloadUrl": "https://civitai.com/api/download/models/1387174"
-        }
-    ],
-    "images": [
-        {
-            "url": "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/42b875cf-c62b-41fa-a349-383b7f074351/width=832/56547310.jpeg",
-            "nsfwLevel": 1,
-            "width": 832,
-            "height": 1216,
-            "hash": "U5IiO6s-4Vn+0~EO^5xa00VsL#IU_O?E7yWC",
-            "type": "image",
-            "metadata": {
-                "hash": "U5IiO6s-4Vn+0~EO^5xa00VsL#IU_O?E7yWC",
-                "size": 1361590,
-                "width": 832,
-                "height": 1216
-            },
-            "meta": {
-                "Size": "832x1216",
-                "seed": 1116375220995209,
-                "Model": "flux_dev_fp8",
-                "steps": 23,
-                "hashes": {
-                    "model": ""
-                },
-                "prompt": "ppstorybook,A dreamy bunny hopping across a rainbow bridge, with fluffy clouds surrounding it and tiny birds flying alongside, rendered in a magical, soft-focus style with pastel hues and glowing accents.",
-                "Version": "ComfyUI",
-                "sampler": "DPM++ 2M",
-                "cfgScale": 3.5,
-                "clipSkip": 1,
-                "resources": [],
-                "Model hash": ""
-            },
-            "availability": "Public",
-            "hasMeta": true,
-            "hasPositivePrompt": true,
-            "onSite": false,
-            "remixOfId": null
-        }
-    ],
-    "downloadUrl": "https://civitai.com/api/download/models/1387174"
-}
@@ -1,153 +0,0 @@
-{
-    "resource-stack": {
-      "class_type": "CheckpointLoaderSimple",
-      "inputs": { "ckpt_name": "urn:air:sdxl:checkpoint:civitai:827184@1410435" }
-    },
-    "resource-stack-1": {
-      "class_type": "LoraLoader",
-      "inputs": {
-        "lora_name": "urn:air:sdxl:lora:civitai:1107767@1253442",
-        "strength_model": 1,
-        "strength_clip": 1,
-        "model": ["resource-stack", 0],
-        "clip": ["resource-stack", 1]
-      }
-    },
-    "resource-stack-2": {
-      "class_type": "LoraLoader",
-      "inputs": {
-        "lora_name": "urn:air:sdxl:lora:civitai:1342708@1516344",
-        "strength_model": 1,
-        "strength_clip": 1,
-        "model": ["resource-stack-1", 0],
-        "clip": ["resource-stack-1", 1]
-      }
-    },
-    "resource-stack-3": {
-      "class_type": "LoraLoader",
-      "inputs": {
-        "lora_name": "urn:air:sdxl:lora:civitai:122359@135867",
-        "strength_model": 1.55,
-        "strength_clip": 1,
-        "model": ["resource-stack-2", 0],
-        "clip": ["resource-stack-2", 1]
-      }
-    },
-    "6": {
-      "class_type": "smZ CLIPTextEncode",
-      "inputs": {
-        "text": "masterpiece, best quality, amazing quality, detailed setting, detailed background, 1girl, yunyun (konosuba), nude, red eyes, hair ornament, braid, hair between eyes,low twintails, pink ribbon, bow, hair bow, pussy, frilled skirt, layered skirt, belt, pink thighhighs, (pussy juice), large insertion, vaginal tugging, pussy grip, detailed skin, detailed soles, stretched pussy, feet in stockings, ass, nipples, medium breasts, french kiss, anus, shocked, nervous, penis awe,  BREAK Professor\u0027s office, college student, pornographic, 1boy, close eyes, (musscular male, detailed large cock), vaginal sex, college office setting, ass grab, fucking, riding, cowgirl, erotic, side view, deep fucking",
-        "parser": "comfy",
-        "text_g": "",
-        "text_l": "",
-        "ascore": 2.5,
-        "width": 0,
-        "height": 0,
-        "crop_w": 0,
-        "crop_h": 0,
-        "target_width": 0,
-        "target_height": 0,
-        "smZ_steps": 1,
-        "mean_normalization": true,
-        "multi_conditioning": true,
-        "use_old_emphasis_implementation": false,
-        "with_SDXL": false,
-        "clip": ["resource-stack-3", 1]
-      },
-      "_meta": { "title": "Positive" }
-    },
-    "7": {
-      "class_type": "smZ CLIPTextEncode",
-      "inputs": {
-        "text": "bad quality,worst quality,worst detail,sketch,censor",
-        "parser": "comfy",
-        "text_g": "",
-        "text_l": "",
-        "ascore": 2.5,
-        "width": 0,
-        "height": 0,
-        "crop_w": 0,
-        "crop_h": 0,
-        "target_width": 0,
-        "target_height": 0,
-        "smZ_steps": 1,
-        "mean_normalization": true,
-        "multi_conditioning": true,
-        "use_old_emphasis_implementation": false,
-        "with_SDXL": false,
-        "clip": ["resource-stack-3", 1]
-      },
-      "_meta": { "title": "Negative" }
-    },
-    "20": {
-      "class_type": "UpscaleModelLoader",
-      "inputs": { "model_name": "urn:air:other:upscaler:civitai:147759@164821" },
-      "_meta": { "title": "Load Upscale Model" }
-    },
-    "17": {
-      "class_type": "LoadImage",
-      "inputs": {
-        "image": "https://orchestration.civitai.com/v2/consumer/blobs/5KZ6358TW8CNEGPZKD08NVDB30",
-        "upload": "image"
-      },
-      "_meta": { "title": "Image Load" }
-    },
-    "19": {
-      "class_type": "ImageUpscaleWithModel",
-      "inputs": { "upscale_model": ["20", 0], "image": ["17", 0] },
-      "_meta": { "title": "Upscale Image (using Model)" }
-    },
-    "23": {
-      "class_type": "ImageScale",
-      "inputs": {
-        "upscale_method": "nearest-exact",
-        "crop": "disabled",
-        "width": 1280,
-        "height": 1856,
-        "image": ["19", 0]
-      },
-      "_meta": { "title": "Upscale Image" }
-    },
-    "21": {
-      "class_type": "VAEEncode",
-      "inputs": { "pixels": ["23", 0], "vae": ["resource-stack", 2] },
-      "_meta": { "title": "VAE Encode" }
-    },
-    "11": {
-      "class_type": "KSampler",
-      "inputs": {
-        "sampler_name": "euler_ancestral",
-        "scheduler": "normal",
-        "seed": 2088370631,
-        "steps": 47,
-        "cfg": 6.5,
-        "denoise": 0.3,
-        "model": ["resource-stack-3", 0],
-        "positive": ["6", 0],
-        "negative": ["7", 0],
-        "latent_image": ["21", 0]
-      },
-      "_meta": { "title": "KSampler" }
-    },
-    "13": {
-      "class_type": "VAEDecode",
-      "inputs": { "samples": ["11", 0], "vae": ["resource-stack", 2] },
-      "_meta": { "title": "VAE Decode" }
-    },
-    "12": {
-      "class_type": "SaveImage",
-      "inputs": { "filename_prefix": "ComfyUI", "images": ["13", 0] },
-      "_meta": { "title": "Save Image" }
-    },
-    "extra": {
-      "airs": [
-        "urn:air:other:upscaler:civitai:147759@164821",
-        "urn:air:sdxl:checkpoint:civitai:827184@1410435",
-        "urn:air:sdxl:lora:civitai:1107767@1253442",
-        "urn:air:sdxl:lora:civitai:1342708@1516344",
-        "urn:air:sdxl:lora:civitai:122359@135867"
-      ]
-    },
-    "extraMetadata": "{\u0022prompt\u0022:\u0022masterpiece, best quality, amazing quality, detailed setting, detailed background, 1girl, yunyun (konosuba), nude, red eyes, hair ornament, braid, hair between eyes,low twintails, pink ribbon, bow, hair bow, pussy, frilled skirt, layered skirt, belt, pink thighhighs, (pussy juice), large insertion, vaginal tugging, pussy grip, detailed skin, detailed soles, stretched pussy, feet in stockings, ass, nipples, medium breasts, french kiss, anus, shocked, nervous, penis awe,  BREAK Professor\u0027s office, college student, pornographic, 1boy, close eyes, (musscular male, detailed large cock), vaginal sex, college office setting, ass grab, fucking, riding, cowgirl, erotic, side view, deep fucking\u0022,\u0022negativePrompt\u0022:\u0022bad quality,worst quality,worst detail,sketch,censor\u0022,\u0022steps\u0022:47,\u0022cfgScale\u0022:6.5,\u0022sampler\u0022:\u0022euler_ancestral\u0022,\u0022workflowId\u0022:\u0022img2img-hires\u0022,\u0022resources\u0022:[{\u0022modelVersionId\u0022:1410435,\u0022strength\u0022:1},{\u0022modelVersionId\u0022:1410435,\u0022strength\u0022:1},{\u0022modelVersionId\u0022:1253442,\u0022strength\u0022:1},{\u0022modelVersionId\u0022:1516344,\u0022strength\u0022:1},{\u0022modelVersionId\u0022:135867,\u0022strength\u0022:1.55}],\u0022remixOfId\u0022:32140259}"
-  }
-  
@@ -1,18 +0,0 @@
-a dynamic and dramatic digital artwork featuring a stylized anthropomorphic white tiger with striking yellow eyes. The tiger is depicted in a powerful stance, wielding a katana with one hand raised above its head. Its fur is detailed with black stripes, and its mane flows wildly, blending with the stormy background. The scene is set amidst swirling dark clouds and flashes of lightning, enhancing the sense of movement and energy. The composition is vertical, with the tiger positioned centrally, creating a sense of depth and intensity. The color palette is dominated by shades of blue, gray, and white, with bright highlights from the lightning. The overall style is reminiscent of fantasy or manga art, with a focus on dynamic action and dramatic lighting.
-Negative prompt:
-Steps: 30, Sampler: Undefined, CFG scale: 3.5, Seed: 90300501, Size: 832x1216, Clip skip: 2, Created Date: 2025-03-05T13:51:18.1770234Z, Civitai resources: [{"type":"checkpoint","modelVersionId":691639,"modelName":"FLUX","modelVersionName":"Dev"},{"type":"lora","weight":0.4,"modelVersionId":1202162,"modelName":"Velvet\u0027s Mythic Fantasy Styles | Flux \u002B Pony \u002B illustrious","modelVersionName":"Flux Gothic Lines"},{"type":"lora","weight":0.8,"modelVersionId":1470588,"modelName":"Velvet\u0027s Mythic Fantasy Styles | Flux \u002B Pony \u002B illustrious","modelVersionName":"Flux Retro"},{"type":"lora","weight":0.75,"modelVersionId":746484,"modelName":"Elden Ring - Yoshitaka Amano","modelVersionName":"V1"},{"type":"lora","weight":0.2,"modelVersionId":914935,"modelName":"Ink-style","modelVersionName":"ink-dynamic"},{"type":"lora","weight":0.2,"modelVersionId":1189379,"modelName":"Painterly Fantasy by ChronoKnight - [FLUX \u0026 IL]","modelVersionName":"FLUX"},{"type":"lora","weight":0.2,"modelVersionId":757030,"modelName":"Mezzotint Artstyle for Flux - by Ethanar","modelVersionName":"V1"}], Civitai metadata: {}
-
-masterpiece, best quality, good quality, very aesthetic, absurdres, newest, 8K, depth of field, focused subject,
-dynamic angle, dutch angle, from below, epic half body portrait, gritty, wabi sabi, looking at viewer, woman is a geisha, parted lips,
-holographic skin, holofoil glitter, faint, glowing, ethereal, neon hair, glowing hair, otherworldly glow, she is dangerous
-<lora:ck-shadow-circuit-IL:0.78>, <lora:ck-nc-cyberpunk-IL-000011:0.4>, <lora:ck-neon-retrowave-IL:0.2>, <lora:ck-yoneyama-mai-IL-000014:0.4>
-Negative prompt: score_6, score_5, score_4, bad quality, worst quality, worst detail, sketch, censorship, furry, window, headphones,
-Steps: 30, Sampler: Euler a, Schedule type: Simple, CFG scale: 7, Seed: 1405717592, Size: 832x1216, Model hash: 1ad6ca7f70, Model: waiNSFWIllustrious_v100, Denoising strength: 0.35, Hires CFG Scale: 5, Hires upscale: 1.3, Hires steps: 20, Hires upscaler: 4x-AnimeSharp, Lora hashes: "ck-shadow-circuit-IL: 88e247aa8c3d, ck-nc-cyberpunk-IL-000011: 935e6755554c, ck-neon-retrowave-IL: edafb9df7da1, ck-yoneyama-mai-IL-000014: 1b9305692a2e", Version: f2.0.1v1.10.1-1.10.1, Diffusion in Low Bits: Automatic (fp16 LoRA)
-
-Masterpiece, best quality, high quality, newest, highres, 8K, HDR, absurdres, 1girl, solo, futuristic warrior, sleek exosuit with glowing energy cores, long braided hair flowing behind, gripping a high-tech bow with an energy arrow drawn, standing on a floating platform overlooking a massive space station, planets and nebulae in the distance, soft glow from distant stars, cinematic depth, foreshortening, dynamic pose, dramatic sci-fi lighting.
-Negative prompt: worst quality, normal quality, anatomical nonsense, bad anatomy,interlocked fingers, extra fingers,watermark,simple background, loli,
-Steps: 20, Sampler: euler_ancestral_karras, CFG scale: 8.0, Seed: 691121152183439, Model: il\waiNSFWIllustrious_v110.safetensors, Model hash: c3688ee04c, Lora_0 Model name: iLLMythAn1m3Style.safetensors, Lora_0 Model hash: ba7a040786, Lora_0 Strength model: 1.0, Lora_0 Strength clip: 1.0, Hashes: {"model": "c3688ee04c", "lora:iLLMythAn1m3Style": "ba7a040786"}
-
-Immerse yourself in the enchanting journey, where harmonious transmutation of Bauhaus art unites photographic precision and contemporary illustration, capturing an enthralling blend between vivid abstract nature and urban landscapes. Let your eyes be captivated by a kaleidoscope of rich, deep reds and yellows, entwined with intriguing shades that beckon a somber atmosphere. As your spirit ventures along this haunting path, witness the mysterious, high-angle perspective dominated by scattered clouds – granting you a mesmerizing glimpse into the ever-transforming realm of metamorphosing environments. ,<lora:flux/fav/ck-charcoal-drawing-000014.safetensors:1.0:1.0>   
-Negative prompt:
-Steps: 20, Sampler: Euler, CFG scale: 3.5, Seed: 885491426361006, Size: 832x1216, Model hash: 4610115bb0, Model: flux_dev, Hashes: {"LORA:flux/fav/ck-charcoal-drawing-000014.safetensors": "34d36c17c1", "model": "4610115bb0"}, Version: ComfyUI
@@ -1,3 +0,0 @@
-In this ethereal masterpiece, metallic sculptures juxtapose effortlessly against a subtle backdrop of misty neutral hues. Exquisite curvatures and geometric shapes converge harmoniously, creating an illuminating realm of polished metallic surfaces. Shimmering copper, gleaming silver, and lustrous gold hues dance in perfect balance, highlighting the intricate play of light and shadow cast upon these celestial forms.  A halo of diffused radiance envelops each piece, enhancing their textured depths and metallic brilliance while allowing delicate details to emerge from obscurity. The composition conveys a serene yet mesmerizing atmosphere, as if suspended in a dreamlike limbo between reality and fantasy. The tantalizing interplay of colors within this transcendent realm creates a profound sense of depth and grandeur that invites the viewer into an enchanting voyage through abstract metallic beauty.  This captivating artwork evokes emotions of boundless curiosity and reverence reminiscent of the timeless works by artists such as Giorgio de Chirico or Paul Klee, while asserting a unique, modern artistic sensibility. With every observation, a new nuance unfolds, as if a never-ending story waiting to be discovered through the lens of metallic artistry.
-Negative prompt:
-Steps: 25, Sampler: dpmpp_2m_sgm_uniform, Seed: 471889513588087, Model: Fluxmania V5P.safetensors, Model hash: 8ae0583b06, VAE: ae.sft, VAE hash: afc8e28272, Lora_0 Model name: ArtVador I.safetensors, Lora_0 Model hash: 08f7133a58, Lora_0 Strength model: 0.65, Lora_0 Strength clip: 0.65, Lora_1 Model name: Kaoru Yamada.safetensors, Lora_1 Model hash: d4893f7202, Lora_1 Strength model: 0.75, Lora_1 Strength clip: 0.75, Hashes: {"model": "8ae0583b06", "vae": "afc8e28272", "lora:ArtVador I": "08f7133a58", "lora:Kaoru Yamada": "d4893f7202"}
@@ -1,33 +0,0 @@
-{
-    "id": "42803a29-02dc-49e1-b798-27da70e8b408",
-    "file_path": "/home/miao/workspace/ComfyUI/models/loras/recipes/test/42803a29-02dc-49e1-b798-27da70e8b408.webp",
-    "title": "masterpiece, best quality, amazing quality, very aesthetic, detailed eyes, perfect",
-    "modified": 1754897325.0507245,
-    "created_date": 1754897325.0507245,
-    "base_model": "Illustrious",
-    "loras": [
-        {
-            "file_name": "",
-            "hash": "1b5b763d83961bb5745f3af8271ba83f1d4fd69c16278dae6d5b4e194bdde97a",
-            "strength": 1.0,
-            "modelVersionId": 2007092,
-            "modelName": "Pony: People's Works +",
-            "modelVersionName": "v8_Illusv1.0",
-            "isDeleted": false,
-            "exclude": false
-        }
-    ],
-    "gen_params": {
-        "prompt": "masterpiece, best quality, amazing quality, very aesthetic, detailed eyes, perfect eyes, realistic eyes,\n(flat colors:1.5), (anime:1.5), (lineart:1.5),\nclose-up, solo, tongue, 1girl, food, (saliva:0.1), open mouth, candy, simple background, blue background, large lollipop, tongue out, fade background, lips, hand up, holding, looking at viewer, licking, seductive, half-closed eyes,",
-        "negative_prompt": "shiny skin,",
-        "steps": 19,
-        "sampler": "Euler a",
-        "cfg_scale": 5,
-        "seed": 1765271748,
-        "size": "832x1216",
-        "clip_skip": 2
-    },
-    "fingerprint": "1b5b763d83961bb5745f3af8271ba83f1d4fd69c16278dae6d5b4e194bdde97a:1.0",
-    "source_path": "https://civitai.com/images/92427432",
-    "folder": "test"
-}
@@ -1,42 +0,0 @@
-{
-  "id": 2269146,
-  "modelId": 2004760,
-  "name": "v1.0 Illustrious",
-  "nsfwLevel": 1,
-  "trainedWords": ["PencilSketchDaal"],
-  "baseModel": "Illustrious",
-  "description": "<p>Illustrious. Your pencil may vary with your checkpoint. </p>",
-  "model": {
-    "name": "Pencil Sketch Anime",
-    "type": "LORA",
-    "nsfw": false,
-    "description": "description",
-    "tags": ["style"],
-    "allowNoCredit": true,
-    "allowCommercialUse": ["Sell"],
-    "allowDerivatives": true,
-    "allowDifferentLicense": true
-  },
-  "files": [
-    {
-      "id": 2161260,
-      "sizeKB": 223106.37890625,
-      "name": "Pencil-Sketch-Illustrious.safetensors",
-      "type": "Model",
-      "hashes": {
-        "SHA256": "2C70479CD673B0FE056EAF4FD97C7F33A39F14853805431AC9AB84226ECE3B82"
-      },
-      "primary": true,
-      "downloadUrl": "https://civitai.com/api/download/models/2269146",
-      "mirrors": {}
-    }
-  ],
-  "images": [
-    {},
-    {}
-  ],
-  "creator": {
-    "username": "Daalis",
-    "image": "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/eb245b49-edc8-4ed6-ad7b-6d61eb8c51de/width=96/Daalis.jpeg"
-  }
-}
@@ -1,91 +0,0 @@
-{
-  "id": 1255556,
-  "modelId": 1117241,
-  "name": "v1.0",
-  "createdAt": "2025-01-08T06:13:08.839Z",
-  "updatedAt": "2025-01-08T06:28:54.156Z",
-  "status": "Published",
-  "publishedAt": "2025-01-08T06:28:54.155Z",
-  "trainedWords": ["in the style of ppWhimsy"],
-  "trainingStatus": null,
-  "trainingDetails": null,
-  "baseModel": "Flux.1 D",
-  "baseModelType": "Standard",
-  "earlyAccessEndsAt": null,
-  "earlyAccessConfig": null,
-  "description": null,
-  "uploadType": "Created",
-  "usageControl": "Download",
-  "air": "urn:air:flux1:lora:civitai:1117241@1255556",
-  "stats": {
-    "downloadCount": 210,
-    "ratingCount": 0,
-    "rating": 0,
-    "thumbsUpCount": 26
-  },
-  "model": {
-    "name": "Enchanted Whimsy style (Flux)",
-    "type": "LORA",
-    "nsfw": false,
-    "poi": false
-  },
-  "files": [
-    {
-      "id": 1160774,
-      "sizeKB": 38828.8125,
-      "name": "pp-enchanted-whimsy.safetensors",
-      "type": "Model",
-      "pickleScanResult": "Success",
-      "pickleScanMessage": "No Pickle imports",
-      "virusScanResult": "Success",
-      "virusScanMessage": null,
-      "scannedAt": "2025-01-08T06:16:27.731Z",
-      "metadata": {
-        "format": "SafeTensor",
-        "size": null,
-        "fp": null
-      },
-      "hashes": {
-        "AutoV1": "40CAF049",
-        "AutoV2": "3202778C3E",
-        "SHA256": "3202778C3EBE5CF7EBE5FC51561DEAE8611F4362036EB7C02EFA033C705E6240",
-        "CRC32": "69DCD953",
-        "BLAKE3": "ED04580DDB1AD36D8B87F4B0800F5930C7E5D4A7269BDC2BE26ED77EA1A34697",
-        "AutoV3": "BF82986F8597"
-      },
-      "primary": true,
-      "downloadUrl": "https://civitai.com/api/download/models/1255556"
-    }
-  ],
-  "images": [
-    {
-      "url": "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/707aef9b-36fb-46c2-ac41-adcab539d3a6/width=832/50270101.jpeg",
-      "nsfwLevel": 1,
-      "width": 832,
-      "height": 1216,
-      "hash": "U7Am@@$^J3%100R;pLR.M]tQ-ps+?wRiVrof",
-      "type": "image",
-      "metadata": {
-        "hash": "U7Am@@$^J3%100R;pLR.M]tQ-ps+?wRiVrof",
-        "size": 702313,
-        "width": 832,
-        "height": 1216
-      },
-      "minor": false,
-      "poi": false,
-      "meta": {
-        "prompt": "in the style of ppWhimsy, a close-up of a boy with a crown of ferns and tiny horns, his eyes wide with wonder as a family of glowing hedgehogs nestle in his hands, their spines shimmering with soft pastel colors"
-      },
-      "availability": "Public",
-      "hasMeta": true,
-      "hasPositivePrompt": true,
-      "onSite": false,
-      "remixOfId": null
-    }
-  ],
-  "downloadUrl": "https://civitai.com/api/download/models/1255556",
-  "creator": {
-    "username": "PixelPawsAI",
-    "image": "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/f3a1aa7c-0159-4dd8-884a-1e7ceb350f96/width=96/PixelPawsAI.jpeg"
-  }
-}
@@ -349,8 +349,8 @@
 }

 .progress-percentage {
-    font-size: 1.2em;
-    font-weight: 600;
+    font-size: var(--text-lg);
+    font-weight: var(--weight-semibold);
    color: var(--lora-accent);
 }

@@ -365,9 +365,9 @@

 .progress-bar {
    height: 100%;
-    background: linear-gradient(90deg, var(--lora-accent), oklch(from var(--lora-accent) calc(l + 0.1) c h));
-    border-radius: 4px;
-    transition: width 0.3s ease;
+    background: var(--lora-accent);
+    border-radius: var(--border-radius-xs);
+    transition: width var(--transition-base);
 }

 /* Progress Stats */
@@ -389,27 +389,26 @@
 }

 .stat-item.success {
-    border-left: 3px solid #00B87A;
+    border-left: 4px solid var(--color-success);
 }

 .stat-item.failed {
-    border-left: 3px solid var(--lora-error);
+    border-left: 4px solid var(--color-error);
 }

 .stat-item.skipped {
-    border-left: 3px solid var(--lora-warning);
+    border-left: 4px solid var(--color-warning);
 }

 .stat-label {
-    font-size: 0.8em;
-    color: var(--text-color);
-    opacity: 0.7;
+    font-size: var(--text-xs);
+    color: var(--text-secondary);
    margin-bottom: 4px;
 }

 .stat-value {
-    font-size: 1.4em;
-    font-weight: 600;
+    font-size: var(--text-lg);
+    font-weight: var(--weight-semibold);
    color: var(--text-color);
 }

@@ -425,8 +424,7 @@
 }

 .current-item-label {
-    color: var(--text-color);
-    opacity: 0.7;
+    color: var(--text-secondary);
    flex-shrink: 0;
 }

@@ -449,27 +447,29 @@
 }

 .results-header {
-    text-align: center;
+    display: flex;
+    align-items: center;
+    gap: var(--space-2);
    margin-bottom: var(--space-3);
 }

 .results-icon {
-    font-size: 3em;
-    color: #00B87A;
-    margin-bottom: var(--space-1);
+    font-size: var(--text-xl);
+    color: var(--color-success);
+    flex-shrink: 0;
 }

 .results-icon.warning {
-    color: var(--lora-warning);
+    color: var(--color-warning);
 }

 .results-icon.error {
-    color: var(--lora-error);
+    color: var(--color-error);
 }

 .results-title {
-    font-size: 1.3em;
-    font-weight: 600;
+    font-size: var(--text-lg);
+    font-weight: var(--weight-semibold);
    color: var(--text-color);
 }

@@ -493,27 +493,26 @@
 }

 .result-card.success {
-    border-left: 3px solid #00B87A;
+    border-left: 4px solid var(--color-success);
 }

 .result-card.failed {
-    border-left: 3px solid var(--lora-error);
+    border-left: 4px solid var(--color-error);
 }

 .result-card.skipped {
-    border-left: 3px solid var(--lora-warning);
+    border-left: 4px solid var(--color-warning);
 }

 .result-label {
-    font-size: 0.8em;
-    color: var(--text-color);
-    opacity: 0.7;
+    font-size: var(--text-xs);
+    color: var(--text-secondary);
    margin-bottom: 4px;
 }

 .result-value {
-    font-size: 1.4em;
-    font-weight: 600;
+    font-size: var(--text-lg);
+    font-weight: var(--weight-semibold);
    color: var(--text-color);
 }

@@ -527,13 +526,13 @@
    display: flex;
    align-items: center;
    justify-content: center;
-    gap: 8px;
-    padding: 10px;
+    gap: var(--space-2);
+    padding: var(--space-2);
    cursor: pointer;
    color: var(--lora-accent);
-    font-weight: 500;
+    font-weight: var(--weight-medium);
    border-radius: var(--border-radius-xs);
-    transition: background 0.2s;
+    transition: background var(--transition-base);
 }

 .details-toggle:hover {
@@ -541,7 +540,7 @@
 }

 .details-toggle i {
-    transition: transform 0.2s;
+    transition: transform var(--transition-base);
 }

 .details-toggle.expanded i {
@@ -561,10 +560,10 @@
 .result-item {
    display: flex;
    align-items: center;
-    gap: 10px;
-    padding: 10px 12px;
+    gap: var(--space-2);
+    padding: var(--space-2) var(--space-3);
    border-bottom: 1px solid var(--border-color);
-    font-size: 0.9em;
+    font-size: var(--text-sm);
 }

 .result-item:last-child {
@@ -572,28 +571,23 @@
 }

 .result-item-status {
-    width: 24px;
-    height: 24px;
-    border-radius: 50%;
    display: flex;
    align-items: center;
    justify-content: center;
-    font-size: 0.8em;
+    font-size: var(--text-sm);
+    flex-shrink: 0;
 }

 .result-item-status.success {
-    background: oklch(from #00B87A l c h / 0.2);
-    color: #00B87A;
+    color: var(--color-success);
 }

 .result-item-status.failed {
-    background: oklch(from var(--lora-error) l c h / 0.2);
-    color: var(--lora-error);
+    color: var(--color-error);
 }

 .result-item-status.skipped {
-    background: oklch(from var(--lora-warning) l c h / 0.2);
-    color: var(--lora-warning);
+    color: var(--color-warning);
 }

 .result-item-info {
@@ -610,8 +604,8 @@
 }

 .result-item-error {
-    font-size: 0.8em;
-    color: var(--lora-error);
+    font-size: var(--text-xs);
+    color: var(--color-error);
    margin-top: 2px;
 }

@@ -661,11 +655,11 @@

 /* Completed State */
 .batch-progress-container.completed .progress-bar {
-    background: #00B87A;
+    background: var(--color-success);
 }

 .batch-progress-container.completed .status-icon {
-    color: #00B87A;
+    color: var(--color-success);
 }

 .batch-progress-container.completed .status-icon i {
@@ -1,6 +1,7 @@
 /* Style for selected cards */
 .model-card.selected {
-    box-shadow: 0 0 0 2px var(--lora-accent);
+    outline: 2px solid var(--lora-accent);
+    outline-offset: -2px;
    position: relative;
 }

@@ -509,6 +509,50 @@
    background: rgba(0,0,0,0.18); /* Optional: subtle background for contrast */
 }

+/* Clickable version count link (shown in group-by-model mode) */
+.version-count-link {
+    display: inline-block;
+    color: var(--color-accent);
+    text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5);
+    font-size: 0.85em;
+    line-height: 1.4;
+    margin-top: 2px;
+    border: 1px solid var(--color-accent-border);
+    border-radius: var(--border-radius-xs);
+    padding: 1px 6px;
+    background: var(--color-accent-subtle);
+    cursor: pointer;
+    transition: background 0.15s ease, border-color 0.15s ease;
+}
+.version-count-link:hover {
+    background: var(--color-accent-border);
+    border-color: var(--color-accent-transparent);
+}
+
+/* Medium density adjustments for version count link */
+.medium-density .version-count-link {
+    font-size: 0.8em;
+}
+
+.medium-density .badge-version-unit .version-count-link {
+    max-width: 90px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+/* Compact density adjustments for version count link */
+.compact-density .version-count-link {
+    font-size: 0.75em;
+}
+
+.compact-density .badge-version-unit .version-count-link {
+    max-width: 70px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
 /* Version row — flex container for badges + version names */
 .version-row {
    display: flex;
@@ -690,6 +734,21 @@ body.hide-card-version .hl-badge {
    }
 }

+/* Grid-scoped loading overlay (replaces full-page overlay for VirtualScroller refreshes) */
+.grid-loading-overlay {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: var(--lora-bg-transparent, oklch(0% 0 0 / 0.3));
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    z-index: 100;
+    pointer-events: none;
+}
+
 /* Add after the existing .model-card:hover styles */

@keyframes update-pulse {
@@ -5,10 +5,10 @@
    position: sticky; /* Keep the sticky position */
    top: var(--space-1);
    width: 100%;
-    background-color: oklch(var(--lora-accent-l) var(--lora-accent-c) var(--lora-accent-h) / 0.1); /* Use accent color with low opacity */
+    background-color: oklch(var(--color-accent-l) var(--color-accent-c) var(--color-accent-h) / 0.1); /* Use accent color with low opacity */
    color: var(--text-color);
-    border-top: 1px solid oklch(var(--lora-accent-l) var(--lora-accent-c) var(--lora-accent-h) / 0.3); /* Add top border with accent color */
-    border-bottom: 1px solid oklch(var(--lora-accent-l) var(--lora-accent-c) var(--lora-accent-h) / 0.4); /* Make bottom border stronger */
+    border-top: 1px solid oklch(var(--color-accent-l) var(--color-accent-c) var(--color-accent-h) / 0.3); /* Add top border with accent color */
+    border-bottom: 1px solid oklch(var(--color-accent-l) var(--color-accent-c) var(--color-accent-h) / 0.4); /* Make bottom border stronger */
    z-index: var(--z-overlay);
    padding: 12px 0;
    box-shadow: var(--shadow-lg); /* Stronger shadow */
@@ -41,7 +41,7 @@

 .duplicates-banner i.fa-exclamation-triangle {
    font-size: 18px;
-    color: oklch(var(--lora-warning-l) var(--lora-warning-c) var(--lora-warning-h));
+    color: oklch(var(--color-warning-l) var(--color-warning-c) var(--color-warning-h));
 }

 .duplicates-banner .banner-actions {
@@ -70,7 +70,7 @@

 .duplicates-banner button.btn-exit-mode:hover {
    background-color: var(--bg-color);
-    border-color: var(--lora-accent-l) var(--lora-accent-c) var(--lora-accent-h);
+    border-color: oklch(var(--color-accent-l) var(--color-accent-c) var(--color-accent-h));
    transform: translateY(-1px);
 }

@@ -92,7 +92,7 @@
 }

 .duplicates-banner button:hover {
-    border-color: var(--lora-accent-l) var(--lora-accent-c) var(--lora-accent-h);
+    border-color: oklch(var(--color-accent-l) var(--color-accent-c) var(--color-accent-h));
    background: var(--bg-color);
    transform: translateY(-1px);
    box-shadow: var(--shadow-sm);
@@ -117,7 +117,7 @@
 /* Duplicate groups */
 .duplicate-group {
    position: relative;
-    border: 2px solid oklch(var(--lora-warning-l) var(--lora-warning-c) var(--lora-warning-h));
+    border: 2px solid oklch(var(--color-warning-l) var(--color-warning-c) var(--color-warning-h));
    border-radius: var(--border-radius-base);
    padding: 16px;
    margin-bottom: 24px;
@@ -152,7 +152,7 @@
    display: flex;
    justify-content: space-between;
    align-items: center;
-    border-left: 4px solid oklch(var(--lora-warning-l) var(--lora-warning-c) var(--lora-warning-h)); /* Add accent border on the left */
+    border-left: 4px solid oklch(var(--color-warning-l) var(--color-warning-c) var(--color-warning-h)); /* Add accent border on the left */
 }

 .duplicate-group-header span:last-child {
@@ -180,7 +180,7 @@
 }

 .duplicate-group-header button:hover {
-    border-color: var(--lora-accent-l) var(--lora-accent-c) var(--lora-accent-h);
+    border-color: oklch(var(--color-accent-l) var(--color-accent-c) var(--color-accent-h));
    background: var(--bg-color);
    transform: translateY(-1px);
    box-shadow: var(--shadow-sm);
@@ -235,7 +235,7 @@
 }

 .group-toggle-btn:hover {
-    border-color: var(--lora-accent-l) var(--lora-accent-c) var (--lora-accent-h);
+    border-color: oklch(var(--color-accent-l) var(--color-accent-c) var(--color-accent-h));
    transform: translateY(-1px);
    box-shadow: var(--shadow-sm);
 }
@@ -247,16 +247,16 @@
 }

 .model-card.duplicate:hover {
-    border-color: var(--lora-accent-l) var(--lora-accent-c) var(--lora-accent-h);
+    border-color: oklch(var(--color-accent-l) var(--color-accent-c) var(--color-accent-h));
 }

 .model-card.duplicate.latest {
    border-style: solid;
-    border-color: oklch(var(--lora-warning-l) var(--lora-warning-c) var(--lora-warning-h));
+    border-color: oklch(var(--color-warning-l) var(--color-warning-c) var(--color-warning-h));
 }

 .model-card.duplicate-selected {
-    border: 2px solid oklch(var(--lora-accent-l) var(--lora-accent-c) var(--lora-accent-h));
+    border: 2px solid oklch(var(--color-accent-l) var(--color-accent-c) var(--color-accent-h));
    box-shadow: var(--shadow-md);
 }

@@ -276,7 +276,7 @@
    position: absolute;
    top: 10px;
    left: 10px;
-    background: oklch(var(--lora-accent-l) var(--lora-accent-c) var(--lora-accent-h));
+    background: oklch(var(--color-accent-l) var(--color-accent-c) var(--color-accent-h));
    color: white;
    font-size: 12px;
    padding: 2px 6px;
@@ -328,7 +328,7 @@
    margin-top: 8px;
    padding-top: 8px;
    border-top: 1px dashed var(--border-color);
-    color: oklch(var(--lora-warning-l) var(--lora-warning-c) var(--lora-warning-h));
+    color: oklch(var(--color-warning-l) var(--color-warning-c) var(--color-warning-h));
    font-weight: bold;
    word-break: break-all; /* Ensure long hashes wrap properly */
 }
@@ -351,12 +351,12 @@
 }

 .verification-badge.verified {
-    background-color: oklch(70% 0.2 140); /* Green for verified */
+    background-color: var(--color-success); /* Green for verified */
    color: white;
 }

 .verification-badge.mismatch {
-    background-color: oklch(var(--lora-warning-l) var(--lora-warning-c) var(--lora-warning-h));
+    background-color: oklch(var(--color-warning-l) var(--color-warning-c) var(--color-warning-h));
    color: white;
 }

@@ -366,7 +366,7 @@

 /* Hash Mismatch Styling */
 .model-card.duplicate.hash-mismatch {
-    border: 2px dashed oklch(var(--lora-warning-l) var(--lora-warning-c) var(--lora-warning-h));
+    border: 2px dashed oklch(var(--color-warning-l) var(--color-warning-c) var(--color-warning-h));
    opacity: 0.85;
    position: relative;
 }
@@ -380,8 +380,8 @@
    bottom: 0;
    background: repeating-linear-gradient(
        45deg,
-        oklch(var(--lora-warning-l) var(--lora-warning-c) var(--lora-warning-h) / 0.05),
-        oklch(var(--lora-warning-l) var(--lora-warning-c) var(--lora-warning-h) / 0.05) 10px,
+        oklch(var(--color-warning-l) var(--color-warning-c) var(--color-warning-h) / 0.05),
+        oklch(var(--color-warning-l) var(--color-warning-c) var(--color-warning-h) / 0.05) 10px,
        transparent 10px,
        transparent 20px
    );
@@ -398,7 +398,7 @@
    position: absolute;
    top: 10px;
    left: 10px; /* Changed from right:10px to left:10px */
-    background: oklch(var(--lora-warning-l) var(--lora-warning-c) var(--lora-warning-h));
+    background: oklch(var(--color-warning-l) var(--color-warning-c) var(--color-warning-h));
    color: white;
    font-size: 12px;
    padding: 3px 8px;
@@ -417,7 +417,7 @@
    margin-top: 8px;
    padding-top: 8px;
    border-top: 1px dashed var(--border-color);
-    color: oklch(var(--lora-warning-l) var(--lora-warning-c) var(--lora-warning-h));
+    color: oklch(var(--color-warning-l) var(--color-warning-c) var(--color-warning-h));
    font-weight: bold;
 }

@@ -437,7 +437,7 @@

 .btn-verify-hashes:hover {
    background: var(--bg-color);
-    border-color: oklch(var(--lora-accent-l) var(--lora-accent-c) var(--lora-accent-h));
+    border-color: oklch(var(--color-accent-l) var(--color-accent-c) var(--color-accent-h));
    transform: translateY(-1px);
 }

@@ -498,7 +498,7 @@

 .help-icon:hover {
    opacity: 1;
-    color: oklch(var(--lora-accent-l) var(--lora-accent-c) var(--lora-accent-h));
+    color: oklch(var(--color-accent-l) var(--color-accent-c) var(--color-accent-h));
 }

 /* Help tooltip */
@@ -573,7 +573,7 @@
 /* In dark mode, add additional distinction */
 html[data-theme="dark"] .duplicates-banner {
    box-shadow: var(--shadow-dark-lg); /* Stronger shadow in dark mode */
-    background-color: oklch(var(--lora-accent-l) var(--lora-accent-c) var(--lora-accent-h) / 0.15); /* Slightly stronger background in dark mode */
+    background-color: oklch(var(--color-accent-l) var(--color-accent-c) var(--color-accent-h) / 0.15); /* Slightly stronger background in dark mode */
 }

 html[data-theme="dark"] .duplicate-group {
@@ -598,11 +598,11 @@ html[data-theme="dark"] .help-tooltip {
    background: var(--lora-accent);
    color: white;
    border-color: var(--lora-accent);
-    box-shadow: 0 0 0 2px oklch(var(--lora-accent-l) var(--lora-accent-c) var(--lora-accent-h) / 0.25);
+    box-shadow: 0 0 0 2px oklch(var(--color-accent-l) var(--color-accent-c) var(--color-accent-h) / 0.25);
    position: relative;
    z-index: 5;
 }

 #findDuplicatesBtn.active:hover {
-    background: oklch(calc(var(--lora-accent-l) - 5%) var(--lora-accent-c) var(--lora-accent-h));
+    background: oklch(calc(var(--color-accent-l) - 5%) var(--color-accent-c) var(--color-accent-h));
 }
@@ -149,7 +149,7 @@
  width: 100%;
  padding: 0.5rem 0.75rem;
  padding-left: 2.25rem !important;
-  padding-right: 5rem !important;
+  padding-right: 6.75rem !important; /* clear room for options + filter + clear/cue toggles */
  border: none;
  background: transparent;
  color: var(--text-color);
@@ -190,6 +190,81 @@
  right: 2.25rem;
 }

+/* Clear button: sit immediately left of the search-options toggle */
+.header-search .search-clear {
+  position: absolute;
+  right: 4.25rem; /* 2.25rem (options toggle) + 28px toggle width + 4px gap */
+  top: 50%;
+  transform: translateY(-50%);
+  width: 28px;
+  height: 28px;
+  display: none;
+  align-items: center;
+  justify-content: center;
+  background: transparent;
+  border: none;
+  color: var(--text-muted);
+  cursor: pointer;
+  border-radius: var(--border-radius-xs, 4px);
+  padding: 0;
+  line-height: 1;
+  transition: background-color var(--transition-base), color var(--transition-base);
+}
+
+.header-search .search-clear.visible {
+  display: flex;
+}
+
+.header-search .search-clear:hover {
+  background: color-mix(in oklch, var(--text-muted) 15%, transparent);
+  color: var(--lora-accent);
+}
+
+/* Keyboard shortcut cue: shown when search is empty, hidden when typing */
+.header-search .search-shortcut-cue {
+  position: absolute;
+  right: 4.25rem; /* same slot as clear button */
+  top: 50%;
+  transform: translateY(-50%);
+  display: flex;
+  align-items: center;
+  gap: 2px;
+  pointer-events: none;
+  font-family: inherit;
+  font-size: 0.7rem;
+  line-height: 1;
+  color: var(--text-muted);
+  opacity: 0.7;
+  white-space: nowrap;
+  transition: opacity 0.2s ease;
+}
+
+.header-search .search-shortcut-cue kbd {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  min-width: 18px;
+  height: 18px;
+  padding: 0 4px;
+  font-family: inherit;
+  font-size: 0.68rem;
+  font-weight: 500;
+  color: var(--text-muted);
+  /* Subtle tint derived from text color so it adapts to both light & dark themes */
+  background: color-mix(in oklch, var(--text-muted) 12%, transparent);
+  border: 1px solid color-mix(in oklch, var(--text-muted) 25%, transparent);
+  border-radius: var(--border-radius-xs, 3px);
+  line-height: 1;
+}
+
+.header-search .search-shortcut-cue.hidden {
+  display: none;
+}
+
+.header-search.disabled .search-shortcut-cue {
+  display: none;
+}
+
 .header-search .search-options-toggle:hover,
 .header-search .search-filter-toggle:hover,
 .header-search .search-filter-toggle:focus-visible {
@@ -283,7 +358,6 @@

 .theme-toggle {
  position: relative;
-  /* Ensure relative positioning for the container */
 }

 .theme-toggle .light-icon,
@@ -293,17 +367,14 @@
  top: 50%;
  left: 50%;
  transform: translate(-50%, -50%);
-  /* Center perfectly */
  opacity: 0;
  transition: opacity 0.3s ease;
 }

-/* Default state shows dark icon */
 .theme-toggle .dark-icon {
  opacity: 1;
 }

-/* Light theme shows light icon */
 .theme-toggle.theme-light .light-icon {
  opacity: 1;
 }
@@ -313,7 +384,6 @@
  opacity: 0;
 }

-/* Dark theme shows dark icon */
 .theme-toggle.theme-dark .dark-icon {
  opacity: 1;
 }
@@ -323,7 +393,6 @@
  opacity: 0;
 }

-/* Auto theme shows auto icon */
 .theme-toggle.theme-auto .auto-icon {
  opacity: 1;
 }
@@ -333,6 +402,201 @@
  opacity: 0;
 }

+.theme-popover {
+  display: none;
+  position: fixed;
+  background: var(--surface-base, #ffffff);
+  border: 1px solid var(--border-base, #e0e0e0);
+  border-radius: var(--radius-md, 8px);
+  box-shadow: var(--shadow-xl, 0 4px 16px rgba(0, 0, 0, 0.15));
+  padding: 12px;
+  min-width: 220px;
+  z-index: calc(var(--z-overlay) + 1);
+  animation: theme-popover-in 0.15s ease-out;
+}
+
+.theme-popover.active {
+  display: block;
+}
+
+@keyframes theme-popover-in {
+  from {
+    opacity: 0;
+    transform: translateY(-4px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+.theme-popover-section {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+.theme-popover-label {
+  font-size: 0.7rem;
+  font-weight: 600;
+  text-transform: uppercase;
+  letter-spacing: 0.05em;
+  color: var(--text-secondary, #6c757d);
+}
+
+.theme-popover-divider {
+  height: 1px;
+  background: var(--border-base, #e0e0e0);
+  margin: 10px 0;
+}
+
+.theme-popover-modes {
+  display: flex;
+  gap: 6px;
+}
+
+.theme-mode-btn {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 4px;
+  padding: 8px 4px;
+  border: 1px solid var(--border-base, #e0e0e0);
+  border-radius: var(--radius-sm, 6px);
+  background: var(--surface-elevated, #ffffff);
+  color: var(--text-primary, #333333);
+  cursor: pointer;
+  font-size: 0.75rem;
+  transition: background-color var(--transition-base, 200ms ease),
+              border-color var(--transition-base, 200ms ease),
+              color var(--transition-base, 200ms ease);
+}
+
+.theme-mode-btn i {
+  font-size: 0.9rem;
+}
+
+.theme-mode-btn:hover {
+  background: var(--surface-hover, oklch(95% 0.02 256));
+  border-color: var(--color-accent, oklch(68% 0.28 256));
+}
+
+.theme-mode-btn.active {
+  background: var(--color-accent-subtle, oklch(68% 0.28 256 / 0.12));
+  border-color: var(--color-accent, oklch(68% 0.28 256));
+  color: var(--color-accent, oklch(68% 0.28 256));
+}
+
+.theme-popover-presets {
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  gap: 6px;
+}
+
+.theme-preset-btn {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 4px;
+  padding: 8px 4px;
+  border: 1px solid var(--border-base, #e0e0e0);
+  border-radius: var(--radius-sm, 6px);
+  background: var(--surface-elevated, #ffffff);
+  color: var(--text-primary, #333333);
+  cursor: pointer;
+  font-size: 0.7rem;
+  transition: background-color var(--transition-base, 200ms ease),
+              border-color var(--transition-base, 200ms ease),
+              color var(--transition-base, 200ms ease);
+}
+
+.theme-preset-btn:hover {
+  background: var(--surface-hover, oklch(95% 0.02 256));
+  border-color: var(--color-accent, oklch(68% 0.28 256));
+}
+
+.theme-preset-btn.active {
+  background: var(--color-accent-subtle, oklch(68% 0.28 256 / 0.12));
+  border-color: var(--color-accent, oklch(68% 0.28 256));
+  color: var(--color-accent, oklch(68% 0.28 256));
+}
+
+.preset-swatch {
+  display: inline-block;
+  width: 22px;
+  height: 22px;
+  border-radius: var(--radius-xs, 4px);
+  border: 1px solid var(--border-subtle, oklch(72% 0.03 256 / 0.45));
+  flex-shrink: 0;
+  transition: transform var(--transition-base, 200ms ease),
+              box-shadow var(--transition-base, 200ms ease);
+}
+
+/* Solid accent colors — each swatch shows the theme's accent color directly.
+   This matches the app's flat, token-driven design language instead of using
+   decorative gradients that clash with the matte aesthetic. */
+
+.preset-swatch-default {
+  background: oklch(68% 0.28 256);
+}
+
+.preset-swatch-nord {
+  background: oklch(62% 0.18 213);
+}
+
+.preset-swatch-midnight {
+  background: oklch(52% 0.15 300);
+}
+
+.preset-swatch-monokai {
+  background: oklch(72% 0.24 190);
+}
+
+.preset-swatch-dracula {
+  background: oklch(68% 0.24 265);
+}
+
+.preset-swatch-solarized {
+  background: oklch(55% 0.18 175);
+}
+
+.theme-preset-btn.active .preset-swatch {
+  box-shadow: 0 0 0 2px var(--color-accent, oklch(68% 0.28 256));
+}
+
+.theme-preset-btn:hover .preset-swatch {
+  transform: scale(1.08);
+}
+
+/* Dark mode: use each preset's dark-mode accent lightness for visibility.
+   These match the --color-accent-l values from [data-theme="dark"][data-theme-preset="..."]
+   in tokens/colors.css so the swatch accurately previews what the theme looks like. */
+
+[data-theme="dark"] .preset-swatch-default {
+  background: oklch(68% 0.28 256);
+}
+
+[data-theme="dark"] .preset-swatch-nord {
+  background: oklch(68% 0.18 213);
+}
+
+[data-theme="dark"] .preset-swatch-midnight {
+  background: oklch(68% 0.14 300);
+}
+
+[data-theme="dark"] .preset-swatch-monokai {
+  background: oklch(72% 0.24 190);
+}
+
+[data-theme="dark"] .preset-swatch-dracula {
+  background: oklch(72% 0.24 265);
+}
+
+[data-theme="dark"] .preset-swatch-solarized {
+  background: oklch(60% 0.18 175);
+}
+
 /* Badge styling */
 .update-badge {
  position: absolute;
@@ -211,7 +211,7 @@

 .lora-item.is-early-access {
    background: rgba(0, 184, 122, 0.05);
-    border-left: 4px solid #00B87A;
+    border-left: 4px solid var(--color-success);
 }

 .lora-item.missing-locally {
@@ -310,7 +310,7 @@

 .missing-lora-item.is-early-access {
    background: rgba(0, 184, 122, 0.05);
-    border-left: 3px solid #00B87A;
+    border-left: 3px solid var(--color-success);
    padding-left: 10px;
 }

@@ -630,7 +630,7 @@
    gap: 12px;
    padding: 12px 16px;
    background: rgba(0, 184, 122, 0.1);
-    border: 1px solid #00B87A;
+    border: 1px solid var(--color-success);
    border-radius: var(--border-radius-sm);
    color: var(--text-color);
    margin-bottom: var(--space-2);
@@ -646,7 +646,7 @@

 /* Specific styling for the early access warning container in import modal */
 .early-access-warning .warning-icon {
-    color: #00B87A;
+    color: var(--color-success);
    font-size: 1.2em;
 }

@@ -72,6 +72,10 @@
    margin-left: auto;
 }

+.modal-header-actions .license-permissions {
+    margin-left: auto;
+}
+
 .license-restrictions {
    display: flex;
    align-items: center;
@@ -95,6 +99,41 @@
    transform: translateY(-1px);
 }

+/* Set 2 — New style permission indicators */
+.license-permissions {
+    display: flex;
+    gap: 4px;
+    align-items: center;
+}
+
+.license-icon-new {
+    width: 22px;
+    height: 22px;
+    display: inline-block;
+    border-radius: 4px;
+    background-color: var(--text-muted);
+    -webkit-mask: var(--license-icon-image) center/contain no-repeat;
+    mask: var(--license-icon-image) center/contain no-repeat;
+    transition: background-color 0.2s ease, transform 0.2s ease;
+    cursor: default;
+    outline: 2px solid transparent;
+    outline-offset: 1px;
+}
+
+.license-icon-new.allowed {
+    background-color: var(--color-success, #40c057);
+    outline-color: color-mix(in oklch, var(--color-success, #40c057) 30%, transparent);
+}
+
+.license-icon-new.denied {
+    background-color: var(--color-error, #fa5252);
+    outline-color: color-mix(in oklch, var(--color-error, #fa5252) 30%, transparent);
+}
+
+.license-icon-new:hover {
+    transform: translateY(-1px);
+}
+
 /* Info Grid */
 .info-grid {
    display: grid;
@@ -229,6 +229,19 @@
  gap: 10px;
 }

+/* Header row for params section */
+.metadata-row.params-row {
+    flex-direction: column;
+}
+
+.metadata-row.params-row .param-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    gap: 8px;
+    margin-bottom: 4px;
+}
+
 /* Styling for parameters tags */
 .params-tags {
  display: flex;
@@ -272,13 +285,25 @@
  margin-top: var(--space-2);
 }

+.metadata-row.prompt-row .param-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  gap: 8px;
+  margin-bottom: 4px;
+}
+
+.metadata-row.prompt-row .param-actions {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+}
+
 .metadata-label {
  font-weight: 600;
  color: var(--text-color);
  opacity: 0.8;
  font-size: 0.85em;
-  display: block;
-  margin-bottom: 4px;
 }

 .metadata-prompt-wrapper {
@@ -286,7 +311,7 @@
  background: var(--lora-surface);
  border: 1px solid var(--lora-border);
  border-radius: var(--border-radius-xs);
-  padding: 6px 30px 6px 8px;
+  padding: 6px 8px;
  margin-top: 2px;
  max-height: 80px; /* Reduced from 120px */
  overflow-y: auto;
@@ -302,22 +327,26 @@
  white-space: pre-wrap;
 }

-.copy-prompt-btn {
-  position: absolute;
-  top: 6px;
-  right: 6px;
+.copy-prompt-btn,
+.send-prompt-btn,
+.send-params-btn {
  background: transparent;
  border: none;
  color: var(--text-color);
  opacity: 0.6;
  cursor: pointer;
-  padding: 3px;
+  padding: 3px 6px;
+  border-radius: var(--border-radius-xs);
  transition: var(--transition-base);
+  font-size: 0.9em;
 }

-.copy-prompt-btn:hover {
+.copy-prompt-btn:hover,
+.send-prompt-btn:hover,
+.send-params-btn:hover {
  opacity: 1;
  color: var(--lora-accent);
+  background: var(--lora-surface);
 }

 /* Scrollbar styling for metadata panel */
@@ -17,6 +17,8 @@
  flex-wrap: nowrap;
  gap: 6px;
  align-items: center;
+  min-width: 0;
+  overflow: hidden;
 }

 .model-tag-compact {
@@ -28,6 +30,9 @@
  font-size: 0.75em;
  color: var(--text-color);
  white-space: nowrap;
+  max-width: 150px;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }

 /* Style for empty tags placeholder */
@@ -118,8 +123,9 @@
 /* Model Tags Edit Mode */
 .model-tags-header {
  display: flex;
-  justify-content: space-between;
+  justify-content: flex-start;
  align-items: center;
+  overflow: hidden;
 }

 .edit-tags-btn {
@@ -132,6 +138,7 @@
  border-radius: var(--border-radius-xs);
  transition: var(--transition-base);
  margin-left: var(--space-1);
+  flex-shrink: 0;
 }

 .edit-tags-btn.visible,
@@ -24,11 +24,6 @@
    min-width: 130px;
 }

-.stat-card > i {
-    font-size: 1.25em;
-    flex-shrink: 0;
-}
-
 .stat-card-body {
    display: flex;
    flex-direction: column;
@@ -52,40 +47,20 @@
    border-left-color: var(--color-success);
 }

-.stat-card-success > i {
-    color: var(--color-success);
-}
-
 .stat-card-failure {
    border-left-color: var(--color-error);
 }

-.stat-card-failure > i {
-    color: var(--color-error);
-}
-
 .stat-card-skipped {
    border-left-color: var(--color-warning);
 }

-.stat-card-skipped > i {
-    color: var(--color-warning);
-}
-
 .stat-card-total {
-    border-left-color: var(--color-info);
-}
-
-.stat-card-total > i {
-    color: var(--color-info);
+    border-left-color: var(--lora-border);
 }

 .stat-card-time {
-    border-left-color: var(--color-accent);
-}
-
-.stat-card-time > i {
-    color: var(--color-accent);
+    border-left-color: var(--lora-border);
 }

 .refresh-failures-section {
@@ -122,7 +97,7 @@
    position: sticky;
    top: 0;
    background: var(--lora-surface);
-    border-bottom: 2px solid var(--lora-border);
+    border-bottom: 1px solid var(--lora-border);
    padding: var(--space-1) var(--space-2);
    text-align: left;
    font-weight: var(--weight-semibold);
@@ -821,4 +821,66 @@

 [data-theme="dark"] .batch-preview-item {
    background: var(--lora-surface);
-}
+}
+
+.hf-badge {
+    display: inline-block;
+    padding: 1px 6px;
+    border-radius: 8px;
+    background: oklch(0.55 0.12 250 / 0.15);
+    color: oklch(0.7 0.12 250);
+    font-size: 0.75em;
+    font-weight: 600;
+    margin-left: 4px;
+}
+
+
+/* Checkbox inside HF batch preview items */
+.batch-preview-checkbox {
+    width: 18px;
+    height: 18px;
+    cursor: pointer;
+    accent-color: var(--lora-accent);
+    flex-shrink: 0;
+    padding: 0;
+    border: none;
+    margin: 0;
+}
+
+/* Select All toolbar in batch preview */
+.batch-preview-select-all {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    padding: 8px 12px;
+    border-bottom: 1px solid var(--border-color);
+    background: var(--lora-surface);
+    cursor: pointer;
+    position: sticky;
+    top: 0;
+    z-index: 1;
+}
+
+.batch-preview-select-all input[type="checkbox"] {
+    width: 18px;
+    height: 18px;
+    cursor: pointer;
+    accent-color: var(--lora-accent);
+    flex-shrink: 0;
+    padding: 0;
+    border: none;
+    margin: 0;
+}
+
+.batch-preview-select-all label {
+    cursor: pointer;
+    font-size: 0.9em;
+    color: var(--text-color);
+    font-weight: 500;
+    margin: 0;
+    user-select: none;
+}
+
+[data-theme="dark"] .batch-preview-select-all {
+    background: var(--lora-surface);
+}
@@ -335,7 +335,12 @@
    }
 }

-/* API key input specific styles */
+/* API key input — CSS masking (prevents Chrome password manager triggers) */
+.api-key-masked {
+    -webkit-text-security: disc;
+}
+
+/* API key input specific styles (shared with proxy password) */
 .api-key-input {
    width: 100%; /* Take full width of parent */
    position: relative;
@@ -345,7 +350,7 @@

 .api-key-input input {
    width: 100%;
-    padding: 6px 40px 6px 10px; /* Add left padding */
+    padding: 6px 40px 6px 10px; /* Right padding for eye button */
    height: 32px;
    box-sizing: border-box;
    border-radius: var(--border-radius-xs);
@@ -353,6 +358,13 @@
    background-color: var(--lora-surface);
    color: var(--text-color);
    font-size: 0.95em;
+    transition: border-color 0.2s ease, box-shadow 0.2s ease;
+}
+
+.api-key-input input:focus {
+    border-color: var(--lora-accent);
+    outline: none;
+    box-shadow: 0 0 0 2px rgba(var(--lora-accent-rgb, 79, 70, 229), 0.1);
 }

 .api-key-input .toggle-visibility {
@@ -364,12 +376,98 @@
    opacity: 0.6;
    cursor: pointer;
    padding: 4px 8px;
+    transition: opacity 0.2s ease;
 }

 .api-key-input .toggle-visibility:hover {
    opacity: 1;
 }

+/* API key item — stack status/edit views vertically for smooth cross-fade */
+.api-key-item .setting-control {
+    flex-direction: column;
+    align-items: flex-end;
+}
+
+/* API key status display (shown when not editing) */
+.api-key-status {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    width: 100%;
+    justify-content: flex-end;
+    transition: opacity 0.2s ease, transform 0.2s ease, max-height 0.25s ease;
+    max-height: 80px;
+    overflow: hidden;
+}
+
+.api-key-status.is-hidden {
+    opacity: 0;
+    max-height: 0;
+    transform: translateY(-4px);
+    pointer-events: none;
+    margin: 0;
+}
+
+.api-key-status-text {
+    display: inline-flex;
+    align-items: center;
+    gap: 4px;
+    font-size: 0.95em;
+    white-space: nowrap;
+    transition: color 0.2s ease;
+}
+
+/* Status color modifiers — replace inline styles */
+.api-key-status--configured .fa-check-circle {
+    color: var(--lora-success);
+}
+
+.api-key-status--unconfigured .fa-times-circle {
+    color: var(--lora-error);
+}
+
+/* Utility classes for status icon colors (used by JS) */
+.text-success {
+    color: var(--lora-success);
+}
+
+.text-error {
+    color: var(--lora-error);
+}
+
+/* API key inline edit container — flex row with input + buttons */
+.api-key-edit {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+    width: 100%;
+    justify-content: flex-end;
+    transition: opacity 0.2s ease, transform 0.2s ease, max-height 0.25s ease;
+    max-height: 80px;
+    overflow: hidden;
+}
+
+.api-key-edit.is-hidden {
+    opacity: 0;
+    max-height: 0;
+    transform: translateY(-4px);
+    pointer-events: none;
+    margin: 0;
+}
+
+.api-key-edit .api-key-input {
+    flex: 1;
+    min-width: 0;
+}
+
+.api-key-edit .primary-btn,
+.api-key-edit .secondary-btn {
+    height: 32px;
+    flex-shrink: 0;
+    white-space: nowrap;
+}
+
 /* Text input wrapper styles for consistent input styling */
 .text-input-wrapper {
    width: 100%;
@@ -9,6 +9,10 @@
    position: relative;
 }

+#recipeTagsContainer {
+    width: 100%;
+}
+
 .recipe-modal-header h2 {
    margin: 0 0 var(--space-1);
    padding: var(--space-1);
@@ -95,127 +99,11 @@
    min-width: 0;
 }

-.content-editor.tags-editor input {
-    font-size: 0.9em;
-}
-
 /* Remove obsolete button styles */
 .editor-actions {
    display: none;
 }

-/* Special styling for tags content */
-.tags-content {
-    display: flex;
-    align-items: center;
-    flex-wrap: nowrap;
-    gap: 8px;
-}
-
-.tags-display {
-    display: flex;
-    flex-wrap: nowrap;
-    gap: 6px;
-    align-items: center;
-    flex: 1;
-    min-width: 0;
-    overflow: hidden;
-}
-
-.no-tags {
-    font-size: 0.85em;
-    color: var(--text-color);
-    opacity: 0.6;
-    font-style: italic;
-}
-
-/* Recipe Tags styles */
-.recipe-tags-container {
-    position: relative;
-    margin-top: 0;
-    margin-bottom: 10px;
-}
-
-.recipe-tags-compact {
-    display: flex;
-    flex-wrap: nowrap;
-    gap: 6px;
-    align-items: center;
-}
-
-.recipe-tag-compact {
-    background: var(--surface-subtle);
-    border: 1px solid rgba(0, 0, 0, 0.1);
-    border-radius: var(--border-radius-xs);
-    padding: 2px 8px;
-    font-size: 0.75em;
-    color: var(--text-color);
-    white-space: nowrap;
-}
-
-[data-theme="dark"] .recipe-tag-compact {
-    background: var(--surface-subtle);
-    border: 1px solid var(--lora-border);
-}
-
-.recipe-tag-more {
-    background: var(--lora-accent);
-    color: var(--lora-text);
-    border-radius: var(--border-radius-xs);
-    padding: 2px 8px;
-    font-size: 0.75em;
-    cursor: pointer;
-    white-space: nowrap;
-    font-weight: 500;
-}
-
-.recipe-tags-tooltip {
-    position: absolute;
-    top: calc(100% + 8px);
-    left: 0;
-    background: var(--card-bg);
-    border: 1px solid var(--border-color);
-    border-radius: var(--border-radius-sm);
-    box-shadow: var(--shadow-dropdown);
-    padding: 10px 14px;
-    max-width: 400px;
-    z-index: 10;
-    opacity: 0;
-    visibility: hidden;
-    transform: translateY(-4px);
-    transition: var(--transition-base);
-    pointer-events: none;
-}
-
-.recipe-tags-tooltip.visible {
-    opacity: 1;
-    visibility: visible;
-    transform: translateY(0);
-    pointer-events: auto;
-}
-
-.tooltip-content {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 6px;
-    max-height: 200px;
-    overflow-y: auto;
-}
-
-.tooltip-tag {
-    background: var(--surface-hover);
-    border: 1px solid rgba(0, 0, 0, 0.1);
-    border-radius: var(--border-radius-xs);
-    padding: 3px 8px;
-    font-size: 0.75em;
-    color: var(--text-color);
-}
-
-[data-theme="dark"] .tooltip-tag {
-    background: var(--surface-hover);
-    border: 1px solid var(--lora-border);
-}
-
 #recipeModal .modal-content {
    display: flex;
    flex-direction: column;
@@ -1153,7 +1041,7 @@
        max-height: 2.4em;
    }

-    .recipe-tags-container {
+    #recipeTagsContainer {
        margin-bottom: 6px;
    }

@@ -114,11 +114,10 @@
 .sidebar-hidden-indicator {
    position: fixed;
    left: 0;
-    top: 50%;
-    transform: translateY(-50%);
+    top: 68px; /* Align with sidebar header */
    z-index: var(--z-overlay);
    width: 14px;
-    height: 44px;
+    height: 48px;
    display: flex;
    align-items: center;
    justify-content: center;
@@ -135,7 +134,7 @@
 }

 .sidebar-hidden-indicator i {
-    font-size: 9px;
+    font-size: 11px;
    color: var(--text-muted);
    transition: color 0.15s ease;
 }
@@ -144,6 +143,21 @@
    color: white;
 }

+/* Subtle breathing animation for first-time discovery */
+@keyframes sidebarBreathing {
+    0%, 100% { opacity: 0.3; }
+    50%      { opacity: 0.65; }
+}
+
+.sidebar-hidden-indicator.breathing {
+    animation: sidebarBreathing 2.5s ease-in-out infinite;
+    animation-delay: 0.5s;
+}
+
+.sidebar-hidden-indicator.breathing:hover {
+    animation: none;
+}
+
 .sidebar-hidden-indicator-tooltip {
    position: absolute;
    left: 100%;
@@ -264,6 +264,174 @@
    box-shadow: 0 0 0 2px oklch(var(--lora-accent) / 0.15);
 }

+/* Disabled sort dropdown — used when VLM custom filter is active */
+.control-group select:disabled {
+    opacity: 0.5;
+    cursor: not-allowed;
+    background-color: var(--bg-color);
+    border-color: var(--border-color);
+    box-shadow: none;
+    transform: none;
+}
+
+.control-group select:disabled:hover {
+    border-color: var(--border-color);
+    background-color: var(--bg-color);
+    transform: none;
+    box-shadow: none;
+}
+
+/* === Sort dropdown — decoupled trigger width ===========================
+   The native <select> sizes its trigger to the widest <option>, wasting
+   horizontal space when a short option is selected. This custom trigger
+   sizes to the currently selected text only; the dropdown menu sizes to
+   its content independently. The native <select> is kept in the DOM
+   (visually hidden) so existing JS that reads/writes `.value` / `.disabled`
+   and dynamically adds/removes <option>s keeps working. */
+
+.sort-dropdown-group {
+    position: relative;
+    display: flex;
+}
+
+.sort-trigger {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+    min-width: 100px;
+    max-width: 240px;
+    padding: 4px 10px;
+    border-radius: var(--border-radius-xs);
+    border: 1px solid var(--border-color);
+    background: var(--card-bg);
+    color: var(--text-color);
+    font-size: 0.85em;
+    cursor: pointer;
+    transition: var(--transition-base);
+    box-shadow: var(--shadow-xs);
+}
+
+.sort-trigger:hover,
+.sort-trigger:focus-visible {
+    border-color: var(--lora-accent);
+    background: var(--bg-color);
+    transform: translateY(-1px);
+    box-shadow: var(--shadow-lg);
+    outline: none;
+}
+
+.sort-trigger:active {
+    transform: translateY(0);
+    box-shadow: var(--shadow-xs);
+}
+
+.sort-trigger__label {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.sort-trigger__caret {
+    opacity: 0.8;
+    transition: transform var(--transition-base);
+    flex-shrink: 0;
+}
+
+.sort-dropdown-group.active .sort-trigger__caret {
+    transform: rotate(180deg);
+}
+
+.sort-dropdown-group.active .sort-trigger {
+    border-color: var(--lora-accent);
+    box-shadow: 0 0 0 2px color-mix(in oklch, var(--lora-accent) 15%, transparent);
+}
+
+/* Disabled state — mirrors the native :disabled look (used when VLM is active) */
+.sort-dropdown-group.is-disabled .sort-trigger {
+    opacity: 0.5;
+    cursor: not-allowed;
+    pointer-events: none;
+    background: var(--bg-color);
+    border-color: var(--border-color);
+    box-shadow: none;
+    transform: none;
+}
+
+/* Dropdown menu — sizes to its content, independent of trigger width.
+   Inherits base .dropdown-menu styling; capped for very long i18n text. */
+.sort-dropdown-menu {
+    min-width: max-content;
+    max-width: 320px;
+    width: max-content;
+}
+
+/* Optgroup label rendered as a section header */
+.sort-dropdown-group .sort-optgroup-label {
+    padding: 8px 12px 4px;
+    font-size: 0.75em;
+    font-weight: 600;
+    text-transform: uppercase;
+    letter-spacing: 0.04em;
+    color: var(--text-muted);
+    cursor: default;
+    user-select: none;
+}
+
+.sort-dropdown-group .sort-optgroup-label:first-child {
+    padding-top: 4px;
+}
+
+/* Option items */
+.sort-dropdown-group .sort-option {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    padding: 6px 12px;
+    color: var(--text-color);
+    cursor: pointer;
+    transition: background-color 0.2s ease;
+    white-space: nowrap;
+}
+
+.sort-dropdown-group .sort-option::before {
+    content: '';
+    width: 14px;
+    flex-shrink: 0;
+    text-align: center;
+    font-weight: 700;
+}
+
+.sort-dropdown-group .sort-option:hover {
+    background-color: color-mix(in oklch, var(--lora-accent) 10%, transparent);
+}
+
+.sort-dropdown-group .sort-option.is-selected {
+    color: var(--lora-accent);
+    font-weight: 600;
+}
+
+.sort-dropdown-group .sort-option.is-selected::before {
+    content: '\2713';
+    color: var(--lora-accent);
+}
+
+/* Visually hidden native <select> — kept in the DOM for programmatic access.
+   High-specificity selector overrides .control-group select { min-width: 100px }. */
+.control-group .sort-select-native {
+    position: absolute;
+    width: 1px;
+    height: 1px;
+    min-width: 0;
+    padding: 0;
+    margin: -1px;
+    overflow: hidden;
+    clip: rect(0, 0, 0, 0);
+    white-space: nowrap;
+    border: 0;
+    opacity: 0;
+    pointer-events: none;
+}
+
 /* Ensure hidden class works properly */
 .hidden {
    display: none !important;
@@ -27,8 +27,8 @@
    transition: var(--transition-slow);
    /* Add glow effect */
    box-shadow: 
-        0 0 0 2px rgba(24, 144, 255, 0.3),
-        0 0 20px rgba(24, 144, 255, 0.2),
+        0 0 0 2px color-mix(in oklch, var(--color-accent) 30%, transparent),
+        0 0 20px color-mix(in oklch, var(--color-accent) 20%, transparent),
        inset 0 0 0 1px rgba(255, 255, 255, 0.1);
 }

@@ -221,14 +221,14 @@
@keyframes onboarding-pulse {
    0%, 100% {
        box-shadow: 
-            0 0 0 2px rgba(24, 144, 255, 0.4),
-            0 0 20px rgba(24, 144, 255, 0.3),
+            0 0 0 2px color-mix(in oklch, var(--color-accent) 40%, transparent),
+            0 0 20px color-mix(in oklch, var(--color-accent) 30%, transparent),
            inset 0 0 0 1px rgba(255, 255, 255, 0.1);
    }
    50% {
        box-shadow: 
-            0 0 0 4px rgba(24, 144, 255, 0.6),
-            0 0 30px rgba(24, 144, 255, 0.4),
+            0 0 0 4px color-mix(in oklch, var(--color-accent) 60%, transparent),
+            0 0 30px color-mix(in oklch, var(--color-accent) 40%, transparent),
            inset 0 0 0 1px rgba(255, 255, 255, 0.2);
    }
 }
@@ -59,3 +59,5 @@
 .initialization-notice .loading-spinner {
    margin-bottom: var(--space-2);
 }
+
+/* ---------- reused from shared styles ---------- */
@@ -37,13 +37,13 @@
  --color-error-border: color-mix(in oklch, var(--color-error) 50%, transparent);

  --color-info: oklch(var(--color-info-l) var(--color-info-c) var(--color-info-h));
-  --color-info-bg: oklch(72% 0.2 220);
-  --color-info-text: oklch(28% 0.03 220);
-  --color-info-glow: oklch(72% 0.2 220 / 0.28);
+  --color-info-bg: oklch(var(--color-info-l) var(--color-info-c) var(--color-info-h));
+  --color-info-text: oklch(28% 0.03 var(--color-info-h));
+  --color-info-glow: oklch(var(--color-info-l) var(--color-info-c) var(--color-info-h) / 0.28);

-  --color-skip-refresh-bg: oklch(82% 0.12 45);
-  --color-skip-refresh-text: oklch(35% 0.02 45);
-  --color-skip-refresh-glow: oklch(82% 0.12 45 / 0.15);
+  --color-skip-refresh-bg: oklch(82% 0.12 var(--color-warning-h));
+  --color-skip-refresh-text: oklch(35% 0.02 var(--color-warning-h));
+  --color-skip-refresh-glow: oklch(82% 0.12 var(--color-warning-h) / 0.15);
 }

 :root {
@@ -106,12 +106,360 @@
  --status-info-bg: oklch(50% 0.10 190 / 0.25);
  --status-info-border: oklch(55% 0.12 195 / 0.3);

-  --color-info-bg: oklch(62% 0.18 220);
-  --color-info-text: oklch(98% 0.02 240);
-  --color-info-glow: oklch(62% 0.18 220 / 0.4);
+  --color-info-bg: oklch(62% 0.18 var(--color-info-h));
+  --color-info-text: oklch(98% 0.02 var(--color-info-h));
+  --color-info-glow: oklch(62% 0.18 var(--color-info-h) / 0.4);

  --color-error-bg: color-mix(in oklch, var(--color-error) 15%, transparent);
  --color-error-border: color-mix(in oklch, var(--color-error) 40%, transparent);

  --favorite-color: #ffc107;
 }
+
+/* ── Preset: Nord ──────────────────────────────────────────── */
+
+[data-theme-preset="nord"] {
+  --color-accent-h: 213;
+  --color-accent-c: 0.18;
+  --color-accent-l: 62%;
+  --color-warning-h: 35;
+  --color-warning-c: 0.18;
+  --color-success-h: 130;
+  --color-error-l: 62%;
+  --color-error-c: 0.22;
+  --color-error-h: 5;
+  --color-info-h: 195;
+  --color-info-c: 0.18;
+
+  --bg-base: oklch(96% 0.01 240);
+  --bg-elevated: oklch(98% 0.008 240 / 0.95);
+  --bg-hover: oklch(93% 0.02 240);
+  --bg-disabled: oklch(92% 0.01 240);
+
+  --text-primary: oklch(22% 0.03 260);
+  --text-secondary: oklch(48% 0.03 260);
+  --text-inverse: oklch(97% 0.01 240);
+
+  --surface-base: oklch(97% 0.01 240);
+  --surface-elevated: oklch(98% 0.008 240 / 0.95);
+  --surface-hover: oklch(93% 0.02 240);
+  --surface-subtle: oklch(0% 0 0 / 0.03);
+
+  --border-base: oklch(82% 0.03 240);
+  --border-subtle: oklch(82% 0.03 240 / 0.45);
+
+  --favorite-color: oklch(72% 0.14 85);
+  --favorite-glow: oklch(72% 0.14 85 / 0.5);
+}
+
+[data-theme="dark"][data-theme-preset="nord"] {
+  --color-accent-h: 213;
+  --color-accent-c: 0.18;
+  --color-accent-l: 68%;
+  --color-warning-h: 35;
+  --color-warning-c: 0.18;
+  --color-success-h: 130;
+  --color-error-l: 65%;
+  --color-error-c: 0.22;
+  --color-error-h: 5;
+  --color-info-h: 195;
+  --color-info-c: 0.18;
+
+  --bg-base: oklch(20% 0.03 260);
+  --bg-elevated: oklch(24% 0.03 260 / 0.98);
+  --bg-hover: oklch(30% 0.03 260);
+  --bg-disabled: oklch(30% 0.02 260);
+
+  --text-primary: oklch(87% 0.02 240);
+  --text-secondary: oklch(68% 0.02 240);
+  --text-inverse: oklch(20% 0.03 260);
+
+  --surface-base: oklch(26% 0.03 260);
+  --surface-elevated: oklch(24% 0.03 260 / 0.98);
+  --surface-hover: oklch(30% 0.03 260);
+  --surface-subtle: oklch(100% 0 0 / 0.03);
+
+  --border-base: oklch(38% 0.03 260);
+  --border-subtle: oklch(87% 0.02 240 / 0.15);
+
+  --favorite-color: oklch(78% 0.15 85);
+  --favorite-glow: oklch(78% 0.15 85 / 0.5);
+}
+
+/* ── Preset: Midnight ───────────────────────────────────────── */
+
+[data-theme-preset="midnight"] {
+  --color-accent-h: 300;
+  --color-accent-c: 0.15;
+  --color-accent-l: 52%;
+  --color-warning-h: 50;
+  --color-warning-c: 0.18;
+  --color-success-h: 135;
+  --color-error-h: 5;
+  --color-error-l: 62%;
+  --color-error-c: 0.22;
+  --color-info-h: 195;
+  --color-info-c: 0.12;
+
+  --bg-base: oklch(96% 0.01 255);
+  --bg-elevated: oklch(98% 0.008 255 / 0.95);
+  --bg-hover: oklch(93% 0.02 255);
+  --bg-disabled: oklch(92% 0.01 255);
+
+  --text-primary: oklch(22% 0.03 260);
+  --text-secondary: oklch(48% 0.03 260);
+  --text-inverse: oklch(97% 0.01 255);
+
+  --surface-base: oklch(97% 0.01 255);
+  --surface-elevated: oklch(98% 0.008 255 / 0.95);
+  --surface-hover: oklch(93% 0.02 255);
+  --surface-subtle: oklch(0% 0 0 / 0.03);
+
+  --border-base: oklch(80% 0.03 255);
+  --border-subtle: oklch(80% 0.03 255 / 0.45);
+
+  --favorite-color: oklch(72% 0.16 85);
+  --favorite-glow: oklch(72% 0.16 85 / 0.5);
+}
+
+[data-theme="dark"][data-theme-preset="midnight"] {
+  --color-accent-h: 300;
+  --color-accent-c: 0.14;
+  --color-accent-l: 68%;
+  --color-warning-h: 50;
+  --color-warning-c: 0.18;
+  --color-success-h: 135;
+  --color-error-h: 5;
+  --color-error-l: 65%;
+  --color-error-c: 0.22;
+  --color-info-h: 195;
+  --color-info-c: 0.12;
+
+  --bg-base: oklch(18% 0.03 260);
+  --bg-elevated: oklch(22% 0.03 260 / 0.98);
+  --bg-hover: oklch(28% 0.03 260);
+  --bg-disabled: oklch(28% 0.02 260);
+
+  --text-primary: oklch(88% 0.02 255);
+  --text-secondary: oklch(68% 0.02 255);
+  --text-inverse: oklch(18% 0.03 260);
+
+  --surface-base: oklch(24% 0.03 260);
+  --surface-elevated: oklch(22% 0.03 260 / 0.98);
+  --surface-hover: oklch(28% 0.03 260);
+  --surface-subtle: oklch(100% 0 0 / 0.03);
+
+  --border-base: oklch(36% 0.03 260);
+  --border-subtle: oklch(88% 0.02 255 / 0.15);
+
+  --favorite-color: oklch(78% 0.16 85);
+  --favorite-glow: oklch(78% 0.16 85 / 0.5);
+}
+
+/* ── Preset: Monokai ───────────────────────────────────────── */
+
+[data-theme-preset="monokai"] {
+  --color-accent-h: 190;
+  --color-accent-c: 0.24;
+  --color-accent-l: 72%;
+  --color-warning-h: 50;
+  --color-warning-c: 0.22;
+  --color-success-h: 140;
+  --color-error-l: 60%;
+  --color-error-c: 0.22;
+  --color-error-h: 340;
+  --color-info-h: 250;
+
+  --bg-base: oklch(96% 0.01 80);
+  --bg-elevated: oklch(98% 0.005 80 / 0.95);
+  --bg-hover: oklch(93% 0.015 80);
+  --bg-disabled: oklch(92% 0.01 80);
+
+  --text-primary: oklch(20% 0.02 100);
+  --text-secondary: oklch(45% 0.02 100);
+  --text-inverse: oklch(97% 0.01 80);
+
+  --surface-base: oklch(97% 0.008 80);
+  --surface-elevated: oklch(98% 0.005 80 / 0.95);
+  --surface-hover: oklch(93% 0.015 80);
+  --surface-subtle: oklch(0% 0 0 / 0.03);
+
+  --border-base: oklch(80% 0.02 80);
+  --border-subtle: oklch(80% 0.02 80 / 0.45);
+
+  --favorite-color: oklch(72% 0.16 85);
+  --favorite-glow: oklch(72% 0.16 85 / 0.5);
+}
+
+[data-theme="dark"][data-theme-preset="monokai"] {
+  --color-accent-h: 190;
+  --color-accent-c: 0.24;
+  --color-accent-l: 72%;
+  --color-warning-h: 50;
+  --color-warning-c: 0.22;
+  --color-success-h: 140;
+  --color-error-l: 65%;
+  --color-error-c: 0.22;
+  --color-error-h: 340;
+  --color-info-h: 250;
+
+  --bg-base: oklch(18% 0.02 100);
+  --bg-elevated: oklch(22% 0.02 100 / 0.98);
+  --bg-hover: oklch(28% 0.025 100);
+  --bg-disabled: oklch(28% 0.015 100);
+
+  --text-primary: oklch(90% 0.02 80);
+  --text-secondary: oklch(70% 0.02 80);
+  --text-inverse: oklch(18% 0.02 100);
+
+  --surface-base: oklch(24% 0.02 100);
+  --surface-elevated: oklch(22% 0.02 100 / 0.98);
+  --surface-hover: oklch(28% 0.025 100);
+  --surface-subtle: oklch(100% 0 0 / 0.03);
+
+  --border-base: oklch(36% 0.02 100);
+  --border-subtle: oklch(90% 0.02 80 / 0.15);
+
+  --favorite-color: oklch(78% 0.16 85);
+  --favorite-glow: oklch(78% 0.16 85 / 0.5);
+}
+
+/* ── Preset: Dracula ───────────────────────────────────────── */
+
+[data-theme-preset="dracula"] {
+  --color-accent-h: 265;
+  --color-accent-c: 0.24;
+  --color-accent-l: 68%;
+  --color-warning-h: 45;
+  --color-warning-c: 0.22;
+  --color-success-h: 135;
+  --color-error-l: 62%;
+  --color-error-c: 0.22;
+  --color-error-h: 350;
+  --color-info-h: 195;
+
+  --bg-base: oklch(96% 0.01 290);
+  --bg-elevated: oklch(98% 0.008 290 / 0.95);
+  --bg-hover: oklch(93% 0.02 290);
+  --bg-disabled: oklch(92% 0.01 290);
+
+  --text-primary: oklch(22% 0.04 290);
+  --text-secondary: oklch(48% 0.04 290);
+  --text-inverse: oklch(97% 0.01 290);
+
+  --surface-base: oklch(97% 0.01 290);
+  --surface-elevated: oklch(98% 0.008 290 / 0.95);
+  --surface-hover: oklch(93% 0.02 290);
+  --surface-subtle: oklch(0% 0 0 / 0.03);
+
+  --border-base: oklch(80% 0.04 290);
+  --border-subtle: oklch(80% 0.04 290 / 0.45);
+
+  --favorite-color: oklch(72% 0.16 85);
+  --favorite-glow: oklch(72% 0.16 85 / 0.5);
+}
+
+[data-theme="dark"][data-theme-preset="dracula"] {
+  --color-accent-h: 265;
+  --color-accent-c: 0.24;
+  --color-accent-l: 72%;
+  --color-warning-h: 45;
+  --color-warning-c: 0.22;
+  --color-success-h: 135;
+  --color-error-l: 65%;
+  --color-error-c: 0.22;
+  --color-error-h: 350;
+  --color-info-h: 195;
+
+  --bg-base: oklch(18% 0.04 290);
+  --bg-elevated: oklch(22% 0.04 290 / 0.98);
+  --bg-hover: oklch(28% 0.04 290);
+  --bg-disabled: oklch(28% 0.03 290);
+
+  --text-primary: oklch(90% 0.02 290);
+  --text-secondary: oklch(70% 0.03 290);
+  --text-inverse: oklch(18% 0.04 290);
+
+  --surface-base: oklch(24% 0.04 290);
+  --surface-elevated: oklch(22% 0.04 290 / 0.98);
+  --surface-hover: oklch(28% 0.04 290);
+  --surface-subtle: oklch(100% 0 0 / 0.03);
+
+  --border-base: oklch(36% 0.04 290);
+  --border-subtle: oklch(90% 0.02 290 / 0.15);
+
+  --favorite-color: oklch(78% 0.16 85);
+  --favorite-glow: oklch(78% 0.16 85 / 0.5);
+}
+
+/* ── Preset: Solarized ─────────────────────────────────────── */
+
+[data-theme-preset="solarized"] {
+  --color-accent-h: 175;
+  --color-accent-c: 0.18;
+  --color-accent-l: 55%;
+  --color-warning-h: 45;
+  --color-warning-c: 0.20;
+  --color-success-h: 68;
+  --color-error-l: 62%;
+  --color-error-c: 0.22;
+  --color-error-h: 5;
+  --color-info-h: 220;
+  --color-info-c: 0.16;
+  --color-info-l: 68%;
+
+  --bg-base: oklch(95% 0.03 85);
+  --bg-elevated: oklch(97% 0.025 85 / 0.95);
+  --bg-hover: oklch(91% 0.035 85);
+  --bg-disabled: oklch(90% 0.025 85);
+
+  --text-primary: oklch(30% 0.06 200);
+  --text-secondary: oklch(50% 0.04 200);
+  --text-inverse: oklch(95% 0.03 85);
+
+  --surface-base: oklch(96% 0.025 85);
+  --surface-elevated: oklch(97% 0.025 85 / 0.95);
+  --surface-hover: oklch(91% 0.035 85);
+  --surface-subtle: oklch(0% 0 0 / 0.03);
+
+  --border-base: oklch(78% 0.04 85);
+  --border-subtle: oklch(78% 0.04 85 / 0.45);
+
+  --favorite-color: oklch(68% 0.16 75);
+  --favorite-glow: oklch(68% 0.16 75 / 0.5);
+}
+
+[data-theme="dark"][data-theme-preset="solarized"] {
+  --color-accent-h: 175;
+  --color-accent-c: 0.18;
+  --color-accent-l: 60%;
+  --color-warning-h: 45;
+  --color-warning-c: 0.20;
+  --color-success-h: 68;
+  --color-error-l: 65%;
+  --color-error-c: 0.22;
+  --color-error-h: 5;
+  --color-info-h: 220;
+  --color-info-c: 0.16;
+  --color-info-l: 68%;
+
+  --bg-base: oklch(18% 0.05 200);
+  --bg-elevated: oklch(22% 0.05 200 / 0.98);
+  --bg-hover: oklch(28% 0.05 200);
+  --bg-disabled: oklch(28% 0.04 200);
+
+  --text-primary: oklch(72% 0.03 85);
+  --text-secondary: oklch(62% 0.03 85);
+  --text-inverse: oklch(18% 0.05 200);
+
+  --surface-base: oklch(24% 0.05 200);
+  --surface-elevated: oklch(22% 0.05 200 / 0.98);
+  --surface-hover: oklch(28% 0.05 200);
+  --surface-subtle: oklch(100% 0 0 / 0.03);
+
+  --border-base: oklch(36% 0.04 200);
+  --border-subtle: oklch(72% 0.03 85 / 0.15);
+
+  --favorite-color: oklch(72% 0.16 75);
+  --favorite-glow: oklch(72% 0.16 75 / 0.5);
+}
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="icon icon-tabler icons-tabler-outline icon-tabler-brush"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M3 21v-4a4 4 0 1 1 4 4h-4" /><path d="M21 3a16 16 0 0 0 -12.8 10.2" /><path d="M21 3a16 16 0 0 1 -10.2 12.8" /><path d="M10.6 9a9 9 0 0 1 4.4 4.4" /></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="icon icon-tabler icons-tabler-outline icon-tabler-currency-dollar"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M16.7 8a3 3 0 0 0 -2.7 -2h-4a3 3 0 0 0 0 6h4a3 3 0 0 1 0 6h-4a3 3 0 0 1 -2.7 -2" /><path d="M12 3v3m0 12v3" /></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="icon icon-tabler icons-tabler-outline icon-tabler-git-merge"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M5 18a2 2 0 1 0 4 0a2 2 0 1 0 -4 0" /><path d="M5 6a2 2 0 1 0 4 0a2 2 0 1 0 -4 0" /><path d="M15 12a2 2 0 1 0 4 0a2 2 0 1 0 -4 0" /><path d="M7 8l0 8" /><path d="M7 8a4 4 0 0 0 4 4h4" /></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="icon icon-tabler icons-tabler-outline icon-tabler-license"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M15 21h-9a3 3 0 0 1 -3 -3v-1h10v2a2 2 0 0 0 4 0v-14a2 2 0 1 1 2 2h-2m2 -4h-11a3 3 0 0 0 -3 3v11" /><path d="M9 7l4 0" /><path d="M9 11l4 0" /></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="icon icon-tabler icons-tabler-outline icon-tabler-user"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M8 7a4 4 0 1 0 8 0a4 4 0 0 0 -8 0" /><path d="M6 21v-2a4 4 0 0 1 4 -4h4a4 4 0 0 1 4 4v2" /></svg>
@@ -190,6 +190,12 @@ export const DOWNLOAD_ENDPOINTS = {
    exampleImages: '/api/lm/force-download-example-images' // New endpoint for downloading example images
 };

+// Hugging Face API endpoints
+export const HF_ENDPOINTS = {
+    repoFiles: '/api/lm/hf-repo-files',
+    download: '/api/lm/download-hf-model',
+};
+
 // WebSocket endpoints
 export const WS_ENDPOINTS = {
    fetchProgress: '/ws/fetch-progress'
@@ -1,12 +1,13 @@
 import { state, getCurrentPageState } from '../state/index.js';
 import { showToast } from '../utils/uiHelpers.js';
 import { translate } from '../utils/i18nHelpers.js';
-import { getStorageItem, getSessionItem, saveMapToStorage } from '../utils/storageHelpers.js';
+import { getStorageItem, getSessionItem, removeSessionItem, saveMapToStorage } from '../utils/storageHelpers.js';
 import {
    getCompleteApiConfig,
    getCurrentModelType,
    isValidModelType,
    DOWNLOAD_ENDPOINTS,
+    HF_ENDPOINTS,
    WS_ENDPOINTS
 } from './apiConfig.js';
 import { resetAndReload } from './modelApiFactory.js';
@@ -115,7 +116,10 @@ export class BaseModelApiClient {
        const pageState = this.getPageState();

        try {
-            state.loadingManager.showSimpleLoading(`Loading more ${this.apiConfig.config.displayName}s...`);
+            // Use grid-scoped loading instead of full-page overlay
+            if (state.virtualScroller?.showGridLoading) {
+                state.virtualScroller.showGridLoading();
+            }

            pageState.isLoading = true;
            if (resetPage) {
@@ -133,6 +137,16 @@ export class BaseModelApiClient {
            pageState.hasMore = result.hasMore;
            pageState.currentPage = pageState.currentPage + 1;

+            // When resetting to page 1, scroll back to the top
+            // This covers: folder selection, filter/sort/search changes,
+            // favorites/update/excluded view toggles, alphabet filter, etc.
+            if (resetPage) {
+                const scrollContainer = document.querySelector('.page-content');
+                if (scrollContainer) {
+                    scrollContainer.scrollTop = 0;
+                }
+            }
+
            if (updateFolders) {
                sidebarManager.refresh();
            }
@@ -144,7 +158,14 @@ export class BaseModelApiClient {
            throw error;
        } finally {
            pageState.isLoading = false;
-            state.loadingManager.hide();
+            // Wait for the next rAF so refreshWithData's scheduleRender has
+            // completed rendering new cards before hiding the grid loading overlay.
+            // This eliminates the ~6.7ms blank-frame gap that caused the flicker.
+            if (state.virtualScroller?.hideGridLoading) {
+                requestAnimationFrame(() => {
+                    state.virtualScroller.hideGridLoading();
+                });
+            }
        }
    }

@@ -679,39 +700,34 @@ export class BaseModelApiClient {
                <div class="modal-content metadata-refresh-result-modal">
                    <button class="close" data-action="close-modal">&times;</button>

-                    <h2><i class="fas fa-sync-alt"></i> ${translate('modals.metadataFetchSummary.title', {}, 'Metadata Fetch Summary')}</h2>
+                    <h2>${translate('modals.metadataFetchSummary.title', {}, 'Metadata Fetch Summary')}</h2>

                    <div class="refresh-summary-stats">
                        <div class="stat-card stat-card-success">
-                            <i class="fas fa-check-circle"></i>
                            <div class="stat-card-body">
                                <span class="stat-card-label">${translate('modals.metadataFetchSummary.statSuccess', {}, 'Success')}</span>
                                <span class="stat-card-value">${success}</span>
                            </div>
                        </div>
                        <div class="stat-card stat-card-failure">
-                            <i class="fas fa-times-circle"></i>
                            <div class="stat-card-body">
                                <span class="stat-card-label">${translate('modals.metadataFetchSummary.statFailed', {}, 'Failed')}</span>
                                <span class="stat-card-value">${failure_count}</span>
                            </div>
                        </div>
                        <div class="stat-card stat-card-skipped">
-                            <i class="fas fa-forward"></i>
                            <div class="stat-card-body">
                                <span class="stat-card-label">${translate('modals.metadataFetchSummary.statSkipped', {}, 'Skipped')}</span>
                                <span class="stat-card-value">${skipped_count}</span>
                            </div>
                        </div>
                        <div class="stat-card stat-card-total">
-                            <i class="fas fa-database"></i>
                            <div class="stat-card-body">
                                <span class="stat-card-label">${translate('modals.metadataFetchSummary.statTotal', {}, 'Total Scanned')}</span>
                                <span class="stat-card-value">${total || processed}</span>
                            </div>
                        </div>
                        <div class="stat-card stat-card-time">
-                            <i class="fas fa-clock"></i>
                            <div class="stat-card-body">
                                <span class="stat-card-label">${translate('modals.metadataFetchSummary.statDuration', {}, 'Duration')}</span>
                                <span class="stat-card-value">${elapsed_seconds}s</span>
@@ -1228,6 +1244,48 @@ export class BaseModelApiClient {
        }
    }

+    async fetchHfRepoFiles(repo, revision = 'main') {
+        try {
+            const params = new URLSearchParams({ repo, revision });
+            const response = await fetch(`${HF_ENDPOINTS.repoFiles}?${params}`);
+            if (!response.ok) {
+                const err = await response.json().catch(() => ({}));
+                throw new Error(err.error || 'Failed to fetch HF repo files');
+            }
+            return await response.json();
+        } catch (error) {
+            console.error('Error fetching HF repo files:', error);
+            throw error;
+        }
+    }
+
+    async downloadHfModel({ repo, filename, revision, modelRoot, relativePath, useDefaultPaths, download_id }) {
+        try {
+            const response = await fetch(HF_ENDPOINTS.download, {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({
+                    repo,
+                    filename,
+                    revision: revision || 'main',
+                    model_root: modelRoot,
+                    relative_path: relativePath || '',
+                    use_default_paths: useDefaultPaths || false,
+                    ...(download_id ? { download_id } : {}),
+                })
+            });
+
+            if (!response.ok) {
+                throw new Error(await response.text());
+            }
+
+            return await response.json();
+        } catch (error) {
+            console.error('Error downloading HF model:', error);
+            throw error;
+        }
+    }
+
    _buildQueryParams(baseParams, pageState) {
        const params = new URLSearchParams(baseParams);
        const isExcludedView = pageState.viewMode === 'excluded';
@@ -1266,6 +1324,12 @@ export class BaseModelApiClient {

        params.append('recursive', pageState.searchOptions.recursive ? 'true' : 'false');

+        // Pass group-by-model mode to backend (skip when showing all versions of a specific model)
+        const vlmModelId = getSessionItem('vlm_model_id');
+        if (state.global.settings.group_by_model && !vlmModelId) {
+            params.append('group_by_model', 'true');
+        }
+
        if (!isExcludedView && pageState.filters) {
            if (pageState.filters.tags && Object.keys(pageState.filters.tags).length > 0) {
                Object.entries(pageState.filters.tags).forEach(([tag, state]) => {
@@ -1347,6 +1411,24 @@ export class BaseModelApiClient {
    }

    _addModelSpecificParams(params, pageState) {
+        // Check for View Local Versions filter (takes priority over recipe filters)
+        const vlmModelId = getSessionItem('vlm_model_id');
+        const vlmPageType = getSessionItem('vlm_page_type');
+        if (vlmModelId && vlmPageType === this.modelType) {
+            params.append('civitai_model_id', vlmModelId);
+            const vlmBaseModel = getSessionItem('vlm_base_model');
+            if (vlmBaseModel) {
+                params.append('base_model', vlmBaseModel);
+            }
+            return;
+        } else if (vlmModelId && vlmPageType !== this.modelType) {
+            // Stale VLM data from a different page type — clean up
+            removeSessionItem('vlm_model_id');
+            removeSessionItem('vlm_model_name');
+            removeSessionItem('vlm_base_model');
+            removeSessionItem('vlm_page_type');
+        }
+
        if (this.modelType === 'loras') {
            const filterLoraHash = getSessionItem('recipe_to_lora_filterLoraHash');
            const filterLoraHashes = getSessionItem('recipe_to_lora_filterLoraHashes');
@@ -9,6 +9,13 @@ export class LoraApiClient extends BaseModelApiClient {
     * Add LoRA-specific parameters to query
     */
    _addModelSpecificParams(params, pageState) {
+        // Let parent handle View Local Versions filter first
+        super._addModelSpecificParams(params, pageState);
+        // If VLM filter was applied, skip recipe-specific filters
+        if (params.has('civitai_model_id')) {
+            return;
+        }
+
        const filterLoraHash = getSessionItem('recipe_to_lora_filterLoraHash');
        const filterLoraHashes = getSessionItem('recipe_to_lora_filterLoraHashes');

@@ -24,6 +24,14 @@ export class GlobalContextMenu extends BaseContextMenu {
        const cleanupExamplesItem = this.menu.querySelector('[data-action="cleanup-example-images-folders"]');
        const excludedModelsItem = this.menu.querySelector('[data-action="manage-excluded-models"]');
        const repairRecipesItem = this.menu.querySelector('[data-action="repair-recipes"]');
+        const groupByModelItem = this.menu.querySelector('[data-action="toggle-group-by-model"]');
+        const groupByModelCheck = groupByModelItem?.querySelector('.check-indicator');
+
+        // Update check indicator for group-by-model
+        if (groupByModelCheck) {
+            const isEnabled = !!state.global.settings.group_by_model;
+            groupByModelCheck.style.display = isEnabled ? 'block' : 'none';
+        }

        if (isRecipesPage) {
            modelUpdateItem?.classList.add('hidden');
@@ -31,6 +39,7 @@ export class GlobalContextMenu extends BaseContextMenu {
            downloadExamplesItem?.classList.add('hidden');
            cleanupExamplesItem?.classList.add('hidden');
            excludedModelsItem?.classList.add('hidden');
+            groupByModelItem?.classList.add('hidden');
            repairRecipesItem?.classList.remove('hidden');
        } else {
            modelUpdateItem?.classList.remove('hidden');
@@ -38,6 +47,7 @@ export class GlobalContextMenu extends BaseContextMenu {
            downloadExamplesItem?.classList.remove('hidden');
            cleanupExamplesItem?.classList.remove('hidden');
            excludedModelsItem?.classList.remove('hidden');
+            groupByModelItem?.classList.remove('hidden');
            repairRecipesItem?.classList.add('hidden');
        }

@@ -74,6 +84,9 @@ export class GlobalContextMenu extends BaseContextMenu {
            case 'manage-excluded-models':
                this.manageExcludedModels();
                break;
+            case 'toggle-group-by-model':
+                this.toggleGroupByModel();
+                break;
            default:
                console.warn(`Unhandled global context menu action: ${action}`);
                break;
@@ -86,6 +99,30 @@ export class GlobalContextMenu extends BaseContextMenu {
        });
    }

+    toggleGroupByModel() {
+        const sm = window.settingsManager;
+        if (!sm) {
+            console.error('settingsManager not available on window');
+            return;
+        }
+        const newValue = !state.global.settings.group_by_model;
+        state.global.settings.group_by_model = newValue;
+
+        // Save/restore sort preference when toggling group_by_model
+        if (window.pageControls?.onGroupByModelToggled) {
+            window.pageControls.onGroupByModelToggled(newValue);
+        }
+
+        sm.saveSetting('group_by_model', newValue).catch((error) => {
+            console.error('Failed to save group_by_model setting:', error);
+            // Revert state on failure
+            state.global.settings.group_by_model = !newValue;
+        });
+
+        sm.applyFrontendSettings();
+        sm.reloadContent();
+    }
+
    async downloadExampleImages(menuItem) {
        const downloadPath = state?.global?.settings?.example_images_path;
        if (!downloadPath) {
@@ -1,9 +1,9 @@
 import { updateService } from '../managers/UpdateService.js';
-import { toggleTheme } from '../utils/uiHelpers.js';
+import { toggleTheme, setPreset, CYCLE_ORDER, PRESET_NAMES } from '../utils/uiHelpers.js';
 import { SearchManager } from '../managers/SearchManager.js';
 import { FilterManager } from '../managers/FilterManager.js';
 import { initPageState } from '../state/index.js';
-import { getStorageItem } from '../utils/storageHelpers.js';
+import { getStorageItem, setStorageItem } from '../utils/storageHelpers.js';
 import { updateElementAttribute } from '../utils/i18nHelpers.js';
 import { renderSupporters } from '../services/supportersService.js';

@@ -47,25 +47,8 @@ export class HeaderManager {
    }
    
    initializeCommonElements() {
-      // Handle theme toggle
-      const themeToggle = document.querySelector('.theme-toggle');
-      if (themeToggle) {
-        const currentTheme = getStorageItem('theme') || 'auto';
-        themeToggle.classList.add(`theme-${currentTheme}`);
+      this.initializeThemePopover();

-        // Use i18nHelpers to update themeToggle's title
-        this.updateThemeTooltip(themeToggle, currentTheme);
-
-        themeToggle.addEventListener('click', async () => {
-          if (typeof toggleTheme === 'function') {
-            const newTheme = toggleTheme();
-            // Use i18nHelpers to update themeToggle's title
-            this.updateThemeTooltip(themeToggle, newTheme);
-          }
-        });
-      }
-      
-      // Handle settings toggle
      const settingsToggle = document.querySelector('.settings-toggle');
      if (settingsToggle) {
        settingsToggle.addEventListener('click', () => {
@@ -74,22 +57,19 @@ export class HeaderManager {
          }
        });
      }
-      
-      // Handle update toggle
+
      const updateToggle = document.getElementById('updateToggleBtn');
      if (updateToggle) {
        updateToggle.addEventListener('click', () => {
          updateService.toggleUpdateModal();
        });
      }
-      
-      // Handle support toggle
+
      const supportToggle = document.getElementById('supportToggleBtn');
      if (supportToggle) {
        supportToggle.addEventListener('click', async () => {
          if (window.modalManager) {
            window.modalManager.toggleModal('supportModal');
-            // Load supporters data when modal opens
            try {
              await renderSupporters();
            } catch (error) {
@@ -99,41 +79,144 @@ export class HeaderManager {
        });
      }

-      // Handle QR code toggle
      const qrToggle = document.getElementById('toggleQRCode');
      const qrContainer = document.getElementById('qrCodeContainer');
-      
-      if (qrToggle && qrContainer) {
-          qrToggle.addEventListener('click', function() {
-              qrContainer.classList.toggle('show');
-              qrToggle.classList.toggle('active');
-              
-              const toggleText = qrToggle.querySelector('.toggle-text');
-              if (qrContainer.classList.contains('show')) {
-                  toggleText.textContent = 'Hide WeChat QR Code';
-                  // Add small delay to ensure DOM is updated before scrolling
-                  setTimeout(() => {
-                      const supportModal = document.querySelector('.support-modal');
-                      if (supportModal) {
-                          supportModal.scrollTo({
-                              top: supportModal.scrollHeight,
-                              behavior: 'smooth'
-                          });
-                      }
-                  }, 250);
-              } else {
-                  toggleText.textContent = 'Show WeChat QR Code';
-              }
-          });
-      }
-      
-      // Hide search functionality on Statistics page
-      this.updateHeaderForPage();

-      // Initialize hamburger menu for mobile
+      if (qrToggle && qrContainer) {
+        qrToggle.addEventListener('click', function () {
+          qrContainer.classList.toggle('show');
+          qrToggle.classList.toggle('active');
+
+          const toggleText = qrToggle.querySelector('.toggle-text');
+          if (qrContainer.classList.contains('show')) {
+            toggleText.textContent = 'Hide WeChat QR Code';
+            setTimeout(() => {
+              const supportModal = document.querySelector('.support-modal');
+              if (supportModal) {
+                supportModal.scrollTo({
+                  top: supportModal.scrollHeight,
+                  behavior: 'smooth'
+                });
+              }
+            }, 250);
+          } else {
+            toggleText.textContent = 'Show WeChat QR Code';
+          }
+        });
+      }
+
+      this.updateHeaderForPage();
      this.initializeHamburgerMenu();
    }

+    initializeThemePopover() {
+      const themeToggle = document.querySelector('.theme-toggle');
+      const themePopover = document.getElementById('themePopover');
+      if (!themeToggle || !themePopover) return;
+
+      const currentTheme = getStorageItem('theme') || 'auto';
+      const currentPreset = getStorageItem('theme_preset') || 'default';
+      themeToggle.classList.add(`theme-${currentTheme}`);
+      this.updateThemeTooltip(themeToggle, currentTheme);
+      this.updatePopoverActiveStates(currentTheme, currentPreset);
+
+      themeToggle.addEventListener('click', (e) => {
+        e.stopPropagation();
+        const isOpen = themePopover.classList.contains('active');
+        this.closeAllPopovers();
+        if (!isOpen) {
+          this.positionThemePopover();
+          themePopover.classList.add('active');
+        }
+      });
+
+      themePopover.addEventListener('click', (e) => {
+        e.stopPropagation();
+        const modeBtn = e.target.closest('.theme-mode-btn');
+        const presetBtn = e.target.closest('.theme-preset-btn');
+
+        if (modeBtn) {
+          const mode = modeBtn.dataset.mode;
+          this.setThemeMode(mode);
+        } else if (presetBtn) {
+          const preset = presetBtn.dataset.preset;
+          this.setThemePreset(preset);
+        }
+      });
+
+      document.addEventListener('click', (e) => {
+        if (!themeToggle.contains(e.target) && !themePopover.contains(e.target)) {
+          themePopover.classList.remove('active');
+        }
+      });
+
+      // Reposition on resize while popover is active
+      window.addEventListener('resize', () => {
+        if (themePopover.classList.contains('active')) {
+          this.positionThemePopover();
+        }
+      });
+    }
+
+    closeAllPopovers() {
+      const themePopover = document.getElementById('themePopover');
+      if (themePopover) {
+        themePopover.classList.remove('active');
+      }
+    }
+
+    positionThemePopover() {
+      const themeToggle = document.querySelector('.theme-toggle');
+      const themePopover = document.getElementById('themePopover');
+      if (!themeToggle || !themePopover) return;
+      const rect = themeToggle.getBoundingClientRect();
+      // Guard: toggle may be hidden on narrow viewports (≤950px CSS hides .header-controls)
+      if (rect.width === 0 || rect.height === 0) return;
+      themePopover.style.top = (rect.bottom + 8) + 'px';
+      themePopover.style.right = (window.innerWidth - rect.right - 8) + 'px';
+    }
+
+    setThemeMode(mode) {
+      setStorageItem('theme', mode);
+      const htmlElement = document.documentElement;
+      const prefersDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
+      htmlElement.removeAttribute('data-theme');
+      if (mode === 'dark' || (mode === 'auto' && prefersDark)) {
+        htmlElement.setAttribute('data-theme', 'dark');
+        document.body.dataset.theme = 'dark';
+      } else {
+        htmlElement.setAttribute('data-theme', 'light');
+        document.body.dataset.theme = 'light';
+      }
+      const themeToggle = document.querySelector('.theme-toggle');
+      if (themeToggle) {
+        themeToggle.classList.remove('theme-light', 'theme-dark', 'theme-auto');
+        themeToggle.classList.add(`theme-${mode}`);
+        this.updateThemeTooltip(themeToggle, mode);
+      }
+      this.updateHamburgerThemeIcon();
+      this.updatePopoverActiveStates(mode, getStorageItem('theme_preset') || 'default');
+    }
+
+    setThemePreset(preset) {
+      setPreset(preset);
+      this.updatePopoverActiveStates(getStorageItem('theme') || 'auto', preset);
+      this.updateHamburgerThemeIcon();
+    }
+
+    updatePopoverActiveStates(theme, preset) {
+      const popover = document.getElementById('themePopover');
+      if (!popover) return;
+
+      popover.querySelectorAll('.theme-mode-btn').forEach(btn => {
+        btn.classList.toggle('active', btn.dataset.mode === theme);
+      });
+
+      popover.querySelectorAll('.theme-preset-btn').forEach(btn => {
+        btn.classList.toggle('active', btn.dataset.preset === preset);
+      });
+    }
+
    initializeHamburgerMenu() {
      const hamburgerBtn = document.getElementById('hamburgerMenuBtn');
      const hamburgerDropdown = document.getElementById('hamburgerDropdown');
@@ -188,7 +271,6 @@ export class HeaderManager {
        case 'theme':
          if (typeof toggleTheme === 'function') {
            const newTheme = toggleTheme();
-            // Update theme toggle in header if it exists
            const themeToggle = document.querySelector('.theme-toggle');
            if (themeToggle) {
              themeToggle.classList.remove('theme-light', 'theme-dark', 'theme-auto');
@@ -196,6 +278,7 @@ export class HeaderManager {
              this.updateThemeTooltip(themeToggle, newTheme);
            }
            this.updateHamburgerThemeIcon();
+            this.updatePopoverActiveStates(newTheme, getStorageItem('theme_preset') || 'default');
          }
          break;
        case 'settings':
@@ -255,7 +338,6 @@ export class HeaderManager {
      const headerSearch = document.getElementById('headerSearch');
      const searchInput = headerSearch?.querySelector('#searchInput');
      const searchButtons = headerSearch?.querySelectorAll('button');
-      const placeholderKey = 'header.search.placeholders.' + this.currentPage;

      if (this.currentPage === 'statistics' && headerSearch) {
        headerSearch.classList.add('disabled');
@@ -270,7 +352,7 @@ export class HeaderManager {
        if (searchInput) {
          searchInput.disabled = false;
          // Use i18nHelpers to update placeholder
-          updateElementAttribute(searchInput, 'placeholder', placeholderKey, {}, '');
+          updateElementAttribute(searchInput, 'placeholder', 'header.search.placeholder', {}, '');
        }
        searchButtons?.forEach(btn => btn.disabled = false);
      }
@@ -1,5 +1,5 @@
 // Recipe Modal Component
-import { showToast, copyToClipboard, sendLoraToWorkflow, sendModelPathToWorkflow, openCivitaiByMetadata } from '../utils/uiHelpers.js';
+import { showToast, copyToClipboard, sendLoraToWorkflow, sendModelPathToWorkflow, openCivitaiByMetadata, stripLoraTags, sendPromptToWorkflow, sendGenParamsToWorkflow } from '../utils/uiHelpers.js';
 import { translate } from '../utils/i18nHelpers.js';
 import { state } from '../state/index.js';
 import { setSessionItem, removeSessionItem, getStorageItem, setStorageItem } from '../utils/storageHelpers.js';
@@ -7,6 +7,8 @@ import { fetchRecipeDetails, updateRecipeMetadata } from '../api/recipeApi.js';
 import { downloadManager } from '../managers/DownloadManager.js';
 import { MODEL_TYPES } from '../api/apiConfig.js';
 import { openMediaViewer } from './shared/MediaViewer.js';
+import { renderCompactTags, setupTagTooltip } from './shared/utils.js';
+import { setupTagEditMode } from './shared/ModelTags.js';

 const ALLOWED_GEN_PARAM_KEYS = new Set([
    'prompt',
@@ -38,6 +40,16 @@ const GEN_PARAM_NORMALIZATION = {
    'Denoising strength': 'denoising_strength',
 };

+const PARAM_DISPLAY_NAMES = {
+    steps: 'Steps',
+    sampler: 'Sampler',
+    cfg_scale: 'CFG',
+    seed: 'Seed',
+    size: 'Size',
+    clip_skip: 'Clip Skip',
+    denoising_strength: 'Denoising Strength',
+};
+
 class RecipeModal {
    constructor() {
        this.promptEditorState = {};
@@ -139,14 +151,6 @@ class RecipeModal {
                this.saveTitleEdit();
            }

-            // Handle tags edit
-            const tagsEditor = document.getElementById('recipeTagsEditor');
-            if (tagsEditor && tagsEditor.classList.contains('active') &&
-                !tagsEditor.contains(event.target) &&
-                !event.target.closest('.edit-icon')) {
-                this.saveTagsEdit();
-            }
-
            // Handle reconnect input
            const reconnectContainers = document.querySelectorAll('.lora-reconnect-container');
            reconnectContainers.forEach(container => {
@@ -236,98 +240,10 @@ class RecipeModal {
        this.filePath = hydratedRecipe.file_path;
        this.listFilePath = hydratedRecipe.file_path;

-        // Set recipe tags if they exist
-        const tagsCompactElement = document.getElementById('recipeTagsCompact');
-        const tagsTooltipContent = document.getElementById('recipeTagsTooltipContent');
-
-        if (tagsCompactElement) {
-            // Add tags container with edit functionality
-            tagsCompactElement.innerHTML = `
-                <div class="editable-content tags-content">
-                    <div class="tags-display"></div>
-                    <button class="edit-icon" title="Edit tags"><i class="fas fa-pencil-alt"></i></button>
-                </div>
-                <div id="recipeTagsEditor" class="content-editor tags-editor">
-                    <input type="text" class="tags-input" placeholder="Enter tags separated by commas">
-                </div>
-            `;
-
-            const tagsDisplay = tagsCompactElement.querySelector('.tags-display');
-
-            if (hydratedRecipe.tags && hydratedRecipe.tags.length > 0) {
-                // Limit displayed tags to 5, show a "+X more" button if needed
-                const maxVisibleTags = 5;
-                const visibleTags = hydratedRecipe.tags.slice(0, maxVisibleTags);
-                const remainingTags = hydratedRecipe.tags.length > maxVisibleTags ? hydratedRecipe.tags.slice(maxVisibleTags) : [];
-
-                // Add visible tags
-                visibleTags.forEach(tag => {
-                    const tagElement = document.createElement('div');
-                    tagElement.className = 'recipe-tag-compact';
-                    tagElement.textContent = tag;
-                    tagsDisplay.appendChild(tagElement);
-                });
-
-                // Add "more" button if needed
-                if (remainingTags.length > 0) {
-                    const moreButton = document.createElement('div');
-                    moreButton.className = 'recipe-tag-more';
-                    moreButton.textContent = `+${remainingTags.length} more`;
-                    tagsDisplay.appendChild(moreButton);
-
-                    // Add tooltip functionality
-                    moreButton.addEventListener('mouseenter', () => {
-                        document.getElementById('recipeTagsTooltip').classList.add('visible');
-                    });
-
-                    moreButton.addEventListener('mouseleave', () => {
-                        setTimeout(() => {
-                            if (!document.getElementById('recipeTagsTooltip').matches(':hover')) {
-                                document.getElementById('recipeTagsTooltip').classList.remove('visible');
-                            }
-                        }, 300);
-                    });
-
-                    document.getElementById('recipeTagsTooltip').addEventListener('mouseleave', () => {
-                        document.getElementById('recipeTagsTooltip').classList.remove('visible');
-                    });
-
-                    // Add all tags to tooltip
-                    if (tagsTooltipContent) {
-                        tagsTooltipContent.innerHTML = '';
-                        hydratedRecipe.tags.forEach(tag => {
-                            const tooltipTag = document.createElement('div');
-                            tooltipTag.className = 'tooltip-tag';
-                            tooltipTag.textContent = tag;
-                            tagsTooltipContent.appendChild(tooltipTag);
-                        });
-                    }
-                }
-            } else {
-                tagsDisplay.innerHTML = '<div class="no-tags">No tags</div>';
-            }
-
-            // Add event listeners for tags editing
-            const editTagsIcon = tagsCompactElement.querySelector('.edit-icon');
-            const tagsInput = tagsCompactElement.querySelector('.tags-input');
-
-            // Set current tags in the input
-            if (hydratedRecipe.tags && hydratedRecipe.tags.length > 0) {
-                tagsInput.value = hydratedRecipe.tags.join(', ');
-            }
-
-            editTagsIcon.addEventListener('click', () => this.showTagsEditor());
-
-            // Add key event listener for Enter key
-            tagsInput.addEventListener('keydown', (e) => {
-                if (e.key === 'Enter') {
-                    e.preventDefault();
-                    this.saveTagsEdit();
-                } else if (e.key === 'Escape') {
-                    e.preventDefault();
-                    this.cancelTagsEdit();
-                }
-            });
+        // Render tags using shared utility
+        const tagsContainer = document.getElementById('recipeTagsContainer');
+        if (tagsContainer) {
+            this.updateTagsDisplay(tagsContainer, hydratedRecipe.tags || []);
        }

        // Set recipe image
@@ -609,17 +525,35 @@ class RecipeModal {
    }

    syncTagsDisplay(tags) {
-        const tagsContainer = document.getElementById('recipeTagsCompact');
-        if (!tagsContainer) {
-            return;
-        }
+        const container = document.getElementById('recipeTagsContainer');
+        if (!container) return;
+        this.updateTagsDisplay(container, tags || []);
+    }

-        this.updateTagsDisplay(tagsContainer, tags || []);
+    // Re-render tags display using shared utility, wire edit mode with ModelTags
+    updateTagsDisplay(container, tags) {
+        const filePath = this.filePath || '';

-        const tagsInput = tagsContainer.querySelector('.tags-input');
-        if (tagsInput) {
-            tagsInput.value = tags && tags.length > 0 ? tags.join(', ') : '';
-        }
+        container.innerHTML = renderCompactTags(tags, filePath);
+
+        // Setup tooltip for all tags
+        setupTagTooltip(container);
+
+        // Wire edit button using shared tag editing (no suggestions for recipes)
+        setupTagEditMode(null, {
+            container: container,
+            showSuggestions: false,
+            normalizeTag: false,
+            saveHandler: async (filePath, tags) => {
+                await updateRecipeMetadata(filePath, { tags }, this.getMetadataUpdateOptions());
+            },
+            onSaved: (tags) => {
+                this.currentRecipe.tags = tags;
+                this.commitField('tags');
+                const c = document.getElementById('recipeTagsContainer');
+                if (c) this.updateTagsDisplay(c, tags);
+            },
+        });
    }

    syncPromptField(field, value, placeholder) {
@@ -664,10 +598,11 @@ class RecipeModal {

                for (const [key, value] of Object.entries(sanitizedGenParams)) {
                    if (!excludedParams.includes(key) && value !== undefined && value !== null) {
+                        const displayName = PARAM_DISPLAY_NAMES[key] || key;
                        const paramTag = document.createElement('div');
                        paramTag.className = 'param-tag';
                        paramTag.innerHTML = `
-                            <span class="param-name">${key}:</span>
+                            <span class="param-name">${displayName}:</span>
                            <span class="param-value">${value}</span>
                        `;
                        otherParamsElement.appendChild(paramTag);
@@ -976,139 +911,6 @@ class RecipeModal {
        }
    }

-    // Tags editing methods
-    showTagsEditor() {
-        const tagsContainer = document.getElementById('recipeTagsCompact');
-        if (tagsContainer) {
-            tagsContainer.querySelector('.editable-content').classList.add('hide');
-            const editor = tagsContainer.querySelector('#recipeTagsEditor');
-            editor.classList.add('active');
-            const input = editor.querySelector('input');
-            input.oninput = () => this.markFieldDirty('tags');
-            input.focus();
-        }
-    }
-
-    saveTagsEdit() {
-        const tagsContainer = document.getElementById('recipeTagsCompact');
-        if (tagsContainer) {
-            const editor = tagsContainer.querySelector('#recipeTagsEditor');
-            const input = editor.querySelector('input');
-            const tagsText = input.value.trim();
-
-            // Parse tags
-            let newTags = [];
-            if (tagsText) {
-                newTags = tagsText.split(',')
-                    .map(tag => tag.trim())
-                    .filter(tag => tag.length > 0);
-            }
-
-            // Check if tags changed
-            const oldTags = this.currentRecipe.tags || [];
-            const tagsChanged =
-                newTags.length !== oldTags.length ||
-                newTags.some((tag, index) => tag !== oldTags[index]);
-
-            if (tagsChanged) {
-                // Update the recipe on the server
-                updateRecipeMetadata(this.filePath, { tags: newTags }, this.getMetadataUpdateOptions())
-                    .then(data => {
-                        // Show success toast
-                        showToast('toast.recipes.tagsUpdated', {}, 'success');
-
-                        // Update the current recipe object
-                        this.currentRecipe.tags = newTags;
-                        this.commitField('tags');
-
-                        // Update tags in the UI
-                        this.updateTagsDisplay(tagsContainer, newTags);
-                    })
-                    .catch(error => {
-                        // Error is handled in the API function
-                        this.clearFieldDirty('tags');
-                    });
-            } else {
-                this.clearFieldDirty('tags');
-            }
-
-            // Hide editor
-            editor.classList.remove('active');
-            tagsContainer.querySelector('.editable-content').classList.remove('hide');
-        }
-    }
-
-    // Helper method to update tags display
-    updateTagsDisplay(tagsContainer, tags) {
-        const tagsDisplay = tagsContainer.querySelector('.tags-display');
-        tagsDisplay.innerHTML = '';
-
-        if (tags.length > 0) {
-            // Limit displayed tags to 5, show a "+X more" button if needed
-            const maxVisibleTags = 5;
-            const visibleTags = tags.slice(0, maxVisibleTags);
-            const remainingTags = tags.length > maxVisibleTags ? tags.slice(maxVisibleTags) : [];
-
-            // Add visible tags
-            visibleTags.forEach(tag => {
-                const tagElement = document.createElement('div');
-                tagElement.className = 'recipe-tag-compact';
-                tagElement.textContent = tag;
-                tagsDisplay.appendChild(tagElement);
-            });
-
-            // Add "more" button if needed
-            if (remainingTags.length > 0) {
-                const moreButton = document.createElement('div');
-                moreButton.className = 'recipe-tag-more';
-                moreButton.textContent = `+${remainingTags.length} more`;
-                tagsDisplay.appendChild(moreButton);
-
-                // Update tooltip content
-                const tooltipContent = document.getElementById('recipeTagsTooltipContent');
-                if (tooltipContent) {
-                    tooltipContent.innerHTML = '';
-                    tags.forEach(tag => {
-                        const tooltipTag = document.createElement('div');
-                        tooltipTag.className = 'tooltip-tag';
-                        tooltipTag.textContent = tag;
-                        tooltipContent.appendChild(tooltipTag);
-                    });
-                }
-
-                // Re-add tooltip functionality
-                moreButton.addEventListener('mouseenter', () => {
-                    document.getElementById('recipeTagsTooltip').classList.add('visible');
-                });
-
-                moreButton.addEventListener('mouseleave', () => {
-                    setTimeout(() => {
-                        if (!document.getElementById('recipeTagsTooltip').matches(':hover')) {
-                            document.getElementById('recipeTagsTooltip').classList.remove('visible');
-                        }
-                    }, 300);
-                });
-            }
-        } else {
-            tagsDisplay.innerHTML = '<div class="no-tags">No tags</div>';
-        }
-    }
-
-    cancelTagsEdit() {
-        const tagsContainer = document.getElementById('recipeTagsCompact');
-        if (tagsContainer) {
-            // Reset input value
-            const editor = tagsContainer.querySelector('#recipeTagsEditor');
-            const input = editor.querySelector('input');
-            input.value = this.currentRecipe.tags ? this.currentRecipe.tags.join(', ') : '';
-            this.clearFieldDirty('tags');
-
-            // Hide editor
-            editor.classList.remove('active');
-            tagsContainer.querySelector('.editable-content').classList.remove('hide');
-        }
-    }
-
    setupPromptEditors() {
        const promptConfigs = [
            {
@@ -1409,6 +1211,53 @@ class RecipeModal {
                this.sendRecipeToWorkflow();
            });
        }
+
+        // Send prompt to workflow buttons
+        const sendPromptBtn = document.getElementById('sendPromptBtn');
+        const sendNegativePromptBtn = document.getElementById('sendNegativePromptBtn');
+
+        if (sendPromptBtn) {
+            sendPromptBtn.addEventListener('click', () => {
+                let promptText = this.currentRecipe?.gen_params?.prompt || '';
+                if (this.shouldStripLoraOnCopy()) {
+                    promptText = RecipeModal.stripLoraTags(promptText);
+                }
+                if (!promptText.trim()) {
+                    showToast('toast.recipes.noPromptToSend', {}, 'warning');
+                    return;
+                }
+                sendPromptToWorkflow(promptText);
+            });
+        }
+
+        if (sendNegativePromptBtn) {
+            sendNegativePromptBtn.addEventListener('click', () => {
+                let negativePromptText = this.currentRecipe?.gen_params?.negative_prompt || '';
+                if (this.shouldStripLoraOnCopy()) {
+                    negativePromptText = RecipeModal.stripLoraTags(negativePromptText);
+                }
+                if (!negativePromptText.trim()) {
+                    showToast('toast.recipes.noPromptToSend', {}, 'warning');
+                    return;
+                }
+                sendPromptToWorkflow(negativePromptText, {
+                    actionTypeText: 'Negative Prompt',
+                });
+            });
+        }
+
+        // Send params to workflow button
+        const sendParamsBtn = document.getElementById('sendParamsBtn');
+        if (sendParamsBtn) {
+            sendParamsBtn.addEventListener('click', () => {
+                const genParams = this.currentRecipe?.gen_params || {};
+                if (!genParams || Object.keys(genParams).length === 0) {
+                    showToast('No generation parameters available', {}, 'warning');
+                    return;
+                }
+                sendGenParamsToWorkflow(genParams);
+            });
+        }
    }

    /**
@@ -1417,14 +1266,7 @@ class RecipeModal {
     * Cleans up artifacts like leading ", ", double commas, and extra whitespace.
     */
    static stripLoraTags(text) {
-        return text
-            .replace(/<lora:[^>]*>/gi, '')
-            .replace(/&lt;lora:[^&]*&gt;/gi, '')
-            .replace(/,(\s*,)+/g, ',')
-            .replace(/^,\s*/, '')
-            .replace(/,\s*$/, '')
-            .replace(/\s{2,}/g, ' ')
-            .trim();
+        return stripLoraTags(text);
    }

    shouldStripLoraOnCopy() {
@@ -4,7 +4,7 @@
 import { getStorageItem, setStorageItem } from '../utils/storageHelpers.js';
 import { getModelApiClient } from '../api/modelApiFactory.js';
 import { translate } from '../utils/i18nHelpers.js';
-import { state } from '../state/index.js';
+import { state, getCurrentPageState } from '../state/index.js';
 import { bulkManager } from '../managers/BulkManager.js';
 import { showToast } from '../utils/uiHelpers.js';
 import { performFolderUpdateCheck } from '../utils/updateCheckHelpers.js';
@@ -457,21 +457,69 @@ export class SidebarManager {

        try {
            console.log('[SidebarManager] calling apiClient.move, useBulkMove:', useBulkMove);
+            let movedFiles = []; // Array of { original_file_path, new_file_path }
+
            if (useBulkMove) {
-                await this.apiClient.moveBulkModels(this.draggedFilePaths, destination);
+                const results = await this.apiClient.moveBulkModels(this.draggedFilePaths, destination);
+                movedFiles = (results || [])
+                    .filter(r => r.success)
+                    .map(r => ({ original_file_path: r.original_file_path, new_file_path: r.new_file_path }));
            } else {
-                await this.apiClient.moveSingleModel(this.draggedFilePaths[0], destination);
+                const result = await this.apiClient.moveSingleModel(this.draggedFilePaths[0], destination);
+                if (result) {
+                    movedFiles.push({
+                        original_file_path: result.original_file_path || this.draggedFilePaths[0],
+                        new_file_path: result.new_file_path
+                    });
+                }
            }
            console.log('[SidebarManager] apiClient.move successful');

-            if (this.pageControls && typeof this.pageControls.resetAndReload === 'function') {
-                console.log('[SidebarManager] calling resetAndReload');
-                await this.pageControls.resetAndReload(true);
-            } else {
-                console.log('[SidebarManager] calling refresh');
-                await this.refresh();
+            // Update VirtualScroller in-place instead of full reload
+            if (movedFiles.length > 0 && state.virtualScroller) {
+                const pageState = getCurrentPageState();
+                const normalizedActive = (pageState.activeFolder || '').replace(/\\/g, '/').replace(/\/$/, '');
+                const isRecursive = pageState.searchOptions?.recursive ?? true;
+                const isFolderFiltered = pageState.activeFolder !== null;
+
+                const normalizedTarget = targetRelativePath.replace(/\\/g, '/').replace(/\/$/, '');
+
+                // Determine if items in the target folder are visible in the current view
+                let itemsRemainVisible = true;
+                if (isFolderFiltered) {
+                    if (isRecursive) {
+                        itemsRemainVisible = normalizedActive === '' ||
+                            normalizedTarget === normalizedActive ||
+                            normalizedTarget.startsWith(normalizedActive + '/');
+                    } else {
+                        itemsRemainVisible = normalizedTarget === normalizedActive;
+                    }
+                }
+
+                if (itemsRemainVisible) {
+                    // Items stay visible — update each item's file_path to reflect new location
+                    for (const moved of movedFiles) {
+                        if (moved.original_file_path && moved.new_file_path) {
+                            state.virtualScroller.updateSingleItem(moved.original_file_path, {
+                                file_path: moved.new_file_path,
+                                folder: normalizedTarget
+                            });
+                        }
+                    }
+                } else {
+                    // Items no longer visible in current folder — remove from VirtualScroller
+                    const pathsToRemove = movedFiles
+                        .map(m => m.original_file_path)
+                        .filter(Boolean);
+                    if (pathsToRemove.length > 0) {
+                        state.virtualScroller.removeMultipleItemsByFilePath(pathsToRemove);
+                    }
+                }
            }

+            // Refresh sidebar folder tree only (no model data reload)
+            await this.refresh();
+
            if (this.draggedFromBulk && state.bulkMode && typeof bulkManager?.toggleBulkMode === 'function') {
                bulkManager.toggleBulkMode();
            }
@@ -530,21 +578,69 @@ export class SidebarManager {

        try {
            console.log('[SidebarManager] calling apiClient.move, useBulkMove:', useBulkMove);
+            let movedFiles = []; // Array of { original_file_path, new_file_path }
+
            if (useBulkMove) {
-                await this.apiClient.moveBulkModels(draggedFilePaths, destination);
+                const results = await this.apiClient.moveBulkModels(draggedFilePaths, destination);
+                movedFiles = (results || [])
+                    .filter(r => r.success)
+                    .map(r => ({ original_file_path: r.original_file_path, new_file_path: r.new_file_path }));
            } else {
-                await this.apiClient.moveSingleModel(draggedFilePaths[0], destination);
+                const result = await this.apiClient.moveSingleModel(draggedFilePaths[0], destination);
+                if (result) {
+                    movedFiles.push({
+                        original_file_path: result.original_file_path || draggedFilePaths[0],
+                        new_file_path: result.new_file_path
+                    });
+                }
            }
            console.log('[SidebarManager] apiClient.move successful');

-            if (this.pageControls && typeof this.pageControls.resetAndReload === 'function') {
-                console.log('[SidebarManager] calling resetAndReload');
-                await this.pageControls.resetAndReload(true);
-            } else {
-                console.log('[SidebarManager] calling refresh');
-                await this.refresh();
+            // Update VirtualScroller in-place instead of full reload
+            if (movedFiles.length > 0 && state.virtualScroller) {
+                const pageState = getCurrentPageState();
+                const normalizedActive = (pageState.activeFolder || '').replace(/\\/g, '/').replace(/\/$/, '');
+                const isRecursive = pageState.searchOptions?.recursive ?? true;
+                const isFolderFiltered = pageState.activeFolder !== null;
+
+                const normalizedTarget = targetRelativePath.replace(/\\/g, '/').replace(/\/$/, '');
+
+                // Determine if items in the target folder are visible in the current view
+                let itemsRemainVisible = true;
+                if (isFolderFiltered) {
+                    if (isRecursive) {
+                        itemsRemainVisible = normalizedActive === '' ||
+                            normalizedTarget === normalizedActive ||
+                            normalizedTarget.startsWith(normalizedActive + '/');
+                    } else {
+                        itemsRemainVisible = normalizedTarget === normalizedActive;
+                    }
+                }
+
+                if (itemsRemainVisible) {
+                    // Items stay visible — update each item's file_path to reflect new location
+                    for (const moved of movedFiles) {
+                        if (moved.original_file_path && moved.new_file_path) {
+                            state.virtualScroller.updateSingleItem(moved.original_file_path, {
+                                file_path: moved.new_file_path,
+                                folder: normalizedTarget
+                            });
+                        }
+                    }
+                } else {
+                    // Items no longer visible in current folder — remove from VirtualScroller
+                    const pathsToRemove = movedFiles
+                        .map(m => m.original_file_path)
+                        .filter(Boolean);
+                    if (pathsToRemove.length > 0) {
+                        state.virtualScroller.removeMultipleItemsByFilePath(pathsToRemove);
+                    }
+                }
            }

+            // Refresh sidebar folder tree only (no model data reload)
+            await this.refresh();
+
            if (draggedFromBulk && state.bulkMode && typeof bulkManager?.toggleBulkMode === 'function') {
                bulkManager.toggleBulkMode();
            }
@@ -1040,7 +1136,15 @@ export class SidebarManager {
            <span class="sidebar-hidden-indicator-tooltip">${translate('sidebar.showSidebar')}</span>
        `;

+        // Subtle breathing animation on first sight to aid discoverability;
+        // stops permanently after user clicks the restore button once
+        const restoreKey = `${this.pageType}_restoreButtonUsed`;
+        if (!getStorageItem(restoreKey, false)) {
+            indicator.classList.add('breathing');
+        }
+
        indicator.addEventListener('click', () => {
+            setStorageItem(restoreKey, true);
            this.toggleHideOnThisPage();
        });

@@ -1338,7 +1442,7 @@ export class SidebarManager {
        this.pageControls.pageState.activeFolder = normalizedPath;
        setStorageItem(`${this.pageType}_activeFolder`, normalizedPath);

-        // Reload models with new filter
+        // Reload models with new filter (loadMoreWithVirtualScroll will scroll to top)
        await this.pageControls.resetAndReload();
    }

@@ -95,6 +95,23 @@ export class CheckpointsControls extends PageControls {
     * Clear checkpoint custom filter and reload
     */
    async clearCustomFilter() {
+        // Check for View Local Versions filter first
+        const vlmModelId = getSessionItem('vlm_model_id');
+        if (vlmModelId) {
+            removeSessionItem('vlm_model_id');
+            removeSessionItem('vlm_model_name');
+            removeSessionItem('vlm_base_model');
+            removeSessionItem('vlm_page_type');
+            this._restoreSortAfterVlm();
+            // Hide the indicator
+            const indicator = document.getElementById('customFilterIndicator');
+            if (indicator) {
+                indicator.classList.add('hidden');
+            }
+            await resetAndReload();
+            return;
+        }
+
        removeSessionItem('recipe_to_checkpoint_filterHash');
        removeSessionItem('recipe_to_checkpoint_filterHashes');
        removeSessionItem('filterCheckpointRecipeName');
@@ -106,14 +123,4 @@ export class CheckpointsControls extends PageControls {

        await resetAndReload();
    }
-
-    /**
-     * Helper to truncate text with ellipsis
-     * @param {string} text
-     * @param {number} maxLength
-     * @returns {string}
-     */
-    _truncateText(text, maxLength) {
-        return text.length > maxLength ? `${text.substring(0, maxLength - 3)}...` : text;
-    }
 }
@@ -112,6 +112,22 @@ export class LorasControls extends PageControls {
     * Clear the custom filter and reload the page
     */
    async clearCustomFilter() {
+        // Check for View Local Versions filter first (handles VLM and reloads)
+        const vlmModelId = getSessionItem('vlm_model_id');
+        if (vlmModelId) {
+            removeSessionItem('vlm_model_id');
+            removeSessionItem('vlm_model_name');
+            removeSessionItem('vlm_base_model');
+            removeSessionItem('vlm_page_type');
+            this._restoreSortAfterVlm();
+            const indicator = document.getElementById('customFilterIndicator');
+            if (indicator) {
+                indicator.classList.add('hidden');
+            }
+            await resetAndReload();
+            return;
+        }
+
        console.log("Clearing custom filter...");
        // Remove filter parameters from session storage
        removeSessionItem('recipe_to_lora_filterLoraHash');
@@ -134,16 +150,6 @@ export class LorasControls extends PageControls {
        await resetAndReload();
    }
    
-    /**
-     * Helper to truncate text with ellipsis
-     * @param {string} text - Text to truncate
-     * @param {number} maxLength - Maximum length before truncating
-     * @returns {string} - Truncated text
-     */
-    _truncateText(text, maxLength) {
-        return text.length > maxLength ? text.substring(0, maxLength - 3) + '...' : text;
-    }
-    
    /**
     * Initialize the alphabet bar component
     */
@@ -1,9 +1,10 @@
 // PageControls.js - Manages controls for both LoRAs and Checkpoints pages
 import { state, getCurrentPageState, setCurrentPageType } from '../../state/index.js';
-import { getStorageItem, setStorageItem, getSessionItem, setSessionItem } from '../../utils/storageHelpers.js';
+import { getStorageItem, setStorageItem, removeStorageItem, getSessionItem, setSessionItem, removeSessionItem } from '../../utils/storageHelpers.js';
 import { showToast, openCivitaiByMetadata } from '../../utils/uiHelpers.js';
 import { performModelUpdateCheck } from '../../utils/updateCheckHelpers.js';
 import { sidebarManager } from '../SidebarManager.js';
+import { initSortDropdown } from './SortDropdown.js';

 /**
 * PageControls class - Unified control management for model pages
@@ -106,6 +107,7 @@ export class PageControls {
        // Sort select handler
        const sortSelect = document.getElementById('sortSelect');
        if (sortSelect) {
+            initSortDropdown(sortSelect);
            sortSelect.value = this.pageState.sortBy;
            sortSelect.addEventListener('change', async (e) => {
                this.pageState.sortBy = e.target.value;
@@ -129,6 +131,9 @@ export class PageControls {
            clearFilterBtn.addEventListener('click', () => this.clearCustomFilter());
        }
        
+        // Check for View Local Versions filter
+        this.checkVlmFilter();
+
        // Page-specific event listeners
        this.initPageSpecificListeners();
    }
@@ -311,7 +316,12 @@ export class PageControls {
     * Load sort preference from storage
     */
    loadSortPreference() {
-        const savedSort = getStorageItem(`${this.pageType}_sort`);
+        // Use separate keys for grouped vs non-grouped sort so each mode
+        // remembers its own preference independently
+        const key = state.global.settings.group_by_model
+            ? `${this.pageType}_sort_grouped`
+            : `${this.pageType}_sort`;
+        const savedSort = getStorageItem(key);
        if (savedSort) {
            // Handle legacy format conversion
            const convertedSort = this.convertLegacySortFormat(savedSort);
@@ -355,7 +365,11 @@ export class PageControls {
            };
            return;
        }
-        setStorageItem(`${this.pageType}_sort`, sortValue);
+        // Separate storage for grouped vs non-grouped sort
+        const key = state.global.settings.group_by_model
+            ? `${this.pageType}_sort_grouped`
+            : `${this.pageType}_sort`;
+        setStorageItem(key, sortValue);
    }
    
    /**
@@ -459,15 +473,211 @@ export class PageControls {
        this.api.toggleBulkMode();
    }
    
+    /**
+     * Clear custom filter
+     */
+    /**
+     * Dynamically add the VLM sort option (version_id:desc) to the sort dropdown.
+     * It is not a permanent option — only present while VLM is active.
+     */
+    _addVlmSortOption() {
+        const sortSelect = document.getElementById('sortSelect');
+        if (!sortSelect) return;
+        // Only add if not already present
+        if (sortSelect.querySelector('option[value="version_id:desc"]')) return;
+        const opt = document.createElement('option');
+        opt.value = 'version_id:desc';
+        opt.textContent = this._t('loras.controls.sort.versionIdDesc', 'Newest version first');
+        sortSelect.appendChild(opt);
+    }
+
+    /**
+     * Remove the VLM sort option from the sort dropdown.
+     */
+    _removeVlmSortOption() {
+        const sortSelect = document.getElementById('sortSelect');
+        if (!sortSelect) return;
+        const opt = sortSelect.querySelector('option[value="version_id:desc"]');
+        if (opt) opt.remove();
+    }
+
+    /**
+     * Look up a translation key via the global i18n helper, falling back to
+     * a plain-text default when the key is missing or i18n is unavailable.
+     */
+    _t(key, fallback) {
+        if (typeof window.i18n?.t === 'function') {
+            return window.i18n.t(key, { defaultValue: fallback });
+        }
+        return fallback;
+    }
+
+    /**
+     * Restore the sort dropdown state after VLM is cleared.
+     * Shared by PageControls.clearCustomFilter() and subclass overrides.
+     */
+    _restoreSortAfterVlm() {
+        const prevSort = getSessionItem('vlm_prev_sort');
+        removeSessionItem('vlm_prev_sort');
+        const restoredSort = prevSort || 'name:asc';
+        this.pageState.sortBy = restoredSort;
+        this.saveSortPreference(restoredSort);
+        this._removeVlmSortOption();
+        const sortSelect = document.getElementById('sortSelect');
+        if (sortSelect) {
+            sortSelect.value = restoredSort;
+            sortSelect.disabled = false;
+        }
+    }
+
+    /**
+     * Trigger View Local Versions without page reload
+     * Sets sessionStorage and reloads data via the API.
+     */
+    triggerVlmView(modelId, modelName, baseModel, pageType) {
+        const targetPageType = pageType || this.pageType;
+        setSessionItem('vlm_model_id', String(modelId));
+        setSessionItem('vlm_model_name', modelName || String(modelId));
+        setSessionItem('vlm_page_type', targetPageType);
+        if (baseModel) {
+            setSessionItem('vlm_base_model', baseModel);
+        } else {
+            removeSessionItem('vlm_base_model');
+        }
+        // Save current sort preference so it can be restored when VLM is cleared
+        setSessionItem('vlm_prev_sort', this.pageState.sortBy);
+        // Inject the temporary sort option and force version_id:desc
+        this._addVlmSortOption();
+        this.pageState.sortBy = 'version_id:desc';
+        this.saveSortPreference('version_id:desc');
+        const sortSelect = document.getElementById('sortSelect');
+        if (sortSelect) {
+            sortSelect.value = 'version_id:desc';
+            sortSelect.disabled = true;
+        }
+        // Reload data via API (no page reload)
+        this.resetAndReload(true).then(() => {
+            // Show the VLM indicator after data loads
+            this.checkVlmFilter();
+        });
+    }
+
+    /**
+     * Called when group_by_model is toggled.
+     * Swaps between {pageType}_sort (non-group) and {pageType}_sort_grouped,
+     * so each mode remembers its own sort preference independently.
+     */
+    onGroupByModelToggled(isEnabled) {
+        const groupedKey = `${this.pageType}_sort_grouped`;
+
+        if (isEnabled) {
+            // Entering group mode: restore last-used grouped sort, if any
+            const savedGroupedSort = getStorageItem(groupedKey);
+            if (savedGroupedSort) {
+                this.pageState.sortBy = savedGroupedSort;
+                const sortSelect = document.getElementById('sortSelect');
+                if (sortSelect) {
+                    sortSelect.value = savedGroupedSort;
+                }
+            }
+        } else {
+            // Leaving group mode: persist current sort for next time, restore non-group sort
+            setStorageItem(groupedKey, this.pageState.sortBy);
+            const savedNormalSort = getStorageItem(`${this.pageType}_sort`);
+            if (savedNormalSort) {
+                this.pageState.sortBy = savedNormalSort;
+                const sortSelect = document.getElementById('sortSelect');
+                if (sortSelect) {
+                    sortSelect.value = savedNormalSort;
+                }
+            }
+        }
+    }
+
+    /**
+     * Check for View Local Versions filter in sessionStorage (page-type-scoped)
+     */
+    checkVlmFilter() {
+        const vlmModelId = getSessionItem('vlm_model_id');
+        const vlmPageType = getSessionItem('vlm_page_type');
+        const sortSelect = document.getElementById('sortSelect');
+
+        // Only show VLM indicator when it belongs to the current page type
+        if (vlmModelId && vlmPageType !== this.pageType) {
+            // Stale VLM data from a different page — clean up
+            removeSessionItem('vlm_model_id');
+            removeSessionItem('vlm_model_name');
+            removeSessionItem('vlm_base_model');
+            removeSessionItem('vlm_page_type');
+            removeSessionItem('vlm_prev_sort');
+            this._removeVlmSortOption();
+            if (sortSelect) sortSelect.disabled = false;
+            return;
+        }
+
+        const vlmModelName = getSessionItem('vlm_model_name');
+        const vlmBaseModel = getSessionItem('vlm_base_model');
+
+        if (vlmModelId && vlmModelName) {
+            // VLM is active — inject sort option, disable dropdown, show indicator
+            this._addVlmSortOption();
+            if (sortSelect) {
+                sortSelect.value = 'version_id:desc';
+                sortSelect.disabled = true;
+            }
+
+            const indicator = document.getElementById('customFilterIndicator');
+            const filterText = indicator?.querySelector('.customFilterText');
+
+            if (indicator && filterText) {
+                indicator.classList.remove('hidden');
+
+                const prefix = vlmBaseModel
+                    ? 'Showing same-base versions from'
+                    : 'Showing all versions from';
+                const displayText = `${prefix}: ${vlmModelName}`;
+
+                filterText.textContent = this._truncateText(displayText, 40);
+                filterText.setAttribute('title', displayText);
+            }
+        } else {
+            // No VLM — ensure sort option is removed and dropdown is enabled
+            this._removeVlmSortOption();
+            if (sortSelect) sortSelect.disabled = false;
+        }
+    }
+
    /**
     * Clear custom filter
     */
    async clearCustomFilter() {
+        // Check for View Local Versions filter first
+        const vlmModelId = getSessionItem('vlm_model_id');
+        if (vlmModelId) {
+            removeSessionItem('vlm_model_id');
+            removeSessionItem('vlm_model_name');
+            removeSessionItem('vlm_base_model');
+            removeSessionItem('vlm_page_type');
+
+            this._restoreSortAfterVlm();
+
+            // Hide the indicator
+            const indicator = document.getElementById('customFilterIndicator');
+            if (indicator) {
+                indicator.classList.add('hidden');
+            }
+
+            // Reload data via API (no page reload)
+            await this.resetAndReload(true);
+            return;
+        }
+
+        // Otherwise delegate to subclass for recipe filters
        if (!this.api) {
            console.error('API methods not registered');
            return;
        }
-        
+
        try {
            await this.api.clearCustomFilter();
        } catch (error) {
@@ -475,6 +685,14 @@ export class PageControls {
            showToast('toast.controls.clearFilterFailed', { message: error.message }, 'error');
        }
    }
+
+    /**
+     * Truncate text with ellipsis
+     */
+    _truncateText(text, maxLength) {
+        if (!text) return '';
+        return text.length > maxLength ? `${text.substring(0, maxLength - 3)}...` : text;
+    }
    
    /**
     * Initialize the favorites filter button state
@@ -0,0 +1,294 @@
+// SortDropdown.js — Decoupled sort trigger.
+//
+// The native <select> sizes its trigger to the widest <option>, so long
+// options (e.g. "Fewest versions first") or long i18n translations force the
+// control to be far wider than the selected text needs. This module wraps the
+// existing <select> with a custom trigger + menu that mirror its state, so the
+// trigger sizes to the selected text while the menu sizes to its content.
+//
+// The native <select> stays in the DOM (visually hidden) so existing code that
+// reads/writes `.value` / `.disabled` and dynamically adds/removes <option>s
+// (e.g. the VLM temporary option) keeps working unchanged. The `value` and
+// `disabled` setters are overridden on the instance to keep the trigger label
+// and disabled styling in sync with programmatic changes.
+//
+// Keyboard navigation (arrows, Home/End, type-to-select) mirrors native
+// <select> behavior so the control remains fully accessible.
+
+const SORT_GROUP_SELECTOR = '.sort-dropdown-group';
+const ACTIVE_GROUP_SELECTOR = '.sort-dropdown-group.active, .dropdown-group.active';
+
+/**
+ * Initialize a decoupled sort dropdown around a native <select>.
+ * Idempotent: safe to call more than once on the same element.
+ * @param {HTMLSelectElement|null} select
+ * @returns {void}
+ */
+export function initSortDropdown(select) {
+    if (!select) return;
+
+    const group = select.closest(SORT_GROUP_SELECTOR);
+    if (!group || group.dataset.sortReady === '1') return;
+
+    const trigger = group.querySelector('.sort-trigger');
+    const menu = group.querySelector('.sort-dropdown-menu');
+    const label = group.querySelector('.sort-trigger__label');
+    if (!trigger || !menu || !label) return;
+
+    const getOptions = () => menu.querySelectorAll('.sort-option');
+
+    const buildItem = (opt) => {
+        const item = document.createElement('div');
+        item.className = 'sort-option';
+        item.setAttribute('role', 'option');
+        item.tabIndex = -1;
+        item.dataset.value = opt.value;
+        item.textContent = opt.textContent;
+        item.addEventListener('click', (event) => {
+            event.stopPropagation();
+            if (select.disabled) return;
+            choose(opt.value);
+            close();
+        });
+        return item;
+    };
+
+    const buildMenu = () => {
+        menu.innerHTML = '';
+        const fragment = document.createDocumentFragment();
+        for (const child of Array.from(select.children)) {
+            if (child.tagName === 'OPTGROUP') {
+                const header = document.createElement('div');
+                header.className = 'sort-optgroup-label';
+                header.textContent = child.label || '';
+                fragment.appendChild(header);
+                for (const opt of Array.from(child.children)) {
+                    fragment.appendChild(buildItem(opt));
+                }
+            } else if (child.tagName === 'OPTION') {
+                fragment.appendChild(buildItem(child));
+            }
+        }
+        menu.appendChild(fragment);
+        syncSelected();
+    };
+
+    const syncSelected = () => {
+        const value = select.value;
+        let labelText = '';
+        let matched = false;
+        getOptions().forEach((el) => {
+            const selected = el.dataset.value === value;
+            el.classList.toggle('is-selected', selected);
+            el.setAttribute('aria-selected', selected ? 'true' : 'false');
+            if (selected) {
+                labelText = el.textContent;
+                matched = true;
+            }
+        });
+        if (!matched) {
+            const opt = select.querySelector(`option[value="${cssEscape(value)}"]`);
+            labelText = opt
+                ? opt.textContent
+                : (select.options[select.selectedIndex]?.textContent ?? '');
+        }
+        label.textContent = labelText;
+    };
+
+    const choose = (value) => {
+        if (select.value === value) return;
+        select.value = value;
+        select.dispatchEvent(new Event('change', { bubbles: true }));
+    };
+
+    const open = () => {
+        document.querySelectorAll(ACTIVE_GROUP_SELECTOR).forEach((g) => {
+            if (g !== group) g.classList.remove('active');
+        });
+        group.classList.add('active');
+        trigger.setAttribute('aria-expanded', 'true');
+        // Focus the currently selected option (or the first option) so
+        // keyboard navigation starts from a sensible position.
+        requestAnimationFrame(() => {
+            const selected = menu.querySelector('.sort-option.is-selected');
+            (selected || getOptions()[0])?.focus();
+        });
+    };
+
+    const close = () => {
+        group.classList.remove('active');
+        trigger.setAttribute('aria-expanded', 'false');
+    };
+
+    const toggle = () => {
+        if (group.classList.contains('active')) close();
+        else open();
+    };
+
+    // ---- keyboard navigation ----
+
+    // Type-to-select buffer: accumulate characters and reset after a pause.
+    // Shared between trigger and menu keydown handlers.
+    let typeBuffer = '';
+    let typeTimer = null;
+
+    const focusOptionByText = (prefix) => {
+        const options = getOptions();
+        const lower = prefix.toLowerCase();
+        for (let i = 0; i < options.length; i++) {
+            if (options[i].textContent.toLowerCase().startsWith(lower)) {
+                options[i].focus();
+                return;
+            }
+        }
+    };
+
+    const moveFocus = (options, direction) => {
+        const focused = menu.querySelector('.sort-option:focus');
+        let idx = focused ? Array.from(options).indexOf(focused) : -1;
+        idx = Math.max(0, Math.min(options.length - 1, idx + direction));
+        options[idx]?.focus();
+    };
+
+    const handleTypeToSelect = (event) => {
+        if (event.key.length !== 1 || event.ctrlKey || event.metaKey || event.altKey) return false;
+        event.preventDefault();
+        clearTimeout(typeTimer);
+        typeBuffer += event.key;
+        focusOptionByText(typeBuffer);
+        typeTimer = setTimeout(() => { typeBuffer = ''; }, 800);
+        return true;
+    };
+
+    trigger.addEventListener('click', (event) => {
+        event.stopPropagation();
+        if (select.disabled) return;
+        toggle();
+    });
+
+    trigger.addEventListener('keydown', (event) => {
+        if (event.key === 'Escape') {
+            close();
+        } else if (event.key === 'Enter' || event.key === ' ' || event.key === 'Spacebar') {
+            event.preventDefault();
+            if (!select.disabled) toggle();
+        } else if (!group.classList.contains('active')) {
+            // Type-to-select on closed dropdown: open and highlight match
+            if (handleTypeToSelect(event)) {
+                open();
+            }
+        }
+    });
+
+    menu.addEventListener('keydown', (event) => {
+        const options = getOptions();
+        if (options.length === 0) return;
+
+        switch (event.key) {
+            case 'Escape':
+                event.preventDefault();
+                close();
+                trigger.focus();
+                return;
+
+            case 'ArrowDown':
+                event.preventDefault();
+                moveFocus(options, 1);
+                return;
+
+            case 'ArrowUp':
+                event.preventDefault();
+                moveFocus(options, -1);
+                return;
+
+            case 'Home':
+                event.preventDefault();
+                options[0]?.focus();
+                return;
+
+            case 'End':
+                event.preventDefault();
+                options[options.length - 1]?.focus();
+                return;
+
+            case 'Enter':
+            case ' ':
+                event.preventDefault();
+                if (select.disabled) return;
+                const focused = menu.querySelector('.sort-option:focus');
+                if (focused) {
+                    choose(focused.dataset.value);
+                    close();
+                    trigger.focus();
+                }
+                return;
+        }
+
+        handleTypeToSelect(event);
+    });
+
+    // Close dropdown when clicking outside
+    document.addEventListener('click', (event) => {
+        if (!group.contains(event.target)) {
+            const wasOpen = group.classList.contains('active');
+            close();
+            // Only return focus to the trigger when the dropdown was actually
+            // open — avoids forcing scrollIntoView on every page click (which
+            // causes the scroll container to jump when clicking a model card).
+            if (wasOpen) trigger.focus();
+        }
+    });
+
+    // ---- property overrides ----
+
+    // Override `value` and `disabled` on this instance so programmatic
+    // changes (loadSortPreference, VLM toggle, excluded-view sync, ...) keep
+    // the trigger label and disabled styling in sync without touching callers.
+    const proto = Object.getPrototypeOf(select);
+    const valueDescriptor =
+        Object.getOwnPropertyDescriptor(proto, 'value') ||
+        Object.getOwnPropertyDescriptor(HTMLSelectElement.prototype, 'value');
+    const disabledDescriptor =
+        Object.getOwnPropertyDescriptor(proto, 'disabled') ||
+        Object.getOwnPropertyDescriptor(HTMLSelectElement.prototype, 'disabled');
+
+    if (valueDescriptor) {
+        Object.defineProperty(select, 'value', {
+            get() { return valueDescriptor.get.call(this); },
+            set(v) {
+                valueDescriptor.set.call(this, v);
+                syncSelected();
+            },
+            configurable: true,
+        });
+    }
+
+    if (disabledDescriptor) {
+        Object.defineProperty(select, 'disabled', {
+            get() { return disabledDescriptor.get.call(this); },
+            set(v) {
+                disabledDescriptor.set.call(this, v);
+                group.classList.toggle('is-disabled', Boolean(v));
+                trigger.disabled = Boolean(v);
+                if (v) close();
+            },
+            configurable: true,
+        });
+    }
+
+    // Rebuild the menu when <option>s change (VLM adds/removes a temporary
+    // option at runtime).
+    const observer = new MutationObserver(() => buildMenu());
+    observer.observe(select, { childList: true });
+
+    buildMenu();
+    group.dataset.sortReady = '1';
+}
+
+function cssEscape(value) {
+    if (typeof CSS !== 'undefined' && typeof CSS.escape === 'function') {
+        return CSS.escape(value);
+    }
+    // Fallback for environments without CSS.escape
+    return String(value).replace(/[!"#$%&'()*+,./:;<=>?@[\]^`{|}~\\ -]/g, '\\$&');
+}
@@ -1,4 +1,4 @@
-import { showToast, openCivitai, copyToClipboard, copyLoraSyntax, sendLoraToWorkflow, sendEmbeddingToWorkflow, openExampleImagesFolder, buildLoraSyntax, sendModelPathToWorkflow } from '../../utils/uiHelpers.js';
+import { showToast, openCivitai, openHuggingFace, copyToClipboard, copyLoraSyntax, sendLoraToWorkflow, sendEmbeddingToWorkflow, openExampleImagesFolder, buildLoraSyntax, sendModelPathToWorkflow } from '../../utils/uiHelpers.js';
 import { state, getCurrentPageState } from '../../state/index.js';
 import { showModelModal } from './ModelModal.js';
 import { toggleShowcase } from './showcase/ShowcaseView.js';
@@ -66,6 +66,8 @@ function handleModelCardEvent_internal(event, modelType) {
        event.stopPropagation();
        if (card.dataset.from_civitai === 'true') {
            openCivitai(card.dataset.filepath);
+        } else if (card.dataset.hf_url) {
+            openHuggingFace(card.dataset.hf_url);
        }
        return true; // Stop propagation
    }
@@ -100,6 +102,12 @@ function handleModelCardEvent_internal(event, modelType) {
        return true; // Stop propagation
    }

+    if (event.target.closest('.version-count-link')) {
+        event.stopPropagation();
+        handleViewLocalVersionsFromCard(card, modelType);
+        return true;
+    }
+
    // If no specific element was clicked, handle the card click (show modal or toggle selection)
    handleCardClick(card, modelType);
    return false; // Continue with other handlers (e.g., bulk selection)
@@ -265,6 +273,22 @@ async function handleExampleImagesAccess(card, modelType) {
    }
 }

+function handleViewLocalVersionsFromCard(card, modelType) {
+    const modelId = card.dataset.modelId;
+    const modelName = card.dataset.name;
+    if (!modelId) return;
+    // Respect version_grouping: only filter by base model when the strategy says so
+    const strategy = state.global?.settings?.version_grouping;
+    const shouldFilterByBase = strategy === 'same_base';
+    const baseModel = shouldFilterByBase && card.dataset.base_model !== 'Unknown'
+        ? card.dataset.base_model
+        : undefined;
+    // Use the no-reload VLM flow via PageControls
+    if (window.pageControls && typeof window.pageControls.triggerVlmView === 'function') {
+        window.pageControls.triggerVlmView(modelId, modelName, baseModel, modelType);
+    }
+}
+
 function handleCardClick(card, modelType) {
    const pageState = getCurrentPageState();

@@ -291,6 +315,7 @@ async function showModelModalFromCard(card, modelType) {
        modified: card.dataset.modified,
        file_size: parseInt(card.dataset.file_size || '0'),
        from_civitai: card.dataset.from_civitai === 'true',
+        hf_url: card.dataset.hf_url || '',
        base_model: card.dataset.base_model,
        notes: card.dataset.notes || '',
        favorite: card.dataset.favorite === 'true',
@@ -379,6 +404,7 @@ function showExampleAccessModal(card, modelType) {
                modified: card.dataset.modified,
                file_size: card.dataset.file_size,
                from_civitai: card.dataset.from_civitai === 'true',
+                hf_url: card.dataset.hf_url || '',
                base_model: card.dataset.base_model,
                notes: card.dataset.notes,
                favorite: card.dataset.favorite === 'true',
@@ -445,9 +471,14 @@ export function createModelCard(model, modelType) {
    card.dataset.base_model = model.base_model || 'Unknown';
    card.dataset.favorite = model.favorite ? 'true' : 'false';
    card.dataset.exclude = model.exclude ? 'true' : 'false';
+    card.dataset.hf_url = model.hf_url || '';
    const hasUpdateAvailable = Boolean(model.update_available);
    card.dataset.update_available = hasUpdateAvailable ? 'true' : 'false';
    card.dataset.skip_metadata_refresh = model.skip_metadata_refresh ? 'true' : 'false';
+    // Store version_count for group-by-model display
+    if (model.version_count !== undefined) {
+        card.dataset.version_count = model.version_count;
+    }

    // To only show usage_count when sorting by usage. 
    const pageState = getCurrentPageState();
@@ -552,7 +583,10 @@ export function createModelCard(model, modelType) {
        translate('modelCard.actions.addToFavorites', {}, 'Add to favorites');
    const globeTitle = model.from_civitai ?
        translate('modelCard.actions.viewOnCivitai', {}, 'View on Civitai') :
-        translate('modelCard.actions.notAvailableFromCivitai', {}, 'Not available from Civitai');
+        model.hf_url ?
+            translate('modelCard.actions.viewOnHuggingFace', {}, 'View on Hugging Face') :
+            translate('modelCard.actions.notAvailableFromCivitai', {}, 'Not available from Civitai');
+    const globeEnabled = model.from_civitai || !!model.hf_url;
    let sendTitle;
    let copyTitle;
    if (modelType === MODEL_TYPES.LORA) {
@@ -577,7 +611,7 @@ export function createModelCard(model, modelType) {
        </i>
        <i class="fas fa-globe" 
           title="${globeTitle}"
-           ${!model.from_civitai ? 'style="opacity: 0.5; cursor: not-allowed"' : ''}>
+           ${!globeEnabled ? 'style="opacity: 0.5; cursor: not-allowed"' : ''}>
        </i>
        <i class="fas fa-paper-plane" 
           title="${sendTitle}">
@@ -659,16 +693,28 @@ export function createModelCard(model, modelType) {
                            const autoTags = model.auto_tags || [];
                            const hlTags = autoTags.filter(t => t === 'HIGH' || t === 'LOW');
                            const hasVersionName = model.civitai?.name;
-                            if (!hlTags.length && !hasVersionName) return '';
+                            // When group_by_model is active and model has multiple versions,
+                            // show clickable version count instead of version name (and hide badges)
+                            const isGroupByModel = state.global.settings.group_by_model;
+                            const versionCount = model.version_count;
+                            const showVersionCount = isGroupByModel && versionCount > 1;
+                            if (!hlTags.length && !hasVersionName && !showVersionCount) return '';
                            const density = state.global.settings.display_density || 'default';
                            const shortLabels = density === 'medium' || density === 'compact';
-                            const badges = hlTags.map(t => {
+                            // Don't show HIGH/LOW badges when showing version count (confusing in grouped mode)
+                            const badges = !showVersionCount ? hlTags.map(t => {
                                const cls = t === 'HIGH' ? 'hl-badge hl-badge--high' : 'hl-badge hl-badge--low';
                                const label = shortLabels ? (t === 'HIGH' ? 'H' : 'L') : t;
                                const titleAttr = shortLabels ? ` title="${t}"` : '';
                                return `<span class="${cls}"${titleAttr}>${label}</span>`;
-                            }).join('');
-                            const versionHtml = hasVersionName ? `<span class="version-name civitai-version">${model.civitai.name}</span>` : '';
+                            }).join('') : '';
+                            let versionHtml = '';
+                            if (showVersionCount) {
+                                const countLabel = translate('modelCard.footer.versionCount', { count: versionCount }, `${versionCount} versions`);
+                                versionHtml = `<span class="version-count-link" title="${translate('modelCard.footer.viewAllVersions', {}, 'View all local versions')}">${countLabel}</span>`;
+                            } else if (hasVersionName) {
+                                versionHtml = `<span class="version-name civitai-version">${model.civitai.name}</span>`;
+                            }
                            return `<span class="badge-version-unit">${badges}${versionHtml}</span>`;
                        })()}
                        ${hasUsageCount ? `<span class="version-name" title="${translate('modelCard.usage.timesUsed', {}, 'Times used')}">${model.usage_count}×</span>` : ''}
@@ -3,7 +3,7 @@
 * Handles model metadata editing functionality - General version
 */

-import { BASE_MODEL_CATEGORIES } from '../../utils/constants.js';
+import { BASE_MODEL_CATEGORIES, getMergedBaseModels } from '../../utils/constants.js';
 import { showToast } from '../../utils/uiHelpers.js';
 import { getModelApiClient } from '../../api/modelApiFactory.js';

@@ -267,6 +267,7 @@ export function setupBaseModelEditing(filePath) {
        
        // Add options from BASE_MODEL_CATEGORIES constants
        const baseModelCategories = BASE_MODEL_CATEGORIES;
+        const categorizedModels = new Set();
        
        // Create option groups for better organization
        Object.entries(baseModelCategories).forEach(([category, models]) => {
@@ -277,13 +278,30 @@ export function setupBaseModelEditing(filePath) {
                const option = document.createElement('option');
                option.value = model;
                option.textContent = model;
-                option.selected = model === currentValue;
+                if (model === currentValue) option.selected = true;
+                categorizedModels.add(model);
                group.appendChild(option);
            });
            
            dropdown.appendChild(group);
        });
        
+        // Check for dynamic base models from API that aren't in any category
+        const mergedModels = getMergedBaseModels();
+        const uncategorizedModels = mergedModels.filter(model => !categorizedModels.has(model));
+        if (uncategorizedModels.length > 0) {
+            const group = document.createElement('optgroup');
+            group.label = 'Other (API)';
+            uncategorizedModels.forEach(model => {
+                const option = document.createElement('option');
+                option.value = model;
+                option.textContent = model;
+                if (model === currentValue) option.selected = true;
+                group.appendChild(option);
+            });
+            dropdown.appendChild(group);
+        }
+        
        // Replace content with dropdown
        baseModelContent.style.display = 'none';
        baseModelDisplay.insertBefore(dropdown, editBtn);
@@ -234,6 +234,95 @@ function renderLicenseIcons(modelData) {
    </div>`;
 }

+// ── Set 2 (new CivitAI-style) permission icons ──
+
+const NEW_LICENSE_ICON_CONFIG = [
+    {
+        key: 'commercial',
+        icon: 'currency-dollar.svg',
+        allowedFn: (license) => {
+            const uses = license.allowCommercialUse || [];
+            return uses.includes('Image') || uses.includes('Sell');
+        },
+        labelAllowed: 'Commercial use allowed',
+        labelDenied: 'No commercial use'
+    },
+    {
+        key: 'genServices',
+        icon: 'brush.svg',
+        allowedFn: (license) => {
+            const uses = license.allowCommercialUse || [];
+            return uses.includes('RentCivit') || uses.includes('Rent');
+        },
+        labelAllowed: 'Generation services allowed',
+        labelDenied: 'No generation services'
+    },
+    {
+        key: 'credit',
+        icon: 'user.svg',
+        allowedFn: (license) => !!license.allowNoCredit,
+        labelAllowed: 'No credit required',
+        labelDenied: 'Creator credit required'
+    },
+    {
+        key: 'derivatives',
+        icon: 'git-merge.svg',
+        allowedFn: (license) => !!license.allowDerivatives,
+        labelAllowed: 'Merges allowed',
+        labelDenied: 'No merges allowed'
+    },
+    {
+        key: 'relicense',
+        icon: 'license.svg',
+        allowedFn: (license) => !!license.allowDifferentLicense,
+        labelAllowed: 'Different permissions allowed on merges',
+        labelDenied: 'Same permissions required on merges'
+    }
+];
+
+function createNewLicenseIconMarkup(icon, allowed, label) {
+    const safeLabel = escapeAttribute(label);
+    const iconPath = `/loras_static/images/tabler/${icon}`;
+    const stateClass = allowed ? 'allowed' : 'denied';
+    return `<span class="license-icon-new ${stateClass}" role="img" aria-label="${safeLabel}" title="${safeLabel}" style="--license-icon-image: url('${iconPath}')"></span>`;
+}
+
+function renderNewLicenseIcons(modelData) {
+    const license = modelData?.civitai?.model;
+    if (!license) {
+        return '';
+    }
+
+    const icons = [];
+    NEW_LICENSE_ICON_CONFIG.forEach((config) => {
+        if (config.key === 'credit' && !hasLicenseField(license, 'allowNoCredit')) {
+            return;
+        }
+        if (config.key === 'derivatives' && !hasLicenseField(license, 'allowDerivatives')) {
+            return;
+        }
+        if (config.key === 'relicense' && !hasLicenseField(license, 'allowDifferentLicense')) {
+            return;
+        }
+        if ((config.key === 'commercial' || config.key === 'genServices') && !hasLicenseField(license, 'allowCommercialUse')) {
+            return;
+        }
+        const allowed = config.allowedFn(license);
+        const label = allowed ? config.labelAllowed : config.labelDenied;
+        icons.push(createNewLicenseIconMarkup(config.icon, allowed, label));
+    });
+
+    if (!icons.length) {
+        return '';
+    }
+
+    const containerLabel = translate('modals.model.license.restrictionsLabel', {}, 'License permissions');
+    const safeContainerLabel = escapeAttribute(containerLabel);
+    return `<div class="license-permissions" aria-label="${safeContainerLabel}" role="group">
+        ${icons.join('\n        ')}
+    </div>`;
+}
+
 /**
 * Display the model modal with the given model data
 * @param {Object} model - Model data object
@@ -264,10 +353,18 @@ export async function showModelModal(model, modelType) {
    };
    const escapedFilePathAttr = escapeAttribute(modelWithFullData.file_path || '');
    const escapedFolderPath = escapeHtml((modelWithFullData.file_path || '').replace(/[^/]+$/, '') || 'N/A');
-    const licenseIcons = renderLicenseIcons(modelWithFullData);
+    const useNewIcons = state.global.settings.use_new_license_icons !== false;
+    const licenseIcons = useNewIcons
+        ? renderNewLicenseIcons(modelWithFullData)
+        : renderLicenseIcons(modelWithFullData);
    const viewOnCivitaiAction = modelWithFullData.from_civitai ? `
 <div class="civitai-view" title="${translate('modals.model.actions.viewOnCivitai', {}, 'View on Civitai')}" data-action="view-civitai" data-filepath="${escapedFilePathAttr}">
    <i class="fas fa-globe"></i> ${translate('modals.model.actions.viewOnCivitaiText', {}, 'View on Civitai')}
+</div>`.trim() : '';
+    const escapedHfUrl = modelWithFullData.hf_url ? escapeAttribute(modelWithFullData.hf_url) : '';
+    const viewOnHuggingFaceAction = escapedHfUrl ? `
+<div class="civitai-view" title="${translate('modals.model.actions.viewOnHuggingFace', {}, 'View on Hugging Face')}" data-action="view-huggingface" data-hf-url="${escapedHfUrl}">
+    <i class="fas fa-globe"></i> ${translate('modals.model.actions.viewOnHuggingFaceText', {}, 'View on Hugging Face')}
 </div>`.trim() : '';
    const creatorInfoAction = modelWithFullData.civitai?.creator ? `
 <div class="creator-info" data-username="${modelWithFullData.civitai.creator.username}" data-action="view-creator" title="${translate('modals.model.actions.viewCreatorProfile', {}, 'View Creator Profile')}">
@@ -285,6 +382,9 @@ export async function showModelModal(model, modelType) {
    if (viewOnCivitaiAction) {
        creatorActionItems.push(indentMarkup(viewOnCivitaiAction, 24));
    }
+    if (viewOnHuggingFaceAction) {
+        creatorActionItems.push(indentMarkup(viewOnHuggingFaceAction, 24));
+    }
    if (creatorInfoAction) {
        creatorActionItems.push(indentMarkup(creatorInfoAction, 24));
    }
@@ -660,6 +760,7 @@ export async function showModelModal(model, modelType) {
        modelId: civitaiModelId,
        currentVersionId: civitaiVersionId,
        currentBaseModel: modelWithFullData.base_model,
+        modelName: model.model_name,
        onUpdateStatusChange: handleUpdateStatusChange,
    });
    setupEditableFields(modelWithFullData.file_path, modelType);
@@ -776,6 +877,11 @@ function setupEventHandlers(filePath, modelType) {
            case 'view-civitai':
                openCivitai(target.dataset.filepath);
                break;
+            case 'view-huggingface':
+                if (target.dataset.hfUrl) {
+                    window.open(target.dataset.hfUrl, '_blank', 'noopener,noreferrer');
+                }
+                break;
            case 'view-creator':
                const username = target.dataset.username;
                if (username) {
@@ -29,6 +29,14 @@ let priorityTagSuggestionsLoaded = false;
 let priorityTagSuggestionsPromise = null;
 let activeTagDragState = null;

+// Configurable options for tag editing (set by setupTagEditMode)
+let tagEditOptions = {
+    showSuggestions: true,
+    saveHandler: null,
+    onSaved: null,
+    normalizeTag: true,
+};
+
 function normalizeModelTypeKey(modelType) {
    if (!modelType) {
        return '';
@@ -140,13 +148,30 @@ let saveTagsHandler = null;

 /**
 * Set up tag editing mode
+ * @param {string|null} modelType - Model type for suggestions (e.g. 'loras', 'checkpoints')
+ * @param {Object} [options] - Optional configuration
+ * @param {boolean} [options.showSuggestions=true] - Show priority tag suggestions dropdown
+ * @param {Function} [options.saveHandler] - Custom save function, async (filePath, tags) => {}
+ * @param {Function} [options.onSaved] - Called after successful save, (tags) => {}
+ * @param {boolean} [options.normalizeTag=true] - Lowercase tag on add
 */
-export function setupTagEditMode(modelType = null) {
-    const editBtn = document.querySelector('.edit-tags-btn');
+export function setupTagEditMode(modelType = null, options = {}) {
+    // Store options for use by saveTags and addNewTag
+    tagEditOptions = {
+        showSuggestions: options.showSuggestions !== false,
+        saveHandler: options.saveHandler || null,
+        onSaved: options.onSaved || null,
+        normalizeTag: options.normalizeTag !== false,
+    };
+
+    const root = options.container || document;
+    const editBtn = root.querySelector('.edit-tags-btn');
    if (!editBtn) return;

-    setActiveModelTypeKey(modelType);
-    ensurePriorityTagSuggestions();
+    if (tagEditOptions.showSuggestions) {
+        setActiveModelTypeKey(modelType);
+        ensurePriorityTagSuggestions();
+    }
    
    // Store original tags for restoring on cancel
    let originalTags = [];
@@ -158,7 +183,8 @@ export function setupTagEditMode(modelType = null) {
    
    // Create new handler and store reference
    const editBtnClickHandler = function() {
-        const tagsSection = document.querySelector('.model-tags-container');
+        const tagsSection = this.closest('.model-tags-container');
+        if (!tagsSection) return;
        const isEditMode = tagsSection.classList.toggle('edit-mode');
        const filePath = this.dataset.filePath;
        
@@ -193,16 +219,18 @@ export function setupTagEditMode(modelType = null) {
                tagsSection.appendChild(editContainer);
                
                // Setup the tag input field behavior
-                setupTagInput();
+                setupTagInput(tagsSection);
                
                // Create and add preset suggestions dropdown
-                const tagForm = editContainer.querySelector('.metadata-add-form');
-                const suggestionsDropdown = createSuggestionsDropdown(originalTags);
-                tagForm.appendChild(suggestionsDropdown);
+                if (tagEditOptions.showSuggestions) {
+                    const tagForm = editContainer.querySelector('.metadata-add-form');
+                    const suggestionsDropdown = createSuggestionsDropdown(originalTags);
+                    tagForm.appendChild(suggestionsDropdown);
+                }
                
                // Setup delete buttons for existing tags
                setupDeleteButtons();
-                setupTagDragAndDrop();
+                setupTagDragAndDrop(tagsSection);
                
                // Transfer click event from original button to the cloned one
                const newEditBtn = editContainer.querySelector('.metadata-header-btn');
@@ -218,7 +246,7 @@ export function setupTagEditMode(modelType = null) {
                // Just show the existing edit container
                tagsEditContainer.style.display = 'block';
                editBtn.style.display = 'none';
-                setupTagDragAndDrop();
+                setupTagDragAndDrop(tagsSection);
            }
        } else {
            // Exit edit mode
@@ -255,7 +283,7 @@ export function setupTagEditMode(modelType = null) {
    saveTagsHandler = function(e) {
        if (e.target.classList.contains('save-tags-btn') || 
            e.target.closest('.save-tags-btn')) {
-            saveTags();
+            saveTags(e.target);
        }
    };
    
@@ -267,19 +295,28 @@ export function setupTagEditMode(modelType = null) {

 /**
 * Save tags
+ * @param {Element} [triggerElement] - The element that triggered the save (e.g. save button)
 */
-async function saveTags() {
-    const editBtn = document.querySelector('.edit-tags-btn');
-    if (!editBtn) return;
+async function saveTags(triggerElement = null) {
+    let editBtn;
+    let scope;
+    if (triggerElement) {
+        scope = triggerElement.closest('.model-tags-container');
+        editBtn = scope ? scope.querySelector('.edit-tags-btn') : document.querySelector('.edit-tags-btn');
+    } else {
+        scope = document.querySelector('.model-tags-container');
+        editBtn = scope ? scope.querySelector('.edit-tags-btn') : null;
+    }
+    if (!editBtn || !scope) return;
    
    const filePath = editBtn.dataset.filePath;
-    const tagElements = document.querySelectorAll('.metadata-item');
+    const tagElements = scope.querySelectorAll('.metadata-item');
    let tags = Array.from(tagElements).map(tag => tag.dataset.tag);
    
    // Flush uncommitted input as a tag so it's not silently lost on save
-    const tagInput = document.querySelector('.metadata-input');
+    const tagInput = scope.querySelector('.metadata-input');
    if (tagInput) {
-        const pendingTag = tagInput.value.trim().toLowerCase();
+        const pendingTag = tagEditOptions.normalizeTag ? tagInput.value.trim().toLowerCase() : tagInput.value.trim();
        if (pendingTag && !tags.includes(pendingTag)) {
            tags.push(pendingTag);
        }
@@ -287,7 +324,7 @@ async function saveTags() {
    }

    // Get original tags to compare
-    const originalTagElements = document.querySelectorAll('.tooltip-tag');
+    const originalTagElements = scope.querySelectorAll('.tooltip-tag');
    const originalTags = Array.from(originalTagElements).map(tag => tag.textContent);
    
    // Check if tags have actually changed
@@ -301,59 +338,68 @@ async function saveTags() {
    }
    
    try {
-        // Save tags metadata
-        await getModelApiClient().saveModelMetadata(filePath, { tags: tags });
+        // Use custom save handler if provided, otherwise default model API
+        if (tagEditOptions.saveHandler) {
+            await tagEditOptions.saveHandler(filePath, tags);
+        } else {
+            await getModelApiClient().saveModelMetadata(filePath, { tags: tags });
+        }
        
        // Set flag to skip restoring original tags when exiting edit mode
        editBtn.dataset.skipRestore = "true";
        
-        // Update the compact tags display
-        const compactTagsContainer = document.querySelector('.model-tags-container');
-        if (compactTagsContainer) {
-            // Generate new compact tags HTML
-            const compactTagsDisplay = compactTagsContainer.querySelector('.model-tags-compact');
-            
-            if (compactTagsDisplay) {
-                // Clear current tags
-                compactTagsDisplay.innerHTML = '';
+        // Use custom onSaved if provided (e.g. for recipe dirty state + re-render)
+        if (tagEditOptions.onSaved) {
+            tagEditOptions.onSaved(tags);
+        } else {
+            // Update the compact tags display
+            const compactTagsContainer = scope;
+            if (compactTagsContainer) {
+                // Generate new compact tags HTML
+                const compactTagsDisplay = compactTagsContainer.querySelector('.model-tags-compact');
                
-                // Add visible tags (up to 5)
-                const visibleTags = tags.slice(0, 5);
-                visibleTags.forEach(tag => {
-                    const span = document.createElement('span');
-                    span.className = 'model-tag-compact';
-                    span.textContent = tag;
-                    compactTagsDisplay.appendChild(span);
-                });
+                if (compactTagsDisplay) {
+                    // Clear current tags
+                    compactTagsDisplay.innerHTML = '';
+                    
+                    // Add visible tags (up to 5)
+                    const visibleTags = tags.slice(0, 5);
+                    visibleTags.forEach(tag => {
+                        const span = document.createElement('span');
+                        span.className = 'model-tag-compact';
+                        span.textContent = tag;
+                        compactTagsDisplay.appendChild(span);
+                    });
+                    
+                    // Add more indicator if needed
+                    const remainingCount = Math.max(0, tags.length - 5);
+                    if (remainingCount > 0) {
+                        const more = document.createElement('span');
+                        more.className = 'model-tag-more';
+                        more.dataset.count = remainingCount;
+                        more.textContent = `+${remainingCount}`;
+                        compactTagsDisplay.appendChild(more);
+                    }
+                }
                
-                // Add more indicator if needed
-                const remainingCount = Math.max(0, tags.length - 5);
-                if (remainingCount > 0) {
-                    const more = document.createElement('span');
-                    more.className = 'model-tag-more';
-                    more.dataset.count = remainingCount;
-                    more.textContent = `+${remainingCount}`;
-                    compactTagsDisplay.appendChild(more);
+                // Update tooltip content
+                const tooltipContent = compactTagsContainer.querySelector('.tooltip-content');
+                if (tooltipContent) {
+                    tooltipContent.innerHTML = '';
+                    
+                    tags.forEach(tag => {
+                        const span = document.createElement('span');
+                        span.className = 'tooltip-tag';
+                        span.textContent = tag;
+                        tooltipContent.appendChild(span);
+                    });
                }
            }
            
-            // Update tooltip content
-            const tooltipContent = compactTagsContainer.querySelector('.tooltip-content');
-            if (tooltipContent) {
-                tooltipContent.innerHTML = '';
-                
-                tags.forEach(tag => {
-                    const span = document.createElement('span');
-                    span.className = 'tooltip-tag';
-                    span.textContent = tag;
-                    tooltipContent.appendChild(span);
-                });
-            }
+            // Exit edit mode
+            editBtn.click();
        }
        
-        // Exit edit mode
-        editBtn.click();
-        
        showToast('modelTags.messages.updated', {}, 'success');
    } catch (error) {
        console.error('Error saving tags:', error);
@@ -470,16 +516,19 @@ function renderPriorityTagSuggestions(container, existingTags = []) {

 /**
 * Set up tag input behavior
+ * @param {Element} scopeContainer - The .model-tags-container element
 */
-function setupTagInput() {
-    const tagInput = document.querySelector('.metadata-input');
+function setupTagInput(scopeContainer) {
+    const tagInput = scopeContainer
+        ? scopeContainer.querySelector('.metadata-input')
+        : document.querySelector('.metadata-input');
    
    if (tagInput) {
        tagInput.focus();
        tagInput.addEventListener('keydown', function(e) {
            if (e.key === 'Enter') {
                e.preventDefault();
-                addNewTag(this.value);
+                addNewTag(this.value, this);
                this.value = ''; // Clear input after adding
            }
        });
@@ -504,9 +553,12 @@ function setupDeleteButtons() {

 /**
 * Enable drag-and-drop sorting for tag items
+ * @param {Element} [scopeContainer] - Optional scoped .model-tags-container element
 */
-function setupTagDragAndDrop() {
-    const container = document.querySelector(METADATA_ITEMS_CONTAINER_SELECTOR);
+function setupTagDragAndDrop(scopeContainer) {
+    const container = scopeContainer
+        ? scopeContainer.querySelector(METADATA_ITEMS_CONTAINER_SELECTOR)
+        : document.querySelector(METADATA_ITEMS_CONTAINER_SELECTOR);
    if (!container) {
        return;
    }
@@ -712,12 +764,14 @@ function finishPointerDrag() {
 /**
 * Add a new tag
 * @param {string} tag - Tag to add
+ * @param {Element} [scopeElement] - Element within the correct .model-tags-container for scoping
 */
-function addNewTag(tag) {
-    tag = tag.trim().toLowerCase();
+function addNewTag(tag, scopeElement = null) {
+    tag = tagEditOptions.normalizeTag ? tag.trim().toLowerCase() : tag.trim();
    if (!tag) return;
    
-    const tagsContainer = document.querySelector('.metadata-items');
+    const scope = scopeElement ? scopeElement.closest('.model-tags-container') : document;
+    const tagsContainer = scope.querySelector('.metadata-items');
    if (!tagsContainer) return;
    
    // Validation: Check length
@@ -762,7 +816,7 @@ function addNewTag(tag) {
    });
    
    tagsContainer.appendChild(newTag);
-    setupTagDragAndDrop();
+    setupTagDragAndDrop(scope);
    
    // Update status of items in the suggestions dropdown
    updateSuggestionsDropdown();
@@ -6,6 +6,7 @@ import { translate } from '../../utils/i18nHelpers.js';
 import { state } from '../../state/index.js';
 import { buildCivitaiModelUrl } from '../../utils/civitaiUtils.js';
 import { formatFileSize } from './utils.js';
+import { setSessionItem, removeSessionItem } from '../../utils/storageHelpers.js';

 const VIDEO_EXTENSIONS = ['.mp4', '.webm', '.mov', '.mkv'];
 const PREVIEW_PLACEHOLDER_URL = '/loras_static/images/no-preview.png';
@@ -306,7 +307,7 @@ function getToggleTooltipText(mode) {
 }

 function getDefaultDisplayMode() {
-    const strategy = state?.global?.settings?.update_flag_strategy;
+    const strategy = state?.global?.settings?.version_grouping;
    return strategy === DISPLAY_FILTER_MODES.SAME_BASE
        ? DISPLAY_FILTER_MODES.SAME_BASE
        : DISPLAY_FILTER_MODES.ANY;
@@ -338,7 +339,7 @@ function resolveUpdateAvailability(record, baseModel, currentVersionId) {
        return false;
    }

-    const strategy = state?.global?.settings?.update_flag_strategy;
+    const strategy = state?.global?.settings?.version_grouping;
    const sameBaseMode = strategy === DISPLAY_FILTER_MODES.SAME_BASE;
    const hideEarlyAccess = state?.global?.settings?.hide_early_access_updates;

@@ -744,7 +745,7 @@ function renderToolbar(record, toolbarState = {}) {
                <button class="versions-toolbar-btn versions-toolbar-btn-primary" data-versions-action="toggle-model-ignore">
                    ${escapeHtml(ignoreText)}
                </button>
-                <button class="versions-toolbar-btn versions-toolbar-btn-secondary" data-versions-action="view-local" title="${escapeHtml(translate('modals.model.versions.actions.viewLocalTooltip', {}, 'Coming soon'))}" disabled>
+                <button class="versions-toolbar-btn versions-toolbar-btn-secondary" data-versions-action="view-local" title="${escapeHtml(translate('modals.model.versions.actions.viewLocalTooltip', {}, 'Show all local versions of this model on the main page'))}">
                    ${escapeHtml(viewLocalText)}
                </button>
            </div>
@@ -792,6 +793,7 @@ export function initVersionsTab({
    modelId,
    currentVersionId,
    currentBaseModel,
+    modelName,
    onUpdateStatusChange,
 }) {
    const pane = document.querySelector(`#${modalId} #versions-tab`);
@@ -1019,6 +1021,39 @@ export function initVersionsTab({
        render(controller.record);
    }

+    function handleViewLocalVersions() {
+        if (!controller.record || !modelId) {
+            return;
+        }
+        // Determine base model filter based on current display mode
+        const baseModelInfo = getCurrentVersionBaseModel(controller.record, normalizedCurrentVersionId);
+        const isFilteringActive =
+            displayMode === DISPLAY_FILTER_MODES.SAME_BASE &&
+            Boolean(baseModelInfo.normalized);
+
+        // Write filter params to sessionStorage (page-scoped)
+        setSessionItem('vlm_model_id', String(modelId));
+        setSessionItem('vlm_model_name', modelName || String(modelId));
+        setSessionItem('vlm_page_type', modelType);
+        if (isFilteringActive) {
+            // Use raw (non-normalized) base model for exact backend matching
+            setSessionItem('vlm_base_model', baseModelInfo.raw);
+        } else {
+            removeSessionItem('vlm_base_model');
+        }
+
+        // Close the modal and navigate via no-reload VLM flow
+        modalManager.closeModal(modalId);
+        if (window.pageControls && typeof window.pageControls.triggerVlmView === 'function') {
+            window.pageControls.triggerVlmView(
+                modelId,
+                modelName || String(modelId),
+                isFilteringActive ? baseModelInfo.raw : undefined,
+                modelType
+            );
+        }
+    }
+
    async function handleToggleVersionIgnore(button, versionId) {
        if (!controller.record) {
            return;
@@ -1348,6 +1383,10 @@ export function initVersionsTab({
                    event.preventDefault();
                    handleToggleVersionDisplayMode();
                    break;
+                case 'view-local':
+                    event.preventDefault();
+                    handleViewLocalVersions();
+                    break;
                default:
                    break;
            }
@@ -3,7 +3,7 @@
 * Media-specific utility functions for showcase components
 * (Moved from uiHelpers.js to better organize code)
 */
-import { showToast, copyToClipboard, getNSFWLevelName } from '../../../utils/uiHelpers.js';
+import { showToast, copyToClipboard, getNSFWLevelName, sendPromptToWorkflow, stripLoraTags, sendGenParamsToWorkflow } from '../../../utils/uiHelpers.js';
 import { state } from '../../../state/index.js';
 import { getModelApiClient } from '../../../api/modelApiFactory.js';
 import { NSFW_LEVELS, getMatureBlurThreshold } from '../../../utils/constants.js';
@@ -318,6 +318,74 @@ export function initMetadataPanelHandlers(container) {
                });
            });
            
+            // Handle send prompt buttons
+            const sendBtns = metadataPanel.querySelectorAll('.send-prompt-btn');
+            sendBtns.forEach(sendBtn => {
+                const promptIndex = sendBtn.dataset.promptIndex;
+                const promptElement = wrapper.querySelector(`#prompt-${promptIndex}`);
+                
+                sendBtn.addEventListener('click', async (e) => {
+                    e.stopPropagation();
+                    
+                    if (!promptElement) return;
+                    
+                    let promptText = promptElement.textContent || '';
+                    if (!promptText.trim()) {
+                        showToast('toast.recipes.noPromptToSend', {}, 'warning');
+                        return;
+                    }
+                    
+                    // Respect strip <lora> setting from global state
+                    if (state.global.settings?.strip_lora_on_copy) {
+                        promptText = stripLoraTags(promptText);
+                    }
+                    
+                    sendPromptToWorkflow(promptText);
+                });
+            });
+            
+            // Handle send params buttons
+            const paramsBtn = metadataPanel.querySelector('.send-params-btn');
+            if (paramsBtn) {
+                paramsBtn.addEventListener('click', async (e) => {
+                    e.stopPropagation();
+                    
+                    // Collect gen params from the param-tag elements
+                    const tagsContainer = wrapper.querySelector('.params-tags');
+                    if (!tagsContainer) return;
+                    
+                    const paramTags = tagsContainer.querySelectorAll('.param-tag');
+                    const genParams = {};
+                    
+                    // Map display labels to genParams keys
+                    const labelToKey = {
+                        'Seed': 'seed',
+                        'Steps': 'steps',
+                        'Sampler': 'sampler',
+                        'CFG': 'cfg_scale',
+                    };
+                    
+                    paramTags.forEach(tag => {
+                        const nameEl = tag.querySelector('.param-name');
+                        const valueEl = tag.querySelector('.param-value');
+                        if (!nameEl || !valueEl) return;
+                        
+                        const label = nameEl.textContent.replace(':', '').trim();
+                        const key = labelToKey[label];
+                        if (key) {
+                            genParams[key] = valueEl.textContent.trim();
+                        }
+                    });
+                    
+                    if (Object.keys(genParams).length === 0) {
+                        showToast('No sendable parameters found', {}, 'warning');
+                        return;
+                    }
+                    
+                    await sendGenParamsToWorkflow(genParams);
+                });
+            }
+            
            // Prevent panel scroll from causing modal scroll
            metadataPanel.addEventListener('wheel', (e) => {
                const isAtTop = metadataPanel.scrollTop === 0;
@@ -28,14 +28,24 @@ export function generateMetadataPanel(hasParams, hasPrompts, prompt, negativePro
    
    if (hasParams) {
        content += `
-            <div class="params-tags">
-                ${size ? `<div class="param-tag"><span class="param-name">Size:</span><span class="param-value">${size}</span></div>` : ''}
-                ${seed ? `<div class="param-tag"><span class="param-name">Seed:</span><span class="param-value">${seed}</span></div>` : ''}
-                ${model ? `<div class="param-tag"><span class="param-name">Model:</span><span class="param-value">${model}</span></div>` : ''}
-                ${steps ? `<div class="param-tag"><span class="param-name">Steps:</span><span class="param-value">${steps}</span></div>` : ''}
-                ${sampler ? `<div class="param-tag"><span class="param-name">Sampler:</span><span class="param-value">${sampler}</span></div>` : ''}
-                ${cfgScale ? `<div class="param-tag"><span class="param-name">CFG:</span><span class="param-value">${cfgScale}</span></div>` : ''}
-                ${clipSkip ? `<div class="param-tag"><span class="param-name">Clip Skip:</span><span class="param-value">${clipSkip}</span></div>` : ''}
+            <div class="metadata-row params-row">
+                <div class="param-header">
+                    <span class="metadata-label">Params:</span>
+                    <div class="param-actions">
+                        <button class="send-params-btn" title="Send Params to Workflow">
+                            <i class="fas fa-paper-plane"></i>
+                        </button>
+                    </div>
+                </div>
+                <div class="params-tags">
+                    ${size ? `<div class="param-tag"><span class="param-name">Size:</span><span class="param-value">${size}</span></div>` : ''}
+                    ${seed ? `<div class="param-tag"><span class="param-name">Seed:</span><span class="param-value">${seed}</span></div>` : ''}
+                    ${model ? `<div class="param-tag"><span class="param-name">Model:</span><span class="param-value">${model}</span></div>` : ''}
+                    ${steps ? `<div class="param-tag"><span class="param-name">Steps:</span><span class="param-value">${steps}</span></div>` : ''}
+                    ${sampler ? `<div class="param-tag"><span class="param-name">Sampler:</span><span class="param-value">${sampler}</span></div>` : ''}
+                    ${cfgScale ? `<div class="param-tag"><span class="param-name">CFG:</span><span class="param-value">${cfgScale}</span></div>` : ''}
+                    ${clipSkip ? `<div class="param-tag"><span class="param-name">Clip Skip:</span><span class="param-value">${clipSkip}</span></div>` : ''}
+                </div>
            </div>
        `;
    }
@@ -53,12 +63,19 @@ export function generateMetadataPanel(hasParams, hasPrompts, prompt, negativePro
        prompt = escapeHtml(prompt);
        content += `
            <div class="metadata-row prompt-row">
-                <span class="metadata-label">Prompt:</span>
+                <div class="param-header">
+                    <span class="metadata-label">Prompt:</span>
+                    <div class="param-actions">
+                        <button class="send-prompt-btn" data-prompt-index="${promptIndex}" title="Send Prompt to Workflow">
+                            <i class="fas fa-paper-plane"></i>
+                        </button>
+                        <button class="copy-prompt-btn" data-prompt-index="${promptIndex}" title="Copy Prompt">
+                            <i class="fas fa-copy"></i>
+                        </button>
+                    </div>
+                </div>
                <div class="metadata-prompt-wrapper">
                    <div class="metadata-prompt">${prompt}</div>
-                    <button class="copy-prompt-btn" data-prompt-index="${promptIndex}">
-                        <i class="fas fa-copy"></i>
-                    </button>
                </div>
            </div>
            <div class="hidden-prompt" id="prompt-${promptIndex}" style="display:none;">${prompt}</div>
@@ -69,12 +86,19 @@ export function generateMetadataPanel(hasParams, hasPrompts, prompt, negativePro
        negativePrompt = escapeHtml(negativePrompt);
        content += `
            <div class="metadata-row prompt-row">
-                <span class="metadata-label">Negative Prompt:</span>
+                <div class="param-header">
+                    <span class="metadata-label">Negative Prompt:</span>
+                    <div class="param-actions">
+                        <button class="send-prompt-btn" data-prompt-index="${negPromptIndex}" title="Send Negative Prompt to Workflow">
+                            <i class="fas fa-paper-plane"></i>
+                        </button>
+                        <button class="copy-prompt-btn" data-prompt-index="${negPromptIndex}" title="Copy Negative Prompt">
+                            <i class="fas fa-copy"></i>
+                        </button>
+                    </div>
+                </div>
                <div class="metadata-prompt-wrapper">
                    <div class="metadata-prompt">${negativePrompt}</div>
-                    <button class="copy-prompt-btn" data-prompt-index="${negPromptIndex}">
-                        <i class="fas fa-copy"></i>
-                    </button>
                </div>
            </div>
            <div class="hidden-prompt" id="prompt-${negPromptIndex}" style="display:none;">${negativePrompt}</div>
@@ -78,10 +78,12 @@ export function renderCompactTags(tags, filePath = '') {

 /**
 * Set up tag tooltip functionality
+ * @param {Element} [scopeContainer] - Optional container to scope the querySelector
 */
-export function setupTagTooltip() {
-    const tagsContainer = document.querySelector('.model-tags-container');
-    const tooltip = document.querySelector('.model-tags-tooltip');
+export function setupTagTooltip(scopeContainer = null) {
+    const root = scopeContainer || document;
+    const tagsContainer = root.querySelector('.model-tags-container');
+    const tooltip = root.querySelector('.model-tags-tooltip');
    
    if (tagsContainer && tooltip) {
        tagsContainer.addEventListener('mouseenter', () => {
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="icon icon-tabler icons-tabler-outline icon-tabler-brush"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M3 21v-4a4 4 0 1 1 4 4h-4" /><path d="M21 3a16 16 0 0 0 -12.8 10.2" /><path d="M21 3a16 16 0 0 1 -10.2 12.8" /><path d="M10.6 9a9 9 0 0 1 4.4 4.4" /></svg>`
				`@@ -0,0 +1 @@`
				<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="icon icon-tabler icons-tabler-outline icon-tabler-git-merge"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M5 18a2 2 0 1 0 4 0a2 2 0 1 0 -4 0" /><path d="M5 6a2 2 0 1 0 4 0a2 2 0 1 0 -4 0" /><path d="M15 12a2 2 0 1 0 4 0a2 2 0 1 0 -4 0" /><path d="M7 8l0 8" /><path d="M7 8a4 4 0 0 0 4 4h4" /></svg>