i18n: translate the Filename Templates feature into all locales

26 keys (settings.filenameTemplates.*, filenameTemplateProgress, modals.filenameTemplateConfirm, related toasts) translated into the 9 non-English locales, reusing each locale's autoOrganizeProgress / downloadPathTemplates renderings. Terminology recorded in docs/i18n-translation-guidelines.md.
feat(settings): empty filename template reverts to recorded original filename (#1071 )
2026-09-21 03:01:27 -03:00 · 2026-09-19 11:00:39 +08:00 · 2026-09-19 10:44:43 +08:00 · 2026-09-19 09:05:39 +08:00 · 2026-09-19 09:04:24 +08:00 · 2026-09-19 07:38:07 +08:00
194 changed files with 27620 additions and 2979 deletions
@@ -15,6 +15,7 @@ node_modules/
 coverage/
 .coverage
 model_cache/
+recipe_cache/

 # agent / dev tooling
 .opencode/
@@ -192,6 +192,15 @@ The system runs in two modes:
 - Auto-saves paths to `settings.json` in ComfyUI mode
 - `settings.json.example` is intentionally minimal (see Important Notes); all
  other defaults live in `DEFAULT_SETTINGS` (`py/services/settings_manager.py`)
+- **`folder_paths` vs `extra_folder_paths` — different purposes, do not conflate:**
+  - `folder_paths` (primary model roots): in ComfyUI plugin mode these come
+    from the ComfyUI host; in standalone mode they are the ONLY source of
+    model library paths and are currently edited by hand in `settings.json`.
+  - `extra_folder_paths` is a **ComfyUI-plugin-mode feature**: paths visible
+    ONLY to LoRA Manager, not to ComfyUI. Its motivation is that a very large
+    model library slows ComfyUI itself down, while LoRA Manager handles large
+    libraries without performance issues — so users keep ComfyUI's library
+    small and add the bulk via `extra_folder_paths`.

 ### Frontend UI Architecture

@@ -7,190 +7,199 @@
  ],
  "allSupporters": [
    "Takkan",
-    "2018cfh",
    "megakirbs",
    "Brennok",
-    "Charles Blakemore",
+    "2018cfh",
    "Rob Williams",
-    "Insomnia Art Designs",
+    "Charles Blakemore",
    "Arlecchino Shion",
+    "Insomnia Art Designs",
+    "Mozzel",
    "Gingko Biloba",
    "stone9k",
+    "Kiba",
    "onesecondinosaur",
    "Skalabananen",
+    "Sterilized",
    "Polymorphic Indeterminate",
    "Liam MacDougal",
+    "Christian Byrne",
+    "DM",
+    "Sen314",
+    "Estragon",
    "Rosenthal",
+    "ClockDaemon",
    "Francisco Tatis",
    "Tobi_Swagg",
+    "SG",
+    "jmack",
    "Andrew Wilson",
    "Greybush",
    "Ricky Carter",
    "JongWon Han",
    "VantAI",
+    "レプサイ",
+    "Michael Wong",
    "Illrigger",
+    "Tom Corrigan",
+    "JackieWang",
    "FreelancerZ",
-    "Mozzel",
+    "fnkylove",
+    "Lilleman",
+    "Robert Stacey",
+    "PM",
    "Marc Whiffen",
+    "Dogwalkerbr",
    "Birdy",
-    "Kiba",
+    "quarz",
    "$MetaSamsara",
+    "jean jahren",
    "Reno Lam",
    "Aleksander Wujczyk",
+    "AM Kuro",
+    "JSST",
    "sig",
-    "Christian Byrne",
-    "DM",
-    "Sen314",
-    "Estragon",
    "J\\B/ 8r0wns0n",
    "Snaggwort",
    "Anthony+Rizzo",
    "W+K+White",
-    "ClockDaemon",
+    "Baekdoosixt",
    "Jonathan Ross",
    "KD",
    "Omnidex",
    "Nolife_M",
+    "Melville Parrish",
+    "daniel dove",
+    "Lustre",
    "Tyler Trebuchon",
    "Release Cabrakan",
-    "SG",
+    "JW Sin",
+    "Alex",
    "carozzz",
+    "Marlon Daniels",
    "James Dooley",
    "zenbound",
    "Buzzard",
-    "jmack",
    "Adam Shaw",
    "Mark Corneglio",
    "RedrockVP",
    "James Todd",
+    "Wicked Choices by ASLPro3D",
+    "FinalyFree",
    "Fyf",
-    "レプサイ",
    "Timmy",
    "Johnny",
+    "Tak",
    "Lisster",
-    "Michael Wong",
+    "Big Red",
    "whudunit",
-    "Tom Corrigan",
-    "JackieWang",
-    "fnkylove",
+    "Luc Job",
+    "corde",
    "Yushio",
    "Vik71it",
+    "Bishoujoker",
    "Echo",
-    "Lilleman",
-    "Robert Stacey",
-    "PM",
    "Todd Keck",
    "Briton Heilbrun",
+    "wildnut",
    "Edgar Tejeda",
-    "Sterilized",
    "BadassArabianMofo",
-    "Dogwalkerbr",
-    "quarz",
+    "MiraiKuriyamaSy",
    "Pascal Dahle",
    "Greg",
-    "jean jahren",
-    "AM Kuro",
-    "JSST",
+    "Akira HentAI",
+    "otaku fra",
    "lmsupporter",
+    "andrew.tappan",
    "wackop",
    "Phil",
+    "Greenmoustache",
    "Carl G.",
    "wfpearl",
+    "jeaness",
    "Dsperado",
-    "Baekdoosixt",
    "Jack B Nimble",
-    "Melville Parrish",
-    "daniel dove",
-    "Lustre",
-    "JW Sin",
-    "Alex",
    "bh",
-    "Marlon Daniels",
+    "Jwk0205",
    "Starkselle",
+    "Olive",
    "Aaron Bleuer",
    "LacesOut!",
    "greebles",
    "SarcasticHashtag",
-    "Wicked Choices by ASLPro3D",
+    "Some Guy Named Barry",
+    "M Postkasse",
    "Jacob Hoehler",
-    "FinalyFree",
+    "Matt Wenzel",
    "Weasyl",
    "Lex Song",
    "Cory Paza",
-    "Tak",
    "Gonzalo Andre Allendes Lopez",
-    "Big Red",
+    "Serge Bekenkamp",
    "AIJimmy",
-    "Luc Job",
    "Philip Hempel",
-    "corde",
-    "Bishoujoker",
+    "dan",
    "aai",
-    "wildnut",
    "Ran C",
    "ViperC",
    "itismyelement",
    "Sangheili460",
    "MagnaInsomnia",
    "Karl P.",
-    "Akira HentAI",
-    "MiraiKuriyamaSy",
    "LarsesFPC",
-    "otaku fra",
-    "andrew.tappan",
+    "Weird_With_A_Beard",
    "N/A",
    "The Spawn",
    "graysock",
    "Pozadine1",
-    "Greenmoustache",
-    "fancypants",
-    "jeaness",
-    "Joboshy",
-    "Digital",
-    "JaxMax",
-    "Bohemian Corporal",
-    "Dan",
-    "Jwk0205",
-    "Bro Xie",
-    "batblue",
-    "carey6409",
-    "Olive",
-    "太郎 ゲーム",
-    "Some Guy Named Barry",
-    "jinxedx",
-    "M Postkasse",
-    "AELOX",
-    "Dankin-Pics",
-    "Nicfit23",
-    "wamekukyouzin",
-    "drum matthieu",
-    "DogmaR34",
-    "Matt Wenzel",
-    "Frank Nitty",
-    "Christopher Michel",
-    "runte3221",
-    "Serge Bekenkamp",
-    "DougPeterson",
-    "LeoZero",
-    "dl0901dm",
-    "Antonio Pontes",
-    "kushiroK9",
-    "Kevin John Duck",
-    "Dustin Chen",
-    "dan",
-    "Blackfish95",
-    "Mouthlessman",
-    "Paul Kroll",
-    "Fraser Cross",
-    "Bas Imagineer",
-    "Dušan Ryban",
-    "Adam Taylor",
-    "Weird_With_A_Beard",
    "Qarob",
    "AIGooner",
    "Luc",
    "ProtonPrince",
    "DiffDuck",
+    "fancypants",
+    "John+Edwards",
+    "Joboshy",
+    "Digital",
+    "JaxMax",
+    "Bohemian Corporal",
+    "Dan",
+    "Bro Xie",
+    "seed123_AIart",
+    "batblue",
+    "carey6409",
+    "太郎 ゲーム",
+    "Roslynd",
+    "jinxedx",
+    "AELOX",
+    "Dankin-Pics",
+    "Nicfit23",
+    "Cristian Vazquez",
+    "wamekukyouzin",
+    "drum matthieu",
+    "DogmaR34",
+    "Frank Nitty",
+    "The Magic Noob",
+    "Christopher Michel",
+    "runte3221",
+    "DougPeterson",
+    "LeoZero",
+    "dl0901dm",
+    "Antonio Pontes",
+    "Bruce",
+    "kushiroK9",
+    "Kevin John Duck",
+    "Dustin Chen",
+    "Blackfish95",
+    "Tori",
+    "Mouthlessman",
+    "Paul Kroll",
+    "Fraser Cross",
+    "Bas Imagineer",
+    "John Statham",
+    "Dušan Ryban",
+    "Adam Taylor",
+    "decoy",
    "elu3199",
    "Hasturkun",
    "Jon Sandman",
@@ -201,39 +210,38 @@
    "wundershark",
    "mr_dinosaur",
    "Tyrswood",
-    "linnfrey",
-    "griffin+dahlberg",
-    "John+Edwards",
-    "ElitaSSJ4",
-    "Matt+J",
-    "Josef Lanzl",
-    "New folder (1)",
-    "seed123_AIart",
-    "Error_Rule34_Not_found",
-    "Roslynd",
-    "Geolog",
-    "Neco28",
-    "Resist's Creations - Spicy Edition 🔥",
-    "David Ortega",
-    "Wolffen",
-    "Cristian Vazquez",
-    "The Magic Noob",
-    "Jeff",
-    "nwalker94",
-    "Bruce",
-    "Kevin Christopher",
-    "Chad Idk",
-    "Tori",
-    "dd",
-    "John Statham",
-    "sjon kreutz",
-    "Metryman55",
-    "AlexDuKaNa",
-    "decoy",
    "Ray Wing",
    "Ranzitho",
    "Gus",
    "MJG",
+    "linnfrey",
+    "griffin+dahlberg",
+    "ElitaSSJ4",
+    "Matt+J",
+    "Josef Lanzl",
+    "New folder (1)",
+    "sanborondon",
+    "Error_Rule34_Not_found",
+    "jcay015",
+    "Erik Lopez",
+    "Mateo Curić",
+    "Geolog",
+    "Neco28",
+    "Eris3D",
+    "Resist's Creations - Spicy Edition 🔥",
+    "David Ortega",
+    "Wolffen",
+    "a _",
+    "Jeff",
+    "nwalker94",
+    "James Coleman",
+    "Kevin Christopher",
+    "Chad Idk",
+    "dd",
+    "Sam",
+    "sjon kreutz",
+    "Metryman55",
+    "AlexDuKaNa",
    "ae",
    "Tr4shP4nda",
    "Gamalonia",
@@ -248,37 +256,41 @@
    "Kland",
    "Hailshem",
    "Naomi Hale Danchi",
+    "epicgamer0020690",
+    "Joshua Porrata",
+    "Andrew",
    "Brian M",
-    "sanborondon",
+    "Robert Wegemund",
+    "Littlehuggy",
+    "Brian Buie",
    "Thought2Form",
-    "jcay015",
    "RAIDiation",
-    "Erik Lopez",
-    "Mateo Curić",
-    "Eris3D",
+    "Sadlip",
    "Gooohokrbe",
    "m",
    "OldBones",
    "Pierce McBride",
    "Zach Gonser",
    "Mikko Hemilä",
+    "Jacob McDaniel",
    "Jamie Ogletree",
-    "a _",
-    "James Coleman",
+    "Temikus",
+    "Artokun",
+    "Michael Taylor",
    "Martial",
    "Emil Andersson",
    "Ouro Boros",
+    "Atilla Berke Pekduyar",
+    "Decx _",
    "Yuji Kaneko",
    "Rops Alot",
-    "Sam",
    "Penfore",
    "Gordon Cole",
    "Ace Ventura",
    "AbstractAss",
    "David LaVallee",
    "ken",
-    "epicgamer0020690",
-    "Joshua Porrata",
+    "Crocket",
    "keemun",
    "SuBu",
    "RedPIXel",
@@ -297,15 +309,19 @@
    "KitKatM",
    "socrasteeze",
    "MudkipMedkitz",
+    "deanbrian",
+    "Alex Wortman",
+    "Cody",
+    "emadsultan",
+    "InformedViewz",
+    "Bubbafett",
+    "leaf",
+    "Adam Rinehart",
    "gzmzmvp",
    "takyamtom",
-    "Andrew",
-    "Robert Wegemund",
-    "Littlehuggy",
+    "Aberr",
    "Gregory Kozhemiak",
-    "Brian Buie",
    "aezin",
-    "Sadlip",
    "Eric Whitney",
    "Joey Callahan",
    "Ivan Tadic",
@@ -315,17 +331,12 @@
    "Elliot E",
    "Morgandel",
    "Theerat Jiramate",
-    "Jacob McDaniel",
    "X",
    "SloanSteddyAI",
-    "Temikus",
-    "Artokun",
-    "Michael Taylor",
    "Steven Owens",
+    "hexxish",
    "Derek Baker",
-    "Atilla Berke Pekduyar",
    "NICHOLAS BAXLEY",
-    "Decx _",
    "Ed Wang",
    "Saya",
    "Xeeosat",
@@ -333,18 +344,10 @@
    "四糸凜音",
    "esthe",
    "FrxzenSnxw",
-    "Crocket",
    "chriphost",
    "ResidentDeviant",
-    "deanbrian",
-    "Alex Wortman",
-    "Cody",
-    "emadsultan",
-    "InformedViewz",
-    "Bubbafett",
-    "leaf",
+    "Ginnie",
    "Skyfire83",
-    "Adam Rinehart",
    "Pitpe11",
    "IamAyam",
    "TheD1rtyD03",
@@ -356,17 +359,25 @@
    "SpringBootisTrash",
    "carsten",
    "ikok",
+    "quantenmecha",
+    "Jason+Nash",
+    "DarkRoast",
+    "letzte",
+    "Nasty+Hobbit",
+    "Sora+Yori",
+    "Duk3+Rand0m",
    "Nathen+Choi",
    "T",
+    "D",
    "David Schenck",
    "Wolfe7D1",
-    "Aberr",
    "Andrew Marshall",
    "Taylor Funk",
    "elleshar666",
    "Gerald Welly",
    "Tee Gee",
    "ACTUALLY_the_Real_Willem_Dafoe",
+    "Михал Михалыч",
    "tarek helmi",
    "Kauffy",
    "Max Marklund",
@@ -376,13 +387,15 @@
    "Vane Holzer",
    "psytrax",
    "Cyrus Fett",
-    "hexxish",
    "lh qwe",
    "conner",
+    "Xenon Xue",
    "Michael Anthony Scott",
    "notedfakes",
    "Princess Bright Eyes",
    "Michael Scott",
+    "Solixer",
+    "Jimmy Borup",
    "Wes Sims",
    "Donor4115",
    "Filippo Ferrari",
@@ -393,11 +406,19 @@
    "momokai",
    "몽타주",
    "kudari",
+    "Whitepinetrader",
    "OrganicArtifact",
-    "Ginnie",
    "Raku",
    "CHKeeho80",
    "nanana",
+    "Alex",
+    "Karru",
+    "ChaChanoKo",
+    "ghoulars",
+    "null",
+    "Beau",
+    "redcarrot",
+    "powerbot99",
    "Fthehappy",
    "J",
    "Jeff+Kesemeyer",
@@ -407,39 +428,32 @@
    "Doug+Rintoul",
    "Noor",
    "Yorunai",
-    "D",
-    "quantenmecha",
-    "Jason+Nash",
-    "DarkRoast",
-    "letzte",
-    "Nasty+Hobbit",
-    "Sora+Yori",
-    "Duk3+Rand0m",
    "Richard",
    "奚明 刘",
    "준희 김",
    "りん あめ",
-    "Михал Михалыч",
    "Matt",
    "Tomohiro Baba",
    "Noora",
    "Frogmilk",
    "SPJ",
+    "Kor",
    "Bryan Rutkowski",
    "Noah",
-    "Xenon Xue",
+    "TenaciousD",
    "Dmitry Ryzhov",
    "DarkSunset",
    "Edward Ten Eyck",
    "Steam Steam",
    "CryptoTraderJK",
    "Davaitamin",
-    "Solixer",
+    "Pete Pain",
    "Nathan",
-    "Jimmy Borup",
    "tedcor",
+    "RHopkirk",
    "jinksta187",
    "Fotek Design",
+    "Maxim",
    "Manu Thetug",
    "Lyavph",
    "Nihongasuki",
@@ -450,8 +464,14 @@
    "starbugx",
    "dc7431",
    "Inversity",
-    "Whitepinetrader",
    "Vir",
+    "Sildoren",
+    "Darv",
+    "Seon+Song",
+    "2turbo",
+    "Dmitry+Viznesenskiy",
+    "tanjin90",
+    "sternenkrieger",
    "Pascalou",
    "Patrick+Bryan",
    "lighthawke",
@@ -468,23 +488,17 @@
    "Bob+Barker",
    "Dark_Pest",
    "Eldithor",
-    "Alex",
-    "Karru",
-    "ChaChanoKo",
-    "ghoulars",
-    "redcarrot",
-    "null",
-    "Beau",
-    "powerbot99",
    "Ko-fi+Supporter",
    "lrdchs2",
    "Tú Nguyễn Lý Hoàng",
+    "shira1011",
    "Kalli Core",
    "Ben D",
    "Draven T",
    "marioandluigi",
    "G",
    "Ronan Delevacq",
+    "Leslie Andrew Ridings",
    "Aquatic Coffee",
    "Dave Abraham",
    "Joaquin Hierrezuelo",
@@ -492,25 +506,27 @@
    "StudOx Tech",
    "yves.poezevara",
    "Jarrid Lee",
-    "Kor",
+    "Poophead27 Blyat",
    "Joseph Hanson",
    "John Rednoulf",
    "Focuschannel",
    "Boba Smith",
+    "matt",
+    "somethingtosay8",
    "ivistorm",
    "Anthony Faxlandez",
    "Sauv",
-    "TenaciousD",
    "Ted Cart",
+    "Sage Himeros",
    "Zeeble",
    "Pat Hen",
-    "Pete Pain",
    "Draconach",
    "Tigon",
+    "ItsGeneralButtNaked",
    "Jordan Shaw",
-    "RHopkirk",
    "g unit",
-    "Maxim",
+    "Dkom22",
+    "Marcos Tortosa Carmona",
    "Distortik",
    "JC",
    "Prompt Pirate",
@@ -518,11 +534,22 @@
    "Marcus thronico",
    "zenobeus",
    "ryoma",
+    "dg",
    "Stryker",
    "smart.edge5178",
    "Menard",
    "SomeDude",
    "raf8osz",
+    "Gold_miner_ego",
+    "bakeliteboy",
+    "TequiTequi",
+    "Homero+Banda",
+    "Nick",
+    "Monix",
+    "Trolinka",
+    "PredragR",
+    "Clauzmak",
+    "Nerick",
    "SundayRage",
    "matter",
    "SRCRCOSS",
@@ -539,13 +566,6 @@
    "Mobius2020",
    "ExLightSaber",
    "YaboiRay",
-    "Sildoren",
-    "Darv",
-    "Seon+Song",
-    "2turbo",
-    "Dmitry+Viznesenskiy",
-    "tanjin90",
-    "sternenkrieger",
    "boston666",
    "cocona",
    "Obsidian.Studios",
@@ -553,52 +573,53 @@
    "Aquaneo",
    "blikkies",
    "JBsuede",
-    "shira1011",
+    "Wolf and Fox Legends",
+    "ゼクス、六",
    "Neko Desco",
    "Vinarus",
    "Josh Snyder",
    "Shock Shockor",
    "Goldwaters",
-    "Leslie Andrew Ridings",
    "Zude",
-    "Poophead27 Blyat",
+    "Room Light",
    "Kyler",
    "Justin Blaylock",
    "aRtFuL_DodGeR",
    "Snorklebort",
    "TheFusion",
    "MR.Bear",
-    "matt",
-    "somethingtosay8",
    "3zS4QNQ4",
    "Terminuz",
    "Matt M.",
    "Ivan Imes",
+    "J M",
    "Steven",
    "Borte",
-    "Sage Himeros",
+    "yyuvuvu",
    "Billy Gladky",
+    "Nomki",
    "Probis",
    "Jack Lawfield",
    "SkibidiRizzler",
    "Maxon - Plans",
    "Kalle Björk",
-    "ItsGeneralButtNaked",
    "Karlanx",
    "operationancut",
    "Nacho Ferrando",
-    "Marcos Tortosa Carmona",
-    "Dkom22",
    "Youguang",
    "andrewzpong",
    "BossGame",
    "lrdchs",
    "Tree Tagger",
+    "Janik",
    "AIVORY3D",
    "Kevinj",
    "Mitchell Robson",
-    "dg",
    "POPPIN",
+    "meatyalien",
+    "Tony+V",
+    "draganjankovic1975dj528",
+    "kinz",
    "YoruHime",
    "Mark+Staaf",
    "Michael+Fürmann",
@@ -611,17 +632,7 @@
    "thomasand01",
    "Shiba+Sama",
    "Celestial+Kitten",
-    "TequiTequi",
-    "Homero+Banda",
-    "bakeliteboy",
-    "Nick",
-    "Gold_miner_ego",
    "IshouI;_;",
-    "Monix",
-    "Trolinka",
-    "PredragR",
-    "Clauzmak",
-    "Nerick",
    "SAVEagleBasement",
    "Adam+Spreer",
    "BillyBoy84",
@@ -629,18 +640,17 @@
    "Welkor",
    "dubious1one",
    "Brandon Thomas",
+    "Dustin Hendel",
    "moranqianlong",
-    "Wolf and Fox Legends",
-    "ゼクス、六",
    "Liberation",
    "Ninja Tom",
    "75marc",
    "Elemnt",
+    "Bradley Turner",
    "swra",
    "JollRodrigo",
    "Oliverfish",
    "uruksayshi",
-    "Room Light",
    "Patryk Serious",
    "nk8",
    "Kyron Mahan",
@@ -648,17 +658,18 @@
    "Nimhloth",
    "TBitz33",
    "Anonym dkjglfleeoeldldldlkf",
+    "Tsani Prodanov",
    "Ezokewn",
    "SendingRavens",
-    "J M",
    "Slacks",
    "Glenn Hoetker",
    "JackJohnnyJim",
    "Khánh Đặng",
+    "Michael Hicks",
    "Homero Banda",
    "Michael Docherty",
-    "yyuvuvu",
-    "Nomki",
+    "MadGod",
+    "GhostyGhost",
    "Paul Hartsuyker",
    "elitassj",
    "Never_M",
@@ -667,6 +678,7 @@
    "Andrew Wilkinson",
    "David",
    "floeki75pad",
+    "TheJohnes",
    "deadwishd",
    "shinonomeiro",
    "Snille",
@@ -675,7 +687,6 @@
    "xybrightsummer",
    "jreedatchison",
    "PhilW",
-    "Janik",
    "Cruel",
    "MRBlack",
    "Kiyoe",
@@ -685,6 +696,15 @@
    "Scott",
    "Muratoraccio",
    "D",
+    "Daevalus",
+    "Milky+Mai",
+    "Krash",
+    "PP",
+    "thababydjac",
+    "belligerencebk",
+    "tortor",
+    "Peter",
+    "T",
    "zipzorpp",
    "Anton",
    "actual",
@@ -706,11 +726,7 @@
    "plonk",
    "Anvil+Girl",
    "Kotetsu",
-    "meatyalien",
-    "Tony+V",
-    "draganjankovic1975dj528",
    "miduzza",
-    "kinz",
    "Somebody",
    "てぃんてぃんひーろー",
    "you+halo9",
@@ -727,12 +743,12 @@
    "4IXplr0r3r",
    "hayden",
    "ahoystan",
+    "Civitaier",
    "BakunyuuWaifu",
    "edk",
-    "Dustin Hendel",
+    "Joey Leto",
    "Anagra Nouma",
    "tafapayo",
-    "Bradley Turner",
    "ja s",
    "Doug Mason",
    "scoreswazey",
@@ -747,8 +763,8 @@
    "David Murcko",
    "Justin Defer",
    "Ben Brogger",
-    "Tsani Prodanov",
    "Jack Dole",
+    "dsffsdfsdfsdfsdfsdf",
    "V Bj",
    "Rj Joplin",
    "Kurt",
@@ -757,15 +773,13 @@
    "Taylor Dominy",
    "Faith",
    "Bouya shaka",
-    "Michael Hicks",
    "Maso",
-    "MadGod",
    "Kevin Wallace",
-    "GhostyGhost",
    "ChicRic",
    "Bastard-Sama",
    "mercur",
    "Sunny",
+    "Somebody",
    "inusanorthcape",
    "Kane Sturzebecher",
    "Yavizu3d",
@@ -776,7 +790,6 @@
    "Evgeniya Smolentseva",
    "Raf Stahelin",
    "Вячеслав Маринин",
-    "TheJohnes",
    "Cola Matthew",
    "OniNoKen",
    "Iain Wisely",
@@ -819,6 +832,12 @@
    "SelfishMedic",
    "adderleighn",
    "EnragedAntelope",
+    "mcmalt",
+    "cesasol",
+    "Null",
+    "fdfac",
+    "Eli",
+    "Somebody",
    "8/4",
    "ivan.morgado.siles",
    "SEI",
@@ -830,16 +849,7 @@
    "gdfgfdgfds",
    "Benjamin+Doerr",
    "D",
-    "Daevalus",
-    "MilkyMai",
-    "Krash",
-    "PP",
-    "babydjac",
-    "belligerencebk",
-    "tortor",
    "Cryphius",
-    "Peter+Timothy+Stover",
-    "Joel+Magnusson",
    "Connor+Hall",
    "Macho+Grump",
    "Morcoddd",
@@ -879,13 +889,11 @@
    "proto merp",
    "_ G3n",
    "Donovan Jenkins",
-    "Civitaier",
    "Hans Meier",
    "jboul",
    "Michael Eid",
    "Super Sigma Reborne",
    "Veloce",
-    "Joey Leto",
    "Bob barker",
    "Michael Rivera",
    "karim ben brik",
@@ -916,6 +924,7 @@
    "DrB",
    "wknight",
    "Moneymaker412K",
+    "Jacid",
    "unkeiknown",
    "Towelie",
    "Alex Ross",
@@ -926,10 +935,12 @@
    "john Greene",
    "jimyjomson",
    "JaeHyun Jang",
+    "sbone",
    "BigBoss",
    "Chase Kwon",
    "Bob Ling",
    "Inyoshu",
+    "nick Meadows",
    "Chad Barnes",
    "redlines3",
    "Adam Gardner",
@@ -944,6 +955,7 @@
    "Somebody",
    "Somebody",
    "Somebody",
+    "Somebody",
    "CoffeeMage",
    "Ken+Suzuki",
    "hannibal",
@@ -954,8 +966,7 @@
    "L C",
    "Dude",
    "Somebody",
-    "Somebody",
    "CK"
  ],
-  "totalCount": 954
+  "totalCount": 965
 }
@@ -62,27 +62,143 @@ Environment variable overrides: `LLM_API_KEY`, `LLM_MODEL`, `LLM_API_BASE`, `LLM

 ### enrich_hf_metadata

-Enriches HuggingFace-downloaded models with metadata extracted by an LLM from the HF model card.
+Enriches models linked to an external model site with metadata extracted by an LLM from the site's model card (README).

-**Entry point**: Right-click context menu → "Enrich Metadata (Agent)"
+**Entry point**: Right-click context menu → "Enrich Metadata with AI"
+
+**Supported model sources**:
+
+| Platform | Link | AI enrichment | Direct download |
+| --- | --- | --- | --- |
+| Hugging Face | yes | yes | yes |
+| ModelScope (`modelscope.cn`) | yes | yes | yes |
+| ModelScope International (`modelscope.ai`) | yes | yes | yes |
+| TensorArt | yes | no (see below) | no |
+
+`modelscope.cn` and `modelscope.ai` are **separate catalogues, not mirrors** — a
+repository published on one is routinely absent from the other — so each is
+registered as its own source (`ModelScopeSource` / `ModelScopeIntlSource` in
+`py/services/model_sources/modelscope.py`). The host therefore decides which
+API and CDN a model resolves against, and the two deployments get separate
+version groups (`ms:` / `msai:`) and default download directories. Keep the two
+tables in `modelSourceHelpers.js` and `registry.py` in step when adding a site.
+
+TensorArt is link-only: `tensor.art` sits behind a Cloudflare managed challenge and its internal API requires session authorization, so the backend cannot read its model pages. Linking still stores the canonical page URL and the "View on TensorArt" link works.

 **What it does**:
-1. Reads the model's `.metadata.json` to get the `hf_url`
-2. Fetches the README.md from the HuggingFace repository
-3. Sends the README + local metadata to the LLM for structured extraction
+1. Reads the model's `.metadata.json` to get the source (`source_platform` + `source_url`, or the legacy `hf_url`)
+2. Fetches the model card through the provider in `py/services/model_sources/` — the README via `fetch_model_card()`, plus any extras the site keeps outside it via `fetch_model_card_context()`
+3. Sends the README + site-provided extras + local metadata to the LLM for structured extraction
 4. Writes extracted fields to `.metadata.json`:
   - `base_model` — only if current value is empty
   - `trainedWords` — trigger words (LoRA only, if none exist)
-   - `modelDescription` — concise summary (if none exists)
+   - `modelDescription` — the site's author description (if any) followed by the README rendered as HTML
   - `tags` — merged with existing tags, deduplicated
+   - `civitai.images` — example images
   - `metadata_source` — audit trail: `agent:enrich_hf_metadata`
   - `llm_enriched_at` — ISO timestamp
-5. Downloads and optimizes preview image (if LLM found one in the README)
+5. Downloads and optimizes a preview image, using the per-file example image the
+   site publishes when the README has none
 6. Updates the scanner cache
 7. Broadcasts WebSocket progress events

+#### Site-provided card extras (`fetch_model_card_context`)
+
+A model card is not always just `README.md`. ModelScope keeps the author's
+summary (`Description`), the site-curated tags (`OfficialTags`), and — per
+published version — the model filenames together with that file's example
+images (`MuseInfo.versions[].coverImages`) and trigger words in its
+model-detail API. AIGC repositories there often ship an auto-generated
+boilerplate README and put everything useful in `Description`, so reading only
+the README yields almost nothing.
+
+Providers opt in by overriding `ModelSource.fetch_model_card_context()`, which
+returns a `ModelCardContext`. The wanted file is identified by its sha256 when
+the caller knows it (the scanner already records one) and by **basename**
+otherwise, so each checkpoint in a collection repo gets its own images — and
+keeps getting them after the user renames the weights, which is the only
+identifier a rename cannot invalidate. Sites with no such extras inherit an
+empty context, and the pipeline behaves exactly as before.
+
+The README and the repository metadata describe the whole repository, not one
+file, so `execute_skill()` creates a `ModelSourceCache` for the duration of a
+run and passes it down. Enriching the eight checkpoints of one ModelScope
+repository costs two HTTP requests instead of sixteen; only the per-file
+selection is redone for each file. Nothing is cached across runs, and download
+URLs never go through it.
+
+#### Deterministic data is applied whether or not an LLM is configured
+
+`AgentService._load_source_card()` runs for every source-backed enrichment, and
+the post-processor applies what it returns before the LLM output is merged. A
+user with **no** provider configured therefore still gets the author summary,
+the example images, the preview, the site-curated tags, the trigger words and
+the README rendered as the model description.
+
+The LLM is always consulted when one is configured — invoking **Enrich Metadata
+with AI** must call the provider every time, and the site data is never treated
+as a reason to skip it. The deterministic values act as fallbacks that fill
+gaps the LLM leaves behind:
+
+| Field | Deterministic source | LLM role |
+| --- | --- | --- |
+| `model_name` | site display name (`Name`), written only while the value is still the file stem | — |
+| `modelDescription` | author summary + README as HTML | — |
+| `civitai.name` | the matched version's label (`modelVersion.showName`) | — |
+| `civitai.images` | site example images, then README images | — |
+| `preview_url` | first available example image | may propose one from the README |
+| `tags` | site-curated tags, always merged in | proposes additional content tags |
+| `civitai.description` | author summary | richer 1-2 sentence summary wins |
+| `base_model` | site hints resolved against the canonical vocabulary (`py/services/agent/base_model_resolver.py`) | mapping it is the LLM's job; the resolver only fills in when the LLM returns nothing |
+| `trainedWords` | per-file site trigger words, then YAML `instance_prompt` | primary extraction |
+| `usage_tips` | regex over an explicitly stated strength range | primary extraction |
+| `notes` | — | LLM-only |
+
+Models with no source, an unknown source, or a source without model-card access (TensorArt) are skipped with an explicit reason and counted in the run summary.
+
 **Model types**: LoRA, Checkpoint, Embedding

+### Download-time hydration
+
+The same deterministic mapping runs automatically when a model is downloaded
+from a model source, so a ModelScope or Hugging Face download lands with the
+populated card a CivitAI download produces instead of a bare filename and
+hash. Nothing needs to be triggered by hand and no provider is called.
+
+`py/services/model_sources/hydration.py` owns this path:
+
+* `_save_source_metadata()` in `py/routes/handlers/model_source_handlers.py`
+  creates the sidecar (hash, source link, scanner-cache entry) and then calls
+  `hydrate_from_source()`. It also runs for a file that was already on disk, so
+  models downloaded before this existed get topped up on the next attempt.
+* Metadata is created through the **owning scanner**
+  (`scanner._create_default_metadata()`) rather than
+  `MetadataManager.create_default_metadata()`, so the per-type lazy-hash rule
+  applies: `CheckpointScanner` and `OtherScanner` store
+  `hash_status="pending"` with an empty `sha256` for their multi-GB files, and
+  the generic helper would read a 10 GB checkpoint end to end inside the
+  download request. Hydration copes with the empty hash — `_matching_versions()`
+  falls back to the repository basename, which the download just wrote.
+* Hydration reuses `PostProcessor` with an empty `llm_output`, so the two paths
+  cannot drift apart. It reports `metadata_source = "source:<platform>"` rather
+  than the skill's `agent:enrich_hf_metadata`, and — because no provider ran —
+  it does not stamp `llm_enriched_at`.
+* `model_name` is only written while it still equals the file stem: once a user
+  renames a model, that choice is kept.
+* Only a model whose stored `source_platform`/`source_url` match the repository
+  being downloaded is updated; a local file that merely shares a name must not
+  receive another model's card.
+* The README and repository payload describe the *repository*, so a short-lived
+  process-wide `ModelSourceCache` (`shared_source_cache`, 300 s, 32 entries)
+  keeps a batch over one repository to two HTTP requests.
+* Every failure — unreachable site, changed payload shape, broken post-processor
+  — is logged and swallowed. Metadata hydration can never fail a download.
+* Neither stage advances the byte counter, so both are announced to the
+  progress UI (`_report_phase()` → `{"status": "metadata", "stage": ...}`) as
+  they start. Without that the bar sits at 100% reporting `0 B/s` for several
+  seconds and the download looks stuck. `stage` and `platform` are
+  machine-readable; the wording is localised in `LoadingManager`.
+
 ## Adding a New Skill

 ### 1. Create the skill directory
@@ -129,7 +245,7 @@ Use `{{variable}}` placeholders that will be replaced with data from the `prepar
 ```markdown
 You are an expert assistant...

-Model URL: {{hf_url}}
+Model URL: {{source_url}}
 README content:
 {{readme_content}}

@@ -4,7 +4,7 @@ This document is the canonical set of conventions for translating LoRA Manager U
 It applies to **human translators and AI agents** alike. Read it before editing anything in
 `locales/`.

-Source of truth: `locales/en.json` (10 locales, 1982 leaf keys; all locales share the exact
+Source of truth: `locales/en.json` (10 locales, 2025 leaf keys; all locales share the exact
 same key structure).

 Locales: `en`, `zh-CN`, `zh-TW`, `ja`, `ko`, `fr`, `de`, `es`, `ru`, `he` (RTL).
@@ -33,6 +33,50 @@ Locales: `en`, `zh-CN`, `zh-TW`, `ja`, `ko`, `fr`, `de`, `es`, `ru`, `he` (RTL).
 > in the same pass. The `folder_paths` JSON snippet shown in that state lives in
 > `templates/other.html`, **not** in the locale files, so it is never translated — only the
 > surrounding prose is. Terminology added in §2.
+>
+> **Status (2026-09, model sources):** models can now be linked to ModelScope and TensorArt
+> alongside Hugging Face, which added 15 keys (`modelCard.actions.viewOnSource`,
+> `loras.contextMenu.linkModelSource`, `modals.linkModelSource.*`,
+> `modals.model.versions.sourceGroupInfo`, `toast.contextMenu.enrichNeedsSource`,
+> `toast.contextMenu.enrichUnsupportedSource`) and refreshed the two `enrichHfAgent` labels,
+> which had hardcoded "HF" for a button that now also enriches ModelScope models. The
+> `modals.linkModelSource.urlPlaceholder` value stays byte-identical to `en.json` (it is a URL,
+> the §6 exception). Terminology in §2, "Model source feature".
+>
+> **Status (2026-09, folder sidebar):** the model-root sidebar gained on-disk folder management
+> (create / rename / delete folders, show empty folders, tree vs list view) plus its `...`
+> view-options menu, adding 35 `sidebar.*` keys. Those were the only `[TODO: Translate]`
+> placeholders left behind by the feature series, and all 35 are now translated in all 9
+> locales, so the "no remaining placeholders" claim above holds again. Terminology in §2,
+> "Folder sidebar feature".
+>
+> **Status (2026-09, chip reordering):** model tags and trigger words now share one drag/`⠿`
+> grip reorder affordance, which added the single `common.reorder.dragHandle` key (it lives
+> under `common` because both editors render it). All 9 locales are translated (renderings in
+> §2, "Chip reordering"). Reordering is pointer-only by design: an `Alt + Arrow` shortcut was
+> prototyped and removed because it collided with the browser's Alt + Arrow handling and the
+> modal's arrow-key navigation.
+
+> **Status (2026-09, standalone no-paths guidance):** the standalone branch of the
+> `other.noPaths` empty state now shows the real `settings.json` path plus an
+> `other.noPaths.openSettingsFolder` button (each locale reuses its
+> `settings.openSettingsFileLocation.label` rendering), and `descriptionStandalone` was
+> reworded in `en.json` — from "none of the configured folders exist on disk" to "no
+> other-model folders were found; add the folder keys you need to the `folder_paths`
+> section" — and re-translated in all 9 locales. The `on disk` phrase now survives only in
+> the ComfyUI variant (`descriptionComfyUI`).
+
+> **Status (2026-09, settings Organization tab):** the settings modal split its overloaded
+> Library tab, adding the single `settings.nav.organization` key (renderings in §2,
+> "Settings Organization tab"). All 9 locales are translated, so the "no remaining
+> placeholders" claim holds again.
+
+> **Status (2026-09, filename templates):** the Filename Templates feature (per-model-type
+> download filename templates + bulk "Apply to Library Now" rename, with an empty template
+> restoring recorded original filenames) added 26 keys across `settings.filenameTemplates.*`,
+> `loras.bulkOperations.filenameTemplateProgress.*`, `modals.filenameTemplateConfirm.*` and
+> the `toast.loras.filenameTemplate*` / `toast.settings.filenameTemplates*` toasts. All 9
+> locales are translated (terminology in §2, "Filename Templates feature").

 ---

@@ -292,6 +336,111 @@ physically exist:
 `settings.json` and `ComfyUI` stay verbatim in every locale; "reload this page" / "restart
 LoRA Manager" reuse each locale's existing restart wording (`settings.extraFolderPaths.*`).

+### Model source feature (Hugging Face / ModelScope / TensorArt)
+
+A model file can be linked to the page of an external model site. **Hugging Face**,
+**ModelScope** and **TensorArt** are brand names and stay Latin in every locale (R3); the
+generic nouns around them are translated:
+
+| Term | Rendering |
+|---|---|
+| model source | zh-CN 模型来源 · zh-TW 模型來源 · ja モデルソース · ko 모델 소스 · fr source de modèle · de Modellquelle · es fuente de modelo · ru источник модели · he מקור מודל |
+| model page | zh-CN 模型页面 · zh-TW 模型頁面 · ja モデルページ · ko 모델 페이지 · fr page du modèle · de Modellseite · es página del modelo · ru страница модели · he עמוד המודל |
+| model card | zh-CN 模型卡 · zh-TW 模型卡 · ja モデルカード · ko 모델 카드 · fr fiche de modèle · de Modellkarte · es ficha de modelo · ru карточка модели · he כרטיס מודל |
+| AI enrichment (noun) | reuse the existing pair per locale: zh-CN 增强 · zh-TW 增強 · ja 補完 · ko 보강 · fr enrichissement (par IA) · de Anreicherung (KI-) · es enriquecimiento (con IA) · ru обогащение (с помощью ИИ) · he העשרה (AI) |
+
+`modelCard.actions.viewOnSource` ("View on {source}") follows each locale's existing
+`viewOnHuggingFace` pattern — de `Auf … ansehen`, ru `Открыть …`, he `צפייה ב-…`,
+ja `… で見る`, ko `…에서 보기`, zh `在 … 查看`, fr `Voir sur …`, es `Ver en …`. `{source}` is
+replaced at runtime with the untranslated platform name, so the brand never appears inside the
+translated text.
+
+`modals.linkModelSource.enrichNote` states the rule that only sites exposing a readable model
+card can be enriched and names TensorArt as the current exception. Keep the parenthetical
+exception in sync if another link-only source is ever added — the sentence is deliberately
+phrased as a rule, not as an apology for one site.
+
+The context-menu and bulk-operation enrichment entry points read **"Enrich Metadata with AI"**
+in `en`, not "Enrich HF Metadata": they cover ModelScope as well, so no locale may reintroduce
+an `HF` qualifier in `loras.contextMenu.enrichHfAgent` / `loras.bulkOperations.enrichHfAgent`
+(the key names keep the historical `Hf`; only the values changed).
+
+### Folder sidebar feature (create / rename / delete folders, empty folders, view options)
+
+The model-root sidebar manages on-disk folders. "Folder" reuses the noun already fixed in §2
+(the `folder key` row); the rest is new surface:
+
+| Term | Rendering |
+|---|---|
+| folder | zh-CN 文件夹 · zh-TW 資料夾 · ja フォルダ · ko 폴더 · fr dossier · de Ordner · es carpeta · ru папка · he תיקייה |
+| model root (as in "no model root is configured") | zh-CN 模型根目录 · zh-TW 模型根目錄 · ja モデルルート · ko 모델 루트 · fr racine de modèle · de Modell-Stammverzeichnis · es raíz de modelo · ru корневая папка моделей · he שורש מודלים — note `sidebar.modelRoot` alone is the shorter 根目录 / 根目錄 / ルート / 루트 / Racine / Stammverzeichnis / Raíz / Корень / שורש |
+| tree view / list view | zh-CN 树形视图 / 列表视图 · zh-TW 樹狀檢視 / 清單檢視 · ja ツリー表示 / リスト表示 · ko 트리 보기 / 목록 보기 · fr Vue arborescente / Vue liste · de Baumansicht / Listenansicht · es Vista de árbol / Vista de lista · ru Дерево / Список · he תצוגת עץ / תצוגת רשימה |
+| sidebar | reuse each locale's `sidebar.hideOnThisPage` noun: zh-CN 侧边栏 · zh-TW 側邊欄 · ja サイドバー · ko 사이드바 · fr barre latérale · de Seitenleiste · es barra lateral · ru боковая панель · he סרגל צד |
+
+Deleting a folder **never cascades over model files** — the backend refuses it and
+`sidebar.deleteFolderModal.notEmptyMessage` states the rule in every locale, so keep that
+clause (and its `—`) when the copy is edited. The `{name}` / `{count}` / `{message}` tokens in
+`sidebar.createFolderResult.*`, `sidebar.deleteFolderResult.*` and `sidebar.renameFolderResult.*`
+are verbatim §1-R2 placeholders; `successWithFiles` is the only key carrying `{count}`.
+
+### Settings Organization tab
+
+The settings modal's fourth nav tab groups everything about how files are arranged on
+disk: download path templates, priority tags, and auto-organize exclusions. The label is
+the **noun for arranging files**, matching each locale's existing
+`settings.sections.autoOrganize` rendering minus the "auto":
+
+| Locale | `settings.nav.organization` |
+|---|---|
+| fr | Organisation |
+| zh-CN | 整理 |
+| zh-TW | 整理 |
+| ja | 整理 |
+| ko | 정리 |
+| de | Organisation |
+| es | Organización |
+| ru | Организация |
+| he | ארגון |
+
+zh-CN/zh-TW use 整理 ("tidying/arranging"), not 组织/組織 (an organization as a group).
+
+### Filename Templates feature
+
+Per-model-type templates that name downloaded model files; "Apply to Library Now"
+bulk-renames existing files, and an **empty template restores the recorded original
+filenames** (recorded in each model's metadata at its first rename). "Template" follows
+each locale's existing download-path-template noun (zh-CN 模板 vs zh-TW 範本 — note the
+split); progress strings mirror `loras.bulkOperations.autoOrganizeProgress` verbatim with
+the locale's "moved" verb swapped for its "renamed" verb, and the toasts mirror the
+`autoOrganize*` / `downloadTemplates*` toast shapes.
+
+| Term | Rendering |
+|---|---|
+| filename template(s) | zh-CN 文件名模板 · zh-TW 檔案名稱範本 · ja ファイル名テンプレート · ko 파일명 템플릿 · fr modèle(s) de nom de fichier · de Dateinamen-Vorlage(n) · es plantilla(s) de nombres de archivo · ru шаблон(ы) имён файлов · he תבנית שם קובץ / תבניות שמות קבצים |
+| Apply to Library Now (button) | zh-CN 立即应用到库 · zh-TW 立即套用至模型庫 · ja ライブラリに今すぐ適用 · ko 지금 라이브러리에 적용 · fr Appliquer à la bibliothèque maintenant · de Jetzt auf Bibliothek anwenden · es Aplicar a la biblioteca ahora · ru Применить к библиотеке сейчас · he החל על הספרייה כעת |
+| Restore original filenames (modal title / button) | zh-CN 恢复原始文件名？/ 恢复原始文件名 · zh-TW 要還原原始檔案名稱嗎？/ 還原原始檔案名稱 · ja 元のファイル名を復元しますか？/ 元のファイル名を復元 · ko 원본 파일명을 복원하시겠습니까? / 원본 파일명 복원 · fr Restaurer les noms de fichier d'origine ? / Restaurer les noms de fichier d'origine · de Ursprüngliche Dateinamen wiederherstellen? / Ursprüngliche Dateinamen wiederherstellen · es ¿Restaurar los nombres de archivo originales? / Restaurar nombres de archivo originales · ru Восстановить исходные имена файлов? / Восстановить исходные имена файлов · he לשחזר שמות קבצים מקוריים? / שחזר שמות קבצים מקוריים |
+| "renamed" (progress/toast counter) | zh-CN 已重命名 · zh-TW 已重新命名 · ja リネーム · ko 이름 변경 · fr renommés · de umbenannt · es renombrados · ru переименовано · he שונו שמותם |
+
+### Chip reordering (model tags / trigger words)
+
+Model tags and trigger-word chips share a single reorder affordance (drag the chip, or its
+`⠿` grip where the chip body is click-to-edit), so the copy sits in `common.reorder.dragHandle`
+instead of a feature namespace. It is used twice per editor: as the grip tooltip and as the
+hint shown in the edit controls row. There is deliberately **no keyboard shortcut** — an
+`Alt + Arrow` binding fought the browser's own Alt + Arrow handling and the modal's arrow-key
+navigation, so reordering is pointer-only and the grip is a decorative, non-focusable
+affordance. Do not reintroduce a shortcut or a "position X of Y" screen-reader string without
+re-adding the corresponding keys.
+
+`dragHandle` is a fragment, not a sentence: it labels both the grip and the hint, so keep it
+short and imperative and do not append a keyboard hint in any locale.
+
+| Term | Rendering |
+|---|---|
+| drag to reorder | zh-CN 拖拽以调整顺序 · zh-TW 拖曳以調整順序 · ja ドラッグして並べ替え · ko 드래그하여 순서 변경 · fr Glisser pour réordonner · de Zum Neuordnen ziehen · es Arrastra para reordenar · ru Перетащите, чтобы изменить порядок · he גרור כדי לשנות סדר |
+
+The grip itself is an icon and is never translated.
+
 ---

 ## 3. Cross-cutting confusion hot-spots (must-fix list)
@@ -0,0 +1,107 @@
+# Plan: Filename Template Follow-ups
+
+**Issue:** [#1071 — Lora Renaming](https://github.com/willmiao/ComfyUI-Lora-Manager/issues/1071)
+**Status:** Core feature **implemented** (2026-09-19, commit `2bc9860b`,
+preceded by the settings-tab split in `327da046`). Follow-ups 1 and 2 were
+resolved together on 2026-09-19 by redefining the empty template as
+"revert to recorded original filename" (see below). Follow-up 3 remains open.
+
+## What shipped in `2bc9860b`
+
+- Per-model-type `download_filename_templates` setting (empty = keep current
+  filename; opt-in). Placeholders: `{model_name}`, `{version_name}`,
+  `{base_model}`, `{author}`, `{first_tag}`, `{hash_short}`,
+  `{original_name}`.
+- `calculate_filename_for_model()` in `py/utils/utils.py` renders the
+  template; templates containing path separators are rejected.
+- Downloads apply the template post-download
+  (`DownloadManager._apply_download_filename_template`); rename conflicts
+  keep the original name and never fail the download.
+- `ModelLifecycleService.rename_model` records `original_file_name` in the
+  `.metadata.json` sidecar (first rename wins via `setdefault`).
+- Bulk apply: `GET|POST /api/lm/{prefix}/apply-filename-template`
+  (`FilenameTemplateUseCase`, shares the auto-organize lock, WS progress type
+  `filename_template_progress`).
+- Settings UI: "Filename Templates" subsection in the new **Organization**
+  settings tab (`templates/components/modals/settings/organization.html`),
+  with validation, live preview, and per-type "Apply to Library Now".
+
+Sandbox E2E verified: rename incl. companion files (previews, sidecars),
+metadata pointer updates, `original_file_name` recording, idempotency,
+conflict handling (failure counted, batch continues), empty-template no-op,
+GET variant.
+
+## Follow-ups 1 & 2 — RESOLVED: empty template = revert to recorded original
+
+Follow-up 1 asked to reword the ambiguous "Valid (keep original filename)"
+empty-template message; Follow-up 2 asked for a bulk revert to the recorded
+`original_file_name`. Both were resolved by a single semantic change: **an
+empty template now means "restore the recorded original filename"** instead of
+"leave the current filename untouched".
+
+Rationale: for never-renamed models a revert is a no-op (no recorded
+original), for renamed models it restores the pre-rename name, and new
+downloads with an empty template keep the download name as before — so the
+two contexts (download path and bulk apply) share one coherent meaning, and
+no separate revert feature or `{recorded_original}` placeholder is needed.
+
+Implemented changes:
+
+- `FilenameTemplateUseCase._process_model`: an empty template now resolves
+  the target name from the sidecar's `original_file_name` via the injected
+  `metadata_loader` (default `load_local_metadata`); models without a
+  recorded original or whose original matches the current name are skipped.
+  Cache entries do not project `original_file_name`, so the sidecar is read
+  per model.
+- `SettingsManager.js`: removed the empty-template early return and the
+  apply-button disable (`updateFilenameTemplateApplyButton` deleted — the
+  button is now always enabled). The browser-native `confirm()` was replaced
+  with `filenameTemplateConfirmModal`
+  (`templates/components/modals/confirm_modals.html`), a **self-managed**
+  modal (like `DirectoryPickerModal`, NOT registered with ModalManager):
+  ModalManager's "close current modal on open" behavior would kill the
+  settings modal underneath. It stacks via `z-index: 10010`
+  (`delete-modal.css`), handles ESC in capture phase with
+  `stopPropagation`, and shows apply vs revert wording
+  (`modals.filenameTemplateConfirm.titleApply` / `titleRevert` /
+  `revertButton`; messages reuse `settings.filenameTemplates.confirmApply` /
+  `confirmRevert`).
+- `locales/en.json`: reworded `help` / `applyHelp`, replaced
+  `validation.keepOriginal` with `validation.restoreOriginal`
+  ("Valid (empty template restores original filenames)"), added
+  `confirmRevert`, removed the now-unused `emptyTemplateInfo`. Other locales
+  re-synced with `[TODO: Translate]` placeholders — retranslation waits for
+  the feature owner's request per `docs/i18n-translation-guidelines.md` §7.
+- Tests: revert / no-record-skip / same-name-skip cases in
+  `tests/services/test_use_cases.py`; modal confirm-and-revert and
+  cancel paths in
+  `tests/frontend/managers/settingsManager.filenameTemplates.test.js`.
+
+Sandbox E2E verified (standalone server, sandboxed settings + library under
+`/tmp`, 2026-09-19): template apply renames and records
+`original_file_name`; empty-template apply reverts to the recorded name;
+revert target occupied by a newer file counts as failure and keeps the
+current name; models without a recorded original are skipped;
+apply → revert → re-apply cycles repeat cleanly.
+
+Standing caveats (unchanged):
+
+- The revert target may collide with an existing file — the existing conflict
+  handling (count as failure, keep current name) covers this.
+- `original_file_name` only exists for models renamed after `2bc9860b`;
+  older renames have no recorded original and are skipped.
+- `original_file_name` is kept (not cleared) after a revert, so
+  apply → revert → re-apply stays repeatable.
+
+## Follow-up 3 — Cross-page refresh after bulk apply
+
+**Problem:** the settings-modal "Apply to Library Now" button calls
+`resetAndReload(true)`, which refreshes only the page type currently open.
+Applying the checkpoint template while on the loras page leaves the loras
+view refreshed but does not touch the checkpoints page state (same
+limitation as the existing bulk auto-organize flow in
+`static/js/managers/SettingsManager.js#applyFilenameTemplate`).
+
+**Fix options:** broadcast a generic "library changed" event that every
+page's state listens to, or accept the limitation (the other page reloads
+its cache on next visit). Low priority.
@@ -2,6 +2,9 @@
    "common": {
        "cancel": "Abbrechen",
        "confirm": "Bestätigen",
+        "reorder": {
+            "dragHandle": "Zum Neuordnen ziehen"
+        },
        "actions": {
            "save": "Speichern",
            "cancel": "Abbrechen",
@@ -139,6 +142,7 @@
            "viewOnCivitai": "Auf CivitAI anzeigen",
            "notAvailableFromCivitai": "Nicht auf CivitAI verfügbar",
            "viewOnHuggingFace": "Auf Hugging Face ansehen",
+            "viewOnSource": "Auf {source} ansehen",
            "sendToWorkflow": "An ComfyUI senden (Klick: Anhängen, Shift+Klick: Ersetzen)",
            "copyLoRASyntax": "LoRA-Syntax kopieren",
            "checkpointNameCopied": "Checkpoint-Name kopiert",
@@ -378,7 +382,9 @@
        "nav": {
            "general": "Allgemein",
            "interface": "Oberfläche",
-            "library": "Bibliothek"
+            "library": "Bibliothek",
+            "organization": "Organisation",
+            "modelPaths": "Modellpfade"
        },
        "search": {
            "placeholder": "Einstellungen durchsuchen...",
@@ -579,6 +585,46 @@
                "checkpointUnetOverlapInline": "Dieser Pfad wird bereits für einen anderen Modelltyp verwendet. Bitte verwenden Sie separate Ordner für Checkpoints und Diffusionsmodelle."
            }
        },
+        "modelPaths": {
+            "title": "Modellbibliothek-Pfade",
+            "description": "Stammordner, die LoRA Manager nach Ihren Modellen durchsucht. Dies sind die primären Modellspeicherorte, die im Standalone-Modus aus der settings.json gelesen werden.",
+            "restartRequired": "Neustart erforderlich, damit die Änderung wirksam wird",
+            "coreTypes": "Kern-Modelltypen",
+            "otherTypes": "Weitere Modelltypen",
+            "otherTypesDisabledHint": "Es sind keine weiteren Modelltypen aktiviert. Aktivieren Sie oben die benötigten Typen, um deren Ordner zu konfigurieren.",
+            "saveSuccessRestart": "Modellbibliothek-Pfade aktualisiert. Neustart erforderlich, um Änderungen anzuwenden.",
+            "pendingRestartNotice": "Pfadänderungen gespeichert. Starten Sie LoRA Manager neu, damit sie wirksam werden.",
+            "pendingRestartBannerTitle": "Neustart erforderlich, um Pfadänderungen anzuwenden",
+            "pendingRestartBannerMessage": "Die Modellbibliothek-Pfade wurden aktualisiert. Starten Sie den LoRA Manager-Server neu, um die neuen Ordner zu scannen.",
+            "folderKeys": {
+                "loras": "LoRA-Pfade",
+                "checkpoints": "Checkpoint-Pfade",
+                "unet": "Diffusionsmodell-Pfade",
+                "embeddings": "Embedding-Pfade",
+                "vae": "VAE-Pfade",
+                "upscale_models": "Upscaler-Pfade",
+                "text_encoders": "Text-Encoder-Pfade",
+                "clip": "CLIP-Pfade (Legacy)",
+                "clip_vision": "CLIP-Vision-Pfade",
+                "controlnet": "ControlNet-Pfade"
+            }
+        },
+        "directoryPicker": {
+            "title": "Ordner durchsuchen",
+            "selectFolder": "Diesen Ordner auswählen",
+            "goUp": "Nach oben",
+            "pathPlaceholder": "Pfad eingeben...",
+            "go": "Los",
+            "emptyFolder": "Keine Unterordner",
+            "loadError": "Verzeichnis konnte nicht geladen werden"
+        },
+        "pathValidation": {
+            "valid": "Pfad ist gültig",
+            "pathNotFound": "Pfad existiert nicht",
+            "notADirectory": "Kein Verzeichnis",
+            "notReadable": "Pfad ist nicht lesbar",
+            "notWritable": "Pfad ist nicht beschreibbar"
+        },
        "priorityTags": {
            "title": "Prioritäts-Tags",
            "description": "Passen Sie die Tag-Prioritätsreihenfolge für jeden Modelltyp an (z. B. character, concept, style(toon|toon_style))",
@@ -635,6 +681,22 @@
                "validTemplate": "Gültige Vorlage"
            }
        },
+        "filenameTemplates": {
+            "title": "Dateinamen-Vorlagen",
+            "help": "Konfigurieren Sie Dateinamen für heruntergeladene Modelle pro Modelltyp. Leer lassen, um den ursprünglichen Dateinamen zu behalten. Der ursprüngliche Dateiname bleibt immer in den Metadaten des Modells erhalten.",
+            "availablePlaceholders": "Verfügbare Platzhalter:",
+            "templatePlaceholder": "Dateinamen-Vorlage eingeben (z.B. {base_model}-{model_name}-{version_name})",
+            "applyButton": "Jetzt auf Bibliothek anwenden",
+            "applyHelp": "Benennt alle vorhandenen Dateien dieses Modelltyps gemäß der Vorlage um. Warnung: Das Umbenennen ändert den relativen Pfad, den ComfyUI-Loader sehen; vorhandene Workflows, die den alten Dateinamen referenzieren, müssen möglicherweise aktualisiert werden. Der ursprüngliche Dateiname bleibt in den Metadaten jedes Modells erhalten.",
+            "confirmApply": "Alle vorhandenen Dateien dieses Modelltyps gemäß der Dateinamen-Vorlage umbenennen? Dies ändert den relativen Pfad, den ComfyUI-Loader sehen. Der ursprüngliche Dateiname bleibt in den Metadaten jedes Modells erhalten.",
+            "confirmRevert": "Die gespeicherten ursprünglichen Dateinamen aller zuvor umbenannten Dateien dieses Modelltyps wiederherstellen? Dies ändert den relativen Pfad, den ComfyUI-Loader sehen. Dateien ohne gespeicherten ursprünglichen Dateinamen werden übersprungen.",
+            "validation": {
+                "restoreOriginal": "Gültig (leere Vorlage stellt ursprüngliche Dateinamen wieder her)",
+                "invalidChars": "Ungültige Zeichen erkannt (ein Dateiname darf / \\ < > : \" | ? * nicht enthalten)",
+                "invalidPlaceholder": "Ungültiger Platzhalter: {placeholder}",
+                "validTemplate": "Gültige Vorlage"
+            }
+        },
        "exampleImages": {
            "downloadLocation": "Download-Speicherort",
            "downloadLocationPlaceholder": "Ordnerpfad für Beispielbilder eingeben",
@@ -867,14 +929,22 @@
                "complete": "Automatische Organisation abgeschlossen",
                "error": "Fehler: {error}"
            },
-            "enrichHfAgent": "HF-Metadaten mit KI anreichern"
+            "filenameTemplateProgress": {
+                "initializing": "Anwendung der Dateinamen-Vorlage wird initialisiert...",
+                "starting": "Dateinamen-Vorlage wird auf {type} angewendet...",
+                "processing": "Verarbeitung ({processed}/{total}) – {success} umbenannt, {skipped} übersprungen, {failures} fehlgeschlagen",
+                "completed": "Abgeschlossen: {success} umbenannt, {skipped} übersprungen, {failures} fehlgeschlagen",
+                "complete": "Anwendung der Dateinamen-Vorlage abgeschlossen",
+                "error": "Fehler: {error}"
+            },
+            "enrichHfAgent": "Metadaten mit KI anreichern"
        },
        "contextMenu": {
            "refreshMetadata": "CivitAI-Daten aktualisieren",
            "checkUpdates": "Updates prüfen",
            "linkModel": "Modell verknüpfen",
            "linkCivitai": "Mit CivitAI neu verknüpfen",
-            "linkHuggingFace": "Mit HuggingFace verknüpfen",
+            "linkModelSource": "Mit Modellquelle verknüpfen",
            "copySyntax": "LoRA-Syntax kopieren",
            "copyFilename": "Modell-Dateiname kopieren",
            "copyRecipeSyntax": "Rezept-Syntax kopieren",
@@ -896,7 +966,7 @@
            "viewAllLoras": "Alle LoRAs anzeigen",
            "downloadMissingLoras": "Fehlende LoRAs herunterladen",
            "deleteRecipe": "Rezept löschen",
-            "enrichHfAgent": "HF-Metadaten mit KI anreichern"
+            "enrichHfAgent": "Metadaten mit KI anreichern"
        }
    },
    "recipes": {
@@ -914,7 +984,9 @@
        },
        "modal": {
            "metadata": {
-                "id": "ID"
+                "id": "ID",
+                "baseModel": "Basismodell",
+                "unknown": "Unbekannt"
            },
            "actions": {
                "openFileLocation": "Dateispeicherort öffnen",
@@ -1235,38 +1307,75 @@
        },
        "noPaths": {
            "title": "Keine Ordner für weitere Modelle gefunden",
-            "descriptionStandalone": "Die Verwaltung weiterer Modelle ist aktiviert, aber keiner der konfigurierten Modellordner existiert auf dem Datenträger. Fügen Sie die unten stehenden Ordnerpfade zu settings.json hinzu und starten Sie LoRA Manager neu.",
-            "hintStandalone": "Nur die oben aufgeführten Ordnerschlüssel werden gescannt; nicht benötigte Schlüssel können weggelassen werden.",
+            "descriptionStandalone": "Die Verwaltung weiterer Modelle ist aktiviert, aber es wurden keine Ordner für weitere Modelle gefunden. Fügen Sie Ihre Modellordner unter Einstellungen → Modellpfade hinzu und starten Sie LoRA Manager anschließend neu.",
+            "hintStandalone": "Es werden nur aktivierte Modelltypen gescannt. Aktivieren Sie die benötigten Typen unter Bibliothek → Standard-Roots.",
            "descriptionComfyUI": "Die Verwaltung weiterer Modelle ist aktiviert, aber keiner der konfigurierten Modellordner existiert auf dem Datenträger. Fügen Sie die entsprechenden Modellordner zu Ihren ComfyUI-Modellpfaden hinzu und laden Sie diese Seite neu.",
            "hintComfyUI": "Weitere Modelle werden aus den Ordnern vae, upscale_models, text_encoders, clip_vision und controlnet von ComfyUI gelesen.",
-            "openSettings": "Einstellungen öffnen"
+            "openSettings": "Einstellungen öffnen",
+            "openModelPaths": "Modellordner konfigurieren",
+            "openSettingsFolder": "Einstellungsordner öffnen"
        }
    },
    "sidebar": {
        "modelRoot": "Stammverzeichnis",
        "collapseAll": "Alle Ordner einklappen",
+        "collapseAllDisabled": "In der Listenansicht nicht verfügbar",
        "hideOnThisPage": "Seitenleiste auf dieser Seite ausblenden",
        "showSidebar": "Seitenleiste anzeigen",
        "sidebarHiddenNotification": "Seitenleiste auf der Seite {page} ausgeblendet",
-        "switchToListView": "Zur Listenansicht wechseln",
-        "switchToTreeView": "Zur Baumansicht wechseln",
+        "viewOptions": "Ansichtsoptionen",
+        "treeView": "Baumansicht",
+        "listView": "Listenansicht",
        "recursiveOn": "Unterordner einbeziehen",
-        "recursiveOff": "Nur aktueller Ordner",
-        "recursiveUnavailable": "Rekursive Suche ist nur in der Baumansicht verfügbar",
-        "collapseAllDisabled": "Im Listenmodus nicht verfügbar",
+        "createFolder": "Neuer Ordner",
+        "newSubfolder": "Neuer Unterordner",
+        "showEmptyFolders": "Leere Ordner anzeigen",
+        "createFolderResult": {
+            "success": "Ordner \"{name}\" erstellt",
+            "failed": "Ordner konnte nicht erstellt werden: {message}",
+            "unsupported": "Das Erstellen von Ordnern wird auf dieser Seite nicht unterstützt",
+            "noRoot": "Es ist kein Modell-Stammverzeichnis konfiguriert"
+        },
+        "deleteFolder": "Ordner löschen",
+        "deleteFolderModal": {
+            "title": "Ordner löschen?",
+            "message": "Der Ordner und sein gesamter Inhalt werden endgültig vom Datenträger gelöscht.",
+            "folderLabel": "Ordner",
+            "emptyNote": "Dieser Ordner enthält keine Modelle. Alle anderen darin enthaltenen Dateien werden ebenfalls gelöscht.",
+            "notEmptyTitle": "Ordner ist nicht leer",
+            "notEmptyMessage": "Dieser Ordner enthält noch Modelle. Löschen oder verschieben Sie diese zuerst — beim Löschen eines Ordners werden Modelldateien niemals mitgelöscht.",
+            "confirm": "Ordner löschen"
+        },
+        "deleteFolderResult": {
+            "success": "Ordner \"{name}\" gelöscht",
+            "successWithFiles": "Ordner \"{name}\" sowie {count} weitere(s) Element(e) gelöscht",
+            "restored": "Ordner wiederhergestellt",
+            "failed": "Ordner konnte nicht gelöscht werden: {message}",
+            "notEmpty": "Dieser Ordner enthält noch Modelle. Aktualisieren Sie die Seitenleiste und versuchen Sie es erneut.",
+            "busy": "In diesem Ordner steht noch eine Löschung aus. Warten Sie, bis das Zeitfenster für das Rückgängigmachen abgelaufen ist.",
+            "unsupported": "Das Löschen von Ordnern wird auf dieser Seite nicht unterstützt",
+            "noRoot": "Es ist kein Modell-Stammverzeichnis konfiguriert"
+        },
+        "renameFolder": "Ordner umbenennen",
+        "renameFolderResult": {
+            "success": "Ordner umbenannt in \"{name}\"",
+            "failed": "Ordner konnte nicht umbenannt werden: {message}",
+            "targetExists": "Ein Ordner mit diesem Namen ist hier bereits vorhanden",
+            "busy": "In diesem Ordner steht noch eine Löschung aus. Warten Sie, bis das Zeitfenster für das Rückgängigmachen abgelaufen ist.",
+            "unsupported": "Das Umbenennen von Ordnern wird auf dieser Seite nicht unterstützt",
+            "noRoot": "Es ist kein Modell-Stammverzeichnis konfiguriert"
+        },
        "dragDrop": {
            "unableToResolveRoot": "Zielpfad für das Verschieben konnte nicht ermittelt werden.",
            "moveUnsupported": "Verschieben wird für dieses Element nicht unterstützt.",
-            "createFolderHint": "Loslassen, um einen neuen Ordner zu erstellen",
            "newFolderName": "Neuer Ordnername",
-            "folderNameHint": "Eingabetaste zum Bestätigen, Escape zum Abbrechen",
            "emptyFolderName": "Bitte geben Sie einen Ordnernamen ein",
            "invalidFolderName": "Ordnername enthält ungültige Zeichen",
            "noDragState": "Kein ausstehender Ziehvorgang gefunden"
        },
        "empty": {
            "noFolders": "Keine Ordner gefunden",
-            "dragHint": "Elemente hierher ziehen, um Ordner zu erstellen"
+            "createHint": "Klicken Sie oben auf „Neuer Ordner“, um Ordner zu erstellen"
        },
        "folderUpdateCheck": {
            "label": "Auf Updates in diesem Ordner prüfen",
@@ -1394,9 +1503,9 @@
        "download": {
            "title": "Modell von URL herunterladen",
            "titleWithType": "{type} von URL herunterladen",
-            "civitaiUrl": "CivitAI URL:",
+            "civitaiUrl": "Modell-URL:",
            "placeholder": "https://civitai.com/models/...",
-            "urlHint": "Geben Sie eine CivitAI-, CivArchive- oder Hugging Face-URL pro Zeile ein. Unterstützt mehrere URLs für den Batch-Download.",
+            "urlHint": "Geben Sie eine CivitAI-, CivArchive-, Hugging Face- oder ModelScope-URL pro Zeile ein. Unterstützt mehrere URLs für den Batch-Download.",
            "selectHfFiles": "Datei(en) zum Herunterladen aus diesem Repository auswählen:",
            "selectAll": "Alle auswählen",
            "fetchingRepoFiles": "Repository-Dateien werden abgerufen...",
@@ -1429,9 +1538,9 @@
                "inLibrary": "In Bibliothek"
            },
            "errors": {
-                "invalidUrl": "Ungültiges CivitAI URL-Format",
+                "invalidUrl": "Ungültiges Modell-URL-Format",
                "noVersions": "Keine Versionen für dieses Modell verfügbar",
-                "mixedSources": "CivitAI- und Hugging Face-URLs können nicht in derselben Charge gemischt werden.",
+                "mixedSources": "CivitAI- und Hugging Face-/ModelScope-URLs können nicht in derselben Charge gemischt werden.",
                "noModelFiles": "In diesem Repository wurden keine Modelldateien gefunden."
            },
            "status": {
@@ -1445,6 +1554,10 @@
            "progress": {
                "currentFile": "Aktuelle Datei:",
                "downloading": "Wird heruntergeladen: {name}",
+                "metadata": "Metadaten: {name}",
+                "indexingFile": "Modelldatei wird gelesen...",
+                "fetchingSourceMetadata": "Metadaten werden von {source} abgerufen...",
+                "fetchingMetadata": "Metadaten werden abgerufen...",
                "transferred": "Heruntergeladen: {downloaded} / {total}",
                "transferredSimple": "Heruntergeladen: {downloaded}",
                "transferredUnknown": "Heruntergeladen: --",
@@ -1513,6 +1626,11 @@
            "tip": "Möchten Sie in Etappen prüfen? Wechseln Sie in den Massenmodus, wählen Sie die benötigten Modelle aus und nutzen Sie anschließend \"Auswahl auf Updates prüfen\".",
            "action": "Alles prüfen"
        },
+        "filenameTemplateConfirm": {
+            "titleApply": "Dateinamen-Vorlage auf Bibliothek anwenden?",
+            "titleRevert": "Ursprüngliche Dateinamen wiederherstellen?",
+            "revertButton": "Ursprüngliche Dateinamen wiederherstellen"
+        },
        "bulkAddTags": {
            "title": "Tags zu mehreren Modellen hinzufügen",
            "description": "Tags hinzufügen zu",
@@ -1596,12 +1714,16 @@
            "pathPlaceholder": "Ordnerpfad eingeben oder aus Baum unten auswählen...",
            "root": "Stammverzeichnis"
        },
-        "linkHuggingFace": {
-            "title": "Mit HuggingFace verknüpfen",
-            "infoText": "Fügen Sie die HuggingFace-Repository-URL ein, um dieses Modell zuzuordnen. Dies ermöglicht die KI-gestützte Metadatenanreicherung.",
-            "urlLabel": "HuggingFace-Repository-URL:",
+        "linkModelSource": {
+            "title": "Mit Modellquelle verknüpfen",
+            "infoText": "Fügen Sie die URL der Modellseite ein, um dieses Modell seiner Quelle zuzuordnen. Die Verknüpfung ermöglicht die KI-gestützte Metadatenanreicherung für Modelle von Hugging Face und ModelScope.",
+            "urlLabel": "URL der Modellseite:",
            "urlPlaceholder": "https://huggingface.co/user/repo",
-            "helpText": "Geben Sie die vollständige URL des HuggingFace-Repositorys ein.",
+            "helpText": "Geben Sie die vollständige URL der Modellseite ein. Unterstützte Websites:",
+            "enrichNote": "Die KI-Anreicherung benötigt eine lesbare Modellkarte. Websites, die keine bereitstellen (derzeit TensorArt), können nur verknüpft werden.",
+            "urlRequired": "Bitte geben Sie die URL der Modellseite ein.",
+            "invalidUrl": "Nicht unterstützte URL. Unterstützte Websites: Hugging Face, ModelScope, TensorArt.",
+            "linking": "Modellquelle wird verknüpft...",
            "confirmAction": "Speichern & Verknüpfen"
        },
        "relinkCivitai": {
@@ -1847,7 +1969,7 @@
                "empty": "Noch keine Versionshistorie für dieses Modell vorhanden.",
                "error": "Versionen konnten nicht geladen werden.",
                "missingModelId": "Für dieses Modell ist keine CivitAI-Model-ID vorhanden.",
-                "hfGroupInfo": "Dies ist eine HuggingFace-Modellgruppe. Öffnen Sie die Bibliothek, um alle Versionen im Raster zu sehen.",
+                "sourceGroupInfo": "Dies ist eine {source}-Modellgruppe. Öffnen Sie die Bibliothek, um alle Versionen im Raster zu sehen.",
                "confirm": {
                    "delete": "Diese Version aus Ihrer Bibliothek löschen?"
                },
@@ -2218,6 +2340,9 @@
            "autoOrganizeSuccess": "Automatische Organisation für {count} {type} erfolgreich abgeschlossen",
            "autoOrganizePartialSuccess": "Automatische Organisation abgeschlossen: {success} verschoben, {failures} fehlgeschlagen von insgesamt {total} Modellen",
            "autoOrganizeFailed": "Automatische Organisation fehlgeschlagen: {error}",
+            "filenameTemplateSuccess": "Dateinamen-Vorlage erfolgreich für {count} {type} angewendet",
+            "filenameTemplatePartialSuccess": "Dateinamen-Vorlage angewendet: {success} umbenannt, {failures} von {total} Modellen fehlgeschlagen",
+            "filenameTemplateFailed": "Anwendung der Dateinamen-Vorlage fehlgeschlagen: {error}",
            "noModelsSelected": "Keine Modelle ausgewählt"
        },
        "recipes": {
@@ -2384,6 +2509,8 @@
            "mappingSaveFailed": "Fehler beim Speichern der Basismodell-Zuordnungen: {message}",
            "downloadTemplatesUpdated": "Download-Pfad-Vorlagen aktualisiert",
            "downloadTemplatesFailed": "Fehler beim Speichern der Download-Pfad-Vorlagen: {message}",
+            "filenameTemplatesUpdated": "Dateinamen-Vorlagen aktualisiert",
+            "filenameTemplatesFailed": "Dateinamen-Vorlagen konnten nicht gespeichert werden: {message}",
            "recipesPathUpdated": "Rezepte-Speicherpfad aktualisiert",
            "recipesPathSaveFailed": "Fehler beim Aktualisieren des Rezepte-Speicherpfads: {message}",
            "settingsUpdated": "Einstellungen aktualisiert: {setting}",
@@ -2483,7 +2610,9 @@
            "linkCivArchSuccess": "Modell erfolgreich über CivitArchive neu verknüpft",
            "fetchMetadataFirst": "Bitte rufen Sie zuerst Metadaten von CivitAI ab",
            "noCivitaiInfo": "Keine CivitAI-Informationen verfügbar",
-            "missingHash": "Modell-Hash nicht verfügbar"
+            "missingHash": "Modell-Hash nicht verfügbar",
+            "enrichNeedsSource": "Verknüpfen Sie dieses Modell zuerst mit einer Modellquelle (Modell verknüpfen → Mit Modellquelle verknüpfen)",
+            "enrichUnsupportedSource": "Die KI-Anreicherung ist für {source}-Modelle nicht verfügbar"
        },
        "exampleImages": {
            "pathUpdated": "Beispielbilder-Pfad erfolgreich aktualisiert",
@@ -2647,6 +2776,11 @@
            "content": "Scannen und verwalten Sie VAE-, Upscaler-, Text-Encoder-, CLIP-Vision- und ControlNet-Dateien und laden Sie sie von CivitAI herunter, alles auf einer eigenen Seite.",
            "enable": "Weitere Modelle aktivieren",
            "openSettings": "Einstellungen öffnen"
+        },
+        "pager": {
+            "previous": "Vorherige Mitteilung",
+            "next": "Nächste Mitteilung",
+            "position": "Mitteilung {current} von {total}"
        }
    }
 }
@@ -2,6 +2,9 @@
  "common": {
    "cancel": "Cancel",
    "confirm": "Confirm",
+    "reorder": {
+      "dragHandle": "Drag to reorder"
+    },
    "actions": {
      "save": "Save",
      "cancel": "Cancel",
@@ -139,6 +142,7 @@
      "viewOnCivitai": "View on CivitAI",
      "notAvailableFromCivitai": "Not available from CivitAI",
      "viewOnHuggingFace": "View on Hugging Face",
+      "viewOnSource": "View on {source}",
      "sendToWorkflow": "Send to ComfyUI (Click: Append, Shift+Click: Replace)",
      "copyLoRASyntax": "Copy LoRA Syntax",
      "checkpointNameCopied": "Checkpoint name copied",
@@ -378,7 +382,9 @@
    "nav": {
      "general": "General",
      "interface": "Interface",
-      "library": "Library"
+      "library": "Library",
+      "organization": "Organization",
+      "modelPaths": "Model Paths"
    },
    "search": {
      "placeholder": "Search settings...",
@@ -579,6 +585,46 @@
        "checkpointUnetOverlapInline": "This path is also used for a different model type. Use separate folders for checkpoints and diffusion models."
      }
    },
+    "modelPaths": {
+      "title": "Model Library Paths",
+      "description": "Root folders LoRA Manager scans for your models. These are the primary model locations read from settings.json in standalone mode.",
+      "restartRequired": "Requires restart to take effect",
+      "coreTypes": "Core Model Types",
+      "otherTypes": "Other Model Types",
+      "otherTypesDisabledHint": "No other model types are enabled. Turn on the types you need above to configure their folders.",
+      "saveSuccessRestart": "Model library paths updated. Restart required to apply changes.",
+      "pendingRestartNotice": "Path changes saved. Restart LoRA Manager for them to take effect.",
+      "pendingRestartBannerTitle": "Restart required to apply path changes",
+      "pendingRestartBannerMessage": "Model library paths were updated. Restart the LoRA Manager server to scan the new folders.",
+      "folderKeys": {
+        "loras": "LoRA Paths",
+        "checkpoints": "Checkpoint Paths",
+        "unet": "Diffusion Model Paths",
+        "embeddings": "Embedding Paths",
+        "vae": "VAE Paths",
+        "upscale_models": "Upscaler Paths",
+        "text_encoders": "Text Encoder Paths",
+        "clip": "CLIP Paths (legacy)",
+        "clip_vision": "CLIP Vision Paths",
+        "controlnet": "ControlNet Paths"
+      }
+    },
+    "directoryPicker": {
+      "title": "Browse Folders",
+      "selectFolder": "Select This Folder",
+      "goUp": "Up",
+      "pathPlaceholder": "Enter path...",
+      "go": "Go",
+      "emptyFolder": "No subfolders",
+      "loadError": "Failed to load directory"
+    },
+    "pathValidation": {
+      "valid": "Path is valid",
+      "pathNotFound": "Path does not exist",
+      "notADirectory": "Not a directory",
+      "notReadable": "Path is not readable",
+      "notWritable": "Path is not writable"
+    },
    "priorityTags": {
      "title": "Priority Tags",
      "description": "Customize the tag priority order for each model type (e.g., character, concept, style(toon|toon_style))",
@@ -635,6 +681,22 @@
        "validTemplate": "Valid template"
      }
    },
+    "filenameTemplates": {
+      "title": "Filename Templates",
+      "help": "Configure filenames for downloaded models per model type. Leave empty to keep original filenames on download; applying an empty template restores the recorded original filenames of previously renamed models. The original filename is always preserved in the model's metadata.",
+      "availablePlaceholders": "Available placeholders:",
+      "templatePlaceholder": "Enter filename template (e.g., {base_model}-{model_name}-{version_name})",
+      "applyButton": "Apply to Library Now",
+      "applyHelp": "Renames all existing files of this model type according to the template; with an empty template, restores the recorded original filenames instead. Warning: renaming changes the relative path seen by ComfyUI loaders, so existing workflows referencing the old filename may need to be updated. The original filename is preserved in each model's metadata.",
+      "confirmApply": "Rename all existing files of this model type according to the filename template? This changes the relative path seen by ComfyUI loaders. The original filename is preserved in each model's metadata.",
+      "confirmRevert": "Restore the recorded original filenames of all previously renamed files of this model type? This changes the relative path seen by ComfyUI loaders. Files without a recorded original filename are skipped.",
+      "validation": {
+        "restoreOriginal": "Valid (empty template restores original filenames)",
+        "invalidChars": "Invalid characters detected (a filename cannot contain / \\ < > : \" | ? *)",
+        "invalidPlaceholder": "Invalid placeholder: {placeholder}",
+        "validTemplate": "Valid template"
+      }
+    },
    "exampleImages": {
      "downloadLocation": "Download Location",
      "downloadLocationPlaceholder": "Enter folder path for example images",
@@ -867,14 +929,22 @@
        "complete": "Auto-organize complete",
        "error": "Error: {error}"
      },
-      "enrichHfAgent": "Enrich HF Metadata (AI)"
+      "filenameTemplateProgress": {
+        "initializing": "Initializing filename template apply...",
+        "starting": "Applying filename template to {type}...",
+        "processing": "Processing ({processed}/{total}) - {success} renamed, {skipped} skipped, {failures} failed",
+        "completed": "Completed: {success} renamed, {skipped} skipped, {failures} failed",
+        "complete": "Filename template apply complete",
+        "error": "Error: {error}"
+      },
+      "enrichHfAgent": "Enrich Metadata with AI"
    },
    "contextMenu": {
      "refreshMetadata": "Refresh CivitAI Data",
      "checkUpdates": "Check Updates",
      "linkModel": "Link Model",
      "linkCivitai": "Link to CivitAI",
-      "linkHuggingFace": "Link to HuggingFace",
+      "linkModelSource": "Link to Model Source",
      "copySyntax": "Copy LoRA Syntax",
      "copyFilename": "Copy Model Filename",
      "copyRecipeSyntax": "Copy Recipe Syntax",
@@ -896,7 +966,7 @@
      "viewAllLoras": "View All LoRAs",
      "downloadMissingLoras": "Download Missing LoRAs",
      "deleteRecipe": "Delete Recipe",
-      "enrichHfAgent": "Enrich HF Metadata (AI)"
+      "enrichHfAgent": "Enrich Metadata with AI"
    }
  },
  "recipes": {
@@ -914,7 +984,9 @@
    },
    "modal": {
      "metadata": {
-        "id": "ID"
+        "id": "ID",
+        "baseModel": "Base Model",
+        "unknown": "Unknown"
      },
      "actions": {
        "openFileLocation": "Open File Location",
@@ -1235,38 +1307,75 @@
    },
    "noPaths": {
      "title": "No other-model folders found",
-      "descriptionStandalone": "Other Models management is on, but none of the configured model folders exist on disk. Add the folder paths below to settings.json and restart LoRA Manager.",
-      "hintStandalone": "Only the folder keys listed above are scanned; keys you do not need can be omitted.",
+      "descriptionStandalone": "Other Models management is on, but no other-model folders were found. Add your model folders under Settings → Model Paths, then restart LoRA Manager.",
+      "hintStandalone": "Only enabled model types are scanned; enable the types you need under Library → Folder Settings.",
      "descriptionComfyUI": "Other Models management is on, but none of the configured model folders exist on disk. Add the matching model folders to your ComfyUI model paths, then reload this page.",
      "hintComfyUI": "Other models are read from ComfyUI's vae, upscale_models, text_encoders, clip_vision and controlnet folders.",
-      "openSettings": "Open Settings"
+      "openSettings": "Open Settings",
+      "openModelPaths": "Configure Model Folders",
+      "openSettingsFolder": "Open Settings Folder"
    }
  },
  "sidebar": {
    "modelRoot": "Root",
    "collapseAll": "Collapse All Folders",
+    "collapseAllDisabled": "Not available in list view",
    "hideOnThisPage": "Hide sidebar on this page",
    "showSidebar": "Show sidebar",
    "sidebarHiddenNotification": "Folder sidebar hidden on {page} page",
-    "switchToListView": "Switch to List View",
-    "switchToTreeView": "Switch to Tree View",
+    "viewOptions": "View options",
+    "treeView": "Tree view",
+    "listView": "List view",
    "recursiveOn": "Include subfolders",
-    "recursiveOff": "Current folder only",
-    "recursiveUnavailable": "Recursive search is available in tree view only",
-    "collapseAllDisabled": "Not available in list view",
+    "createFolder": "New folder",
+    "newSubfolder": "New subfolder",
+    "showEmptyFolders": "Show empty folders",
+    "createFolderResult": {
+      "success": "Folder \"{name}\" created",
+      "failed": "Failed to create folder: {message}",
+      "unsupported": "Folder creation is not supported on this page",
+      "noRoot": "No model root is configured"
+    },
+    "deleteFolder": "Delete folder",
+    "deleteFolderModal": {
+      "title": "Delete folder?",
+      "message": "The folder and everything inside it will be permanently removed from disk.",
+      "folderLabel": "Folder",
+      "emptyNote": "This folder contains no models. Any other files it holds will be deleted too.",
+      "notEmptyTitle": "Folder is not empty",
+      "notEmptyMessage": "This folder still contains models. Delete or move them first — deleting a folder never cascades over model files.",
+      "confirm": "Delete folder"
+    },
+    "deleteFolderResult": {
+      "success": "Folder \"{name}\" deleted",
+      "successWithFiles": "Folder \"{name}\" deleted along with {count} other item(s)",
+      "restored": "Folder restored",
+      "failed": "Failed to delete folder: {message}",
+      "notEmpty": "This folder still contains models. Refresh the sidebar and try again.",
+      "busy": "A deletion is still pending inside this folder. Wait for the undo window to expire.",
+      "unsupported": "Folder deletion is not supported on this page",
+      "noRoot": "No model root is configured"
+    },
+    "renameFolder": "Rename folder",
+    "renameFolderResult": {
+      "success": "Folder renamed to \"{name}\"",
+      "failed": "Failed to rename folder: {message}",
+      "targetExists": "A folder with that name already exists here",
+      "busy": "A deletion is still pending inside this folder. Wait for the undo window to expire.",
+      "unsupported": "Folder renaming is not supported on this page",
+      "noRoot": "No model root is configured"
+    },
    "dragDrop": {
      "unableToResolveRoot": "Unable to determine destination path for move.",
      "moveUnsupported": "Move is not supported for this item.",
-      "createFolderHint": "Release to create new folder",
      "newFolderName": "New folder name",
-      "folderNameHint": "Press Enter to confirm, Escape to cancel",
      "emptyFolderName": "Please enter a folder name",
      "invalidFolderName": "Folder name contains invalid characters",
      "noDragState": "No pending drag operation found"
    },
    "empty": {
      "noFolders": "No folders found",
-      "dragHint": "Drag items here to create folders"
+      "createHint": "Click the New Folder button above to create folders"
    },
    "folderUpdateCheck": {
      "label": "Check for updates in this folder",
@@ -1394,9 +1503,9 @@
    "download": {
      "title": "Download Model from URL",
      "titleWithType": "Download {type} from URL",
-      "civitaiUrl": "CivitAI URL(s):",
+      "civitaiUrl": "Model URL(s):",
      "placeholder": "https://civitai.com/models/...",
-      "urlHint": "Enter one CivitAI, CivArchive, or Hugging Face URL per line. Supports multiple URLs for batch download.",
+      "urlHint": "Enter one CivitAI, CivArchive, Hugging Face, or ModelScope 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...",
@@ -1429,9 +1538,9 @@
        "inLibrary": "In Library"
      },
      "errors": {
-        "invalidUrl": "Invalid CivitAI URL format",
+        "invalidUrl": "Invalid model URL format",
        "noVersions": "No versions available for this model",
-        "mixedSources": "Cannot mix CivitAI and Hugging Face URLs in the same batch.",
+        "mixedSources": "Cannot mix CivitAI and Hugging Face / ModelScope URLs in the same batch.",
        "noModelFiles": "No model files found in this repository."
      },
      "status": {
@@ -1445,6 +1554,10 @@
      "progress": {
        "currentFile": "Current file:",
        "downloading": "Downloading: {name}",
+        "metadata": "Metadata: {name}",
+        "indexingFile": "Reading model file...",
+        "fetchingSourceMetadata": "Fetching metadata from {source}...",
+        "fetchingMetadata": "Fetching metadata...",
        "transferred": "Transferred: {downloaded} / {total}",
        "transferredSimple": "Transferred: {downloaded}",
        "transferredUnknown": "Transferred: --",
@@ -1513,6 +1626,11 @@
      "tip": "To work in smaller batches, switch to bulk mode, choose the ones you need, then use \"Check Updates for Selected\".",
      "action": "Check All"
    },
+    "filenameTemplateConfirm": {
+      "titleApply": "Apply filename template to library?",
+      "titleRevert": "Restore original filenames?",
+      "revertButton": "Restore Original Filenames"
+    },
    "bulkAddTags": {
      "title": "Add Tags to Multiple Models",
      "description": "Add tags to",
@@ -1596,12 +1714,16 @@
      "pathPlaceholder": "Type folder path or select from tree below...",
      "root": "Root"
    },
-    "linkHuggingFace": {
-      "title": "Link to HuggingFace",
-      "infoText": "Paste the HuggingFace repository URL to associate this model with its source. This enables AI-powered metadata enrichment.",
-      "urlLabel": "HuggingFace Repository URL:",
+    "linkModelSource": {
+      "title": "Link to Model Source",
+      "infoText": "Paste the model page URL to associate this model with its source. Linking enables AI-powered metadata enrichment for Hugging Face and ModelScope models.",
+      "urlLabel": "Model Page URL:",
      "urlPlaceholder": "https://huggingface.co/user/repo",
-      "helpText": "Enter the full URL of the HuggingFace repository.",
+      "helpText": "Enter the full URL of the model page. Supported sites:",
+      "enrichNote": "AI enrichment needs a readable model card. Sites that don't expose one (currently TensorArt) can only be linked.",
+      "urlRequired": "Please enter a model page URL.",
+      "invalidUrl": "Unsupported URL. Supported sites: Hugging Face, ModelScope, TensorArt.",
+      "linking": "Linking model source...",
      "confirmAction": "Save & Link"
    },
    "relinkCivitai": {
@@ -1847,7 +1969,7 @@
        "empty": "No version history available for this model yet.",
        "error": "Failed to load versions.",
        "missingModelId": "This model is missing a CivitAI model id.",
-        "hfGroupInfo": "This is a HuggingFace model group. Open the library to see all versions in the grid.",
+        "sourceGroupInfo": "This is a {source} model group. Open the library to see all versions in the grid.",
        "confirm": {
          "delete": "Delete this version from your library?"
        },
@@ -2218,6 +2340,9 @@
      "autoOrganizeSuccess": "Auto-organize completed successfully for {count} {type}",
      "autoOrganizePartialSuccess": "Auto-organize completed with {success} moved, {failures} failed out of {total} models",
      "autoOrganizeFailed": "Auto-organize failed: {error}",
+      "filenameTemplateSuccess": "Filename template applied successfully for {count} {type}",
+      "filenameTemplatePartialSuccess": "Filename template applied with {success} renamed, {failures} failed out of {total} models",
+      "filenameTemplateFailed": "Applying filename template failed: {error}",
      "noModelsSelected": "No models selected"
    },
    "recipes": {
@@ -2384,6 +2509,8 @@
      "mappingSaveFailed": "Failed to save base model mappings: {message}",
      "downloadTemplatesUpdated": "Download path templates updated",
      "downloadTemplatesFailed": "Failed to save download path templates: {message}",
+      "filenameTemplatesUpdated": "Filename templates updated",
+      "filenameTemplatesFailed": "Failed to save filename templates: {message}",
      "recipesPathUpdated": "Recipes storage path updated",
      "recipesPathSaveFailed": "Failed to update recipes storage path: {message}",
      "settingsUpdated": "Settings updated: {setting}",
@@ -2478,12 +2605,14 @@
      "contentRatingFailed": "Failed to set content rating: {message}",
      "relinkSuccess": "Model successfully re-linked to CivitAI",
      "relinkFailed": "Error: {message}",
-      "linkHfSuccess": "Model successfully linked to HuggingFace",
+      "linkHfSuccess": "Model successfully linked to its model source",
      "linkHfFailed": "Error: {message}",
      "linkCivArchSuccess": "Model successfully re-linked via CivitArchive",
      "fetchMetadataFirst": "Please fetch metadata from CivitAI first",
      "noCivitaiInfo": "No CivitAI information available",
-      "missingHash": "Model hash not available"
+      "missingHash": "Model hash not available",
+      "enrichNeedsSource": "Link this model to a model source first (Link Model → Link to Model Source)",
+      "enrichUnsupportedSource": "AI enrichment is not available for {source} models"
    },
    "exampleImages": {
      "pathUpdated": "Example images path updated successfully",
@@ -2647,6 +2776,11 @@
      "content": "Scan and manage VAE, upscaler, text encoder, CLIP vision and ControlNet files — and download them from CivitAI — from one dedicated page.",
      "enable": "Enable Other Models",
      "openSettings": "Open Settings"
+    },
+    "pager": {
+      "previous": "Previous message",
+      "next": "Next message",
+      "position": "Message {current} of {total}"
    }
  }
 }
@@ -2,6 +2,9 @@
    "common": {
        "cancel": "Cancelar",
        "confirm": "Confirmar",
+        "reorder": {
+            "dragHandle": "Arrastra para reordenar"
+        },
        "actions": {
            "save": "Guardar",
            "cancel": "Cancelar",
@@ -139,6 +142,7 @@
            "viewOnCivitai": "Ver en CivitAI",
            "notAvailableFromCivitai": "No disponible en CivitAI",
            "viewOnHuggingFace": "Ver en Hugging Face",
+            "viewOnSource": "Ver en {source}",
            "sendToWorkflow": "Enviar a ComfyUI (Clic: Añadir, Shift+Clic: Reemplazar)",
            "copyLoRASyntax": "Copiar sintaxis de LoRA",
            "checkpointNameCopied": "Nombre del checkpoint copiado",
@@ -378,7 +382,9 @@
        "nav": {
            "general": "General",
            "interface": "Interfaz",
-            "library": "Biblioteca"
+            "library": "Biblioteca",
+            "organization": "Organización",
+            "modelPaths": "Rutas de modelos"
        },
        "search": {
            "placeholder": "Buscar ajustes...",
@@ -579,6 +585,46 @@
                "checkpointUnetOverlapInline": "Esta ruta ya se usa para otro tipo de modelo. Use carpetas separadas para checkpoints y modelos de difusión."
            }
        },
+        "modelPaths": {
+            "title": "Rutas de la biblioteca de modelos",
+            "description": "Carpetas raíz que LoRA Manager escanea en busca de tus modelos. Son las ubicaciones de modelos principales leídas de settings.json en modo independiente.",
+            "restartRequired": "Requiere reiniciar para que surta efecto",
+            "coreTypes": "Tipos de modelos principales",
+            "otherTypes": "Otros tipos de modelos",
+            "otherTypesDisabledHint": "No hay habilitado ningún otro tipo de modelo. Activa los tipos que necesites arriba para configurar sus carpetas.",
+            "saveSuccessRestart": "Rutas de la biblioteca de modelos actualizadas. Se requiere reinicio para aplicar los cambios.",
+            "pendingRestartNotice": "Cambios de rutas guardados. Reinicia LoRA Manager para que surtan efecto.",
+            "pendingRestartBannerTitle": "Se requiere reinicio para aplicar los cambios de rutas",
+            "pendingRestartBannerMessage": "Se actualizaron las rutas de la biblioteca de modelos. Reinicia el servidor de LoRA Manager para escanear las nuevas carpetas.",
+            "folderKeys": {
+                "loras": "Rutas de LoRA",
+                "checkpoints": "Rutas de Checkpoint",
+                "unet": "Rutas de modelo de difusión",
+                "embeddings": "Rutas de Embedding",
+                "vae": "Rutas de VAE",
+                "upscale_models": "Rutas de Upscaler",
+                "text_encoders": "Rutas de Text Encoder",
+                "clip": "Rutas de CLIP (heredadas)",
+                "clip_vision": "Rutas de CLIP Vision",
+                "controlnet": "Rutas de ControlNet"
+            }
+        },
+        "directoryPicker": {
+            "title": "Explorar carpetas",
+            "selectFolder": "Seleccionar esta carpeta",
+            "goUp": "Subir",
+            "pathPlaceholder": "Introducir ruta...",
+            "go": "Ir",
+            "emptyFolder": "No hay subcarpetas",
+            "loadError": "Error al cargar el directorio"
+        },
+        "pathValidation": {
+            "valid": "La ruta es válida",
+            "pathNotFound": "La ruta no existe",
+            "notADirectory": "No es un directorio",
+            "notReadable": "La ruta no es legible",
+            "notWritable": "La ruta no es escribible"
+        },
        "priorityTags": {
            "title": "Etiquetas prioritarias",
            "description": "Personaliza el orden de prioridad de etiquetas para cada tipo de modelo (p. ej., character, concept, style(toon|toon_style))",
@@ -635,6 +681,22 @@
                "validTemplate": "Plantilla válida"
            }
        },
+        "filenameTemplates": {
+            "title": "Plantillas de nombres de archivo",
+            "help": "Configurar nombres de archivo de los modelos descargados por tipo de modelo. Dejar vacío para conservar los nombres de archivo originales al descargar; aplicar una plantilla vacía restaura los nombres de archivo originales registrados de los modelos renombrados previamente. El nombre de archivo original siempre se conserva en los metadatos del modelo.",
+            "availablePlaceholders": "Marcadores de posición disponibles:",
+            "templatePlaceholder": "Introduce plantilla de nombre de archivo (ej., {base_model}-{model_name}-{version_name})",
+            "applyButton": "Aplicar a la biblioteca ahora",
+            "applyHelp": "Renombra todos los archivos existentes de este tipo de modelo según la plantilla; con una plantilla vacía, restaura los nombres de archivo originales registrados. Advertencia: renombrar cambia la ruta relativa que ven los cargadores de ComfyUI, por lo que los workflows existentes que hagan referencia al nombre de archivo anterior pueden necesitar actualizarse. El nombre de archivo original se conserva en los metadatos de cada modelo.",
+            "confirmApply": "¿Renombrar todos los archivos existentes de este tipo de modelo según la plantilla de nombres de archivo? Esto cambia la ruta relativa que ven los cargadores de ComfyUI. El nombre de archivo original se conserva en los metadatos de cada modelo.",
+            "confirmRevert": "¿Restaurar los nombres de archivo originales registrados de todos los archivos renombrados previamente de este tipo de modelo? Esto cambia la ruta relativa que ven los cargadores de ComfyUI. Los archivos sin un nombre de archivo original registrado se omiten.",
+            "validation": {
+                "restoreOriginal": "Válido (la plantilla vacía restaura los nombres de archivo originales)",
+                "invalidChars": "Caracteres inválidos detectados (un nombre de archivo no puede contener / \\ < > : \" | ? *)",
+                "invalidPlaceholder": "Marcador de posición inválido: {placeholder}",
+                "validTemplate": "Plantilla válida"
+            }
+        },
        "exampleImages": {
            "downloadLocation": "Ubicación de descarga",
            "downloadLocationPlaceholder": "Introduce la ruta de la carpeta para imágenes de ejemplo",
@@ -867,14 +929,22 @@
                "complete": "Auto-organización completada",
                "error": "Error: {error}"
            },
-            "enrichHfAgent": "Enriquecer metadatos HF (IA)"
+            "filenameTemplateProgress": {
+                "initializing": "Inicializando aplicación de plantilla de nombres de archivo...",
+                "starting": "Aplicando plantilla de nombres de archivo a {type}...",
+                "processing": "Procesando ({processed}/{total}) - {success} renombrados, {skipped} omitidos, {failures} fallidos",
+                "completed": "Completado: {success} renombrados, {skipped} omitidos, {failures} fallidos",
+                "complete": "Aplicación de plantilla de nombres de archivo completada",
+                "error": "Error: {error}"
+            },
+            "enrichHfAgent": "Enriquecer metadatos con IA"
        },
        "contextMenu": {
            "refreshMetadata": "Actualizar datos de CivitAI",
            "checkUpdates": "Comprobar actualizaciones",
            "linkModel": "Vincular modelo",
            "linkCivitai": "Re-vincular a CivitAI",
-            "linkHuggingFace": "Vincular a HuggingFace",
+            "linkModelSource": "Vincular a una fuente de modelo",
            "copySyntax": "Copiar sintaxis de LoRA",
            "copyFilename": "Copiar nombre de archivo del modelo",
            "copyRecipeSyntax": "Copiar sintaxis de receta",
@@ -896,7 +966,7 @@
            "viewAllLoras": "Ver todos los LoRAs",
            "downloadMissingLoras": "Descargar LoRAs faltantes",
            "deleteRecipe": "Eliminar receta",
-            "enrichHfAgent": "Enriquecer metadatos HF (IA)"
+            "enrichHfAgent": "Enriquecer metadatos con IA"
        }
    },
    "recipes": {
@@ -914,7 +984,9 @@
        },
        "modal": {
            "metadata": {
-                "id": "ID"
+                "id": "ID",
+                "baseModel": "Modelo base",
+                "unknown": "Desconocido"
            },
            "actions": {
                "openFileLocation": "Abrir ubicación del archivo",
@@ -1235,38 +1307,75 @@
        },
        "noPaths": {
            "title": "No se encontraron carpetas de otros modelos",
-            "descriptionStandalone": "La gestión de otros modelos está activada, pero ninguna de las carpetas de modelos configuradas existe en el disco. Añade las rutas de carpetas de abajo a settings.json y reinicia LoRA Manager.",
-            "hintStandalone": "Solo se escanean las claves de carpeta listadas arriba; las claves que no necesites puedes omitirlas.",
+            "descriptionStandalone": "La gestión de otros modelos está activada, pero no se encontraron carpetas de otros modelos. Añade tus carpetas de modelos en Configuración → Rutas de modelos y reinicia LoRA Manager.",
+            "hintStandalone": "Solo se escanean los tipos de modelos habilitados; activa los tipos que necesites en Biblioteca → Raíces predeterminadas.",
            "descriptionComfyUI": "La gestión de otros modelos está activada, pero ninguna de las carpetas de modelos configuradas existe en el disco. Añade las carpetas de modelos correspondientes a tus rutas de modelos de ComfyUI y recarga esta página.",
            "hintComfyUI": "Los otros modelos se leen de las carpetas vae, upscale_models, text_encoders, clip_vision y controlnet de ComfyUI.",
-            "openSettings": "Abrir configuración"
+            "openSettings": "Abrir configuración",
+            "openModelPaths": "Configurar carpetas de modelos",
+            "openSettingsFolder": "Abrir carpeta de ajustes"
        }
    },
    "sidebar": {
        "modelRoot": "Raíz",
        "collapseAll": "Colapsar todas las carpetas",
+        "collapseAllDisabled": "No disponible en la vista de lista",
        "hideOnThisPage": "Ocultar barra lateral en esta página",
        "showSidebar": "Mostrar barra lateral",
        "sidebarHiddenNotification": "Barra lateral oculta en la página {page}",
-        "switchToListView": "Cambiar a vista de lista",
-        "switchToTreeView": "Cambiar a vista de árbol",
+        "viewOptions": "Opciones de vista",
+        "treeView": "Vista de árbol",
+        "listView": "Vista de lista",
        "recursiveOn": "Incluir subcarpetas",
-        "recursiveOff": "Solo carpeta actual",
-        "recursiveUnavailable": "La búsqueda recursiva solo está disponible en la vista en árbol",
-        "collapseAllDisabled": "No disponible en vista de lista",
+        "createFolder": "Nueva carpeta",
+        "newSubfolder": "Nueva subcarpeta",
+        "showEmptyFolders": "Mostrar carpetas vacías",
+        "createFolderResult": {
+            "success": "Carpeta \"{name}\" creada",
+            "failed": "Error al crear la carpeta: {message}",
+            "unsupported": "La creación de carpetas no es compatible con esta página",
+            "noRoot": "No hay ninguna raíz de modelo configurada"
+        },
+        "deleteFolder": "Eliminar carpeta",
+        "deleteFolderModal": {
+            "title": "¿Eliminar carpeta?",
+            "message": "La carpeta y todo su contenido se eliminarán permanentemente del disco.",
+            "folderLabel": "Carpeta",
+            "emptyNote": "Esta carpeta no contiene modelos. Los demás archivos que contenga también se eliminarán.",
+            "notEmptyTitle": "La carpeta no está vacía",
+            "notEmptyMessage": "Esta carpeta aún contiene modelos. Elimínalos o muévelos primero — eliminar una carpeta nunca elimina los archivos de modelo en cascada.",
+            "confirm": "Eliminar carpeta"
+        },
+        "deleteFolderResult": {
+            "success": "Carpeta \"{name}\" eliminada",
+            "successWithFiles": "Carpeta \"{name}\" eliminada junto con {count} elemento(s) más",
+            "restored": "Carpeta restaurada",
+            "failed": "Error al eliminar la carpeta: {message}",
+            "notEmpty": "Esta carpeta aún contiene modelos. Actualiza la barra lateral e inténtalo de nuevo.",
+            "busy": "Todavía hay una eliminación pendiente dentro de esta carpeta. Espera a que caduque la ventana de deshacer.",
+            "unsupported": "La eliminación de carpetas no es compatible con esta página",
+            "noRoot": "No hay ninguna raíz de modelo configurada"
+        },
+        "renameFolder": "Cambiar nombre de la carpeta",
+        "renameFolderResult": {
+            "success": "Carpeta renombrada a \"{name}\"",
+            "failed": "Error al cambiar el nombre de la carpeta: {message}",
+            "targetExists": "Ya existe una carpeta con ese nombre aquí",
+            "busy": "Todavía hay una eliminación pendiente dentro de esta carpeta. Espera a que caduque la ventana de deshacer.",
+            "unsupported": "El cambio de nombre de carpetas no es compatible con esta página",
+            "noRoot": "No hay ninguna raíz de modelo configurada"
+        },
        "dragDrop": {
            "unableToResolveRoot": "No se puede determinar la ruta de destino para el movimiento.",
            "moveUnsupported": "El movimiento no es compatible con este elemento.",
-            "createFolderHint": "Suelta para crear una nueva carpeta",
            "newFolderName": "Nombre de la nueva carpeta",
-            "folderNameHint": "Presiona Enter para confirmar, Escape para cancelar",
            "emptyFolderName": "Por favor, introduce un nombre de carpeta",
            "invalidFolderName": "El nombre de la carpeta contiene caracteres no válidos",
            "noDragState": "No se encontró ninguna operación de arrastre pendiente"
        },
        "empty": {
            "noFolders": "No se encontraron carpetas",
-            "dragHint": "Arrastra elementos aquí para crear carpetas"
+            "createHint": "Haz clic en el botón Nueva carpeta de arriba para crear carpetas"
        },
        "folderUpdateCheck": {
            "label": "Buscar actualizaciones en esta carpeta",
@@ -1394,9 +1503,9 @@
        "download": {
            "title": "Descargar modelo desde URL",
            "titleWithType": "Descargar {type} desde URL",
-            "civitaiUrl": "URL de CivitAI:",
+            "civitaiUrl": "URL del modelo:",
            "placeholder": "https://civitai.com/models/...",
-            "urlHint": "Ingrese una URL de CivitAI, CivArchive o Hugging Face por línea. Admite múltiples URLs para descarga por lotes.",
+            "urlHint": "Ingrese una URL de CivitAI, CivArchive, Hugging Face o ModelScope por línea. Admite múltiples URLs para descarga por lotes.",
            "selectHfFiles": "Seleccione el/los archivo(s) para descargar de este repositorio:",
            "selectAll": "Seleccionar todo",
            "fetchingRepoFiles": "Obteniendo archivos del repositorio...",
@@ -1429,9 +1538,9 @@
                "inLibrary": "En la biblioteca"
            },
            "errors": {
-                "invalidUrl": "Formato de URL de CivitAI inválido",
+                "invalidUrl": "Formato de URL de modelo inválido",
                "noVersions": "No hay versiones disponibles para este modelo",
-                "mixedSources": "No se pueden mezclar URL de CivitAI y Hugging Face en el mismo lote.",
+                "mixedSources": "No se pueden mezclar URL de CivitAI y Hugging Face / ModelScope en el mismo lote.",
                "noModelFiles": "No se encontraron archivos de modelo en este repositorio."
            },
            "status": {
@@ -1445,6 +1554,10 @@
            "progress": {
                "currentFile": "Archivo actual:",
                "downloading": "Descargando: {name}",
+                "metadata": "Metadatos: {name}",
+                "indexingFile": "Leyendo el archivo de modelo...",
+                "fetchingSourceMetadata": "Obteniendo metadatos de {source}...",
+                "fetchingMetadata": "Obteniendo metadatos...",
                "transferred": "Descargado: {downloaded} / {total}",
                "transferredSimple": "Descargado: {downloaded}",
                "transferredUnknown": "Descargado: --",
@@ -1513,6 +1626,11 @@
            "tip": "¿Quieres hacerlo por partes? Activa el modo por lotes, selecciona los modelos que necesites y usa \"Comprobar actualizaciones para la selección\".",
            "action": "Comprobar todo"
        },
+        "filenameTemplateConfirm": {
+            "titleApply": "¿Aplicar la plantilla de nombres de archivo a la biblioteca?",
+            "titleRevert": "¿Restaurar los nombres de archivo originales?",
+            "revertButton": "Restaurar nombres de archivo originales"
+        },
        "bulkAddTags": {
            "title": "Añadir etiquetas a múltiples modelos",
            "description": "Añadir etiquetas a",
@@ -1596,12 +1714,16 @@
            "pathPlaceholder": "Escribe la ruta de la carpeta o selecciona del árbol de abajo...",
            "root": "Raíz"
        },
-        "linkHuggingFace": {
-            "title": "Vincular a HuggingFace",
-            "infoText": "Pegue la URL del repositorio de HuggingFace para asociar este modelo. Esto permite el enriquecimiento de metadatos con IA.",
-            "urlLabel": "URL del repositorio de HuggingFace:",
+        "linkModelSource": {
+            "title": "Vincular a una fuente de modelo",
+            "infoText": "Pegue la URL de la página del modelo para asociar este modelo con su fuente. La vinculación permite el enriquecimiento de metadatos con IA para modelos de Hugging Face y ModelScope.",
+            "urlLabel": "URL de la página del modelo:",
            "urlPlaceholder": "https://huggingface.co/user/repo",
-            "helpText": "Ingrese la URL completa del repositorio de HuggingFace.",
+            "helpText": "Ingrese la URL completa de la página del modelo. Sitios soportados:",
+            "enrichNote": "El enriquecimiento con IA necesita una ficha de modelo legible. Los sitios que no la exponen (actualmente TensorArt) solo se pueden vincular.",
+            "urlRequired": "Ingrese la URL de la página del modelo.",
+            "invalidUrl": "URL no soportada. Sitios soportados: Hugging Face, ModelScope, TensorArt.",
+            "linking": "Vinculando la fuente del modelo...",
            "confirmAction": "Guardar y vincular"
        },
        "relinkCivitai": {
@@ -1847,7 +1969,7 @@
                "empty": "Aún no hay historial de versiones para este modelo.",
                "error": "No se pudieron cargar las versiones.",
                "missingModelId": "Este modelo no tiene un ID de modelo de CivitAI.",
-                "hfGroupInfo": "Este es un grupo de modelos de HuggingFace. Abra la biblioteca para ver todas las versiones en la cuadrícula.",
+                "sourceGroupInfo": "Este es un grupo de modelos de {source}. Abra la biblioteca para ver todas las versiones en la cuadrícula.",
                "confirm": {
                    "delete": "¿Eliminar esta versión de tu biblioteca?"
                },
@@ -2218,6 +2340,9 @@
            "autoOrganizeSuccess": "Auto-organización completada exitosamente para {count} {type}",
            "autoOrganizePartialSuccess": "Auto-organización completada con {success} movidos, {failures} fallidos de un total de {total} modelos",
            "autoOrganizeFailed": "Auto-organización fallida: {error}",
+            "filenameTemplateSuccess": "Plantilla de nombres de archivo aplicada exitosamente para {count} {type}",
+            "filenameTemplatePartialSuccess": "Plantilla de nombres de archivo aplicada con {success} renombrados, {failures} fallidos de un total de {total} modelos",
+            "filenameTemplateFailed": "Aplicación de la plantilla de nombres de archivo fallida: {error}",
            "noModelsSelected": "No hay modelos seleccionados"
        },
        "recipes": {
@@ -2384,6 +2509,8 @@
            "mappingSaveFailed": "Error al guardar mapeos de modelo base: {message}",
            "downloadTemplatesUpdated": "Plantillas de rutas de descarga actualizadas",
            "downloadTemplatesFailed": "Error al guardar plantillas de rutas de descarga: {message}",
+            "filenameTemplatesUpdated": "Plantillas de nombres de archivo actualizadas",
+            "filenameTemplatesFailed": "Error al guardar plantillas de nombres de archivo: {message}",
            "recipesPathUpdated": "Ruta de almacenamiento de recetas actualizada",
            "recipesPathSaveFailed": "Error al actualizar la ruta de almacenamiento de recetas: {message}",
            "settingsUpdated": "Configuración actualizada: {setting}",
@@ -2483,7 +2610,9 @@
            "linkCivArchSuccess": "Modelo re-vinculado exitosamente mediante CivitArchive",
            "fetchMetadataFirst": "Por favor obtén metadatos de CivitAI primero",
            "noCivitaiInfo": "No hay información de CivitAI disponible",
-            "missingHash": "Hash del modelo no disponible"
+            "missingHash": "Hash del modelo no disponible",
+            "enrichNeedsSource": "Vincule este modelo a una fuente de modelo primero (Vincular modelo → Vincular a una fuente de modelo)",
+            "enrichUnsupportedSource": "El enriquecimiento con IA no está disponible para modelos de {source}"
        },
        "exampleImages": {
            "pathUpdated": "Ruta de imágenes de ejemplo actualizada exitosamente",
@@ -2647,6 +2776,11 @@
            "content": "Escanea y gestiona archivos VAE, Upscaler, Text Encoder, CLIP Vision y ControlNet, y descárgalos desde CivitAI, todo desde una página dedicada.",
            "enable": "Activar otros modelos",
            "openSettings": "Abrir configuración"
+        },
+        "pager": {
+            "previous": "Notificación anterior",
+            "next": "Notificación siguiente",
+            "position": "Notificación {current} de {total}"
        }
    }
 }
@@ -2,6 +2,9 @@
    "common": {
        "cancel": "Annuler",
        "confirm": "Confirmer",
+        "reorder": {
+            "dragHandle": "Glisser pour réordonner"
+        },
        "actions": {
            "save": "Enregistrer",
            "cancel": "Annuler",
@@ -139,6 +142,7 @@
            "viewOnCivitai": "Voir sur CivitAI",
            "notAvailableFromCivitai": "Non disponible sur CivitAI",
            "viewOnHuggingFace": "Voir sur Hugging Face",
+            "viewOnSource": "Voir sur {source}",
            "sendToWorkflow": "Envoyer vers ComfyUI (Clic: Ajouter, Maj+Clic: Remplacer)",
            "copyLoRASyntax": "Copier la syntaxe LoRA",
            "checkpointNameCopied": "Nom du checkpoint copié",
@@ -378,7 +382,9 @@
        "nav": {
            "general": "Général",
            "interface": "Interface",
-            "library": "Bibliothèque"
+            "library": "Bibliothèque",
+            "organization": "Organisation",
+            "modelPaths": "Chemins de modèles"
        },
        "search": {
            "placeholder": "Rechercher dans les paramètres...",
@@ -579,6 +585,46 @@
                "checkpointUnetOverlapInline": "Ce chemin est déjà utilisé pour un autre type de modèle. Utilisez des dossiers séparés pour les checkpoints et les modèles de diffusion."
            }
        },
+        "modelPaths": {
+            "title": "Chemins de la bibliothèque de modèles",
+            "description": "Dossiers racine que LoRA Manager analyse pour trouver vos modèles. Ce sont les emplacements de modèles principaux lus depuis settings.json en mode autonome.",
+            "restartRequired": "Un redémarrage est requis pour appliquer les changements",
+            "coreTypes": "Types de modèles principaux",
+            "otherTypes": "Autres types de modèles",
+            "otherTypesDisabledHint": "Aucun autre type de modèle n’est activé. Activez les types dont vous avez besoin ci-dessus pour configurer leurs dossiers.",
+            "saveSuccessRestart": "Chemins de la bibliothèque de modèles mis à jour. Redémarrage requis pour appliquer les changements.",
+            "pendingRestartNotice": "Changements de chemins enregistrés. Redémarrez LoRA Manager pour qu’ils prennent effet.",
+            "pendingRestartBannerTitle": "Redémarrage requis pour appliquer les changements de chemins",
+            "pendingRestartBannerMessage": "Les chemins de la bibliothèque de modèles ont été mis à jour. Redémarrez le serveur LoRA Manager pour analyser les nouveaux dossiers.",
+            "folderKeys": {
+                "loras": "Chemins LoRA",
+                "checkpoints": "Chemins Checkpoint",
+                "unet": "Chemins de modèle de diffusion",
+                "embeddings": "Chemins Embedding",
+                "vae": "Chemins VAE",
+                "upscale_models": "Chemins Upscaler",
+                "text_encoders": "Chemins Text Encoder",
+                "clip": "Chemins CLIP (hérité)",
+                "clip_vision": "Chemins CLIP Vision",
+                "controlnet": "Chemins ControlNet"
+            }
+        },
+        "directoryPicker": {
+            "title": "Parcourir les dossiers",
+            "selectFolder": "Sélectionner ce dossier",
+            "goUp": "Remonter",
+            "pathPlaceholder": "Saisir un chemin...",
+            "go": "Aller",
+            "emptyFolder": "Aucun sous-dossier",
+            "loadError": "Échec du chargement du dossier"
+        },
+        "pathValidation": {
+            "valid": "Le chemin est valide",
+            "pathNotFound": "Le chemin n’existe pas",
+            "notADirectory": "N’est pas un dossier",
+            "notReadable": "Le chemin n’est pas lisible",
+            "notWritable": "Le chemin n’est pas accessible en écriture"
+        },
        "priorityTags": {
            "title": "Tags prioritaires",
            "description": "Personnalisez l'ordre de priorité des tags pour chaque type de modèle (par ex. : character, concept, style(toon|toon_style))",
@@ -635,6 +681,22 @@
                "validTemplate": "Modèle valide"
            }
        },
+        "filenameTemplates": {
+            "title": "Modèles de nom de fichier",
+            "help": "Configurer les noms de fichier des modèles téléchargés par type de modèle. Laisser vide pour conserver le nom de fichier d'origine. Le nom de fichier d'origine est toujours conservé dans les métadonnées du modèle.",
+            "availablePlaceholders": "Espaces réservés disponibles :",
+            "templatePlaceholder": "Entrez un modèle de nom de fichier (ex: {base_model}-{model_name}-{version_name})",
+            "applyButton": "Appliquer à la bibliothèque maintenant",
+            "applyHelp": "Renomme tous les fichiers existants de ce type de modèle selon le modèle. Attention : le renommage change le chemin relatif vu par les loaders ComfyUI, les workflows existants référençant l'ancien nom de fichier peuvent donc nécessiter une mise à jour. Le nom de fichier d'origine est conservé dans les métadonnées de chaque modèle.",
+            "confirmApply": "Renommer tous les fichiers existants de ce type de modèle selon le modèle de nom de fichier ? Cela change le chemin relatif vu par les loaders ComfyUI. Le nom de fichier d'origine est conservé dans les métadonnées de chaque modèle.",
+            "confirmRevert": "Restaurer les noms de fichier d'origine enregistrés de tous les fichiers précédemment renommés de ce type de modèle ? Cela change le chemin relatif vu par les loaders ComfyUI. Les fichiers sans nom de fichier d'origine enregistré sont ignorés.",
+            "validation": {
+                "restoreOriginal": "Valide (un modèle vide restaure les noms de fichier d'origine)",
+                "invalidChars": "Caractères invalides détectés (un nom de fichier ne peut pas contenir / \\ < > : \" | ? *)",
+                "invalidPlaceholder": "Espace réservé invalide : {placeholder}",
+                "validTemplate": "Modèle valide"
+            }
+        },
        "exampleImages": {
            "downloadLocation": "Emplacement de téléchargement",
            "downloadLocationPlaceholder": "Entrez le chemin du dossier pour les images d'exemple",
@@ -867,14 +929,22 @@
                "complete": "Auto-organisation terminée",
                "error": "Erreur : {error}"
            },
-            "enrichHfAgent": "Enrichir les métadonnées HF (IA)"
+            "filenameTemplateProgress": {
+                "initializing": "Initialisation de l'application du modèle de nom de fichier...",
+                "starting": "Application du modèle de nom de fichier pour {type}...",
+                "processing": "Traitement ({processed}/{total}) - {success} renommés, {skipped} ignorés, {failures} échecs",
+                "completed": "Terminé : {success} renommés, {skipped} ignorés, {failures} échecs",
+                "complete": "Application du modèle de nom de fichier terminée",
+                "error": "Erreur : {error}"
+            },
+            "enrichHfAgent": "Enrichir les métadonnées avec l'IA"
        },
        "contextMenu": {
            "refreshMetadata": "Actualiser les données CivitAI",
            "checkUpdates": "Vérifier les mises à jour",
            "linkModel": "Lier le modèle",
            "linkCivitai": "Relier à nouveau à CivitAI",
-            "linkHuggingFace": "Lier à HuggingFace",
+            "linkModelSource": "Lier à une source de modèle",
            "copySyntax": "Copier la syntaxe LoRA",
            "copyFilename": "Copier le nom de fichier du modèle",
            "copyRecipeSyntax": "Copier la syntaxe de la recipe",
@@ -896,7 +966,7 @@
            "viewAllLoras": "Voir tous les LoRAs",
            "downloadMissingLoras": "Télécharger les LoRAs manquants",
            "deleteRecipe": "Supprimer la recipe",
-            "enrichHfAgent": "Enrichir les métadonnées HF (IA)"
+            "enrichHfAgent": "Enrichir les métadonnées avec l'IA"
        }
    },
    "recipes": {
@@ -914,7 +984,9 @@
        },
        "modal": {
            "metadata": {
-                "id": "ID"
+                "id": "ID",
+                "baseModel": "Modèle de base",
+                "unknown": "Inconnu"
            },
            "actions": {
                "openFileLocation": "Ouvrir l’emplacement du fichier",
@@ -1235,38 +1307,75 @@
        },
        "noPaths": {
            "title": "Aucun dossier d’autres modèles trouvé",
-            "descriptionStandalone": "La gestion des autres modèles est activée, mais aucun des dossiers de modèles configurés n’existe sur le disque. Ajoutez les chemins de dossiers ci-dessous à settings.json, puis redémarrez LoRA Manager.",
-            "hintStandalone": "Seules les clés de dossiers listées ci-dessus sont analysées ; les clés inutiles peuvent être omises.",
+            "descriptionStandalone": "La gestion des autres modèles est activée, mais aucun dossier d’autres modèles n’a été trouvé. Ajoutez vos dossiers de modèles dans Paramètres → Chemins de modèles, puis redémarrez LoRA Manager.",
+            "hintStandalone": "Seuls les types de modèles activés sont analysés ; activez les types dont vous avez besoin dans Bibliothèque → Racines par défaut.",
            "descriptionComfyUI": "La gestion des autres modèles est activée, mais aucun des dossiers de modèles configurés n’existe sur le disque. Ajoutez les dossiers de modèles correspondants à vos chemins de modèles ComfyUI, puis rechargez cette page.",
            "hintComfyUI": "Les autres modèles sont lus depuis les dossiers vae, upscale_models, text_encoders, clip_vision et controlnet de ComfyUI.",
-            "openSettings": "Ouvrir les paramètres"
+            "openSettings": "Ouvrir les paramètres",
+            "openModelPaths": "Configurer les dossiers de modèles",
+            "openSettingsFolder": "Ouvrir le dossier des paramètres"
        }
    },
    "sidebar": {
        "modelRoot": "Racine",
        "collapseAll": "Réduire tous les dossiers",
+        "collapseAllDisabled": "Non disponible en vue liste",
        "hideOnThisPage": "Masquer la barre latérale sur cette page",
        "showSidebar": "Afficher la barre latérale",
        "sidebarHiddenNotification": "Barre latérale masquée sur la page {page}",
-        "switchToListView": "Passer en vue liste",
-        "switchToTreeView": "Passer en vue arborescence",
+        "viewOptions": "Options d’affichage",
+        "treeView": "Vue arborescente",
+        "listView": "Vue liste",
        "recursiveOn": "Inclure les sous-dossiers",
-        "recursiveOff": "Dossier actuel uniquement",
-        "recursiveUnavailable": "La recherche récursive n'est disponible qu'en vue arborescente",
-        "collapseAllDisabled": "Non disponible en vue liste",
+        "createFolder": "Nouveau dossier",
+        "newSubfolder": "Nouveau sous-dossier",
+        "showEmptyFolders": "Afficher les dossiers vides",
+        "createFolderResult": {
+            "success": "Dossier \"{name}\" créé",
+            "failed": "Échec de la création du dossier : {message}",
+            "unsupported": "La création de dossiers n’est pas prise en charge sur cette page",
+            "noRoot": "Aucune racine de modèle n’est configurée"
+        },
+        "deleteFolder": "Supprimer le dossier",
+        "deleteFolderModal": {
+            "title": "Supprimer le dossier ?",
+            "message": "Le dossier et tout son contenu seront définitivement supprimés du disque.",
+            "folderLabel": "Dossier",
+            "emptyNote": "Ce dossier ne contient aucun modèle. Les autres fichiers qu’il contient seront également supprimés.",
+            "notEmptyTitle": "Le dossier n’est pas vide",
+            "notEmptyMessage": "Ce dossier contient encore des modèles. Supprimez-les ou déplacez-les d’abord — la suppression d’un dossier n’entraîne jamais celle des fichiers de modèles.",
+            "confirm": "Supprimer le dossier"
+        },
+        "deleteFolderResult": {
+            "success": "Dossier \"{name}\" supprimé",
+            "successWithFiles": "Dossier \"{name}\" supprimé, ainsi que {count} autre(s) élément(s)",
+            "restored": "Dossier restauré",
+            "failed": "Échec de la suppression du dossier : {message}",
+            "notEmpty": "Ce dossier contient encore des modèles. Actualisez la barre latérale et réessayez.",
+            "busy": "Une suppression est encore en attente dans ce dossier. Attendez la fin de la fenêtre d’annulation.",
+            "unsupported": "La suppression de dossiers n’est pas prise en charge sur cette page",
+            "noRoot": "Aucune racine de modèle n’est configurée"
+        },
+        "renameFolder": "Renommer le dossier",
+        "renameFolderResult": {
+            "success": "Dossier renommé en \"{name}\"",
+            "failed": "Échec du renommage du dossier : {message}",
+            "targetExists": "Un dossier portant ce nom existe déjà ici",
+            "busy": "Une suppression est encore en attente dans ce dossier. Attendez la fin de la fenêtre d’annulation.",
+            "unsupported": "Le renommage de dossiers n’est pas pris en charge sur cette page",
+            "noRoot": "Aucune racine de modèle n’est configurée"
+        },
        "dragDrop": {
            "unableToResolveRoot": "Impossible de déterminer le chemin de destination pour le déplacement.",
            "moveUnsupported": "Le déplacement n'est pas pris en charge pour cet élément.",
-            "createFolderHint": "Relâcher pour créer un nouveau dossier",
            "newFolderName": "Nom du nouveau dossier",
-            "folderNameHint": "Appuyez sur Entrée pour confirmer, Échap pour annuler",
            "emptyFolderName": "Veuillez saisir un nom de dossier",
            "invalidFolderName": "Le nom du dossier contient des caractères invalides",
            "noDragState": "Aucune opération de glissement en attente trouvée"
        },
        "empty": {
            "noFolders": "Aucun dossier trouvé",
-            "dragHint": "Faites glisser des éléments ici pour créer des dossiers"
+            "createHint": "Cliquez sur le bouton Nouveau dossier ci-dessus pour créer des dossiers"
        },
        "folderUpdateCheck": {
            "label": "Vérifier les mises à jour dans ce dossier",
@@ -1394,9 +1503,9 @@
        "download": {
            "title": "Télécharger un modèle depuis une URL",
            "titleWithType": "Télécharger {type} depuis une URL",
-            "civitaiUrl": "URL CivitAI :",
+            "civitaiUrl": "URL du modèle :",
            "placeholder": "https://civitai.com/models/...",
-            "urlHint": "Entrez une URL CivitAI, CivArchive ou Hugging Face par ligne. Prend en charge plusieurs URL pour le téléchargement par lot.",
+            "urlHint": "Entrez une URL CivitAI, CivArchive, Hugging Face ou ModelScope par ligne. Prend en charge plusieurs URL pour le téléchargement par lot.",
            "selectHfFiles": "Sélectionnez le(s) fichier(s) à télécharger depuis ce dépôt :",
            "selectAll": "Tout sélectionner",
            "fetchingRepoFiles": "Récupération des fichiers du dépôt...",
@@ -1429,9 +1538,9 @@
                "inLibrary": "Dans la bibliothèque"
            },
            "errors": {
-                "invalidUrl": "Format d'URL CivitAI invalide",
+                "invalidUrl": "Format d'URL de modèle invalide",
                "noVersions": "Aucune version disponible pour ce modèle",
-                "mixedSources": "Impossible de mélanger les URL CivitAI et Hugging Face dans le même lot.",
+                "mixedSources": "Impossible de mélanger les URL CivitAI et Hugging Face / ModelScope dans le même lot.",
                "noModelFiles": "Aucun fichier de modèle trouvé dans ce dépôt."
            },
            "status": {
@@ -1445,6 +1554,10 @@
            "progress": {
                "currentFile": "Fichier actuel :",
                "downloading": "Téléchargement : {name}",
+                "metadata": "Métadonnées : {name}",
+                "indexingFile": "Lecture du fichier de modèle...",
+                "fetchingSourceMetadata": "Récupération des métadonnées depuis {source}...",
+                "fetchingMetadata": "Récupération des métadonnées...",
                "transferred": "Téléchargé : {downloaded} / {total}",
                "transferredSimple": "Téléchargé : {downloaded}",
                "transferredUnknown": "Téléchargé : --",
@@ -1513,6 +1626,11 @@
            "tip": "Besoin de procéder par étapes ? Passez en mode groupé, sélectionnez les modèles souhaités puis utilisez \"Vérifier les mises à jour pour la sélection\".",
            "action": "Tout vérifier"
        },
+        "filenameTemplateConfirm": {
+            "titleApply": "Appliquer le modèle de nom de fichier à la bibliothèque ?",
+            "titleRevert": "Restaurer les noms de fichier d'origine ?",
+            "revertButton": "Restaurer les noms de fichier d'origine"
+        },
        "bulkAddTags": {
            "title": "Ajouter des tags à plusieurs modèles",
            "description": "Ajouter des tags à",
@@ -1596,12 +1714,16 @@
            "pathPlaceholder": "Tapez le chemin du dossier ou sélectionnez dans l'arbre ci-dessous...",
            "root": "Racine"
        },
-        "linkHuggingFace": {
-            "title": "Lier à HuggingFace",
-            "infoText": "Collez l'URL du dépôt HuggingFace pour associer ce modèle à sa source. Cela permet l'enrichissement des métadonnées par IA.",
-            "urlLabel": "URL du dépôt HuggingFace :",
+        "linkModelSource": {
+            "title": "Lier à une source de modèle",
+            "infoText": "Collez l'URL de la page du modèle pour associer ce modèle à sa source. La liaison permet l'enrichissement des métadonnées par IA pour les modèles Hugging Face et ModelScope.",
+            "urlLabel": "URL de la page du modèle :",
            "urlPlaceholder": "https://huggingface.co/user/repo",
-            "helpText": "Entrez l'URL complète du dépôt HuggingFace.",
+            "helpText": "Entrez l'URL complète de la page du modèle. Sites pris en charge :",
+            "enrichNote": "L'enrichissement par IA nécessite une fiche de modèle lisible. Les sites qui n'en exposent pas (actuellement TensorArt) ne peuvent être que liés.",
+            "urlRequired": "Veuillez saisir l'URL de la page du modèle.",
+            "invalidUrl": "URL non prise en charge. Sites pris en charge : Hugging Face, ModelScope, TensorArt.",
+            "linking": "Liaison de la source du modèle...",
            "confirmAction": "Enregistrer & lier"
        },
        "relinkCivitai": {
@@ -1847,7 +1969,7 @@
                "empty": "Aucun historique de versions n'est disponible pour ce modèle pour le moment.",
                "error": "Échec du chargement des versions.",
                "missingModelId": "Ce modèle ne possède pas d'identifiant de modèle CivitAI.",
-                "hfGroupInfo": "Ceci est un groupe de modèles HuggingFace. Ouvrez la bibliothèque pour voir toutes les versions dans la grille.",
+                "sourceGroupInfo": "Ceci est un groupe de modèles {source}. Ouvrez la bibliothèque pour voir toutes les versions dans la grille.",
                "confirm": {
                    "delete": "Supprimer cette version de votre bibliothèque ?"
                },
@@ -2218,6 +2340,9 @@
            "autoOrganizeSuccess": "Auto-organisation terminée avec succès pour {count} {type}",
            "autoOrganizePartialSuccess": "Auto-organisation terminée avec {success} déplacés, {failures} échecs sur {total} modèles",
            "autoOrganizeFailed": "Échec de l'auto-organisation : {error}",
+            "filenameTemplateSuccess": "Modèle de nom de fichier appliqué avec succès pour {count} {type}",
+            "filenameTemplatePartialSuccess": "Modèle de nom de fichier appliqué avec {success} renommés, {failures} échecs sur {total} modèles",
+            "filenameTemplateFailed": "Échec de l'application du modèle de nom de fichier : {error}",
            "noModelsSelected": "Aucun modèle sélectionné"
        },
        "recipes": {
@@ -2384,6 +2509,8 @@
            "mappingSaveFailed": "Échec de la sauvegarde des mappages de modèle de base : {message}",
            "downloadTemplatesUpdated": "Modèles de chemin de téléchargement mis à jour",
            "downloadTemplatesFailed": "Échec de la sauvegarde des modèles de chemin de téléchargement : {message}",
+            "filenameTemplatesUpdated": "Modèles de nom de fichier mis à jour",
+            "filenameTemplatesFailed": "Échec de la sauvegarde des modèles de nom de fichier : {message}",
            "recipesPathUpdated": "Chemin de stockage des Recipes mis à jour",
            "recipesPathSaveFailed": "Échec de la mise à jour du chemin de stockage des Recipes : {message}",
            "settingsUpdated": "Paramètres mis à jour : {setting}",
@@ -2483,7 +2610,9 @@
            "linkCivArchSuccess": "Modèle relié via CivitArchive avec succès",
            "fetchMetadataFirst": "Veuillez d'abord récupérer les métadonnées depuis CivitAI",
            "noCivitaiInfo": "Aucune information CivitAI disponible",
-            "missingHash": "Hash du modèle non disponible"
+            "missingHash": "Hash du modèle non disponible",
+            "enrichNeedsSource": "Liez d'abord ce modèle à une source de modèle (Lier le modèle → Lier à une source de modèle)",
+            "enrichUnsupportedSource": "L'enrichissement par IA n'est pas disponible pour les modèles {source}"
        },
        "exampleImages": {
            "pathUpdated": "Chemin des images d'exemple mis à jour avec succès",
@@ -2647,6 +2776,11 @@
            "content": "Analysez et gérez les fichiers VAE, Upscaler, Text Encoder, CLIP Vision et ControlNet, et téléchargez-les depuis CivitAI, le tout depuis une page dédiée.",
            "enable": "Activer les autres modèles",
            "openSettings": "Ouvrir les paramètres"
+        },
+        "pager": {
+            "previous": "Message précédent",
+            "next": "Message suivant",
+            "position": "Message {current} sur {total}"
        }
    }
 }
@@ -2,6 +2,9 @@
    "common": {
        "cancel": "ביטול",
        "confirm": "אישור",
+        "reorder": {
+            "dragHandle": "גרור כדי לשנות סדר"
+        },
        "actions": {
            "save": "שמירה",
            "cancel": "ביטול",
@@ -139,6 +142,7 @@
            "viewOnCivitai": "הצג ב-CivitAI",
            "notAvailableFromCivitai": "לא זמין מ-CivitAI",
            "viewOnHuggingFace": "צפייה ב-Hugging Face",
+            "viewOnSource": "צפייה ב-{source}",
            "sendToWorkflow": "שלח ל-ComfyUI (לחיצה: הוסף, Shift+לחיצה: החלף)",
            "copyLoRASyntax": "העתק תחביר LoRA",
            "checkpointNameCopied": "שם Checkpoint הועתק",
@@ -378,7 +382,9 @@
        "nav": {
            "general": "כללי",
            "interface": "ממשק",
-            "library": "ספרייה"
+            "library": "ספרייה",
+            "organization": "ארגון",
+            "modelPaths": "נתיבי מודלים"
        },
        "search": {
            "placeholder": "חיפוש בהגדרות...",
@@ -579,6 +585,46 @@
                "checkpointUnetOverlapInline": "הנתיב הזה כבר נמצא בשימוש עבור סוג מודל אחר. יש להשתמש בתיקיות נפרדות עבור checkpoints ומודלי דיפוזיה."
            }
        },
+        "modelPaths": {
+            "title": "נתיבי ספריית המודלים",
+            "description": "תיקיות שורש ש-LoRA Manager סורק לאיתור המודלים שלך. אלו מיקומי המודלים הראשיים הנקראים מ-settings.json במצב עצמאי.",
+            "restartRequired": "נדרש אתחול כדי שהשינוי ייכנס לתוקף",
+            "coreTypes": "סוגי מודלים מרכזיים",
+            "otherTypes": "סוגי מודלים אחרים",
+            "otherTypesDisabledHint": "לא מופעלים סוגי מודלים אחרים. הפעל למעלה את הסוגים הדרושים לך כדי להגדיר את התיקיות שלהם.",
+            "saveSuccessRestart": "נתיבי ספריית המודלים עודכנו. נדרשת הפעלה מחדש כדי להחיל את השינויים.",
+            "pendingRestartNotice": "שינויי הנתיבים נשמרו. הפעל מחדש את LoRA Manager כדי שייכנסו לתוקף.",
+            "pendingRestartBannerTitle": "נדרשת הפעלה מחדש כדי להחיל את שינויי הנתיבים",
+            "pendingRestartBannerMessage": "נתיבי ספריית המודלים עודכנו. הפעל מחדש את שרת LoRA Manager כדי לסרוק את התיקיות החדשות.",
+            "folderKeys": {
+                "loras": "נתיבי LoRA",
+                "checkpoints": "נתיבי Checkpoint",
+                "unet": "נתיבי מודל דיפוזיה",
+                "embeddings": "נתיבי Embedding",
+                "vae": "נתיבי VAE",
+                "upscale_models": "נתיבי Upscaler",
+                "text_encoders": "נתיבי Text Encoder",
+                "clip": "נתיבי CLIP (ישן)",
+                "clip_vision": "נתיבי CLIP Vision",
+                "controlnet": "נתיבי ControlNet"
+            }
+        },
+        "directoryPicker": {
+            "title": "עיון בתיקיות",
+            "selectFolder": "בחר תיקייה זו",
+            "goUp": "למעלה",
+            "pathPlaceholder": "הזן נתיב...",
+            "go": "עבור",
+            "emptyFolder": "אין תתי-תיקיות",
+            "loadError": "טעינת התיקייה נכשלה"
+        },
+        "pathValidation": {
+            "valid": "הנתיב תקין",
+            "pathNotFound": "הנתיב לא קיים",
+            "notADirectory": "לא תיקייה",
+            "notReadable": "הנתיב לא ניתן לקריאה",
+            "notWritable": "הנתיב לא ניתן לכתיבה"
+        },
        "priorityTags": {
            "title": "תגיות עדיפות",
            "description": "התאם את סדר העדיפות של התגיות עבור כל סוג מודל (לדוגמה: character, concept, style(toon|toon_style))",
@@ -635,6 +681,22 @@
                "validTemplate": "תבנית תקינה"
            }
        },
+        "filenameTemplates": {
+            "title": "תבניות שמות קבצים",
+            "help": "הגדר שמות קבצים למודלים שהורדו לפי סוג מודל. השאר ריק כדי לשמור על שמות הקבצים המקוריים בעת ההורדה; החלת תבנית ריקה משחזרת את שמות הקבצים המקוריים המתועדים של מודלים ששונה שמם בעבר. שם הקובץ המקורי תמיד נשמר במטא-נתונים של המודל.",
+            "availablePlaceholders": "מצייני מקום זמינים:",
+            "templatePlaceholder": "הזן תבנית שם קובץ (למשל, {base_model}-{model_name}-{version_name})",
+            "applyButton": "החל על הספרייה כעת",
+            "applyHelp": "משנה את שמות כל הקבצים הקיימים מסוג מודל זה בהתאם לתבנית; עם תבנית ריקה, משחזר במקום זאת את שמות הקבצים המקוריים המתועדים. אזהרה: שינוי שם משנה את הנתיב היחסי שרואים הטוענים של ComfyUI, ולכן workflows קיימים המפנים לשם הקובץ הישן עשויים לדרוש עדכון. שם הקובץ המקורי נשמר במטא-נתונים של כל מודל.",
+            "confirmApply": "לשנות את שמות כל הקבצים הקיימים מסוג מודל זה בהתאם לתבנית שם הקובץ? פעולה זו משנה את הנתיב היחסי שרואים הטוענים של ComfyUI. שם הקובץ המקורי נשמר במטא-נתונים של כל מודל.",
+            "confirmRevert": "לשחזר את שמות הקבצים המקוריים המתועדים של כל הקבצים ששונה שמם בעבר מסוג מודל זה? פעולה זו משנה את הנתיב היחסי שרואים הטוענים של ComfyUI. קבצים ללא שם קובץ מקורי מתועד ידולגו.",
+            "validation": {
+                "restoreOriginal": "תקין (תבנית ריקה משחזרת שמות קבצים מקוריים)",
+                "invalidChars": "זוהו תווים לא חוקיים (שם קובץ אינו יכול להכיל / \\ < > : \" | ? *)",
+                "invalidPlaceholder": "מציין מקום לא חוקי: {placeholder}",
+                "validTemplate": "תבנית תקינה"
+            }
+        },
        "exampleImages": {
            "downloadLocation": "מיקום הורדה",
            "downloadLocationPlaceholder": "הזן נתיב תיקייה לתמונות דוגמה",
@@ -867,14 +929,22 @@
                "complete": "ארגון אוטומטי הושלם",
                "error": "שגיאה: {error}"
            },
-            "enrichHfAgent": "העשרת HF מטא-נתונים (AI)"
+            "filenameTemplateProgress": {
+                "initializing": "מאתחל החלת תבנית שם קובץ...",
+                "starting": "מחיל תבנית שם קובץ על {type}...",
+                "processing": "מעבד ({processed}/{total}) - {success} שונו שמותם, {skipped} דולגו, {failures} נכשלו",
+                "completed": "הושלם: {success} שונו שמותם, {skipped} דולגו, {failures} נכשלו",
+                "complete": "החלת תבנית שם הקובץ הושלמה",
+                "error": "שגיאה: {error}"
+            },
+            "enrichHfAgent": "העשרת מטא-נתונים ב-AI"
        },
        "contextMenu": {
            "refreshMetadata": "רענן נתוני CivitAI",
            "checkUpdates": "בדוק עדכונים",
            "linkModel": "קישור מודל",
            "linkCivitai": "קשר מחדש ל-CivitAI",
-            "linkHuggingFace": "קישור ל-HuggingFace",
+            "linkModelSource": "קישור למקור מודל",
            "copySyntax": "העתק תחביר LoRA",
            "copyFilename": "העתק שם קובץ מודל",
            "copyRecipeSyntax": "העתק תחביר מתכון",
@@ -896,7 +966,7 @@
            "viewAllLoras": "הצג את כל ה-LoRAs",
            "downloadMissingLoras": "הורד LoRAs חסרים",
            "deleteRecipe": "מחק מתכון",
-            "enrichHfAgent": "העשרת HF מטא-נתונים (AI)"
+            "enrichHfAgent": "העשרת מטא-נתונים ב-AI"
        }
    },
    "recipes": {
@@ -914,7 +984,9 @@
        },
        "modal": {
            "metadata": {
-                "id": "ID"
+                "id": "ID",
+                "baseModel": "מודל בסיס",
+                "unknown": "לא ידוע"
            },
            "actions": {
                "openFileLocation": "פתח מיקום קובץ",
@@ -1235,38 +1307,75 @@
        },
        "noPaths": {
            "title": "לא נמצאו תיקיות של מודלים אחרים",
-            "descriptionStandalone": "ניהול המודלים האחרים פועל, אך אף אחת מתיקיות המודלים המוגדרות אינה קיימת בדיסק. הוסף את נתיבי התיקיות שלמטה ל-settings.json והפעל מחדש את LoRA Manager.",
-            "hintStandalone": "רק מפתחות התיקיות המפורטים למעלה נסרקים; ניתן להשמיט מפתחות שאינך צריך.",
+            "descriptionStandalone": "ניהול המודלים האחרים פועל, אך לא נמצאו תיקיות של מודלים אחרים. הוסף את תיקיות המודלים שלך תחת הגדרות > נתיבי מודלים, ולאחר מכן הפעל מחדש את LoRA Manager.",
+            "hintStandalone": "נסרקים רק סוגי מודלים מופעלים; הפעל את הסוגים הדרושים לך תחת ספרייה > תיקיות ברירת מחדל.",
            "descriptionComfyUI": "ניהול המודלים האחרים פועל, אך אף אחת מתיקיות המודלים המוגדרות אינה קיימת בדיסק. הוסף את תיקיות המודלים המתאימות לנתיבי המודלים של ComfyUI וטען מחדש עמוד זה.",
            "hintComfyUI": "מודלים אחרים נקראים מתיקיות vae, upscale_models, text_encoders, clip_vision ו-controlnet של ComfyUI.",
-            "openSettings": "פתח הגדרות"
+            "openSettings": "פתח הגדרות",
+            "openModelPaths": "הגדר תיקיות מודלים",
+            "openSettingsFolder": "פתח תיקיית הגדרות"
        }
    },
    "sidebar": {
        "modelRoot": "שורש",
        "collapseAll": "כווץ את כל התיקיות",
+        "collapseAllDisabled": "לא זמין בתצוגת רשימה",
        "hideOnThisPage": "הסתר סרגל צד בדף זה",
        "showSidebar": "הצג סרגל צד",
        "sidebarHiddenNotification": "סרגל הצד מוסתר בדף {page}",
-        "switchToListView": "עבור לתצוגת רשימה",
-        "switchToTreeView": "תצוגת עץ",
+        "viewOptions": "אפשרויות תצוגה",
+        "treeView": "תצוגת עץ",
+        "listView": "תצוגת רשימה",
        "recursiveOn": "כלול תיקיות משנה",
-        "recursiveOff": "רק התיקייה הנוכחית",
-        "recursiveUnavailable": "חיפוש רקורסיבי זמין רק בתצוגת עץ",
-        "collapseAllDisabled": "לא זמין בתצוגת רשימה",
+        "createFolder": "תיקייה חדשה",
+        "newSubfolder": "תיקיית משנה חדשה",
+        "showEmptyFolders": "הצג תיקיות ריקות",
+        "createFolderResult": {
+            "success": "התיקייה \"{name}\" נוצרה",
+            "failed": "יצירת התיקייה נכשלה: {message}",
+            "unsupported": "יצירת תיקיות אינה נתמכת בדף זה",
+            "noRoot": "לא הוגדר שורש מודלים"
+        },
+        "deleteFolder": "מחק תיקייה",
+        "deleteFolderModal": {
+            "title": "למחוק את התיקייה?",
+            "message": "התיקייה וכל תוכנה יימחקו לצמיתות מהדיסק.",
+            "folderLabel": "תיקייה",
+            "emptyNote": "אין מודלים בתיקייה זו. קבצים אחרים שבה יימחקו גם הם.",
+            "notEmptyTitle": "התיקייה אינה ריקה",
+            "notEmptyMessage": "בתיקייה זו עדיין יש מודלים. מחק או העבר אותם תחילה — מחיקת תיקייה לעולם אינה מוחקת קובצי מודלים.",
+            "confirm": "מחק תיקייה"
+        },
+        "deleteFolderResult": {
+            "success": "התיקייה \"{name}\" נמחקה",
+            "successWithFiles": "התיקייה \"{name}\" נמחקה יחד עם {count} פריטים נוספים",
+            "restored": "התיקייה שוחזרה",
+            "failed": "מחיקת התיקייה נכשלה: {message}",
+            "notEmpty": "בתיקייה זו עדיין יש מודלים. רענן את סרגל הצד ונסה שוב.",
+            "busy": "מחיקה עדיין ממתינה בתיקייה זו. המתן לסיום חלון הביטול.",
+            "unsupported": "מחיקת תיקיות אינה נתמכת בדף זה",
+            "noRoot": "לא הוגדר שורש מודלים"
+        },
+        "renameFolder": "שנה שם תיקייה",
+        "renameFolderResult": {
+            "success": "שם התיקייה שונה ל-\"{name}\"",
+            "failed": "שינוי שם התיקייה נכשל: {message}",
+            "targetExists": "תיקייה בשם זה כבר קיימת כאן",
+            "busy": "מחיקה עדיין ממתינה בתיקייה זו. המתן לסיום חלון הביטול.",
+            "unsupported": "שינוי שם תיקיות אינו נתמך בדף זה",
+            "noRoot": "לא הוגדר שורש מודלים"
+        },
        "dragDrop": {
            "unableToResolveRoot": "לא ניתן לקבוע את נתיב היעד להעברה.",
            "moveUnsupported": "העברה אינה נתמכת עבור פריט זה.",
-            "createFolderHint": "שחרר כדי ליצור תיקייה חדשה",
            "newFolderName": "שם תיקייה חדשה",
-            "folderNameHint": "הקש Enter לאישור, Escape לביטול",
            "emptyFolderName": "אנא הזן שם תיקייה",
            "invalidFolderName": "שם התיקייה מכיל תווים לא חוקיים",
            "noDragState": "לא נמצאה פעולת גרירה ממתינה"
        },
        "empty": {
            "noFolders": "לא נמצאו תיקיות",
-            "dragHint": "גרור פריטים לכאן כדי ליצור תיקיות"
+            "createHint": "לחץ על כפתור תיקייה חדשה למעלה כדי ליצור תיקיות"
        },
        "folderUpdateCheck": {
            "label": "בדוק עדכונים בתיקייה זו",
@@ -1394,9 +1503,9 @@
        "download": {
            "title": "הורד מודל מכתובת URL",
            "titleWithType": "הורד {type} מכתובת URL",
-            "civitaiUrl": "כתובת URL של CivitAI:",
+            "civitaiUrl": "כתובת URL של מודל:",
            "placeholder": "https://civitai.com/models/...",
-            "urlHint": "יש להזין כתובת URL אחת של CivitAI, CivArchive או Hugging Face בכל שורה. תומך במספר כתובות URL להורדה בקבוצה.",
+            "urlHint": "יש להזין כתובת URL אחת של CivitAI, CivArchive, Hugging Face או ModelScope בכל שורה. תומך במספר כתובות URL להורדה בקבוצה.",
            "selectHfFiles": "בחר קבצים להורדה ממאגר זה:",
            "selectAll": "בחר הכל",
            "fetchingRepoFiles": "מביא קבצים מהמאגר...",
@@ -1429,9 +1538,9 @@
                "inLibrary": "בספרייה"
            },
            "errors": {
-                "invalidUrl": "פורמט URL של CivitAI לא חוקי",
+                "invalidUrl": "פורמט URL של מודל לא חוקי",
                "noVersions": "אין גרסאות זמינות למודל זה",
-                "mixedSources": "לא ניתן לערבב כתובות URL של CivitAI ו-Hugging Face באותה קבוצה.",
+                "mixedSources": "לא ניתן לערבב כתובות URL של CivitAI ו-Hugging Face / ModelScope באותה קבוצה.",
                "noModelFiles": "לא נמצאו קבצי מודל במאגר זה."
            },
            "status": {
@@ -1445,6 +1554,10 @@
            "progress": {
                "currentFile": "הקובץ הנוכחי:",
                "downloading": "מוריד: {name}",
+                "metadata": "מטא-נתונים: {name}",
+                "indexingFile": "קורא קובץ מודל...",
+                "fetchingSourceMetadata": "מביא מטא-נתונים מ-{source}...",
+                "fetchingMetadata": "מביא מטא-נתונים...",
                "transferred": "הורד: {downloaded} / {total}",
                "transferredSimple": "הורד: {downloaded}",
                "transferredUnknown": "הורד: --",
@@ -1513,6 +1626,11 @@
            "tip": "רוצים לחלק למנות קטנות? עברו למצב בכמות גדולה, בחרו את המודלים הדרושים ואז השתמשו ב\"בדוק עדכונים לנבחרים\".",
            "action": "בדוק הכל"
        },
+        "filenameTemplateConfirm": {
+            "titleApply": "להחיל תבנית שם קובץ על הספרייה?",
+            "titleRevert": "לשחזר שמות קבצים מקוריים?",
+            "revertButton": "שחזר שמות קבצים מקוריים"
+        },
        "bulkAddTags": {
            "title": "הוסף תגיות למספר מודלים",
            "description": "הוסף תגיות ל-",
@@ -1596,12 +1714,16 @@
            "pathPlaceholder": "הקלד נתיב תיקייה או בחר מהעץ למטה...",
            "root": "שורש"
        },
-        "linkHuggingFace": {
-            "title": "קישור ל-HuggingFace",
-            "infoText": "הדבק את כתובת ה-URL של מאגר HuggingFace כדי לשייך מודל זה למקורו. פעולה זו מאפשרת העשרת מטא-נתונים באמצעות AI.",
-            "urlLabel": "כתובת URL של מאגר HuggingFace:",
+        "linkModelSource": {
+            "title": "קישור למקור מודל",
+            "infoText": "הדבק את כתובת ה-URL של עמוד המודל כדי לשייך מודל זה למקורו. הקישור מאפשר העשרת מטא-נתונים באמצעות AI עבור מודלים של Hugging Face ו-ModelScope.",
+            "urlLabel": "כתובת URL של עמוד המודל:",
            "urlPlaceholder": "https://huggingface.co/user/repo",
-            "helpText": "הזן את כתובת ה-URL המלאה של מאגר HuggingFace.",
+            "helpText": "הזן את כתובת ה-URL המלאה של עמוד המודל. אתרים נתמכים:",
+            "enrichNote": "העשרת AI דורשת כרטיס מודל קריא. אתרים שאינם חושפים אותו (נכון להיום TensorArt) ניתנים לקישור בלבד.",
+            "urlRequired": "הזן כתובת URL של עמוד המודל.",
+            "invalidUrl": "כתובת URL לא נתמכת. אתרים נתמכים: Hugging Face, ModelScope, TensorArt.",
+            "linking": "מקשר את מקור המודל...",
            "confirmAction": "שמור וקשר"
        },
        "relinkCivitai": {
@@ -1847,7 +1969,7 @@
                "empty": "אין עדיין היסטוריית גרסאות למודל זה.",
                "error": "טעינת הגרסאות נכשלה.",
                "missingModelId": "למודל זה אין מזהה מודל של CivitAI.",
-                "hfGroupInfo": "זוהי קבוצת מודלים של HuggingFace. פתח את הספרייה כדי לראות את כל הגרסאות ברשת.",
+                "sourceGroupInfo": "זוהי קבוצת מודלים של {source}. פתח את הספרייה כדי לראות את כל הגרסאות ברשת.",
                "confirm": {
                    "delete": "למחוק גרסה זו מהספרייה שלך?"
                },
@@ -2218,6 +2340,9 @@
            "autoOrganizeSuccess": "הארגון האוטומטי הושלם בהצלחה עבור {count} {type}",
            "autoOrganizePartialSuccess": "הארגון האוטומטי הושלם עם {success} שהועברו, {failures} שנכשלו מתוך {total} מודלים",
            "autoOrganizeFailed": "הארגון האוטומטי נכשל: {error}",
+            "filenameTemplateSuccess": "תבנית שם הקובץ הוחלה בהצלחה עבור {count} {type}",
+            "filenameTemplatePartialSuccess": "החלת תבנית שם הקובץ הושלמה עם {success} ששונה שמם, {failures} שנכשלו מתוך {total} מודלים",
+            "filenameTemplateFailed": "החלת תבנית שם הקובץ נכשלה: {error}",
            "noModelsSelected": "לא נבחרו מודלים"
        },
        "recipes": {
@@ -2384,6 +2509,8 @@
            "mappingSaveFailed": "שמירת מיפויי מודל בסיס נכשלה: {message}",
            "downloadTemplatesUpdated": "תבניות נתיב הורדה עודכנו",
            "downloadTemplatesFailed": "שמירת תבניות נתיב הורדה נכשלה: {message}",
+            "filenameTemplatesUpdated": "תבניות שמות הקבצים עודכנו",
+            "filenameTemplatesFailed": "שמירת תבניות שמות הקבצים נכשלה: {message}",
            "recipesPathUpdated": "נתיב אחסון המתכונים עודכן",
            "recipesPathSaveFailed": "עדכון נתיב אחסון המתכונים נכשל: {message}",
            "settingsUpdated": "הגדרות עודכנו: {setting}",
@@ -2483,7 +2610,9 @@
            "linkCivArchSuccess": "המודל קושר מחדש דרך CivitArchive בהצלחה",
            "fetchMetadataFirst": "אנא אחזר מטא-נתונים מ-CivitAI תחילה",
            "noCivitaiInfo": "אין מידע מ-CivitAI זמין",
-            "missingHash": "ה-hash של המודל אינו זמין"
+            "missingHash": "ה-hash של המודל אינו זמין",
+            "enrichNeedsSource": "קשר מודל זה למקור מודל תחילה (קישור מודל → קישור למקור מודל)",
+            "enrichUnsupportedSource": "העשרת AI אינה זמינה עבור מודלים של {source}"
        },
        "exampleImages": {
            "pathUpdated": "נתיב תמונות הדוגמה עודכן בהצלחה",
@@ -2647,6 +2776,11 @@
            "content": "סרוק ונהל קבצי VAE, Upscaler, Text Encoder, CLIP Vision ו-ControlNet, והורד אותם מ-CivitAI — מהעמוד הייעודי.",
            "enable": "הפעל מודלים אחרים",
            "openSettings": "פתח הגדרות"
+        },
+        "pager": {
+            "previous": "הודעה קודמת",
+            "next": "הודעה הבאה",
+            "position": "הודעה {current} מתוך {total}"
        }
    }
 }
@@ -2,6 +2,9 @@
    "common": {
        "cancel": "キャンセル",
        "confirm": "確認",
+        "reorder": {
+            "dragHandle": "ドラッグして並べ替え"
+        },
        "actions": {
            "save": "保存",
            "cancel": "キャンセル",
@@ -139,6 +142,7 @@
            "viewOnCivitai": "CivitAIで表示",
            "notAvailableFromCivitai": "CivitAIでは利用できません",
            "viewOnHuggingFace": "Hugging Face で見る",
+            "viewOnSource": "{source} で見る",
            "sendToWorkflow": "ComfyUIに送信（クリック：追加、Shift+クリック：置換）",
            "copyLoRASyntax": "LoRA構文をコピー",
            "checkpointNameCopied": "Checkpointの名前をコピーしました",
@@ -378,7 +382,9 @@
        "nav": {
            "general": "一般",
            "interface": "インターフェース",
-            "library": "ライブラリ"
+            "library": "ライブラリ",
+            "organization": "整理",
+            "modelPaths": "モデルパス"
        },
        "search": {
            "placeholder": "設定を検索...",
@@ -579,6 +585,46 @@
                "checkpointUnetOverlapInline": "このパスは別のモデルタイプですでに使用されています。Checkpoints と diffusion models には別々のフォルダを使用してください。"
            }
        },
+        "modelPaths": {
+            "title": "モデルライブラリパス",
+            "description": "LoRA Managerがモデルをスキャンするルートフォルダーです。スタンドアロンモードでは settings.json から読み込まれる主要なモデルの場所になります。",
+            "restartRequired": "変更を有効にするには再起動が必要です",
+            "coreTypes": "コアモデルタイプ",
+            "otherTypes": "その他のモデルタイプ",
+            "otherTypesDisabledHint": "その他のモデルタイプが有効になっていません。フォルダーを設定するには、上で必要なタイプをオンにしてください。",
+            "saveSuccessRestart": "モデルライブラリパスを更新しました。変更を適用するには再起動が必要です。",
+            "pendingRestartNotice": "パスの変更を保存しました。変更を有効にするにはLoRA Managerを再起動してください。",
+            "pendingRestartBannerTitle": "パスの変更を適用するには再起動が必要です",
+            "pendingRestartBannerMessage": "モデルライブラリパスが更新されました。新しいフォルダーをスキャンするにはLoRA Managerサーバーを再起動してください。",
+            "folderKeys": {
+                "loras": "LoRAパス",
+                "checkpoints": "Checkpointパス",
+                "unet": "Diffusionモデルパス",
+                "embeddings": "Embeddingパス",
+                "vae": "VAEパス",
+                "upscale_models": "Upscalerパス",
+                "text_encoders": "Text Encoderパス",
+                "clip": "CLIPパス（レガシー）",
+                "clip_vision": "CLIP Visionパス",
+                "controlnet": "ControlNetパス"
+            }
+        },
+        "directoryPicker": {
+            "title": "フォルダを参照",
+            "selectFolder": "このフォルダを選択",
+            "goUp": "上へ",
+            "pathPlaceholder": "パスを入力...",
+            "go": "移動",
+            "emptyFolder": "サブフォルダがありません",
+            "loadError": "ディレクトリの読み込みに失敗しました"
+        },
+        "pathValidation": {
+            "valid": "パスは有効です",
+            "pathNotFound": "パスが存在しません",
+            "notADirectory": "ディレクトリではありません",
+            "notReadable": "パスは読み取れません",
+            "notWritable": "パスは書き込めません"
+        },
        "priorityTags": {
            "title": "優先タグ",
            "description": "各モデルタイプのタグ優先順位をカスタマイズします (例: character, concept, style(toon|toon_style))",
@@ -635,6 +681,22 @@
                "validTemplate": "有効なテンプレート"
            }
        },
+        "filenameTemplates": {
+            "title": "ファイル名テンプレート",
+            "help": "ダウンロードしたモデルのファイル名をモデルタイプごとに設定します。空欄にするとダウンロード時は元のファイル名が保持され、空のテンプレートを適用すると以前にリネームされたモデルの記録済みの元のファイル名が復元されます。元のファイル名は常にモデルのメタデータに保持されます。",
+            "availablePlaceholders": "利用可能なプレースホルダー：",
+            "templatePlaceholder": "ファイル名テンプレートを入力（例：{base_model}-{model_name}-{version_name}）",
+            "applyButton": "ライブラリに今すぐ適用",
+            "applyHelp": "このモデルタイプの既存のすべてのファイルをテンプレートに従ってリネームします。空のテンプレートの場合は、代わりに記録済みの元のファイル名を復元します。警告：リネームするとComfyUIローダーから見える相対パスが変わるため、古いファイル名を参照する既存のワークフローは更新が必要になる場合があります。元のファイル名は各モデルのメタデータに保持されます。",
+            "confirmApply": "このモデルタイプの既存のすべてのファイルをファイル名テンプレートに従ってリネームしますか？ComfyUIローダーから見える相対パスが変わります。元のファイル名は各モデルのメタデータに保持されます。",
+            "confirmRevert": "このモデルタイプの以前にリネームされたすべてのファイルについて、記録済みの元のファイル名を復元しますか？ComfyUIローダーから見える相対パスが変わります。記録済みの元のファイル名がないファイルはスキップされます。",
+            "validation": {
+                "restoreOriginal": "有効（空のテンプレートは元のファイル名を復元）",
+                "invalidChars": "無効な文字が検出されました（ファイル名に / \\ < > : \" | ? * は使用できません）",
+                "invalidPlaceholder": "無効なプレースホルダー：{placeholder}",
+                "validTemplate": "有効なテンプレート"
+            }
+        },
        "exampleImages": {
            "downloadLocation": "ダウンロード場所",
            "downloadLocationPlaceholder": "例画像のフォルダパスを入力",
@@ -867,14 +929,22 @@
                "complete": "自動整理が完了しました",
                "error": "エラー：{error}"
            },
-            "enrichHfAgent": "HF メタデータをAIで補完"
+            "filenameTemplateProgress": {
+                "initializing": "ファイル名テンプレートの適用を初期化中...",
+                "starting": "{type}にファイル名テンプレートを適用中...",
+                "processing": "処理中（{processed}/{total}）- {success} リネーム、{skipped} スキップ、{failures} 失敗",
+                "completed": "完了：{success} リネーム、{skipped} スキップ、{failures} 失敗",
+                "complete": "ファイル名テンプレートの適用が完了しました",
+                "error": "エラー：{error}"
+            },
+            "enrichHfAgent": "メタデータをAIで補完"
        },
        "contextMenu": {
            "refreshMetadata": "CivitAIデータを更新",
            "checkUpdates": "更新確認",
            "linkModel": "モデルをリンク",
            "linkCivitai": "CivitAI にリンク",
-            "linkHuggingFace": "HuggingFace にリンク",
+            "linkModelSource": "モデルソースにリンク",
            "copySyntax": "LoRA構文をコピー",
            "copyFilename": "モデルファイル名をコピー",
            "copyRecipeSyntax": "レシピ構文をコピー",
@@ -896,7 +966,7 @@
            "viewAllLoras": "すべてのLoRAを表示",
            "downloadMissingLoras": "不足しているLoRAをダウンロード",
            "deleteRecipe": "レシピを削除",
-            "enrichHfAgent": "HF メタデータをAIで補完"
+            "enrichHfAgent": "メタデータをAIで補完"
        }
    },
    "recipes": {
@@ -914,7 +984,9 @@
        },
        "modal": {
            "metadata": {
-                "id": "ID"
+                "id": "ID",
+                "baseModel": "ベースモデル",
+                "unknown": "不明"
            },
            "actions": {
                "openFileLocation": "ファイルの場所を開く",
@@ -1235,38 +1307,75 @@
        },
        "noPaths": {
            "title": "その他のモデルのフォルダーが見つかりません",
-            "descriptionStandalone": "その他のモデル管理はオンですが、設定されたモデルフォルダーがディスク上に存在しません。以下のフォルダーパスをsettings.jsonに追加し、LoRA Managerを再起動してください。",
-            "hintStandalone": "スキャンされるのは上記のフォルダーキーのみです。不要なキーは省略できます。",
+            "descriptionStandalone": "その他のモデル管理はオンですが、その他のモデルフォルダーが見つかりませんでした。「設定 > モデルパス」でモデルフォルダーを追加し、LoRA Managerを再起動してください。",
+            "hintStandalone": "有効になっているモデルタイプのみがスキャンされます。必要なタイプは「ライブラリ > デフォルトルート」で有効にしてください。",
            "descriptionComfyUI": "その他のモデル管理はオンですが、設定されたモデルフォルダーがディスク上に存在しません。該当するモデルフォルダーをComfyUIのモデルパスに追加し、このページを再読み込みしてください。",
            "hintComfyUI": "その他のモデルは、ComfyUIのvae、upscale_models、text_encoders、clip_vision、controlnetフォルダーから読み込まれます。",
-            "openSettings": "設定を開く"
+            "openSettings": "設定を開く",
+            "openModelPaths": "モデルフォルダーを設定",
+            "openSettingsFolder": "設定フォルダーを開く"
        }
    },
    "sidebar": {
        "modelRoot": "ルート",
        "collapseAll": "すべてのフォルダを折りたたむ",
+        "collapseAllDisabled": "リスト表示では利用できません",
        "hideOnThisPage": "このページでサイドバーを非表示",
        "showSidebar": "サイドバーを表示",
        "sidebarHiddenNotification": "{page}ページでサイドバーが非表示になっています",
-        "switchToListView": "リストビューに切り替え",
-        "switchToTreeView": "ツリー表示に切り替え",
+        "viewOptions": "表示オプション",
+        "treeView": "ツリー表示",
+        "listView": "リスト表示",
        "recursiveOn": "サブフォルダーを含める",
-        "recursiveOff": "現在のフォルダーのみ",
-        "recursiveUnavailable": "再帰検索はツリービューでのみ利用できます",
-        "collapseAllDisabled": "リストビューでは利用できません",
+        "createFolder": "新規フォルダ",
+        "newSubfolder": "新規サブフォルダ",
+        "showEmptyFolders": "空のフォルダを表示",
+        "createFolderResult": {
+            "success": "フォルダ \"{name}\" を作成しました",
+            "failed": "フォルダの作成に失敗しました: {message}",
+            "unsupported": "このページではフォルダを作成できません",
+            "noRoot": "モデルルートが設定されていません"
+        },
+        "deleteFolder": "フォルダを削除",
+        "deleteFolderModal": {
+            "title": "フォルダを削除しますか？",
+            "message": "フォルダとその内容はすべてディスクから完全に削除されます。",
+            "folderLabel": "フォルダ",
+            "emptyNote": "このフォルダにはモデルがありません。他のファイルもすべて削除されます。",
+            "notEmptyTitle": "フォルダが空ではありません",
+            "notEmptyMessage": "このフォルダにはまだモデルがあります。先に削除するか移動してください —— フォルダを削除してもモデルファイルがまとめて削除されることはありません。",
+            "confirm": "フォルダを削除"
+        },
+        "deleteFolderResult": {
+            "success": "フォルダ \"{name}\" を削除しました",
+            "successWithFiles": "フォルダ \"{name}\" を削除し、他に {count} 件の項目も削除しました",
+            "restored": "フォルダを復元しました",
+            "failed": "フォルダの削除に失敗しました: {message}",
+            "notEmpty": "このフォルダにはまだモデルがあります。サイドバーを再読み込みしてからもう一度お試しください。",
+            "busy": "このフォルダ内に保留中の削除があります。取り消し可能な時間が過ぎるまでお待ちください。",
+            "unsupported": "このページではフォルダを削除できません",
+            "noRoot": "モデルルートが設定されていません"
+        },
+        "renameFolder": "フォルダ名を変更",
+        "renameFolderResult": {
+            "success": "フォルダ名を \"{name}\" に変更しました",
+            "failed": "フォルダ名の変更に失敗しました: {message}",
+            "targetExists": "同じ名前のフォルダが既に存在します",
+            "busy": "このフォルダ内に保留中の削除があります。取り消し可能な時間が過ぎるまでお待ちください。",
+            "unsupported": "このページではフォルダ名を変更できません",
+            "noRoot": "モデルルートが設定されていません"
+        },
        "dragDrop": {
            "unableToResolveRoot": "移動先のパスを特定できません。",
            "moveUnsupported": "この項目の移動はサポートされていません。",
-            "createFolderHint": "放して新しいフォルダを作成",
            "newFolderName": "新しいフォルダ名",
-            "folderNameHint": "Enterで確定、Escでキャンセル",
            "emptyFolderName": "フォルダ名を入力してください",
            "invalidFolderName": "フォルダ名に無効な文字が含まれています",
            "noDragState": "保留中のドラッグ操作が見つかりません"
        },
        "empty": {
            "noFolders": "フォルダが見つかりません",
-            "dragHint": "ここへアイテムをドラッグしてフォルダを作成します"
+            "createHint": "上部の新規フォルダボタンからフォルダを作成できます"
        },
        "folderUpdateCheck": {
            "label": "このフォルダのアップデートを確認",
@@ -1394,9 +1503,9 @@
        "download": {
            "title": "URLからモデルをダウンロード",
            "titleWithType": "URLから{type}をダウンロード",
-            "civitaiUrl": "CivitAI URL：",
+            "civitaiUrl": "モデル URL：",
            "placeholder": "https://civitai.com/models/...",
-            "urlHint": "1行に1つのCivitAI、CivArchive、またはHugging Face URLを入力してください。複数のURLを一括ダウンロードできます。",
+            "urlHint": "1行に1つのCivitAI、CivArchive、Hugging Face、またはModelScope URLを入力してください。複数のURLを一括ダウンロードできます。",
            "selectHfFiles": "このリポジトリからダウンロードするファイルを選択してください：",
            "selectAll": "すべて選択",
            "fetchingRepoFiles": "リポジトリのファイルを取得中...",
@@ -1429,9 +1538,9 @@
                "inLibrary": "ライブラリ内"
            },
            "errors": {
-                "invalidUrl": "無効なCivitAI URL形式",
+                "invalidUrl": "無効なモデル URL 形式",
                "noVersions": "このモデルの利用可能なバージョンがありません",
-                "mixedSources": "同じバッチ内でCivitAIとHugging FaceのURLを混在させることはできません。",
+                "mixedSources": "同じバッチ内でCivitAIとHugging Face / ModelScopeのURLを混在させることはできません。",
                "noModelFiles": "このリポジトリにモデルファイルが見つかりませんでした。"
            },
            "status": {
@@ -1445,6 +1554,10 @@
            "progress": {
                "currentFile": "現在のファイル:",
                "downloading": "ダウンロード中: {name}",
+                "metadata": "メタデータ: {name}",
+                "indexingFile": "モデルファイルを読み込み中...",
+                "fetchingSourceMetadata": "{source} からメタデータを取得中...",
+                "fetchingMetadata": "メタデータを取得中...",
                "transferred": "ダウンロード済み: {downloaded} / {total}",
                "transferredSimple": "ダウンロード済み: {downloaded}",
                "transferredUnknown": "ダウンロード済み: --",
@@ -1513,6 +1626,11 @@
            "tip": "少しずつ確認したい場合は一括モードに切り替え、必要なモデルを選んで「選択項目の更新を確認」を使ってください。",
            "action": "すべて確認"
        },
+        "filenameTemplateConfirm": {
+            "titleApply": "ファイル名テンプレートをライブラリに適用しますか？",
+            "titleRevert": "元のファイル名を復元しますか？",
+            "revertButton": "元のファイル名を復元"
+        },
        "bulkAddTags": {
            "title": "複数モデルにタグを追加",
            "description": "タグを追加するモデル：",
@@ -1596,12 +1714,16 @@
            "pathPlaceholder": "フォルダパスを入力するか、下のツリーから選択...",
            "root": "ルート"
        },
-        "linkHuggingFace": {
-            "title": "HuggingFace にリンク",
-            "infoText": "HuggingFace リポジトリの URL を貼り付けてモデルを関連付けます。AI によるメタデータ補完が有効になります。",
-            "urlLabel": "HuggingFace リポジトリ URL：",
+        "linkModelSource": {
+            "title": "モデルソースにリンク",
+            "infoText": "モデルページの URL を貼り付けて、このモデルをソースに関連付けます。リンクすると、Hugging Face と ModelScope のモデルで AI によるメタデータ補完が有効になります。",
+            "urlLabel": "モデルページ URL：",
            "urlPlaceholder": "https://huggingface.co/user/repo",
-            "helpText": "完全な HuggingFace リポジトリ URL を入力してください。",
+            "helpText": "完全なモデルページ URL を入力してください。対応サイト：",
+            "enrichNote": "AI 補完には読み取り可能なモデルカードが必要です。モデルカードを公開していないサイト（現在は TensorArt）はリンクのみ可能です。",
+            "urlRequired": "モデルページの URL を入力してください。",
+            "invalidUrl": "サポートされていない URL です。対応サイト：Hugging Face、ModelScope、TensorArt。",
+            "linking": "モデルソースをリンクしています...",
            "confirmAction": "保存＆リンク"
        },
        "relinkCivitai": {
@@ -1847,7 +1969,7 @@
                "empty": "このモデルにはまだバージョン履歴がありません。",
                "error": "バージョンの読み込みに失敗しました。",
                "missingModelId": "このモデルにはCivitAIのモデルIDがありません。",
-                "hfGroupInfo": "これは HuggingFace モデルグループです。ライブラリを開いてグリッドですべてのバージョンを表示してください。",
+                "sourceGroupInfo": "これは {source} モデルグループです。ライブラリを開いてグリッドですべてのバージョンを表示してください。",
                "confirm": {
                    "delete": "このバージョンをライブラリから削除しますか？"
                },
@@ -2218,6 +2340,9 @@
            "autoOrganizeSuccess": "{count} {type} の自動整理が正常に完了しました",
            "autoOrganizePartialSuccess": "自動整理が完了しました：{total} モデル中 {success} 移動、{failures} 失敗",
            "autoOrganizeFailed": "自動整理に失敗しました：{error}",
+            "filenameTemplateSuccess": "{count} 件の{type}にファイル名テンプレートを正常に適用しました",
+            "filenameTemplatePartialSuccess": "ファイル名テンプレートを適用しました：{total} 件中 {success} 件をリネーム、{failures} 件失敗",
+            "filenameTemplateFailed": "ファイル名テンプレートの適用に失敗しました：{error}",
            "noModelsSelected": "モデルが選択されていません"
        },
        "recipes": {
@@ -2384,6 +2509,8 @@
            "mappingSaveFailed": "ベースモデルマッピングの保存に失敗しました：{message}",
            "downloadTemplatesUpdated": "ダウンロードパステンプレートが更新されました",
            "downloadTemplatesFailed": "ダウンロードパステンプレートの保存に失敗しました：{message}",
+            "filenameTemplatesUpdated": "ファイル名テンプレートを更新しました",
+            "filenameTemplatesFailed": "ファイル名テンプレートの保存に失敗しました：{message}",
            "recipesPathUpdated": "レシピ保存先を更新しました",
            "recipesPathSaveFailed": "レシピ保存先の更新に失敗しました: {message}",
            "settingsUpdated": "設定が更新されました：{setting}",
@@ -2483,7 +2610,9 @@
            "linkCivArchSuccess": "モデルがCivitArchive経由で正常に再リンクされました",
            "fetchMetadataFirst": "最初にCivitAIからメタデータを取得してください",
            "noCivitaiInfo": "CivitAI情報が利用できません",
-            "missingHash": "モデルハッシュが利用できません"
+            "missingHash": "モデルハッシュが利用できません",
+            "enrichNeedsSource": "まずこのモデルをモデルソースにリンクしてください（モデルをリンク → モデルソースにリンク）",
+            "enrichUnsupportedSource": "{source} モデルでは AI 補完を利用できません"
        },
        "exampleImages": {
            "pathUpdated": "例画像パスが正常に更新されました",
@@ -2647,6 +2776,11 @@
            "content": "専用ページで VAE、Upscaler、Text Encoder、CLIP Vision、ControlNet の各ファイルをスキャン・管理し、CivitAI からダウンロードできます。",
            "enable": "その他のモデルを有効にする",
            "openSettings": "設定を開く"
+        },
+        "pager": {
+            "previous": "前の通知",
+            "next": "次の通知",
+            "position": "{total} 件中 {current} 件目の通知"
        }
    }
 }
@@ -2,6 +2,9 @@
    "common": {
        "cancel": "취소",
        "confirm": "확인",
+        "reorder": {
+            "dragHandle": "드래그하여 순서 변경"
+        },
        "actions": {
            "save": "저장",
            "cancel": "취소",
@@ -139,6 +142,7 @@
            "viewOnCivitai": "CivitAI에서 보기",
            "notAvailableFromCivitai": "CivitAI에서 사용할 수 없음",
            "viewOnHuggingFace": "Hugging Face에서 보기",
+            "viewOnSource": "{source}에서 보기",
            "sendToWorkflow": "ComfyUI로 전송 (클릭: 추가, Shift+클릭: 교체)",
            "copyLoRASyntax": "LoRA 문법 복사",
            "checkpointNameCopied": "Checkpoint 이름 복사됨",
@@ -378,7 +382,9 @@
        "nav": {
            "general": "일반",
            "interface": "인터페이스",
-            "library": "라이브러리"
+            "library": "라이브러리",
+            "organization": "정리",
+            "modelPaths": "모델 경로"
        },
        "search": {
            "placeholder": "설정 검색...",
@@ -579,6 +585,46 @@
                "checkpointUnetOverlapInline": "이 경로는 다른 모델 유형에 이미 사용 중입니다. checkpoints와 diffusion models에 별도의 폴더를 사용하세요."
            }
        },
+        "modelPaths": {
+            "title": "모델 라이브러리 경로",
+            "description": "LoRA Manager가 모델을 스캔하는 루트 폴더입니다. 독립 실행 모드에서는 settings.json에서 읽어오는 기본 모델 위치입니다.",
+            "restartRequired": "변경 사항을 적용하려면 재시작이 필요합니다",
+            "coreTypes": "핵심 모델 유형",
+            "otherTypes": "기타 모델 유형",
+            "otherTypesDisabledHint": "활성화된 기타 모델 유형이 없습니다. 위에서 필요한 유형을 켜면 해당 폴더를 구성할 수 있습니다.",
+            "saveSuccessRestart": "모델 라이브러리 경로가 업데이트되었습니다. 변경 사항을 적용하려면 재시작이 필요합니다.",
+            "pendingRestartNotice": "경로 변경 사항이 저장되었습니다. 적용하려면 LoRA Manager를 재시작하세요.",
+            "pendingRestartBannerTitle": "경로 변경 사항을 적용하려면 재시작이 필요합니다",
+            "pendingRestartBannerMessage": "모델 라이브러리 경로가 업데이트되었습니다. 새 폴더를 스캔하려면 LoRA Manager 서버를 재시작하세요.",
+            "folderKeys": {
+                "loras": "LoRA 경로",
+                "checkpoints": "Checkpoint 경로",
+                "unet": "Diffusion Model 경로",
+                "embeddings": "Embedding 경로",
+                "vae": "VAE 경로",
+                "upscale_models": "Upscaler 경로",
+                "text_encoders": "Text Encoder 경로",
+                "clip": "CLIP 경로 (레거시)",
+                "clip_vision": "CLIP Vision 경로",
+                "controlnet": "ControlNet 경로"
+            }
+        },
+        "directoryPicker": {
+            "title": "폴더 찾아보기",
+            "selectFolder": "이 폴더 선택",
+            "goUp": "위로",
+            "pathPlaceholder": "경로 입력...",
+            "go": "이동",
+            "emptyFolder": "하위 폴더 없음",
+            "loadError": "디렉터리를 불러오지 못했습니다"
+        },
+        "pathValidation": {
+            "valid": "유효한 경로입니다",
+            "pathNotFound": "경로가 존재하지 않습니다",
+            "notADirectory": "디렉터리가 아닙니다",
+            "notReadable": "경로를 읽을 수 없습니다",
+            "notWritable": "경로에 쓸 수 없습니다"
+        },
        "priorityTags": {
            "title": "우선순위 태그",
            "description": "모델 유형별 태그 우선순위를 사용자 지정합니다(예: character, concept, style(toon|toon_style)).",
@@ -635,6 +681,22 @@
                "validTemplate": "유효한 템플릿"
            }
        },
+        "filenameTemplates": {
+            "title": "파일명 템플릿",
+            "help": "모델 유형별로 다운로드되는 모델의 파일명을 구성합니다. 비워 두면 다운로드 시 원본 파일명을 유지하고, 빈 템플릿을 적용하면 이전에 이름이 변경된 모델의 기록된 원본 파일명이 복원됩니다. 원본 파일명은 항상 모델의 메타데이터에 보존됩니다.",
+            "availablePlaceholders": "사용 가능한 플레이스홀더:",
+            "templatePlaceholder": "파일명 템플릿 입력 (예: {base_model}-{model_name}-{version_name})",
+            "applyButton": "지금 라이브러리에 적용",
+            "applyHelp": "이 모델 유형의 기존 파일을 모두 템플릿에 따라 이름 변경합니다. 빈 템플릿이면 기록된 원본 파일명을 대신 복원합니다. 경고: 이름을 변경하면 ComfyUI 로더에서 보이는 상대 경로가 바뀌므로 이전 파일명을 참조하는 기존 워크플로를 업데이트해야 할 수 있습니다. 원본 파일명은 각 모델의 메타데이터에 보존됩니다.",
+            "confirmApply": "이 모델 유형의 기존 파일을 모두 파일명 템플릿에 따라 이름 변경하시겠습니까? ComfyUI 로더에서 보이는 상대 경로가 변경됩니다. 원본 파일명은 각 모델의 메타데이터에 보존됩니다.",
+            "confirmRevert": "이 모델 유형에서 이전에 이름이 변경된 모든 파일의 기록된 원본 파일명을 복원하시겠습니까? ComfyUI 로더에서 보이는 상대 경로가 변경됩니다. 기록된 원본 파일명이 없는 파일은 건너뜁니다.",
+            "validation": {
+                "restoreOriginal": "유효함 (빈 템플릿은 원본 파일명을 복원합니다)",
+                "invalidChars": "잘못된 문자가 감지됨 (파일명에는 / \\ < > : \" | ? * 문자를 사용할 수 없습니다)",
+                "invalidPlaceholder": "잘못된 플레이스홀더: {placeholder}",
+                "validTemplate": "유효한 템플릿"
+            }
+        },
        "exampleImages": {
            "downloadLocation": "다운로드 위치",
            "downloadLocationPlaceholder": "예시 이미지 폴더 경로를 입력하세요",
@@ -867,14 +929,22 @@
                "complete": "자동 정리 완료",
                "error": "오류: {error}"
            },
-            "enrichHfAgent": "HF AI로 메타데이터 보강"
+            "filenameTemplateProgress": {
+                "initializing": "파일명 템플릿 적용 초기화 중...",
+                "starting": "{type}에 파일명 템플릿 적용 중...",
+                "processing": "처리 중 ({processed}/{total}) - {success}개 이름 변경, {skipped}개 건너뜀, {failures}개 실패",
+                "completed": "완료: {success}개 이름 변경, {skipped}개 건너뜀, {failures}개 실패",
+                "complete": "파일명 템플릿 적용 완료",
+                "error": "오류: {error}"
+            },
+            "enrichHfAgent": "AI로 메타데이터 보강"
        },
        "contextMenu": {
            "refreshMetadata": "CivitAI 데이터 새로고침",
            "checkUpdates": "업데이트 확인",
            "linkModel": "모델 연결",
            "linkCivitai": "CivitAI에 연결",
-            "linkHuggingFace": "HuggingFace에 연결",
+            "linkModelSource": "모델 소스에 연결",
            "copySyntax": "LoRA 문법 복사",
            "copyFilename": "모델 파일명 복사",
            "copyRecipeSyntax": "레시피 문법 복사",
@@ -896,7 +966,7 @@
            "viewAllLoras": "모든 LoRA 보기",
            "downloadMissingLoras": "누락된 LoRA 다운로드",
            "deleteRecipe": "레시피 삭제",
-            "enrichHfAgent": "HF AI로 메타데이터 보강"
+            "enrichHfAgent": "AI로 메타데이터 보강"
        }
    },
    "recipes": {
@@ -914,7 +984,9 @@
        },
        "modal": {
            "metadata": {
-                "id": "ID"
+                "id": "ID",
+                "baseModel": "베이스 모델",
+                "unknown": "알 수 없음"
            },
            "actions": {
                "openFileLocation": "파일 위치 열기",
@@ -1235,38 +1307,75 @@
        },
        "noPaths": {
            "title": "기타 모델 폴더를 찾을 수 없습니다",
-            "descriptionStandalone": "기타 모델 관리가 켜져 있지만, 설정된 모델 폴더가 디스크에 존재하지 않습니다. 아래 폴더 경로를 settings.json에 추가한 뒤 LoRA Manager를 재시작하세요.",
-            "hintStandalone": "위에 나열된 폴더 키만 스캔됩니다. 필요 없는 키는 생략할 수 있습니다.",
+            "descriptionStandalone": "기타 모델 관리가 켜져 있지만, 기타 모델 폴더를 찾을 수 없습니다. 설정 → 모델 경로에서 모델 폴더를 추가한 뒤 LoRA Manager를 재시작하세요.",
+            "hintStandalone": "활성화된 모델 유형만 스캔됩니다. 라이브러리 → 기본 루트에서 필요한 유형을 활성화하세요.",
            "descriptionComfyUI": "기타 모델 관리가 켜져 있지만, 설정된 모델 폴더가 디스크에 존재하지 않습니다. 해당 모델 폴더를 ComfyUI 모델 경로에 추가한 뒤 이 페이지를 새로 고침하세요.",
            "hintComfyUI": "기타 모델은 ComfyUI의 vae, upscale_models, text_encoders, clip_vision, controlnet 폴더에서 읽어옵니다.",
-            "openSettings": "설정 열기"
+            "openSettings": "설정 열기",
+            "openModelPaths": "모델 폴더 구성",
+            "openSettingsFolder": "설정 폴더 열기"
        }
    },
    "sidebar": {
        "modelRoot": "루트",
        "collapseAll": "모든 폴더 접기",
+        "collapseAllDisabled": "목록 보기에서는 사용할 수 없습니다",
        "hideOnThisPage": "이 페이지에서 사이드바 숨기기",
        "showSidebar": "사이드바 표시",
        "sidebarHiddenNotification": "{page} 페이지에서 사이드바가 숨겨져 있습니다",
-        "switchToListView": "목록 보기로 전환",
-        "switchToTreeView": "트리 보기로 전환",
+        "viewOptions": "보기 옵션",
+        "treeView": "트리 보기",
+        "listView": "목록 보기",
        "recursiveOn": "하위 폴더 포함",
-        "recursiveOff": "현재 폴더만",
-        "recursiveUnavailable": "재귀 검색은 트리 보기에서만 사용할 수 있습니다",
-        "collapseAllDisabled": "목록 보기에서는 사용할 수 없습니다",
+        "createFolder": "새 폴더",
+        "newSubfolder": "새 하위 폴더",
+        "showEmptyFolders": "빈 폴더 표시",
+        "createFolderResult": {
+            "success": "\"{name}\" 폴더를 생성했습니다",
+            "failed": "폴더 생성 실패: {message}",
+            "unsupported": "이 페이지에서는 폴더를 만들 수 없습니다",
+            "noRoot": "모델 루트가 설정되지 않았습니다"
+        },
+        "deleteFolder": "폴더 삭제",
+        "deleteFolderModal": {
+            "title": "폴더를 삭제할까요?",
+            "message": "폴더와 그 안의 모든 내용이 디스크에서 영구적으로 삭제됩니다.",
+            "folderLabel": "폴더",
+            "emptyNote": "이 폴더에는 모델이 없습니다. 폴더 안의 다른 파일도 함께 삭제됩니다.",
+            "notEmptyTitle": "폴더가 비어 있지 않습니다",
+            "notEmptyMessage": "이 폴더에는 아직 모델이 있습니다. 먼저 해당 모델을 삭제하거나 이동하세요 —— 폴더를 삭제해도 모델 파일이 함께 삭제되지는 않습니다.",
+            "confirm": "폴더 삭제"
+        },
+        "deleteFolderResult": {
+            "success": "\"{name}\" 폴더를 삭제했습니다",
+            "successWithFiles": "\"{name}\" 폴더와 {count}개 항목을 함께 삭제했습니다",
+            "restored": "폴더를 복원했습니다",
+            "failed": "폴더 삭제 실패: {message}",
+            "notEmpty": "이 폴더에는 아직 모델이 있습니다. 사이드바를 새로 고친 후 다시 시도하세요.",
+            "busy": "이 폴더에 아직 대기 중인 삭제 작업이 있습니다. 되돌리기 시간이 끝날 때까지 기다리세요.",
+            "unsupported": "이 페이지에서는 폴더를 삭제할 수 없습니다",
+            "noRoot": "모델 루트가 설정되지 않았습니다"
+        },
+        "renameFolder": "폴더 이름 바꾸기",
+        "renameFolderResult": {
+            "success": "폴더 이름을 \"{name}\"(으)로 변경했습니다",
+            "failed": "폴더 이름 바꾸기 실패: {message}",
+            "targetExists": "같은 이름의 폴더가 이미 있습니다",
+            "busy": "이 폴더에 아직 대기 중인 삭제 작업이 있습니다. 되돌리기 시간이 끝날 때까지 기다리세요.",
+            "unsupported": "이 페이지에서는 폴더 이름을 바꿀 수 없습니다",
+            "noRoot": "모델 루트가 설정되지 않았습니다"
+        },
        "dragDrop": {
            "unableToResolveRoot": "이동할 대상 경로를 확인할 수 없습니다.",
            "moveUnsupported": "이 항목은 이동을 지원하지 않습니다.",
-            "createFolderHint": "놓아서 새 폴더 만들기",
            "newFolderName": "새 폴더 이름",
-            "folderNameHint": "Enter를 눌러 확인, Escape를 눌러 취소",
            "emptyFolderName": "폴더 이름을 입력하세요",
            "invalidFolderName": "폴더 이름에 잘못된 문자가 포함되어 있습니다",
            "noDragState": "보류 중인 드래그 작업을 찾을 수 없습니다"
        },
        "empty": {
            "noFolders": "폴더를 찾을 수 없습니다",
-            "dragHint": "항목을 여기로 드래그하여 폴더를 만듭니다"
+            "createHint": "위의 새 폴더 버튼을 클릭하여 폴더를 만들 수 있습니다"
        },
        "folderUpdateCheck": {
            "label": "이 폴더의 업데이트 확인",
@@ -1394,9 +1503,9 @@
        "download": {
            "title": "URL에서 모델 다운로드",
            "titleWithType": "URL에서 {type} 다운로드",
-            "civitaiUrl": "CivitAI URL:",
+            "civitaiUrl": "모델 URL:",
            "placeholder": "https://civitai.com/models/...",
-            "urlHint": "한 줄에 하나의 CivitAI, CivArchive 또는 Hugging Face URL을 입력하세요. 여러 URL을 일괄 다운로드할 수 있습니다.",
+            "urlHint": "한 줄에 하나의 CivitAI, CivArchive, Hugging Face 또는 ModelScope URL을 입력하세요. 여러 URL을 일괄 다운로드할 수 있습니다.",
            "selectHfFiles": "이 저장소에서 다운로드할 파일을 선택하세요：",
            "selectAll": "모두 선택",
            "fetchingRepoFiles": "저장소 파일을 가져오는 중...",
@@ -1429,9 +1538,9 @@
                "inLibrary": "라이브러리에 있음"
            },
            "errors": {
-                "invalidUrl": "잘못된 CivitAI URL 형식",
+                "invalidUrl": "잘못된 모델 URL 형식",
                "noVersions": "이 모델에 사용 가능한 버전이 없습니다",
-                "mixedSources": "동일한 배치에서 CivitAI와 Hugging Face URL을 혼합할 수 없습니다.",
+                "mixedSources": "동일한 배치에서 CivitAI와 Hugging Face / ModelScope URL을 혼합할 수 없습니다.",
                "noModelFiles": "이 저장소에서 모델 파일을 찾을 수 없습니다."
            },
            "status": {
@@ -1445,6 +1554,10 @@
            "progress": {
                "currentFile": "현재 파일:",
                "downloading": "다운로드 중: {name}",
+                "metadata": "메타데이터: {name}",
+                "indexingFile": "모델 파일 읽는 중...",
+                "fetchingSourceMetadata": "{source}에서 메타데이터 가져오는 중...",
+                "fetchingMetadata": "메타데이터 가져오는 중...",
                "transferred": "다운로드됨: {downloaded} / {total}",
                "transferredSimple": "다운로드됨: {downloaded}",
                "transferredUnknown": "다운로드됨: --",
@@ -1513,6 +1626,11 @@
            "tip": "나눠서 진행하고 싶다면 일괄 모드로 전환해 필요한 모델만 선택한 뒤 \"선택 항목 업데이트 확인\"을 사용하세요.",
            "action": "전체 확인"
        },
+        "filenameTemplateConfirm": {
+            "titleApply": "라이브러리에 파일명 템플릿을 적용하시겠습니까?",
+            "titleRevert": "원본 파일명을 복원하시겠습니까?",
+            "revertButton": "원본 파일명 복원"
+        },
        "bulkAddTags": {
            "title": "여러 모델에 태그 추가",
            "description": "다음에 태그를 추가합니다:",
@@ -1596,12 +1714,16 @@
            "pathPlaceholder": "폴더 경로를 입력하거나 아래 트리에서 선택하세요...",
            "root": "루트"
        },
-        "linkHuggingFace": {
-            "title": "HuggingFace에 연결",
-            "infoText": "HuggingFace 저장소 URL을 붙여넣어 모델을 연결합니다. AI 메타데이터 보강 기능을 사용할 수 있습니다.",
-            "urlLabel": "HuggingFace 저장소 URL：",
+        "linkModelSource": {
+            "title": "모델 소스에 연결",
+            "infoText": "모델 페이지 URL을 붙여넣어 이 모델을 소스에 연결합니다. 연결하면 Hugging Face 및 ModelScope 모델에 AI 메타데이터 보강을 사용할 수 있습니다.",
+            "urlLabel": "모델 페이지 URL:",
            "urlPlaceholder": "https://huggingface.co/user/repo",
-            "helpText": "전체 HuggingFace 저장소 URL을 입력하세요.",
+            "helpText": "전체 모델 페이지 URL을 입력하세요. 지원 사이트:",
+            "enrichNote": "AI 보강에는 읽을 수 있는 모델 카드가 필요합니다. 모델 카드를 제공하지 않는 사이트(현재 TensorArt)는 연결만 가능합니다.",
+            "urlRequired": "모델 페이지 URL을 입력하세요.",
+            "invalidUrl": "지원되지 않는 URL입니다. 지원 사이트: Hugging Face, ModelScope, TensorArt.",
+            "linking": "모델 소스를 연결하는 중...",
            "confirmAction": "저장 및 연결"
        },
        "relinkCivitai": {
@@ -1847,7 +1969,7 @@
                "empty": "이 모델에는 아직 버전 기록이 없습니다.",
                "error": "버전을 불러오지 못했습니다.",
                "missingModelId": "이 모델에는 CivitAI 모델 ID가 없습니다.",
-                "hfGroupInfo": "HuggingFace 모델 그룹입니다. 라이브러리를 열어 그리드에서 모든 버전을 확인하세요.",
+                "sourceGroupInfo": "{source} 모델 그룹입니다. 라이브러리를 열어 그리드에서 모든 버전을 확인하세요.",
                "confirm": {
                    "delete": "이 버전을 라이브러리에서 삭제하시겠습니까?"
                },
@@ -2218,6 +2340,9 @@
            "autoOrganizeSuccess": "{count}개의 {type}에 대해 자동 정리가 성공적으로 완료되었습니다",
            "autoOrganizePartialSuccess": "자동 정리 완료: 전체 {total}개 중 {success}개 이동, {failures}개 실패",
            "autoOrganizeFailed": "자동 정리 실패: {error}",
+            "filenameTemplateSuccess": "{count}개의 {type}에 파일명 템플릿이 성공적으로 적용되었습니다",
+            "filenameTemplatePartialSuccess": "파일명 템플릿 적용 완료: 전체 {total}개 중 {success}개 이름 변경, {failures}개 실패",
+            "filenameTemplateFailed": "파일명 템플릿 적용 실패: {error}",
            "noModelsSelected": "선택된 모델이 없습니다"
        },
        "recipes": {
@@ -2384,6 +2509,8 @@
            "mappingSaveFailed": "베이스 모델 매핑 저장 실패: {message}",
            "downloadTemplatesUpdated": "다운로드 경로 템플릿이 업데이트되었습니다",
            "downloadTemplatesFailed": "다운로드 경로 템플릿 저장 실패: {message}",
+            "filenameTemplatesUpdated": "파일명 템플릿이 업데이트되었습니다",
+            "filenameTemplatesFailed": "파일명 템플릿 저장 실패: {message}",
            "recipesPathUpdated": "레시피 저장 경로가 업데이트되었습니다",
            "recipesPathSaveFailed": "레시피 저장 경로 업데이트 실패: {message}",
            "settingsUpdated": "설정 업데이트됨: {setting}",
@@ -2483,7 +2610,9 @@
            "linkCivArchSuccess": "모델이 CivitArchive을 통해 성공적으로 다시 연결되었습니다",
            "fetchMetadataFirst": "먼저 CivitAI에서 메타데이터를 가져와주세요",
            "noCivitaiInfo": "사용 가능한 CivitAI 정보가 없습니다",
-            "missingHash": "모델 해시를 사용할 수 없습니다"
+            "missingHash": "모델 해시를 사용할 수 없습니다",
+            "enrichNeedsSource": "먼저 이 모델을 모델 소스에 연결하세요 (모델 연결 → 모델 소스에 연결)",
+            "enrichUnsupportedSource": "{source} 모델에서는 AI 보강을 사용할 수 없습니다"
        },
        "exampleImages": {
            "pathUpdated": "예시 이미지 경로가 성공적으로 업데이트되었습니다",
@@ -2647,6 +2776,11 @@
            "content": "전용 페이지에서 VAE, Upscaler, Text Encoder, CLIP Vision, ControlNet 파일을 스캔 및 관리하고 CivitAI에서 다운로드할 수 있습니다.",
            "enable": "기타 모델 활성화",
            "openSettings": "설정 열기"
+        },
+        "pager": {
+            "previous": "이전 알림",
+            "next": "다음 알림",
+            "position": "전체 {total}개 중 {current}번째 알림"
        }
    }
 }
@@ -2,6 +2,9 @@
    "common": {
        "cancel": "Отмена",
        "confirm": "Подтвердить",
+        "reorder": {
+            "dragHandle": "Перетащите, чтобы изменить порядок"
+        },
        "actions": {
            "save": "Сохранить",
            "cancel": "Отмена",
@@ -139,6 +142,7 @@
            "viewOnCivitai": "Посмотреть на CivitAI",
            "notAvailableFromCivitai": "Недоступно на CivitAI",
            "viewOnHuggingFace": "Открыть Hugging Face",
+            "viewOnSource": "Открыть {source}",
            "sendToWorkflow": "Отправить в ComfyUI (Клик: Добавить, Shift+Клик: Заменить)",
            "copyLoRASyntax": "Копировать синтаксис LoRA",
            "checkpointNameCopied": "Имя checkpoint скопировано",
@@ -378,7 +382,9 @@
        "nav": {
            "general": "Общее",
            "interface": "Интерфейс",
-            "library": "Библиотека"
+            "library": "Библиотека",
+            "organization": "Организация",
+            "modelPaths": "Пути к моделям"
        },
        "search": {
            "placeholder": "Поиск в настройках...",
@@ -579,6 +585,46 @@
                "checkpointUnetOverlapInline": "Этот путь уже используется для другого типа модели. Используйте отдельные папки для checkpoints и diffusion models."
            }
        },
+        "modelPaths": {
+            "title": "Пути библиотеки моделей",
+            "description": "Корневые папки, которые LoRA Manager сканирует в поисках ваших моделей. В автономном режиме это основные расположения моделей, считываемые из settings.json.",
+            "restartRequired": "Требуется перезапуск, чтобы изменения вступили в силу",
+            "coreTypes": "Основные типы моделей",
+            "otherTypes": "Другие типы моделей",
+            "otherTypesDisabledHint": "Другие типы моделей не включены. Включите нужные типы выше, чтобы настроить их папки.",
+            "saveSuccessRestart": "Пути библиотеки моделей обновлены. Требуется перезапуск для применения изменений.",
+            "pendingRestartNotice": "Изменения путей сохранены. Перезапустите LoRA Manager, чтобы они вступили в силу.",
+            "pendingRestartBannerTitle": "Требуется перезапуск для применения изменений путей",
+            "pendingRestartBannerMessage": "Пути библиотеки моделей обновлены. Перезапустите сервер LoRA Manager, чтобы просканировать новые папки.",
+            "folderKeys": {
+                "loras": "Пути LoRA",
+                "checkpoints": "Пути Checkpoint",
+                "unet": "Пути моделей диффузии",
+                "embeddings": "Пути Embedding",
+                "vae": "Пути VAE",
+                "upscale_models": "Пути Upscaler",
+                "text_encoders": "Пути Text Encoder",
+                "clip": "Пути CLIP (устаревшие)",
+                "clip_vision": "Пути CLIP Vision",
+                "controlnet": "Пути ControlNet"
+            }
+        },
+        "directoryPicker": {
+            "title": "Обзор папок",
+            "selectFolder": "Выбрать эту папку",
+            "goUp": "Вверх",
+            "pathPlaceholder": "Введите путь...",
+            "go": "Перейти",
+            "emptyFolder": "Нет подпапок",
+            "loadError": "Не удалось загрузить каталог"
+        },
+        "pathValidation": {
+            "valid": "Путь действителен",
+            "pathNotFound": "Путь не существует",
+            "notADirectory": "Не является каталогом",
+            "notReadable": "Путь недоступен для чтения",
+            "notWritable": "Путь недоступен для записи"
+        },
        "priorityTags": {
            "title": "Приоритетные теги",
            "description": "Настройте порядок приоритетов тегов для каждого типа моделей (например, character, concept, style(toon|toon_style)).",
@@ -635,6 +681,22 @@
                "validTemplate": "Действительный шаблон"
            }
        },
+        "filenameTemplates": {
+            "title": "Шаблоны имён файлов",
+            "help": "Настройте имена файлов загружаемых моделей для каждого типа моделей. Оставьте пустым, чтобы сохранять исходные имена файлов при загрузке; применение пустого шаблона восстанавливает записанные исходные имена файлов ранее переименованных моделей. Исходное имя файла всегда сохраняется в метаданных модели.",
+            "availablePlaceholders": "Доступные заполнители:",
+            "templatePlaceholder": "Введите шаблон имени файла (например, {base_model}-{model_name}-{version_name})",
+            "applyButton": "Применить к библиотеке сейчас",
+            "applyHelp": "Переименовывает все существующие файлы этого типа моделей согласно шаблону; при пустом шаблоне вместо этого восстанавливает записанные исходные имена файлов. Предупреждение: переименование меняет относительный путь, который видят загрузчики ComfyUI, поэтому существующие workflow, ссылающиеся на старое имя файла, может потребоваться обновить. Исходное имя файла сохраняется в метаданных каждой модели.",
+            "confirmApply": "Переименовать все существующие файлы этого типа моделей согласно шаблону имён файлов? Это меняет относительный путь, который видят загрузчики ComfyUI. Исходное имя файла сохраняется в метаданных каждой модели.",
+            "confirmRevert": "Восстановить записанные исходные имена файлов всех ранее переименованных файлов этого типа моделей? Это меняет относительный путь, который видят загрузчики ComfyUI. Файлы без записанного исходного имени файла пропускаются.",
+            "validation": {
+                "restoreOriginal": "Действительный (пустой шаблон восстанавливает исходные имена файлов)",
+                "invalidChars": "Обнаружены недопустимые символы (имя файла не может содержать / \\ < > : \" | ? *)",
+                "invalidPlaceholder": "Недопустимый заполнитель: {placeholder}",
+                "validTemplate": "Действительный шаблон"
+            }
+        },
        "exampleImages": {
            "downloadLocation": "Место загрузки",
            "downloadLocationPlaceholder": "Введите путь к папке для примеров изображений",
@@ -867,14 +929,22 @@
                "complete": "Автоматическая организация завершена",
                "error": "Ошибка: {error}"
            },
-            "enrichHfAgent": "Обогатить HF метаданные (ИИ)"
+            "filenameTemplateProgress": {
+                "initializing": "Инициализация применения шаблона имён файлов...",
+                "starting": "Применение шаблона имён файлов к {type}...",
+                "processing": "Обработка ({processed}/{total}) — {success} переименовано, {skipped} пропущено, {failures} не удалось",
+                "completed": "Завершено: {success} переименовано, {skipped} пропущено, {failures} не удалось",
+                "complete": "Применение шаблона имён файлов завершено",
+                "error": "Ошибка: {error}"
+            },
+            "enrichHfAgent": "Обогатить метаданные с помощью ИИ"
        },
        "contextMenu": {
            "refreshMetadata": "Обновить данные CivitAI",
            "checkUpdates": "Проверить обновления",
            "linkModel": "Связать модель",
            "linkCivitai": "Пересвязать с CivitAI",
-            "linkHuggingFace": "Связать с HuggingFace",
+            "linkModelSource": "Связать с источником модели",
            "copySyntax": "Копировать синтаксис LoRA",
            "copyFilename": "Копировать имя файла модели",
            "copyRecipeSyntax": "Копировать синтаксис рецепта",
@@ -896,7 +966,7 @@
            "viewAllLoras": "Посмотреть все LoRAs",
            "downloadMissingLoras": "Загрузить отсутствующие LoRAs",
            "deleteRecipe": "Удалить рецепт",
-            "enrichHfAgent": "Обогатить HF метаданные (ИИ)"
+            "enrichHfAgent": "Обогатить метаданные с помощью ИИ"
        }
    },
    "recipes": {
@@ -914,7 +984,9 @@
        },
        "modal": {
            "metadata": {
-                "id": "ID"
+                "id": "ID",
+                "baseModel": "Базовая модель",
+                "unknown": "Неизвестно"
            },
            "actions": {
                "openFileLocation": "Открыть расположение файла",
@@ -1235,38 +1307,75 @@
        },
        "noPaths": {
            "title": "Папки других моделей не найдены",
-            "descriptionStandalone": "Управление другими моделями включено, но ни одна из настроенных папок моделей не существует на диске. Добавьте указанные ниже пути к папкам в settings.json и перезапустите LoRA Manager.",
-            "hintStandalone": "Сканируются только перечисленные выше ключи папок; ненужные ключи можно опустить.",
+            "descriptionStandalone": "Управление другими моделями включено, но папки других моделей не найдены. Добавьте свои папки моделей в разделе «Настройки → Пути к моделям», затем перезапустите LoRA Manager.",
+            "hintStandalone": "Сканируются только включённые типы моделей; включите нужные типы в разделе «Библиотека → Корневые папки».",
            "descriptionComfyUI": "Управление другими моделями включено, но ни одна из настроенных папок моделей не существует на диске. Добавьте соответствующие папки моделей в пути к моделям ComfyUI и перезагрузите эту страницу.",
            "hintComfyUI": "Другие модели читаются из папок vae, upscale_models, text_encoders, clip_vision и controlnet в ComfyUI.",
-            "openSettings": "Открыть настройки"
+            "openSettings": "Открыть настройки",
+            "openModelPaths": "Настроить папки моделей",
+            "openSettingsFolder": "Открыть папку настроек"
        }
    },
    "sidebar": {
        "modelRoot": "Корень",
        "collapseAll": "Свернуть все папки",
+        "collapseAllDisabled": "Недоступно в виде списка",
        "hideOnThisPage": "Скрыть боковую панель на этой странице",
        "showSidebar": "Показать боковую панель",
        "sidebarHiddenNotification": "Боковая панель скрыта на странице {page}",
-        "switchToListView": "Переключить на вид списка",
-        "switchToTreeView": "Переключить на древовидный вид",
+        "viewOptions": "Параметры отображения",
+        "treeView": "Дерево",
+        "listView": "Список",
        "recursiveOn": "Включать вложенные папки",
-        "recursiveOff": "Только текущая папка",
-        "recursiveUnavailable": "Рекурсивный поиск доступен только в режиме дерева",
-        "collapseAllDisabled": "Недоступно в виде списка",
+        "createFolder": "Новая папка",
+        "newSubfolder": "Новая вложенная папка",
+        "showEmptyFolders": "Показывать пустые папки",
+        "createFolderResult": {
+            "success": "Папка \"{name}\" создана",
+            "failed": "Не удалось создать папку: {message}",
+            "unsupported": "Создание папок не поддерживается на этой странице",
+            "noRoot": "Корневая папка моделей не настроена"
+        },
+        "deleteFolder": "Удалить папку",
+        "deleteFolderModal": {
+            "title": "Удалить папку?",
+            "message": "Папка и всё её содержимое будут безвозвратно удалены с диска.",
+            "folderLabel": "Папка",
+            "emptyNote": "В этой папке нет моделей. Остальные файлы в ней тоже будут удалены.",
+            "notEmptyTitle": "Папка не пуста",
+            "notEmptyMessage": "В этой папке ещё есть модели. Сначала удалите или переместите их — удаление папки никогда не затрагивает файлы моделей.",
+            "confirm": "Удалить папку"
+        },
+        "deleteFolderResult": {
+            "success": "Папка \"{name}\" удалена",
+            "successWithFiles": "Папка \"{name}\" удалена вместе с ещё {count} элемент(ами)",
+            "restored": "Папка восстановлена",
+            "failed": "Не удалось удалить папку: {message}",
+            "notEmpty": "В этой папке ещё есть модели. Обновите боковую панель и повторите попытку.",
+            "busy": "В этой папке всё ещё есть отложенное удаление. Дождитесь окончания окна отмены.",
+            "unsupported": "Удаление папок не поддерживается на этой странице",
+            "noRoot": "Корневая папка моделей не настроена"
+        },
+        "renameFolder": "Переименовать папку",
+        "renameFolderResult": {
+            "success": "Папка переименована в \"{name}\"",
+            "failed": "Не удалось переименовать папку: {message}",
+            "targetExists": "Папка с таким именем уже существует здесь",
+            "busy": "В этой папке всё ещё есть отложенное удаление. Дождитесь окончания окна отмены.",
+            "unsupported": "Переименование папок не поддерживается на этой странице",
+            "noRoot": "Корневая папка моделей не настроена"
+        },
        "dragDrop": {
            "unableToResolveRoot": "Не удалось определить путь назначения для перемещения.",
            "moveUnsupported": "Перемещение этого элемента не поддерживается.",
-            "createFolderHint": "Отпустите, чтобы создать новую папку",
            "newFolderName": "Имя новой папки",
-            "folderNameHint": "Нажмите Enter для подтверждения, Escape для отмены",
            "emptyFolderName": "Пожалуйста, введите имя папки",
            "invalidFolderName": "Имя папки содержит недопустимые символы",
            "noDragState": "Ожидающая операция перетаскивания не найдена"
        },
        "empty": {
            "noFolders": "Папки не найдены",
-            "dragHint": "Перетащите элементы сюда, чтобы создать папки"
+            "createHint": "Нажмите кнопку «Новая папка» вверху, чтобы создать папки"
        },
        "folderUpdateCheck": {
            "label": "Проверить обновления в этой папке",
@@ -1394,9 +1503,9 @@
        "download": {
            "title": "Скачать модель по URL",
            "titleWithType": "Скачать {type} по URL",
-            "civitaiUrl": "CivitAI URL:",
+            "civitaiUrl": "URL модели:",
            "placeholder": "https://civitai.com/models/...",
-            "urlHint": "Введите один URL CivitAI, CivArchive или Hugging Face в каждой строке. Поддерживает несколько URL для пакетной загрузки.",
+            "urlHint": "Введите один URL CivitAI, CivArchive, Hugging Face или ModelScope в каждой строке. Поддерживает несколько URL для пакетной загрузки.",
            "selectHfFiles": "Выберите файл(ы) для загрузки из этого репозитория:",
            "selectAll": "Выбрать все",
            "fetchingRepoFiles": "Получение файлов репозитория...",
@@ -1429,9 +1538,9 @@
                "inLibrary": "В библиотеке"
            },
            "errors": {
-                "invalidUrl": "Неверный формат URL CivitAI",
+                "invalidUrl": "Неверный формат URL модели",
                "noVersions": "Нет доступных версий для этой модели",
-                "mixedSources": "Нельзя смешивать URL-адреса CivitAI и Hugging Face в одном пакете.",
+                "mixedSources": "Нельзя смешивать URL-адреса CivitAI и Hugging Face / ModelScope в одном пакете.",
                "noModelFiles": "В этом репозитории не найдено файлов моделей."
            },
            "status": {
@@ -1445,6 +1554,10 @@
            "progress": {
                "currentFile": "Текущий файл:",
                "downloading": "Скачивается: {name}",
+                "metadata": "Метаданные: {name}",
+                "indexingFile": "Чтение файла модели...",
+                "fetchingSourceMetadata": "Получение метаданных из {source}...",
+                "fetchingMetadata": "Получение метаданных...",
                "transferred": "Скачано: {downloaded} / {total}",
                "transferredSimple": "Скачано: {downloaded}",
                "transferredUnknown": "Скачано: --",
@@ -1513,6 +1626,11 @@
            "tip": "Хотите проверять по частям? Переключитесь в массовый режим, выберите нужные модели и используйте \"Проверить обновления для выбранных\".",
            "action": "Проверить всё"
        },
+        "filenameTemplateConfirm": {
+            "titleApply": "Применить шаблон имён файлов к библиотеке?",
+            "titleRevert": "Восстановить исходные имена файлов?",
+            "revertButton": "Восстановить исходные имена файлов"
+        },
        "bulkAddTags": {
            "title": "Добавить теги к нескольким моделям",
            "description": "Добавить теги к",
@@ -1596,12 +1714,16 @@
            "pathPlaceholder": "Введите путь к папке или выберите из дерева ниже...",
            "root": "Корень"
        },
-        "linkHuggingFace": {
-            "title": "Связать с HuggingFace",
-            "infoText": "Вставьте URL репозитория HuggingFace, чтобы связать эту модель с её источником. Это позволит обогащать метаданные с помощью ИИ.",
-            "urlLabel": "URL репозитория HuggingFace:",
+        "linkModelSource": {
+            "title": "Связать с источником модели",
+            "infoText": "Вставьте URL страницы модели, чтобы связать эту модель с её источником. Связывание включает обогащение метаданных с помощью ИИ для моделей Hugging Face и ModelScope.",
+            "urlLabel": "URL страницы модели:",
            "urlPlaceholder": "https://huggingface.co/user/repo",
-            "helpText": "Введите полный URL репозитория HuggingFace.",
+            "helpText": "Введите полный URL страницы модели. Поддерживаемые сайты:",
+            "enrichNote": "Для обогащения с помощью ИИ нужна читаемая карточка модели. Сайты, которые её не предоставляют (сейчас TensorArt), можно только связать.",
+            "urlRequired": "Введите URL страницы модели.",
+            "invalidUrl": "Неподдерживаемый URL. Поддерживаемые сайты: Hugging Face, ModelScope, TensorArt.",
+            "linking": "Связывание с источником модели...",
            "confirmAction": "Сохранить и связать"
        },
        "relinkCivitai": {
@@ -1847,7 +1969,7 @@
                "empty": "Для этой модели пока нет истории версий.",
                "error": "Не удалось загрузить версии.",
                "missingModelId": "У этой модели отсутствует идентификатор модели CivitAI.",
-                "hfGroupInfo": "Это группа моделей HuggingFace. Откройте библиотеку, чтобы увидеть все версии в сетке.",
+                "sourceGroupInfo": "Это группа моделей {source}. Откройте библиотеку, чтобы увидеть все версии в сетке.",
                "confirm": {
                    "delete": "Удалить эту версию из библиотеки?"
                },
@@ -2218,6 +2340,9 @@
            "autoOrganizeSuccess": "Автоматическая организация успешно завершена для {count} {type}",
            "autoOrganizePartialSuccess": "Автоматическая организация завершена: перемещено {success}, не удалось {failures} из {total} моделей",
            "autoOrganizeFailed": "Ошибка автоматической организации: {error}",
+            "filenameTemplateSuccess": "Шаблон имён файлов успешно применён для {count} {type}",
+            "filenameTemplatePartialSuccess": "Шаблон имён файлов применён: переименовано {success}, не удалось {failures} из {total} моделей",
+            "filenameTemplateFailed": "Не удалось применить шаблон имён файлов: {error}",
            "noModelsSelected": "Модели не выбраны"
        },
        "recipes": {
@@ -2384,6 +2509,8 @@
            "mappingSaveFailed": "Не удалось сохранить сопоставления базовых моделей: {message}",
            "downloadTemplatesUpdated": "Шаблоны путей загрузки обновлены",
            "downloadTemplatesFailed": "Не удалось сохранить шаблоны путей загрузки: {message}",
+            "filenameTemplatesUpdated": "Шаблоны имён файлов обновлены",
+            "filenameTemplatesFailed": "Не удалось сохранить шаблоны имён файлов: {message}",
            "recipesPathUpdated": "Путь хранения рецептов обновлён",
            "recipesPathSaveFailed": "Не удалось обновить путь хранения рецептов: {message}",
            "settingsUpdated": "Настройки обновлены: {setting}",
@@ -2483,7 +2610,9 @@
            "linkCivArchSuccess": "Модель успешно пересвязана через CivitArchive",
            "fetchMetadataFirst": "Пожалуйста, сначала получите метаданные с CivitAI",
            "noCivitaiInfo": "Информация CivitAI недоступна",
-            "missingHash": "Хеш модели недоступен"
+            "missingHash": "Хеш модели недоступен",
+            "enrichNeedsSource": "Сначала свяжите эту модель с источником модели (Связать модель → Связать с источником модели)",
+            "enrichUnsupportedSource": "Обогащение с помощью ИИ недоступно для моделей {source}"
        },
        "exampleImages": {
            "pathUpdated": "Путь к примерам изображений успешно обновлен",
@@ -2647,6 +2776,11 @@
            "content": "Сканирование и управление файлами VAE, Upscaler, Text Encoder, CLIP Vision и ControlNet, а также загрузка их с CivitAI — всё на одной отдельной странице.",
            "enable": "Включить другие модели",
            "openSettings": "Открыть настройки"
+        },
+        "pager": {
+            "previous": "Предыдущее уведомление",
+            "next": "Следующее уведомление",
+            "position": "Уведомление {current} из {total}"
        }
    }
 }
@@ -2,6 +2,9 @@
    "common": {
        "cancel": "取消",
        "confirm": "确认",
+        "reorder": {
+            "dragHandle": "拖拽以调整顺序"
+        },
        "actions": {
            "save": "保存",
            "cancel": "取消",
@@ -139,6 +142,7 @@
            "viewOnCivitai": "在 CivitAI 查看",
            "notAvailableFromCivitai": "CivitAI 上不可用",
            "viewOnHuggingFace": "在 Hugging Face 查看",
+            "viewOnSource": "在 {source} 查看",
            "sendToWorkflow": "发送到 ComfyUI（点击：追加，Shift+点击：替换）",
            "copyLoRASyntax": "复制 LoRA 语法",
            "checkpointNameCopied": "Checkpoint 名称已复制",
@@ -378,7 +382,9 @@
        "nav": {
            "general": "通用",
            "interface": "界面",
-            "library": "库"
+            "library": "库",
+            "organization": "整理",
+            "modelPaths": "模型路径"
        },
        "search": {
            "placeholder": "搜索设置...",
@@ -579,6 +585,46 @@
                "checkpointUnetOverlapInline": "此路径已被用于另一种模型类型。请为 checkpoints 和 diffusion models 使用不同的文件夹。"
            }
        },
+        "modelPaths": {
+            "title": "模型库路径",
+            "description": "LoRA Manager 扫描模型所用的根文件夹。独立模式下，这些是从 settings.json 读取的主要模型位置。",
+            "restartRequired": "需要重启才能生效",
+            "coreTypes": "核心模型类型",
+            "otherTypes": "其他模型类型",
+            "otherTypesDisabledHint": "未启用任何其他模型类型。请在上方启用你需要的类型，然后为其配置文件夹。",
+            "saveSuccessRestart": "模型库路径已更新，需要重启才能生效。",
+            "pendingRestartNotice": "路径更改已保存。重启 LoRA Manager 后生效。",
+            "pendingRestartBannerTitle": "需要重启以应用路径更改",
+            "pendingRestartBannerMessage": "模型库路径已更新。请重启 LoRA Manager 服务器以扫描新文件夹。",
+            "folderKeys": {
+                "loras": "LoRA 路径",
+                "checkpoints": "Checkpoint 路径",
+                "unet": "Diffusion 模型路径",
+                "embeddings": "Embedding 路径",
+                "vae": "VAE 路径",
+                "upscale_models": "Upscaler 路径",
+                "text_encoders": "Text Encoder 路径",
+                "clip": "CLIP 路径（旧版）",
+                "clip_vision": "CLIP Vision 路径",
+                "controlnet": "ControlNet 路径"
+            }
+        },
+        "directoryPicker": {
+            "title": "浏览文件夹",
+            "selectFolder": "选择此文件夹",
+            "goUp": "上级目录",
+            "pathPlaceholder": "输入路径...",
+            "go": "跳转",
+            "emptyFolder": "没有子文件夹",
+            "loadError": "目录加载失败"
+        },
+        "pathValidation": {
+            "valid": "路径有效",
+            "pathNotFound": "路径不存在",
+            "notADirectory": "不是一个目录",
+            "notReadable": "路径不可读",
+            "notWritable": "路径不可写"
+        },
        "priorityTags": {
            "title": "优先标签",
            "description": "为每种模型类型自定义标签优先级顺序 (例如: character, concept, style(toon|toon_style))",
@@ -635,6 +681,22 @@
                "validTemplate": "有效模板"
            }
        },
+        "filenameTemplates": {
+            "title": "文件名模板",
+            "help": "按模型类型配置下载模型的文件名。留空则下载时保留原始文件名；应用空模板会恢复此前被重命名模型所记录的原始文件名。原始文件名始终保留在模型的元数据中。",
+            "availablePlaceholders": "可用占位符：",
+            "templatePlaceholder": "输入文件名模板（如：{base_model}-{model_name}-{version_name}）",
+            "applyButton": "立即应用到库",
+            "applyHelp": "根据模板重命名此模型类型的所有现有文件；模板为空时则恢复已记录的原始文件名。警告：重命名会改变 ComfyUI 加载器所见的相对路径，因此引用旧文件名的现有工作流可能需要更新。原始文件名保留在每个模型的元数据中。",
+            "confirmApply": "要根据文件名模板重命名此模型类型的所有现有文件吗？这会改变 ComfyUI 加载器所见的相对路径。原始文件名保留在每个模型的元数据中。",
+            "confirmRevert": "要恢复此模型类型中所有此前被重命名文件所记录的原始文件名吗？这会改变 ComfyUI 加载器所见的相对路径。未记录原始文件名的文件将被跳过。",
+            "validation": {
+                "restoreOriginal": "有效（空模板将恢复原始文件名）",
+                "invalidChars": "检测到无效字符（文件名不能包含 / \\ < > : \" | ? *）",
+                "invalidPlaceholder": "无效占位符：{placeholder}",
+                "validTemplate": "有效模板"
+            }
+        },
        "exampleImages": {
            "downloadLocation": "下载位置",
            "downloadLocationPlaceholder": "输入示例图片文件夹路径",
@@ -867,14 +929,22 @@
                "complete": "自动整理已完成",
                "error": "错误：{error}"
            },
-            "enrichHfAgent": "AI HF 元数据增强"
+            "filenameTemplateProgress": {
+                "initializing": "正在初始化应用文件名模板...",
+                "starting": "正在为 {type} 应用文件名模板...",
+                "processing": "处理中（{processed}/{total}）- 已重命名 {success} 个，跳过 {skipped} 个，失败 {failures} 个",
+                "completed": "完成：已重命名 {success} 个，跳过 {skipped} 个，失败 {failures} 个",
+                "complete": "文件名模板应用完成",
+                "error": "错误：{error}"
+            },
+            "enrichHfAgent": "AI 元数据增强"
        },
        "contextMenu": {
            "refreshMetadata": "刷新 CivitAI 数据",
            "checkUpdates": "检查更新",
            "linkModel": "链接模型",
            "linkCivitai": "链接到 CivitAI",
-            "linkHuggingFace": "链接到 HuggingFace",
+            "linkModelSource": "链接到模型来源",
            "copySyntax": "复制 LoRA 语法",
            "copyFilename": "复制模型文件名",
            "copyRecipeSyntax": "复制配方语法",
@@ -896,7 +966,7 @@
            "viewAllLoras": "查看所有 LoRA",
            "downloadMissingLoras": "下载缺失的 LoRA",
            "deleteRecipe": "删除配方",
-            "enrichHfAgent": "AI HF 元数据增强"
+            "enrichHfAgent": "AI 元数据增强"
        }
    },
    "recipes": {
@@ -914,7 +984,9 @@
        },
        "modal": {
            "metadata": {
-                "id": "ID"
+                "id": "ID",
+                "baseModel": "基础模型",
+                "unknown": "未知"
            },
            "actions": {
                "openFileLocation": "打开文件位置",
@@ -1235,38 +1307,75 @@
        },
        "noPaths": {
            "title": "未找到其他模型文件夹",
-            "descriptionStandalone": "其他模型管理已开启，但配置的模型文件夹在磁盘上都不存在。请将下面的文件夹路径添加到 settings.json，然后重启 LoRA Manager。",
-            "hintStandalone": "只会扫描上面列出的文件夹键；不需要的键可以省略。",
+            "descriptionStandalone": "其他模型管理已开启，但未找到其他模型文件夹。请在“设置 → 模型路径”中添加你的模型文件夹，然后重启 LoRA Manager。",
+            "hintStandalone": "仅扫描已启用的模型类型；请在“库 → 默认根目录”中启用你需要的类型。",
            "descriptionComfyUI": "其他模型管理已开启，但配置的模型文件夹在磁盘上都不存在。请将对应的模型文件夹添加到 ComfyUI 的模型路径，然后重新加载此页面。",
            "hintComfyUI": "其他模型从 ComfyUI 的 vae、upscale_models、text_encoders、clip_vision 和 controlnet 文件夹中读取。",
-            "openSettings": "打开设置"
+            "openSettings": "打开设置",
+            "openModelPaths": "配置模型文件夹",
+            "openSettingsFolder": "打开设置文件夹"
        }
    },
    "sidebar": {
        "modelRoot": "根目录",
        "collapseAll": "折叠所有文件夹",
+        "collapseAllDisabled": "列表视图下不可用",
        "hideOnThisPage": "隐藏此页面侧边栏",
        "showSidebar": "显示侧边栏",
        "sidebarHiddenNotification": "{page}页面的文件夹侧边栏已隐藏",
-        "switchToListView": "切换到列表视图",
-        "switchToTreeView": "切换到树状视图",
+        "viewOptions": "视图选项",
+        "treeView": "树形视图",
+        "listView": "列表视图",
        "recursiveOn": "包含子文件夹",
-        "recursiveOff": "仅当前文件夹",
-        "recursiveUnavailable": "仅在树形视图中可使用递归搜索",
-        "collapseAllDisabled": "列表视图下不可用",
+        "createFolder": "新建文件夹",
+        "newSubfolder": "新建子文件夹",
+        "showEmptyFolders": "显示空文件夹",
+        "createFolderResult": {
+            "success": "已创建文件夹 \"{name}\"",
+            "failed": "创建文件夹失败: {message}",
+            "unsupported": "此页面不支持创建文件夹",
+            "noRoot": "未配置模型根目录"
+        },
+        "deleteFolder": "删除文件夹",
+        "deleteFolderModal": {
+            "title": "删除文件夹？",
+            "message": "该文件夹及其中所有内容都将从磁盘上永久删除。",
+            "folderLabel": "文件夹",
+            "emptyNote": "该文件夹中没有模型，其中的其他文件也会一并删除。",
+            "notEmptyTitle": "文件夹不为空",
+            "notEmptyMessage": "该文件夹中仍有模型，请先删除或移出这些模型 —— 删除文件夹不会级联删除模型文件。",
+            "confirm": "删除文件夹"
+        },
+        "deleteFolderResult": {
+            "success": "已删除文件夹 \"{name}\"",
+            "successWithFiles": "已删除文件夹 \"{name}\"，同时删除了另外 {count} 项内容",
+            "restored": "文件夹已恢复",
+            "failed": "删除文件夹失败: {message}",
+            "notEmpty": "该文件夹中仍有模型。请刷新侧边栏后重试。",
+            "busy": "该文件夹内仍有待处理的删除操作，请等待撤销窗口结束。",
+            "unsupported": "此页面不支持删除文件夹",
+            "noRoot": "未配置模型根目录"
+        },
+        "renameFolder": "重命名文件夹",
+        "renameFolderResult": {
+            "success": "文件夹已重命名为 \"{name}\"",
+            "failed": "重命名文件夹失败: {message}",
+            "targetExists": "此处已存在同名文件夹",
+            "busy": "该文件夹内仍有待处理的删除操作，请等待撤销窗口结束。",
+            "unsupported": "此页面不支持重命名文件夹",
+            "noRoot": "未配置模型根目录"
+        },
        "dragDrop": {
            "unableToResolveRoot": "无法确定移动的目标路径。",
            "moveUnsupported": "此条目不支持移动。",
-            "createFolderHint": "释放以创建新文件夹",
            "newFolderName": "新文件夹名称",
-            "folderNameHint": "按 Enter 确认，Escape 取消",
            "emptyFolderName": "请输入文件夹名称",
            "invalidFolderName": "文件夹名称包含无效字符",
            "noDragState": "未找到待处理的拖放操作"
        },
        "empty": {
            "noFolders": "未找到文件夹",
-            "dragHint": "拖拽项目到此处以创建文件夹"
+            "createHint": "点击上方的新建文件夹按钮即可创建文件夹"
        },
        "folderUpdateCheck": {
            "label": "检查此文件夹的更新",
@@ -1394,9 +1503,9 @@
        "download": {
            "title": "从 URL 下载模型",
            "titleWithType": "从 URL 下载 {type}",
-            "civitaiUrl": "CivitAI URL:",
+            "civitaiUrl": "模型 URL：",
            "placeholder": "https://civitai.com/models/...",
-            "urlHint": "每行输入一个 CivitAI、CivArchive 或 Hugging Face URL。支持批量下载多个 URL。",
+            "urlHint": "每行输入一个 CivitAI、CivArchive、Hugging Face 或 ModelScope URL。支持批量下载多个 URL。",
            "selectHfFiles": "选择从此仓库下载的文件：",
            "selectAll": "全选",
            "fetchingRepoFiles": "正在获取仓库文件...",
@@ -1429,9 +1538,9 @@
                "inLibrary": "已在库中"
            },
            "errors": {
-                "invalidUrl": "无效的 CivitAI URL 格式",
+                "invalidUrl": "无效的模型 URL 格式",
                "noVersions": "此模型没有可用版本",
-                "mixedSources": "无法在同一批次中混合使用 CivitAI 和 Hugging Face URL。",
+                "mixedSources": "无法在同一批次中混合使用 CivitAI 和 Hugging Face / ModelScope URL。",
                "noModelFiles": "在此仓库中未找到模型文件。"
            },
            "status": {
@@ -1445,6 +1554,10 @@
            "progress": {
                "currentFile": "当前文件：",
                "downloading": "下载中：{name}",
+                "metadata": "元数据：{name}",
+                "indexingFile": "正在读取模型文件...",
+                "fetchingSourceMetadata": "正在从 {source} 获取元数据...",
+                "fetchingMetadata": "正在获取元数据...",
                "transferred": "已下载：{downloaded} / {total}",
                "transferredSimple": "已下载：{downloaded}",
                "transferredUnknown": "已下载：--",
@@ -1513,6 +1626,11 @@
            "tip": "想分批进行？切换到批量模式，选中需要的模型，然后使用“检查所选更新”。",
            "action": "检查全部"
        },
+        "filenameTemplateConfirm": {
+            "titleApply": "将文件名模板应用到库？",
+            "titleRevert": "恢复原始文件名？",
+            "revertButton": "恢复原始文件名"
+        },
        "bulkAddTags": {
            "title": "批量添加标签",
            "description": "为多个模型添加标签",
@@ -1596,12 +1714,16 @@
            "pathPlaceholder": "输入文件夹路径或从下方树中选择...",
            "root": "根目录"
        },
-        "linkHuggingFace": {
-            "title": "链接到 HuggingFace",
-            "infoText": "粘贴 HuggingFace 仓库 URL 以关联此模型。关联后可启用 AI 元数据增强功能。",
-            "urlLabel": "HuggingFace 仓库 URL：",
+        "linkModelSource": {
+            "title": "链接到模型来源",
+            "infoText": "粘贴模型页面 URL 以关联此模型与其来源。关联后可对 Hugging Face 和 ModelScope 模型启用 AI 元数据增强。",
+            "urlLabel": "模型页面 URL：",
            "urlPlaceholder": "https://huggingface.co/user/repo",
-            "helpText": "请输入完整的 HuggingFace 仓库 URL。",
+            "helpText": "请输入完整的模型页面 URL。支持的站点：",
+            "enrichNote": "AI 增强需要可读取的模型卡。未提供模型卡的站点（目前为 TensorArt）只能建立链接。",
+            "urlRequired": "请输入模型页面 URL。",
+            "invalidUrl": "URL 不受支持。支持的站点：Hugging Face、ModelScope、TensorArt。",
+            "linking": "正在链接模型来源...",
            "confirmAction": "保存并链接"
        },
        "relinkCivitai": {
@@ -1847,7 +1969,7 @@
                "empty": "该模型还没有版本历史。",
                "error": "加载版本失败。",
                "missingModelId": "该模型缺少 CivitAI 模型 ID。",
-                "hfGroupInfo": "这是一个 HuggingFace 模型组。打开库页面即可在网格中查看所有版本。",
+                "sourceGroupInfo": "这是一个 {source} 模型组。打开库页面即可在网格中查看所有版本。",
                "confirm": {
                    "delete": "从库中删除此版本？"
                },
@@ -2218,6 +2340,9 @@
            "autoOrganizeSuccess": "自动整理已成功完成，共 {count} 个 {type}",
            "autoOrganizePartialSuccess": "自动整理完成：已移动 {success} 个，{failures} 个失败，共 {total} 个模型",
            "autoOrganizeFailed": "自动整理失败：{error}",
+            "filenameTemplateSuccess": "文件名模板已成功应用，共 {count} 个 {type}",
+            "filenameTemplatePartialSuccess": "文件名模板应用完成：已重命名 {success} 个，{failures} 个失败，共 {total} 个模型",
+            "filenameTemplateFailed": "应用文件名模板失败：{error}",
            "noModelsSelected": "未选中模型"
        },
        "recipes": {
@@ -2384,6 +2509,8 @@
            "mappingSaveFailed": "保存基础模型映射失败：{message}",
            "downloadTemplatesUpdated": "下载路径模板已更新",
            "downloadTemplatesFailed": "保存下载路径模板失败：{message}",
+            "filenameTemplatesUpdated": "文件名模板已更新",
+            "filenameTemplatesFailed": "保存文件名模板失败：{message}",
            "recipesPathUpdated": "配方存储路径已更新",
            "recipesPathSaveFailed": "更新配方存储路径失败：{message}",
            "settingsUpdated": "设置已更新：{setting}",
@@ -2483,7 +2610,9 @@
            "linkCivArchSuccess": "模型已成功通过 CivitArchive 重新关联",
            "fetchMetadataFirst": "请先从 CivitAI 获取元数据",
            "noCivitaiInfo": "无 CivitAI 信息",
-            "missingHash": "模型哈希不可用"
+            "missingHash": "模型哈希不可用",
+            "enrichNeedsSource": "请先将此模型链接到模型来源（链接模型 → 链接到模型来源）",
+            "enrichUnsupportedSource": "{source} 模型不支持 AI 增强"
        },
        "exampleImages": {
            "pathUpdated": "示例图片路径更新成功",
@@ -2647,6 +2776,11 @@
            "content": "在一个专属页面中扫描和管理 VAE、Upscaler、Text Encoder、CLIP Vision 和 ControlNet 文件，并从 CivitAI 下载。",
            "enable": "启用其他模型",
            "openSettings": "打开设置"
+        },
+        "pager": {
+            "previous": "上一条通知",
+            "next": "下一条通知",
+            "position": "第 {current} 条通知，共 {total} 条"
        }
    }
 }
@@ -2,6 +2,9 @@
    "common": {
        "cancel": "取消",
        "confirm": "確認",
+        "reorder": {
+            "dragHandle": "拖曳以調整順序"
+        },
        "actions": {
            "save": "儲存",
            "cancel": "取消",
@@ -139,6 +142,7 @@
            "viewOnCivitai": "在 CivitAI 查看",
            "notAvailableFromCivitai": "CivitAI 不提供",
            "viewOnHuggingFace": "在 Hugging Face 查看",
+            "viewOnSource": "在 {source} 查看",
            "sendToWorkflow": "傳送到 ComfyUI（點擊：附加，Shift+點擊：取代）",
            "copyLoRASyntax": "複製 LoRA 語法",
            "checkpointNameCopied": "Checkpoint 名稱已複製",
@@ -378,7 +382,9 @@
        "nav": {
            "general": "通用",
            "interface": "介面",
-            "library": "模型庫"
+            "library": "模型庫",
+            "organization": "整理",
+            "modelPaths": "模型路徑"
        },
        "search": {
            "placeholder": "搜尋設定...",
@@ -579,6 +585,46 @@
                "checkpointUnetOverlapInline": "此路徑已被用於另一種模型類型。請為 checkpoints 和 diffusion models 使用不同的資料夾。"
            }
        },
+        "modelPaths": {
+            "title": "模型庫路徑",
+            "description": "LoRA Manager 掃描您模型的根目錄資料夾。這些是獨立模式下從 settings.json 讀取的主要模型位置。",
+            "restartRequired": "需要重新啟動才能生效",
+            "coreTypes": "核心模型類型",
+            "otherTypes": "其他模型類型",
+            "otherTypesDisabledHint": "尚未啟用任何其他模型類型。請在上方開啟您需要的類型，以設定其資料夾。",
+            "saveSuccessRestart": "模型庫路徑已更新，需要重新啟動才能生效。",
+            "pendingRestartNotice": "路徑變更已儲存。請重新啟動 LoRA Manager 以使其生效。",
+            "pendingRestartBannerTitle": "需要重新啟動才能套用路徑變更",
+            "pendingRestartBannerMessage": "模型庫路徑已更新。請重新啟動 LoRA Manager 伺服器以掃描新的資料夾。",
+            "folderKeys": {
+                "loras": "LoRA 路徑",
+                "checkpoints": "Checkpoint 路徑",
+                "unet": "Diffusion 模型路徑",
+                "embeddings": "Embedding 路徑",
+                "vae": "VAE 路徑",
+                "upscale_models": "Upscaler 路徑",
+                "text_encoders": "Text Encoder 路徑",
+                "clip": "CLIP 路徑（舊版）",
+                "clip_vision": "CLIP Vision 路徑",
+                "controlnet": "ControlNet 路徑"
+            }
+        },
+        "directoryPicker": {
+            "title": "瀏覽資料夾",
+            "selectFolder": "選擇此資料夾",
+            "goUp": "上一層",
+            "pathPlaceholder": "輸入路徑...",
+            "go": "前往",
+            "emptyFolder": "沒有子資料夾",
+            "loadError": "目錄載入失敗"
+        },
+        "pathValidation": {
+            "valid": "路徑有效",
+            "pathNotFound": "路徑不存在",
+            "notADirectory": "不是目錄",
+            "notReadable": "路徑無法讀取",
+            "notWritable": "路徑無法寫入"
+        },
        "priorityTags": {
            "title": "優先標籤",
            "description": "為每種模型類型自訂標籤的優先順序 (例如: character, concept, style(toon|toon_style))",
@@ -635,6 +681,22 @@
                "validTemplate": "範本有效"
            }
        },
+        "filenameTemplates": {
+            "title": "檔案名稱範本",
+            "help": "依模型類型設定已下載模型的檔案名稱。留空則下載時保留原始檔案名稱；套用空範本會還原先前已重新命名模型所記錄的原始檔案名稱。原始檔案名稱一律會保存在模型的中繼資料中。",
+            "availablePlaceholders": "可用佔位符：",
+            "templatePlaceholder": "輸入檔案名稱範本（例如：{base_model}-{model_name}-{version_name}）",
+            "applyButton": "立即套用至模型庫",
+            "applyHelp": "依範本重新命名此模型類型的所有現有檔案；若範本為空，則改為還原已記錄的原始檔案名稱。警告：重新命名會變更 ComfyUI 載入器所見的相對路徑，因此參照舊檔案名稱的現有工作流可能需要更新。原始檔案名稱會保存在每個模型的中繼資料中。",
+            "confirmApply": "要依檔案名稱範本重新命名此模型類型的所有現有檔案嗎？這會變更 ComfyUI 載入器所見的相對路徑。原始檔案名稱會保存在每個模型的中繼資料中。",
+            "confirmRevert": "要將此模型類型所有先前已重新命名的檔案還原為已記錄的原始檔案名稱嗎？這會變更 ComfyUI 載入器所見的相對路徑。沒有記錄原始檔案名稱的檔案將被略過。",
+            "validation": {
+                "restoreOriginal": "有效（空範本會還原原始檔案名稱）",
+                "invalidChars": "偵測到無效字元（檔案名稱不能包含 / \\ < > : \" | ? *）",
+                "invalidPlaceholder": "無效佔位符：{placeholder}",
+                "validTemplate": "範本有效"
+            }
+        },
        "exampleImages": {
            "downloadLocation": "下載位置",
            "downloadLocationPlaceholder": "輸入範例圖片的資料夾路徑",
@@ -867,14 +929,22 @@
                "complete": "自動整理完成",
                "error": "錯誤：{error}"
            },
-            "enrichHfAgent": "AI HF 中繼資料增強"
+            "filenameTemplateProgress": {
+                "initializing": "正在初始化檔案名稱範本套用...",
+                "starting": "正在將檔案名稱範本套用至 {type}...",
+                "processing": "處理中（{processed}/{total}）- 已重新命名 {success}，已略過 {skipped}，失敗 {failures}",
+                "completed": "完成：已重新命名 {success}，已略過 {skipped}，失敗 {failures}",
+                "complete": "檔案名稱範本套用完成",
+                "error": "錯誤：{error}"
+            },
+            "enrichHfAgent": "AI 中繼資料增強"
        },
        "contextMenu": {
            "refreshMetadata": "刷新 CivitAI 資料",
            "checkUpdates": "檢查更新",
            "linkModel": "連結模型",
            "linkCivitai": "連結到 CivitAI",
-            "linkHuggingFace": "連結到 HuggingFace",
+            "linkModelSource": "連結到模型來源",
            "copySyntax": "複製 LoRA 語法",
            "copyFilename": "複製模型檔名",
            "copyRecipeSyntax": "複製配方語法",
@@ -896,7 +966,7 @@
            "viewAllLoras": "檢視全部 LoRA",
            "downloadMissingLoras": "下載缺少的 LoRA",
            "deleteRecipe": "刪除配方",
-            "enrichHfAgent": "AI HF 中繼資料增強"
+            "enrichHfAgent": "AI 中繼資料增強"
        }
    },
    "recipes": {
@@ -914,7 +984,9 @@
        },
        "modal": {
            "metadata": {
-                "id": "ID"
+                "id": "ID",
+                "baseModel": "基礎模型",
+                "unknown": "未知"
            },
            "actions": {
                "openFileLocation": "開啟檔案位置",
@@ -1235,38 +1307,75 @@
        },
        "noPaths": {
            "title": "找不到其他模型資料夾",
-            "descriptionStandalone": "其他模型管理已開啟，但設定的模型資料夾在磁碟上都不存在。請將下方的資料夾路徑加入 settings.json，然後重新啟動 LoRA Manager。",
-            "hintStandalone": "只會掃描上方列出的資料夾鍵；不需要的鍵可以省略。",
+            "descriptionStandalone": "其他模型管理已開啟，但找不到其他模型的資料夾。請在「設定 > 模型路徑」中加入您的模型資料夾，然後重新啟動 LoRA Manager。",
+            "hintStandalone": "僅會掃描已啟用的模型類型；請在「模型庫 > 預設根目錄」中啟用您需要的類型。",
            "descriptionComfyUI": "其他模型管理已開啟，但設定的模型資料夾在磁碟上都不存在。請將對應的模型資料夾加入 ComfyUI 的模型路徑，然後重新載入此頁面。",
            "hintComfyUI": "其他模型會從 ComfyUI 的 vae、upscale_models、text_encoders、clip_vision 和 controlnet 資料夾讀取。",
-            "openSettings": "開啟設定"
+            "openSettings": "開啟設定",
+            "openModelPaths": "設定模型資料夾",
+            "openSettingsFolder": "開啟設定資料夾"
        }
    },
    "sidebar": {
        "modelRoot": "根目錄",
        "collapseAll": "全部摺疊資料夾",
+        "collapseAllDisabled": "清單檢視下無法使用",
        "hideOnThisPage": "隱藏此頁面側邊欄",
        "showSidebar": "顯示側邊欄",
        "sidebarHiddenNotification": "{page}頁面的資料夾側邊欄已隱藏",
-        "switchToListView": "切換至列表檢視",
-        "switchToTreeView": "切換到樹狀檢視",
+        "viewOptions": "檢視選項",
+        "treeView": "樹狀檢視",
+        "listView": "清單檢視",
        "recursiveOn": "包含子資料夾",
-        "recursiveOff": "僅目前資料夾",
-        "recursiveUnavailable": "遞迴搜尋僅能在樹狀檢視中使用",
-        "collapseAllDisabled": "列表檢視下不可用",
+        "createFolder": "新增資料夾",
+        "newSubfolder": "新增子資料夾",
+        "showEmptyFolders": "顯示空資料夾",
+        "createFolderResult": {
+            "success": "已建立資料夾 \"{name}\"",
+            "failed": "建立資料夾失敗: {message}",
+            "unsupported": "此頁面不支援建立資料夾",
+            "noRoot": "未設定模型根目錄"
+        },
+        "deleteFolder": "刪除資料夾",
+        "deleteFolderModal": {
+            "title": "刪除資料夾？",
+            "message": "該資料夾及其中的所有內容都將從磁碟上永久刪除。",
+            "folderLabel": "資料夾",
+            "emptyNote": "該資料夾中沒有模型，其中的其他檔案也會一併刪除。",
+            "notEmptyTitle": "資料夾不是空的",
+            "notEmptyMessage": "該資料夾中仍有模型，請先刪除或移出這些模型 —— 刪除資料夾不會串聯刪除模型檔案。",
+            "confirm": "刪除資料夾"
+        },
+        "deleteFolderResult": {
+            "success": "已刪除資料夾 \"{name}\"",
+            "successWithFiles": "已刪除資料夾 \"{name}\"，同時刪除了另外 {count} 項內容",
+            "restored": "資料夾已還原",
+            "failed": "刪除資料夾失敗: {message}",
+            "notEmpty": "該資料夾中仍有模型。請重新整理側邊欄後再試。",
+            "busy": "該資料夾內仍有待處理的刪除操作，請等待復原時間結束。",
+            "unsupported": "此頁面不支援刪除資料夾",
+            "noRoot": "未設定模型根目錄"
+        },
+        "renameFolder": "重新命名資料夾",
+        "renameFolderResult": {
+            "success": "資料夾已重新命名為 \"{name}\"",
+            "failed": "重新命名資料夾失敗: {message}",
+            "targetExists": "此處已存在同名資料夾",
+            "busy": "該資料夾內仍有待處理的刪除操作，請等待復原時間結束。",
+            "unsupported": "此頁面不支援重新命名資料夾",
+            "noRoot": "未設定模型根目錄"
+        },
        "dragDrop": {
            "unableToResolveRoot": "無法確定移動的目標路徑。",
            "moveUnsupported": "此項目不支援移動。",
-            "createFolderHint": "放開以建立新資料夾",
            "newFolderName": "新資料夾名稱",
-            "folderNameHint": "按 Enter 確認，Escape 取消",
            "emptyFolderName": "請輸入資料夾名稱",
            "invalidFolderName": "資料夾名稱包含無效字元",
            "noDragState": "未找到待處理的拖放操作"
        },
        "empty": {
            "noFolders": "未找到資料夾",
-            "dragHint": "將項目拖到此處以建立資料夾"
+            "createHint": "點擊上方的新增資料夾按鈕即可建立資料夾"
        },
        "folderUpdateCheck": {
            "label": "檢查此資料夾的更新",
@@ -1394,9 +1503,9 @@
        "download": {
            "title": "從網址下載模型",
            "titleWithType": "從網址下載 {type}",
-            "civitaiUrl": "CivitAI 網址：",
+            "civitaiUrl": "模型網址：",
            "placeholder": "https://civitai.com/models/...",
-            "urlHint": "每行輸入一個 CivitAI、CivArchive 或 Hugging Face URL。支援批量下載多個 URL。",
+            "urlHint": "每行輸入一個 CivitAI、CivArchive、Hugging Face 或 ModelScope URL。支援批量下載多個 URL。",
            "selectHfFiles": "選擇從此倉庫下載的檔案：",
            "selectAll": "全選",
            "fetchingRepoFiles": "正在獲取倉庫檔案...",
@@ -1429,9 +1538,9 @@
                "inLibrary": "已在庫中"
            },
            "errors": {
-                "invalidUrl": "CivitAI 網址格式無效",
+                "invalidUrl": "模型網址格式無效",
                "noVersions": "此模型無可用版本",
-                "mixedSources": "無法在同一批次中混合使用 CivitAI 和 Hugging Face URL。",
+                "mixedSources": "無法在同一批次中混合使用 CivitAI 和 Hugging Face / ModelScope URL。",
                "noModelFiles": "在此倉庫中未找到模型檔案。"
            },
            "status": {
@@ -1445,6 +1554,10 @@
            "progress": {
                "currentFile": "目前檔案：",
                "downloading": "下載中：{name}",
+                "metadata": "中繼資料：{name}",
+                "indexingFile": "正在讀取模型檔案...",
+                "fetchingSourceMetadata": "正在從 {source} 取得中繼資料...",
+                "fetchingMetadata": "正在取得中繼資料...",
                "transferred": "已下載：{downloaded} / {total}",
                "transferredSimple": "已下載：{downloaded}",
                "transferredUnknown": "已下載：--",
@@ -1513,6 +1626,11 @@
            "tip": "想分批處理？切換到批次模式，選擇需要的模型，然後使用「檢查所選更新」。",
            "action": "全部檢查"
        },
+        "filenameTemplateConfirm": {
+            "titleApply": "要將檔案名稱範本套用至模型庫嗎？",
+            "titleRevert": "要還原原始檔案名稱嗎？",
+            "revertButton": "還原原始檔案名稱"
+        },
        "bulkAddTags": {
            "title": "新增標籤到多個模型",
            "description": "新增標籤到",
@@ -1596,12 +1714,16 @@
            "pathPlaceholder": "輸入資料夾路徑或從下方樹狀結構選擇...",
            "root": "根目錄"
        },
-        "linkHuggingFace": {
-            "title": "連結到 HuggingFace",
-            "infoText": "貼上 HuggingFace 倉庫 URL 以關聯此模型。關聯後可啟用 AI 中繼資料增強功能。",
-            "urlLabel": "HuggingFace 倉庫 URL：",
+        "linkModelSource": {
+            "title": "連結到模型來源",
+            "infoText": "貼上模型頁面 URL 以關聯此模型與其來源。關聯後可對 Hugging Face 和 ModelScope 模型啟用 AI 中繼資料增強。",
+            "urlLabel": "模型頁面 URL：",
            "urlPlaceholder": "https://huggingface.co/user/repo",
-            "helpText": "請輸入完整的 HuggingFace 倉庫 URL。",
+            "helpText": "請輸入完整的模型頁面 URL。支援的站點：",
+            "enrichNote": "AI 增強需要可讀取的模型卡。未提供模型卡的站點（目前為 TensorArt）只能建立連結。",
+            "urlRequired": "請輸入模型頁面 URL。",
+            "invalidUrl": "URL 不受支援。支援的站點：Hugging Face、ModelScope、TensorArt。",
+            "linking": "正在連結模型來源...",
            "confirmAction": "儲存並連結"
        },
        "relinkCivitai": {
@@ -1847,7 +1969,7 @@
                "empty": "此模型尚無版本歷史。",
                "error": "載入版本失敗。",
                "missingModelId": "此模型缺少 CivitAI 模型 ID。",
-                "hfGroupInfo": "這是一個 HuggingFace 模型組。打開庫頁面即可在網格中查看所有版本。",
+                "sourceGroupInfo": "這是一個 {source} 模型組。打開庫頁面即可在網格中查看所有版本。",
                "confirm": {
                    "delete": "要從庫中刪除此版本嗎？"
                },
@@ -2218,6 +2340,9 @@
            "autoOrganizeSuccess": "自動整理已成功完成，共 {count} 個 {type} 已整理",
            "autoOrganizePartialSuccess": "自動整理完成：已移動 {success} 個，{failures} 個失敗，共 {total} 個模型",
            "autoOrganizeFailed": "自動整理失敗：{error}",
+            "filenameTemplateSuccess": "已成功為 {count} 個 {type} 套用檔案名稱範本",
+            "filenameTemplatePartialSuccess": "檔案名稱範本套用完成：已重新命名 {success} 個，{failures} 個失敗，共 {total} 個模型",
+            "filenameTemplateFailed": "套用檔案名稱範本失敗：{error}",
            "noModelsSelected": "未選擇任何模型"
        },
        "recipes": {
@@ -2384,6 +2509,8 @@
            "mappingSaveFailed": "儲存基礎模型對應失敗：{message}",
            "downloadTemplatesUpdated": "下載路徑範本已更新",
            "downloadTemplatesFailed": "儲存下載路徑範本失敗：{message}",
+            "filenameTemplatesUpdated": "檔案名稱範本已更新",
+            "filenameTemplatesFailed": "儲存檔案名稱範本失敗：{message}",
            "recipesPathUpdated": "配方儲存路徑已更新",
            "recipesPathSaveFailed": "更新配方儲存路徑失敗：{message}",
            "settingsUpdated": "設定已更新：{setting}",
@@ -2483,7 +2610,9 @@
            "linkCivArchSuccess": "模型已成功透過 CivitArchive 重新連結",
            "fetchMetadataFirst": "請先從 CivitAI 取得 metadata",
            "noCivitaiInfo": "無 CivitAI 資訊",
-            "missingHash": "模型雜湊不可用"
+            "missingHash": "模型雜湊不可用",
+            "enrichNeedsSource": "請先將此模型連結到模型來源（連結模型 → 連結到模型來源）",
+            "enrichUnsupportedSource": "{source} 模型不支援 AI 增強"
        },
        "exampleImages": {
            "pathUpdated": "範例圖片路徑已更新",
@@ -2647,6 +2776,11 @@
            "content": "在專屬頁面中掃描和管理 VAE、Upscaler、Text Encoder、CLIP Vision 和 ControlNet 檔案，並從 CivitAI 下載。",
            "enable": "啟用其他模型",
            "openSettings": "開啟設定"
+        },
+        "pager": {
+            "previous": "上一則通知",
+            "next": "下一則通知",
+            "position": "第 {current} 則通知，共 {total} 則"
        }
    }
 }
@@ -472,12 +472,5 @@ class LoraManager:
                    scanner.cancel_task()
                    logger.debug("LoRA Manager: Cancelled %s", name)

-            # Close shared aiohttp sessions to avoid "Unclosed client session" warnings
-            try:
-                from py.routes.handlers.hf_handlers import close_hf_api_session
-                await close_hf_api_session()
-            except Exception as exc:
-                logger.debug("Error closing HF API session: %s", exc)
-
        except Exception as e:
            logger.error(f"Error during cleanup: {e}", exc_info=True)
@@ -78,7 +78,7 @@ class CheckpointLoaderLM:

                # Filter only checkpoint type (not diffusion_model) and format names
                names = []
-                for item in cache.raw_data:
+                for item in list(cache.raw_data):
                    if item.get("sub_type") == "checkpoint":
                        file_path = item.get("file_path", "")
                        # Only offer models that still exist on disk so ComfyUI
@@ -126,7 +126,7 @@ class CheckpointLoaderLM:
                cache = await scanner.get_cached_data()

                base_models = set()
-                for item in cache.raw_data:
+                for item in list(cache.raw_data):
                    if item.get("sub_type") != "checkpoint":
                        continue
                    base_model = item.get("base_model")
@@ -601,7 +601,7 @@ class SaveImageLM:
            os.path.basename(name),
            os.path.splitext(os.path.basename(name))[0],
        ]
-        for model in getattr(cache, "raw_data", []):
+        for model in list(getattr(cache, "raw_data", [])):
            file_name = model.get("file_name")
            if file_name in candidates:
                return model
@@ -93,7 +93,7 @@ class UNETLoaderLM:

                # Filter only diffusion_model type and format names
                names = []
-                for item in cache.raw_data:
+                for item in list(cache.raw_data):
                    if item.get("sub_type") == "diffusion_model":
                        file_path = item.get("file_path", "")
                        # Only offer models that still exist on disk so ComfyUI
@@ -141,7 +141,7 @@ class UNETLoaderLM:
                cache = await scanner.get_cached_data()

                base_models = set()
-                for item in cache.raw_data:
+                for item in list(cache.raw_data):
                    if item.get("sub_type") != "diffusion_model":
                        continue
                    base_model = item.get("base_model")
@@ -156,7 +156,7 @@ def _find_missing_loras(names: list[str]) -> list[str]:

        lookup = {}
        basename_candidates = {}
-        for item in cache.raw_data:
+        for item in list(cache.raw_data):
            file_path = item.get("file_path")
            if not file_path:
                continue
@@ -24,9 +24,11 @@ from ..services.use_cases import (
    AutoOrganizeUseCase,
    BulkMetadataRefreshUseCase,
    DownloadModelUseCase,
+    FilenameTemplateUseCase,
 )
 from ..services.websocket_progress_callback import (
    WebSocketBroadcastCallback,
+    WebSocketFilenameTemplateProgressCallback,
    WebSocketProgressCallback,
 )
 from ..utils.exif_utils import ExifUtils
@@ -37,6 +39,7 @@ from .handlers.model_handlers import (
    ModelAutoOrganizeHandler,
    ModelCivitaiHandler,
    ModelDownloadHandler,
+    ModelFilenameTemplateHandler,
    ModelHandlerSet,
    ModelListingHandler,
    ModelManagementHandler,
@@ -83,6 +86,9 @@ class BaseModelRoutes(ABC):
        self.model_lifecycle_service: ModelLifecycleService | None = None
        self.websocket_progress_callback = WebSocketProgressCallback()
        self.metadata_progress_callback = WebSocketBroadcastCallback()
+        self.filename_template_progress_callback = (
+            WebSocketFilenameTemplateProgressCallback()
+        )

        self._handler_set: ModelHandlerSet | None = None
        self._handler_mapping: Dict[str, Callable[[web.Request], Awaitable[web.Response]]] | None = None
@@ -202,6 +208,17 @@ class BaseModelRoutes(ABC):
            ws_manager=self._ws_manager,
            logger=logger,
        )
+        filename_template_use_case = FilenameTemplateUseCase(
+            scanner=service.scanner,
+            lifecycle_service=self._ensure_lifecycle_service(),
+            lock_provider=self._ws_manager,
+            model_type=service.model_type,
+        )
+        filename_template = ModelFilenameTemplateHandler(
+            use_case=filename_template_use_case,
+            progress_callback=self.filename_template_progress_callback,
+            logger=logger,
+        )
        updates = ModelUpdateHandler(
            service=service,
            update_service=update_service,
@@ -218,6 +235,7 @@ class BaseModelRoutes(ABC):
            civitai=civitai,
            move=move,
            auto_organize=auto_organize,
+            filename_template=filename_template,
            updates=updates,
        )

@@ -54,12 +54,14 @@ from ...utils.constants import (
    SUPPORTED_MEDIA_EXTENSIONS,
    VALID_LORA_TYPES,
    VALID_OTHER_CIVITAI_TYPES,
+    folder_path_schema,
 )
-from .hf_handlers import HfHandler
+from .model_source_handlers import ModelSourceHandler
 from .agent_handlers import AgentHandler
 from .download_routing_handlers import DownloadRoutingHandler
 from .model_handlers import ModelCivitaiHandler
 from ...utils.civitai_utils import rewrite_preview_url
+from ...utils.directory_browser import browse_directory
 from ...utils.example_images_paths import (
    find_non_compliant_items_in_example_images_root,
    is_valid_example_images_root,
@@ -421,6 +423,11 @@ def _wsl_to_windows_path(wsl_path: str) -> str | None:
        return None


+def _has_gui_display() -> bool:
+    """Check whether a GUI session is reachable for xdg-open."""
+    return bool(os.environ.get("DISPLAY") or os.environ.get("WAYLAND_DISPLAY"))
+
+
 class PromptServerProtocol(Protocol):
    """Subset of PromptServer used by the handlers."""

@@ -1575,6 +1582,30 @@ class SettingsHandler:
                    availability_error,
                )
                response_data["other_models_paths_available"] = None
+            standalone_mode = os.environ.get("LORA_MANAGER_STANDALONE", "0") == "1"
+            response_data["standalone_mode"] = standalone_mode
+            if standalone_mode:
+                # Standalone reads its model roots exclusively from
+                # settings.json, so the Model Paths settings UI needs the
+                # current values plus the editable-key schema. In plugin mode
+                # the paths come from the ComfyUI host and stay hidden.
+                folder_paths = self._settings.get("folder_paths") or {}
+                # A fresh install is seeded from settings.json.example, whose
+                # folder_paths are documentation placeholders — hide them so
+                # the UI starts with empty editors instead of fake paths.
+                get_placeholders = getattr(
+                    self._settings, "get_template_folder_path_placeholders", None
+                )
+                placeholders = get_placeholders() if get_placeholders else set()
+                if placeholders:
+                    folder_paths = {
+                        key: [p for p in paths if p not in placeholders]
+                        if isinstance(paths, list)
+                        else paths
+                        for key, paths in folder_paths.items()
+                    }
+                response_data["folder_paths"] = folder_paths
+                response_data["folder_path_schema"] = folder_path_schema()
            settings_file = getattr(self._settings, "settings_file", None)
            if settings_file:
                response_data["settings_file"] = settings_file
@@ -2759,12 +2790,40 @@ class ModelLibraryHandler:

            normalized_type, scanner = await self._get_scanner_for_type(model_type)
            if not normalized_type:
+                # The lookup cannot be served as a fully interactive list. Two
+                # cases share this branch: a CivitAI type with no scanner at all
+                # (Wildcards, Workflows, Hypernetwork, Poses, AestheticGradient)
+                # and an Other-model type while the opt-in master switch is off.
+                # Answer 200 with the CivitAI list marked read-only plus a
+                # machine-readable reason, so clients can still show the
+                # versions and explain why the actions are missing. Legacy
+                # clients keep working: they only read `success`/`versions`.
+                reason = (
+                    "other_models_disabled"
+                    if self._normalize_model_type(model_type) == "other"
+                    else "model_type_unsupported"
+                )
                return web.json_response(
                    {
-                        "success": False,
-                        "error": f'Model type "{model_type}" is not supported',
-                    },
-                    status=400,
+                        "success": True,
+                        "modelId": model_id,
+                        "modelName": model_name,
+                        "modelType": model_type,
+                        "supported": False,
+                        "reason": reason,
+                        "versions": [
+                            {
+                                "id": version.get("id"),
+                                "name": version.get("name", ""),
+                                "thumbnailUrl": version.get("images")[0]["url"]
+                                if version.get("images")
+                                else None,
+                                "inLibrary": False,
+                                "hasBeenDownloaded": False,
+                            }
+                            for version in versions
+                        ],
+                    }
                )

            if not scanner:
@@ -2806,6 +2865,7 @@ class ModelLibraryHandler:
                    "modelId": model_id,
                    "modelName": model_name,
                    "modelType": model_type,
+                    "supported": True,
                    "versions": enriched_versions,
                }
            )
@@ -3393,6 +3453,18 @@ class FileSystemHandler:
                    subprocess.Popen(["open", "-R", settings_file])
                else:
                    folder = os.path.dirname(settings_file)
+                    if not _has_gui_display():
+                        # Headless/SSH session: xdg-open cannot open a file
+                        # manager, so hand the path to the browser for copying
+                        # instead of reporting a success that never happened.
+                        return web.json_response(
+                            {
+                                "success": True,
+                                "message": "Headless session: path available for copying",
+                                "path": settings_file,
+                                "mode": "clipboard",
+                            }
+                        )
                    subprocess.Popen(["xdg-open", folder])

            return web.json_response(
@@ -3426,6 +3498,76 @@ class FileSystemHandler:
            logger.error("Failed to open wildcards location: %s", exc, exc_info=True)
            return web.json_response({"success": False, "error": str(exc)}, status=500)

+    async def browse_directory(self, request: web.Request) -> web.Response:
+        """Browse a directory for the settings-UI directory picker."""
+        try:
+            data = await request.json()
+            payload, status = browse_directory(data.get("path", ""))
+            return web.json_response(payload, status=status)
+        except json.JSONDecodeError:
+            return web.json_response(
+                {"success": False, "error": "Invalid JSON"}, status=400
+            )
+        except Exception as exc:  # pragma: no cover - defensive logging
+            logger.error("Failed to browse directory: %s", exc, exc_info=True)
+            return web.json_response({"success": False, "error": str(exc)}, status=500)
+
+    async def validate_path(self, request: web.Request) -> web.Response:
+        """Validate a filesystem path for the settings UI.
+
+        A well-formed request always returns HTTP 200; invalid paths are
+        reported via ``error_code`` in the payload. HTTP 400 is reserved for
+        malformed requests (missing path, invalid JSON).
+        """
+        try:
+            data = await request.json()
+            raw_path = data.get("path")
+            expect = data.get("expect", "directory")
+
+            if not raw_path or not isinstance(raw_path, str):
+                return web.json_response(
+                    {"success": False, "error": "Missing path parameter"}, status=400
+                )
+
+            # Business path convention: abspath only, never realpath.
+            path = os.path.abspath(os.path.expanduser(raw_path))
+
+            exists = os.path.exists(path)
+            is_directory = os.path.isdir(path) if exists else False
+            readable = bool(exists and os.access(path, os.R_OK))
+            writable = bool(exists and os.access(path, os.W_OK))
+
+            error_code = None
+            if not exists:
+                error_code = "path_not_found"
+            elif expect == "directory" and not is_directory:
+                error_code = "not_a_directory"
+            elif expect == "file" and not os.path.isfile(path):
+                error_code = "not_a_file"
+            elif not readable:
+                error_code = "not_readable"
+            elif not writable:
+                error_code = "not_writable"
+
+            return web.json_response(
+                {
+                    "success": True,
+                    "path": path,
+                    "exists": exists,
+                    "is_directory": is_directory,
+                    "readable": readable,
+                    "writable": writable,
+                    "error_code": error_code,
+                }
+            )
+        except json.JSONDecodeError:
+            return web.json_response(
+                {"success": False, "error": "Invalid JSON"}, status=400
+            )
+        except Exception as exc:  # pragma: no cover - defensive logging
+            logger.error("Failed to validate path: %s", exc, exc_info=True)
+            return web.json_response({"success": False, "error": str(exc)}, status=500)
+

 class CustomWordsHandler:
    """Handler for autocomplete via TagFTSIndex."""
@@ -4001,7 +4143,7 @@ class MiscHandlerSet:
        doctor: DoctorHandler,
        example_workflows: ExampleWorkflowsHandler,
        base_model: BaseModelHandlerSet,
-        hf_handler: Any = None,
+        model_source_handler: Any = None,
        agent_handler: Any = None,
        download_routing: Any = None,
    ) -> None:
@@ -4022,7 +4164,7 @@ class MiscHandlerSet:
        self.doctor = doctor
        self.example_workflows = example_workflows
        self.base_model = base_model
-        self.hf_handler = hf_handler
+        self.model_source_handler = model_source_handler
        self.agent_handler = agent_handler
        self.download_routing = download_routing

@@ -4070,15 +4212,21 @@ class MiscHandlerSet:
            "open_settings_location": self.filesystem.open_settings_location,
            "open_backup_location": self.filesystem.open_backup_location,
            "open_wildcards_location": self.filesystem.open_wildcards_location,
+            "browse_directory": self.filesystem.browse_directory,
+            "validate_path": self.filesystem.validate_path,
            "search_custom_words": self.custom_words.search_custom_words,
            "search_wildcards": self.wildcards.search_wildcards,
            "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,
-            "set_hf_url": self.hf_handler.set_hf_url,
+            # External model sources (Hugging Face / ModelScope)
+            "list_model_source_files": self.model_source_handler.list_model_source_files,
+            "download_model_source": self.model_source_handler.download_model_source,
+            "get_hf_repo_files": self.model_source_handler.list_model_source_files,
+            "download_hf_model": self.model_source_handler.download_model_source,
+            "set_hf_url": self.model_source_handler.set_hf_url,
+            "get_model_sources": self.model_source_handler.get_model_sources,
            # Agent skill handlers
            "get_agent_skills": self.agent_handler.get_agent_skills,
            "execute_agent_skill": self.agent_handler.execute_agent_skill,
@@ -37,10 +37,14 @@ from ...services.use_cases import (
    DownloadModelEarlyAccessError,
    DownloadModelUseCase,
    DownloadModelValidationError,
+    FilenameTemplateUseCase,
    MetadataRefreshProgressReporter,
 )
 from ...services.websocket_manager import WebSocketManager
-from ...services.websocket_progress_callback import WebSocketProgressCallback
+from ...services.websocket_progress_callback import (
+    WebSocketFilenameTemplateProgressCallback,
+    WebSocketProgressCallback,
+)
 from ...services.download_queue_service import DownloadQueueService
 from ...services.errors import RateLimitError, ResourceNotFoundError
 from ...utils.civitai_utils import resolve_license_payload
@@ -1910,6 +1914,11 @@ class ModelDownloadHandler:
                response_payload["status"] = status
                if "message" in progress_data:
                    response_payload["message"] = progress_data["message"]
+                # Post-transfer stage (indexing / source metadata); polling
+                # consumers need it to tell "working" from "stuck".
+                for field in ("stage", "platform"):
+                    if field in progress_data:
+                        response_payload[field] = progress_data[field]
            elif status is None and "message" in progress_data:
                response_payload["message"] = progress_data["message"]

@@ -2479,6 +2488,90 @@ class ModelMoveHandler:
        self._move_service = move_service
        self._logger = logger

+    async def create_folder(self, request: web.Request) -> web.Response:
+        try:
+            data = await request.json()
+        except Exception:
+            return web.json_response(
+                {"success": False, "error": "Invalid JSON body"}, status=400
+            )
+        try:
+            folder_path = data.get("folder_path")
+            if not folder_path:
+                return web.json_response(
+                    {"success": False, "error": "Folder path is required"}, status=400
+                )
+            result = await self._move_service.create_folder(folder_path)
+            status = 200 if result.get("success") else 400
+            return web.json_response(result, status=status)
+        except Exception as exc:
+            self._logger.error("Error creating folder: %s", exc, exc_info=True)
+            return web.json_response({"success": False, "error": str(exc)}, status=500)
+
+    async def delete_folder(self, request: web.Request) -> web.Response:
+        try:
+            data = await request.json()
+        except Exception:
+            return web.json_response(
+                {"success": False, "error": "Invalid JSON body"}, status=400
+            )
+        try:
+            folder_path = data.get("folder_path")
+            if not folder_path:
+                return web.json_response(
+                    {"success": False, "error": "Folder path is required"}, status=400
+                )
+            dry_run = bool(data.get("dry_run"))
+            result = await self._move_service.delete_folder(
+                folder_path, dry_run=dry_run
+            )
+            if result.get("success"):
+                if not dry_run:
+                    _broadcast_models_changed()
+                return web.json_response(result, status=200)
+
+            # "not_empty" / "busy" are conflicts between the tree the client
+            # rendered and the on-disk truth; everything else is a bad request.
+            code = result.get("code")
+            status = 409 if code in ("not_empty", "busy") else 400
+            return web.json_response(result, status=status)
+        except Exception as exc:
+            self._logger.error("Error deleting folder: %s", exc, exc_info=True)
+            return web.json_response({"success": False, "error": str(exc)}, status=500)
+
+    async def rename_folder(self, request: web.Request) -> web.Response:
+        try:
+            data = await request.json()
+        except Exception:
+            return web.json_response(
+                {"success": False, "error": "Invalid JSON body"}, status=400
+            )
+        try:
+            folder_path = data.get("folder_path")
+            new_name = data.get("new_name")
+            if not folder_path:
+                return web.json_response(
+                    {"success": False, "error": "Folder path is required"}, status=400
+                )
+            if not new_name:
+                return web.json_response(
+                    {"success": False, "error": "New folder name is required"}, status=400
+                )
+            result = await self._move_service.rename_folder(folder_path, new_name)
+            if result.get("success"):
+                if result.get("renamed"):
+                    _broadcast_models_changed()
+                return web.json_response(result, status=200)
+
+            # A name collision or a staged delete inside the subtree is a
+            # conflict with the state the client rendered, not a bad request.
+            code = result.get("code")
+            status = 409 if code in ("target_exists", "busy") else 400
+            return web.json_response(result, status=status)
+        except Exception as exc:
+            self._logger.error("Error renaming folder: %s", exc, exc_info=True)
+            return web.json_response({"success": False, "error": str(exc)}, status=500)
+
    async def move_model(self, request: web.Request) -> web.Response:
        try:
            data = await request.json()
@@ -2603,6 +2696,71 @@ class ModelAutoOrganizeHandler:
            return web.json_response({"success": False, "error": str(exc)}, status=500)


+class ModelFilenameTemplateHandler:
+    """Apply the configured filename template to existing library models."""
+
+    def __init__(
+        self,
+        *,
+        use_case: FilenameTemplateUseCase,
+        progress_callback: WebSocketFilenameTemplateProgressCallback,
+        logger: logging.Logger,
+    ) -> None:
+        self._use_case = use_case
+        self._progress_callback = progress_callback
+        self._logger = logger
+
+    async def apply_filename_template(self, request: web.Request) -> web.Response:
+        try:
+            file_paths = None
+            if request.method == "POST":
+                try:
+                    data = await request.json()
+                    file_paths = data.get("file_paths")
+                except Exception:  # pragma: no cover - permissive path
+                    pass
+            else:
+                # GET variant (browser extension is GET-only): comma-separated
+                # file_paths query parameter.
+                raw_file_paths = request.query.get("file_paths")
+                if raw_file_paths:
+                    file_paths = [
+                        path.strip()
+                        for path in raw_file_paths.split(",")
+                        if path.strip()
+                    ]
+
+            result = await self._use_case.execute(
+                file_paths=file_paths,
+                progress_callback=self._progress_callback,
+            )
+            _broadcast_models_changed()
+            return web.json_response(result.to_dict())
+        except AutoOrganizeInProgressError:
+            return web.json_response(
+                {
+                    "success": False,
+                    "error": "Another library operation is already running. Please wait for it to complete.",
+                },
+                status=409,
+            )
+        except Exception as exc:
+            self._logger.error(
+                "Error in apply_filename_template: %s", exc, exc_info=True
+            )
+            try:
+                await self._progress_callback.on_progress(
+                    {
+                        "type": "filename_template_progress",
+                        "status": "error",
+                        "error": str(exc),
+                    }
+                )
+            except Exception:  # pragma: no cover - defensive reporting
+                pass
+            return web.json_response({"success": False, "error": str(exc)}, status=500)
+
+
 class ModelUpdateHandler:
    """Handle update tracking requests."""

@@ -3370,6 +3528,7 @@ class ModelHandlerSet:
    civitai: ModelCivitaiHandler
    move: ModelMoveHandler
    auto_organize: ModelAutoOrganizeHandler
+    filename_template: ModelFilenameTemplateHandler
    updates: ModelUpdateHandler

    def to_route_mapping(
@@ -3429,8 +3588,12 @@ class ModelHandlerSet:
            "get_civitai_model_by_hash": self.civitai.get_civitai_model_by_hash,
            "move_model": self.move.move_model,
            "move_models_bulk": self.move.move_models_bulk,
+            "create_folder": self.move.create_folder,
+            "delete_folder": self.move.delete_folder,
+            "rename_folder": self.move.rename_folder,
            "auto_organize_models": self.auto_organize.auto_organize_models,
            "get_auto_organize_progress": self.auto_organize.get_auto_organize_progress,
+            "apply_filename_template": self.filename_template.apply_filename_template,
            "get_model_notes": self.query.get_model_notes,
            "get_model_preview_url": self.query.get_model_preview_url,
            "get_model_civitai_url": self.query.get_model_civitai_url,
@@ -1,8 +1,13 @@
-"""Handlers for Hugging Face model listing and download.
+"""Handlers for external model sources: linking, file listing and downloads.

-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.
+Covers every site registered in :mod:`py.services.model_sources`.  The module
+was Hugging Face only (``hf_handlers.py`` / ``HfHandler``) until ModelScope
+downloads were added; the per-site differences now live in the providers, so
+this file has no platform branches beyond the capability lookups.
+
+The historical route paths (``/api/lm/set-hf-url``, ``/api/lm/hf-repo-files``,
+``/api/lm/download-hf-model``) are still registered as aliases of the generic
+handlers, so existing callers keep working.
 """

 from __future__ import annotations
@@ -10,10 +15,8 @@ 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
@@ -22,10 +25,19 @@ from ...services.downloader import (
    get_downloader,
 )
 from ...services.aria2_downloader import Aria2Downloader
+from ...services.model_sources import (
+    ModelSourceError,
+    SourceRef,
+    detect_source,
+    get_download_source,
+    hydrate_from_source,
+    is_valid_source_id,
+    list_sources,
+    normalize_metadata_source,
+)
 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

@@ -34,28 +46,6 @@ 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
-
-
-async def close_hf_api_session() -> None:
-    """Close the shared HF API session, if it was ever created."""
-    global _hf_api_session
-    if _hf_api_session is not None and not _hf_api_session.closed:
-        await _hf_api_session.close()
-        _hf_api_session = None
-

 def _infer_model_type(model_root: str) -> tuple[Any, str]:
    """Determine model class and scanner by matching ``model_root`` against the
@@ -96,35 +86,96 @@ def _infer_model_type(model_root: str) -> tuple[Any, str]:
    return _DEFAULT_MODEL_CLASS, _DEFAULT_SCANNER_GETTER


-async def _save_hf_metadata(dest_path: str, repo: str, model_root: str) -> None:
+async def _report_phase(
+    download_id: str | None, stage: str, platform: str = ""
+) -> None:
+    """Tell the progress UI which post-transfer stage is running.
+
+    A download's byte counter stops the moment the last byte lands, but the
+    backend still has to index the file and read the model site's API.  Without
+    this the bar sits at 100% reporting "0 B/s" and the download looks stuck for
+    several seconds.  *stage* is machine-readable — the UI localises it — and
+    *platform* lets it name the site the metadata comes from.
+    """
+
+    if not download_id:
+        return
+    try:
+        await ws_manager.broadcast_download_progress(
+            download_id,
+            {
+                "status": "metadata",
+                "stage": stage,
+                "platform": platform,
+                "progress": 100,
+            },
+        )
+    except Exception as exc:  # pragma: no cover - progress must never be fatal
+        logger.debug("Failed to report the '%s' phase: %s", stage, exc)
+
+
+async def _save_source_metadata(
+    dest_path: str, ref: SourceRef, model_root: str, *, download_id: str | None = None
+) -> 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.
+    The metadata is created through the owning scanner rather than
+    ``MetadataManager.create_default_metadata()``, because that is the only
+    factory that knows when hashing must be deferred: ``CheckpointScanner`` and
+    ``OtherScanner`` deliberately record ``hash_status="pending"`` with an empty
+    ``sha256`` for their multi-GB files, and the generic helper would read a
+    10 GB checkpoint end to end *inside the download request*.  Scanners for the
+    small types delegate straight back to it, so nothing changes for them.
+
+    The external-source fields are then overlaid and the model is registered in
+    the in-memory scanner cache so it appears immediately without a full
+    filesystem walk.
+
+    Finally the site's own published metadata is applied (see
+    :func:`~py.services.model_sources.hydration.hydrate_from_source`), so a
+    ModelScope or Hugging Face download lands with the same populated model
+    card a CivitAI download produces instead of a bare filename and hash.
+
+    Both post-transfer stages are reported through *download_id* when the UI is
+    watching one, because neither advances the byte counter.
    """
    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
-        )
+        scanner = None
+        scanner_getter = getattr(ServiceRegistry, scanner_getter_name, None)
+        if scanner_getter is not None:
+            scanner = await scanner_getter()
+
+        # 1. Create proper metadata (reads safetensors headers; hashes only for
+        #    the model types whose scanner does not defer it)
+        await _report_phase(download_id, "indexing", ref.platform)
+        create_metadata = getattr(scanner, "_create_default_metadata", None)
+        if create_metadata is not None:
+            metadata = await create_metadata(dest_path)
+        else:
+            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
+        # 2. Overlay the external-source fields (`hf_url` is written by
+        #    normalisation for Hugging Face only)
+        fields = metadata._unknown_fields
+        fields["source_url"] = ref.url
+        fields["source_platform"] = ref.platform
+        if ref.platform == "huggingface":
+            fields["hf_url"] = ref.url
+        metadata.from_civitai = False  # externally-sourced 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)
+        logger.info(
+            "Saved %s metadata (source=%s, hash_status=%s) for %s",
+            ref.platform, ref.url, getattr(metadata, "hash_status", "?"), dest_path,
+        )

        # 4. Determine relative folder path for cache
        #    model_root is an absolute path; dest_path is under it
@@ -134,17 +185,19 @@ async def _save_hf_metadata(dest_path: str, repo: str, model_root: str) -> None:
            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)
+        if scanner is not None:
+            metadata_dict = normalize_metadata_source(metadata.to_dict())
+            await scanner.add_model_to_cache(metadata_dict, folder)
+            logger.info("Added %s to scanner cache (folder=%s)", dest_path, folder)
+
+        # 6. Top up from the site's public API. Runs last so the scanner-cache
+        #    refresh it performs lands on the entry created above. It never
+        #    raises and never fails the download.
+        await _report_phase(download_id, "source", ref.platform)
+        await hydrate_from_source(dest_path, ref=ref)

    except Exception as exc:
-        logger.warning("Failed to save HF metadata for %s: %s", dest_path, exc)
+        logger.warning("Failed to save source metadata for %s: %s", dest_path, exc)


 def _find_matching_root(dest_dir: str) -> str | None:
@@ -186,30 +239,87 @@ async def _add_to_scanner_cache(dest_path: str, metadata: dict[str, Any]) -> Non
    await scanner.update_single_model_cache(dest_path, dest_path, metadata)


-class HfHandler:
-    """Handle Hugging Face model browsing and download."""
+def _unsupported_platform_error(platform: str) -> web.Response:
+    supported = ", ".join(source.label for source in list_sources() if source.supports_download)
+    return web.json_response(
+        {"error": f"'{platform}' does not support downloads. Supported: {supported}"},
+        status=400,
+    )
+
+
+class ModelSourceHandler:
+    """Handle external model browsing, linking and downloads."""
+
+    async def get_model_sources(self, request: web.Request) -> web.Response:
+        """List the external model sites the UI can link a model to.
+
+        Used by the "Link Model" dialog to validate URLs client-side, to
+        explain which sites support AI metadata enrichment, and to pick the
+        right download endpoint/revision.
+        """
+
+        return web.json_response([
+            {
+                "platform": source.platform,
+                "label": source.label,
+                "supports_enrichment": source.supports_enrichment,
+                "supports_download": source.supports_download,
+                "default_revision": source.default_revision,
+                "example_url": source.canonical_url(
+                    "user/repo" if source.platform != "tensorart" else "827823520299086029"
+                ),
+            }
+            for source in list_sources()
+        ])

    async def set_hf_url(self, request: web.Request) -> web.Response:
+        """Link a model file to its page on an external model site.
+
+        Accepts ``source_url`` (preferred) or the legacy ``hf_url`` / ``url``
+        payload key.  Every registered site is recognised and the platform is
+        stored alongside the canonical URL.  TensorArt models can be linked and
+        browsed, but not AI-enriched.
+
+        The route path keeps its historical ``set-hf-url`` name.
+        """
+
        try:
            payload: dict[str, Any] = await request.json()
        except json.JSONDecodeError:
            return web.json_response({"success": False, "error": "Invalid JSON"}, status=400)

        file_path = (payload.get("file_path") or "").strip()
-        hf_url = (payload.get("hf_url") or "").strip()
+        raw_url = (
+            payload.get("source_url")
+            or payload.get("hf_url")
+            or payload.get("url")
+            or ""
+        )
+        source_url = raw_url.strip() if isinstance(raw_url, str) else ""

-        if not file_path or not hf_url:
-            return web.json_response(
-                {"success": False, "error": "Missing required fields: 'file_path' and 'hf_url'"},
-                status=400,
-            )
-
-        m = re.match(r"^https?://huggingface\.co/([^/]+/[^/]+)/?$", hf_url)
-        if not m:
+        if not file_path or not source_url:
            return web.json_response(
                {
                    "success": False,
-                    "error": "Invalid HuggingFace URL. Expected format: https://huggingface.co/user/repo",
+                    "error": "Missing required fields: 'file_path' and 'source_url'",
+                },
+                status=400,
+            )
+
+        ref = detect_source(source_url, strict=True)
+        if ref is None:
+            return web.json_response(
+                {
+                    "success": False,
+                    "error": (
+                        "Unsupported model URL. Supported formats: "
+                        + ", ".join(
+                            f"{s.label} ({s.canonical_url('user/repo')})"
+                            if s.platform != "tensorart"
+                            else f"{s.label} (https://tensor.art/models/<id>)"
+                            for s in list_sources()
+                        )
+                    ),
                },
                status=400,
            )
@@ -225,110 +335,120 @@ class HfHandler:
            return web.json_response(
                {
                    "success": False,
-                    "error": "File is not within any configured model directory. Cannot link to HuggingFace.",
+                    "error": "File is not within any configured model directory. Cannot link to a model source.",
                },
                status=400,
            )

        try:
            existing = await MetadataManager.load_metadata_payload(file_path)
-            if existing.get("hf_url") == hf_url:
+
+            already_linked = (
+                (existing.get("source_url") or "").strip() == ref.url
+                and (existing.get("source_platform") or "").strip().lower()
+                == ref.platform
+            ) or (
+                not existing.get("source_url")
+                and ref.platform == "huggingface"
+                and (existing.get("hf_url") or "").strip() == ref.url
+            )
+            if already_linked:
                return web.json_response({
                    "success": True,
-                    "message": "hf_url already set",
-                    "hf_url": hf_url,
+                    "message": "source_url already set",
+                    "source_url": ref.url,
+                    "source_platform": ref.platform,
+                    "hf_url": ref.url if ref.platform == "huggingface" else "",
                })

-            existing["hf_url"] = hf_url
+            existing["source_url"] = ref.url
+            existing["source_platform"] = ref.platform
+            if ref.platform == "huggingface":
+                existing["hf_url"] = ref.url
+            else:
+                existing.pop("hf_url", None)
+            normalize_metadata_source(existing)
+
            # NOTE: deliberately do NOT touch `from_civitai` here. It records
            # where the metadata came from, and the UI must show the CivitAI
-            # link whenever CivitAI data is present — linking HuggingFace must
-            # not hide it (#1094). HF provenance is tracked via `hf_url`.
+            # link whenever CivitAI data is present — linking an external
+            # source must not hide it (#1094). Source provenance is tracked
+            # via `source_platform` / `source_url`.
            await MetadataManager.save_metadata(file_path, existing)

            await _add_to_scanner_cache(file_path, existing)

-            logger.info("Set hf_url=%s for %s", hf_url, file_path)
+            logger.info(
+                "Linked %s to %s source (%s)", file_path, ref.platform, ref.url
+            )
            return web.json_response({
                "success": True,
-                "message": f"hf_url set to {hf_url}",
-                "hf_url": hf_url,
+                "message": f"Linked to {ref.url}",
+                "source_url": ref.url,
+                "source_platform": ref.platform,
+                "hf_url": existing.get("hf_url", ""),
            })
        except Exception as exc:
-            logger.error("Failed to set hf_url for %s: %s", file_path, exc)
+            logger.error("Failed to link %s to a model source: %s", file_path, exc)
            return web.json_response(
                {"success": False, "error": str(exc)},
                status=500,
            )

-    async def get_hf_repo_files(self, request: web.Request) -> web.Response:
-        """List model-weight files from a HF repo with real file sizes.
+    async def list_model_source_files(self, request: web.Request) -> web.Response:
+        """List the downloadable weight files of an external repository.

-        Uses the HF tree API endpoint which returns accurate file sizes
-        (including LFS-tracked files), unlike the model info endpoint.
+        Query params: ``platform``, ``repo`` (``owner/name``), ``revision``
+        (optional; each site has its own default branch).
+
+        Returns a JSON array of ``{"filename", "size"}``, largest first —
+        the same shape the Hugging Face endpoint has always returned.
        """
-        repo = request.query.get("repo", "").strip()
-        if not repo or "/" not in repo:
+
+        platform = (request.query.get("platform") or "").strip()
+        repo = (request.query.get("repo") or "").strip()
+        revision = (request.query.get("revision") or "").strip()
+
+        source = get_download_source(platform)
+        if source is None:
+            return _unsupported_platform_error(platform)
+        if not is_valid_source_id(repo):
            return web.json_response(
-                {"error": "Missing or invalid 'repo' parameter (expected user/repo)"},
+                {"error": "Missing or invalid 'repo' parameter (expected owner/name)"},
                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()
+            files = await source.list_files(repo, revision)
+        except ModelSourceError as exc:
+            return web.json_response({"error": str(exc)}, status=exc.status)
        except Exception as exc:
-            logger.error("Failed to fetch HF repo files: %s", exc)
+            logger.error("Failed to list %s files in %s: %s", platform, repo, 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.
+    async def download_model_source(self, request: web.Request) -> web.Response:
+        """Download a single file from an external repository.

        POST JSON body::

            {
-              "repo": "dx8152/Flux2-Klein-9B-Consistency",
-              "filename": "Flux2-Klein-9B-consistency-V2.safetensors",
-              "revision": "main",
+              "platform": "modelscope",
+              "repo": "owner/name",
+              "filename": "subdir/model.safetensors",
+              "revision": "master",
              "model_root": "loras",
              "relative_path": "",
              "use_default_paths": false,
              "download_id": "optional-batch-id"
            }

+        ``platform`` defaults to ``huggingface`` when omitted, which keeps the
+        legacy ``/api/lm/download-hf-model`` payload working unchanged.
+
        If ``download_id`` is provided, real-time progress (bytes, speed,
-        percentage) is broadcast via the WebSocket progress system, matching
-        the CivitAI download experience.
+        percentage) is broadcast via the WebSocket progress system.

        Respects the ``download_backend`` setting (``aria2`` or ``default``).
        """
@@ -337,30 +457,33 @@ class HfHandler:
        except json.JSONDecodeError:
            return web.json_response({"error": "Invalid JSON"}, status=400)

+        platform = (payload.get("platform") or "huggingface").strip()
        repo = (payload.get("repo") or "").strip()
        filename = (payload.get("filename") or "").strip()
-        revision = (payload.get("revision") or "main").strip()
+        revision = (payload.get("revision") or "").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,
+            "download_model_source: platform=%s repo=%s file=%s root=%s download_id=%s",
+            platform, repo, filename, model_root, download_id,
        )

+        source = get_download_source(platform)
+        if source is None:
+            return _unsupported_platform_error(platform)
+
        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):
+        # `owner/name` only; the components become path segments below.
+        if not is_valid_source_id(repo):
            return web.json_response({"error": f"Invalid repo format: {repo}"}, status=400)
+        owner, repo_name = repo.split("/", 1)

        # Validate filename — must not contain path traversal
        if ".." in filename:
@@ -379,40 +502,47 @@ class HfHandler:
        # unnecessary when the frontend sends the path from its own dropdown
        # (populated from scanner roots).  Using the "business path" directly
        # keeps dest_path consistent with scanner roots so that later folder
-        # derivation (in _save_hf_metadata) works correctly.
+        # derivation (in _save_source_metadata) works correctly.
        if os.path.isabs(model_root):
            base_dir = os.path.normpath(model_root)
        else:
            base_dir = os.path.normpath(os.path.join(os.getcwd(), "models", model_root))

        if use_default_paths:
-            target_dir = os.path.join(base_dir, "huggingface", author, repo_name)
+            target_dir = os.path.join(base_dir, source.default_subdir, owner, repo_name)
        elif relative_path:
            target_dir = os.path.join(base_dir, relative_path)
        else:
            target_dir = base_dir

-        # Strip HF repo subdirectory — "diffusion_models/xxx.safetensors"
-        # is an HF repo convention, not meaningful for local storage.
+        # Strip the repository sub-directory — "diffusion_models/xxx.safetensors"
+        # is a repository convention, not meaningful for local storage.
        file_base = os.path.basename(filename)

        os.makedirs(target_dir, exist_ok=True)
        dest_path = os.path.join(target_dir, file_base)

+        # Built per request: sites that redirect to a CDN hand out a
+        # time-limited token in the redirect, so the URL must never be cached.
+        resolve_url = source.file_download_url(repo, filename, revision)
+        ref = SourceRef(
+            platform=source.platform, source_id=repo, url=source.canonical_url(repo)
+        )
+
        # 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)
+            logger.info("download_model_source: file already exists, skipping — %s", dest_path)
+            # The sidecar may predate the source metadata being fetched, or may
+            # have been deleted, so top it up instead of skipping past it.
+            # Hydration no-ops when there is no sidecar to update.
+            await _report_phase(download_id, "source", source.platform)
+            await hydrate_from_source(dest_path, ref=ref)
            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:
@@ -452,28 +582,29 @@ class HfHandler:

        if download_backend == "aria2":
            aria2 = await Aria2Downloader.get_instance()
-            aid = download_id or f"hf_{repo}_{filename}"
+            aid = download_id or f"{source.platform}_{repo}_{filename}"
            try:
-                hf_success, hf_result = await aria2.download_file(
+                ok, 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)
+                if ok:
+                    await _save_source_metadata(
+                        dest_path, ref, model_root, download_id=download_id
+                    )
                    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,
-                    )
+                return web.json_response(
+                    {"success": False, "error": result or "aria2 download failed"},
+                    status=500,
+                )
            except Exception as exc:
-                logger.error("HF download (aria2) failed: %s", exc)
+                logger.error("%s download (aria2) failed: %s", platform, exc)
                return web.json_response(
                    {"success": False, "error": str(exc)}, status=500
                )
@@ -489,19 +620,20 @@ class HfHandler:
                progress_callback=progress_callback,
            )
            if success:
-                await _save_hf_metadata(dest_path, repo, model_root)
+                await _save_source_metadata(
+                    dest_path, ref, model_root, download_id=download_id
+                )
                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,
-                )
+            return web.json_response(
+                {"success": False, "error": result or "Download failed"},
+                status=500,
+            )
        except Exception as exc:
-            logger.error("HF download failed: %s", exc)
+            logger.error("%s download failed: %s", platform, exc)
            return web.json_response(
                {"success": False, "error": str(exc)}, status=500
            )
@@ -9,7 +9,6 @@ import re
 import asyncio
 import tempfile
 from dataclasses import dataclass
-from pathlib import Path
 from typing import Any, Awaitable, Callable, Dict, List, Mapping, Optional, Protocol, Tuple

 from aiohttp import web
@@ -34,6 +33,7 @@ from ...utils.civitai_utils import (
    rewrite_preview_url,
 )
 from ...utils.constants import NSFW_LEVELS
+from ...utils.directory_browser import WINDOWS_DRIVES_TOKEN, browse_directory
 from ...utils.exif_utils import ExifUtils
 from ...utils.recipe_open_stats import RecipeOpenStats
 from ...recipes.merger import GenParamsMerger
@@ -3124,11 +3124,10 @@ class RecipeWorkflowHandler:
 class BatchImportHandler:
    """Handle batch import operations for recipes."""

-    # Virtual path token for the Windows drive list. Browsing up from a drive
-    # root (e.g. C:\) lands here so users can switch drives without typing a
-    # path. Only meaningful on Windows; elsewhere it falls through to normal
-    # path handling and fails the existence check.
-    WINDOWS_DRIVES_TOKEN = "__drives__"
+    # Virtual path token for the Windows drive list. Kept as a class
+    # attribute for backwards compatibility; the canonical definition lives
+    # in py/utils/directory_browser.py.
+    WINDOWS_DRIVES_TOKEN = WINDOWS_DRIVES_TOKEN

    def __init__(
        self,
@@ -3301,131 +3300,8 @@ class BatchImportHandler:
        """Browse a directory and return its contents (subdirectories and files)."""
        try:
            data = await request.json()
-            directory_path = data.get("path", "")
-
-            if os.name == "nt" and directory_path == self.WINDOWS_DRIVES_TOKEN:
-                return self._windows_drives_response()
-
-            # Default to the user's home directory. The frontend previously
-            # sent "/" as the initial path, which is POSIX-only: on Windows it
-            # resolves to the current drive root and then fails the access
-            # check below.
-            if not directory_path:
-                path = Path.home()
-            else:
-                path = Path(directory_path).expanduser().resolve()
-
-            # Access check: browsing intentionally covers the whole server
-            # filesystem (the server operator browses their own machine). On
-            # POSIX every absolute path is under "/", but Path("/") has no
-            # drive letter on Windows and can never anchor a drive-qualified
-            # path in relative_to(), so test for a drive there instead.
-            if os.name == "nt":
-                is_allowed = bool(path.drive)
-            else:
-                is_allowed = path.is_absolute()
-
-            if not is_allowed:
-                return web.json_response(
-                    {"success": False, "error": "Access denied to this directory"},
-                    status=403,
-                )
-
-            if not path.exists():
-                return web.json_response(
-                    {"success": False, "error": "Directory does not exist"},
-                    status=404,
-                )
-
-            if not path.is_dir():
-                return web.json_response(
-                    {"success": False, "error": "Path is not a directory"},
-                    status=400,
-                )
-
-            # List directory contents
-            directories = []
-            image_files = []
-
-            image_extensions = {
-                ".jpg",
-                ".jpeg",
-                ".png",
-                ".gif",
-                ".webp",
-                ".bmp",
-                ".tiff",
-                ".tif",
-            }
-
-            try:
-                for item in path.iterdir():
-                    try:
-                        if item.is_dir():
-                            # Skip hidden directories and common system folders
-                            if not item.name.startswith(".") and item.name not in [
-                                "__pycache__",
-                                "node_modules",
-                            ]:
-                                directories.append(
-                                    {
-                                        "name": item.name,
-                                        "path": str(item),
-                                        "is_parent": False,
-                                    }
-                                )
-                        elif item.is_file() and item.suffix.lower() in image_extensions:
-                            image_files.append(
-                                {
-                                    "name": item.name,
-                                    "path": str(item),
-                                    "size": item.stat().st_size,
-                                }
-                            )
-                    except (PermissionError, OSError):
-                        # Skip files/directories we can't access
-                        continue
-
-                # Sort directories and files alphabetically
-                directories.sort(key=lambda x: x["name"].lower())
-                image_files.sort(key=lambda x: x["name"].lower())
-
-                # Parent directory. A filesystem root is its own parent
-                # (parent == path): POSIX "/" gets no parent, while a Windows
-                # drive root (C:\) links up to the virtual drive list so users
-                # can switch drives. The previous str(path) != str(path.root)
-                # check misfired on Windows, where a drive root's parent is
-                # itself, producing an infinite self-loop.
-                if path.parent == path:
-                    parent_path = (
-                        self.WINDOWS_DRIVES_TOKEN if os.name == "nt" else None
-                    )
-                else:
-                    parent_path = str(path.parent)
-
-                return web.json_response(
-                    {
-                        "success": True,
-                        "current_path": str(path),
-                        "parent_path": parent_path,
-                        "directories": directories,
-                        "image_files": image_files,
-                        "image_count": len(image_files),
-                        "directory_count": len(directories),
-                    }
-                )
-
-            except PermissionError:
-                return web.json_response(
-                    {"success": False, "error": "Permission denied"},
-                    status=403,
-                )
-            except OSError as exc:
-                return web.json_response(
-                    {"success": False, "error": f"Error reading directory: {str(exc)}"},
-                    status=500,
-                )
-
+            payload, status = browse_directory(data.get("path", ""))
+            return web.json_response(payload, status=status)
        except json.JSONDecodeError:
            return web.json_response(
                {"success": False, "error": "Invalid JSON"},
@@ -3434,30 +3310,3 @@ class BatchImportHandler:
        except Exception as exc:
            self._logger.error("Error browsing directory: %s", exc, exc_info=True)
            return web.json_response({"success": False, "error": str(exc)}, status=500)
-
-    def _windows_drives_response(self) -> web.Response:
-        """List available drive letters as a virtual directory (Windows only)."""
-        try:
-            drives = os.listdrives()
-        except AttributeError:  # Python < 3.12
-            drives = [
-                f"{letter}:\\"
-                for letter in "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                if os.path.exists(f"{letter}:\\")
-            ]
-        directories = [
-            {"name": drive, "path": drive, "is_parent": False} for drive in drives
-        ]
-        return web.json_response(
-            {
-                "success": True,
-                # Empty current_path marks the virtual level; the frontend
-                # disables folder selection there.
-                "current_path": "",
-                "parent_path": None,
-                "directories": directories,
-                "image_files": [],
-                "image_count": 0,
-                "directory_count": len(directories),
-            }
-        )
@@ -37,6 +37,8 @@ MISC_ROUTE_DEFINITIONS: tuple[RouteDefinition, ...] = (
    RouteDefinition("GET", "/api/lm/wildcards/search", "search_wildcards"),
    RouteDefinition("POST", "/api/lm/wildcards/open-location", "open_wildcards_location"),
    RouteDefinition("POST", "/api/lm/open-file-location", "open_file_location"),
+    RouteDefinition("POST", "/api/lm/browse-directory", "browse_directory"),
+    RouteDefinition("POST", "/api/lm/validate-path", "validate_path"),
    RouteDefinition("POST", "/api/lm/update-usage-stats", "update_usage_stats"),
    RouteDefinition("GET", "/api/lm/get-usage-stats", "get_usage_stats"),
    RouteDefinition("POST", "/api/lm/update-lora-code", "update_lora_code"),
@@ -99,7 +101,11 @@ MISC_ROUTE_DEFINITIONS: tuple[RouteDefinition, ...] = (
    RouteDefinition(
        "GET", "/api/lm/delete-model-version", "delete_model_version"
    ),
-    # Hugging Face model endpoints
+    # External model source endpoints (Hugging Face / ModelScope).
+    # The hf-* paths are the historical names, kept as aliases.
+    RouteDefinition(
+        "GET", "/api/lm/model-source-files", "list_model_source_files"
+    ),
    RouteDefinition(
        "GET", "/api/lm/hf-repo-files", "get_hf_repo_files"
    ),
@@ -107,12 +113,19 @@ MISC_ROUTE_DEFINITIONS: tuple[RouteDefinition, ...] = (
    RouteDefinition(
        "POST", "/api/lm/download/routing", "get_download_routing"
    ),
+    RouteDefinition(
+        "POST", "/api/lm/download-model-source", "download_model_source"
+    ),
    RouteDefinition(
        "POST", "/api/lm/download-hf-model", "download_hf_model"
    ),
    RouteDefinition(
        "POST", "/api/lm/set-hf-url", "set_hf_url"
    ),
+    # Supported external model sites (Hugging Face / ModelScope / TensorArt)
+    RouteDefinition(
+        "GET", "/api/lm/model-sources", "get_model_sources"
+    ),
    # Agent skill endpoints
    RouteDefinition(
        "GET", "/api/lm/agent/skills", "get_agent_skills"
@@ -39,7 +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 .handlers.model_source_handlers import ModelSourceHandler
 from .handlers.agent_handlers import AgentHandler
 from .handlers.download_routing_handlers import DownloadRoutingHandler
 from .misc_route_registrar import MiscRouteRegistrar
@@ -139,7 +139,7 @@ class MiscRoutes:
        doctor = DoctorHandler(settings_service=self._settings)
        example_workflows = ExampleWorkflowsHandler()
        base_model = BaseModelHandlerSet()
-        hf_handler = HfHandler()
+        model_source_handler = ModelSourceHandler()
        agent_handler = AgentHandler()
        download_routing = DownloadRoutingHandler()

@@ -161,7 +161,7 @@ class MiscRoutes:
            doctor=doctor,
            example_workflows=example_workflows,
            base_model=base_model,
-            hf_handler=hf_handler,
+            model_source_handler=model_source_handler,
            agent_handler=agent_handler,
            download_routing=download_routing,
        )
@@ -40,11 +40,20 @@ COMMON_ROUTE_DEFINITIONS: tuple[RouteDefinition, ...] = (
    RouteDefinition("POST", "/api/lm/{prefix}/verify-duplicates", "verify_duplicates"),
    RouteDefinition("POST", "/api/lm/{prefix}/move_model", "move_model"),
    RouteDefinition("POST", "/api/lm/{prefix}/move_models_bulk", "move_models_bulk"),
+    RouteDefinition("POST", "/api/lm/{prefix}/create-folder", "create_folder"),
+    RouteDefinition("POST", "/api/lm/{prefix}/delete-folder", "delete_folder"),
+    RouteDefinition("POST", "/api/lm/{prefix}/rename-folder", "rename_folder"),
    RouteDefinition("GET", "/api/lm/{prefix}/auto-organize", "auto_organize_models"),
    RouteDefinition("POST", "/api/lm/{prefix}/auto-organize", "auto_organize_models"),
    RouteDefinition(
        "GET", "/api/lm/{prefix}/auto-organize-progress", "get_auto_organize_progress"
    ),
+    RouteDefinition(
+        "GET", "/api/lm/{prefix}/apply-filename-template", "apply_filename_template"
+    ),
+    RouteDefinition(
+        "POST", "/api/lm/{prefix}/apply-filename-template", "apply_filename_template"
+    ),
    RouteDefinition("GET", "/api/lm/{prefix}/top-tags", "get_top_tags"),
    RouteDefinition("GET", "/api/lm/{prefix}/search-tags", "search_tags"),
    RouteDefinition("GET", "/api/lm/{prefix}/base-models", "get_base_models"),
@@ -83,11 +83,16 @@ class OtherRoutes(BaseModelRoutes):
        # resolved to no existing folder. Render an actionable empty state
        # instead of an apparently broken empty grid.
        standalone_mode = os.environ.get("LORA_MANAGER_STANDALONE", "0") == "1"
-        return {
+        context = {
            "other_disabled": False,
            "other_no_paths": not bool(config.other_roots),
            "standalone_mode": standalone_mode,
        }
+        if standalone_mode:
+            # The empty state points at the Model Paths settings section and
+            # shows the settings.json path as a fallback reference.
+            context["settings_file"] = getattr(self._settings, "settings_file", "") or ""
+        return context

    def _get_expected_model_types(self) -> str:
        """Get expected model types string for error messages"""
@@ -21,7 +21,20 @@ NETWORK_EXCEPTIONS = (ClientError, OSError, asyncio.TimeoutError)
 # 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')
+# ``cache`` covers the resolved cache tree (cache/model, cache/recipe,
+# cache/fts, ...); the legacy ``recipe_cache`` / ``model_cache`` directories
+# are listed too because a portable install can predate the cache/ move.
+_PRESERVE_DIRS = (
+    'settings.json',
+    'civitai',
+    'wildcards',
+    'backups',
+    'stats',
+    'logs',
+    'cache',
+    'model_cache',
+    'recipe_cache',
+)


 def _clean_excludes() -> List[str]:
@@ -19,16 +19,21 @@ from __future__ import annotations
 import asyncio
 import json
 import logging
+import os
 import re
 from dataclasses import dataclass, field
 from typing import Any, Dict, List, Optional

-import aiohttp
-
-import os
-
 from ...config import config
 from ..llm_service import LLMService
+from ..model_sources import (
+    ModelCardContext,
+    ModelSourceCache,
+    get_source,
+    resolve_source_ref,
+    source_label,
+)
+from ..model_sources.hydration import load_model_card, resolve_site_base_model
 from ..websocket_manager import ws_manager
 from .post_processor import PostProcessor
 from .skill_registry import SkillRegistry
@@ -255,6 +260,11 @@ class AgentService:
        llm = await self._ensure_llm()
        llm_configured = llm.is_configured() if skill.llm_required else True

+        # A collection repository holds many model files under one source id;
+        # this memo keeps the README and the repository metadata from being
+        # re-fetched once per file.  It lives for this run only.
+        source_cache = ModelSourceCache()
+
        for model_path in model_paths:
            model_filename = os.path.basename(model_path)
            logger.info(
@@ -267,24 +277,50 @@ class AgentService:
                from ...metadata_ops import read_metadata
                metadata = await read_metadata(model_path)

-                # Fast-fail: enrich_hf_metadata requires hf_url to have HF README context
-                if skill_name == "enrich_hf_metadata" and not metadata.get("hf_url", ""):
-                    logger.info(
-                        "[%s] SKIP %s — no hf_url in metadata",
-                        skill_name, model_filename,
-                    )
-                    skipped_count += 1
-                    skip_model = True
+                # Fast-fail: enrich_hf_metadata needs an external model source
+                # that exposes an accessible model card.
+                if skill_name == "enrich_hf_metadata":
+                    skip_reason = self._enrichment_skip_reason(metadata)
+                    if skip_reason:
+                        logger.info(
+                            "[%s] SKIP %s — %s",
+                            skill_name, model_filename, skip_reason,
+                        )
+                        skipped_count += 1
+                        skip_model = True

                if not skip_model:
-                    prompt_vars: Dict[str, Any] = {"model_path": model_path}
-                    if skill.llm_required and llm_configured:
-                        prompt_vars = await self._build_prompt_context(
-                            skill_name, model_path, metadata, registry, llm,
+                    # The site's own data is deterministic and must land whether
+                    # or not an LLM is available: a user without a key still gets
+                    # the author summary, the example images and the tags.
+                    source_vars, source_context = await self._load_source_card(
+                        model_path, metadata, cache=source_cache,
+                    )
+                    resolved_base_model = ""
+                    if skill_name == "enrich_hf_metadata" and not (
+                        metadata.get("base_model") or ""
+                    ).strip():
+                        resolved_base_model = await self._resolve_site_base_model(
+                            source_context,
                        )

                    llm_response: Optional[Dict[str, Any]] = None
-                    if skill.llm_required and llm_configured:
+                    if skill.llm_required and not llm_configured:
+                        # Without a provider the deterministic model-source data
+                        # still lands; the LLM-only fields simply stay untouched.
+                        logger.info(
+                            "[%s] No LLM configured for %s — applying %s data only",
+                            skill_name, model_filename,
+                            "model-source"
+                            if not source_context.is_empty()
+                            else "README",
+                        )
+                    elif skill.llm_required:
+                        prompt_vars = await self._build_prompt_context(
+                            skill_name, model_path, metadata, registry, llm,
+                            source_vars=source_vars,
+                            source_context=source_context,
+                        )
                        prompt_template = registry.load_prompt(skill_name)
                        rendered = _render_prompt(prompt_template, prompt_vars)
                        llm_response = await llm.chat_completion_json(
@@ -307,7 +343,9 @@ class AgentService:
                        model_path=model_path,
                        llm_output=llm_response or {},
                        metadata=metadata,
-                        readme_content=prompt_vars.get("readme_content_full", ""),
+                        readme_content=source_vars.get("readme_content_full", ""),
+                        source_context=source_context,
+                        resolved_base_model=resolved_base_model,
                    )

                    if model_result.get("success", True):
@@ -358,6 +396,28 @@ class AgentService:
    # Base model grouping (keeps the prompt compact)
    # ------------------------------------------------------------------

+    @staticmethod
+    def _enrichment_skip_reason(metadata: Dict[str, Any]) -> str:
+        """Return why ``enrich_hf_metadata`` cannot run, or ``""`` if it can.
+
+        Distinguishes the three cases the user can act on: no source linked,
+        a source we don't know, and a known source whose model card is not
+        reachable from the backend (TensorArt).
+        """
+
+        ref = resolve_source_ref(metadata)
+        if ref is None:
+            return "no model source linked (source_url missing)"
+        source = get_source(ref.platform)
+        if source is None:
+            return f"unsupported model source platform '{ref.platform}'"
+        if not source.supports_enrichment:
+            return (
+                f"{source.label} does not expose a model card to the backend; "
+                "AI metadata enrichment is not available for this source"
+            )
+        return ""
+
    @staticmethod
    def _format_base_models(models: List[str]) -> str:
        """Format the base model list as a flat, one-per-line list.
@@ -368,6 +428,82 @@ class AgentService:
        """
        return "\n".join(f"- {m}" for m in models)

+    async def _load_source_card(
+        self,
+        model_path: str,
+        metadata: Dict[str, Any],
+        *,
+        cache: Optional[ModelSourceCache] = None,
+    ) -> tuple[Dict[str, Any], ModelCardContext]:
+        """Fetch the model card and site-published extras for one model.
+
+        Runs for every source-backed enrichment regardless of LLM
+        availability, because everything it returns is deterministic data that
+        should be applied even without a configured provider.
+
+        *cache* is the per-run memo created by :meth:`execute_skill`.  The
+        README is repository-wide, so it is fetched once per source id; only
+        successful reads are memoised, leaving a transient failure to be
+        retried for the next file.
+        """
+
+        variables: Dict[str, Any] = {
+            "asset_base_url": "",
+            "source_description": "",
+            "source_base_model": "",
+            "source_official_tags": "",
+            "source_example_images": "",
+            "source_trigger_words": "",
+            "readme_content": "(README not available)",
+            "readme_content_full": "",
+        }
+
+        ref = resolve_source_ref(metadata)
+        source = get_source(ref.platform) if ref is not None else None
+        if ref is None or source is None or not source.supports_enrichment:
+            return variables, ModelCardContext()
+
+        raw_basename = os.path.splitext(os.path.basename(model_path))[0]
+        variables["asset_base_url"] = source.asset_base_url(ref.source_id)
+
+        readme = await load_model_card(source, ref.source_id, cache)
+
+        # Sites such as ModelScope keep part of the model card outside the
+        # README (author summary, curated tags, per-file example images).  The
+        # recorded hash identifies the file even after the user renames it.
+        card_context = await source.fetch_model_card_context(
+            ref.source_id,
+            os.path.basename(model_path),
+            sha256=(metadata.get("sha256") or "").strip(),
+            cache=cache,
+        )
+        variables["source_description"] = card_context.description
+        variables["source_base_model"] = card_context.base_model
+        variables["source_official_tags"] = "\n".join(
+            f"- {tag}" for tag in card_context.official_tags
+        )
+        variables["source_example_images"] = "\n".join(
+            f"- {url}" for url in card_context.example_images
+        )
+        variables["source_trigger_words"] = ", ".join(card_context.trigger_words)
+
+        # Trim README to the section relevant to this model file
+        # (collection repos often have multiple models in one README).
+        if readme and raw_basename:
+            trimmed = extract_relevant_section(readme, raw_basename)
+            cleaned = clean_readme_for_llm(trimmed) if trimmed else ""
+        else:
+            cleaned = clean_readme_for_llm(readme) if readme else ""
+        variables["readme_content"] = cleaned if cleaned else "(README not available)"
+        variables["readme_content_full"] = readme or ""
+
+        return variables, card_context
+
+    async def _resolve_site_base_model(self, source_context: ModelCardContext) -> str:
+        """Resolve the site's base-model hints to a canonical name, or ``""``."""
+
+        return await resolve_site_base_model(source_context)
+
    async def _build_prompt_context(
        self,
        skill_name: str,
@@ -375,19 +511,45 @@ class AgentService:
        metadata: Dict[str, Any],
        registry: SkillRegistry,
        llm: Any,
+        *,
+        source_vars: Optional[Dict[str, Any]] = None,
+        source_context: Optional[ModelCardContext] = None,
    ) -> Dict[str, Any]:
        """Gather variables for the skill's prompt template.

-        Reads metadata, fetches the HF README (if applicable), lists available
+        Reads metadata, fetches the model card (unless a pre-fetched
+        *source_vars* / *source_context* pair is supplied), lists available
        base models, loads user priority tags, and returns a dict that maps to
        ``{{variable}}`` placeholders in ``prompt.md``.
        """
        from ...metadata_ops import identify_model_type, list_base_models
        from ..settings_manager import SettingsManager

+        if source_vars is None or source_context is None:
+            source_vars, source_context = await self._load_source_card(
+                model_path, metadata,
+            )
+
        context: Dict[str, Any] = {
            "model_path": model_path,
            "model_basename": "",
+            # Canonical external-source variables
+            "source_url": "",
+            "source_id": "",
+            "source_platform": "",
+            "source_label": "",
+            "asset_base_url": "",
+            # Site-provided card extras (see ModelSource.fetch_model_card_context)
+            "source_description": "",
+            "source_base_model": "",
+            "source_official_tags": "",
+            "source_example_images": "",
+            "source_trigger_words": "",
+            # Carrier for the structured context handed to the post-processor;
+            # never rendered into the prompt.
+            "source_context": ModelCardContext(),
+            # Legacy Hugging Face aliases (kept so older prompt templates and
+            # third-party skills keep rendering)
            "hf_url": "",
            "repo": "",
            "readme_content": "",
@@ -411,21 +573,29 @@ class AgentService:
            "size": metadata.get("size", 0),
        }

-        hf_url = metadata.get("hf_url", "")
-        context["hf_url"] = hf_url
-        repo = self._extract_repo_from_url(hf_url) if hf_url else ""
-        context["repo"] = repo or ""
-        if repo:
-            readme = await self._fetch_readme(repo)
-            # Trim README to the section relevant to this model file
-            # (collection repos often have multiple models in one README).
-            if readme and raw_basename:
-                trimmed = extract_relevant_section(readme, raw_basename)
-                cleaned = clean_readme_for_llm(trimmed) if trimmed else ""
-            else:
-                cleaned = clean_readme_for_llm(readme) if readme else ""
-            context["readme_content"] = cleaned if cleaned else "(README not available)"
-            context["readme_content_full"] = readme or ""
+        ref = resolve_source_ref(metadata)
+        if ref is not None:
+            context["source_url"] = ref.url
+            context["source_id"] = ref.source_id
+            context["source_platform"] = ref.platform
+            context["source_label"] = source_label(ref.platform, ref.platform)
+            if ref.platform == "huggingface":
+                context["hf_url"] = ref.url
+            context["repo"] = ref.source_id
+
+        source = get_source(ref.platform) if ref is not None else None
+        if ref is not None and source is not None and source.supports_enrichment:
+            # Values fetched once by _load_source_card and shared with the
+            # post-processor, so the network is not hit twice per model.
+            context["asset_base_url"] = source_vars["asset_base_url"]
+            context["source_context"] = source_context
+            context["source_description"] = source_vars["source_description"]
+            context["source_base_model"] = source_vars["source_base_model"]
+            context["source_official_tags"] = source_vars["source_official_tags"]
+            context["source_example_images"] = source_vars["source_example_images"]
+            context["source_trigger_words"] = source_vars["source_trigger_words"]
+            context["readme_content"] = source_vars["readme_content"]
+            context["readme_content_full"] = source_vars["readme_content_full"]

        try:
            raw_models = await list_base_models()
@@ -458,20 +628,14 @@ class AgentService:

    @staticmethod
    async def _fetch_readme(repo: str) -> str:
-        """Fetch README.md from HuggingFace (tries ``main``, then ``master``)."""
-        async with aiohttp.ClientSession(
-            headers={"User-Agent": "ComfyUI-LoRA-Manager/1.0"},
-            timeout=aiohttp.ClientTimeout(total=30),
-        ) as session:
-            for branch in ("main", "master"):
-                url = f"https://huggingface.co/{repo}/raw/{branch}/README.md"
-                try:
-                    async with session.get(url) as resp:
-                        if resp.status == 200:
-                            return await resp.text()
-                except Exception as exc:
-                    logger.debug("Failed to fetch README from %s: %s", url, exc)
-        return ""
+        """Fetch a Hugging Face README (tries ``main``, then ``master``).
+
+        Kept for backward compatibility; new code should go through the
+        model-source registry so every supported site works.
+        """
+        from ..model_sources import HuggingFaceSource
+
+        return await HuggingFaceSource().fetch_model_card(repo)

    async def _emit_progress(
        self,
@@ -0,0 +1,94 @@
+"""Map a site-reported base model onto this system's canonical vocabulary.
+
+Model sites name base models in their own terms: ModelScope publishes
+``krea/Krea-2-Turbo`` and ``KREA_2_TURBO`` where this system expects the
+canonical ``Krea 2``.  Turning one into the other is normally the LLM's job;
+this module resolves the cases that can be decided safely so the canonical
+field is still populated when the LLM returns nothing usable for it.
+
+The resolver is deliberately strict, because a wrong base model written with
+apparent authority is worse than no value at all:
+
+* it only ever returns a name that is already present in *known_names*;
+* matching is on the normalised form (lowercased, non-alphanumerics removed),
+  so separators and casing are ignored but nothing is inferred;
+* a bounded set of published variant suffixes may be stripped, and only when
+  the remainder still matches a known name exactly.
+
+Anything it cannot decide returns ``""``, and the caller falls back to the LLM.
+"""
+
+from __future__ import annotations
+
+import re
+from typing import Iterable, Sequence
+
+#: Variant suffixes sites append to a base-model *family* name.  Stripping one
+#: is only attempted when the remainder matches a known name exactly, so an
+#: unrecognised suffix can never produce a bogus match.
+_VARIANT_SUFFIXES: tuple[str, ...] = (
+    "turbo",
+    "schnell",
+    "lightning",
+    "dev",
+    "beta",
+    "alpha",
+)
+
+_NON_ALNUM = re.compile(r"[^a-z0-9]+")
+
+
+def _normalize(value: str) -> str:
+    """Return the comparison form of *value*.
+
+    Lowercases and drops every non-alphanumeric character, so ``KREA_2``,
+    ``Krea 2``, ``krea-2`` and ``krea.2`` all collapse to ``krea2``.
+    """
+
+    return _NON_ALNUM.sub("", (value or "").lower())
+
+
+def resolve_base_model(
+    hints: Iterable[str], known_names: Sequence[str]
+) -> str:
+    """Return the canonical base model that *hints* refers to, or ``""``.
+
+    Args:
+        hints: Site-reported names, best first (e.g. an architecture enum
+            before a link-style repository id).
+        known_names: The canonical vocabulary; only these are ever returned.
+
+    Returns:
+        One of *known_names*, or ``""`` when nothing matches exactly.
+    """
+
+    normalized: dict[str, str] = {}
+    for name in known_names:
+        key = _normalize(name)
+        if key and key not in normalized:
+            normalized[key] = name
+    if not normalized:
+        return ""
+
+    ordered = [hint for hint in hints if hint]
+
+    # 1. Exact normalised match — the unambiguous case.
+    for hint in ordered:
+        candidate = _normalize(hint)
+        if candidate in normalized:
+            return normalized[candidate]
+
+    # 2. Drop one published variant suffix and retry exactly.
+    for hint in ordered:
+        candidate = _normalize(hint)
+        for suffix in _VARIANT_SUFFIXES:
+            if not candidate.endswith(suffix) or candidate == suffix:
+                continue
+            stem = candidate[: -len(suffix)]
+            if stem in normalized:
+                return normalized[stem]
+
+    return ""
+
+
+__all__ = ["resolve_base_model"]
@@ -10,12 +10,16 @@ refresh cache).  All actual I/O is delegated to :mod:`~py.metadata_ops`.

 from __future__ import annotations

+import html
 import json
 import logging
 import os
 import re
 from datetime import datetime, timezone
-from typing import Any, Dict, List, Optional
+from typing import TYPE_CHECKING, Any, Dict, List, Optional
+
+if TYPE_CHECKING:  # pragma: no cover - typing only
+    from ..model_sources import ModelCardContext

 logger = logging.getLogger(__name__)

@@ -42,6 +46,9 @@ class PostProcessor:
        llm_output: Dict[str, Any],
        metadata: Dict[str, Any],
        readme_content: str = "",
+        source_context: Optional["ModelCardContext"] = None,
+        resolved_base_model: str = "",
+        metadata_source: str = "agent:enrich_hf_metadata",
    ) -> Dict[str, Any]:
        """Route *llm_output* to the correct skill post-processor.

@@ -49,12 +56,26 @@ class PostProcessor:
        that is converted to HTML and stored as ``modelDescription`` for
        the description tab.

+        *source_context* carries the extras the model site publishes outside
+        the README (author description, per-file example images, trigger
+        words).  It is ``None`` for callers that have none.
+
+        *resolved_base_model* is the canonical base-model name the site's own
+        hints resolve to, used when the LLM did not supply one (which is the
+        normal case when the LLM was skipped).
+
+        *metadata_source* records who produced the metadata.  The AI skill
+        keeps its historical value; the deterministic download-time hydration
+        passes its own so the two remain distinguishable.  ``llm_enriched_at``
+        is only stamped when *llm_output* actually carries a provider answer.
+
        Returns a dict with keys ``success`` (bool), ``updated_fields`` (list),
        ``preview_downloaded`` (bool), and ``errors`` (list).
        """
        if skill_name == "enrich_hf_metadata":
            return await self._process_enrich_hf_metadata(
-                model_path, llm_output, metadata, readme_content,
+                model_path, llm_output, metadata, readme_content, source_context,
+                resolved_base_model, metadata_source,
            )
        return {
            "success": False,
@@ -72,12 +93,16 @@ class PostProcessor:
        llm_output: Dict[str, Any],
        metadata: Dict[str, Any],
        readme_content: str = "",
+        source_context: Optional["ModelCardContext"] = None,
+        resolved_base_model: str = "",
+        metadata_source: str = "agent:enrich_hf_metadata",
    ) -> Dict[str, Any]:
        from ...metadata_ops import (
            apply_metadata_updates,
            download_preview,
            refresh_cache,
        )
+        from ..model_sources import get_source, has_external_source, resolve_source_ref
        from .skills.enrich_hf_metadata.readme_processor import (
            convert_readme_to_html,
            extract_gallery_images,
@@ -85,27 +110,49 @@ class PostProcessor:
            extract_relevant_section,
            extract_simple_markdown_images,
            extract_html_img_tags,
-            extract_repo_from_hf_url,
        )

        updated_fields: List[str] = []
        preview_downloaded = False

-        # -- Determine whether this is an HF-sourced model -----------------
-        # Key off `hf_url` directly: `from_civitai` records provenance and can
-        # be true for a model that is also linked to HuggingFace (both sources
-        # coexist, see #1094), so it must not gate HF enrichment.
-        is_hf_model = bool(metadata.get("hf_url", ""))
+        # -- Determine whether this is an externally-sourced model ---------
+        # Key off the source fields directly: `from_civitai` records provenance
+        # and can be true for a model that is also linked to an external site
+        # (both sources coexist, see #1094), so it must not gate enrichment.
+        is_source_model = has_external_source(metadata)
+
+        source_ref = resolve_source_ref(metadata)
+        source = get_source(source_ref.platform) if source_ref else None
+        source_id = source_ref.source_id if source_ref else ""
+        asset_base_url = (
+            source.asset_base_url(source_id)
+            if source is not None and source_id
+            else None
+        )

        # -- Collect updates -----------------------------------------------
        updates: Dict[str, Any] = {}

-        # base_model
+        # base_model — the LLM's mapping wins; when it returned nothing usable,
+        # fall back to the canonical name the site's own hints resolve to.
        new_base = (llm_output.get("base_model") or "").strip()
+        if not new_base:
+            new_base = (resolved_base_model or "").strip()
        current_base = metadata.get("base_model", "") or ""
-        if new_base and self._should_overwrite(current_base, is_hf_model):
+        if new_base and self._should_overwrite(current_base, is_source_model):
            updates["base_model"] = new_base

+        # model_name — the site's own display name, so a source download never
+        # shows up under its local filename.  Written only while the name is
+        # still the untouched file stem: once a user renames a model that
+        # choice is theirs to keep.
+        site_name = ((source_context.model_name if source_context else "") or "").strip()
+        if is_source_model and site_name:
+            current_name = (metadata.get("model_name") or "").strip()
+            file_stem = (metadata.get("file_name") or "").strip()
+            if not current_name or current_name == file_stem:
+                updates["model_name"] = site_name
+
        # trigger words → civitai.trainedWords
        new_triggers = llm_output.get("trigger_words", [])
        trigger_words_empty = True
@@ -113,45 +160,71 @@ class PostProcessor:
            cleaned = [t.strip() for t in new_triggers if t.strip()]
            cleaned = [t for t in cleaned if t.lower() not in ("none", "null", "n/a")]
            trigger_words_empty = not cleaned
-            current_civitai = metadata.get("civitai") or {}
-            current_triggers = current_civitai.get("trainedWords") or []
-            if self._should_overwrite_list(current_triggers, is_hf_model):
-                trig_civitai = dict(current_civitai)
-                if "civitai" in updates and isinstance(updates["civitai"], dict):
-                    trig_civitai.update(updates["civitai"])
-                trig_civitai["trainedWords"] = cleaned
-                updates["civitai"] = trig_civitai
+            current_triggers = (metadata.get("civitai") or {}).get("trainedWords") or []
+            if self._should_overwrite_list(current_triggers, is_source_model):
+                self._merge_civitai(updates, metadata, trainedWords=cleaned)

-        # modelDescription — from raw README content (converted to HTML)
-        if readme_content and is_hf_model:
-            converted = convert_readme_to_html(readme_content)
-            if converted:
-                updates["modelDescription"] = converted
+        # modelDescription — the author's own summary (when the site keeps one
+        # outside the README, e.g. ModelScope's ``Description``) followed by the
+        # README converted to HTML.
+        site_description = (
+            (source_context.description if source_context else "") or ""
+        ).strip()
+        if is_source_model and (site_description or readme_content):
+            parts: List[str] = []
+            if site_description:
+                parts.append(f"<p>{html.escape(site_description)}</p>")
+            if readme_content:
+                converted = convert_readme_to_html(readme_content)
+                if converted:
+                    parts.append(converted)
+            if parts:
+                updates["modelDescription"] = "\n".join(parts)

-        # short_description → civitai.description (for "About this version")
+        # short_description → civitai.description (for "About this version").
+        # Falls back to the site's author summary, which for ModelScope AIGC
+        # models is frequently the only human-written text available.
        short_desc = (llm_output.get("short_description") or "").strip()
-        if short_desc and is_hf_model:
-            current_civitai = metadata.get("civitai") or {}
-            desc_civitai = dict(current_civitai)
-            if "civitai" in updates and isinstance(updates["civitai"], dict):
-                desc_civitai.update(updates["civitai"])
-            desc_civitai["description"] = short_desc
-            updates["civitai"] = desc_civitai
+        if not short_desc:
+            short_desc = site_description
+        if short_desc and is_source_model:
+            self._merge_civitai(updates, metadata, description=short_desc)
+
+        # The version label completes the card the way a CivitAI download does:
+        # the UI renders `civitai.name` as the version chip.  It is per file,
+        # so a collection repository shows that checkpoint's own label.
+        site_version = (
+            (source_context.version_name if source_context else "") or ""
+        ).strip()
+        if is_source_model and site_version:
+            self._merge_civitai(updates, metadata, name=site_version)
+
+        # gallery images → civitai.images (site example images, YAML frontmatter
+        # widget entries, and Sample Gallery markdown tables in the README body)
+        rec_width = llm_output.get("recommended_width") or 0
+        rec_height = llm_output.get("recommended_height") or 0
+
+        # Example images the site publishes for *this* file.  They are matched
+        # by filename, so they are the most precise preview source available
+        # and the only one for repositories whose README carries no images.
+        site_images: List[Dict[str, Any]] = []
+        if is_source_model and source_context is not None:
+            site_images = [
+                _example_image(url, rec_width, rec_height)
+                for url in source_context.example_images
+                if url
+            ]

-        # gallery images → civitai.images (from YAML frontmatter widget entries
-        # and Sample Gallery markdown tables in the README body)
        gallery_images: List[Dict[str, Any]] = []
-        if readme_content and is_hf_model:
-            hf_url = metadata.get("hf_url", "") or ""
-            repo = extract_repo_from_hf_url(hf_url)
-            if repo:
-                rec_w = llm_output.get("recommended_width") or 0
-                rec_h = llm_output.get("recommended_height") or 0
-
+        if (readme_content or site_images) and is_source_model:
+            repo = source_id
+            readme_images: List[Dict[str, Any]] = []
+            if readme_content and repo:
                # 1. Widget images (YAML frontmatter)
                gallery = extract_gallery_images(
                    readme_content, repo,
-                    default_width=rec_w, default_height=rec_h,
+                    default_width=rec_width, default_height=rec_height,
+                    base_url=asset_base_url,
                )

                # 2. Sample Gallery table images (markdown body), deduplicated
@@ -159,7 +232,8 @@ class PostProcessor:
                table_images = extract_gallery_table_images(
                    readme_content, repo,
                    existing_urls=existing_urls,
-                    default_width=rec_w, default_height=rec_h,
+                    default_width=rec_width, default_height=rec_height,
+                    base_url=asset_base_url,
                )
                existing_urls.update(img["url"] for img in table_images if img.get("url"))

@@ -167,7 +241,8 @@ class PostProcessor:
                simple_images = extract_simple_markdown_images(
                    readme_content, repo,
                    existing_urls=existing_urls,
-                    default_width=rec_w, default_height=rec_h,
+                    default_width=rec_width, default_height=rec_height,
+                    base_url=asset_base_url,
                )
                existing_urls.update(img["url"] for img in simple_images if img.get("url"))

@@ -175,54 +250,71 @@ class PostProcessor:
                html_images = extract_html_img_tags(
                    readme_content, repo,
                    existing_urls=existing_urls,
-                    default_width=rec_w, default_height=rec_h,
+                    default_width=rec_width, default_height=rec_height,
+                    base_url=asset_base_url,
                )

-                all_images = gallery + table_images + simple_images + html_images
-                if all_images:
-                    gallery_images = all_images
-                    current_civitai = metadata.get("civitai") or {}
-                    gallery_civitai = dict(current_civitai)
-                    if "civitai" in updates and isinstance(updates["civitai"], dict):
-                        gallery_civitai.update(updates["civitai"])
-                    gallery_civitai["images"] = all_images
-                    updates["civitai"] = gallery_civitai
+                readme_images = gallery + table_images + simple_images + html_images

-        # tags
+            # Site images come first so the preview fallback below prefers an
+            # image that is known to belong to this exact file.
+            all_images = _dedupe_images(site_images + readme_images)
+            if all_images:
+                gallery_images = all_images
+                self._merge_civitai(updates, metadata, images=all_images)
+
+        # tags — the site's curated tags are authoritative content vocabulary, so
+        # they are kept alongside whatever the LLM proposed (the LLM is skipped
+        # entirely when the site data is complete, which is why this cannot rely
+        # on ``llm_output`` alone).
        new_tags = llm_output.get("tags", [])
-        if isinstance(new_tags, list) and new_tags:
+        candidate_tags: List[str] = []
+        if is_source_model and source_context is not None:
+            candidate_tags.extend(source_context.official_tags)
+        if isinstance(new_tags, list):
+            candidate_tags.extend(
+                tag for tag in new_tags if tag not in candidate_tags
+            )
+        if candidate_tags:
            existing_tags = metadata.get("tags") or []
-            merged = self._merge_tags(existing_tags, new_tags)
-            if len(merged) > len(existing_tags) or is_hf_model:
+            merged = self._merge_tags(existing_tags, candidate_tags)
+            if len(merged) > len(existing_tags) or is_source_model:
                updates["tags"] = merged

-        # metadata_source & llm_enriched_at (always set)
-        updates["metadata_source"] = "agent:enrich_hf_metadata"
-        updates["llm_enriched_at"] = datetime.now(timezone.utc).isoformat()
+        # metadata_source is recorded for provenance; llm_enriched_at only means
+        # something when a provider actually answered, so the deterministic
+        # download-time hydration does not claim an enrichment that never ran.
+        updates["metadata_source"] = metadata_source
+        if llm_output:
+            updates["llm_enriched_at"] = datetime.now(timezone.utc).isoformat()

-        # Store LLM confidence in metadata so it's accessible for evaluation
+        # LLM confidence, stored for the enrichment evaluation harness.  The key
+        # must NOT start with an underscore: `BaseModelMetadata.from_dict()`
+        # deliberately drops underscore-prefixed keys so they never round-trip,
+        # which silently erased this field on the next metadata write.
        raw_confidence = (llm_output.get("confidence") or "").strip()
        if raw_confidence:
-            updates["_llm_confidence"] = raw_confidence
+            updates["llm_confidence"] = raw_confidence

-        # Fallback: extract instance_prompt from YAML frontmatter when the LLM
-        # returned empty trigger words but the README has instance_prompt.
+        # Fallback: use the trigger words the site records for this exact file,
+        # then the README's YAML `instance_prompt`, when the LLM returned none.
        if trigger_words_empty:
-            instance_prompt = _extract_yaml_instance_prompt(readme_content)
-            if instance_prompt:
-                current_civitai = metadata.get("civitai") or {}
-                trig_civitai = dict(current_civitai)
-                if "civitai" in updates and isinstance(updates["civitai"], dict):
-                    trig_civitai.update(updates["civitai"])
-                trig_civitai["trainedWords"] = [instance_prompt]
-                updates["civitai"] = trig_civitai
+            site_triggers = (
+                list(source_context.trigger_words) if source_context else []
+            )
+            if not site_triggers:
+                instance_prompt = _extract_yaml_instance_prompt(readme_content)
+                if instance_prompt:
+                    site_triggers = [instance_prompt]
+            if site_triggers:
+                self._merge_civitai(updates, metadata, trainedWords=site_triggers)

        preview_remote_url = (llm_output.get("preview_url") or "").strip()
        # Fallback: if the LLM couldn't find a preview image in the cleaned
        # README, find the first gallery image from the *model-specific
        # section* of the README (not the repo-wide first image, which
        # belongs to a different model in collection repos).
-        if not preview_remote_url and readme_content and is_hf_model:
+        if not preview_remote_url and readme_content and is_source_model:
            model_basename = os.path.splitext(os.path.basename(model_path))[0]
            relevant_section = extract_relevant_section(
                readme_content, model_basename,
@@ -248,8 +340,12 @@ class PostProcessor:
        if new_notes:
            updates["notes"] = new_notes

-        # usage_tips — JSON string (e.g. {"strength_min":0.85,"strength_max":1.4})
+        # usage_tips — JSON string (e.g. {"strength_min":0.85,"strength_max":1.4}).
+        # When the LLM returned nothing, recover an explicitly stated strength
+        # range from the author summary so the value is not lost.
        raw_tips = (llm_output.get("usage_tips") or "").strip()
+        if not raw_tips or raw_tips == "{}":
+            raw_tips = _extract_usage_tips(site_description)
        if raw_tips and raw_tips != "{}":
            try:
                json.loads(raw_tips)
@@ -279,16 +375,35 @@ class PostProcessor:
    # ------------------------------------------------------------------

    @staticmethod
-    def _should_overwrite(current_value: str, is_hf_model: bool) -> bool:
+    def _should_overwrite(current_value: str, is_source_model: bool) -> bool:
        """Return ``True`` when a scalar field should be overwritten."""
-        return is_hf_model or not current_value or current_value.lower() in (
+        return is_source_model or not current_value or current_value.lower() in (
            "", "unknown",
        )

    @staticmethod
-    def _should_overwrite_list(current_list: List[str], is_hf_model: bool) -> bool:
+    def _merge_civitai(
+        updates: Dict[str, Any], metadata: Dict[str, Any], **fields: Any
+    ) -> None:
+        """Layer *fields* onto the ``civitai`` block being assembled.
+
+        Description, version label, trigger words and gallery images all live
+        in the same dict and are contributed by separate branches, so each one
+        starts from what is already on disk and then applies whatever an
+        earlier branch queued in *updates*.
+        """
+
+        merged = dict(metadata.get("civitai") or {})
+        queued = updates.get("civitai")
+        if isinstance(queued, dict):
+            merged.update(queued)
+        merged.update(fields)
+        updates["civitai"] = merged
+
+    @staticmethod
+    def _should_overwrite_list(current_list: List[str], is_source_model: bool) -> bool:
        """Return ``True`` when a list field should be overwritten."""
-        return is_hf_model or not current_list
+        return is_source_model or not current_list

    @staticmethod
    def _merge_tags(existing: List[str], new: List[str]) -> List[str]:
@@ -312,6 +427,129 @@ class PostProcessor:
 # ------------------------------------------------------------------


+#: Separator between a label and its value.  Published model cards routinely
+#: wrap the numbers in markdown emphasis or quotes (``strength: **0.85 - 1.4**``,
+#: ``CLIP 强度「0.5」``), so those are absorbed rather than treated as a break.
+_EMPHASIS = "[\"'\u201c\u201d\u300c\u300d*_`\\s]*"
+
+#: An explicitly stated strength/weight range, e.g. ``权重0.5-1.2``,
+#: ``强度 0.8 ~ 1.2``, ``strength: **0.85 - 1.4**``.
+_RANGE_DASH = "(?:-|\u2010|\u2011|\u2012|\u2013|\u2014|\uff0d|~|\uff5e|\u81f3|\u5230|to)"
+
+_STRENGTH_RANGE_RE = re.compile(
+    "(?:\u6743\u91cd|\u5f3a\u5ea6|strength|weight)" + _EMPHASIS + "[:\uff1a]?" + _EMPHASIS
+    + r"(\d+(?:\.\d+)?)" + _EMPHASIS + _RANGE_DASH + _EMPHASIS
+    + r"(\d+(?:\.\d+)?)",
+    re.IGNORECASE,
+)
+
+#: A single strength/weight value, e.g. ``strength: 0.6``, ``权重 0.8``.
+_STRENGTH_VALUE_RE = re.compile(
+    "(?:\u6743\u91cd|\u5f3a\u5ea6|strength|weight)" + _EMPHASIS + "[:\uff1a]?" + _EMPHASIS
+    + r"(\d+(?:\.\d+)?)",
+    re.IGNORECASE,
+)
+
+#: ``clip strength: 0.5`` / ``CLIP 强度 0.5``.
+_CLIP_STRENGTH_RE = re.compile(
+    "clip" + _EMPHASIS + "(?:\u5f3a\u5ea6|strength)" + _EMPHASIS + "[:\uff1a]?" + _EMPHASIS
+    + r"(\d+(?:\.\d+)?)",
+    re.IGNORECASE,
+)
+
+#: ``clip skip: 2`` / ``CLIP 跳过 2``.
+_CLIP_SKIP_RE = re.compile(
+    "clip" + _EMPHASIS + "(?:skip|\u8df3\u8fc7)" + _EMPHASIS + "[:\uff1a]?" + _EMPHASIS
+    + r"(\d+)",
+    re.IGNORECASE,
+)
+
+
+def _extract_usage_tips(text: str) -> str:
+    """Extract stated strength/CLIP recommendations from prose.
+
+    This is the deterministic counterpart to the LLM's ``usage_tips`` output,
+    used when the LLM was skipped.  It only recognises explicitly written
+    values — it never infers a range — and returns ``""`` when it finds none.
+
+    Returns:
+        A JSON string matching the skill's ``usage_tips`` schema, or ``""``.
+    """
+
+    if not text:
+        return ""
+
+    tips: Dict[str, Any] = {}
+
+    # CLIP strength is resolved first and then blanked out, so the generic
+    # strength patterns cannot mistake `CLIP 强度 0.5` for the LoRA strength.
+    text_for_strength = text
+    clip_strength = _CLIP_STRENGTH_RE.search(text_for_strength)
+    if clip_strength:
+        tips["clip_strength"] = float(clip_strength.group(1))
+        text_for_strength = (
+            text_for_strength[: clip_strength.start()]
+            + " "
+            + text_for_strength[clip_strength.end() :]
+        )
+
+    range_match = _STRENGTH_RANGE_RE.search(text_for_strength)
+    if range_match:
+        low = float(range_match.group(1))
+        high = float(range_match.group(2))
+        if low > high:
+            low, high = high, low
+        tips["strength_min"] = low
+        tips["strength_max"] = high
+        tips["strength_range"] = f"{low:g}-{high:g}"
+    else:
+        value_match = _STRENGTH_VALUE_RE.search(text_for_strength)
+        if value_match:
+            tips["strength"] = float(value_match.group(1))
+
+    clip_skip = _CLIP_SKIP_RE.search(text)
+    if clip_skip:
+        tips["clip_skip"] = int(clip_skip.group(1))
+
+    if not tips:
+        return ""
+    return json.dumps(tips, ensure_ascii=False)
+
+
+def _example_image(url: str, width: int, height: int) -> Dict[str, Any]:
+    """Build a ``civitai.images`` entry for a site-provided example image.
+
+    The site publishes no prompt alongside these images, so the entry carries
+    empty prompt metadata and the LLM's recommended dimensions when it found
+    any (falling back to the same 512px placeholder the README extractors use).
+    """
+
+    return {
+        "url": url,
+        "type": "image",
+        "nsfwLevel": 0,
+        "width": width or 512,
+        "height": height or 512,
+        "meta": {"prompt": "", "negativePrompt": ""},
+        "hasMeta": False,
+        "hasPositivePrompt": False,
+    }
+
+
+def _dedupe_images(images: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
+    """Drop later entries that repeat an earlier image URL, keeping order."""
+
+    seen: set[str] = set()
+    unique: List[Dict[str, Any]] = []
+    for image in images:
+        url = image.get("url") or ""
+        if not url or url in seen:
+            continue
+        seen.add(url)
+        unique.append(image)
+    return unique
+
+
 def _extract_yaml_instance_prompt(readme_content: str) -> str:
    """Extract ``instance_prompt`` from the YAML frontmatter of a HF README.

@@ -1,20 +1,23 @@
 ---
 name: enrich_hf_metadata
-title: "Enrich Metadata from HuggingFace"
+title: "Enrich Metadata from Model Card"
 description: >
-  Parse the HuggingFace model card via LLM to extract description, trigger
-  words, base model, tags, and preview image URL.
+  Parse the model card (README) from HuggingFace, ModelScope, or any other
+  supported model site via LLM to extract description, trigger words, base
+  model, tags, and preview image URL.
 llm_required: true
 ---

-You are an expert assistant for AI image generation models. Your task is to extract structured metadata from a HuggingFace model card (README.md).
+You are an expert assistant for AI image generation models. Your task is to extract structured metadata from a model card (README).

 ## Model Information

- **Repository**: {{hf_url}}
+- **Source site**: {{source_label}} ({{source_platform}})
+- **Model page**: {{source_url}}
 - **Model file path**: {{model_path}}
 - **Model filename**: {{model_basename}}
- **Repository ID**: {{repo}}
+- **Repository ID**: {{source_id}}
+- **Repository raw-file base URL**: {{asset_base_url}}

 ## Current Metadata (may be incomplete)

@@ -22,6 +25,34 @@ You are an expert assistant for AI image generation models. Your task is to extr
 {{current_metadata}}
 ```

+## Site-Provided Metadata (any field may be empty)
+
+The model site publishes the following **alongside** the README. It is
+first-hand information recorded by the site itself, so it outranks anything
+you would otherwise guess:
+
+- **Author description**: {{source_description}}
+- **Base model reported by the site**: {{source_base_model}}
+- **Trigger words recorded for this file**: {{source_trigger_words}}
+- **Site-curated tags**:
+{{source_official_tags}}
+- **Example image URLs for this file**:
+{{source_example_images}}
+
+Use it as follows:
+
+- A weight or strength range stated in the **author description** belongs in
+  ``usage_tips`` (and in ``notes``); do not leave ``usage_tips`` empty when the
+  description states one.
+- When the author description exists, base ``short_description`` on it rather
+  than on the README, which on some sites is auto-generated boilerplate.
+- Treat the **site-curated tags** as strong signals for ``tags``: they are
+  already a curated content vocabulary, so prefer them over invented words.
+- Treat the **base model reported by the site** as a strong hint for
+  ``base_model``, but still map it to the EXACT canonical name from the
+  available base-model list.
+- Use the **example image URLs** when the README contains no usable image.
+
 ## User Priority Tags Reference

 The user has configured the following list of **meaningful tag categories** for this model type (`{{model_type}}`):
@@ -39,7 +70,7 @@ name listed — do not invent aliases or modify variant suffixes.

 {{base_models}}

-## HuggingFace README Content
+## Model Card Content

 ```
 {{readme_content}}
@@ -52,10 +83,11 @@ Extract the following information from the README content above:
 ### base_model
 The base model this model was trained on. Use EXACTLY one of the names from the **Available Base Models** list above. Do not invent new names or use aliases.

-Check the YAML frontmatter for ``base_model:`` first. If the frontmatter has no ``base_model:``, look at the **model filename** (``{{model_basename}}``), YAML ``tags:``, README title and first paragraph for clues — the base model family is often embedded in the name
+Check the **base model reported by the site** (above) and the YAML frontmatter ``base_model:`` first. If neither yields a match, look at the **model filename** (``{{model_basename}}``), YAML ``tags:``, README title and first paragraph for clues — the base model family is often embedded in the name

 ### trigger_words
 The trigger words or activation prompts needed to use this LoRA. Look for:
+- The **trigger words recorded for this file** in the site-provided metadata (most authoritative)
 - `instance_prompt:` in the YAML frontmatter
 - Phrases like "trigger word:", "trigger:", "use this prompt:", "activation prompt:"
 - In collection repos: the trigger section **specific to this model file** (look near matching download links or anchor IDs)
@@ -63,12 +95,13 @@ The trigger words or activation prompts needed to use this LoRA. Look for:
 Return as an array of strings. If none found, return an empty array `[]`. **Never** return `["None"]` or any placeholder value — a truly empty list means no trigger words exist.

 ### short_description
-A concise 1-2 sentence summary of what this model does. Extract from the "Model description" section or the first paragraph.  For collection repos, focus on the **specific model version** matching `{{model_basename}}`, not the repo as a whole.  Return empty string if the README is too minimal.
+A concise 1-2 sentence summary of what this model does. For collection repos, focus on the **specific model version** matching `{{model_basename}}`, not the repo as a whole.  Prefer the **author description** from the site-provided metadata when it is present; otherwise extract from the "Model description" section or the first paragraph.  Return empty string if the available content is too minimal.

 ### tags
 3-8 relevant tags for categorizing this model. **Quality over quantity.**

 Sources to consider:
+- The **site-curated tags** from the site-provided metadata (these are already filtered content tags — prefer them)
 - The YAML frontmatter `tags:` list (filter out technical ones — see below)
 - The subject, style, character, or concept the model represents
 - The model filename itself may give clues (e.g. "pokemon", "anime", "pixelart")
@@ -79,7 +112,9 @@ Sources to consider:

 2. **Cross-reference against the priority_tags reference.** Only include a tag if it meaningfully describes what the model actually creates (subject, style, character type) and is semantically close to one of the priority_tags. If none of the README's tags match meaningful categories, prefer returning a smaller set or an empty array over including low-value tags.

-3. **All lowercase, no spaces, no hyphens** (use single words like `"photorealistic"`, `"anime"`, `"character"`).
+3. **All lowercase, and keep each tag's own wording.** Prefer the spelling already used by the site, the frontmatter, or the author — including hyphenated and multi-word tags such as `"sci-fi"`, `"semi-realistic"`, `"character-enhancement"` or `"art style"`. Do **not** strip separators or invent a single-word variant of a tag you are already including (e.g. do not emit both `"character-enhancement"` and `"character"`). When a tag is written in another script (e.g. Chinese), likewise keep it verbatim instead of translating it.
+
+4. **Never invent a tag** that neither the site-provided metadata, the YAML frontmatter, nor the README text supports.

 Return empty array if no meaningful content tags remain after filtering.

@@ -92,13 +127,13 @@ The URL of the most suitable preview image from the README. Look for:
 - The YAML frontmatter `widget:` section (which often has `output.url` fields)
 - In collection repos: the sample images listed **under the section** for this specific model version
 - Generic `![alt](url)` in the body
-Choose the first image that appears to be a generation example (not a logo or diagram). Construct the absolute URL as `https://huggingface.co/{{repo}}/resolve/main/{filename}`. If no suitable image is found, return an empty string.
+Choose the first image that appears to be a generation example (not a logo or diagram). Construct the absolute URL from the repository raw-file base URL (`{{asset_base_url}}`) plus the relative path. If the README has no suitable image, fall back to the site-provided **example image URLs** for this file. If nothing is available, return an empty string.

 ### notes
-A plain-text summary of the model card's key practical usage information. Combine trigger words, style modifiers, recommended parameters (steps, CFG, resolution, sampler), and any setup tips into a readable paragraph.  For collection repos, focus on the **specific model version** matching `{{model_basename}}`.  Return empty string if the README has no useful usage info.
+A plain-text summary of the model card's key practical usage information. Combine trigger words, style modifiers, recommended parameters (steps, CFG, resolution, sampler), and any setup tips into a readable paragraph.  For collection repos, focus on the **specific model version** matching `{{model_basename}}`.  Include the **author description** from the site-provided metadata when it is present.  Return empty string if there is no useful usage info.

 ### usage_tips
-A JSON string with structured usage recommendations. Extract from the README any explicit ranges or recommended values (e.g. "Set LoRA strength: **0.85 - 1.4**", "CLIP strength: 0.5"). Possible fields (include only those you can determine):
+A JSON string with structured usage recommendations. Extract from the **author description** (site-provided metadata) and the README any explicit ranges or recommended values (e.g. "Set LoRA strength: **0.85 - 1.4**", "CLIP strength: 0.5", "权重0.5-1.2"). Possible fields (include only those you can determine):

 ```json
 {
@@ -121,7 +156,7 @@ Your confidence level in the extracted data:

 ## Important: Handling Collection Repos (multiple model files)

-Many HuggingFace repos contain **multiple model files** in a single repository
+Many model repositories contain **multiple model files** in a single repository
 (e.g. a "LoRA collection" with different styles/characters in separate files).

 The model file currently being enriched is: **`{{model_basename}}`**
@@ -1,8 +1,15 @@
-"""HF README processing for the ``enrich_hf_metadata`` skill.
+"""Model card (README) processing for the ``enrich_hf_metadata`` skill.

 Provides README cleaning for LLM injection, gallery/image extraction from
 multiple formats (YAML widget, markdown, HTML ``<img>``, gallery tables),
 and section-based README trimming for collection repos.
+
+The extractors default to Hugging Face asset URLs, but every one of them
+accepts an explicit ``base_url`` so the same parsing works for any model
+source (ModelScope, ...).  See :mod:`py.services.model_sources`.
+
+This module deliberately has no package-relative imports: it is also loaded
+standalone by the README-processing test harness.
 """

 from __future__ import annotations
@@ -15,12 +22,25 @@ from typing import Any, List, Tuple
 _REPO_URL_PATTERN = re.compile(r"https?://huggingface\.co/([^/]+/[^/]+)")


+def resolve_asset_base_url(repo: str, base_url: str | None = None) -> str:
+    """Return the base URL used to resolve repository-relative assets.
+
+    Falls back to the historical Hugging Face layout when *base_url* is not
+    supplied, so existing callers keep their behaviour.
+    """
+
+    if base_url:
+        return base_url.rstrip("/")
+    return f"https://huggingface.co/{repo}/resolve/main"
+
+
 def extract_simple_markdown_images(
    markdown_text: str,
    repo: str,
    existing_urls: set[str] | None = None,
    default_width: int = 512,
    default_height: int = 512,
+    base_url: str | None = None,
 ) -> list[dict[str, Any]]:
    """Extract standalone markdown images from the README body.

@@ -32,10 +52,10 @@ def extract_simple_markdown_images(
    Returns a list of dicts in the same ``civitai.images`` format as
    :func:`extract_gallery_images`.
    """
-    if not markdown_text or not repo:
+    if not markdown_text or not (repo or base_url):
        return []

-    base_url = f"https://huggingface.co/{repo}/resolve/main"
+    base_url = resolve_asset_base_url(repo, base_url)
    images: list[dict[str, Any]] = []
    seen_urls: set[str] = set(existing_urls) if existing_urls else set()

@@ -89,20 +109,21 @@ def extract_html_img_tags(
    existing_urls: set[str] | None = None,
    default_width: int = 512,
    default_height: int = 512,
+    base_url: str | None = None,
 ) -> list[dict[str, Any]]:
    """Extract image URLs from HTML ``<img src=\"...\">`` tags in the README.

    Many HF collection repos (e.g. ``deadman44/Z-Image_LoRA``) use raw HTML
    ``<img>`` tags exclusively for their sample images, with no markdown
    ``![]()`` equivalents.  This function finds those tags and constructs
-    resolvable HF URLs.
+    resolvable URLs.

    Returns a list of dicts in the ``civitai.images`` format.
    """
-    if not markdown_text or not repo:
+    if not markdown_text or not (repo or base_url):
        return []

-    base_url = f"https://huggingface.co/{repo}/resolve/main"
+    base_url = resolve_asset_base_url(repo, base_url)
    images: list[dict[str, Any]] = []
    seen_urls: set[str] = set(existing_urls) if existing_urls else set()

@@ -166,7 +187,7 @@ def extract_html_img_tags(

 def extract_repo_from_hf_url(hf_url: str) -> str:
    """Extract ``user/repo`` from a HuggingFace URL."""
-    m = _REPO_URL_PATTERN.match(hf_url)
+    m = _REPO_URL_PATTERN.match(hf_url or "")
    return m.group(1) if m else ""


@@ -175,21 +196,23 @@ def extract_gallery_images(
    repo: str,
    default_width: int = 512,
    default_height: int = 512,
+    base_url: str | None = None,
 ) -> List[dict[str, Any]]:
-    """Extract widget/gallery images from the YAML frontmatter of a HF README.
+    """Extract widget/gallery images from the YAML frontmatter of a README.

    Args:
        markdown_text: Raw README content.
-        repo: HF repo identifier (``user/repo``).
+        repo: Repository identifier (``user/repo``).
        default_width: Fallback width when the README provides no dimension.
        default_height: Fallback height when the README provides no dimension.
+        base_url: Overrides the asset base URL (defaults to Hugging Face).

    Returns a list of dicts compatible with the ``civitai.images`` metadata
-    format, each containing ``url`` (absolute HF URL), ``meta.prompt``,
+    format, each containing ``url`` (absolute), ``meta.prompt``,
    ``width``, ``height``, and ``type``.  Returns an empty list when no
    widget entries are found or when *repo* is empty.
    """
-    if not markdown_text or not repo:
+    if not markdown_text or not (repo or base_url):
        return []

    frontmatter = _extract_frontmatter(markdown_text)
@@ -197,7 +220,7 @@ def extract_gallery_images(
        return []

    images: List[dict[str, Any]] = []
-    base_url = f"https://huggingface.co/{repo}/resolve/main"
+    base_url = resolve_asset_base_url(repo, base_url)
    w = default_width or 512
    h = default_height or 512

@@ -279,10 +302,11 @@ def extract_gallery_table_images(
    existing_urls: set[str] | None = None,
    default_width: int = 512,
    default_height: int = 512,
+    base_url: str | None = None,
 ) -> list[dict[str, Any]]:
    """Extract images from ``| Preview | Prompt |`` markdown gallery tables.

-    Many HF READMEs include a sample-gallery table in the body (outside
+    Many READMEs include a sample-gallery table in the body (outside
    the YAML frontmatter) that shows generation examples with their
    prompts.  This function parses those tables and merges results with
    the widget-sourced images from :func:`extract_gallery_images`.
@@ -291,10 +315,10 @@ def extract_gallery_table_images(
    :func:`extract_gallery_images`.  Already-seen URLs (from *existing_urls*)
    are skipped.
    """
-    if not markdown_text or not repo:
+    if not markdown_text or not (repo or base_url):
        return []

-    base_url = f"https://huggingface.co/{repo}/resolve/main"
+    base_url = resolve_asset_base_url(repo, base_url)
    images: list[dict[str, Any]] = []
    seen_urls: set[str] = set(existing_urls) if existing_urls else set()
    lines = markdown_text.split("\n")
@@ -368,12 +392,18 @@ def _extract_frontmatter(text: str) -> str:


 def convert_readme_to_html(markdown_text: str | None) -> str:
-    """Convert HF README markdown to sanitised HTML."""
+    """Convert HF README markdown to sanitised HTML.
+
+    Site-generated placeholder notices are dropped here too, so a repository
+    whose author wrote nothing does not store the download instructions as its
+    model description; the result is an empty string in that case.
+    """
    if not markdown_text:
        return ""

    text = markdown_text
    text = _strip_frontmatter(text)
+    text = _strip_generated_card_boilerplate(text)
    text = _strip_gallery(text)
    text = _strip_badge_images(text)
    text = _strip_html_comments(text)
@@ -420,6 +450,59 @@ _MASSIVE_LIST_LINE_MIN_LEN = 150
 #: Minimum consecutive enumeration lines to trigger massive-list stripping.
 _MASSIVE_LIST_THRESHOLD = 8

+#: Substrings identifying text a *site* generated to fill a model card whose
+#: author wrote nothing, as opposed to the author's own content.  ModelScope
+#: renders such a card as a placeholder notice, a block of SDK/git download
+#: instructions, and a closing invitation to improve the card.
+#:
+#: Matched as substrings rather than whole headings because the notices are
+#: prose, and because non-Latin scripts are not space-delimited — the notice
+#: continues with a full-width period, so the ``title == kw`` style matching
+#: used for :data:`_BOILERPLATE_HEADERS` would never fire.
+_GENERATED_CARD_MARKERS: tuple[str, ...] = (
+    "当前模型的贡献者未提供更加详细的模型介绍",
+    "您可以通过如下",
+    "如果您是本模型的贡献者",
+)
+
+
+def _strip_generated_card_boilerplate(text: str) -> str:
+    """Remove the notices a site generates to fill an empty model card.
+
+    A repository whose uploader wrote no README still gets a card: ModelScope
+    answers with "the contributor provided no further description", the SDK
+    and git download commands, and an invitation to complete the card.  None
+    of it describes the model, yet it was landing in both the LLM prompt and
+    the stored description.
+
+    A notice that is a heading takes its whole section with it, so the
+    download block goes too; a stand-alone notice line is dropped on its own.
+    Content the author added later — under a heading of equal or higher
+    level — is kept, so an improved card is not thrown away.
+    """
+
+    lines = text.split("\n")
+    out: list[str] = []
+    skip_until_level: int | None = None
+
+    for line in lines:
+        level = _heading_level(line)
+
+        if any(marker in line for marker in _GENERATED_CARD_MARKERS):
+            if level > 0:
+                skip_until_level = level
+            continue
+
+        if skip_until_level is not None:
+            if level > 0 and level <= skip_until_level:
+                skip_until_level = None
+            else:
+                continue
+
+        out.append(line)
+
+    return "\n".join(out)
+

 def clean_readme_for_llm(markdown_text: str | None, max_length: int = 6000) -> str:
    """Clean a HF README for injection into an LLM metadata-extraction prompt.
@@ -429,6 +512,8 @@ def clean_readme_for_llm(markdown_text: str | None, max_length: int = 6000) -> s

    * ``widget:`` YAML block (example prompts + output URLs)
    * ``<Gallery />`` tags and wrappers
+    * Site-generated placeholder notices for a card the author never wrote
+      (see :func:`_strip_generated_card_boilerplate`)
    * Fenced code blocks (Python / bash / bibtex / yaml)
    * Standalone ``![...](...)`` image lines and ``<img>`` tags
    * Training-parameter tables
@@ -454,6 +539,7 @@ def clean_readme_for_llm(markdown_text: str | None, max_length: int = 6000) -> s
    # Order matters — broader strips first, then finer ones.
    text = _strip_gallery(text)
    text = _strip_widget_section(text)
+    text = _strip_generated_card_boilerplate(text)
    text = _strip_fenced_code_blocks(text)
    text = _strip_standalone_images(text)
    text = _strip_training_tables(text)
@@ -21,6 +21,7 @@ from .model_query import (
    resolve_sub_type,
 )
 from .settings_manager import get_settings_manager
+from .model_sources import source_group_key
 from ..utils.civitai_utils import build_civitai_model_page_url

 logger = logging.getLogger(__name__)
@@ -742,29 +743,32 @@ class BaseModelService(ABC):
    @staticmethod
    def _extract_hf_group_key(item: Dict[str, Any]) -> Optional[str]:
        """Extract `hf:{owner}/{repo}` from item's ``hf_url``, or None."""
-        hf_url = item.get("hf_url") if isinstance(item, dict) else None
-        if not hf_url or not isinstance(hf_url, str):
-            return None
-        m = re.match(
-            r"https?://huggingface\.co/([^/]+/[^/]+)", hf_url.strip()
-        )
-        if not m:
-            return None
-        return f"hf:{m.group(1)}"
+        key = BaseModelService._extract_source_group_key(item)
+        return key if key and key.startswith("hf:") else None
+
+    @staticmethod
+    def _extract_source_group_key(item: Dict[str, Any]) -> Optional[str]:
+        """Return the external-source group key for *item*, or None.
+
+        Hugging Face keeps the historical ``hf:{owner}/{repo}`` shape; other
+        platforms use their own short prefix (``ms:`` / ``ta:``).
+        """
+        return source_group_key(item)

    @staticmethod
    def _extract_group_key(item: Dict[str, Any]) -> Union[int, str, None]:
-        """Return the group identity key: CivitAI modelId (int) or HF repo (str).
+        """Return the group identity key.

        Preference order:
        1. CivitAI ``modelId`` (int)
-        2. HF repo identity ``hf:{owner}/{repo}`` (str)
+        2. External model source identity, e.g. ``hf:{owner}/{repo}``,
+           ``ms:{owner}/{repo}``, ``ta:{model_id}`` (str)
        3. ``None`` (no known grouping source)
        """
        mid = BaseModelService._extract_model_id(item)
        if mid is not None:
            return mid
-        return BaseModelService._extract_hf_group_key(item)
+        return BaseModelService._extract_source_group_key(item)

    @staticmethod
    def _extract_model_id(item: Dict[str, Any]) -> Optional[int]:
@@ -67,6 +67,8 @@ class CheckpointService(BaseModelService):
            "civitai": self.filter_civitai_data(model_data.get("civitai", {}), minimal=True),
            "auto_tags": model_data.get("auto_tags") or extract_auto_tags(model_data),
            "version_count": model_data.get("version_count"),
+            "source_platform": model_data.get("source_platform", ""),
+            "source_url": model_data.get("source_url", ""),
            "hf_url": model_data.get("hf_url", ""),
        }
    
@@ -33,7 +33,7 @@ from ..utils.constants import (
 from ..utils.civitai_utils import normalize_civitai_download_url, rewrite_preview_url
 from ..utils.file_utils import calculate_sha256, calculate_autov3
 from ..utils.preview_selection import resolve_mature_threshold, select_preview_media
-from ..utils.utils import sanitize_folder_name
+from ..utils.utils import calculate_filename_for_model, sanitize_folder_name
 from ..utils.exif_utils import ExifUtils
 from ..utils.metadata_manager import MetadataManager
 from .service_registry import ServiceRegistry
@@ -45,6 +45,7 @@ from .errors import RateLimitError
 from .aria2_downloader import Aria2Error, get_aria2_downloader
 from .aria2_transfer_state import Aria2TransferStateStore
 from .download_queue_service import DownloadQueueService
+from .model_lifecycle_service import ModelLifecycleService, load_local_metadata

 # Download to temporary file first
 import tempfile
@@ -2746,6 +2747,7 @@ class DownloadManager:
                else None
            )

+            downloaded_metadata: List[Dict[str, Any]] = []
            for index, entry in enumerate(metadata_entries):
                file_path_for_adjust = getattr(
                    entry, "file_path", actual_file_paths[index]
@@ -2788,6 +2790,15 @@ class DownloadManager:
                if scanner is not None:
                    await scanner.add_model_to_cache(metadata_dict, relative_path)

+                downloaded_metadata.append(metadata_dict)
+
+            await self._apply_download_filename_template(
+                scanner=scanner,
+                model_type=model_type,
+                downloaded_metadata=downloaded_metadata,
+                download_id=download_id,
+            )
+
            if transfer_backend == "aria2" and download_id:
                await self._aria2_state_store.remove(download_id)

@@ -2827,6 +2838,83 @@ class DownloadManager:

            return {"success": False, "error": str(e)}

+    async def _apply_download_filename_template(
+        self,
+        *,
+        scanner,
+        model_type: str,
+        downloaded_metadata: List[Dict[str, Any]],
+        download_id: Optional[str],
+    ) -> None:
+        """Rename freshly downloaded models according to the filename template.
+
+        Best-effort post-download step: any failure (including name conflicts)
+        is logged and skipped so a successful download is never turned into a
+        failure by a rename problem.
+        """
+        try:
+            if scanner is None or not downloaded_metadata:
+                return
+
+            template = get_settings_manager().get_download_filename_template(
+                model_type
+            )
+            if not template:
+                return
+
+            lifecycle_service = ModelLifecycleService(
+                scanner=scanner,
+                metadata_manager=MetadataManager,
+                metadata_loader=load_local_metadata,
+                recipe_scanner_factory=ServiceRegistry.get_recipe_scanner,
+            )
+
+            for metadata_dict in downloaded_metadata:
+                file_path = metadata_dict.get("file_path")
+                if not isinstance(file_path, str) or not file_path:
+                    continue
+
+                new_stem = calculate_filename_for_model(metadata_dict, model_type)
+                if not new_stem:
+                    continue
+
+                current_stem = os.path.splitext(os.path.basename(file_path))[0]
+                if new_stem == current_stem or os.path.normcase(
+                    new_stem
+                ) == os.path.normcase(current_stem):
+                    continue
+
+                try:
+                    result = await lifecycle_service.rename_model(
+                        file_path=file_path, new_file_name=new_stem
+                    )
+                except ValueError as exc:
+                    logger.warning(
+                        "Keeping original filename for %s: %s", file_path, exc
+                    )
+                    continue
+
+                new_file_path = result.get("new_file_path")
+                if download_id and isinstance(new_file_path, str):
+                    info = self._active_downloads.get(download_id)
+                    if info is None:
+                        continue
+                    if info.get("file_path") == file_path:
+                        info["file_path"] = new_file_path
+                    extracted = info.get("extracted_paths")
+                    if isinstance(extracted, list):
+                        info["extracted_paths"] = [
+                            new_file_path if path == file_path else path
+                            for path in extracted
+                        ]
+        except Exception as exc:  # Rename phase must never fail the download
+            logger.warning(
+                "Filename template rename failed for %s download: %s",
+                model_type,
+                exc,
+                exc_info=True,
+            )
+
    def _get_supported_extensions_for_type(self, model_type: str) -> Set[str]:
        if model_type in ("checkpoint", "other"):
            return {
@@ -67,6 +67,8 @@ class EmbeddingService(BaseModelService):
            "civitai": self.filter_civitai_data(model_data.get("civitai", {}), minimal=True),
            "auto_tags": model_data.get("auto_tags") or extract_auto_tags(model_data),
            "version_count": model_data.get("version_count"),
+            "source_platform": model_data.get("source_platform", ""),
+            "source_url": model_data.get("source_url", ""),
            "hf_url": model_data.get("hf_url", ""),
        }
    
@@ -267,6 +267,16 @@ _PROVIDER_DEFAULTS: Dict[str, str] = {
 # Request timeout for LLM calls (seconds)
 _LLM_TIMEOUT = aiohttp.ClientTimeout(total=120)

+# Providers that do NOT implement ``response_format: {"type": "json_schema"}``
+# and reject it with HTTP 400.  For these the weaker, widely supported
+# ``json_object`` mode is used instead (the prompt already specifies the
+# expected JSON shape, and ``_try_salvage_json`` repairs imperfect output).
+# DeepSeek answers a json_schema request with
+# ``{"error":{"message":"This response_format type is unavailable now"}}``.
+# LM Studio and some other local OpenAI-compatible servers reject
+# ``json_object`` but accept ``json_schema``, so they are not listed here.
+_JSON_OBJECT_ONLY_PROVIDERS = frozenset({"deepseek"})
+

 class LLMService:
    """Centralized LLM API client.
@@ -614,47 +624,61 @@ class LLMService:
        if effective_max is None:
            effective_max = 4096

-        # Use json_schema (not json_object) for broader provider compatibility:
-        # LM Studio and some other OpenAI-compatible servers reject
-        # json_object but accept json_schema.  {"type": "object"} is
-        # functionally equivalent — it accepts any JSON object without
-        # constraining specific fields.
-        response_format = {
+        # Structured-output format.  ``json_schema`` is preferred because LM
+        # Studio and other local OpenAI-compatible servers reject
+        # ``json_object`` but accept ``json_schema``; ``{"type": "object"}``
+        # accepts any JSON object without constraining specific fields, so the
+        # two modes are functionally equivalent here.  Providers known to
+        # reject json_schema (see _JSON_OBJECT_ONLY_PROVIDERS) get
+        # ``json_object`` instead.
+        schema_format: Dict[str, Any] = {
            "type": "json_schema",
            "json_schema": {
                "name": "metadata",
                "schema": {"type": "object"},
            },
        }
+        json_object_format: Dict[str, Any] = {"type": "json_object"}

-        try:
-            result = await self.chat_completion(
-                messages=messages,
-                model=model,
-                temperature=temperature,
-                response_format=response_format,
-                max_tokens=effective_max,
-            )
-        except LLMResponseError as e:
-            # Only fall back when the provider rejects the response_format
-            # type value (e.g. "'response_format.type' must be...").  Avoid
-            # catching unrelated 400 errors whose body happens to mention
-            # "response_format" (e.g. "model does not support
-            # response_format restrictions on this endpoint").
-            if "'response_format.type'" not in str(e).lower():
-                raise
-            logger.info(
-                "Provider rejected response_format, retrying without it. "
-                "Falling back to prompt-only JSON mode. Error: %s",
-                e,
-            )
-            result = await self.chat_completion(
-                messages=messages,
-                model=model,
-                temperature=temperature,
-                response_format=None,
-                max_tokens=effective_max,
-            )
+        if self._get_config()["provider"] in _JSON_OBJECT_ONLY_PROVIDERS:
+            format_chain: List[Optional[Dict[str, Any]]] = [
+                json_object_format,
+                None,
+            ]
+        else:
+            format_chain = [schema_format, json_object_format, None]
+
+        result: Optional[Dict[str, Any]] = None
+        for index, fmt in enumerate(format_chain):
+            try:
+                result = await self.chat_completion(
+                    messages=messages,
+                    model=model,
+                    temperature=temperature,
+                    response_format=fmt,
+                    max_tokens=effective_max,
+                )
+                break
+            except LLMResponseError as e:
+                message = str(e).lower()
+                if index + 1 >= len(format_chain):
+                    raise
+                # Only downgrade when the failure is about ``response_format``.
+                # Everything else (auth, unknown model, rate limits) must
+                # surface unchanged.  Matching on the bare parameter name also
+                # covers variants such as DeepSeek's "This response_format
+                # type is unavailable now" without swallowing unrelated 400s.
+                if "response_format" not in message:
+                    raise
+                logger.info(
+                    "Provider rejected response_format=%s, retrying with %s. "
+                    "Error: %s",
+                    (fmt or {}).get("type", "none"),
+                    (format_chain[index + 1] or {}).get("type", "none"),
+                    e,
+                )
+
+        assert result is not None  # non-empty chain always sets or raises

        content = result.get("content", "") or ""
        if not content:
@@ -79,6 +79,8 @@ class LoraService(BaseModelService):
            ),
            "auto_tags": model_data.get("auto_tags") or extract_auto_tags(model_data),
            "version_count": model_data.get("version_count"),
+            "source_platform": model_data.get("source_platform", ""),
+            "source_url": model_data.get("source_url", ""),
            "hf_url": model_data.get("hf_url", ""),
        }

@@ -712,12 +714,18 @@ class LoraService(BaseModelService):
                ),
            )

-        # Return minimal data needed for cycling
-        return [
-            {
+        # Return minimal data needed for cycling. usage_tips is only included
+        # when non-empty so widget consumers (recommended strength range cues)
+        # can build their lookup without inflating the payload.
+        result = []
+        for lora in available_loras:
+            entry = {
                "file_name": f"{lora['folder']}/{lora['file_name']}" if lora.get("folder") else lora["file_name"],
                "model_name": lora.get("model_name", lora["file_name"]),
                "folder": lora.get("folder", ""),
            }
-            for lora in available_loras
-        ]
+            usage_tips = lora.get("usage_tips")
+            if usage_tips:
+                entry["usage_tips"] = usage_tips
+            result.append(entry)
+        return result
@@ -14,10 +14,33 @@ from ..utils.model_utils import determine_base_model
 from ..utils.models import autov3_from_civitai_files
 from .connectivity_guard import OFFLINE_FRIENDLY_MESSAGE, is_expected_offline_error
 from .errors import RateLimitError
+from .model_sources import has_external_source

 logger = logging.getLogger(__name__)


+def _merge_ordered_unique(existing: Iterable[str], new: Iterable[str]) -> list[str]:
+    """Concatenate two word lists, dropping duplicates without reordering.
+
+    Trigger word order is meaningful: the sequence stored in
+    ``civitai.trainedWords`` is the order used when building prompts, and users
+    can reorder it in the UI. A plain ``set`` union used to shuffle that order on
+    every metadata refresh, so existing words are kept first (in their saved
+    order) and newly discovered ones are appended.
+    """
+
+    merged: list[str] = []
+    seen: set[str] = set()
+
+    for word in list(existing) + list(new):
+        if word in seen:
+            continue
+        seen.add(word)
+        merged.append(word)
+
+    return merged
+
+
 class MetadataProviderProtocol(Protocol):
    """Subset of metadata provider interface consumed by the sync service."""

@@ -114,9 +137,10 @@ class MetadataSyncService:
                )

            if "trainedWords" in existing_civitai:
-                existing_trained = existing_civitai.get("trainedWords", [])
-                new_trained = civitai_metadata.get("trainedWords", [])
-                merged_trained = list(set(existing_trained + new_trained))
+                existing_trained = existing_civitai.get("trainedWords", []) or []
+                new_trained = civitai_metadata.get("trainedWords", []) or []
+                # Order preserving merge: the saved order drives prompt order.
+                merged_trained = _merge_ordered_unique(existing_trained, new_trained)
                merged_civitai["trainedWords"] = merged_trained

            local_metadata["civitai"] = merged_civitai
@@ -222,9 +246,10 @@ class MetadataSyncService:
                        error_msg = "CivitAI model is deleted and no archive provider is available"
                    return False, error_msg
            else:
-                is_hf_source = bool(model_data.get("hf_url"))
+                is_hf_source = has_external_source(model_data)
                if is_hf_source:
-                    # HF-sourced model: only check CivitAI API directly.
+                    # External-source model (Hugging Face / ModelScope /
+                    # TensorArt): only check CivitAI API directly.
                    # CivArchive is almost guaranteed to have no record, and
                    # hitting it wastes rate-limit budget.
                    # Use a distinct provider name ("civitai_api" not None) so
@@ -2,13 +2,15 @@ import asyncio
 import fnmatch
 import os
 import logging
+import shutil
 from typing import Any, Dict, List, Optional, Sequence, Set
 from abc import ABC, abstractmethod

 from ..utils.utils import calculate_relative_path_for_model, remove_empty_dirs
-from ..utils.constants import AUTO_ORGANIZE_BATCH_SIZE
+from ..utils.constants import AUTO_ORGANIZE_BATCH_SIZE, MODEL_FILE_EXTENSIONS
 from ..services.settings_manager import get_settings_manager
 from ..services.model_lifecycle_service import _require_path_in_library_roots
+from ..services.pending_delete_service import PENDING_DELETE_DIR_NAME

 logger = logging.getLogger(__name__)

@@ -41,10 +43,22 @@ class AutoOrganizeResult:
    
    def to_dict(self) -> Dict[str, Any]:
        """Convert result to dictionary"""
+        if self.operation_type == 'filename_template':
+            message = (
+                f'Filename template applied: {self.success_count} renamed, '
+                f'{self.skipped_count} skipped, {self.failure_count} failed '
+                f'out of {self.total} total'
+            )
+        else:
+            message = (
+                f'Auto-organize {self.operation_type} completed: '
+                f'{self.success_count} moved, {self.skipped_count} skipped, '
+                f'{self.failure_count} failed out of {self.total} total'
+            )
        result: Dict[str, Any] = {
            'success': self.status != 'error',
            'status': self.status,
-            'message': f'Auto-organize {self.operation_type} completed: {self.success_count} moved, {self.skipped_count} skipped, {self.failure_count} failed out of {self.total} total',
+            'message': message,
            'summary': {
                'total': self.total,
                'success': self.success_count,
@@ -473,17 +487,368 @@ class ModelFileService:

 class ModelMoveService:
    """Service for handling individual model moves"""
-    
+
    def __init__(self, scanner, model_type: str):
        """Initialize the service
-        
+
        Args:
            scanner: Model scanner instance
            model_type: Type of model (e.g., 'lora', 'checkpoint')
        """
        self.scanner = scanner
        self.model_type = model_type
-    
+
+    async def create_folder(self, folder_path: str) -> Dict[str, Any]:
+        """Create a directory inside the model library roots.
+
+        Args:
+            folder_path: Absolute path of the directory to create (business
+                path — symlinks are not resolved)
+
+        Returns:
+            Dictionary with success flag, the created path and the
+            library-relative folder name used by folder trees.
+        """
+        try:
+            if not folder_path or not str(folder_path).strip():
+                return {"success": False, "error": "Folder path is required"}
+
+            _require_path_in_library_roots(folder_path, self.scanner, label="Folder path")
+
+            absolute_path = os.path.abspath(folder_path)
+            already_exists = os.path.isdir(absolute_path)
+            os.makedirs(absolute_path, exist_ok=True)
+
+            relative_folder = self._calculate_relative_folder(absolute_path)
+            if relative_folder:
+                await self.scanner.add_known_folder(relative_folder)
+
+            return {
+                "success": True,
+                "folder_path": absolute_path.replace(os.sep, "/"),
+                "folder": relative_folder,
+                "created": not already_exists,
+            }
+        except ValueError as exc:
+            return {"success": False, "error": str(exc)}
+        except Exception as exc:
+            logger.error(f"Error creating folder: {exc}", exc_info=True)
+            return {"success": False, "error": str(exc)}
+
+    def _calculate_relative_folder(self, absolute_path: str) -> str:
+        """Return the library-relative folder for an absolute directory path."""
+        normalized = os.path.abspath(absolute_path)
+        for root in self.scanner.get_model_roots():
+            abs_root = os.path.abspath(root)
+            try:
+                rel = os.path.relpath(normalized, abs_root)
+            except ValueError:
+                continue
+            if rel == ".":
+                return ""
+            if not rel.startswith(".."):
+                return rel.replace(os.sep, "/")
+        return ""
+
+    async def delete_folder(self, folder_path: str, dry_run: bool = False) -> Dict[str, Any]:
+        """Delete a model-free directory inside the model library roots.
+
+        Only directories whose subtree holds no model weight files can be
+        removed: a folder-level cascade would bypass the per-model lifecycle
+        bookkeeping (metadata sidecars, previews, cache entries, pending-delete
+        staging and recipe references), so it is deliberately refused. Leftover
+        non-model files (stray previews, sidecars, ``.bak`` files) are reported
+        in the manifest before they are removed.
+
+        Args:
+            folder_path: Absolute path of the directory to remove (business
+                path — symlinks are not resolved)
+            dry_run: When true, only report what would be removed
+
+        Returns:
+            Dictionary with the success flag plus a removal manifest
+            (``model_count``/``file_count``/``dir_count``/``symlink_count``/
+            ``total_bytes``/``restorable``) on success.
+        """
+        try:
+            if not folder_path or not str(folder_path).strip():
+                return {"success": False, "error": "Folder path is required"}
+
+            _require_path_in_library_roots(folder_path, self.scanner, label="Folder path")
+
+            absolute_path = os.path.abspath(folder_path)
+            if os.path.islink(absolute_path):
+                # shutil.rmtree refuses symlinked roots, and silently deleting
+                # the link (leaving the real directory behind) is a separate
+                # decision we do not make here.
+                return {
+                    "success": False,
+                    "error": "Symlinked folders cannot be deleted",
+                }
+            if not os.path.isdir(absolute_path):
+                return {"success": False, "error": "Folder no longer exists"}
+
+            if self._is_model_root(absolute_path):
+                return {
+                    "success": False,
+                    "error": "The library root itself cannot be deleted",
+                }
+
+            manifest = self._collect_folder_manifest(absolute_path)
+
+            if manifest["pending_delete_job"]:
+                return {
+                    "success": False,
+                    "code": "busy",
+                    "error": (
+                        "A staged delete is still pending inside this folder; "
+                        "wait for the undo window to expire"
+                    ),
+                    "manifest": manifest,
+                }
+
+            if manifest["model_count"] > 0:
+                return {
+                    "success": False,
+                    "code": "not_empty",
+                    "error": (
+                        f"Folder still contains {manifest['model_count']} model "
+                        "file(s); delete or move them first"
+                    ),
+                    "manifest": manifest,
+                }
+
+            relative_folder = self._calculate_relative_folder(absolute_path)
+
+            if dry_run:
+                return {
+                    "success": True,
+                    "dry_run": True,
+                    "folder_path": absolute_path.replace(os.sep, "/"),
+                    "folder": relative_folder,
+                    **manifest,
+                }
+
+            shutil.rmtree(absolute_path)
+
+            await self._forget_folder(relative_folder)
+
+            return {
+                "success": True,
+                "dry_run": False,
+                "folder_path": absolute_path.replace(os.sep, "/"),
+                "folder": relative_folder,
+                **manifest,
+            }
+        except ValueError as exc:
+            return {"success": False, "error": str(exc)}
+        except Exception as exc:
+            logger.error(f"Error deleting folder: {exc}", exc_info=True)
+            return {"success": False, "error": str(exc)}
+
+    def _is_model_root(self, absolute_path: str) -> bool:
+        """Return True when the path *is* one of the configured library roots."""
+        normalized = os.path.normpath(absolute_path)
+        for root in self.scanner.get_model_roots():
+            if os.path.normpath(os.path.abspath(root)) == normalized:
+                return True
+        return False
+
+    @staticmethod
+    def _is_model_file(file_name: str) -> bool:
+        """Return True when the file name carries a model weight extension."""
+        return os.path.splitext(file_name)[1].lower() in MODEL_FILE_EXTENSIONS
+
+    def _collect_folder_manifest(self, absolute_path: str) -> Dict[str, Any]:
+        """Describe everything a recursive delete of *absolute_path* removes.
+
+        Walking is intentional: the scanner cache can be stale, and a model file
+        that appeared on disk since the last scan must still block the delete.
+        Symbolic links are never followed (``os.walk`` default) and are counted
+        separately — ``shutil.rmtree`` unlinks them without touching their
+        targets.
+        """
+        model_count = 0
+        file_count = 0
+        dir_count = 0
+        symlink_count = 0
+        total_bytes = 0
+        pending_delete_job = False
+
+        for dirpath, dirnames, filenames in os.walk(absolute_path):
+            if PENDING_DELETE_DIR_NAME in dirnames:
+                pending_delete_job = True
+
+            for name in dirnames:
+                if os.path.islink(os.path.join(dirpath, name)):
+                    symlink_count += 1
+                else:
+                    dir_count += 1
+
+            for name in filenames:
+                full_path = os.path.join(dirpath, name)
+                if os.path.islink(full_path):
+                    symlink_count += 1
+                    continue
+                if self._is_model_file(name):
+                    model_count += 1
+                else:
+                    file_count += 1
+                try:
+                    total_bytes += os.path.getsize(full_path)
+                except OSError:  # pragma: no cover - defensive
+                    pass
+
+        return {
+            "model_count": model_count,
+            "file_count": file_count,
+            "dir_count": dir_count,
+            "symlink_count": symlink_count,
+            "total_bytes": total_bytes,
+            "pending_delete_job": pending_delete_job,
+            # A truly empty directory is the only case an "undo" can restore by
+            # simply recreating it; a folder holding stray files is gone for good.
+            "restorable": (
+                model_count == 0
+                and file_count == 0
+                and dir_count == 0
+                and symlink_count == 0
+            ),
+        }
+
+    async def _forget_folder(self, relative_folder: str) -> None:
+        """Drop a removed directory from the scanner's folder/cache records."""
+        if not relative_folder:
+            return
+        remove_known_folder = getattr(self.scanner, "remove_known_folder", None)
+        if callable(remove_known_folder):
+            await remove_known_folder(relative_folder)
+
+    async def rename_folder(self, folder_path: str, new_name: str) -> Dict[str, Any]:
+        """Rename a directory inside the model library roots.
+
+        Unlike :meth:`delete_folder` this works on folders that hold models.
+        A rename keeps every file, so no per-model lifecycle step is bypassed:
+        the directory is renamed on disk and the affected folder, cache, hash
+        index and metadata-sidecar records are re-keyed onto the new prefix by
+        the scanner.
+
+        Args:
+            folder_path: Absolute path of the directory to rename (business
+                path — symlinks are not resolved)
+            new_name: New leaf name; a single path segment, not a path
+
+        Returns:
+            Dictionary with the success flag, the previous/next library-relative
+            folder names and whether the directory actually moved.
+        """
+        try:
+            if not folder_path or not str(folder_path).strip():
+                return {"success": False, "error": "Folder path is required"}
+
+            new_name = str(new_name or "").strip()
+            if not new_name:
+                return {"success": False, "error": "New folder name is required"}
+            if new_name in (".", "..") or any(
+                char in new_name for char in '/\\:*?"<>|'
+            ):
+                return {"success": False, "error": "Invalid characters in folder name"}
+
+            _require_path_in_library_roots(folder_path, self.scanner, label="Folder path")
+
+            absolute_path = os.path.abspath(folder_path)
+            if os.path.islink(absolute_path):
+                return {
+                    "success": False,
+                    "error": "Symlinked folders cannot be renamed",
+                }
+            if not os.path.isdir(absolute_path):
+                return {"success": False, "error": "Folder no longer exists"}
+
+            if self._is_model_root(absolute_path):
+                return {
+                    "success": False,
+                    "error": "The library root itself cannot be renamed",
+                }
+
+            previous_relative = self._calculate_relative_folder(absolute_path)
+            target = os.path.join(os.path.dirname(absolute_path), new_name)
+
+            if os.path.normpath(target) == os.path.normpath(absolute_path):
+                return {
+                    "success": True,
+                    "renamed": False,
+                    "folder": previous_relative,
+                    "previous_folder": previous_relative,
+                    "folder_path": absolute_path.replace(os.sep, "/"),
+                }
+
+            if os.path.exists(target):
+                return {
+                    "success": False,
+                    "code": "target_exists",
+                    "error": f"A folder named \"{new_name}\" already exists here",
+                }
+
+            # A staging manifest records absolute original/staged paths, so
+            # moving a folder that holds one would break its undo and purge.
+            if self._has_pending_delete_job(absolute_path):
+                return {
+                    "success": False,
+                    "code": "busy",
+                    "error": (
+                        "A staged delete is still pending inside this folder; "
+                        "wait for the undo window to expire"
+                    ),
+                }
+
+            os.rename(absolute_path, target)
+
+            new_relative = self._calculate_relative_folder(target)
+            await self._rename_folder_records(
+                previous_relative, new_relative, absolute_path, target
+            )
+
+            return {
+                "success": True,
+                "renamed": True,
+                "folder": new_relative,
+                "previous_folder": previous_relative,
+                "folder_path": target.replace(os.sep, "/"),
+            }
+        except ValueError as exc:
+            return {"success": False, "error": str(exc)}
+        except Exception as exc:
+            logger.error(f"Error renaming folder: {exc}", exc_info=True)
+            return {"success": False, "error": str(exc)}
+
+    @staticmethod
+    def _has_pending_delete_job(absolute_path: str) -> bool:
+        """Return True when a staged-delete batch lives inside the subtree."""
+        for _dirpath, dirnames, _filenames in os.walk(absolute_path):
+            if PENDING_DELETE_DIR_NAME in dirnames:
+                return True
+        return False
+
+    async def _rename_folder_records(
+        self,
+        previous_relative: str,
+        new_relative: str,
+        previous_path: str,
+        new_path: str,
+    ) -> None:
+        """Hand the rename to the scanner so folder/cache records follow it."""
+        if not previous_relative or not new_relative:
+            return
+        rename_known_folder = getattr(self.scanner, "rename_known_folder", None)
+        if callable(rename_known_folder):
+            await rename_known_folder(
+                previous_relative,
+                new_relative,
+                previous_path=previous_path,
+                new_path=new_path,
+            )
+
    async def move_model(self, file_path: str, target_path: str, use_default_paths: bool = False) -> Dict[str, Any]:
        """Move a single model file
        
@@ -2,6 +2,7 @@

 from __future__ import annotations

+import json
 import logging
 import os
 from typing import Any, Awaitable, Callable, Dict, Iterable, List, Mapping, Optional, TYPE_CHECKING, cast
@@ -17,6 +18,26 @@ if TYPE_CHECKING:
    from ..services.model_update_service import ModelUpdateService


+async def load_local_metadata(metadata_path: str) -> Dict[str, Any]:
+    """Load a metadata sidecar JSON, returning an empty dict when missing.
+
+    Thin equivalent of ``MetadataSyncService.load_local_metadata`` for callers
+    (download manager, use cases) that do not hold a sync-service instance.
+    """
+
+    if not os.path.exists(metadata_path):
+        return {}
+
+    try:
+        with open(metadata_path, "r", encoding="utf-8") as handle:
+            payload = json.load(handle)
+    except Exception as exc:
+        logger.warning("Failed to load metadata from %s: %s", metadata_path, exc)
+        return {}
+
+    return payload if isinstance(payload, dict) else {}
+
+
 async def delete_model_artifacts(
    target_dir: str, file_name: str, main_extension: str | None = None
 ) -> List[str]:
@@ -404,6 +425,9 @@ class ModelLifecycleService:
        if metadata and new_metadata_path:
            metadata["file_name"] = new_file_name
            metadata["file_path"] = new_file_path
+            # Preserve the pre-rename stem so the original download filename
+            # stays recoverable after template-driven renames.
+            metadata.setdefault("original_file_name", old_file_name)

            if metadata.get("preview_url"):
                old_preview = str(metadata["preview_url"])
@@ -15,6 +15,7 @@ from ..utils.civitai_utils import resolve_license_info
 from .model_cache import ModelCache
 from .model_hash_index import ModelHashIndex
 from .model_lifecycle_service import delete_model_artifacts, _require_path_in_library_roots
+from .model_sources import normalize_metadata_source
 from .service_registry import ServiceRegistry
 from .websocket_manager import ws_manager
 from .persistent_model_cache import get_persistent_cache
@@ -62,6 +63,15 @@ def _is_hidden_relative_path(rel_path: str) -> bool:
    return any(part.startswith(".") for part in rel_path.replace(os.sep, "/").split("/"))


+def _file_name_stem(file_path: str) -> str:
+    """Return the extension-free file name of a normalized model path.
+
+    ``file_name`` cache/sidecar fields are defined as the on-disk stem, so this
+    is the authoritative value to compare stored names against (issue #1112).
+    """
+    return os.path.splitext(os.path.basename(file_path))[0]
+
+
 # Maps a scanner model type to the manager page type used in progress
 # broadcasts (e.g. 'lora' -> 'loras').
 PAGE_TYPE_MAP = {
@@ -387,8 +397,14 @@ class ModelScanner:
            'civitai': civitai_slim,
            'civitai_deleted': bool(get_value('civitai_deleted', False)),
            'skip_metadata_refresh': bool(get_value('skip_metadata_refresh', False)),
+            # External model source (Hugging Face / ModelScope / TensorArt).
+            # `source_url` + `source_platform` are canonical; `hf_url` stays in
+            # sync as a legacy alias (normalised below).
+            'source_platform': get_value('source_platform', '') or '',
+            'source_url': get_value('source_url', '') or '',
            'hf_url': get_value('hf_url', '') or '',
        }
+        normalize_metadata_source(entry)

        license_source: Dict[str, Any] = {}
        if isinstance(civitai_full, Mapping):
@@ -1069,6 +1085,26 @@ class ModelScanner:
            # Track found files and new files
            found_paths = set()
            new_files = []
+            # Cached entries whose stored file_name no longer matches the file
+            # on disk (e.g. dotted stems truncated by the legacy .civitai.info
+            # migration, issue #1112). Repaired in place after the walk; the
+            # list stays empty on a clean library, so a no-change reconcile
+            # only pays one string compare per cached file.
+            stale_paths: List[str] = []
+            stale_seen: Set[str] = set()
+
+            def mark_stale_if_needed(cached_path: str) -> None:
+                """Queue a cached path for file_name repair when it drifted."""
+                if cached_path in stale_seen:
+                    return
+                item = path_to_item.get(cached_path)
+                if item is None:
+                    return
+                if item.get("file_name") == _file_name_stem(cached_path):
+                    return
+                stale_seen.add(cached_path)
+                stale_paths.append(cached_path)
+
            visited_real_paths = set()
            discovered_real_files = set()
            discovered_folders: Set[str] = set()
@@ -1103,6 +1139,7 @@ class ModelScanner:
                            # Check if this file is already in cache
                            if file_path in cached_paths:
                                found_paths.add(file_path)
+                                mark_stale_if_needed(file_path)
                                continue

                            # Only a cache miss needs the physical path, so the
@@ -1113,6 +1150,7 @@ class ModelScanner:
                            cached_real_match = lookup_cached_real_path(real_file_path)
                            if cached_real_match:
                                found_paths.add(cached_real_match)
+                                mark_stale_if_needed(cached_real_match)
                                continue

                            if file_path in self._excluded_models:
@@ -1125,6 +1163,7 @@ class ModelScanner:
                                for cached_path in cached_paths:
                                    if cached_path.lower() == lower_path:
                                        found_paths.add(cached_path)
+                                        mark_stale_if_needed(cached_path)
                                        matched = True
                                        break
                                if matched:
@@ -1235,7 +1274,57 @@ class ModelScanner:
                                elapsed_seconds=time.time() - start_time,
                            )
                            return
-            
+
+            # Repair rows whose file_name drifted from the file on disk. Only
+            # mismatching entries are re-read here, so a clean library never
+            # touches metadata during a refresh. Each repair goes through the
+            # single-row update path: load_metadata() normalizes the sidecar
+            # (MetadataManager._normalize_metadata_paths) and
+            # _sync_cache_from_metadata_impl() rewrites one targeted SQL delta
+            # instead of a full cache save, and the mismatch is gone
+            # afterwards, so the work never repeats (issue #1112).
+            total_repaired = 0
+            if stale_paths:
+                logger.info(
+                    "%s Scanner: Repairing %d cached entries whose file_name no longer matches the file on disk",
+                    self.model_type.capitalize(),
+                    len(stale_paths),
+                )
+                for path in stale_paths:
+                    if self.is_cancelled():
+                        logger.info(f"{self.model_type.capitalize()} Scanner: Reconcile repair cancelled")
+                        break
+                    try:
+                        metadata, _should_skip = await MetadataManager.load_metadata(
+                            path, self.model_class
+                        )
+                        if metadata is None:
+                            # Missing or corrupt sidecar: keep the existing row
+                            # so a full rebuild can recreate the metadata from
+                            # .civitai.info (or defaults) without losing cached
+                            # fields such as tags or civitai data.
+                            logger.debug(
+                                "%s Scanner: Leaving %s unchanged (no usable metadata to repair from)",
+                                self.model_type.capitalize(),
+                                path,
+                            )
+                            continue
+
+                        payload = metadata.to_dict()
+                        unknown_fields = getattr(metadata, "_unknown_fields", None)
+                        if isinstance(unknown_fields, dict):
+                            payload.update(unknown_fields)
+
+                        if await self._sync_cache_from_metadata_impl(path, payload):
+                            total_repaired += 1
+                    except Exception as exc:
+                        logger.warning(
+                            "%s Scanner: Failed to repair file_name for %s: %s",
+                            self.model_type.capitalize(),
+                            path,
+                            exc,
+                        )
+
            # Find missing files (in cache but not in filesystem)
            missing_files = cached_paths - found_paths
            total_removed = 0
@@ -1316,7 +1405,11 @@ class ModelScanner:
            elif folders_changed:
                await self._persist_current_cache()
                
-            logger.info(f"{self.model_type.capitalize()} Scanner: Cache reconciliation completed in {time.time() - start_time:.2f} seconds. Added {total_added}, removed {total_removed} models.")
+            logger.info(
+                f"{self.model_type.capitalize()} Scanner: Cache reconciliation completed in "
+                f"{time.time() - start_time:.2f} seconds. Added {total_added}, "
+                f"removed {total_removed}, repaired {total_repaired} models."
+            )
            await self._broadcast_scan_progress(
                'completed', 'process_new', 100, False,
                added=total_added, removed=total_removed,
@@ -1384,6 +1477,244 @@ class ModelScanner:

        return sorted(folders, key=lambda x: x.lower())

+    async def add_known_folder(self, folder: str) -> None:
+        """Record a folder (and its parents) in the known folder list.
+
+        Called when a directory is created between scans (e.g. via the
+        create-folder API) so folder trees reflect it immediately without
+        waiting for the next reconciliation. When ``all_folders`` has not
+        been recorded yet (legacy snapshot), this is a no-op — the scheduled
+        backfill walk discovers the directory from disk instead.
+        """
+        normalized = folder.replace("\\", "/").strip("/")
+        parts = [part for part in normalized.split("/") if part]
+        if not parts:
+            return
+        cache = self._cache
+        if cache is None:
+            return
+        recorded = getattr(cache, "all_folders", None)
+        if recorded is None:
+            return
+        known = set(recorded)
+        for i in range(1, len(parts) + 1):
+            known.add("/".join(parts[:i]))
+        updated = sorted(known, key=lambda x: x.lower())
+        if updated != list(recorded):
+            cache.all_folders = updated
+            await self._persist_current_cache()
+            self.bump_cache_version()
+
+    async def remove_known_folder(self, folder: str) -> None:
+        """Forget a folder (and its subtree) that no longer exists on disk.
+
+        Counterpart of :meth:`add_known_folder`, called after a directory is
+        removed between scans (e.g. via the delete-folder API) so folder trees
+        and the move/download destination pickers stop offering it without a
+        full rescan. Ancestors are kept on purpose: every recorded ancestor
+        exists on disk in its own right, so only the removed subtree is dropped.
+
+        Cache entries that referenced the now-missing directory are purged as
+        well, which keeps a stale (phantom) model card from surviving the
+        deletion. When ``all_folders`` has not been recorded yet (legacy
+        snapshot) only the cache purge runs — the scheduled backfill walk
+        rebuilds the folder list from disk.
+        """
+        normalized = folder.replace("\\", "/").strip("/")
+        if not normalized:
+            return
+        cache = self._cache
+        if cache is None:
+            return
+
+        prefix = f"{normalized}/"
+
+        folders_changed = False
+        recorded = getattr(cache, "all_folders", None)
+        if recorded is not None:
+            updated = [
+                entry
+                for entry in recorded
+                if entry != normalized and not entry.startswith(prefix)
+            ]
+            if updated != list(recorded):
+                cache.all_folders = updated
+                folders_changed = True
+
+        stale_paths = [
+            item.get("file_path")
+            for item in (cache.raw_data or [])
+            if self._folder_within(item.get("folder", ""), normalized)
+        ]
+        if stale_paths:
+            # The purge persists the cache — including the already updated
+            # all_folders list — and bumps the version itself.
+            await self._batch_update_cache_for_deleted_models(stale_paths)
+            folders = set(item.get("folder", "") for item in cache.raw_data)
+            cache.folders = sorted(folders, key=lambda x: x.lower())
+        elif folders_changed:
+            await self._persist_current_cache()
+
+        self.bump_cache_version()
+
+    @staticmethod
+    def _folder_within(candidate: str, target: str) -> bool:
+        """Return True when *candidate* is *target* or lives below it."""
+        return candidate == target or candidate.startswith(f"{target}/")
+
+    @staticmethod
+    def _rekey_path(value: str, old_prefix: str, new_prefix: str) -> str:
+        """Move a stored path (or URL) from *old_prefix* onto *new_prefix*."""
+        if not value:
+            return value
+        normalized = value.replace("\\", "/")
+        if normalized.startswith(old_prefix):
+            return new_prefix + normalized[len(old_prefix):]
+        return value
+
+    async def rename_known_folder(
+        self,
+        previous_folder: str,
+        new_folder: str,
+        *,
+        previous_path: str,
+        new_path: str,
+    ) -> bool:
+        """Re-key folder, cache and metadata records after a directory rename.
+
+        Counterpart of :meth:`add_known_folder` / :meth:`remove_known_folder`.
+        A rename keeps every file, so nothing may be dropped: the recorded
+        folder list, the affected cache entries (``file_path``/``folder``/
+        ``preview_url``), the hash index and the on-disk metadata sidecars are
+        all rewritten onto the new prefix. That is what lets a folder full of
+        models be renamed without a rescan and without breaking per-model
+        bookkeeping.
+
+        Args:
+            previous_folder: Library-relative folder name before the rename
+            new_folder: Library-relative folder name after the rename
+            previous_path: Absolute directory path before the rename
+            new_path: Absolute directory path after the rename
+
+        Returns:
+            True when any recorded data was rewritten.
+        """
+        previous = previous_folder.replace("\\", "/").strip("/")
+        current = new_folder.replace("\\", "/").strip("/")
+        if not previous or not current or previous == current:
+            return False
+
+        old_rel_prefix = f"{previous}/"
+        new_rel_prefix = f"{current}/"
+        old_abs_prefix = f"{str(previous_path).replace(chr(92), '/').rstrip('/')}/"
+        new_abs_prefix = f"{str(new_path).replace(chr(92), '/').rstrip('/')}/"
+
+        cache = self._cache
+        if cache is None:
+            return False
+
+        changed = False
+
+        recorded = getattr(cache, "all_folders", None)
+        if recorded is not None:
+            rekeyed = sorted(
+                (
+                    self._rekey_folder_name(entry, previous, old_rel_prefix, new_rel_prefix)
+                    for entry in recorded
+                ),
+                key=lambda entry: entry.lower(),
+            )
+            if rekeyed != list(recorded):
+                cache.all_folders = rekeyed
+                changed = True
+
+        excluded = getattr(self, "_excluded_models", None)
+        if excluded:
+            rekeyed_excluded = [
+                self._rekey_path(entry, old_abs_prefix, new_abs_prefix)
+                for entry in excluded
+            ]
+            if rekeyed_excluded != list(excluded):
+                self._excluded_models = rekeyed_excluded
+                changed = True
+
+        touched: List[Dict[str, Any]] = []
+        for item in cache.raw_data or []:
+            folder_value = item.get("folder", "") or self._calculate_folder(
+                item.get("file_path", "")
+            )
+            if not self._folder_within(folder_value, previous):
+                continue
+
+            old_file_path = item.get("file_path", "")
+            if old_file_path:
+                cache.remove_from_version_index(item)
+                item["file_path"] = self._rekey_path(
+                    old_file_path, old_abs_prefix, new_abs_prefix
+                )
+                hash_value = (item.get("sha256") or "").lower()
+                if hash_value:
+                    self._hash_index.remove_by_path(old_file_path, hash_value)
+                    self._hash_index.add_entry(
+                        hash_value, item["file_path"], item.get("autov3") or None
+                    )
+
+            item["folder"] = self._rekey_folder_name(
+                folder_value, previous, old_rel_prefix, new_rel_prefix
+            )
+            if item.get("preview_url"):
+                item["preview_url"] = self._rekey_path(
+                    item["preview_url"], old_abs_prefix, new_abs_prefix
+                )
+            touched.append(item)
+
+        if touched:
+            changed = True
+            await self._rewrite_sidecar_paths(touched)
+            folders = set(item.get("folder", "") for item in cache.raw_data)
+            cache.folders = sorted(folders, key=lambda x: x.lower())
+            cache.rebuild_version_index()
+            await cache.resort()
+
+        if changed:
+            await self._persist_current_cache()
+
+        self.bump_cache_version()
+        return changed
+
+    @staticmethod
+    def _rekey_folder_name(
+        entry: str, previous: str, old_rel_prefix: str, new_rel_prefix: str
+    ) -> str:
+        """Move a library-relative folder name (and its subtree) under a new name."""
+        if entry == previous:
+            return new_rel_prefix.rstrip("/")
+        if entry.startswith(old_rel_prefix):
+            return new_rel_prefix + entry[len(old_rel_prefix):]
+        return entry
+
+    async def _rewrite_sidecar_paths(self, entries: List[Dict[str, Any]]) -> None:
+        """Point each model's metadata sidecar at its new location.
+
+        Sidecars travel with the renamed directory, so only the recorded
+        ``file_path``/``preview_url`` inside them need rewriting. Failures are
+        logged and skipped — a stale sidecar is repaired by the next metadata
+        refresh, and must not abort the rename.
+        """
+        for item in entries:
+            file_path = item.get("file_path")
+            if not file_path:
+                continue
+            metadata_path = f"{os.path.splitext(file_path)[0]}.metadata.json"
+            if not os.path.exists(metadata_path):
+                continue
+            try:
+                await self._update_metadata_paths(metadata_path, file_path)
+            except Exception as exc:  # pragma: no cover - defensive
+                logger.warning(
+                    "Failed to rewrite metadata sidecar %s: %s", metadata_path, exc
+                )
+
    def _schedule_all_folders_backfill(self) -> None:
        """Kick off a one-shot background folder walk if none is running."""
        if self._all_folders_backfill_running:
@@ -1545,11 +1876,16 @@ class ModelScanner:
                    
                    file_info = next((f for f in version_info.get('files', []) if f.get('primary')), None)
                    if file_info:
-                        file_name = os.path.splitext(os.path.basename(file_path))[0]
-                        file_info['name'] = file_name
-                    
+                        local_stem = os.path.splitext(os.path.basename(file_path))[0]
+                        # from_civitai_info expects an API-shaped file entry and
+                        # strips one extension itself, so hand it the real
+                        # basename: passing the already extension-free stem made
+                        # it cut dotted names at their last dot ("lora-sd1.5-..."
+                        # became "lora-sd1", issue #1112).
+                        file_info['name'] = os.path.basename(file_path)
+
                        metadata = cast(Any, self.model_class).from_civitai_info(version_info, file_info, file_path)
-                        metadata.preview_url = find_preview_file(file_name, os.path.dirname(file_path))
+                        metadata.preview_url = find_preview_file(local_stem, os.path.dirname(file_path))
                        await MetadataManager.save_metadata(file_path, metadata)
                        logger.info(f"Created metadata from .civitai.info for {file_path} (Reason: .civitai.info was found but .metadata.json was missing)")
                except Exception as e:
@@ -0,0 +1,86 @@
+"""External model-source providers (Hugging Face, ModelScope, TensorArt).
+
+This package is the single abstraction over "a site that hosts models and
+a model card".  See :mod:`py.services.model_sources.base` for the provider
+protocol and :mod:`py.services.model_sources.registry` for the lookup and
+metadata-normalisation helpers used across the codebase.
+"""
+
+from __future__ import annotations
+
+from .base import (
+    GROUP_PREFIXES,
+    HTTP_TIMEOUT,
+    ModelCardContext,
+    ModelSource,
+    ModelSourceCache,
+    ModelSourceError,
+    SourceRef,
+    USER_AGENT,
+    clean_source_url,
+    fetch_json,
+    fetch_text,
+    filter_weight_files,
+    is_valid_source_id,
+)
+from .huggingface import HuggingFaceSource
+from .hydration import (
+    hydrate_from_source,
+    load_model_card,
+    resolve_site_base_model,
+)
+from .modelscope import ModelScopeIntlSource, ModelScopeSource
+from .registry import (
+    LEGACY_HF_URL_FIELD,
+    SOURCE_PLATFORM_FIELD,
+    SOURCE_URL_FIELD,
+    detect_source,
+    downloadable_sources,
+    get_download_source,
+    get_source,
+    get_source_platform,
+    has_external_source,
+    list_sources,
+    normalize_metadata_source,
+    resolve_source_ref,
+    source_group_key,
+    source_label,
+)
+from .tensorart import TensorArtSource
+
+__all__ = [
+    "GROUP_PREFIXES",
+    "HTTP_TIMEOUT",
+    "LEGACY_HF_URL_FIELD",
+    "ModelCardContext",
+    "ModelSource",
+    "ModelSourceCache",
+    "ModelSourceError",
+    "HuggingFaceSource",
+    "ModelScopeIntlSource",
+    "ModelScopeSource",
+    "SOURCE_PLATFORM_FIELD",
+    "SOURCE_URL_FIELD",
+    "SourceRef",
+    "TensorArtSource",
+    "USER_AGENT",
+    "clean_source_url",
+    "detect_source",
+    "downloadable_sources",
+    "fetch_json",
+    "fetch_text",
+    "filter_weight_files",
+    "get_download_source",
+    "get_source",
+    "get_source_platform",
+    "has_external_source",
+    "hydrate_from_source",
+    "is_valid_source_id",
+    "list_sources",
+    "load_model_card",
+    "normalize_metadata_source",
+    "resolve_site_base_model",
+    "resolve_source_ref",
+    "source_group_key",
+    "source_label",
+]
@@ -0,0 +1,446 @@
+"""Base types for the external model-source provider abstraction.
+
+A *model source* is a third-party site that hosts model files and a model
+card (README) describing them — Hugging Face, ModelScope, TensorArt, and
+whatever gets added later.  Everything the rest of the codebase needs to
+know about such a site is expressed by :class:`ModelSource`:
+
+* how to recognise one of its URLs (:meth:`ModelSource.parse`)
+* the canonical page URL for a source id (:meth:`ModelSource.canonical_url`)
+* how to fetch the model card (:meth:`ModelSource.fetch_model_card`)
+* how to fetch the extras that live *outside* the README
+  (:meth:`ModelSource.fetch_model_card_context`)
+* how to turn repository-relative asset paths into absolute URLs
+  (:meth:`ModelSource.asset_base_url`)
+* which capabilities the site actually supports
+  (``supports_enrichment`` / ``supports_download``)
+
+Keeping this in one place means the agent pipeline, the scanners, and the
+HTTP handlers never need site-specific branching.
+"""
+
+from __future__ import annotations
+
+import logging
+import os
+import re
+from dataclasses import dataclass, field
+from typing import Any, Dict, Iterable, Optional
+
+import aiohttp
+
+from ...utils.constants import MODEL_FILE_EXTENSIONS
+
+logger = logging.getLogger(__name__)
+
+#: Shared HTTP timeout for model-card fetches.
+HTTP_TIMEOUT = 30
+
+#: User agent used for all model-source HTTP requests.
+USER_AGENT = "ComfyUI-LoRA-Manager/1.0"
+
+#: Platform → short prefix used when building version-group keys.
+#: ``huggingface`` keeps the historical ``hf:`` prefix for backward
+#: compatibility with already-cached group keys.
+GROUP_PREFIXES: dict[str, str] = {
+    "huggingface": "hf",
+    "modelscope": "ms",
+    "modelscope-ai": "msai",
+    "tensorart": "ta",
+}
+
+
+@dataclass(frozen=True)
+class SourceRef:
+    """A parsed reference to a model hosted on an external site."""
+
+    platform: str
+    """Canonical platform id, e.g. ``"huggingface"``."""
+
+    source_id: str
+    """Site-specific identity, e.g. ``"user/repo"`` or ``"827823520299086029"``."""
+
+    url: str
+    """Canonical URL of the model page."""
+
+
+@dataclass
+class ModelCardContext:
+    """Site-specific extras that accompany a model's README model card.
+
+    A model card is not always just ``README.md``.  ModelScope, for example,
+    keeps the author's summary, the site-curated tags, and the per-file
+    example images in its model-detail API rather than in the repository.
+    Sources with no such extras return an empty context (the default), so
+    every field here must be treated as optional by callers.
+    """
+
+    description: str = ""
+    """Author-written summary shown on the model page, outside the README."""
+
+    model_name: str = ""
+    """Site-published display name for the repository.
+
+    Sites publish this next to the repository id (ModelScope's ``Name``).
+    It is what a CivitAI download would store as the model's name, so the
+    card never has to fall back to the local filename.
+    """
+
+    model_name_localized: str = ""
+    """Site-published localized name (ModelScope's ``ChineseName``)."""
+
+    version_name: str = ""
+    """Site-published label for the requested file's version.
+
+    Resolved per file, like :attr:`example_images`: a repository publishes
+    one label per checkpoint (ModelScope's ``modelVersion.showName``).
+    """
+
+    license: str = ""
+    """License the site records for the repository."""
+
+    model_type: str = ""
+    """Site-reported model type, e.g. ModelScope's ``AigcType`` (``LoRA``)."""
+
+    base_model: str = ""
+    """Base model as reported by the site (possibly a site-local id)."""
+
+    base_model_aliases: list[str] = field(default_factory=list)
+    """Other names the site uses for the same base model.
+
+    Sites often publish both a link-style id (``krea/Krea-2-Turbo``) and an
+    internal architecture enum (``KREA_2``).  The enum usually normalises
+    cleanly onto this system's canonical vocabulary, so it is the better
+    resolution hint for :mod:`py.services.agent.base_model_resolver`.
+    """
+
+    official_tags: list[str] = field(default_factory=list)
+    """Content tags curated by the site itself."""
+
+    example_images: list[str] = field(default_factory=list)
+    """Absolute URLs of example images for the requested model file."""
+
+    trigger_words: list[str] = field(default_factory=list)
+    """Trigger words the site records for the requested model file."""
+
+    def is_empty(self) -> bool:
+        """Return ``True`` when the site contributed nothing extra."""
+
+        return not any(
+            (
+                self.description,
+                self.model_name,
+                self.model_name_localized,
+                self.version_name,
+                self.license,
+                self.model_type,
+                self.base_model,
+                self.base_model_aliases,
+                self.official_tags,
+                self.example_images,
+                self.trigger_words,
+            )
+        )
+
+
+class ModelSourceError(Exception):
+    """Raised when a model source cannot satisfy a request.
+
+    Carries the HTTP status the API handler should answer with, so the
+    handlers stay free of per-site error mapping.
+    """
+
+    def __init__(self, message: str, status: int = 502) -> None:
+        super().__init__(message)
+        self.status = status
+
+
+class ModelSourceCache:
+    """Per-run memo shared between the agent pipeline and a model source.
+
+    A collection repository publishes many model files under a single source
+    id, so enriching each file re-fetches the same README and the same
+    repository metadata.  One cache is created per enrichment run and thrown
+    away afterwards: nothing is retained across runs (a model card can change
+    at any time), and download URLs are never routed through it.
+    """
+
+    def __init__(self) -> None:
+        #: Provider-agnostic: ``"<platform>:<source_id>"`` → raw README text.
+        self.readmes: Dict[str, str] = {}
+        #: Provider-owned scratch space.  Keys must be namespaced by the
+        #: provider (``(platform, kind, source_id)``) so two providers can
+        #: never collide.  Only successful results should be stored, so a
+        #: transient failure is still retried for the next file.
+        self.provider: Dict[Any, Any] = {}
+
+
+#: Repository ids are always exactly ``owner/name``. Components may contain
+#: dots (``black-forest-labs/FLUX.1-dev``) but must not be empty, ``.`` / ``..``,
+#: or start with a dot - the id is used as a path segment on disk.
+_SOURCE_ID_COMPONENT = re.compile(r"^[A-Za-z0-9_][A-Za-z0-9_.\-]*$")
+
+
+def is_valid_source_id(source_id: str) -> bool:
+    """Return ``True`` when *source_id* is a safe ``owner/name`` repository id."""
+
+    if not source_id or not isinstance(source_id, str) or source_id.count("/") != 1:
+        return False
+    owner, name = source_id.split("/", 1)
+    return all(
+        part and part not in (".", "..") and _SOURCE_ID_COMPONENT.match(part)
+        for part in (owner, name)
+    )
+
+
+async def fetch_text(url: str, *, timeout: int = HTTP_TIMEOUT) -> str:
+    """Fetch *url* and return its body as text, or ``""`` on any failure.
+
+    Network problems are expected (offline installs, rate limits, dead
+    repos) and must never bubble up into the pipeline, so every error is
+    logged at debug level and normalised to an empty string.
+    """
+
+    try:
+        async with aiohttp.ClientSession(
+            headers={"User-Agent": USER_AGENT},
+            timeout=aiohttp.ClientTimeout(total=timeout),
+        ) as session:
+            async with session.get(url) as resp:
+                if resp.status == 200:
+                    return await resp.text()
+                logger.debug("Fetch %s returned HTTP %s", url, resp.status)
+    except Exception as exc:  # pragma: no cover - network dependent
+        logger.debug("Failed to fetch %s: %s", url, exc)
+    return ""
+
+
+async def fetch_json(
+    url: str, *, timeout: int = HTTP_TIMEOUT
+) -> tuple[int, Any]:
+    """Fetch *url* and return ``(status, parsed_body)``.
+
+    Unlike :func:`fetch_text` this reports the status, because callers such as
+    the file-listing endpoints need to distinguish "repo not found" (404) from
+    a transport failure.  ``parsed_body`` is ``None`` when the response is not
+    JSON or the request failed outright (status ``0``).
+    """
+
+    try:
+        async with aiohttp.ClientSession(
+            headers={"User-Agent": USER_AGENT},
+            timeout=aiohttp.ClientTimeout(total=timeout),
+        ) as session:
+            async with session.get(url) as resp:
+                if resp.status != 200:
+                    return resp.status, None
+                try:
+                    return resp.status, await resp.json(content_type=None)
+                except Exception:
+                    return resp.status, None
+    except Exception as exc:  # pragma: no cover - network dependent
+        logger.debug("Failed to fetch %s: %s", url, exc)
+        return 0, None
+
+
+class ModelSource:
+    """Description and I/O for one external model hosting site."""
+
+    #: Canonical platform id stored in metadata.
+    platform: str = ""
+
+    #: Human-readable name used in UI copy and prompts.
+    label: str = ""
+
+    #: Whether the agent skill can fetch a model card and run AI extraction.
+    supports_enrichment: bool = False
+
+    #: Whether models can be downloaded directly from this site.
+    supports_download: bool = False
+
+    #: Branch used when the caller does not pass an explicit revision.
+    default_revision: str = ""
+
+    #: Sub-directory the "use default paths" template places downloads in.
+    default_subdir: str = ""
+
+    #: Lenient pattern used to recognise URLs already stored in metadata.
+    #: Captures the site-specific source id in group ``id``.
+    url_pattern: re.Pattern[str] | None = None
+
+    #: Strict pattern used to validate user input.  Must match the whole URL.
+    strict_url_pattern: re.Pattern[str] | None = None
+
+    # ------------------------------------------------------------------
+    # Parsing
+    # ------------------------------------------------------------------
+
+    def parse(self, url: str, *, strict: bool = False) -> Optional[str]:
+        """Return the source id contained in *url*, or ``None``.
+
+        With ``strict=True`` the URL must match this site's canonical shape
+        exactly (used when validating what a user pasted); with
+        ``strict=False`` sub-paths such as ``/resolve/main/file.bin`` are
+        tolerated (used when normalising already-stored values).
+        """
+
+        if not url or not isinstance(url, str):
+            return None
+        candidate = url.strip()
+        if not candidate:
+            return None
+        pattern = self.strict_url_pattern if strict else self.url_pattern
+        if pattern is None:
+            return None
+        match = pattern.match(candidate)
+        return match.group("id") if match else None
+
+    def ref(self, url: str, *, strict: bool = False) -> Optional[SourceRef]:
+        """Return a :class:`SourceRef` for *url*, or ``None`` if not ours."""
+
+        source_id = self.parse(url, strict=strict)
+        if not source_id:
+            return None
+        return SourceRef(
+            platform=self.platform,
+            source_id=source_id,
+            url=self.canonical_url(source_id),
+        )
+
+    # ------------------------------------------------------------------
+    # URLs and content
+    # ------------------------------------------------------------------
+
+    def canonical_url(self, source_id: str) -> str:
+        """Return the canonical model-page URL for *source_id*."""
+
+        raise NotImplementedError
+
+    def asset_base_url(self, source_id: str, revision: str = "") -> str:
+        """Base URL used to resolve repository-relative asset paths."""
+
+        return ""
+
+    def group_key(self, source_id: str) -> str:
+        """Return the version-group key for *source_id*."""
+
+        prefix = GROUP_PREFIXES.get(self.platform, self.platform)
+        return f"{prefix}:{source_id}"
+
+    async def fetch_model_card(self, source_id: str) -> str:
+        """Fetch the raw model card (README) markdown for *source_id*."""
+
+        return ""
+
+    async def fetch_model_card_context(
+        self,
+        source_id: str,
+        filename: str = "",
+        *,
+        sha256: str = "",
+        cache: Optional["ModelSourceCache"] = None,
+    ) -> ModelCardContext:
+        """Return the card extras the site keeps outside the README.
+
+        *filename* is the model file's basename (no directory) and *sha256*
+        its content hash; between them they select the right entry when a
+        repository holds several models.  A site that records per-file hashes
+        should prefer *sha256*, because it is the only identifier that
+        survives the user renaming the weights.
+
+        *cache* is an optional per-run memo (see :class:`ModelSourceCache`)
+        that lets a provider avoid re-fetching repository-wide data for every
+        file in a collection repository.
+
+        Sites whose model card is fully described by :meth:`fetch_model_card`
+        need no override and inherit this empty context.
+
+        Implementations must never raise: enrichment treats a missing
+        context as "the site had nothing extra to say".
+        """
+
+        return ModelCardContext()
+
+    # ------------------------------------------------------------------
+    # Download support
+    # ------------------------------------------------------------------
+
+    async def list_files(
+        self, source_id: str, revision: str = ""
+    ) -> list[dict[str, Any]]:
+        """List downloadable weight files in *source_id*.
+
+        Returns ``[{"filename": <repo-relative path>, "size": <bytes>}]``,
+        largest first, filtered to :data:`MODEL_FILE_EXTENSIONS`.  Sites
+        without download support return an empty list.
+
+        Raises :class:`ModelSourceError` when the repository cannot be read,
+        so the handler can surface "not found" separately from a transport
+        failure.
+        """
+
+        return []
+
+    def file_download_url(
+        self, source_id: str, filename: str, revision: str = ""
+    ) -> str:
+        """Return the direct (redirecting) download URL for one file."""
+
+        raise ModelSourceError(
+            f"{self.label or self.platform} does not support downloads", status=400
+        )
+
+    def resolve_revision(self, revision: str = "") -> str:
+        """Return *revision*, falling back to this site's default branch."""
+
+        return revision or self.default_revision
+
+    def page_url_for_file(self, source_id: str, filename: str) -> str:
+        """Return the human-facing page for *filename* inside *source_id*."""
+
+        return self.canonical_url(source_id)
+
+    def __repr__(self) -> str:  # pragma: no cover - debugging aid
+        return f"<ModelSource {self.platform}>"
+
+
+def clean_source_url(url: Any) -> str:
+    """Normalise a stored source URL value into a stripped string."""
+
+    if not isinstance(url, str):
+        return ""
+    return url.strip()
+
+
+def filter_weight_files(entries: Iterable[tuple[str, int]]) -> list[dict[str, Any]]:
+    """Keep model-weight files from ``(path, size)`` pairs, largest first.
+
+    Every site lists a lot more than weights (READMEs, configs, tokenizers,
+    …); the download picker only ever wants the files ComfyUI can load, which
+    is exactly :data:`MODEL_FILE_EXTENSIONS`.
+    """
+
+    files = [
+        {"filename": path, "size": int(size or 0)}
+        for path, size in entries
+        if path and os.path.splitext(path)[1].lower() in MODEL_FILE_EXTENSIONS
+    ]
+    files.sort(key=lambda entry: entry["size"], reverse=True)
+    return files
+
+
+__all__ = [
+    "GROUP_PREFIXES",
+    "HTTP_TIMEOUT",
+    "ModelCardContext",
+    "ModelSource",
+    "ModelSourceCache",
+    "ModelSourceError",
+    "SourceRef",
+    "USER_AGENT",
+    "clean_source_url",
+    "fetch_json",
+    "fetch_text",
+    "filter_weight_files",
+    "is_valid_source_id",
+]
@@ -0,0 +1,106 @@
+"""Hugging Face model source."""
+
+from __future__ import annotations
+
+import logging
+import re
+
+from .base import (
+    ModelSource,
+    ModelSourceError,
+    fetch_json,
+    fetch_text,
+    filter_weight_files,
+)
+
+logger = logging.getLogger(__name__)
+
+#: Lenient — used to normalise URLs already stored in metadata; tolerates
+#: sub-paths such as ``/resolve/main/model.safetensors``.
+_URL_PATTERN = re.compile(
+    r"https?://(?:www\.)?huggingface\.co/(?P<id>[^/?#\s]+/[^/?#\s]+)"
+)
+
+#: Strict — validates what the user pasted into the "link model" dialog.
+_STRICT_URL_PATTERN = re.compile(
+    r"https?://(?:www\.)?huggingface\.co/(?P<id>[^/?#\s]+/[^/?#\s]+)/?$"
+)
+
+
+class HuggingFaceSource(ModelSource):
+    """Hugging Face Hub (``huggingface.co``)."""
+
+    platform = "huggingface"
+    label = "Hugging Face"
+    supports_enrichment = True
+    supports_download = True
+    default_revision = "main"
+    default_subdir = "huggingface"
+    url_pattern = _URL_PATTERN
+    strict_url_pattern = _STRICT_URL_PATTERN
+
+    def canonical_url(self, source_id: str) -> str:
+        return f"https://huggingface.co/{source_id}"
+
+    def asset_base_url(self, source_id: str, revision: str = "") -> str:
+        return f"https://huggingface.co/{source_id}/resolve/{self.resolve_revision(revision)}"
+
+    async def fetch_model_card(self, source_id: str) -> str:
+        """Fetch ``README.md`` from Hugging Face (tries ``main``, then ``master``)."""
+
+        for branch in ("main", "master"):
+            text = await fetch_text(
+                f"https://huggingface.co/{source_id}/raw/{branch}/README.md"
+            )
+            if text:
+                return text
+        return ""
+
+    async def list_files(
+        self, source_id: str, revision: str = ""
+    ) -> list[dict]:
+        """List weight files via the Hub tree API.
+
+        The tree endpoint (rather than the model-info endpoint) is used
+        because it reports accurate sizes for LFS-tracked files.
+        """
+
+        revision = self.resolve_revision(revision)
+        status, payload = await fetch_json(
+            f"https://huggingface.co/api/models/{source_id}/tree/{revision}"
+        )
+
+        if status == 404:
+            raise ModelSourceError(f"Repository '{source_id}' not found", status=404)
+        if status != 200 or not isinstance(payload, list):
+            raise ModelSourceError(
+                f"Hugging Face API error while listing '{source_id}' (HTTP {status})"
+            )
+
+        entries = []
+        for entry in payload:
+            if not isinstance(entry, dict):
+                continue
+            path = entry.get("path", "")
+            size = entry.get("size", 0) or 0
+            if not size and isinstance(entry.get("lfs"), dict):
+                size = entry["lfs"].get("size", 0) or 0
+            entries.append((path, size))
+
+        return filter_weight_files(entries)
+
+    def file_download_url(
+        self, source_id: str, filename: str, revision: str = ""
+    ) -> str:
+        return (
+            f"https://huggingface.co/{source_id}/resolve/"
+            f"{self.resolve_revision(revision)}/{filename}"
+        )
+
+    def page_url_for_file(self, source_id: str, filename: str) -> str:
+        return (
+            f"https://huggingface.co/{source_id}/blob/{self.default_revision}/{filename}"
+        )
+
+
+__all__ = ["HuggingFaceSource"]
@@ -0,0 +1,235 @@
+"""Deterministic metadata hydration for freshly downloaded source models.
+
+A CivitAI download writes a fully-populated metadata sidecar as part of the
+download itself: the name, the description, the tags, the trigger words and
+the example images all arrive with the file.  A download from an external
+model source (ModelScope, Hugging Face) has the same information behind a
+public API, but historically landed as a bare filename plus a source URL that
+the user had to enrich by hand ("Enrich Metadata with AI").
+
+This module closes that gap without involving an LLM.  It fetches the linked
+site's model card, hands it to the same :class:`~py.services.agent.post_processor.PostProcessor`
+the AI skill uses, and writes the result.  Everything it applies is data the
+site published, so it is safe to run automatically on every download and to
+treat as a fallback for the gaps the LLM would otherwise fill.
+
+Nothing here may break a download: every failure is logged and normalised to
+"the site had nothing to contribute".
+"""
+
+from __future__ import annotations
+
+import logging
+import os
+import time
+from typing import TYPE_CHECKING, Optional
+
+from .base import ModelCardContext, ModelSourceCache
+from .registry import get_source, resolve_source_ref
+
+if TYPE_CHECKING:  # pragma: no cover - typing only
+    from .base import ModelSource, SourceRef
+
+logger = logging.getLogger(__name__)
+
+#: How long a fetched repository payload stays usable.  A download batch walks
+#: a repository's files one HTTP request at a time, and the README plus the
+#: detail payload describe the *repository*, not the file, so re-fetching them
+#: per file would be pure waste.  They expire so an edited model card is still
+#: picked up by the next batch.
+SHARED_CACHE_TTL = 300.0
+
+#: Upper bound on memoised repositories; a long-running server must not grow
+#: without limit.
+SHARED_CACHE_MAX_ENTRIES = 32
+
+#: ``"<platform>:<source_id>"`` → ``(expiry, memo)``.
+_shared_caches: dict[str, tuple[float, ModelSourceCache]] = {}
+
+
+def shared_source_cache(platform: str, source_id: str) -> ModelSourceCache:
+    """Return a short-lived per-repository memo for download-time hydration."""
+
+    now = time.monotonic()
+    key = f"{platform}:{source_id}"
+    entry = _shared_caches.get(key)
+    if entry is not None and entry[0] > now:
+        return entry[1]
+
+    for expired in [k for k, (expiry, _) in _shared_caches.items() if expiry <= now]:
+        _shared_caches.pop(expired, None)
+    if len(_shared_caches) >= SHARED_CACHE_MAX_ENTRIES:
+        oldest = min(_shared_caches, key=lambda k: _shared_caches[k][0])
+        _shared_caches.pop(oldest, None)
+
+    cache = ModelSourceCache()
+    _shared_caches[key] = (now + SHARED_CACHE_TTL, cache)
+    return cache
+
+
+def reset_shared_caches() -> None:
+    """Drop every memoised repository — used by tests."""
+
+    _shared_caches.clear()
+
+
+async def load_model_card(
+    source: "ModelSource",
+    source_id: str,
+    cache: Optional[ModelSourceCache] = None,
+) -> str:
+    """Return *source_id*'s README, reusing *cache* when one is supplied.
+
+    Only successful reads are memoised, leaving a transient failure to be
+    retried for the next file of the same repository.
+    """
+
+    key = f"{source.platform}:{source_id}"
+    if cache is not None:
+        cached = cache.readmes.get(key)
+        if cached is not None:
+            return cached
+
+    readme = await source.fetch_model_card(source_id)
+    if cache is not None and readme:
+        cache.readmes[key] = readme
+    return readme or ""
+
+
+async def resolve_site_base_model(context: ModelCardContext) -> str:
+    """Resolve the site's base-model hints to a canonical name, or ``""``.
+
+    Sites name base models in their own vocabulary (ModelScope publishes both
+    ``krea/Krea-2-Turbo`` and the ``KREA_2_TURBO`` enum).  The resolver is
+    strict and only ever returns a name the canonical vocabulary already
+    contains, so an uncertain hint yields ``""`` rather than a plausible-looking
+    wrong value.
+    """
+
+    hints = [*context.base_model_aliases, context.base_model]
+    if not any(hints):
+        return ""
+
+    # Imported lazily: pulling in the agent package at module scope would make
+    # the model-source package import itself while it is still initialising.
+    try:
+        from ...metadata_ops import list_base_models
+        from ..agent.base_model_resolver import resolve_base_model
+
+        known_names = await list_base_models()
+    except Exception as exc:
+        logger.warning("Could not resolve a site base model: %s", exc)
+        return ""
+    return resolve_base_model(hints, known_names)
+
+
+async def hydrate_from_source(
+    file_path: str,
+    *,
+    ref: "SourceRef",
+    cache: Optional[ModelSourceCache] = None,
+) -> list[str]:
+    """Apply the linked site's published metadata to a downloaded model.
+
+    This is the deterministic counterpart of the ``enrich_hf_metadata`` skill:
+    it produces the same populated model card a CivitAI download produces,
+    without an LLM and without user action.
+
+    Args:
+        file_path: The just-downloaded model file, whose sidecar already
+            carries the SHA256 used to match the right file in a collection
+            repository.
+        ref: The source the file came from.
+        cache: Optional per-call memo; defaults to a short-lived shared one so
+            a batch over one repository fetches its card only once.
+
+    Returns:
+        The names of the metadata fields that changed.  Never raises — a site
+        that is down, or an API that changed shape, must not fail a download.
+    """
+
+    try:
+        source = get_source(ref.platform)
+        if source is None or not source.supports_enrichment:
+            return []
+
+        from ...metadata_ops import read_metadata
+
+        metadata = await read_metadata(file_path)
+        if not metadata:
+            logger.debug("No metadata to hydrate for %s", file_path)
+            return []
+
+        # Only a model that is actually linked to this repository may be
+        # updated.  The download path writes those fields just before calling
+        # us; a file that merely shares a name with the requested one must not
+        # be given another model's card.
+        linked = resolve_source_ref(metadata)
+        if linked is None or (linked.platform, linked.source_id) != (
+            ref.platform,
+            ref.source_id,
+        ):
+            logger.debug(
+                "Not hydrating %s: linked to %s, not %s",
+                file_path, linked.url if linked else "no model source", ref.url,
+            )
+            return []
+
+        memo = cache if cache is not None else shared_source_cache(
+            ref.platform, ref.source_id
+        )
+        readme = await load_model_card(source, ref.source_id, memo)
+        context = await source.fetch_model_card_context(
+            ref.source_id,
+            os.path.basename(file_path),
+            sha256=(metadata.get("sha256") or "").strip(),
+            cache=memo,
+        )
+        if context.is_empty() and not readme:
+            logger.debug(
+                "No published metadata for %s on %s", ref.source_id, ref.platform
+            )
+            return []
+
+        resolved_base_model = await resolve_site_base_model(context)
+
+        from ..agent.post_processor import PostProcessor
+
+        result = await PostProcessor().process(
+            skill_name="enrich_hf_metadata",
+            model_path=file_path,
+            llm_output={},
+            metadata=metadata,
+            readme_content=readme,
+            source_context=context,
+            resolved_base_model=resolved_base_model,
+            metadata_source=f"source:{ref.platform}",
+        )
+        if not result.get("success", True):
+            logger.debug(
+                "Hydration reported failure for %s: %s",
+                file_path, result.get("errors"),
+            )
+            return []
+
+        updated = list(result.get("updated_fields") or [])
+        logger.info(
+            "Hydrated %s from %s (%s): %s",
+            file_path, source.label or ref.platform, ref.source_id,
+            ", ".join(updated) or "nothing to change",
+        )
+        return updated
+    except Exception as exc:  # pragma: no cover - defensive by design
+        logger.warning("Source hydration failed for %s: %s", file_path, exc)
+        return []
+
+
+__all__ = [
+    "SHARED_CACHE_MAX_ENTRIES",
+    "SHARED_CACHE_TTL",
+    "hydrate_from_source",
+    "load_model_card",
+    "reset_shared_caches",
+    "resolve_site_base_model",
+    "shared_source_cache",
+]
@@ -0,0 +1,644 @@
+"""ModelScope (魔搭社区) model sources.
+
+ModelScope exposes the same "model card as README.md" convention as
+Hugging Face, including a YAML frontmatter block that often carries
+``base_model:`` and ``trigger_words:``.  Four public endpoints are used,
+none of which requires an API key for public models:
+
+* ``/models/{owner}/{name}/resolve/{revision}/README.md`` — raw model card
+* ``/api/v1/models/{owner}/{name}/repo?Revision=..&FilePath=README.md`` —
+  the same content through the API, used as a fallback when the resolve
+  URL is unavailable.
+* ``/api/v1/models/{owner}/{name}`` — the model-detail payload behind the
+  model page.  It carries the repository's display name (``Name`` /
+  ``ChineseName``), the author's summary (``Description``), the license, the
+  AIGC type, the site tags (``OfficialTags``, falling back to ``Tags``), and,
+  per published version, the model filenames
+  (``MuseInfo.versions[].stats.fileList``) together with that version's label
+  (``modelVersion.showName``), example images (``coverImages``) and trigger
+  words.  See :meth:`ModelScopeSource.fetch_model_card_context`.
+* ``/api/v1/models/{owner}/{name}/repo/files?Revision=..`` — the file
+  listing backing the download picker.  It reports real sizes for LFS
+  files (not the pointer size), so no extra HEAD request is needed.
+
+Downloads go through ``/models/{owner}/{name}/resolve/{revision}/{path}``,
+which redirects to a CDN URL carrying a time-limited ``auth_key``.
+Requesting the resolve URL fresh on every attempt (which the shared
+downloader does, including for resumable Range requests) keeps that key
+valid; the CDN URL must never be cached.
+
+The README and the detail payload both describe the whole repository rather
+than one file, so a per-run ``ModelSourceCache`` keeps them from being read
+again for every checkpoint of a collection repository.
+
+Two deployments are served by this module.  ``modelscope.cn`` (with
+``modelscope.com`` as a redirect alias) and ``modelscope.ai`` are *separate
+catalogues*, not mirrors, so they are registered as distinct sources:
+:class:`ModelScopeSource` and :class:`ModelScopeIntlSource`.  Every URL either
+class builds is derived from its ``base_url``.
+"""
+
+from __future__ import annotations
+
+import json
+import logging
+import os
+import re
+from typing import TYPE_CHECKING, Any, Iterable, Optional
+
+from .base import (
+    ModelCardContext,
+    ModelSource,
+    ModelSourceError,
+    fetch_json,
+    fetch_text,
+    filter_weight_files,
+)
+
+if TYPE_CHECKING:  # pragma: no cover - typing only
+    from .base import ModelSourceCache
+
+logger = logging.getLogger(__name__)
+
+#: ModelScope runs two independent catalogues.  ``modelscope.com`` is a
+#: redirect alias of the mainland site, but ``modelscope.ai`` is the
+#: *international* deployment with its own repository catalogue — a repository
+#: published on one is routinely absent from the other (``referall13/EM1``
+#: exists only on ``.ai``, ``jj3550945163/Krea-2-LORA`` only on ``.cn``).  The
+#: host therefore decides which site, API and CDN a model belongs to, and the
+#: two deployments are registered as separate sources rather than folded into
+#: one id.
+_MAINLAND_HOSTS = r"modelscope\.(?:cn|com)"
+_INTERNATIONAL_HOSTS = r"modelscope\.ai"
+
+#: Trailing view segments the site appends to a model URL; accepted verbatim
+#: when the user pastes a browser tab URL.
+_VIEW_SEGMENTS = r"(?:summary|files|model-file|readme|community|evaluation)?"
+
+
+def _url_patterns(hosts: str) -> tuple[re.Pattern[str], re.Pattern[str]]:
+    """Build the lenient and strict model-URL patterns for *hosts*."""
+
+    body = rf"https?://(?:www\.)?(?:{hosts})/models/(?P<id>[^/?#\s]+/[^/?#\s]+)"
+    return re.compile(body), re.compile(rf"{body}/?{_VIEW_SEGMENTS}/?$")
+
+
+#: ``master`` is ModelScope's default branch; ``main`` is tried as a fallback
+#: for repos imported from Hugging Face.
+_REVISIONS = ("master", "main")
+
+
+class ModelScopeSource(ModelSource):
+    """ModelScope's mainland site (``modelscope.cn``).
+
+    ``modelscope.com`` is accepted as an alias of it.  The international
+    deployment is :class:`ModelScopeIntlSource`; everything below is written in
+    terms of ``base_url`` so both share one implementation.
+    """
+
+    platform = "modelscope"
+    label = "ModelScope"
+    supports_enrichment = True
+    supports_download = True
+    default_revision = "master"
+    default_subdir = "modelscope"
+
+    #: Origin every outgoing URL is built from.
+    base_url = "https://modelscope.cn"
+
+    url_pattern, strict_url_pattern = _url_patterns(_MAINLAND_HOSTS)
+
+    def canonical_url(self, source_id: str) -> str:
+        return f"{self.base_url}/models/{source_id}"
+
+    def asset_base_url(self, source_id: str, revision: str = "") -> str:
+        return (
+            f"{self.base_url}/models/{source_id}/resolve/"
+            f"{self.resolve_revision(revision)}"
+        )
+
+    async def fetch_model_card(self, source_id: str) -> str:
+        """Fetch the model card, preferring the raw resolve URL."""
+
+        for revision in _REVISIONS:
+            text = await fetch_text(
+                f"{self.base_url}/models/{source_id}/resolve/{revision}/README.md"
+            )
+            if text:
+                return text
+
+        # Fallback: the repo API proxies the same file and is reachable in
+        # environments where the CDN resolve host is blocked.
+        for revision in _REVISIONS:
+            text = await fetch_text(
+                f"{self.base_url}/api/v1/models/"
+                f"{source_id}/repo?Revision={revision}&FilePath=README.md"
+            )
+            if text:
+                return text
+        return ""
+
+    async def fetch_model_card_context(
+        self,
+        source_id: str,
+        filename: str = "",
+        *,
+        sha256: str = "",
+        cache: Optional["ModelSourceCache"] = None,
+    ) -> ModelCardContext:
+        """Read the model-detail API that backs the ModelScope model page.
+
+        ModelScope splits a model card in two: ``README.md`` holds the
+        long-form content, while the author's summary, the site-curated tags,
+        and the per-file example images live only here.  AIGC repositories
+        frequently ship an auto-generated README ("the contributor provided
+        no further description") and put everything useful in ``Description``,
+        so enrichment that reads only the README comes back nearly empty.
+
+        The wanted file is identified by its sha256 when the caller knows it
+        and by *filename* otherwise; see :func:`_matching_versions`.  The
+        images and trigger words returned belong to that exact
+        ``.safetensors`` — essential for collection repositories, where every
+        checkpoint has its own sample image.
+
+        The detail payload describes the whole repository and is therefore
+        shared across every file in it, so it is read through *cache* when the
+        caller supplies one; only the per-file selection is redone.
+        """
+
+        data = await self._fetch_detail(source_id, cache=cache)
+        if data is None:
+            return ModelCardContext()
+        return _build_card_context(data, filename, sha256)
+
+    async def _fetch_detail(
+        self,
+        source_id: str,
+        *,
+        cache: Optional["ModelSourceCache"] = None,
+    ) -> Optional[dict[str, Any]]:
+        """Fetch (or reuse) the model-detail payload for *source_id*."""
+
+        cache_key = (self.platform, "detail", source_id)
+        if cache is not None and cache_key in cache.provider:
+            return cache.provider[cache_key]
+
+        status, payload = await fetch_json(
+            f"{self.base_url}/api/v1/models/{source_id}"
+        )
+        if status != 200 or not isinstance(payload, dict):
+            logger.debug(
+                "ModelScope detail API returned HTTP %s for %s", status, source_id
+            )
+            return None
+        data = payload.get("Data")
+        if not isinstance(data, dict):
+            return None
+
+        if cache is not None:
+            cache.provider[cache_key] = data
+        return data
+
+    async def list_files(
+        self, source_id: str, revision: str = ""
+    ) -> list[dict]:
+        """List weight files via the repo files API.
+
+        ``master`` is the only branch name the API accepts — even repos
+        imported from Hugging Face are addressed as ``master`` (``main``
+        returns 404) — so no fallback probing is done here.
+        """
+
+        revision = self.resolve_revision(revision)
+        status, payload = await fetch_json(
+            f"{self.base_url}/api/v1/models/"
+            f"{source_id}/repo/files?Revision={revision}"
+        )
+
+        if status == 404:
+            raise ModelSourceError(f"Repository '{source_id}' not found", status=404)
+        if status != 200 or not isinstance(payload, dict):
+            raise ModelSourceError(
+                f"ModelScope API error while listing '{source_id}' (HTTP {status})"
+            )
+
+        entries = []
+        for entry in (payload.get("Data") or {}).get("Files") or []:
+            if not isinstance(entry, dict) or entry.get("Type") != "blob":
+                continue
+            entries.append((entry.get("Path", ""), entry.get("Size", 0) or 0))
+
+        return filter_weight_files(entries)
+
+    def file_download_url(
+        self, source_id: str, filename: str, revision: str = ""
+    ) -> str:
+        return (
+            f"{self.base_url}/models/{source_id}/resolve/"
+            f"{self.resolve_revision(revision)}/{filename}"
+        )
+
+    def page_url_for_file(self, source_id: str, filename: str) -> str:
+        return (
+            f"{self.base_url}/models/{source_id}/file/view/"
+            f"{self.default_revision}/{filename}"
+        )
+
+
+class ModelScopeIntlSource(ModelScopeSource):
+    """ModelScope's international site (``modelscope.ai``).
+
+    A separate catalogue rather than a mirror, so it is registered under its
+    own platform id: the two deployments must not share a version group, a
+    "use default paths" directory, or a stored ``source_url``.  The detail API,
+    the file listing, the resolve URLs and the CDN redirect all behave exactly
+    like the mainland site, which is why every URL here is derived from
+    :attr:`base_url` instead of being duplicated.
+    """
+
+    platform = "modelscope-ai"
+    label = "ModelScope (International)"
+    default_subdir = "modelscope-ai"
+    base_url = "https://www.modelscope.ai"
+
+    url_pattern, strict_url_pattern = _url_patterns(_INTERNATIONAL_HOSTS)
+
+
+__all__ = ["ModelScopeIntlSource", "ModelScopeSource"]
+
+
+# ---------------------------------------------------------------------------
+# Model-detail API parsing helpers
+# ---------------------------------------------------------------------------
+
+#: Trigger-word values that mean "the author left this blank".
+_EMPTY_TRIGGER_VALUES = frozenset({"none", "null", "n/a"})
+
+#: Repository tags that only restate what the model *is* (its library, task or
+#: framework) rather than what it depicts.  ModelScope mixes both into the
+#: plain ``Tags`` list, and a card tagged "lora" or "text-to-image" is noise.
+_GENERIC_TAGS = frozenset(
+    {
+        "any-to-any",
+        "checkpoint",
+        "controlnet",
+        "diffusers",
+        "embedding",
+        "image-text-to-text",
+        "image-to-image",
+        "image-to-video",
+        "lora",
+        "lycoris",
+        "onnx",
+        "pytorch",
+        "safetensors",
+        "tensorflow",
+        "text-to-image",
+        "text-to-speech",
+        "text-to-video",
+        "textual-inversion",
+        "vae",
+    }
+)
+
+
+def _clean_text(value: Any) -> str:
+    """Return a stripped string for *value*, or ``""`` for anything else."""
+
+    return value.strip() if isinstance(value, str) else ""
+
+
+def _first_string(value: Any) -> str:
+    """Return the first non-empty string in a list, or ``""``."""
+
+    if isinstance(value, list):
+        for item in value:
+            text = _clean_text(item)
+            if text:
+                return text
+    return ""
+
+
+def _build_card_context(
+    data: dict[str, Any], filename: str, sha256: str = ""
+) -> ModelCardContext:
+    """Turn a model-detail payload into a :class:`ModelCardContext`.
+
+    Separated from the HTTP fetch so the repository-wide payload can be cached
+    across the files of a collection repository while the per-file selection
+    is still redone for each one.
+    """
+
+    context = ModelCardContext(
+        description=_clean_text(data.get("Description")),
+        model_name=_clean_text(data.get("Name")),
+        model_name_localized=_clean_text(data.get("ChineseName")),
+        license=_clean_text(data.get("License")),
+        model_type=_clean_text(data.get("AigcType")),
+        base_model=_first_string(data.get("BaseModel")),
+        base_model_aliases=_base_model_aliases(data),
+        official_tags=_official_tags(data),
+    )
+
+    versions = _matching_versions(
+        data.get("MuseInfo"),
+        filename,
+        digests=_file_digests(data),
+        sha256=sha256,
+    )
+    if versions:
+        context.version_name = _version_label(versions)
+        context.example_images = _cover_image_urls(versions)
+        context.trigger_words = _version_trigger_words(versions)
+    return context
+
+
+def _base_model_aliases(data: dict[str, Any]) -> list[str]:
+    """Return the site's own names for the base model.
+
+    ModelScope publishes a link-style id (``krea/Krea-2-Turbo``) plus its
+    internal architecture enums (``VisionFoundation: KREA_2``,
+    ``SubVisionFoundation: KREA_2_TURBO``).  The enums are the better
+    resolution hint because they normalise onto this system's canonical
+    vocabulary, so they come first; the owner prefix is also stripped from
+    the link-style ids.
+    """
+
+    aliases: list[str] = []
+    for key in ("VisionFoundation", "SubVisionFoundation"):
+        value = _clean_text(data.get(key))
+        if value and value not in aliases:
+            aliases.append(value)
+
+    base_models = data.get("BaseModel")
+    if isinstance(base_models, list):
+        for item in base_models:
+            text = _clean_text(item)
+            leaf = text.rsplit("/", 1)[-1] if text else ""
+            if leaf and leaf not in aliases:
+                aliases.append(leaf)
+    return aliases
+
+
+def _official_tags(data: dict[str, Any]) -> list[str]:
+    """Return the content tags the site publishes for the repository.
+
+    ``OfficialTags`` is ModelScope's curated content vocabulary and is
+    preferred whenever it is populated.  Plenty of AIGC repositories leave it
+    empty and carry only the plain ``Tags`` list, which mixes content tags with
+    framework and task categories; those categories are dropped so a card is
+    not handed "lora" and "text-to-image" as if they described the model.
+    """
+
+    curated = _dedupe(_tag_values(data.get("OfficialTags")))
+    if curated:
+        return curated
+
+    generic = set(_GENERIC_TAGS)
+    for value in (
+        data.get("AigcType"),
+        data.get("Libraries"),
+        data.get("Frameworks"),
+    ):
+        for item in value if isinstance(value, list) else [value]:
+            text = _clean_text(item).lower()
+            if text:
+                generic.add(text)
+
+    return _dedupe(
+        tag for tag in _tag_values(data.get("Tags")) if tag.lower() not in generic
+    )
+
+
+def _tag_values(value: Any) -> list[str]:
+    """Return the tag strings from either shape ModelScope publishes.
+
+    ``OfficialTags`` is a list of ``{"Tag": ..., "ChineseName": ...}`` dicts
+    carrying an English value; the plain ``Tags`` list is already strings.
+    """
+
+    if not isinstance(value, list):
+        return []
+    tags: list[str] = []
+    for entry in value:
+        tag = _clean_text(entry.get("Tag") if isinstance(entry, dict) else entry)
+        if tag:
+            tags.append(tag)
+    return tags
+
+
+def _dedupe(values: Iterable[str]) -> list[str]:
+    """Drop empties and repeats, keeping the first spelling seen."""
+
+    unique: list[str] = []
+    for value in values:
+        if value and value not in unique:
+            unique.append(value)
+    return unique
+
+
+def _version_files(version: dict[str, Any]) -> list[str]:
+    """Return the model filenames covered by one ``MuseInfo.versions`` entry.
+
+    The listing normally sits in ``stats.fileList``; some payloads only
+    carry the same field as a JSON-encoded string under
+    ``modelVersion.stats``, so both shapes are accepted.
+    """
+
+    stats = version.get("stats")
+    files = stats.get("fileList") if isinstance(stats, dict) else None
+
+    if not isinstance(files, list):
+        model_version = version.get("modelVersion")
+        raw = model_version.get("stats") if isinstance(model_version, dict) else None
+        if isinstance(raw, str) and raw.strip():
+            try:
+                decoded = json.loads(raw)
+            except (json.JSONDecodeError, TypeError):
+                decoded = None
+            if isinstance(decoded, dict):
+                files = decoded.get("fileList")
+
+    if not isinstance(files, list):
+        return []
+    return [item for item in files if isinstance(item, str) and item]
+
+
+def _version_show_name(version: dict[str, Any]) -> str:
+    """Return the human-facing version label (e.g. ``c1-st1000``)."""
+
+    model_version = version.get("modelVersion")
+    if not isinstance(model_version, dict):
+        return ""
+    return _clean_text(model_version.get("showName")).lower()
+
+
+def _version_label(versions: list[dict[str, Any]]) -> str:
+    """Return the first published version label, preserving its spelling.
+
+    Unlike :func:`_version_show_name` this is for display, so the label is
+    not lowercased.
+    """
+
+    for version in versions:
+        model_version = version.get("modelVersion")
+        if not isinstance(model_version, dict):
+            continue
+        label = _clean_text(model_version.get("showName"))
+        if label:
+            return label
+    return ""
+
+
+def _file_digests(data: dict[str, Any]) -> dict[str, str]:
+    """Return ``basename -> sha256`` for every published weight file.
+
+    ``ModelInfos`` groups the repository's files by kind (``safetensor``,
+    …) and records a real sha256 for each, which is what makes it possible to
+    recognise a file the user has renamed.
+    """
+
+    digests: dict[str, str] = {}
+    model_infos = data.get("ModelInfos")
+    if not isinstance(model_infos, dict):
+        return digests
+    for info in model_infos.values():
+        files = info.get("files") if isinstance(info, dict) else None
+        if not isinstance(files, list):
+            continue
+        for entry in files:
+            if not isinstance(entry, dict):
+                continue
+            name = _clean_text(entry.get("name"))
+            digest = _clean_text(entry.get("sha256"))
+            if name and digest:
+                digests.setdefault(os.path.basename(name).lower(), digest.lower())
+    return digests
+
+
+def _matching_versions(
+    muse_info: Any,
+    filename: str,
+    *,
+    digests: dict[str, str] | None = None,
+    sha256: str = "",
+) -> list[dict[str, Any]]:
+    """Return the ``versions`` entries that publish the wanted model file.
+
+    Strategies, in order:
+
+    1. **sha256** — the file's content hash, looked up through
+       :func:`_file_digests`.  This is the only strategy that survives the
+       user renaming the weights, which is common once a model is filed away.
+    2. **Exact basename** against each version's ``stats.fileList``.
+    3. **``showName`` inside the file stem**, which absorbs the naming drift
+       ModelScope sometimes applies to uploaded weights.
+
+    A known-but-unmatched hash falls through to the filename strategies
+    rather than giving up, in case the local file was re-encoded.  All matches
+    are returned so a file re-published across several versions contributes
+    all of its example images.  With no *filename* and no *sha256*, only an
+    unambiguous single-version repository is used, because a per-file image
+    must never be attributed to the wrong file.
+    """
+
+    if not isinstance(muse_info, dict):
+        return []
+    versions = muse_info.get("versions")
+    if not isinstance(versions, list):
+        return []
+    entries = [entry for entry in versions if isinstance(entry, dict)]
+    if not entries:
+        return []
+
+    target_hash = (sha256 or "").strip().lower()
+    if target_hash:
+        known = digests or {}
+        by_hash: list[dict[str, Any]] = []
+        for version in entries:
+            for path in _version_files(version):
+                if known.get(os.path.basename(path).lower()) == target_hash:
+                    by_hash.append(version)
+                    break
+        if by_hash:
+            return by_hash
+
+    if not filename:
+        return entries if len(entries) == 1 else []
+
+    target = os.path.basename(filename).strip().lower()
+    if not target:
+        return []
+    stem = os.path.splitext(target)[0]
+
+    exact: list[dict[str, Any]] = []
+    fuzzy: list[dict[str, Any]] = []
+    for version in entries:
+        files = {os.path.basename(path).lower() for path in _version_files(version)}
+        if target in files:
+            exact.append(version)
+            continue
+        show_name = _version_show_name(version)
+        if show_name and show_name in stem:
+            fuzzy.append(version)
+
+    return exact or fuzzy
+
+
+def _cover_image_urls(versions: list[dict[str, Any]]) -> list[str]:
+    """Collect the example-image URLs published by the given versions."""
+
+    urls: list[str] = []
+    for version in versions:
+        covers = version.get("coverImages")
+        if not isinstance(covers, list):
+            continue
+        for cover in covers:
+            if not isinstance(cover, dict):
+                continue
+            url = _clean_text(cover.get("url"))
+            if url and url not in urls:
+                urls.append(url)
+    return urls
+
+
+def _version_trigger_words(versions: list[dict[str, Any]]) -> list[str]:
+    """Return the first non-empty trigger-word list across *versions*."""
+
+    for version in versions:
+        model_version = version.get("modelVersion")
+        raw = (
+            model_version.get("triggerWords")
+            if isinstance(model_version, dict)
+            else None
+        )
+        words = _parse_trigger_words(raw)
+        if words:
+            return words
+    return []
+
+
+def _parse_trigger_words(raw: Any) -> list[str]:
+    """Decode ModelScope's JSON-encoded trigger-word string list."""
+
+    if isinstance(raw, list):
+        candidates = raw
+    elif isinstance(raw, str) and raw.strip():
+        try:
+            decoded = json.loads(raw)
+        except (json.JSONDecodeError, TypeError):
+            return []
+        if not isinstance(decoded, list):
+            return []
+        candidates = decoded
+    else:
+        return []
+
+    words: list[str] = []
+    for item in candidates:
+        word = _clean_text(item)
+        if not word or word.lower() in _EMPTY_TRIGGER_VALUES:
+            continue
+        if word not in words:
+            words.append(word)
+    return words
@@ -0,0 +1,228 @@
+"""Registry and metadata helpers for external model sources.
+
+The registry is the single place the rest of the codebase asks "which site
+is this URL from?", "what is this model's source?", and "can we enrich it?".
+Import from :mod:`py.services.model_sources` rather than this module
+directly.
+"""
+
+from __future__ import annotations
+
+import logging
+from typing import Any, Dict, Mapping, Optional
+
+from .base import GROUP_PREFIXES, ModelSource, SourceRef, clean_source_url
+from .huggingface import HuggingFaceSource
+from .modelscope import ModelScopeIntlSource, ModelScopeSource
+from .tensorart import TensorArtSource
+
+logger = logging.getLogger(__name__)
+
+#: Order matters only for disambiguation; the URL patterns are disjoint.
+#: ``modelscope.ai`` is a separate catalogue from ``modelscope.cn`` rather than
+#: an alias, which is why it gets its own entry (see ``modelscope.py``).
+_SOURCES: tuple[ModelSource, ...] = (
+    HuggingFaceSource(),
+    ModelScopeSource(),
+    ModelScopeIntlSource(),
+    TensorArtSource(),
+)
+
+_BY_PLATFORM: Dict[str, ModelSource] = {s.platform: s for s in _SOURCES}
+
+#: Metadata keys that carry the canonical external-source identity.
+SOURCE_PLATFORM_FIELD = "source_platform"
+SOURCE_URL_FIELD = "source_url"
+#: Legacy field kept as a read/write alias for Hugging Face models so that
+#: older sidecars, cached rows, and third-party consumers keep working.
+LEGACY_HF_URL_FIELD = "hf_url"
+
+
+def list_sources() -> list[ModelSource]:
+    """Return every known model source."""
+
+    return list(_SOURCES)
+
+
+def get_source(platform: Optional[str]) -> Optional[ModelSource]:
+    """Return the source registered for *platform*, or ``None``."""
+
+    if not platform or not isinstance(platform, str):
+        return None
+    return _BY_PLATFORM.get(platform.strip().lower())
+
+
+def source_label(platform: Optional[str], default: str = "") -> str:
+    """Return the human-readable label for *platform*."""
+
+    source = get_source(platform)
+    return source.label if source else default
+
+
+def downloadable_sources() -> list[ModelSource]:
+    """Return the sources whose repositories can be downloaded directly."""
+
+    return [source for source in _SOURCES if source.supports_download]
+
+
+def get_download_source(platform: Optional[str]) -> Optional[ModelSource]:
+    """Return the source for *platform*, but only when it supports downloads."""
+
+    source = get_source(platform)
+    if source is None or not source.supports_download:
+        return None
+    return source
+
+
+def detect_source(url: Optional[str], *, strict: bool = False) -> Optional[SourceRef]:
+    """Return the :class:`SourceRef` for *url*, or ``None`` if unsupported."""
+
+    if not url or not isinstance(url, str):
+        return None
+    for source in _SOURCES:
+        ref = source.ref(url, strict=strict)
+        if ref is not None:
+            return ref
+    return None
+
+
+def resolve_source_ref(metadata: Mapping[str, Any]) -> Optional[SourceRef]:
+    """Return the source reference described by a model's metadata.
+
+    Handles all three storage states found in the wild:
+
+    1. ``source_url`` + ``source_platform`` (current format)
+    2. ``hf_url`` only (legacy Hugging Face storage)
+    3. ``hf_url`` plus a newer ``source_url`` (both written by older builds)
+    """
+
+    if not isinstance(metadata, Mapping):
+        return None
+
+    platform = clean_source_url(metadata.get(SOURCE_PLATFORM_FIELD)).lower()
+    url = clean_source_url(metadata.get(SOURCE_URL_FIELD))
+    legacy = clean_source_url(metadata.get(LEGACY_HF_URL_FIELD))
+
+    source = get_source(platform)
+    if url:
+        if source is not None:
+            ref = source.ref(url)
+            if ref is not None:
+                return ref
+        ref = detect_source(url)
+        if ref is not None:
+            return ref
+        # Unknown platform but a URL is present: keep it addressable.
+        return SourceRef(platform=platform or "unknown", source_id="", url=url)
+
+    if legacy:
+        return detect_source(legacy)
+    return None
+
+
+def normalize_metadata_source(metadata: Dict[str, Any]) -> Dict[str, Any]:
+    """Normalise the external-source fields on *metadata* in place.
+
+    Guarantees that ``source_url``/``source_platform`` are present and
+    consistent, and that ``hf_url`` mirrors ``source_url`` for Hugging Face
+    models (never for other platforms, so a stale alias can't make a
+    ModelScope model look like a Hugging Face one).
+
+    Returns the same dict for convenient chaining.
+    """
+
+    if not isinstance(metadata, dict):
+        return metadata
+
+    platform = clean_source_url(metadata.get(SOURCE_PLATFORM_FIELD)).lower()
+    url = clean_source_url(metadata.get(SOURCE_URL_FIELD))
+    legacy = clean_source_url(metadata.get(LEGACY_HF_URL_FIELD))
+
+    source = get_source(platform)
+    ref: Optional[SourceRef] = None
+
+    if url:
+        ref = source.ref(url) if source is not None else None
+        if ref is None:
+            ref = detect_source(url)
+    elif legacy:
+        ref = detect_source(legacy)
+
+    if ref is not None and ref.source_id:
+        platform = ref.platform
+        url = ref.url or url
+
+    if platform:
+        metadata[SOURCE_PLATFORM_FIELD] = platform
+    else:
+        metadata.setdefault(SOURCE_PLATFORM_FIELD, "")
+
+    metadata[SOURCE_URL_FIELD] = url
+
+    # Keep the legacy alias in sync, but only for Hugging Face.
+    if url and platform == "huggingface":
+        metadata[LEGACY_HF_URL_FIELD] = url
+    elif LEGACY_HF_URL_FIELD in metadata and platform and platform != "huggingface":
+        metadata[LEGACY_HF_URL_FIELD] = ""
+    elif legacy and not url:
+        metadata[LEGACY_HF_URL_FIELD] = legacy
+
+    return metadata
+
+
+def has_external_source(item: Mapping[str, Any]) -> bool:
+    """Return ``True`` when *item* is linked to any external model site."""
+
+    if not isinstance(item, Mapping):
+        return False
+    return bool(
+        clean_source_url(item.get(SOURCE_URL_FIELD))
+        or clean_source_url(item.get(LEGACY_HF_URL_FIELD))
+    )
+
+
+def get_source_platform(item: Mapping[str, Any]) -> str:
+    """Return the platform id stored on *item* (may be empty)."""
+
+    if not isinstance(item, Mapping):
+        return ""
+    platform = clean_source_url(item.get(SOURCE_PLATFORM_FIELD)).lower()
+    if platform:
+        return platform
+    ref = resolve_source_ref(item)
+    return ref.platform if ref else ""
+
+
+def source_group_key(item: Mapping[str, Any]) -> Optional[str]:
+    """Return the version-group key for *item*, or ``None``.
+
+    Hugging Face keeps the historical ``hf:{owner}/{repo}`` shape; other
+    platforms use their own short prefix (see :data:`GROUP_PREFIXES`).
+    """
+
+    ref = resolve_source_ref(item)
+    if ref is None or not ref.source_id:
+        return None
+    source = get_source(ref.platform)
+    if source is None:
+        return None
+    return source.group_key(ref.source_id)
+
+
+__all__ = [
+    "GROUP_PREFIXES",
+    "LEGACY_HF_URL_FIELD",
+    "SOURCE_PLATFORM_FIELD",
+    "SOURCE_URL_FIELD",
+    "detect_source",
+    "downloadable_sources",
+    "get_download_source",
+    "get_source",
+    "get_source_platform",
+    "has_external_source",
+    "list_sources",
+    "normalize_metadata_source",
+    "resolve_source_ref",
+    "source_group_key",
+    "source_label",
+]
@@ -0,0 +1,56 @@
+"""TensorArt model source (link / provenance only).
+
+TensorArt support is intentionally limited to *linking* a model to its
+TensorArt page.  Automatic metadata extraction is not possible without a
+user session:
+
+* ``tensor.art`` sits behind a Cloudflare managed challenge, so plain
+  HTTP clients (aiohttp, requests, curl) receive ``403 "Just a moment..."``.
+* Its internal API (``ap-east-1.tensorart.cloud`` / ``cn.tensorart.net``)
+  answers every ``/v1/model/*`` route with
+  ``{"code":100002,"message":"invalid authorization header"}``.
+* The official TAMS API requires an AccessKey/SecretKey pair and request
+  signatures, which is a poor fit for a "paste a URL" workflow.
+
+``supports_enrichment`` is therefore ``False``: the agent pipeline skips
+these models with an explicit reason instead of failing silently, and the
+UI keeps showing the "View on TensorArt" link.  ``tusi.cn`` is TensorArt's
+Chinese mirror and is accepted as the same platform.
+"""
+
+from __future__ import annotations
+
+import re
+
+from .base import ModelSource
+
+_DOMAINS = r"(?:tensor\.art|tusi\.cn)"
+
+_URL_PATTERN = re.compile(
+    rf"https?://(?:www\.)?{_DOMAINS}/models/(?P<id>\d+)"
+)
+
+_STRICT_URL_PATTERN = re.compile(
+    rf"https?://(?:www\.)?{_DOMAINS}/models/(?P<id>\d+)(?:/[^/?#\s]+)?/?$"
+)
+
+
+class TensorArtSource(ModelSource):
+    """TensorArt (``tensor.art``)."""
+
+    platform = "tensorart"
+    label = "TensorArt"
+    supports_enrichment = False
+    supports_download = False
+    url_pattern = _URL_PATTERN
+    strict_url_pattern = _STRICT_URL_PATTERN
+
+    def canonical_url(self, source_id: str) -> str:
+        return f"https://tensor.art/models/{source_id}"
+
+    def asset_base_url(self, source_id: str, revision: str = "") -> str:
+        # Unreachable today: enrichment is disabled for this platform.
+        return f"https://tensor.art/models/{source_id}"
+
+
+__all__ = ["TensorArtSource"]
@@ -67,6 +67,8 @@ class OtherModelService(BaseModelService):
            "civitai": self.filter_civitai_data(model_data.get("civitai", {}), minimal=True),
            "auto_tags": model_data.get("auto_tags") or extract_auto_tags(model_data),
            "version_count": model_data.get("version_count"),
+            "source_platform": model_data.get("source_platform", ""),
+            "source_url": model_data.get("source_url", ""),
            "hf_url": model_data.get("hf_url", ""),
        }

@@ -6,7 +6,10 @@ import threading
 from dataclasses import dataclass, field
 from typing import Any, Dict, List, Mapping, Optional, Sequence, Tuple

+from ..utils.cache_db import connect_cache_db
 from ..utils.cache_paths import CacheType, resolve_cache_path_with_migration
+from ..utils.file_lock import exclusive_lock
+from .model_sources import normalize_metadata_source

 logger = logging.getLogger(__name__)

@@ -62,6 +65,8 @@ class PersistentModelCache:
        "db_checked",
        "last_checked_at",
        "hash_status",
+        "source_platform",
+        "source_url",
        "hf_url",
    )
    _MODEL_UPDATE_COLUMNS: Tuple[str, ...] = _MODEL_COLUMNS[2:]
@@ -206,8 +211,13 @@ class PersistentModelCache:
                "skip_metadata_refresh": bool(row["skip_metadata_refresh"]),
                "license_flags": int(license_value),
                "hash_status": row["hash_status"] or "completed",
+                "source_platform": row["source_platform"] or "",
+                "source_url": row["source_url"] or "",
                "hf_url": row["hf_url"] or "",
            }
+            # Legacy rows only carry `hf_url`; derive the canonical pair so
+            # every consumer sees the same shape.
+            normalize_metadata_source(item)
            if row["autov3"] is not None:
                item["autov3"] = (row["autov3"] or "").lower()
            raw_data.append(item)
@@ -249,267 +259,271 @@ class PersistentModelCache:
            return
        try:
            with self._db_lock:
-                conn = self._connect()
-                try:
-                    conn.execute("PRAGMA foreign_keys = ON")
-                    conn.execute("BEGIN")
+                # Cross-process serialization: another LoRA Manager instance may
+                # share this settings directory, and the read-merge-write below
+                # spans several statements.
+                with exclusive_lock(self._db_path):
+                    conn = self._connect()
+                    try:
+                        conn.execute("PRAGMA foreign_keys = ON")
+                        conn.execute("BEGIN")

-                    model_rows = [self._prepare_model_row(model_type, item) for item in raw_data]
-                    model_map: Dict[str, Tuple[Any, ...]] = {
-                        row[1]: row for row in model_rows if row[1]  # row[1] is file_path
-                    }
+                        model_rows = [self._prepare_model_row(model_type, item) for item in raw_data]
+                        model_map: Dict[str, Tuple[Any, ...]] = {
+                            row[1]: row for row in model_rows if row[1]  # row[1] is file_path
+                        }

-                    existing_models = conn.execute(
-                        "SELECT "
-                        + ", ".join(self._MODEL_COLUMNS[1:])
-                        + " FROM models WHERE model_type = ?",
-                        (model_type,),
-                    ).fetchall()
-                    existing_model_map: Dict[str, sqlite3.Row] = {
-                        row["file_path"]: row for row in existing_models
-                    }
-
-                    to_remove_models = [
-                        (model_type, path)
-                        for path in existing_model_map.keys()
-                        if path not in model_map
-                    ]
-                    if to_remove_models:
-                        conn.executemany(
-                            "DELETE FROM models WHERE model_type = ? AND file_path = ?",
-                            to_remove_models,
-                        )
-                        conn.executemany(
-                            "DELETE FROM model_tags WHERE model_type = ? AND file_path = ?",
-                            to_remove_models,
-                        )
-                        conn.executemany(
-                            "DELETE FROM hash_index WHERE model_type = ? AND file_path = ?",
-                            to_remove_models,
-                        )
-                        conn.executemany(
-                            "DELETE FROM autov3_index WHERE model_type = ? AND file_path = ?",
-                            to_remove_models,
-                        )
-                        conn.executemany(
-                            "DELETE FROM excluded_models WHERE model_type = ? AND file_path = ?",
-                            to_remove_models,
-                        )
-
-                    insert_rows: List[Tuple[Any, ...]] = []
-                    update_rows: List[Tuple[Any, ...]] = []
-
-                    for file_path, row in model_map.items():
-                        existing = existing_model_map.get(file_path)
-                        if existing is None:
-                            insert_rows.append(row)
-                            continue
-
-                        existing_values = tuple(
-                            existing[column] for column in self._MODEL_COLUMNS[1:]
-                        )
-                        current_values = row[1:]
-                        if existing_values != current_values:
-                            update_rows.append(row[2:] + (model_type, file_path))
-
-                    if insert_rows:
-                        conn.executemany(self._insert_model_sql(), insert_rows)
-
-                    if update_rows:
-                        set_clause = ", ".join(
-                            f"{column} = ?"
-                            for column in self._MODEL_UPDATE_COLUMNS
-                        )
-                        update_sql = (
-                            f"UPDATE models SET {set_clause} WHERE model_type = ? AND file_path = ?"
-                        )
-                        conn.executemany(update_sql, update_rows)
-
-                    existing_tags_rows = conn.execute(
-                        "SELECT file_path, tag FROM model_tags WHERE model_type = ?",
-                        (model_type,),
-                    ).fetchall()
-                    existing_tags: Dict[str, set[str]] = {}
-                    for row in existing_tags_rows:
-                        existing_tags.setdefault(row["file_path"], set()).add(row["tag"])
-
-                    new_tags: Dict[str, set[str]] = {}
-                    for item in raw_data:
-                        file_path = item.get("file_path")
-                        if not file_path:
-                            continue
-                        tags = set(item.get("tags") or [])
-                        if tags:
-                            new_tags[file_path] = tags
-
-                    tag_inserts: List[Tuple[str, str, str]] = []
-                    tag_deletes: List[Tuple[str, str, str]] = []
-
-                    all_tag_paths = set(existing_tags.keys()) | set(new_tags.keys())
-                    for path in all_tag_paths:
-                        existing_set = existing_tags.get(path, set())
-                        new_set = new_tags.get(path, set())
-                        to_add = new_set - existing_set
-                        to_remove = existing_set - new_set
-
-                        for tag in to_add:
-                            tag_inserts.append((model_type, path, tag))
-                        for tag in to_remove:
-                            tag_deletes.append((model_type, path, tag))
-
-                    if tag_deletes:
-                        conn.executemany(
-                            "DELETE FROM model_tags WHERE model_type = ? AND file_path = ? AND tag = ?",
-                            tag_deletes,
-                        )
-                    if tag_inserts:
-                        conn.executemany(
-                            "INSERT INTO model_tags (model_type, file_path, tag) VALUES (?, ?, ?)",
-                            tag_inserts,
-                        )
-
-                    existing_hash_rows = conn.execute(
-                        "SELECT sha256, file_path FROM hash_index WHERE model_type = ?",
-                        (model_type,),
-                    ).fetchall()
-                    existing_hash_map: Dict[str, set[str]] = {}
-                    for row in existing_hash_rows:
-                        sha_value = (row["sha256"] or "").lower()
-                        if not sha_value:
-                            continue
-                        existing_hash_map.setdefault(sha_value, set()).add(row["file_path"])
-
-                    new_hash_map: Dict[str, set[str]] = {}
-                    for sha_value, paths in hash_index.items():
-                        normalized_sha = (sha_value or "").lower()
-                        if not normalized_sha:
-                            continue
-                        bucket = new_hash_map.setdefault(normalized_sha, set())
-                        for path in paths:
-                            if path:
-                                bucket.add(path)
-
-                    hash_inserts: List[Tuple[str, str, str]] = []
-                    hash_deletes: List[Tuple[str, str, str]] = []
-
-                    all_shas = set(existing_hash_map.keys()) | set(new_hash_map.keys())
-                    for sha_value in all_shas:
-                        existing_paths = existing_hash_map.get(sha_value, set())
-                        new_paths = new_hash_map.get(sha_value, set())
-
-                        for path in existing_paths - new_paths:
-                            hash_deletes.append((model_type, sha_value, path))
-                        for path in new_paths - existing_paths:
-                            hash_inserts.append((model_type, sha_value, path))
-
-                    if hash_deletes:
-                        conn.executemany(
-                            "DELETE FROM hash_index WHERE model_type = ? AND sha256 = ? AND file_path = ?",
-                            hash_deletes,
-                        )
-                    if hash_inserts:
-                        conn.executemany(
-                            "INSERT OR IGNORE INTO hash_index (model_type, sha256, file_path) VALUES (?, ?, ?)",
-                            hash_inserts,
-                        )
-
-                    if autov3_hash_index is not None:
-                        existing_autov3_rows = conn.execute(
-                            "SELECT autov3, file_path FROM autov3_index WHERE model_type = ?",
+                        existing_models = conn.execute(
+                            "SELECT "
+                            + ", ".join(self._MODEL_COLUMNS[1:])
+                            + " FROM models WHERE model_type = ?",
                            (model_type,),
                        ).fetchall()
-                        existing_autov3_map: Dict[str, set[str]] = {}
-                        for row in existing_autov3_rows:
-                            autov3_value = (row["autov3"] or "").lower()
-                            if not autov3_value:
-                                continue
-                            existing_autov3_map.setdefault(autov3_value, set()).add(row["file_path"])
+                        existing_model_map: Dict[str, sqlite3.Row] = {
+                            row["file_path"]: row for row in existing_models
+                        }

-                        new_autov3_map: Dict[str, set[str]] = {}
-                        for autov3_value, paths in autov3_hash_index.items():
-                            normalized_autov3 = (autov3_value or "").lower()
-                            if not normalized_autov3:
+                        to_remove_models = [
+                            (model_type, path)
+                            for path in existing_model_map.keys()
+                            if path not in model_map
+                        ]
+                        if to_remove_models:
+                            conn.executemany(
+                                "DELETE FROM models WHERE model_type = ? AND file_path = ?",
+                                to_remove_models,
+                            )
+                            conn.executemany(
+                                "DELETE FROM model_tags WHERE model_type = ? AND file_path = ?",
+                                to_remove_models,
+                            )
+                            conn.executemany(
+                                "DELETE FROM hash_index WHERE model_type = ? AND file_path = ?",
+                                to_remove_models,
+                            )
+                            conn.executemany(
+                                "DELETE FROM autov3_index WHERE model_type = ? AND file_path = ?",
+                                to_remove_models,
+                            )
+                            conn.executemany(
+                                "DELETE FROM excluded_models WHERE model_type = ? AND file_path = ?",
+                                to_remove_models,
+                            )
+
+                        insert_rows: List[Tuple[Any, ...]] = []
+                        update_rows: List[Tuple[Any, ...]] = []
+
+                        for file_path, row in model_map.items():
+                            existing = existing_model_map.get(file_path)
+                            if existing is None:
+                                insert_rows.append(row)
                                continue
-                            bucket = new_autov3_map.setdefault(normalized_autov3, set())
+
+                            existing_values = tuple(
+                                existing[column] for column in self._MODEL_COLUMNS[1:]
+                            )
+                            current_values = row[1:]
+                            if existing_values != current_values:
+                                update_rows.append(row[2:] + (model_type, file_path))
+
+                        if insert_rows:
+                            conn.executemany(self._insert_model_sql(), insert_rows)
+
+                        if update_rows:
+                            set_clause = ", ".join(
+                                f"{column} = ?"
+                                for column in self._MODEL_UPDATE_COLUMNS
+                            )
+                            update_sql = (
+                                f"UPDATE models SET {set_clause} WHERE model_type = ? AND file_path = ?"
+                            )
+                            conn.executemany(update_sql, update_rows)
+
+                        existing_tags_rows = conn.execute(
+                            "SELECT file_path, tag FROM model_tags WHERE model_type = ?",
+                            (model_type,),
+                        ).fetchall()
+                        existing_tags: Dict[str, set[str]] = {}
+                        for row in existing_tags_rows:
+                            existing_tags.setdefault(row["file_path"], set()).add(row["tag"])
+
+                        new_tags: Dict[str, set[str]] = {}
+                        for item in raw_data:
+                            file_path = item.get("file_path")
+                            if not file_path:
+                                continue
+                            tags = set(item.get("tags") or [])
+                            if tags:
+                                new_tags[file_path] = tags
+
+                        tag_inserts: List[Tuple[str, str, str]] = []
+                        tag_deletes: List[Tuple[str, str, str]] = []
+
+                        all_tag_paths = set(existing_tags.keys()) | set(new_tags.keys())
+                        for path in all_tag_paths:
+                            existing_set = existing_tags.get(path, set())
+                            new_set = new_tags.get(path, set())
+                            to_add = new_set - existing_set
+                            to_remove = existing_set - new_set
+
+                            for tag in to_add:
+                                tag_inserts.append((model_type, path, tag))
+                            for tag in to_remove:
+                                tag_deletes.append((model_type, path, tag))
+
+                        if tag_deletes:
+                            conn.executemany(
+                                "DELETE FROM model_tags WHERE model_type = ? AND file_path = ? AND tag = ?",
+                                tag_deletes,
+                            )
+                        if tag_inserts:
+                            conn.executemany(
+                                "INSERT INTO model_tags (model_type, file_path, tag) VALUES (?, ?, ?)",
+                                tag_inserts,
+                            )
+
+                        existing_hash_rows = conn.execute(
+                            "SELECT sha256, file_path FROM hash_index WHERE model_type = ?",
+                            (model_type,),
+                        ).fetchall()
+                        existing_hash_map: Dict[str, set[str]] = {}
+                        for row in existing_hash_rows:
+                            sha_value = (row["sha256"] or "").lower()
+                            if not sha_value:
+                                continue
+                            existing_hash_map.setdefault(sha_value, set()).add(row["file_path"])
+
+                        new_hash_map: Dict[str, set[str]] = {}
+                        for sha_value, paths in hash_index.items():
+                            normalized_sha = (sha_value or "").lower()
+                            if not normalized_sha:
+                                continue
+                            bucket = new_hash_map.setdefault(normalized_sha, set())
                            for path in paths:
                                if path:
                                    bucket.add(path)

-                        autov3_inserts: List[Tuple[str, str, str]] = []
-                        autov3_deletes: List[Tuple[str, str, str]] = []
+                        hash_inserts: List[Tuple[str, str, str]] = []
+                        hash_deletes: List[Tuple[str, str, str]] = []

-                        all_autov3 = set(existing_autov3_map.keys()) | set(new_autov3_map.keys())
-                        for autov3_value in all_autov3:
-                            existing_paths = existing_autov3_map.get(autov3_value, set())
-                            new_paths = new_autov3_map.get(autov3_value, set())
+                        all_shas = set(existing_hash_map.keys()) | set(new_hash_map.keys())
+                        for sha_value in all_shas:
+                            existing_paths = existing_hash_map.get(sha_value, set())
+                            new_paths = new_hash_map.get(sha_value, set())

                            for path in existing_paths - new_paths:
-                                autov3_deletes.append((model_type, autov3_value, path))
+                                hash_deletes.append((model_type, sha_value, path))
                            for path in new_paths - existing_paths:
-                                autov3_inserts.append((model_type, autov3_value, path))
+                                hash_inserts.append((model_type, sha_value, path))

-                        if autov3_deletes:
+                        if hash_deletes:
                            conn.executemany(
-                                "DELETE FROM autov3_index WHERE model_type = ? AND autov3 = ? AND file_path = ?",
-                                autov3_deletes,
+                                "DELETE FROM hash_index WHERE model_type = ? AND sha256 = ? AND file_path = ?",
+                                hash_deletes,
                            )
-                        if autov3_inserts:
+                        if hash_inserts:
                            conn.executemany(
-                                "INSERT OR IGNORE INTO autov3_index (model_type, autov3, file_path) VALUES (?, ?, ?)",
-                                autov3_inserts,
+                                "INSERT OR IGNORE INTO hash_index (model_type, sha256, file_path) VALUES (?, ?, ?)",
+                                hash_inserts,
                            )

-                    existing_excluded_rows = conn.execute(
-                        "SELECT file_path FROM excluded_models WHERE model_type = ?",
-                        (model_type,),
-                    ).fetchall()
-                    existing_excluded = {row["file_path"] for row in existing_excluded_rows}
-                    new_excluded = {path for path in excluded_models if path}
+                        if autov3_hash_index is not None:
+                            existing_autov3_rows = conn.execute(
+                                "SELECT autov3, file_path FROM autov3_index WHERE model_type = ?",
+                                (model_type,),
+                            ).fetchall()
+                            existing_autov3_map: Dict[str, set[str]] = {}
+                            for row in existing_autov3_rows:
+                                autov3_value = (row["autov3"] or "").lower()
+                                if not autov3_value:
+                                    continue
+                                existing_autov3_map.setdefault(autov3_value, set()).add(row["file_path"])

-                    excluded_deletes = [
-                        (model_type, path)
-                        for path in existing_excluded - new_excluded
-                    ]
-                    excluded_inserts = [
-                        (model_type, path)
-                        for path in new_excluded - existing_excluded
-                    ]
+                            new_autov3_map: Dict[str, set[str]] = {}
+                            for autov3_value, paths in autov3_hash_index.items():
+                                normalized_autov3 = (autov3_value or "").lower()
+                                if not normalized_autov3:
+                                    continue
+                                bucket = new_autov3_map.setdefault(normalized_autov3, set())
+                                for path in paths:
+                                    if path:
+                                        bucket.add(path)

-                    if excluded_deletes:
-                        conn.executemany(
-                            "DELETE FROM excluded_models WHERE model_type = ? AND file_path = ?",
-                            excluded_deletes,
-                        )
-                    if excluded_inserts:
-                        conn.executemany(
-                            "INSERT OR IGNORE INTO excluded_models (model_type, file_path) VALUES (?, ?)",
-                            excluded_inserts,
-                        )
+                            autov3_inserts: List[Tuple[str, str, str]] = []
+                            autov3_deletes: List[Tuple[str, str, str]] = []

-                    if all_folders is not None:
-                        conn.execute(
-                            "DELETE FROM folders WHERE model_type = ?",
+                            all_autov3 = set(existing_autov3_map.keys()) | set(new_autov3_map.keys())
+                            for autov3_value in all_autov3:
+                                existing_paths = existing_autov3_map.get(autov3_value, set())
+                                new_paths = new_autov3_map.get(autov3_value, set())
+
+                                for path in existing_paths - new_paths:
+                                    autov3_deletes.append((model_type, autov3_value, path))
+                                for path in new_paths - existing_paths:
+                                    autov3_inserts.append((model_type, autov3_value, path))
+
+                            if autov3_deletes:
+                                conn.executemany(
+                                    "DELETE FROM autov3_index WHERE model_type = ? AND autov3 = ? AND file_path = ?",
+                                    autov3_deletes,
+                                )
+                            if autov3_inserts:
+                                conn.executemany(
+                                    "INSERT OR IGNORE INTO autov3_index (model_type, autov3, file_path) VALUES (?, ?, ?)",
+                                    autov3_inserts,
+                                )
+
+                        existing_excluded_rows = conn.execute(
+                            "SELECT file_path FROM excluded_models WHERE model_type = ?",
                            (model_type,),
-                        )
-                        folder_inserts = [
-                            (model_type, path) for path in all_folders if path
-                        ]
-                        if folder_inserts:
-                            conn.executemany(
-                                "INSERT OR IGNORE INTO folders (model_type, path) VALUES (?, ?)",
-                                folder_inserts,
-                            )
-                        # Mark the snapshot as having folder data even when the
-                        # library has no subfolders, so an empty list is not
-                        # mistaken for "never recorded" on load.
-                        conn.execute(
-                            "INSERT OR REPLACE INTO cache_meta (key, value) VALUES (?, ?)",
-                            (f"folders_recorded:{model_type}", "1"),
-                        )
+                        ).fetchall()
+                        existing_excluded = {row["file_path"] for row in existing_excluded_rows}
+                        new_excluded = {path for path in excluded_models if path}

-                    conn.commit()
-                finally:
-                    conn.close()
+                        excluded_deletes = [
+                            (model_type, path)
+                            for path in existing_excluded - new_excluded
+                        ]
+                        excluded_inserts = [
+                            (model_type, path)
+                            for path in new_excluded - existing_excluded
+                        ]
+
+                        if excluded_deletes:
+                            conn.executemany(
+                                "DELETE FROM excluded_models WHERE model_type = ? AND file_path = ?",
+                                excluded_deletes,
+                            )
+                        if excluded_inserts:
+                            conn.executemany(
+                                "INSERT OR IGNORE INTO excluded_models (model_type, file_path) VALUES (?, ?)",
+                                excluded_inserts,
+                            )
+
+                        if all_folders is not None:
+                            conn.execute(
+                                "DELETE FROM folders WHERE model_type = ?",
+                                (model_type,),
+                            )
+                            folder_inserts = [
+                                (model_type, path) for path in all_folders if path
+                            ]
+                            if folder_inserts:
+                                conn.executemany(
+                                    "INSERT OR IGNORE INTO folders (model_type, path) VALUES (?, ?)",
+                                    folder_inserts,
+                                )
+                            # Mark the snapshot as having folder data even when the
+                            # library has no subfolders, so an empty list is not
+                            # mistaken for "never recorded" on load.
+                            conn.execute(
+                                "INSERT OR REPLACE INTO cache_meta (key, value) VALUES (?, ?)",
+                                (f"folders_recorded:{model_type}", "1"),
+                            )
+
+                        conn.commit()
+                    finally:
+                        conn.close()
        except Exception as exc:
            logger.warning("Failed to persist cache for %s: %s", model_type, exc)

@@ -562,6 +576,8 @@ class PersistentModelCache:
                            db_checked INTEGER,
                            last_checked_at REAL,
                            hash_status TEXT,
+                            source_platform TEXT DEFAULT '',
+                            source_url TEXT DEFAULT '',
                            hf_url TEXT DEFAULT '',
                            PRIMARY KEY (model_type, file_path)
                        );
@@ -629,6 +645,8 @@ 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'",
+            "source_platform": "TEXT DEFAULT ''",
+            "source_url": "TEXT DEFAULT ''",
            "hf_url": "TEXT DEFAULT ''",
            "autov3": "TEXT",
        }
@@ -638,18 +656,19 @@ class PersistentModelCache:
                conn.execute(f"ALTER TABLE models ADD COLUMN {column} {definition}")

    def _connect(self, readonly: bool = False) -> sqlite3.Connection:
-        uri = False
-        path = self._db_path
-        if readonly:
-            if not os.path.exists(path):
-                raise FileNotFoundError(path)
-            path = f"file:{path}?mode=ro"
-            uri = True
-        conn = sqlite3.connect(path, check_same_thread=False, uri=uri, detect_types=sqlite3.PARSE_DECLTYPES)
-        conn.row_factory = sqlite3.Row
-        return conn
+        if readonly and not os.path.exists(self._db_path):
+            raise FileNotFoundError(self._db_path)
+        return connect_cache_db(
+            self._db_path,
+            readonly=readonly,
+            detect_types=sqlite3.PARSE_DECLTYPES,
+            row_factory=sqlite3.Row,
+        )

    def _prepare_model_row(self, model_type: str, item: Dict[str, Any]) -> Tuple[Any, ...]:
+        # Keep `source_*` and the legacy `hf_url` alias consistent no matter
+        # which caller populated the item.
+        normalize_metadata_source(item)
        civitai = item.get("civitai") or {}
        trained_words = civitai.get("trainedWords")
        if isinstance(trained_words, str):
@@ -713,6 +732,8 @@ 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("source_platform") or "",
+            item.get("source_url") or "",
            item.get("hf_url") or "",
        )

@@ -19,7 +19,9 @@ import threading
 from dataclasses import dataclass, field
 from typing import Any, Dict, List, Optional, Set, Tuple

+from ..utils.cache_db import connect_cache_db
 from ..utils.cache_paths import CacheType, resolve_cache_path_with_migration
+from ..utils.file_lock import exclusive_lock

 logger = logging.getLogger(__name__)

@@ -170,65 +172,98 @@ class PersistentRecipeCache:
        recipes: List[Dict[str, Any]],
        json_paths: Optional[Dict[str, str]] = None,
        image_id_map: Optional[Dict[str, str]] = None,
-    ) -> None:
+        skip_if_empty: bool = False,
+    ) -> bool:
        """Save all recipes to SQLite cache.

        Args:
            recipes: List of recipe dictionaries to persist.
            json_paths: Optional mapping of recipe_id -> json_path for file stats.
            image_id_map: Optional precomputed civitai image_id → recipe_id mapping.
+            skip_if_empty: When True, refuse to replace a non-empty cache with an
+                empty one. This is the storage-level backstop against a scan that
+                silently loses every recipe (unavailable drive / mis-resolved
+                recipes directory): overwriting both deletes the user's data and
+                destroys their only record of it. Intentional full clears (manual
+                rebuild) must pass ``skip_if_empty=False``.
+
+        Returns:
+            ``True`` when the write happened, ``False`` when it was skipped.
        """
        if not self.is_enabled():
-            return
+            return False
        if not self._schema_initialized:
            self._initialize_schema()
        if not self._schema_initialized:
-            return
+            return False

        try:
            with self._db_lock:
-                conn = self._connect()
-                try:
-                    conn.execute("PRAGMA foreign_keys = ON")
-                    conn.execute("BEGIN")
+                # Cross-process serialization: another LoRA Manager instance may
+                # share this settings directory, and a full-table replace is a
+                # read-modify-write that SQLite alone cannot make atomic.
+                with exclusive_lock(self._db_path):
+                    conn = self._connect()
+                    try:
+                        conn.execute("PRAGMA foreign_keys = ON")
+                        conn.execute("BEGIN")

-                    # Clear existing data
-                    conn.execute("DELETE FROM recipes")
+                        if skip_if_empty and not recipes:
+                            existing = conn.execute(
+                                "SELECT COUNT(*) FROM recipes"
+                            ).fetchone()
+                            if existing and existing[0]:
+                                conn.rollback()
+                                logger.warning(
+                                    "Refusing to persist an empty recipe cache: the "
+                                    "stored cache still holds %d recipe(s). The scan "
+                                    "found nothing, which usually means the recipes "
+                                    "path was unavailable or resolved elsewhere; "
+                                    "keeping the stored cache so the data stays "
+                                    "recoverable.",
+                                    existing[0],
+                                )
+                                return False

-                    # Prepare and insert all rows
-                    recipe_rows = []
-                    for recipe in recipes:
-                        recipe_id = str(recipe.get("id", ""))
-                        if not recipe_id:
-                            continue
+                        # Clear existing data
+                        conn.execute("DELETE FROM recipes")

-                        json_path = ""
-                        if json_paths:
-                            json_path = json_paths.get(recipe_id, "")
+                        # Prepare and insert all rows
+                        recipe_rows = []
+                        for recipe in recipes:
+                            recipe_id = str(recipe.get("id", ""))
+                            if not recipe_id:
+                                continue

-                        row = self._prepare_recipe_row(recipe, json_path)
-                        recipe_rows.append(row)
+                            json_path = ""
+                            if json_paths:
+                                json_path = json_paths.get(recipe_id, "")

-                    if recipe_rows:
-                        placeholders = ", ".join(["?"] * len(self._RECIPE_COLUMNS))
-                        columns = ", ".join(self._RECIPE_COLUMNS)
-                        conn.executemany(
-                            f"INSERT INTO recipes ({columns}) VALUES ({placeholders})",
-                            recipe_rows,
+                            row = self._prepare_recipe_row(recipe, json_path)
+                            recipe_rows.append(row)
+
+                        if recipe_rows:
+                            placeholders = ", ".join(["?"] * len(self._RECIPE_COLUMNS))
+                            columns = ", ".join(self._RECIPE_COLUMNS)
+                            conn.executemany(
+                                f"INSERT INTO recipes ({columns}) VALUES ({placeholders})",
+                                recipe_rows,
+                            )
+
+                        # Persist image_id_map for O(1) lookups on cache load
+                        conn.execute(
+                            "INSERT OR REPLACE INTO cache_metadata (key, value) VALUES (?, ?)",
+                            ("image_id_map", json.dumps(image_id_map or {})),
                        )

-                    # Persist image_id_map for O(1) lookups on cache load
-                    conn.execute(
-                        "INSERT OR REPLACE INTO cache_metadata (key, value) VALUES (?, ?)",
-                        ("image_id_map", json.dumps(image_id_map or {})),
-                    )
-
-                    conn.commit()
-                    logger.debug("Persisted %d recipes to cache", len(recipe_rows))
-                finally:
-                    conn.close()
+                        conn.commit()
+                        logger.debug("Persisted %d recipes to cache", len(recipe_rows))
+                        return True
+                    finally:
+                        conn.close()
        except Exception as exc:
            logger.warning("Failed to persist recipe cache: %s", exc)
+            return False

    def get_file_stats(self) -> Dict[str, Tuple[float, int]]:
        """Return stored file stats for all cached recipes.
@@ -486,16 +521,14 @@ class PersistentRecipeCache:
                logger.warning("Failed to initialize persistent recipe cache schema: %s", exc)

    def _connect(self, readonly: bool = False) -> sqlite3.Connection:
-        uri = False
-        path = self._db_path
-        if readonly:
-            if not os.path.exists(path):
-                raise FileNotFoundError(path)
-            path = f"file:{path}?mode=ro"
-            uri = True
-        conn = sqlite3.connect(path, check_same_thread=False, uri=uri, detect_types=sqlite3.PARSE_DECLTYPES)
-        conn.row_factory = sqlite3.Row
-        return conn
+        if readonly and not os.path.exists(self._db_path):
+            raise FileNotFoundError(self._db_path)
+        return connect_cache_db(
+            self._db_path,
+            readonly=readonly,
+            detect_types=sqlite3.PARSE_DECLTYPES,
+            row_factory=sqlite3.Row,
+        )

    def _prepare_recipe_row(self, recipe: Dict[str, Any], json_path: str) -> Tuple[Any, ...]:
        """Convert a recipe dict to a row tuple for SQLite insertion."""
@@ -16,6 +16,7 @@ import threading
 import time
 from typing import Any, Dict, List, Optional, Set, Tuple

+from ..utils.cache_db import connect_cache_db
 from ..utils.cache_paths import CacheType, resolve_cache_path_with_migration

 logger = logging.getLogger(__name__)
@@ -633,16 +634,13 @@ class RecipeFTSIndex:

    def _connect(self, readonly: bool = False) -> sqlite3.Connection:
        """Create a database connection."""
-        uri = False
-        path = self._db_path
-        if readonly:
-            if not os.path.exists(path):
-                raise FileNotFoundError(path)
-            path = f"file:{path}?mode=ro"
-            uri = True
-        conn = sqlite3.connect(path, check_same_thread=False, uri=uri)
-        conn.row_factory = sqlite3.Row
-        return conn
+        if readonly and not os.path.exists(self._db_path):
+            raise FileNotFoundError(self._db_path)
+        return connect_cache_db(
+            self._db_path,
+            readonly=readonly,
+            row_factory=sqlite3.Row,
+        )

    def _remove_recipe_locked(self, conn: sqlite3.Connection, recipe_id: str) -> None:
        """Remove a recipe entry. Caller must hold the lock."""
@@ -116,6 +116,12 @@ class RecipeScanner:
            self._persistent_cache: Optional[PersistentRecipeCache] = None
            self._civitai_client: Any = None  # Lazily initialized from registry
            self._json_path_map: Dict[str, str] = {}  # recipe_id -> json_path
+            # True when the last scan refused to prune the stored cache because
+            # every recorded recipe file was missing (see
+            # :meth:`_initialize_recipe_cache_sync`). Keeps dependent background
+            # work (FTS index) aligned with the stored rows instead of the
+            # intentionally out-of-sync in-memory view.
+            self._prune_skipped: bool = False
            if lora_scanner:
                self._lora_scanner = lora_scanner
            if checkpoint_scanner:
@@ -1651,8 +1657,12 @@ class RecipeScanner:
                'pageType': 'recipes',
            })
            self._schedule_post_scan_enrichment()
-            # Schedule FTS index build in background (non-blocking)
-            self._schedule_fts_index_build()
+            # Schedule FTS index build in background (non-blocking). When the
+            # prune was skipped the in-memory cache is intentionally out of sync
+            # with the stored rows, so leave the existing index alone instead of
+            # rebuilding it from the empty view.
+            if not self._prune_skipped:
+                self._schedule_fts_index_build()
        except Exception as e:
            logger.error(f"Recipe Scanner: Error initializing cache in background: {e}")
            # Ensure the cache is never None so the page stops showing the
@@ -1723,6 +1733,7 @@ class RecipeScanner:
        """
        loop = None
        scan_start_time: Optional[float] = None
+        self._prune_skipped = False
        try:
            # Ensure cache exists to avoid None reference errors
            if self._cache is None:
@@ -1749,14 +1760,38 @@ class RecipeScanner:
                logger.warning(f"Recipes directory not found: {recipes_dir}")
                return self._cache

+            # Record which directory the scan actually used. When the Recipes
+            # Storage Path is empty this falls back to the first LoRA root, and
+            # a support reader needs that path to tell a real wipe apart from a
+            # scan that looked somewhere else (see the prune guard below).
+            logger.info(f"Recipe scan directory: {recipes_dir}")
+
            # Try to load from persistent cache first
            persisted = self._persistent_cache.load_cache()
            if persisted:
-                recipes, changed, json_paths = self._reconcile_recipe_cache(
-                    persisted, recipes_dir
-                )
+                (
+                    recipes,
+                    changed,
+                    json_paths,
+                    skipped_prune_reason,
+                ) = self._reconcile_recipe_cache(persisted, recipes_dir)
                self._json_path_map = json_paths

+                if skipped_prune_reason:
+                    # Every persisted recipe file vanished at once. That is not a
+                    # reliable deletion signal: a drive that did not mount, a
+                    # recipes_path that silently fell back to another root, or a
+                    # shared cache touched by a second instance all look exactly
+                    # like this. Keep the stored cache and skip the prune, so the
+                    # only copy of the user's recipes is not destroyed.
+                    logger.warning(
+                        f"Recipe cache prune skipped: {skipped_prune_reason}. "
+                        f"Keeping {len(persisted.raw_data)} stored recipe(s); this "
+                        "session reports no recipes until the files are found again."
+                    )
+                    self._prune_skipped = True
+                    return self._cache
+
                if not changed:
                    # Fast path: use cached data directly
                    logger.info(
@@ -1770,7 +1805,10 @@ class RecipeScanner:
                    if self._backfill_source_path_if_needed(recipes, json_paths):
                        self._cache.image_id_map = self._build_image_id_map()
                        self._persistent_cache.save_cache(
-                            recipes, json_paths, self._cache.image_id_map
+                            recipes,
+                            json_paths,
+                            self._cache.image_id_map,
+                            skip_if_empty=True,
                        )
                    else:
                        # Use persisted map, or rebuild if empty (e.g. first startup
@@ -1798,7 +1836,10 @@ class RecipeScanner:
                    self._cache.image_id_map = self._build_image_id_map()
                    # Persist updated cache
                    self._persistent_cache.save_cache(
-                        recipes, json_paths, self._cache.image_id_map
+                        recipes,
+                        json_paths,
+                        self._cache.image_id_map,
+                        skip_if_empty=True,
                    )
                    return self._cache

@@ -1825,7 +1866,10 @@ class RecipeScanner:

            # Persist for next startup
            self._persistent_cache.save_cache(
-                recipes, json_paths, self._cache.image_id_map
+                recipes,
+                json_paths,
+                self._cache.image_id_map,
+                skip_if_empty=True,
            )

            if report_progress:
@@ -1862,7 +1906,7 @@ class RecipeScanner:
        self,
        persisted: PersistedRecipeData,
        recipes_dir: str,
-    ) -> Tuple[List[Dict[str, Any]], bool, Dict[str, str]]:
+    ) -> Tuple[List[Dict[str, Any]], bool, Dict[str, str], Optional[str]]:
        """Reconcile persisted cache with current filesystem state.

        Args:
@@ -1870,7 +1914,11 @@ class RecipeScanner:
            recipes_dir: Path to the recipes directory.

        Returns:
-            Tuple of (recipes list, changed flag, json_paths dict).
+            Tuple of (recipes list, changed flag, json_paths dict,
+            skipped_prune_reason). The last element is ``None`` on a normal
+            reconcile. When it is a string, the scan saw every persisted recipe
+            file disappear at once; the caller must then keep the persisted
+            cache instead of overwriting it. The reason text is user-facing.
        """
        recipes: List[Dict[str, Any]] = []
        json_paths: Dict[str, str] = {}
@@ -1951,12 +1999,67 @@ class RecipeScanner:
                time.sleep(0)

        # Check for deleted files
-        for json_path in persisted.file_stats.keys():
-            if json_path not in current_files:
-                changed = True
-                logger.debug("Recipe file deleted: %s", json_path)
+        orphaned_stats = [
+            json_path
+            for json_path in persisted.file_stats.keys()
+            if json_path not in current_files
+        ]
+        if orphaned_stats:
+            changed = True
+            # This single line plus the resolved scan directory logged by the
+            # caller are the evidence a support reader gets for a recipes path
+            # that moved; the per-file lines stay at debug to avoid flooding.
+            if len(orphaned_stats) > 10:
+                logger.info(
+                    f"Recipe reconcile: {len(orphaned_stats)} of "
+                    f"{len(persisted.file_stats)} cached recipe file(s) are not in "
+                    f"{recipes_dir} (first: {orphaned_stats[0]}, "
+                    f"last: {orphaned_stats[-1]})"
+                )
+            else:
+                for json_path in orphaned_stats:
+                    logger.debug("Recipe file deleted: %s", json_path)

-        return recipes, changed, json_paths
+        skipped_prune_reason: Optional[str] = None
+        if not current_files and persisted.file_stats:
+            metadata_is_coherent = self._persisted_metadata_is_coherent(persisted)
+            if metadata_is_coherent:
+                skipped_prune_reason = (
+                    f"every recipe file recorded in the cache "
+                    f"({len(persisted.file_stats)}) is missing from {recipes_dir}"
+                )
+            else:
+                # The stored row set and its recorded file stats disagree, so
+                # this cache is stale rather than a faithful record of recipes
+                # that have just gone missing. Pruning it is safe.
+                logger.info(
+                    f"Recipe reconcile: stored cache is inconsistent "
+                    f"({len(persisted.raw_data)} row(s) vs "
+                    f"{len(persisted.file_stats)} file record(s)); falling back "
+                    "to a normal prune."
+                )
+
+        return recipes, changed, json_paths, skipped_prune_reason
+
+    @staticmethod
+    def _persisted_metadata_is_coherent(persisted: PersistedRecipeData) -> bool:
+        """Return True when the stored rows and their file stats describe one set.
+
+        The prune guard treats "no recipe files found" as a signal that the
+        directory moved out from under us, which is only meaningful when the
+        stored cache is a faithful record of recipes that exist on disk. A cache
+        whose row set and file-stat set have diverged (left behind by an older
+        reconcile) carries recipes that were already orphaned, so it is not
+        evidence of a fresh disappearance.
+        """
+        stats_ids = {
+            os.path.basename(json_path)[: -len(".recipe.json")]
+            for json_path in persisted.file_stats
+            if os.path.basename(json_path).lower().endswith(".recipe.json")
+        }
+        rows_ids = {str(recipe.get("id", "")) for recipe in persisted.raw_data}
+        rows_ids.discard("")
+        return bool(rows_ids) and rows_ids == stats_ids

    # Metadata key recording that the one-shot source_path backfill has run.
    _SOURCE_PATH_BACKFILL_MARKER = "source_path_backfilled"
@@ -2626,6 +2729,10 @@ class RecipeScanner:
                    try:
                        # Invalidate persistent cache so the sync path does a
                        # full directory scan instead of reconciling stale data.
+                        # This is the deliberate escape hatch from the
+                        # all-missing prune guard: an explicit user rebuild is
+                        # allowed to clear the stored cache, while an implicit
+                        # startup scan is not.
                        if self._persistent_cache:
                            self._persistent_cache.save_cache([], {})
                        self._json_path_map = {}
@@ -2656,7 +2763,8 @@ class RecipeScanner:

                        # Schedule non-blocking background work
                        self._schedule_post_scan_enrichment()
-                        self._schedule_fts_index_build()
+                        if not self._prune_skipped:
+                            self._schedule_fts_index_build()

                        return cast(RecipeCache, self._cache)

@@ -19,6 +19,7 @@ from typing import (
    Mapping,
    Optional,
    Sequence,
+    Set,
    Tuple,
 )

@@ -37,6 +38,7 @@ from ..utils.constants import (
 from ..utils.preview_selection import VALID_MATURE_BLUR_LEVELS
 from ..utils.settings_paths import (
    APP_NAME,
+    _portable_env_override,
    ensure_settings_file,
    get_legacy_settings_path,
    get_settings_dir_override,
@@ -96,6 +98,7 @@ DEFAULT_SETTINGS: Dict[str, Any] = {
    "recipes_path": "",
    "base_model_path_mappings": {},
    "download_path_templates": {},
+    "download_filename_templates": {},
    "folder_paths": {},
    "extra_folder_paths": {},
    "example_images_path": "",
@@ -172,13 +175,23 @@ class SettingsManager:
        self._check_environment_variables()
        self._collect_configuration_warnings()

-        if (
-            os.environ.get("LORA_MANAGER_PORTABLE", "0") == "1"
-            and not is_settings_dir_pinned()
-        ):
+        portable_override = _portable_env_override()
+        if portable_override is True and not is_settings_dir_pinned():
            if not self.settings.get("use_portable_settings"):
                self.settings["use_portable_settings"] = True
                self._save_settings()
+        elif portable_override is False and self.settings.get(
+            "use_portable_settings"
+        ):
+            # Explicit opt-out from a persisted portable mode: clear the flag so
+            # later runs go back to the shared settings directory instead of
+            # requiring a manual edit of settings.json.
+            logger.info(
+                "Clearing the persisted portable-mode flag because %s=0",
+                "LORA_MANAGER_PORTABLE",
+            )
+            self.settings["use_portable_settings"] = False
+            self._save_settings()

        if self._needs_initial_save:
            self._save_settings()
@@ -297,6 +310,29 @@ class SettingsManager:

        return payload == template

+    def get_template_folder_path_placeholders(self) -> Set[str]:
+        """Placeholder folder_paths values shipped in settings.json.example.
+
+        A fresh standalone install is seeded from the template, so its
+        documentation-only placeholder paths end up in the live settings
+        file. The Model Paths settings UI hides them; the first real save
+        overwrites them via ``set("folder_paths")``.
+        """
+
+        template = self._read_template_payload()
+        if not template:
+            return set()
+
+        folder_paths = template.get("folder_paths")
+        if not isinstance(folder_paths, Mapping):
+            return set()
+
+        placeholders: Set[str] = set()
+        for value in folder_paths.values():
+            paths = value if isinstance(value, list) else [value]
+            placeholders.update(p for p in paths if isinstance(p, str) and p)
+        return placeholders
+
    def _merge_template_with_defaults(
        self, defaults: Dict[str, Any], template: Mapping[str, Any]
    ) -> Dict[str, Any]:
@@ -1208,19 +1244,27 @@ class SettingsManager:
            if self._bootstrap_reason == "missing":
                message = (
                    "LoRA Manager created a default settings.json because no configuration was found. "
-                    "Edit settings.json to add your model directories so library scanning can run."
+                    "Open Settings → Model Paths to add your model directories so library scanning can run."
                )
            else:
                message = (
                    "LoRA Manager could not locate any configured model directories. "
-                    "Edit settings.json to add your model folders so library scanning can run."
+                    "Open Settings → Model Paths to add your model folders so library scanning can run."
                )
            self._add_startup_message(
                code="missing-model-paths",
                title="Model folders need setup",
                message=message,
                severity="warning",
-                actions=self._default_settings_actions(),
+                actions=[
+                    {
+                        "action": "open-model-paths-settings",
+                        "label": "Configure model folders",
+                        "type": "primary",
+                        "icon": "fas fa-cog",
+                    },
+                    *self._default_settings_actions(),
+                ],
                dismissible=False,
            )

@@ -1233,6 +1277,7 @@ class SettingsManager:
        defaults = copy.deepcopy(DEFAULT_SETTINGS)
        defaults["base_model_path_mappings"] = {}
        defaults["download_path_templates"] = {}
+        defaults["download_filename_templates"] = {}
        defaults["priority_tags"] = DEFAULT_PRIORITY_TAG_CONFIG.copy()
        defaults.setdefault("folder_paths", {})
        defaults.setdefault("extra_folder_paths", {})
@@ -2381,6 +2426,49 @@ class SettingsManager:
            model_type, DEFAULT_DOWNLOAD_PATH_TEMPLATES.get(model_type, "")
        )

+    def get_download_filename_template(self, model_type: str) -> str:
+        """Get the download filename template for a specific model type.
+
+        Args:
+            model_type: The type of model ('lora', 'checkpoint', 'embedding',
+                'other')
+
+        Returns:
+            Template string for the model type. Empty string (the default for
+            every model type) means downloaded files keep their original
+            filename.
+        """
+        templates = self.settings.get("download_filename_templates", {})
+
+        # Handle edge case where templates might be stored as JSON string
+        if isinstance(templates, str):
+            try:
+                parsed_templates = json.loads(templates)
+                if isinstance(parsed_templates, dict):
+                    self.settings["download_filename_templates"] = parsed_templates
+                    self._save_settings()
+                    templates = parsed_templates
+                    logger.info(
+                        "Successfully parsed download_filename_templates from JSON string"
+                    )
+                else:
+                    raise ValueError("Parsed JSON is not a dictionary")
+            except (json.JSONDecodeError, ValueError) as e:
+                logger.warning(
+                    f"Failed to parse download_filename_templates JSON string: {e}. Resetting to empty templates."
+                )
+                templates = {}
+                self.settings["download_filename_templates"] = templates
+                self._save_settings()
+
+        if not isinstance(templates, dict):
+            templates = {}
+            self.settings["download_filename_templates"] = templates
+            self._save_settings()
+
+        template = templates.get(model_type, "")
+        return template if isinstance(template, str) else ""
+

 _SETTINGS_MANAGER: Optional["SettingsManager"] = None
 _SETTINGS_MANAGER_LOCK = Lock()
@@ -20,6 +20,7 @@ import time
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Set

+from ..utils.cache_db import connect_cache_db
 from ..utils.cache_paths import CacheType, resolve_cache_path_with_migration

 logger = logging.getLogger(__name__)
@@ -677,16 +678,13 @@ class TagFTSIndex:

    def _connect(self, readonly: bool = False) -> sqlite3.Connection:
        """Create a database connection."""
-        uri = False
-        path = self._db_path
-        if readonly:
-            if not os.path.exists(path):
-                raise FileNotFoundError(path)
-            path = f"file:{path}?mode=ro"
-            uri = True
-        conn = sqlite3.connect(path, check_same_thread=False, uri=uri)
-        conn.row_factory = sqlite3.Row
-        return conn
+        if readonly and not os.path.exists(self._db_path):
+            raise FileNotFoundError(self._db_path)
+        return connect_cache_db(
+            self._db_path,
+            readonly=readonly,
+            row_factory=sqlite3.Row,
+        )

    def _build_fts_query(self, query: str) -> str:
        """Build an FTS5 query string with prefix matching.
@@ -20,6 +20,7 @@ from .example_images import (
    ImportExampleImagesUseCase,
    ImportExampleImagesValidationError,
 )
+from .filename_template_use_case import FilenameTemplateUseCase

 __all__ = [
    "AutoOrganizeInProgressError",
@@ -34,4 +35,5 @@ __all__ = [
    "DownloadExampleImagesUseCase",
    "ImportExampleImagesUseCase",
    "ImportExampleImagesValidationError",
+    "FilenameTemplateUseCase",
 ]
@@ -7,6 +7,7 @@ import time
 from typing import Any, Dict, List, Optional, Protocol, Sequence

 from ..metadata_sync_service import MetadataSyncService
+from ..model_sources import has_external_source
 from ...utils.metadata_manager import MetadataManager


@@ -51,10 +52,11 @@ class BulkMetadataRefreshUseCase:
            if not model.get("skip_metadata_refresh", False)
            and not self._is_in_skip_path(model.get("folder", ""), skip_paths)
            and (not model.get("civitai") or not model["civitai"].get("id"))
-            # Skip models downloaded from Hugging Face — they are not on
-            # CivitAI / CivArchive.  Users can still refresh them individually
-            # via the right-click context menu.
-            and not model.get("hf_url", "")
+            # Skip models linked to an external model site (Hugging Face /
+            # ModelScope / TensorArt) — they are not on CivitAI / CivArchive.
+            # Users can still refresh them individually via the right-click
+            # context menu.
+            and not has_external_source(model)
            and not (
                # Skip models confirmed not on CivitAI when no need to retry
                model.get("from_civitai") is False
@@ -0,0 +1,245 @@
+"""Filename template use case: bulk-rename library models per the configured template.
+
+An empty template reverts previously renamed models to the original filename
+recorded in their ``.metadata.json`` sidecar (``original_file_name``).
+"""
+
+from __future__ import annotations
+
+import asyncio
+import logging
+import os
+from typing import Any, Awaitable, Callable, Dict, List, Optional, Sequence
+
+from ...utils.constants import AUTO_ORGANIZE_BATCH_SIZE
+from ...utils.utils import calculate_filename_for_model
+from ..model_file_service import AutoOrganizeResult, ProgressCallback
+from ..model_lifecycle_service import ModelLifecycleService, load_local_metadata
+from ..settings_manager import get_settings_manager
+from .auto_organize_use_case import (
+    AutoOrganizeInProgressError,
+    AutoOrganizeLockProvider,
+)
+
+logger = logging.getLogger(__name__)
+
+_PROGRESS_TYPE = "filename_template_progress"
+
+
+class FilenameTemplateUseCase:
+    """Apply the download filename template to existing library models.
+
+    An empty template restores the recorded original filename instead of
+    rendering a template. Shares the auto-organize lock (and its in-progress
+    error) so a bulk rename never runs concurrently with an auto-organize
+    operation.
+    """
+
+    def __init__(
+        self,
+        *,
+        scanner,
+        lifecycle_service: ModelLifecycleService,
+        lock_provider: AutoOrganizeLockProvider,
+        model_type: str,
+        metadata_loader: Callable[[str], Awaitable[Dict[str, Any]]] = load_local_metadata,
+    ) -> None:
+        self._scanner = scanner
+        self._lifecycle_service = lifecycle_service
+        self._lock_provider = lock_provider
+        self._model_type = model_type
+        self._metadata_loader = metadata_loader
+
+    async def execute(
+        self,
+        *,
+        file_paths: Optional[Sequence[str]] = None,
+        progress_callback: Optional[ProgressCallback] = None,
+    ) -> AutoOrganizeResult:
+        """Run the bulk rename guarded by the shared library-operation lock."""
+
+        is_running = getattr(self._lock_provider, "is_filename_template_running", None)
+        if callable(is_running) and is_running():
+            raise AutoOrganizeInProgressError(
+                "A filename template operation is already running"
+            )
+        if self._lock_provider.is_auto_organize_running():
+            raise AutoOrganizeInProgressError("Auto-organize is already running")
+
+        lock = await self._lock_provider.get_auto_organize_lock()
+        if lock.locked():
+            raise AutoOrganizeInProgressError(
+                "Another library operation is already running"
+            )
+
+        async with lock:
+            return await self._run(
+                file_paths=file_paths, progress_callback=progress_callback
+            )
+
+    async def _run(
+        self,
+        *,
+        file_paths: Optional[Sequence[str]],
+        progress_callback: Optional[ProgressCallback],
+    ) -> AutoOrganizeResult:
+        result = AutoOrganizeResult()
+        result.operation_type = "filename_template"
+
+        self._scanner.reset_cancellation()
+
+        try:
+            template = get_settings_manager().get_download_filename_template(
+                self._model_type
+            )
+
+            cache = await self._scanner.get_cached_data()
+            models = list(cache.raw_data)
+            if file_paths:
+                wanted = set(file_paths)
+                models = [
+                    model for model in models if model.get("file_path") in wanted
+                ]
+
+            result.total = len(models)
+
+            await self._emit_progress(progress_callback, result, "started")
+
+            for index in range(0, result.total, AUTO_ORGANIZE_BATCH_SIZE):
+                if self._scanner.is_cancelled():
+                    logger.info(
+                        "Filename template apply cancelled for %s", self._model_type
+                    )
+                    break
+
+                batch = models[index : index + AUTO_ORGANIZE_BATCH_SIZE]
+                for model in batch:
+                    if self._scanner.is_cancelled():
+                        break
+                    await self._process_model(model, template, result)
+                    result.processed += 1
+
+                await self._emit_progress(progress_callback, result, "processing")
+                # Yield between batches so the server stays responsive.
+                await asyncio.sleep(0.1)
+
+            if self._scanner.is_cancelled():
+                result.status = "cancelled"
+                await self._emit_progress(progress_callback, result, "cancelled")
+                return result
+
+            await self._emit_progress(progress_callback, result, "completed")
+            return result
+
+        except Exception as exc:
+            logger.error("Error in filename template apply: %s", exc, exc_info=True)
+            if progress_callback:
+                await progress_callback.on_progress(
+                    {
+                        "type": _PROGRESS_TYPE,
+                        "status": "error",
+                        "error": str(exc),
+                        "operation_type": result.operation_type,
+                    }
+                )
+            raise
+
+    async def _process_model(
+        self,
+        model: Dict[str, Any],
+        template: str,
+        result: AutoOrganizeResult,
+    ) -> None:
+        model_name = model.get("model_name", "Unknown")
+        try:
+            file_path = model.get("file_path")
+            if not file_path:
+                self._add_result(result, model_name, False, "No file path found")
+                result.failure_count += 1
+                return
+
+            if not template:
+                # Empty template = revert to the original filename recorded
+                # by the first rename; models without a record are skipped.
+                new_stem = await self._resolve_recorded_original(file_path)
+            else:
+                new_stem = calculate_filename_for_model(model, self._model_type)
+            if not new_stem:
+                result.skipped_count += 1
+                return
+
+            current_stem = os.path.splitext(os.path.basename(file_path))[0]
+            if new_stem == current_stem or os.path.normcase(
+                new_stem
+            ) == os.path.normcase(current_stem):
+                result.skipped_count += 1
+                return
+
+            await self._lifecycle_service.rename_model(
+                file_path=file_path, new_file_name=new_stem
+            )
+            result.success_count += 1
+
+        except ValueError as exc:
+            # Conflicts (e.g. target name already exists) count as failures
+            # without aborting the batch.
+            self._add_result(result, model_name, False, str(exc))
+            result.failure_count += 1
+        except Exception as exc:
+            logger.error(
+                "Error applying filename template to %s: %s", model_name, exc,
+                exc_info=True,
+            )
+            self._add_result(result, model_name, False, f"Error: {exc}")
+            result.failure_count += 1
+
+    async def _resolve_recorded_original(self, file_path: str) -> str:
+        """Return the original filename stem recorded at the first rename.
+
+        Reads the ``.metadata.json`` sidecar; returns an empty string when no
+        sidecar or no ``original_file_name`` entry exists (models never
+        renamed, or renamed before the recording shipped).
+        """
+        metadata_path = f"{os.path.splitext(file_path)[0]}.metadata.json"
+        metadata = await self._metadata_loader(metadata_path)
+        original = metadata.get("original_file_name")
+        if not isinstance(original, str):
+            return ""
+        return original.strip()
+
+    async def _emit_progress(
+        self,
+        progress_callback: Optional[ProgressCallback],
+        result: AutoOrganizeResult,
+        status: str,
+    ) -> None:
+        if not progress_callback:
+            return
+        await progress_callback.on_progress(
+            {
+                "type": _PROGRESS_TYPE,
+                "status": status,
+                "total": result.total,
+                "processed": result.processed,
+                "success": result.success_count,
+                "failures": result.failure_count,
+                "skipped": result.skipped_count,
+                "operation_type": result.operation_type,
+            }
+        )
+
+    @staticmethod
+    def _add_result(
+        result: AutoOrganizeResult,
+        model_name: str,
+        success: bool,
+        message: str,
+    ) -> None:
+        """Add a result entry if under the limit (mirrors ModelFileService)."""
+        if len(result.results) < 100:
+            result.results.append(
+                {"model": model_name, "success": success, "message": message}
+            )
+        elif len(result.results) == 100:
+            result.results_truncated = True
+            result.sample_results = result.results[:50]
@@ -20,6 +20,8 @@ class WebSocketManager:
        self._last_init_progress: Dict[str, Dict[str, Any]] = {}
        # Add auto-organize progress tracking
        self._auto_organize_progress: Optional[Dict[str, Any]] = None
+        # Add filename template progress tracking
+        self._filename_template_progress: Optional[Dict[str, Any]] = None
        # Add recipe rematch progress tracking
        self._recipe_rematch_progress: Optional[Dict[str, Any]] = None
        self._auto_organize_lock = asyncio.Lock()
@@ -170,6 +172,13 @@ class WebSocketManager:
            progress_entry['status'] = data['status']
        if 'message' in data:
            progress_entry['message'] = data['message']
+        # Post-transfer stage reporting (see `model_source_handlers._report_phase`):
+        # the byte counter has stopped by then, so the stage is the only thing
+        # that still says the download is working.
+        if 'stage' in data:
+            progress_entry['stage'] = data['stage']
+        if 'platform' in data:
+            progress_entry['platform'] = data['platform']

        self._download_progress[download_id] = progress_entry
        
@@ -198,6 +207,26 @@ class WebSocketManager:
    def cleanup_auto_organize_progress(self):
        """Clear auto-organize progress data"""
        self._auto_organize_progress = None
+
+    async def broadcast_filename_template_progress(self, data: Dict[str, Any]):
+        """Broadcast filename template progress to connected clients"""
+        self._filename_template_progress = data
+        await self.broadcast(data)
+
+    def get_filename_template_progress(self) -> Optional[Dict[str, Any]]:
+        """Get current filename template progress"""
+        return self._filename_template_progress
+
+    def cleanup_filename_template_progress(self):
+        """Clear filename template progress data"""
+        self._filename_template_progress = None
+
+    def is_filename_template_running(self) -> bool:
+        """Check if a filename template operation is currently running"""
+        if not self._filename_template_progress:
+            return False
+        status = self._filename_template_progress.get('status')
+        return status in ['started', 'processing']
    
    async def broadcast_recipe_rematch_progress(self, data: Dict[str, Any]):
        """Broadcast recipe rematch progress to connected clients"""
@@ -21,6 +21,14 @@ class WebSocketProgressCallback(ProgressCallback):
        await ws_manager.broadcast_auto_organize_progress(progress_data)


+class WebSocketFilenameTemplateProgressCallback(ProgressCallback):
+    """WebSocket progress callback for filename template operations."""
+
+    async def on_progress(self, progress_data: Dict[str, Any]) -> None:
+        """Send filename template progress via WebSocket."""
+        await ws_manager.broadcast_filename_template_progress(progress_data)
+
+
 class WebSocketBroadcastCallback:
    """Generic WebSocket progress callback broadcasting to all clients."""

@@ -0,0 +1,81 @@
+"""Shared SQLite connection setup for LoRA Manager cache databases.
+
+Cache databases live under the settings directory (``cache/model/<library>.sqlite``,
+``cache/recipe/<library>.sqlite``, ``cache/fts/*.sqlite``). With portable mode or a
+pinned ``LORA_MANAGER_SETTINGS_DIR`` off, that directory is shared by every ComfyUI
+instance on the machine, so two processes can open the same cache file at once.
+
+SQLite serializes writers, but the default ``timeout`` is 5 seconds: a second
+instance that writes while the first is mid-transaction fails with "database is
+locked". These settings make concurrent access wait instead of failing, and keep
+the write path in WAL so readers are never blocked by a writer.
+"""
+
+from __future__ import annotations
+
+import sqlite3
+from typing import Any
+
+# How long a connection waits for a competing writer before raising.
+CONCURRENT_TIMEOUT_SECONDS = 30.0
+
+# PRAGMAs applied to every cache connection.
+#
+# ``busy_timeout`` mirrors the connection timeout so a busy database is retried
+# inside SQLite rather than surfacing as an immediate error. ``synchronous=NORMAL``
+# is the documented companion of WAL: still crash-safe, far fewer fsyncs.
+_TUNING_PRAGMAS = (
+    "PRAGMA busy_timeout = 30000",
+    "PRAGMA synchronous = NORMAL",
+)
+
+
+def connect_cache_db(
+    path: str,
+    *,
+    readonly: bool = False,
+    uri: bool = False,
+    detect_types: int = 0,
+    row_factory: Any = None,
+) -> sqlite3.Connection:
+    """Open a cache database with multi-instance-friendly settings.
+
+    Args:
+        path: Database path, or a ``file:`` URI when *uri* is True.
+        readonly: Open through a read-only URI. Callers still pass the
+            plain path; the ``mode=ro`` suffix is added here. The
+            write-oriented tuning pragmas are skipped in that case so a
+            read-only connection never attempts to change the file.
+        uri: Treat *path* as a SQLite URI.
+        detect_types: Forwarded to :func:`sqlite3.connect`.
+        row_factory: Optional ``row_factory`` for the connection.
+
+    Returns:
+        A configured :class:`sqlite3.Connection`.
+    """
+    if readonly:
+        if not uri and not path.startswith("file:"):
+            path = f"file:{path}?mode=ro"
+            uri = True
+
+    conn = sqlite3.connect(
+        path,
+        check_same_thread=False,
+        uri=uri,
+        detect_types=detect_types,
+        timeout=CONCURRENT_TIMEOUT_SECONDS,
+    )
+    if row_factory is not None:
+        conn.row_factory = row_factory
+
+    try:
+        for pragma in _TUNING_PRAGMAS:
+            # A read-only connection may reject write PRAGMAs; they are not
+            # needed there anyway.
+            conn.execute(pragma)
+    except sqlite3.Error:
+        # Tuning is best-effort: a connection that cannot set pragmas still
+        # works, just without the concurrency headroom.
+        pass
+
+    return conn
@@ -127,6 +127,29 @@ def other_sub_type_folder_keys() -> Dict[str, List[str]]:
 # Precomputed inverse of OTHER_MODEL_FOLDER_SUBTYPES, keeping the table order.
 OTHER_SUB_TYPE_FOLDER_KEYS: Dict[str, List[str]] = other_sub_type_folder_keys()

+# Core folder_paths keys every LoRA Manager installation understands.
+CORE_FOLDER_PATH_KEYS: List[str] = ["loras", "checkpoints", "unet", "embeddings"]
+
+
+def folder_path_schema() -> List[Dict[str, Any]]:
+    """Ordered schema describing the editable folder_paths keys.
+
+    Drives the standalone-only Model Paths settings UI: the frontend renders
+    one multi-path editor per entry and resolves labels via the
+    ``settings.modelPaths.folderKeys.<key>`` i18n keys, so adding a new model
+    category is a constants + locale change only. ``sub_type`` lets the UI
+    hide editors for other-model categories the user has not enabled.
+    """
+    schema: List[Dict[str, Any]] = [
+        {"key": key, "category": "core", "sub_type": None}
+        for key in CORE_FOLDER_PATH_KEYS
+    ]
+    schema.extend(
+        {"key": folder_key, "category": "other", "sub_type": sub_type}
+        for folder_key, sub_type in OTHER_MODEL_FOLDER_SUBTYPES.items()
+    )
+    return schema
+

 def normalize_other_sub_types(value: Any) -> List[str]:
    """Normalize a stored/requested enabled-sub_type list.
@@ -0,0 +1,152 @@
+"""Shared directory-browsing logic for HTTP directory pickers."""
+
+from __future__ import annotations
+
+import os
+from pathlib import Path
+from typing import Any, Dict, Tuple
+
+# Virtual path token for the Windows drive list. Browsing up from a drive
+# root (e.g. C:\) lands here so users can switch drives without typing a
+# path. Only meaningful on Windows; elsewhere it falls through to normal
+# path handling and fails the existence check.
+WINDOWS_DRIVES_TOKEN = "__drives__"
+
+_IMAGE_EXTENSIONS = {
+    ".jpg",
+    ".jpeg",
+    ".png",
+    ".gif",
+    ".webp",
+    ".bmp",
+    ".tiff",
+    ".tif",
+}
+
+
+def browse_directory(directory_path: str) -> Tuple[Dict[str, Any], int]:
+    """Browse a directory and return (payload, http_status).
+
+    The payload shape matches the JSON responses historically produced by
+    ``BatchImportHandler.browse_directory``: on success a dict with
+    ``success``, ``current_path``, ``parent_path``, ``directories``,
+    ``image_files``, ``image_count`` and ``directory_count``; on failure a
+    ``{"success": False, "error": ...}`` dict with a 400/403/404/500 status.
+    """
+    if os.name == "nt" and directory_path == WINDOWS_DRIVES_TOKEN:
+        return _windows_drives_payload(), 200
+
+    # Default to the user's home directory. The frontend previously
+    # sent "/" as the initial path, which is POSIX-only: on Windows it
+    # resolves to the current drive root and then fails the access
+    # check below.
+    if not directory_path:
+        path = Path.home()
+    else:
+        path = Path(directory_path).expanduser().resolve()
+
+    # Access check: browsing intentionally covers the whole server
+    # filesystem (the server operator browses their own machine). On
+    # POSIX every absolute path is under "/", but Path("/") has no
+    # drive letter on Windows and can never anchor a drive-qualified
+    # path in relative_to(), so test for a drive there instead.
+    if os.name == "nt":
+        is_allowed = bool(path.drive)
+    else:
+        is_allowed = path.is_absolute()
+
+    if not is_allowed:
+        return {"success": False, "error": "Access denied to this directory"}, 403
+
+    if not path.exists():
+        return {"success": False, "error": "Directory does not exist"}, 404
+
+    if not path.is_dir():
+        return {"success": False, "error": "Path is not a directory"}, 400
+
+    directories = []
+    image_files = []
+
+    try:
+        for item in path.iterdir():
+            try:
+                if item.is_dir():
+                    # Skip hidden directories and common system folders
+                    if not item.name.startswith(".") and item.name not in [
+                        "__pycache__",
+                        "node_modules",
+                    ]:
+                        directories.append(
+                            {
+                                "name": item.name,
+                                "path": str(item),
+                                "is_parent": False,
+                            }
+                        )
+                elif item.is_file() and item.suffix.lower() in _IMAGE_EXTENSIONS:
+                    image_files.append(
+                        {
+                            "name": item.name,
+                            "path": str(item),
+                            "size": item.stat().st_size,
+                        }
+                    )
+            except (PermissionError, OSError):
+                # Skip files/directories we can't access
+                continue
+
+        directories.sort(key=lambda x: x["name"].lower())
+        image_files.sort(key=lambda x: x["name"].lower())
+
+        # Parent directory. A filesystem root is its own parent
+        # (parent == path): POSIX "/" gets no parent, while a Windows
+        # drive root (C:\) links up to the virtual drive list so users
+        # can switch drives. The previous str(path) != str(path.root)
+        # check misfired on Windows, where a drive root's parent is
+        # itself, producing an infinite self-loop.
+        if path.parent == path:
+            parent_path = WINDOWS_DRIVES_TOKEN if os.name == "nt" else None
+        else:
+            parent_path = str(path.parent)
+
+        return (
+            {
+                "success": True,
+                "current_path": str(path),
+                "parent_path": parent_path,
+                "directories": directories,
+                "image_files": image_files,
+                "image_count": len(image_files),
+                "directory_count": len(directories),
+            },
+            200,
+        )
+
+    except PermissionError:
+        return {"success": False, "error": "Permission denied"}, 403
+    except OSError as exc:
+        return {"success": False, "error": f"Error reading directory: {str(exc)}"}, 500
+
+
+def _windows_drives_payload() -> Dict[str, Any]:
+    """List available drive letters as a virtual directory (Windows only)."""
+    try:
+        drives = os.listdrives()
+    except AttributeError:  # Python < 3.12
+        drives = [
+            f"{letter}:\\"
+            for letter in "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+            if os.path.exists(f"{letter}:\\")
+        ]
+    directories = [{"name": drive, "path": drive, "is_parent": False} for drive in drives]
+    return {
+        "success": True,
+        # Empty current_path marks the virtual level; the frontend
+        # disables folder selection there.
+        "current_path": "",
+        "parent_path": None,
+        "directories": directories,
+        "image_files": [],
+        "image_count": 0,
+        "directory_count": len(directories),
+    }
@@ -2,7 +2,7 @@ import inspect
 import logging
 import os
 import re
-from typing import TYPE_CHECKING, Any, Dict, Optional
+from typing import TYPE_CHECKING, Any, Dict, Mapping, MutableMapping, Optional

 from ..recipes.constants import GEN_PARAM_KEYS
 from ..services.metadata_service import get_default_metadata_provider, get_metadata_provider
@@ -13,9 +13,20 @@ from ..services.downloader import get_downloader
 from ..utils.constants import SUPPORTED_MEDIA_EXTENSIONS
 from ..utils.exif_utils import ExifUtils
 from ..utils.metadata_manager import MetadataManager
+from ..utils.video_metadata import get_video_dimensions

 logger = logging.getLogger(__name__)

+# Placeholder dimensions written when the real ones cannot be determined.
+# Kept for backwards compatibility with pre-existing metadata entries.
+_DEFAULT_MEDIA_WIDTH = 720
+_DEFAULT_MEDIA_HEIGHT = 1280
+
+# Example metadata entries carry a marker: ``customImages`` use their ``id``
+# while ``images`` use the positional index. Either way the marker must be a
+# plain filename-safe token, never a path fragment.
+_ENTRY_MARKER_PATTERN = re.compile(r"^(?:custom_|image_)?([^./\\]+)$")
+
 _preview_service = PreviewAssetService(
    metadata_manager=MetadataManager,
    downloader_factory=get_downloader,
@@ -66,6 +77,141 @@ def _build_metadata_sync_service(settings_manager: "SettingsManager") -> Metadat
    )


+def _read_media_dimensions(path: str, is_video: bool) -> tuple[int, int]:
+    """Return ``(width, height)`` for an example image or video file.
+
+    Videos are read from their container headers (PIL cannot open them) so the
+    showcase viewer sizes the gallery to the real aspect ratio. Falls back to
+    the legacy ``720x1280`` placeholder when the dimensions cannot be
+    determined — e.g. an unreadable file or an exotic codec — which only
+    affects the displayed aspect ratio, never the file itself.
+    """
+
+    dimensions = None
+
+    if is_video:
+        dimensions = get_video_dimensions(path)
+    else:
+        try:
+            from PIL import Image
+
+            if os.path.exists(path):
+                with Image.open(path) as img:
+                    dimensions = img.size
+        except Exception:
+            dimensions = None
+
+    if dimensions:
+        width, height = dimensions
+        if width > 0 and height > 0:
+            return int(width), int(height)
+
+    return _DEFAULT_MEDIA_WIDTH, _DEFAULT_MEDIA_HEIGHT
+
+
+def _is_video_entry(file_path: Optional[str], entry: Mapping[str, Any]) -> bool:
+    """Return True when an example entry points at a video file.
+
+    The local file extension wins over the recorded ``type`` because files in
+    the wild are frequently mislabelled (animated WebP saved as ``.mp4``);
+    ``_read_media_dimensions`` handles that correctly either way.
+    """
+
+    if file_path:
+        ext = os.path.splitext(file_path)[1].lower()
+        if ext in SUPPORTED_MEDIA_EXTENSIONS["videos"]:
+            return True
+        if ext in SUPPORTED_MEDIA_EXTENSIONS["images"]:
+            return False
+    return str(entry.get("type", "")).lower() == "video"
+
+
+def _resolve_local_file(
+    entry: Mapping[str, Any],
+    index: int,
+    local_files: Mapping[str, str],
+) -> Optional[str]:
+    """Map a metadata entry onto its example file inside the model folder.
+
+    Reads the entry's own marker (``id`` for ``customImages``, positional
+    ``index`` for ``images``) with an anchored regex, so the identifier can
+    never bleed into a neighbouring filename the way a prefix comparison can.
+    """
+
+    marker = entry.get("id")
+    if not isinstance(marker, str) or not marker:
+        marker = str(index)
+
+    match = _ENTRY_MARKER_PATTERN.fullmatch(marker)
+    if not match:
+        return None
+
+    return local_files.get(match.group(1))
+
+
+def repair_local_video_dimensions(
+    metadata: MutableMapping[str, Any],
+    local_files: Mapping[str, str],
+    *,
+    dry_run: bool = False,
+) -> int:
+    """Backfill real video dimensions for an entry that has local files.
+
+    Only entries with an empty ``url`` are considered: those have no remote
+    source, so the local file is the single source of truth for their size and
+    rewriting them cannot discard API-supplied data. Entries whose dimensions
+    already match the file are left byte-identical.
+
+    Args:
+        metadata: Raw metadata payload (mutated in place unless ``dry_run``).
+        local_files: ``{identifier: path}`` for files present in the model's
+            example folder, where the identifier is the entry's ``id`` (for
+            ``customImages``) or its positional index (for ``images``).
+        dry_run: Count the fixes without mutating ``metadata``.
+
+    Returns:
+        The number of entries that were (or would be) repaired.
+    """
+
+    civitai = metadata.get("civitai")
+    if not isinstance(civitai, dict):
+        return 0
+
+    repaired = 0
+
+    for key in ("customImages", "images"):
+        entries = civitai.get(key)
+        if not isinstance(entries, list) or not entries:
+            continue
+
+        for index, entry in enumerate(entries):
+            if not isinstance(entry, dict):
+                continue
+            if entry.get("url", "") != "":
+                # Remote-backed entry: never rebuilt from local state.
+                continue
+
+            file_path = _resolve_local_file(entry, index, local_files)
+            if not file_path or not os.path.isfile(file_path):
+                continue
+
+            dimensions = _read_media_dimensions(
+                file_path, _is_video_entry(file_path, entry)
+            )
+            width, height = dimensions
+            if width <= 0 or height <= 0:
+                continue
+            if entry.get("width") == width and entry.get("height") == height:
+                continue
+
+            if not dry_run:
+                entry["width"] = width
+                entry["height"] = height
+            repaired += 1
+
+    return repaired
+
+
 def _get_metadata_sync_service() -> MetadataSyncService:
    """Return the shared metadata sync service, initialising it lazily."""

@@ -230,29 +376,21 @@ class MetadataUpdater:
                    # Determine if video or image
                    file_ext = os.path.splitext(path)[1].lower()
                    is_video = file_ext in SUPPORTED_MEDIA_EXTENSIONS['videos']
-                    
+
+                    width, height = _read_media_dimensions(path, is_video)
+
                    # Create image metadata entry
                    image_entry = {
                        "url": "",  # Empty URL as required
                        "nsfwLevel": 0,
-                        "width": 720,  # Default dimensions
-                        "height": 1280,
+                        "width": width,
+                        "height": height,
                        "type": "video" if is_video else "image",
                        "meta": None,
                        "hasMeta": False,
                        "hasPositivePrompt": False
                    }
-                    
-                    # If it's an image, try to get actual dimensions (optional enhancement)
-                    try:
-                        from PIL import Image
-                        if not is_video and os.path.exists(path):
-                            with Image.open(path) as img:
-                                image_entry["width"], image_entry["height"] = img.size
-                    except:
-                        # If PIL fails or is unavailable, use default dimensions
-                        pass
-                        
+
                    images.append(image_entry)
                
                # Update the model's civitai.images field
@@ -321,14 +459,16 @@ class MetadataUpdater:
                # Determine if video or image
                file_ext = os.path.splitext(path)[1].lower()
                is_video = file_ext in SUPPORTED_MEDIA_EXTENSIONS['videos']
-                
+
+                width, height = _read_media_dimensions(path, is_video)
+
                # Create image metadata entry
                image_entry = {
                    "url": "",  # Empty URL as requested
                    "id": short_id,
                    "nsfwLevel": 0,
-                    "width": 720,  # Default dimensions
-                    "height": 1280,
+                    "width": width,
+                    "height": height,
                    "type": "video" if is_video else "image",
                    "meta": None,
                    "hasMeta": False,
@@ -353,16 +493,6 @@ class MetadataUpdater:
                    except Exception as e:
                        logger.warning(f"Failed to extract metadata from {os.path.basename(path)}: {e}")
                
-                # If it's an image, try to get actual dimensions
-                try:
-                    from PIL import Image
-                    if not is_video and os.path.exists(path):
-                        with Image.open(path) as img:
-                            image_entry["width"], image_entry["height"] = img.size
-                except:
-                    # If PIL fails or is unavailable, use default dimensions
-                    pass
-                    
                # Append to existing customImages array
                custom_images.append(image_entry)
            
@@ -15,12 +15,20 @@ from ..utils.example_images_paths import (
 )
 from ..utils.metadata_manager import MetadataManager
 from ..utils.example_images_processor import ExampleImagesProcessor
-from ..utils.example_images_metadata import update_cache_from_metadata
+from ..utils.example_images_metadata import (
+    repair_local_video_dimensions,
+    update_cache_from_metadata,
+)
 from ..utils.constants import SUPPORTED_MEDIA_EXTENSIONS

 logger = logging.getLogger(__name__)

-CURRENT_NAMING_VERSION = 2  # Increment this when naming conventions change
+CURRENT_NAMING_VERSION = 3  # Increment this when naming conventions change
+
+# Example files worth inspecting during the dimension repair.
+_REPAIRABLE_EXTENSIONS = frozenset(
+    SUPPORTED_MEDIA_EXTENSIONS["images"] + SUPPORTED_MEDIA_EXTENSIONS["videos"]
+)


 class _SettingsProxy:
@@ -185,6 +193,9 @@ class ExampleImagesMigration:
            if from_version < 2 and to_version >= 2:
                await ExampleImagesMigration._migrate_to_v2(model_folders)
            
+            if from_version < 3 and to_version >= 3:
+                await ExampleImagesMigration._migrate_to_v3(example_images_path, model_folders)
+            
            # Update version in progress file
            progress_file = os.path.join(example_images_path, '.download_progress.json')
            try:
@@ -437,4 +448,137 @@ class ExampleImagesMigration:
                logger.error(f"Error migrating folder {folder}: {e}")
                migration_errors += 1
        
-        logger.info(f"Migration to v2 complete: migrated {count} custom examples across {updated_models} models with {migration_errors} errors")
+        logger.info(f"Migration to v2 complete: migrated {count} custom examples across {updated_models} models with {migration_errors} errors")
+
+    @staticmethod
+    def _build_local_file_map(folder):
+        """Map entry markers to their files inside a model's example folder.
+
+        Keys are the marker alone (``custom_<id>`` → ``<id>``,
+        ``image_<index>`` → ``<index>``) so they line up with the metadata
+        entries' ``id``/positional index without any prefix ambiguity.
+        """
+
+        local_files = {}
+        try:
+            entries = os.listdir(folder)
+        except OSError as exc:
+            logger.debug("Could not list example folder %s: %s", folder, exc)
+            return local_files
+
+        for name in entries:
+            stem, ext = os.path.splitext(name)
+            if ext.lower() not in _REPAIRABLE_EXTENSIONS:
+                continue
+            if stem.startswith("custom_"):
+                local_files[stem[len("custom_"):]] = os.path.join(folder, name)
+            elif stem.startswith("image_"):
+                local_files[stem[len("image_"):]] = os.path.join(folder, name)
+
+        return local_files
+
+    @staticmethod
+    async def _find_scanner_for_hash(model_hash):
+        """Return the scanner owning ``model_hash``, or ``None``."""
+
+        lora_scanner = await ServiceRegistry.get_lora_scanner()
+        checkpoint_scanner = await ServiceRegistry.get_checkpoint_scanner()
+        embedding_scanner = await ServiceRegistry.get_embedding_scanner()
+
+        for scanner in (lora_scanner, checkpoint_scanner, embedding_scanner):
+            if scanner is None:
+                continue
+            try:
+                if scanner.has_hash(model_hash):
+                    return scanner
+            except Exception as exc:  # pragma: no cover - defensive
+                logger.debug("has_hash check failed for %s: %s", type(scanner).__name__, exc)
+        return None
+
+    @staticmethod
+    async def _migrate_to_v3(example_images_path, model_folders):
+        """Backfill real dimensions for locally imported example videos.
+
+        Imported videos were stored with a hardcoded ``720x1280`` placeholder
+        (issue #1115), so landscape clips were rendered inside a portrait
+        container. Only entries with an empty ``url`` are touched — those have
+        no remote source, which makes the local file authoritative and the
+        rewrite lossless. Entries already carrying the right size are left
+        untouched, so re-running this migration is a no-op.
+
+        This runs once per library via the ``naming_version`` gate in
+        ``run_migrations``; it is deliberately not wired into any request path.
+        """
+
+        repaired_entries = 0
+        updated_models = 0
+        migration_errors = 0
+
+        logger.info(
+            "Starting v3 migration (local example video dimensions) for %d model folders",
+            len(model_folders),
+        )
+
+        for folder in model_folders:
+            try:
+                model_hash = os.path.basename(folder)
+                if not model_hash or len(model_hash) != 64:
+                    continue
+
+                local_files = ExampleImagesMigration._build_local_file_map(folder)
+                if not local_files:
+                    continue
+
+                scanner = await ExampleImagesMigration._find_scanner_for_hash(model_hash)
+                if scanner is None:
+                    logger.debug(
+                        "Model %s not found in any scanner cache, skipping dimension repair",
+                        model_hash,
+                    )
+                    continue
+
+                cache = await scanner.get_cached_data()
+                model_data = None
+                for item in cache.raw_data:
+                    if item.get("sha256") == model_hash:
+                        model_data = item
+                        break
+
+                if not model_data:
+                    continue
+
+                file_path = model_data.get("file_path")
+                if not file_path:
+                    continue
+
+                payload = await MetadataManager.load_metadata_payload(file_path)
+                if not isinstance(payload, dict):
+                    continue
+
+                repaired = repair_local_video_dimensions(payload, local_files)
+                if repaired <= 0:
+                    continue
+
+                # The model cache shape differs from the on-disk payload, so
+                # persist the file first and let the cache sync re-read it.
+                await MetadataManager.save_metadata(file_path, payload)
+                await update_cache_from_metadata(scanner, file_path, payload)
+
+                repaired_entries += repaired
+                updated_models += 1
+
+            except Exception as exc:
+                logger.error(
+                    "Failed to repair example video dimensions for %s: %s",
+                    folder,
+                    exc,
+                )
+                migration_errors += 1
+
+        logger.info(
+            "Migration to v3 complete: repaired %d example entr(ies) across %d model(s) "
+            "with %d error(s)",
+            repaired_entries,
+            updated_models,
+            migration_errors,
+        )
@@ -0,0 +1,146 @@
+"""Cross-process advisory locking for shared LoRA Manager state.
+
+Two LoRA Manager processes (the ComfyUI plugin and a standalone server, or two
+ComfyUI installs pointed at the same settings directory) can open the same cache
+database. SQLite serializes individual statements, but it cannot make a
+read-modify-write *sequence* atomic across processes: two full-table cache
+replacements can interleave so that one process's snapshot overwrites the
+other's.
+
+This module provides a small advisory file lock for those sequences. It is
+deliberately non-fatal: if locking is unavailable or the wait times out, callers
+keep working with SQLite's own ``busy_timeout`` as the fallback.
+"""
+
+from __future__ import annotations
+
+import logging
+import os
+import time
+
+logger = logging.getLogger(__name__)
+
+# How long to wait for another process to release the lock before giving up.
+DEFAULT_LOCK_TIMEOUT_SECONDS = 30.0
+_POLL_INTERVAL_SECONDS = 0.05
+
+# Windows byte-range locks; fcntl.flock on POSIX.
+try:  # pragma: no cover - platform dependent
+    import fcntl
+except ImportError:  # pragma: no cover - Windows
+    fcntl = None  # type: ignore[assignment]
+
+try:  # pragma: no cover - Windows only
+    import msvcrt
+except ImportError:  # pragma: no cover - POSIX
+    msvcrt = None  # type: ignore[assignment]
+
+
+class FileLockUnavailable(RuntimeError):
+    """Raised when the lock could not be acquired within the timeout."""
+
+
+def lock_path_for(db_path: str) -> str:
+    """Return the sibling lock file path used for *db_path*."""
+    absolute = os.path.abspath(db_path)
+    directory = os.path.dirname(absolute)
+    if not directory:
+        raise ValueError(f"Cannot derive a lock directory from {db_path!r}")
+    return os.path.join(directory, f".{os.path.basename(absolute)}.lock")
+
+
+class CrossProcessLock:
+    """A best-effort advisory lock backed by a lock file.
+
+    The lock file is a sibling of the guarded resource and is never deleted:
+    unlinking it would let a second process create a fresh inode and lock that
+    instead, defeating mutual exclusion.
+    """
+
+    def __init__(self, path: str, timeout: float = DEFAULT_LOCK_TIMEOUT_SECONDS):
+        self.path = path
+        self.timeout = timeout
+        self._handle = None
+
+    def acquire(self) -> bool:
+        """Try to take the lock, waiting up to ``timeout`` seconds.
+
+        Returns:
+            True when the lock is held (including when another lock is already
+            held by *this* process — the calls are not reentrant, so callers must
+            not nest them). False when locking is unsupported or timed out; the
+            caller should proceed and rely on the SQLite busy timeout instead.
+        """
+        if fcntl is None and msvcrt is None:  # pragma: no cover - exotic platform
+            return False
+
+        os.makedirs(os.path.dirname(self.path), exist_ok=True)
+        try:
+            handle = open(self.path, "a+b")
+        except OSError as exc:
+            logger.debug("Could not open lock file %s: %s", self.path, exc)
+            return False
+
+        deadline = time.monotonic() + max(0.0, self.timeout)
+        while True:
+            if self._try_lock(handle):
+                self._handle = handle
+                return True
+            if time.monotonic() >= deadline:
+                handle.close()
+                return False
+            time.sleep(_POLL_INTERVAL_SECONDS)
+
+    def release(self) -> None:
+        """Release the lock if held. Safe to call more than once."""
+        handle = self._handle
+        if handle is None:
+            return
+        self._handle = None
+        try:
+            self._unlock(handle)
+        except OSError as exc:  # pragma: no cover - defensive
+            logger.debug("Failed to release lock %s: %s", self.path, exc)
+        finally:
+            try:
+                handle.close()
+            except OSError:  # pragma: no cover - defensive
+                pass
+
+    def __enter__(self) -> "CrossProcessLock":
+        self.acquire()
+        return self
+
+    def __exit__(self, *_exc_info: object) -> None:
+        self.release()
+
+    # -- platform primitives -------------------------------------------------
+
+    def _try_lock(self, handle) -> bool:
+        if fcntl is not None:
+            try:
+                fcntl.flock(handle.fileno(), fcntl.LOCK_EX | fcntl.LOCK_NB)
+                return True
+            except OSError:
+                return False
+        if msvcrt is not None:  # pragma: no cover - Windows
+            try:
+                handle.seek(0)
+                msvcrt.locking(handle.fileno(), msvcrt.LK_NBLCK, 1)
+                return True
+            except OSError:
+                return False
+        return False
+
+    def _unlock(self, handle) -> None:
+        if fcntl is not None:
+            fcntl.flock(handle.fileno(), fcntl.LOCK_UN)
+            return
+        if msvcrt is not None:  # pragma: no cover - Windows
+            handle.seek(0)
+            msvcrt.locking(handle.fileno(), msvcrt.LK_UNLCK, 1)
+
+
+def exclusive_lock(db_path: str, timeout: float = DEFAULT_LOCK_TIMEOUT_SECONDS):
+    """Return a :class:`CrossProcessLock` for the database at *db_path*."""
+    return CrossProcessLock(lock_path_for(db_path), timeout=timeout)
@@ -2,7 +2,11 @@ from dataclasses import dataclass, asdict, field
 from typing import Callable, Dict, Optional, List, Any
 from datetime import datetime
 import os
-from .constants import CIVITAI_TYPE_TO_OTHER_SUB_TYPE, INVALID_AUTOV3_EMPTY_HASH
+from .constants import (
+    CIVITAI_TYPE_TO_OTHER_SUB_TYPE,
+    INVALID_AUTOV3_EMPTY_HASH,
+    MODEL_FILE_EXTENSIONS,
+)
 from .model_utils import determine_base_model


@@ -46,6 +50,24 @@ def autov3_from_civitai_files(civitai_data: Optional[Dict[str, Any]], sha256: st
    return None


+def strip_model_extension(file_name: str) -> str:
+    """Strip a recognized model file extension, leaving dotted stems intact.
+
+    ``os.path.splitext`` treats everything after the last dot as an extension,
+    so applying it to an already extension-free name truncates dotted stems:
+    ``lora-sd1.5-backlight_slider_v10`` becomes ``lora-sd1``. API filenames keep
+    their extension and need one strip, while migration paths (``.civitai.info``)
+    pass the local stem as-is, so only remove a suffix that is a known model
+    extension and both inputs resolve to the same stem (issue #1112).
+    """
+    if not file_name:
+        return file_name
+    stem, extension = os.path.splitext(file_name)
+    if extension.lower() in MODEL_FILE_EXTENSIONS:
+        return stem
+    return file_name
+
+
@dataclass
 class BaseModelMetadata:
    """Base class for all model metadata structures"""
@@ -241,6 +263,7 @@ class LoraMetadata(BaseModelMetadata):
    ) -> "LoraMetadata":
        """Create LoraMetadata instance from Civitai version info"""
        file_name = file_info.get("name", "")
+        base_name = strip_model_extension(file_name)
        base_model = determine_base_model(version_info.get("baseModel", ""))

        # Extract tags and description if available
@@ -255,8 +278,8 @@ class LoraMetadata(BaseModelMetadata):
        sha256_value = (file_info.get("hashes") or {}).get("SHA256", "").lower()

        return cls(
-            file_name=os.path.splitext(file_name)[0],
-            model_name=model_data.get("name", os.path.splitext(file_name)[0]),
+            file_name=base_name,
+            model_name=model_data.get("name", base_name),
            file_path=save_path.replace(os.sep, "/"),
            size=file_info.get("sizeKB", 0) * 1024,
            modified=datetime.now().timestamp(),
@@ -285,6 +308,7 @@ class CheckpointMetadata(BaseModelMetadata):
    ) -> "CheckpointMetadata":
        """Create CheckpointMetadata instance from Civitai version info"""
        file_name = file_info.get("name", "")
+        base_name = strip_model_extension(file_name)
        base_model = determine_base_model(version_info.get("baseModel", ""))
        sha256_value = (file_info.get("hashes") or {}).get("SHA256", "").lower()
        sub_type = version_info.get("type", "checkpoint")
@@ -299,8 +323,8 @@ class CheckpointMetadata(BaseModelMetadata):
            description = model_data["description"]

        return cls(
-            file_name=os.path.splitext(file_name)[0],
-            model_name=model_data.get("name", os.path.splitext(file_name)[0]),
+            file_name=base_name,
+            model_name=model_data.get("name", base_name),
            file_path=save_path.replace(os.sep, "/"),
            size=file_info.get("sizeKB", 0) * 1024,
            modified=datetime.now().timestamp(),
@@ -336,6 +360,7 @@ class OtherModelMetadata(BaseModelMetadata):
    ) -> "OtherModelMetadata":
        """Create OtherModelMetadata instance from Civitai version info"""
        file_name = file_info.get("name", "")
+        base_name = strip_model_extension(file_name)
        base_model = determine_base_model(version_info.get("baseModel", ""))
        sha256_value = (file_info.get("hashes") or {}).get("SHA256", "").lower()
        # Map the CivitAI model type onto our sub_types; unknown types keep the
@@ -354,8 +379,8 @@ class OtherModelMetadata(BaseModelMetadata):
            description = model_data["description"]

        return cls(
-            file_name=os.path.splitext(file_name)[0],
-            model_name=model_data.get("name", os.path.splitext(file_name)[0]),
+            file_name=base_name,
+            model_name=model_data.get("name", base_name),
            file_path=save_path.replace(os.sep, "/"),
            size=file_info.get("sizeKB", 0) * 1024,
            modified=datetime.now().timestamp(),
@@ -385,6 +410,7 @@ class EmbeddingMetadata(BaseModelMetadata):
    ) -> "EmbeddingMetadata":
        """Create EmbeddingMetadata instance from Civitai version info"""
        file_name = file_info.get("name", "")
+        base_name = strip_model_extension(file_name)
        base_model = determine_base_model(version_info.get("baseModel", ""))
        sha256_value = (file_info.get("hashes") or {}).get("SHA256", "").lower()
        sub_type = version_info.get("type", "embedding")
@@ -399,8 +425,8 @@ class EmbeddingMetadata(BaseModelMetadata):
            description = model_data["description"]

        return cls(
-            file_name=os.path.splitext(file_name)[0],
-            model_name=model_data.get("name", os.path.splitext(file_name)[0]),
+            file_name=base_name,
+            model_name=model_data.get("name", base_name),
            file_path=save_path.replace(os.sep, "/"),
            size=file_info.get("sizeKB", 0) * 1024,
            modified=datetime.now().timestamp(),
@@ -174,12 +174,42 @@ def ensure_settings_file(logger: Optional[logging.Logger] = None) -> str:
    return target_path


+def _portable_env_override() -> Optional[bool]:
+    """Return the portable mode forced by ``LORA_MANAGER_PORTABLE``, if any.
+
+    Returns:
+        ``True`` when the variable enables portable mode, ``False`` when it is
+        explicitly set to ``"0"``, and ``None`` when it is unset or holds some
+        other value (in which case the persisted settings flag decides).
+    """
+
+    raw = os.environ.get(_LM_PORTABLE_ENV)
+    if raw is None:
+        return None
+    if raw == "1":
+        return True
+    if raw == "0":
+        return False
+    return None
+
+
 def _should_use_portable_settings(path: str, logger: logging.Logger) -> bool:
    """Return ``True`` when the env var forces it or the settings file enables it."""

-    if os.environ.get(_LM_PORTABLE_ENV, "0") == "1":
+    override = _portable_env_override()
+    if override is True:
        logger.debug("Portable mode enabled via %s", _LM_PORTABLE_ENV)
        return True
+    if override is False:
+        # Explicit opt-out. Without this, a single `LORA_MANAGER_PORTABLE=1`
+        # run would pin the shared plugin settings.json to portable mode
+        # forever, with no way back except editing that file by hand.
+        logger.info(
+            "Portable mode disabled via %s=%s",
+            _LM_PORTABLE_ENV,
+            os.environ.get(_LM_PORTABLE_ENV, ""),
+        )
+        return False

    if not os.path.exists(path):
        return False
@@ -1,4 +1,5 @@
 from difflib import SequenceMatcher
+import logging
 import os
 import re
 from typing import Any, Dict, List, Optional
@@ -7,6 +8,8 @@ from ..config import config
 from ..services.settings_manager import get_settings_manager
 import asyncio

+logger = logging.getLogger(__name__)
+

 def get_lora_info(lora_name):
    """Get the lora path and trigger words from cache"""
@@ -598,6 +601,107 @@ def calculate_relative_path_for_model(
    return formatted_path


+def calculate_filename_for_model(
+    model_data: Dict[str, Any], model_type: str = "lora"
+) -> str:
+    """Calculate the filename stem for a model using the filename template.
+
+    Mirrors the data extraction of :func:`calculate_relative_path_for_model`
+    but renders a single filename (no path segments). Missing values resolve
+    to empty segments instead of the path-oriented defaults ("Anonymous" /
+    "no tags") so templates degrade gracefully.
+
+    Args:
+        model_data: Model data from scanner cache
+        model_type: Type of model ('lora', 'checkpoint', 'embedding')
+
+    Returns:
+        Sanitized filename stem without extension, or an empty string when no
+        template is configured, the template is invalid, or the rendered name
+        is empty.
+    """
+    settings_manager = get_settings_manager()
+    template = settings_manager.get_download_filename_template(model_type)
+
+    if not template:
+        return ""
+
+    # A filename template must render a single name, never folder segments.
+    if "/" in template or "\\" in template:
+        logger.warning(
+            "Filename template for %s contains a path separator and is ignored: %r",
+            model_type,
+            template,
+        )
+        return ""
+
+    civitai_data = model_data.get("civitai", {})
+
+    author = ""
+    if isinstance(civitai_data, dict) and civitai_data.get("id") is not None:
+        creator_info = civitai_data.get("creator") or {}
+        author = creator_info.get("username") or ""
+
+    base_model = model_data.get("base_model", "")
+    base_model_mappings = settings_manager.get("base_model_path_mappings", {})
+    mapped_base_model = base_model_mappings.get(base_model, base_model)
+
+    lowercase_tags = [
+        tag.lower() for tag in model_data.get("tags", []) if isinstance(tag, str)
+    ]
+    first_tag = settings_manager.resolve_priority_tag_for_model(
+        lowercase_tags, model_type
+    )
+
+    model_name = model_data.get("model_name", "")
+    version_name = ""
+    if isinstance(civitai_data, dict):
+        version_name = civitai_data.get("name") or ""
+
+    sha256 = model_data.get("sha256") or ""
+    hash_short = sha256[:10].lower() if isinstance(sha256, str) else ""
+
+    file_path = model_data.get("file_path") or ""
+    if isinstance(file_path, str) and file_path:
+        original_name = os.path.splitext(os.path.basename(file_path))[0]
+    else:
+        original_name = os.path.splitext(str(model_data.get("file_name", "")))[0]
+
+    def _sanitize_value(value: Any) -> str:
+        # sanitize_folder_name falls back to "unnamed" for empty input; for
+        # templates an empty value must stay empty so segments collapse.
+        text = str(value) if value else ""
+        return sanitize_folder_name(text) if text else ""
+
+    replacements = {
+        "{model_name}": _sanitize_value(model_name),
+        "{version_name}": _sanitize_value(version_name),
+        "{base_model}": _sanitize_value(mapped_base_model),
+        "{author}": _sanitize_value(author),
+        "{first_tag}": _sanitize_value(first_tag),
+        "{hash_short}": hash_short,
+        "{original_name}": _sanitize_value(original_name),
+    }
+
+    result = template
+    for placeholder, value in replacements.items():
+        result = result.replace(placeholder, value)
+
+    if model_type == "embedding":
+        result = result.replace(" ", "_")
+
+    # Strip characters that are illegal in filenames on common filesystems.
+    result = re.sub(r'[:*?"<>|]', "", result)
+    # Collapse runs of identical separators introduced by empty substitutions.
+    result = re.sub(r"([-_. ])\1+", r"\1", result)
+    # Drop separators left dangling next to each other ("- -" -> "-").
+    result = re.sub(r" ?([-_.]) (?=[-_.])", r"\1", result)
+    # A stem must not start or end with separators, spaces or dots.
+    result = result.strip("-_. ")
+
+    return result
+
+
 def remove_empty_dirs(path):
    """Recursively remove empty directories starting from the given path.

@@ -0,0 +1,623 @@
+"""Read intrinsic dimensions from video containers without external tooling.
+
+PIL cannot open ``.mp4``/``.webm`` files, so example videos imported through
+the "Add examples" flow used to fall back to a hardcoded ``720x1280`` (portrait)
+entry, which forced the showcase viewer to letterbox landscape videos.
+
+This module reads the dimensions out of the container headers themselves:
+
+* ISO base media files (``.mp4``/``.mov``/``.m4v``) — ``moov/trak/tkhd``,
+  falling back to the sample description of the video track.
+* WebM/Matroska (``.webm``/``.mkv``) — ``Segment/Tracks/TrackEntry/Video``
+  ``PixelWidth``/``PixelHeight``.
+* Animated WebP (``RIFF``/``WEBP``) — handled because users routinely save
+  animated examples with a video extension.
+
+The container signature decides which reader runs, so a mislabelled file
+(a ``.mp4`` that is really WebM) still reports the right dimensions.
+
+Both readers stream over the file: only container headers are read, so a
+multi-gigabyte ``mdat`` is never pulled into memory (it is seeked past).
+"""
+
+from __future__ import annotations
+
+import functools
+import logging
+import os
+import struct
+from typing import BinaryIO, Iterator, Optional, Tuple
+
+logger = logging.getLogger(__name__)
+
+ISO_MEDIA_EXTENSIONS = frozenset({".mp4", ".m4v", ".mov"})
+EBML_MEDIA_EXTENSIONS = frozenset({".webm", ".mkv"})
+
+_EBML_MAGIC = b"\x1a\x45\xdf\xa3"
+
+# Cap recursion into nesting containers so a crafted/corrupt file cannot blow
+# the Python stack.
+_MAX_BOX_DEPTH = 12
+_MAX_EBML_DEPTH = 12
+
+# Header structs (``tkhd``, sample entries) are tiny; guard against a bogus
+# size claiming the whole file.
+_MAX_HEADER_PAYLOAD = 1024 * 1024
+
+_WIDTH_HEIGHT_UNSET = (0, 0)
+
+
+@functools.lru_cache(maxsize=4096)
+def _get_video_dimensions_cached(
+    path: str, _mtime_ns: int, _size: int
+) -> Optional[Tuple[int, int]]:
+    """Return ``(width, height)`` for ``path``, or ``None`` on any failure.
+
+    ``_mtime_ns`` and ``_size`` participate in the cache key only so a replaced
+    file is re-probed; they are never read by the parser.
+    """
+    try:
+        return _read_video_dimensions(path)
+    except Exception:
+        logger.debug("Failed to read video dimensions for %s", path, exc_info=True)
+        return None
+
+
+def _read_video_dimensions(path: str) -> Optional[Tuple[int, int]]:
+    """Dispatch to the ISO or EBML reader based on the container's magic bytes.
+
+    Real libraries contain files whose extension lies about their container
+    (a ``.mp4`` that is really WebM, typically), so the sniffed signature wins
+    and the extension is only a fallback.
+    """
+
+    ext = os.path.splitext(path)[1].lower()
+    file_size = os.path.getsize(path)
+
+    with open(path, "rb") as stream:
+        magic = stream.read(12)
+
+        if _looks_like_iso_media(magic):
+            return _read_iso_media_dimensions(stream, file_size)
+        if magic[:4] == _EBML_MAGIC:
+            return _read_ebml_dimensions(stream, file_size)
+        if magic[:4] == b"RIFF" and magic[8:12] == b"WEBP":
+            return _read_riff_webp_dimensions(stream, file_size)
+
+        # Signature is inconclusive (truncated or unusual file): fall back to
+        # the extension.
+        if ext in EBML_MEDIA_EXTENSIONS:
+            return _read_ebml_dimensions(stream, file_size)
+        if ext in ISO_MEDIA_EXTENSIONS:
+            return _read_iso_media_dimensions(stream, file_size)
+        return None
+
+
+def _looks_like_iso_media(magic: bytes) -> bool:
+    """Return True when the leading bytes are an ISO base media box header."""
+
+    return len(magic) >= 8 and magic[4:8] in {
+        b"ftyp",
+        b"moov",
+        b"mdat",
+        b"free",
+        b"skip",
+        b"wide",
+    }
+
+
+def get_video_dimensions(path: str) -> Optional[Tuple[int, int]]:
+    """Return the intrinsic ``(width, height)`` of a local video file.
+
+    Returns ``None`` when the extension is unsupported, the file is missing or
+    corrupt, or the dimensions cannot be determined. Never raises.
+    """
+    if not path:
+        return None
+    try:
+        stat = os.stat(path)
+    except OSError:
+        return None
+    return _get_video_dimensions_cached(path, stat.st_mtime_ns, stat.st_size)
+
+
+def _clear_video_dimensions_cache() -> None:
+    """Drop the dimension cache (used by tests)."""
+
+    _get_video_dimensions_cached.cache_clear()
+
+
+# --------------------------------------------------------------------------- #
+# ISO base media (MP4 / MOV)
+# --------------------------------------------------------------------------- #
+
+
+def _iter_boxes(
+    stream: BinaryIO, end: int, depth: int = 0
+) -> Iterator[Tuple[bytes, int, int]]:
+    """Yield ``(type, payload_start, box_end)`` for boxes in ``[tell, end)``.
+
+    The stream is left at the next box boundary after each yielded box.
+    """
+    if depth > _MAX_BOX_DEPTH:
+        return
+
+    while True:
+        start = stream.tell()
+        if start + 8 > end:
+            return
+
+        header = stream.read(8)
+        if len(header) < 8:
+            return
+
+        size, box_type = struct.unpack(">I4s", header)
+        header_size = 8
+
+        if size == 1:
+            # 64-bit ``largesize`` follows the type.
+            extended = stream.read(8)
+            if len(extended) < 8:
+                return
+            size = struct.unpack(">Q", extended)[0]
+            header_size = 16
+        elif size == 0:
+            # Box extends to the end of the enclosing container.
+            size = end - start
+
+        if size < header_size or start + size > end:
+            return
+
+        yield box_type, start + header_size, start + size
+        stream.seek(start + size)
+
+
+def _read_iso_media_dimensions(
+    stream: BinaryIO, file_size: int
+) -> Optional[Tuple[int, int]]:
+    """Walk ``moov`` looking for the video track's dimensions."""
+
+    stream.seek(0)
+    moov: Optional[Tuple[int, int]] = None
+    for box_type, payload_start, box_end in _iter_boxes(stream, file_size):
+        if box_type == b"moov":
+            moov = (payload_start, box_end)
+            break
+
+    if moov is None:
+        return None
+
+    stream.seek(moov[0])
+    for box_type, payload_start, box_end in _iter_boxes(stream, moov[1], depth=1):
+        if box_type != b"trak":
+            continue
+        dimensions = _read_trak_dimensions(stream, payload_start, box_end)
+        if dimensions is not None:
+            return dimensions
+
+    return None
+
+
+def _read_trak_dimensions(
+    stream: BinaryIO, trak_start: int, trak_end: int
+) -> Optional[Tuple[int, int]]:
+    """Return the dimensions of a ``trak`` when it describes a video track."""
+
+    stream.seek(trak_start)
+
+    is_video = False
+    tkhd_dimensions = _WIDTH_HEIGHT_UNSET
+    stsd_dimensions = _WIDTH_HEIGHT_UNSET
+
+    for box_type, payload_start, box_end in _iter_boxes(stream, trak_end, depth=2):
+        if box_type == b"tkhd":
+            tkhd_dimensions = _parse_tkhd(stream, payload_start, box_end)
+        elif box_type == b"mdia":
+            stream.seek(payload_start)
+            media = _read_mdia_dimensions(stream, payload_start, box_end)
+            if media is not None:
+                is_video, stsd_dimensions = media
+
+    if not is_video:
+        return None
+
+    # ``tkhd`` is preferred: it is display space, and its 16.16 fixed point
+    # encoding keeps non-integer dimensions (odd crops produce those).
+    for width, height in (tkhd_dimensions, stsd_dimensions):
+        if width > 0 and height > 0:
+            return int(round(width)), int(round(height))
+    return None
+
+
+def _read_mdia_dimensions(
+    stream: BinaryIO, mdia_start: int, mdia_end: int
+) -> Optional[Tuple[bool, Tuple[float, float]]]:
+    """Return ``(is_video, dimensions)`` for a ``mdia`` box."""
+
+    handler_type = b""
+    stsd_dimensions = _WIDTH_HEIGHT_UNSET
+
+    for box_type, payload_start, box_end in _iter_boxes(stream, mdia_end, depth=3):
+        if box_type == b"hdlr":
+            handler_type = _parse_handler_type(stream, payload_start, box_end)
+        elif box_type == b"minf":
+            stream.seek(payload_start)
+            stsd_dimensions = _read_minf_dimensions(stream, payload_start, box_end)
+
+    return handler_type == b"vide", stsd_dimensions
+
+
+def _read_minf_dimensions(
+    stream: BinaryIO, minf_start: int, minf_end: int
+) -> Tuple[float, float]:
+    """Return the sample-entry dimensions declared under ``minf/stbl/stsd``."""
+
+    for box_type, payload_start, box_end in _iter_boxes(stream, minf_end, depth=4):
+        if box_type != b"stbl":
+            continue
+        stream.seek(payload_start)
+        for inner_type, inner_start, inner_end in _iter_boxes(
+            stream, box_end, depth=5
+        ):
+            if inner_type == b"stsd":
+                return _parse_stsd(stream, inner_start, inner_end)
+    return _WIDTH_HEIGHT_UNSET
+
+
+def _parse_tkhd(
+    stream: BinaryIO, payload_start: int, box_end: int
+) -> Tuple[float, float]:
+    """Parse the 16.16 fixed point width/height trailer of a ``tkhd`` box."""
+
+    size = box_end - payload_start
+    if size < 8 or size > _MAX_HEADER_PAYLOAD:
+        return _WIDTH_HEIGHT_UNSET
+
+    stream.seek(box_end - 8)
+    trailer = stream.read(8)
+    if len(trailer) < 8:
+        return _WIDTH_HEIGHT_UNSET
+
+    width, height = struct.unpack(">II", trailer)
+    return width / 65536.0, height / 65536.0
+
+
+def _parse_handler_type(
+    stream: BinaryIO, payload_start: int, box_end: int
+) -> bytes:
+    """Parse the handler type from an ``hdlr`` box.
+
+    Layout: version/flags (4) + pre_defined (4) + handler_type (4).
+    """
+
+    if box_end - payload_start < 12:
+        return b""
+    stream.seek(payload_start)
+    data = stream.read(12)
+    if len(data) < 12:
+        return b""
+    return data[8:12]
+
+
+def _parse_stsd(
+    stream: BinaryIO, payload_start: int, box_end: int
+) -> Tuple[float, float]:
+    """Parse the visual sample entry dimensions from an ``stsd`` box.
+
+    Only the first entry is inspected: video tracks are single-entry in every
+    container we import from.
+    """
+
+    if box_end - payload_start < 16:
+        return _WIDTH_HEIGHT_UNSET
+
+    stream.seek(payload_start)
+    header = stream.read(8)  # version/flags + entry_count
+    if len(header) < 8:
+        return _WIDTH_HEIGHT_UNSET
+
+    entry_start = payload_start + 8
+    if entry_start + 8 > box_end:
+        return _WIDTH_HEIGHT_UNSET
+
+    stream.seek(entry_start)
+    entry_header = stream.read(8)
+    if len(entry_header) < 8:
+        return _WIDTH_HEIGHT_UNSET
+
+    entry_size = struct.unpack(">I", entry_header[:4])[0]
+    header_size = 8
+
+    if entry_size == 1:
+        extended = stream.read(8)
+        if len(extended) < 8:
+            return _WIDTH_HEIGHT_UNSET
+        entry_size = struct.unpack(">Q", extended)[0]
+        header_size = 16
+    elif entry_size == 0:
+        entry_size = box_end - entry_start
+
+    if entry_size < header_size + 8 or entry_start + entry_size > box_end:
+        return _WIDTH_HEIGHT_UNSET
+
+    # Visual sample entries: 6 bytes reserved + 2 bytes data_reference_index,
+    # then width (2) and height (2).
+    stream.seek(entry_start + header_size + 6 + 2)
+    dimensions = stream.read(4)
+    if len(dimensions) < 4:
+        return _WIDTH_HEIGHT_UNSET
+
+    width, height = struct.unpack(">HH", dimensions)
+    return float(width), float(height)
+
+
+# --------------------------------------------------------------------------- #
+# WebM / Matroska (EBML)
+# --------------------------------------------------------------------------- #
+
+# EBML element IDs (stored with their length marker, as they appear on disk).
+_ID_SEGMENT = 0x18538067
+_ID_TRACKS = 0x1654AE6B
+_ID_TRACK_ENTRY = 0xAE
+_ID_TRACK_TYPE = 0x83
+_ID_VIDEO = 0xE0
+_ID_PIXEL_WIDTH = 0xB0
+_ID_PIXEL_HEIGHT = 0xBA
+
+# Nested containers we descend into while hunting for video dimensions.
+_EBML_CONTAINER_IDS = frozenset({_ID_SEGMENT, _ID_TRACKS, _ID_TRACK_ENTRY})
+
+
+def _read_ebml_vint(stream: BinaryIO, *, keep_marker: bool) -> Optional[Tuple[int, int]]:
+    """Read an EBML variable-length integer.
+
+    Returns ``(value, byte_length)``. For element IDs the marker bit is kept
+    (``keep_marker=True``) because IDs are compared in their on-disk form; for
+    sizes the marker is stripped to yield the actual payload length.
+    """
+
+    first = stream.read(1)
+    if not first:
+        return None
+
+    first_byte = first[0]
+    if first_byte == 0:
+        return None
+
+    length = 1
+    mask = 0x80
+    while not first_byte & mask:
+        mask >>= 1
+        length += 1
+        if length > 8:
+            return None
+
+    value = first_byte if keep_marker else first_byte & (mask - 1)
+    remaining = length - 1
+
+    if remaining:
+        extra = stream.read(remaining)
+        if len(extra) < remaining:
+            return None
+        for byte in extra:
+            value = (value << 8) | byte
+
+    return value, length
+
+
+def _read_ebml_dimensions(
+    stream: BinaryIO, file_size: int
+) -> Optional[Tuple[int, int]]:
+    """Parse ``Segment/Tracks`` for the first video ``TrackEntry``."""
+
+    stream.seek(0)
+    header = stream.read(4)
+    if header != _EBML_MAGIC:
+        return None
+
+    return _walk_ebml(stream, 0, file_size, depth=0)
+
+
+def _walk_ebml(
+    stream: BinaryIO, start: int, end: int, *, depth: int
+) -> Optional[Tuple[int, int]]:
+    """Recursively scan EBML elements in ``[start, end)`` for video dimensions."""
+
+    if depth > _MAX_EBML_DEPTH:
+        return None
+
+    stream.seek(start)
+
+    while stream.tell() < end:
+        element_start = stream.tell()
+
+        element_id = _read_ebml_vint(stream, keep_marker=True)
+        if element_id is None:
+            return None
+        element_id_value = element_id[0]
+
+        size_field = _read_ebml_vint(stream, keep_marker=False)
+        if size_field is None:
+            return None
+        payload_size, size_length = size_field
+
+        payload_start = element_start + element_id[1] + size_length
+
+        # A size field of all-ones marks an unknown-size element, which is
+        # legal for Segment/Tracks; treat it as "until the parent ends".
+        unknown_size = payload_size == (1 << (7 * size_length)) - 1
+        payload_end = end if unknown_size else payload_start + payload_size
+
+        if payload_end > end:
+            return None
+
+        if element_id_value == _ID_VIDEO:
+            dimensions = _read_ebml_video(stream, payload_start, min(payload_end, end))
+            if dimensions is not None:
+                return dimensions
+        elif element_id_value == _ID_TRACK_ENTRY:
+            track = _read_ebml_track_entry(
+                stream, payload_start, min(payload_end, end)
+            )
+            if track is not None:
+                return track
+        elif element_id_value in _EBML_CONTAINER_IDS:
+            found = _walk_ebml(
+                stream, payload_start, min(payload_end, end), depth=depth + 1
+            )
+            if found is not None:
+                return found
+
+        if unknown_size:
+            # Cannot resume after an unknown-size element; its siblings cannot
+            # be located reliably, so stop scanning this level.
+            return None
+
+        stream.seek(payload_end)
+
+    return None
+
+
+def _read_ebml_track_entry(
+    stream: BinaryIO, start: int, end: int
+) -> Optional[Tuple[int, int]]:
+    """Return dimensions when a ``TrackEntry`` is a video track."""
+
+    track_type: Optional[int] = None
+    dimensions: Optional[Tuple[int, int]] = None
+
+    stream.seek(start)
+    while stream.tell() < end:
+        element_start = stream.tell()
+
+        element_id = _read_ebml_vint(stream, keep_marker=True)
+        if element_id is None:
+            return None
+
+        size_field = _read_ebml_vint(stream, keep_marker=False)
+        if size_field is None:
+            return None
+        payload_size, size_length = size_field
+
+        payload_start = element_start + element_id[1] + size_length
+        payload_end = min(payload_start + payload_size, end)
+
+        if element_id[0] == _ID_TRACK_TYPE:
+            track_type = _read_ebml_uint(stream, payload_start, payload_end)
+        elif element_id[0] == _ID_VIDEO:
+            dimensions = _read_ebml_video(stream, payload_start, payload_end)
+
+        stream.seek(payload_end)
+
+    # Track type 1 is video.
+    if track_type == 1 and dimensions is not None:
+        return dimensions
+    return None
+
+
+def _read_ebml_video(
+    stream: BinaryIO, start: int, end: int
+) -> Optional[Tuple[int, int]]:
+    """Return ``PixelWidth``/``PixelHeight`` from a ``Video`` element."""
+
+    width: Optional[int] = None
+    height: Optional[int] = None
+
+    stream.seek(start)
+    while stream.tell() < end:
+        element_start = stream.tell()
+
+        element_id = _read_ebml_vint(stream, keep_marker=True)
+        if element_id is None:
+            return None
+
+        size_field = _read_ebml_vint(stream, keep_marker=False)
+        if size_field is None:
+            return None
+        payload_size, size_length = size_field
+
+        payload_start = element_start + element_id[1] + size_length
+        payload_end = min(payload_start + payload_size, end)
+
+        if element_id[0] == _ID_PIXEL_WIDTH:
+            width = _read_ebml_uint(stream, payload_start, payload_end)
+        elif element_id[0] == _ID_PIXEL_HEIGHT:
+            height = _read_ebml_uint(stream, payload_start, payload_end)
+
+        stream.seek(payload_end)
+
+    if width and height and width > 0 and height > 0:
+        return width, height
+    return None
+
+
+def _read_ebml_uint(stream: BinaryIO, start: int, end: int) -> Optional[int]:
+    """Read an unsigned big-endian integer element payload."""
+
+    length = end - start
+    if length <= 0 or length > 8:
+        return None
+
+    stream.seek(start)
+    raw = stream.read(length)
+    if len(raw) < length:
+        return None
+
+    value = 0
+    for byte in raw:
+        value = (value << 8) | byte
+    return value
+
+
+# --------------------------------------------------------------------------- #
+# RIFF / WebP (animated examples are often renamed to ``.mp4``)
+# --------------------------------------------------------------------------- #
+
+
+def _read_riff_webp_dimensions(
+    stream: BinaryIO, file_size: int
+) -> Optional[Tuple[int, int]]:
+    """Return dimensions from a WebP file's first dimension-bearing chunk."""
+
+    stream.seek(12)
+
+    while stream.tell() + 8 <= file_size:
+        header = stream.read(8)
+        if len(header) < 8:
+            return None
+
+        fourcc, chunk_size = struct.unpack("<4sI", header)
+        payload_start = stream.tell()
+
+        if fourcc == b"VP8X":
+            payload = stream.read(10)
+            if len(payload) < 10:
+                return None
+            # Canvas size is stored minus one, as 24-bit little endian values.
+            width = int.from_bytes(payload[4:7], "little") + 1
+            height = int.from_bytes(payload[7:10], "little") + 1
+            return width, height
+
+        if fourcc == b"VP8 ":
+            # Frame tag (3 bytes, bit 0 = key frame) then the key frame start
+            # code 0x9d 0x01 0x2a and the 16-bit dimensions.
+            payload = stream.read(10)
+            if len(payload) < 10:
+                return None
+            start = payload.find(b"\x9d\x01\x2a")
+            if start < 0 or start + 7 > len(payload):
+                return None
+            width, height = struct.unpack("<HH", payload[start + 3 : start + 7])
+            return width & 0x3FFF, height & 0x3FFF
+
+        if fourcc == b"VP8L":
+            payload = stream.read(5)
+            if len(payload) < 5 or payload[0] != 0x2F:
+                return None
+            bits = int.from_bytes(payload[1:5], "little")
+            return (bits & 0x3FFF) + 1, ((bits >> 14) & 0x3FFF) + 1
+
+        # Skip this chunk (payloads are padded to an even byte boundary).
+        stream.seek(payload_start + chunk_size + (chunk_size & 1))
+
+    return None
@@ -1,7 +1,7 @@
 [project]
 name = "comfyui-lora-manager"
 description = "Revolutionize your workflow with the ultimate LoRA companion for ComfyUI!"
-version = "1.2.2"
+version = "1.2.3"
 license = {file = "LICENSE"}
 dependencies = [
    "aiohttp",
@@ -225,10 +225,9 @@ def main() -> int:

    args = parser.parse_args()

-    # Get project root (parent of .agents directory)
+    # Get project root: this script lives in <project_root>/scripts/e2e/.
    script_dir = os.path.dirname(os.path.abspath(__file__))
-    skill_dir = os.path.dirname(script_dir)
-    project_root = os.path.dirname(os.path.dirname(os.path.dirname(skill_dir)))
+    project_root = os.path.dirname(os.path.dirname(script_dir))

    managed_pids = read_managed_pids(args.port)

@@ -118,6 +118,44 @@
    transform: translateY(-1px);
 }

+/* Banner Pager (cycles through multiple active banners) */
+.banner-pager {
+    display: flex;
+    align-items: center;
+    gap: 2px;
+    flex-shrink: 0;
+    margin-left: var(--space-2);
+}
+
+.banner-pager-btn {
+    width: 24px;
+    height: 24px;
+    border: none;
+    background: transparent;
+    color: var(--text-muted);
+    cursor: pointer;
+    border-radius: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    transition: var(--transition-base);
+    font-size: 0.75em;
+    padding: 0;
+}
+
+.banner-pager-btn:hover {
+    background: oklch(var(--lora-accent) / 0.1);
+    color: var(--lora-accent);
+}
+
+.banner-pager-indicator {
+    font-size: 0.8em;
+    color: var(--text-muted);
+    min-width: 2.8em;
+    text-align: center;
+    font-variant-numeric: tabular-nums;
+}
+
 /* Dismiss Button */
 .banner-dismiss {
    position: absolute;
@@ -183,6 +221,10 @@
        flex-wrap: wrap;
        justify-content: flex-start;
    }
+
+    .banner-pager {
+        margin-left: 0;
+    }
    
    .banner-action {
        flex: 1;
@@ -31,6 +31,10 @@
 /* Textarea Styling */
 #batchUrlInput {
    width: 100%;
+    /* Content-box sizing made the border box wider than the modal's content
+       box, so the right border/halo fell outside the clipped area and was cut
+       off. Include padding and border in the declared width. */
+    box-sizing: border-box;
    min-height: 120px;
    padding: 12px;
    border: 1px solid var(--border-color);
@@ -97,6 +97,32 @@
    width: 0%;
 }

+/* The transfer is done but the backend is still indexing the file and reading
+   the model site's API. A sheen over the full bar reads as "busy" where a
+   motionless 100% bar reads as "stuck". */
+.current-item-bar.is-indeterminate {
+    position: relative;
+    overflow: hidden;
+}
+
+.current-item-bar.is-indeterminate::after {
+    content: '';
+    position: absolute;
+    inset: 0;
+    background: linear-gradient(
+        90deg,
+        transparent 0%,
+        rgba(255, 255, 255, 0.5) 50%,
+        transparent 100%
+    );
+    animation: progress-sheen 1.2s ease-in-out infinite;
+}
+
+@keyframes progress-sheen {
+    from { transform: translateX(-100%); }
+    to { transform: translateX(100%); }
+}
+
 .current-item-percent {
    font-size: 0.8rem;
    color: var(--text-color-secondary, var(--text-color));
@@ -131,4 +157,8 @@
    .current-item-bar {
        transition: none;
    }
+
+    .current-item-bar.is-indeterminate::after {
+        animation: none;
+    }
 }
@@ -46,8 +46,20 @@
    pointer-events: none;
 }

+/* Destructive entries. The token used to be the nonexistent `--danger-color`,
+   which made the declaration invalid at computed-value time: the colour then
+   fell back to the menu's inherited text colour, so every "Delete …" entry in
+   the folder and model-card context menus rendered plain. */
 .context-menu-item.delete-item {
-    color: var(--danger-color);
+    color: var(--lora-error);
+}
+
+/* The shared .context-menu-item:hover paints the accent background, which the
+   red label does not read against — destructive entries get their own wash. */
+.context-menu-item.delete-item:hover,
+.context-menu-item.delete-item:focus-visible {
+    background-color: var(--lora-error-bg);
+    color: var(--lora-error);
 }

 .context-menu-item i {
@@ -55,6 +67,21 @@
    text-align: center;
 }

+/* Muted counter shown next to a menu label (e.g. how many empty folders the
+   "Show empty folders" toggle would reveal) */
+.context-menu-count {
+    color: var(--text-muted);
+    font-size: 12px;
+}
+
+/* The count keeps the label/tally muted even while the row is hovered, since
+   the accent background would otherwise wash the muted colour out. */
+.context-menu-item:hover .context-menu-count,
+.context-menu-item:focus-visible .context-menu-count {
+    color: var(--lora-text);
+    opacity: 0.8;
+}
+
 /* Section Headers */
 .context-menu-section-header {
    padding: 6px 12px 2px;
@@ -27,6 +27,12 @@
    justify-content: center;
 }

+/* Self-managed by SettingsManager: stacks above the settings modal like the
+   directory picker (settings panels sit at 10000/10002). */
+#filenameTemplateConfirmModal {
+    z-index: 10010;
+}
+
 .delete-modal-content {
    max-width: 500px;
    width: 90%;
@@ -0,0 +1,179 @@
+/* Directory Picker Modal */
+/* Stacks above the settings modal: settings tooltips/combobox panels sit at
+   10000/10002, so 10010 keeps the picker on top of everything settings-side. */
+#directoryPickerModal {
+    z-index: 10010;
+}
+
+.directory-picker-content {
+    max-width: 560px;
+    display: flex;
+    flex-direction: column;
+}
+
+.directory-picker-content h3 {
+    color: var(--text-color);
+    margin-bottom: var(--space-2);
+}
+
+/* Manual path row */
+#directoryPickerModal .directory-picker-path-row {
+    display: flex;
+    gap: 8px;
+    margin-bottom: var(--space-2);
+}
+
+#directoryPickerModal .directory-picker-path-row input {
+    flex: 1;
+    min-width: 0;
+    padding: 8px 12px;
+    border: 1px solid var(--border-color);
+    border-radius: var(--border-radius-xs);
+    background: var(--bg-color);
+    color: var(--text-color);
+    font-family: inherit;
+    font-size: 0.9em;
+}
+
+#directoryPickerModal .directory-picker-path-row input:focus {
+    outline: none;
+    border-color: var(--lora-accent);
+    box-shadow: 0 0 0 2px oklch(from var(--lora-accent) l c h / 0.2);
+}
+
+/* Directory browser (class names shared with the batch import browser) */
+#directoryPickerModal .directory-browser {
+    border: 1px solid var(--border-color);
+    border-radius: var(--border-radius-xs);
+    background: var(--lora-surface);
+    overflow: hidden;
+}
+
+#directoryPickerModal .browser-header {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    padding: 10px 12px;
+    background: var(--bg-color);
+    border-bottom: 1px solid var(--border-color);
+}
+
+#directoryPickerModal .back-btn {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 32px;
+    height: 32px;
+    border: 1px solid var(--border-color);
+    border-radius: var(--border-radius-xs);
+    background: var(--card-bg);
+    color: var(--text-color);
+    cursor: pointer;
+    transition: var(--transition-base);
+}
+
+#directoryPickerModal .back-btn:hover {
+    border-color: var(--lora-accent);
+    background: var(--bg-color);
+}
+
+#directoryPickerModal .back-btn:disabled {
+    opacity: 0.5;
+    cursor: not-allowed;
+}
+
+#directoryPickerModal .current-path {
+    flex: 1;
+    padding: 6px 10px;
+    background: var(--card-bg);
+    border: 1px solid var(--border-color);
+    border-radius: var(--border-radius-xs);
+    font-size: 0.9em;
+    color: var(--text-color);
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+#directoryPickerModal .browser-content {
+    max-height: 300px;
+    overflow-y: auto;
+    padding: 12px;
+}
+
+#directoryPickerModal .folder-list {
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+}
+
+#directoryPickerModal .folder-item {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    padding: 8px 10px;
+    border-radius: var(--border-radius-xs);
+    cursor: pointer;
+    transition: var(--transition-base);
+    border: 1px solid transparent;
+}
+
+#directoryPickerModal .folder-item:hover {
+    background: var(--lora-surface-hover, oklch(from var(--lora-accent) l c h / 0.1));
+    border-color: var(--lora-accent);
+}
+
+#directoryPickerModal .folder-item i {
+    color: #fbbf24;
+    font-size: 1.1em;
+}
+
+#directoryPickerModal .item-name {
+    flex: 1;
+    font-size: 0.9em;
+    color: var(--text-color);
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+#directoryPickerModal .browser-footer {
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+    padding: 10px 12px;
+    background: var(--bg-color);
+    border-top: 1px solid var(--border-color);
+}
+
+#directoryPickerModal .directory-picker-error {
+    margin-top: 8px;
+    padding: 8px 10px;
+    border-radius: var(--border-radius-xs);
+    background: oklch(from var(--lora-error) l c h / 0.12);
+    color: var(--lora-error);
+    font-size: 0.85em;
+    word-break: break-word;
+}
+
+#directoryPickerModal .directory-picker-empty {
+    padding: var(--space-2);
+    text-align: center;
+    color: var(--text-color);
+    opacity: 0.6;
+    font-size: 0.9em;
+}
+
+/* Dark theme adjustments */
+[data-theme="dark"] #directoryPickerModal .directory-browser {
+    background: var(--card-bg);
+}
+
+[data-theme="dark"] #directoryPickerModal .browser-header,
+[data-theme="dark"] #directoryPickerModal .browser-footer {
+    background: var(--lora-surface);
+}
+
+[data-theme="dark"] #directoryPickerModal .folder-item i {
+    color: #fcd34d;
+}
@@ -12,6 +12,10 @@
 .input-group input,
 .input-group select {
    width: 100%;
+    /* Include padding/border in the declared width so full-width fields do not
+       spill past the modal's content box, where their right border gets
+       clipped by the step's overflow-x: hidden. */
+    box-sizing: border-box;
    padding: 8px;
    border: 1px solid var(--border-color);
    border-radius: var(--border-radius-xs);
@@ -720,6 +724,9 @@
 /* Textarea for multi-URL input */
 #modelUrl {
    width: 100%;
+    /* Content-box sizing pushed the border box 2px past the step's content
+       edge, clipping the right border. Include padding/border in the width. */
+    box-sizing: border-box;
    padding: 8px;
    border: 1px solid var(--border-color);
    border-radius: var(--border-radius-xs);
@@ -750,6 +757,42 @@
 #downloadModal .modal-content {
    display: flex;
    flex-direction: column;
+    overflow: hidden; /* The active step scrolls instead of the whole modal */
+}
+
+/* Sticky footer layout (mirrors the import modal fix): fixed header,
+   scrollable step content, pinned action buttons. Ensures Back/Download
+   buttons stay visible on short viewports (e.g. 1080p or 150% zoom). */
+#downloadModal .modal-header {
+    flex-shrink: 0;
+}
+
+#downloadModal .download-step {
+    flex: 1 1 auto;
+    min-height: 0; /* Allow the step to shrink and scroll within the flex container */
+    overflow-y: auto;
+    overflow-x: hidden;
+    scrollbar-gutter: stable;
+}
+
+/* Fields sit flush against the scrollable step's content edge; the global
+   focus outline (offset: 2px) has its left/right edges clipped by the step's
+   overflow-x. Draw the ring inset so the full outline stays visible.
+   (Same fix as #importModal in import-modal.css.) */
+#downloadModal input:focus-visible,
+#downloadModal select:focus-visible,
+#downloadModal textarea:focus-visible {
+    outline-offset: -2px;
+}
+
+#downloadModal .download-step .modal-actions {
+    position: sticky;
+    bottom: 0;
+    z-index: 1;
+    background: var(--lora-surface);
+    border-top: 1px solid var(--lora-border);
+    padding-top: var(--space-2);
+    padding-bottom: var(--space-1);
 }

 #batchPreviewStep {
@@ -747,13 +747,13 @@
 }

 .priority-tags-input.settings-input-error {
-    border-color: var(--danger-color, #dc2626);
-    box-shadow: 0 0 0 2px rgba(220, 38, 38, 0.12);
+    border-color: var(--lora-error);
+    box-shadow: 0 0 0 2px rgba(from var(--lora-error) r g b / 0.12);
 }

 .settings-input-error-message {
    font-size: 0.8em;
-    color: var(--danger-color, #dc2626);
+    color: var(--lora-error);
    display: none;
 }

@@ -1692,6 +1692,87 @@ input:checked + .toggle-slider:before {
    color: white;
 }

+/* Browse (directory picker) button — boxed accent style used on the dynamic
+   extra-folder-path / model-path rows, mirroring .remove-path-btn. Static
+   path fields use the .inset variant below instead. */
+#settingsModal .browse-path-btn {
+    width: 32px;
+    height: 32px;
+    padding: 0;
+    border-radius: var(--border-radius-xs);
+    border: 1px solid var(--lora-accent);
+    background: transparent;
+    color: var(--lora-accent);
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    transition: var(--transition-base);
+    flex-shrink: 0;
+}
+
+#settingsModal .browse-path-btn:hover {
+    background: var(--lora-accent);
+    color: white;
+}
+
+/* Inset variant (static path fields): the button floats inside the right
+   edge of the input, so the setting row keeps its single-control look and
+   narrow columns never push it onto a second line. */
+#settingsModal .browse-path-btn.inset {
+    position: absolute;
+    right: 6px;
+    top: 50%;
+    transform: translateY(-50%);
+    width: 24px;
+    height: 24px;
+    border: none;
+    background: transparent;
+    color: var(--text-color);
+    opacity: 0.55;
+}
+
+#settingsModal .browse-path-btn.inset:hover {
+    background: transparent;
+    color: var(--lora-accent);
+    opacity: 1;
+}
+
+#settingsModal input.has-inset-browse {
+    padding-right: 34px;
+}
+
+/* Advisory path validation feedback (wraps below the input row) */
+#settingsModal .text-input-wrapper,
+#settingsModal .path-control {
+    flex-wrap: wrap;
+}
+
+#settingsModal .path-control > .text-input-wrapper {
+    flex: 1;
+    min-width: 0;
+}
+
+.path-validation {
+    display: none;
+    flex-basis: 100%;
+    width: 100%;
+    margin-top: 4px;
+    font-size: 0.8em;
+    line-height: 1.4;
+    color: var(--lora-error);
+}
+
+.path-validation.visible {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+}
+
+.path-validation.valid {
+    color: var(--lora-success);
+}
+
 /* Highlight animation for setting items targeted from Doctor actions */
@keyframes settings-highlight-pulse {
    0%, 100% { box-shadow: 0 0 0 0 rgba(from var(--lora-accent) r g b / 0.4); }
@@ -1780,3 +1861,38 @@ input:checked + .toggle-slider:before {
    opacity: 0.5;
    cursor: not-allowed;
 }
+
+/* Standalone Model Paths: pending-restart cues */
+.settings-nav-item.has-pending-restart {
+    position: relative;
+}
+
+.settings-nav-item.has-pending-restart::after {
+    content: '';
+    position: absolute;
+    right: 10px;
+    top: 50%;
+    transform: translateY(-50%);
+    width: 8px;
+    height: 8px;
+    border-radius: 50%;
+    background: var(--lora-warning, #e67e22);
+}
+
+.model-paths-restart-notice {
+    display: none;
+    margin-top: 8px;
+    padding: 10px 14px;
+    border-radius: var(--border-radius-xs);
+    border: 1px solid var(--lora-warning, #e67e22);
+    background: rgba(230, 126, 34, 0.08);
+    color: var(--lora-warning, #e67e22);
+    font-size: 0.85em;
+    line-height: 1.4;
+    align-items: center;
+    gap: 8px;
+}
+
+.model-paths-restart-notice.visible {
+    display: flex;
+}
@@ -28,6 +28,38 @@
    width: 100%;
 }

+/* Tags row: the base model badge shares one line with the compact tags. */
+.recipe-tags-row {
+    display: flex;
+    align-items: center;
+    gap: var(--space-2);
+    width: 100%;
+}
+
+.recipe-tags-row #recipeTagsContainer {
+    flex: 1;
+    min-width: 0;
+}
+
+/* Header base model badge: reuses the card .base-model-label pill shape but
+   swaps the on-image overlay styling (text shadow, backdrop blur) for the
+   accent-tinted chip look used by resource rows in this modal. */
+.recipe-base-model-badge {
+    flex-shrink: 0;
+    max-width: 160px;
+    text-shadow: none;
+    backdrop-filter: none;
+    background: oklch(var(--lora-accent) / 0.1);
+    color: var(--lora-accent);
+    padding: 2px 8px;
+}
+
+.recipe-base-model-badge.is-unknown {
+    background: var(--surface-subtle);
+    color: var(--text-color);
+    opacity: 0.6;
+}
+
 .recipe-modal-header h2 {
    margin: 0 0 var(--space-1);
    padding: var(--space-1);
@@ -92,38 +92,104 @@
  border-radius: var(--border-radius-xs);
  padding: 4px 8px;
  position: relative;
-  cursor: grab;
  transition: transform 0.18s ease;
 }

-.metadata-item:active {
+/* --- Shared chip reordering (tags + trigger words) ------------------------ */
+/* Chips in a list that is actually sortable advertise the grab gesture only
+   then, so lists that cannot be reordered never lie about it. */
+
+.metadata-items.pointer-sort-enabled .metadata-item {
+  cursor: grab;
+}
+
+.metadata-items.pointer-sort-enabled .metadata-item:active {
  cursor: grabbing;
 }

-.metadata-item-dragging {
+/* Grip handle: always in the DOM, revealed when the list is sortable */
+.reorder-handle {
+  display: none;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
+  padding: 0;
+  margin-left: -2px;
+  border: none;
+  background: transparent;
+  color: var(--text-color);
+  opacity: 0.4;
+  font-size: 0.8em;
+  line-height: 1;
+  cursor: grab;
+  /* Keep a touch drag on the handle from scrolling the surrounding panel */
+  touch-action: none;
+  user-select: none;
+  transition: opacity 0.2s ease, color 0.2s ease;
+}
+
+.has-sortable-words .reorder-handle {
+  display: inline-flex;
+}
+
+/* Tag chips have no flex gap (unlike trigger word tags), so the grip needs its
+   own spacing before the tag text */
+.metadata-item .reorder-handle {
+  margin-right: 4px;
+}
+
+.reorder-handle:hover {
+  opacity: 0.9;
+  color: var(--lora-accent);
+}
+
+.reorder-handle:active {
+  cursor: grabbing;
+}
+
+/* Hint shown in the edit controls row while reordering is available */
+.reorder-hint {
+  display: none;
+  align-items: center;
+  gap: 4px;
+  margin-right: auto;
+  font-size: 0.75em;
+  color: var(--text-color);
+  opacity: 0.6;
+  white-space: nowrap;
+}
+
+.has-sortable-words .reorder-hint {
+  display: inline-flex;
+}
+
+/* Snapped-to-grid transition for the remaining chips while dragging */
+.reorder-sorting > * {
+  transition: transform 0.18s ease;
+}
+
+/* The lifted chip that follows the pointer */
+.reorder-dragging {
  box-shadow: var(--shadow-dialog);
  cursor: grabbing;
  opacity: 0.95;
  transition: none;
 }

-.metadata-item-placeholder {
+/* Drop target left behind by the lifted chip */
+.reorder-placeholder {
  border: 1px dashed var(--lora-accent);
  border-radius: var(--border-radius-xs);
  background: rgba(255, 255, 255, 0.1);
  pointer-events: none;
 }

-.metadata-items-sorting .metadata-item {
-  transition: transform 0.18s ease;
-}
-
-body.metadata-drag-active {
+body.reorder-drag-active {
  user-select: none;
  cursor: grabbing;
 }

-body.metadata-drag-active * {
+body.reorder-drag-active * {
  cursor: grabbing !important;
 }

@@ -228,6 +228,18 @@
    border-left-color: var(--lora-accent);
 }

+/* Empty folders (no models) shown when the empty-folders toggle is on */
+.sidebar-tree-node-content.empty .sidebar-tree-folder-name,
+.sidebar-node-content.empty .sidebar-folder-name {
+    opacity: 0.55;
+    font-style: italic;
+}
+
+.sidebar-tree-node-content.empty .sidebar-tree-folder-icon,
+.sidebar-node-content.empty .sidebar-folder-icon {
+    opacity: 0.45;
+}
+
 .sidebar-tree-node-content.drop-target .sidebar-tree-folder-icon,
 .sidebar-node-content.drop-target .sidebar-folder-icon {
    color: var(--lora-accent);
@@ -627,88 +639,40 @@
    display: inline;
 }

-/* Create folder drop zone */
-.sidebar-create-folder-zone {
-    position: absolute;
-    bottom: 16px;
-    left: 16px;
-    right: 16px;
-    padding: 16px;
-    border: 2px dashed oklch(var(--lora-accent-l) var(--lora-accent-c) var(--lora-accent-h) / 0.4);
-    border-radius: var(--border-radius-xs);
-    background: oklch(var(--lora-accent-l) var(--lora-accent-c) var(--lora-accent-h) / 0.08);
+/* Create folder inline row: rendered inside the tree at the creation
+   location, styled like a regular node row with a full-width input */
+.sidebar-create-folder-row {
+    padding-top: 4px;
+    padding-bottom: 4px;
+    cursor: default;
+}
+
+.sidebar-tree-node-content.sidebar-create-folder-row:hover,
+.sidebar-node-content.sidebar-create-folder-row:hover {
+    background: transparent;
+    color: var(--text-color);
+}
+
+.sidebar-create-folder-spacer {
    opacity: 0;
-    transform: translateY(10px);
-    transition: var(--transition-base);
    pointer-events: none;
-    z-index: 10;
 }

-.sidebar-create-folder-zone.active {
-    opacity: 1;
-    transform: translateY(0);
-}
-
-.sidebar-create-folder-content {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    gap: 8px;
+.sidebar-create-folder-row .sidebar-tree-folder-icon,
+.sidebar-create-folder-row .sidebar-folder-icon {
    color: var(--lora-accent);
-    font-size: 0.85em;
-    text-align: center;
-}
-
-.sidebar-create-folder-content i {
-    font-size: 1.5em;
-    opacity: 0.8;
-}
-
-/* Create folder input container */
-.sidebar-create-folder-input-container {
-    position: absolute;
-    bottom: 16px;
-    left: 16px;
-    right: 16px;
-    padding: 12px;
-    background: var(--bg-color);
-    border: 1px solid var(--border-color);
-    border-radius: var(--border-radius-xs);
-    box-shadow: var(--shadow-lg);
-    z-index: 20;
-    animation: slideUp 0.2s ease;
-}
-
-@keyframes slideUp {
-    from {
-        opacity: 0;
-        transform: translateY(10px);
-    }
-    to {
-        opacity: 1;
-        transform: translateY(0);
-    }
-}
-
-.sidebar-create-folder-input-wrapper {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-}
-
-.sidebar-create-folder-input-wrapper > i {
-    color: var(--lora-accent);
-    font-size: 1em;
+    opacity: 0.9;
 }

 .sidebar-create-folder-input {
    flex: 1;
-    padding: 6px 10px;
+    min-width: 0; /* allow the input to shrink below its intrinsic width */
+    padding: 4px 8px;
    border: 1px solid var(--border-color);
    border-radius: var(--border-radius-xs);
    background: var(--bg-color);
    color: var(--text-color);
-    font-size: 0.85em;
+    font-size: 1em;
    outline: none;
    transition: var(--transition-base);
 }
@@ -718,49 +682,6 @@
    box-shadow: 0 0 0 2px oklch(var(--lora-accent-l) var(--lora-accent-c) var(--lora-accent-h) / 0.15);
 }

-.sidebar-create-folder-btn {
-    width: 28px;
-    height: 28px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    border: none;
-    border-radius: var(--border-radius-xs);
-    cursor: pointer;
-    transition: var(--transition-base);
-    background: transparent;
-    color: var(--text-muted);
-}
-
-.sidebar-create-folder-btn:hover,
-.sidebar-create-folder-btn:focus-visible {
-    background: var(--lora-surface);
-    color: var(--text-color);
-    outline: none;
-}
-
-.sidebar-create-folder-confirm:hover,
-.sidebar-create-folder-confirm:focus-visible {
-    background: oklch(from var(--success-color) l c h / 0.15);
-    color: var(--success-color);
-    outline: none;
-}
-
-.sidebar-create-folder-cancel:hover,
-.sidebar-create-folder-cancel:focus-visible {
-    background: oklch(from var(--error-color) l c h / 0.15);
-    color: var(--error-color);
-    outline: none;
-}
-
-.sidebar-create-folder-hint {
-    margin-top: 6px;
-    font-size: 0.75em;
-    color: var(--text-muted);
-    text-align: center;
-    opacity: 0.8;
-}
-
 /* Dragging state for sidebar */
 .folder-sidebar.dragging-active {
    border-color: oklch(var(--lora-accent-l) var(--lora-accent-c) var(--lora-accent-h) / 0.5);
@@ -772,11 +693,6 @@
    background: oklch(var(--lora-accent-l) var(--lora-accent-c) var(--lora-accent-h) / 0.02);
 }

-/* Tree container positioning for create folder elements */
-.sidebar-tree-container {
-    position: relative;
-}
-
 /* Folder context menu - positioned relative to sidebar */
 #sidebarFolderContextMenu {
    z-index: var(--z-modal, 1002);
@@ -18,6 +18,7 @@
@import 'components/modal/example-access-modal.css';
@import 'components/modal/support-modal.css';
@import 'components/modal/download-modal.css';
+@import 'components/modal/directory-picker-modal.css';
@import 'components/toast.css';
@import 'components/loading.css';
@import 'components/menu.css';
@@ -22,6 +22,7 @@ export const MODEL_CONFIG = {
        supportsLetterFilter: true,
        supportsBulkOperations: true,
        supportsMove: true,
+        supportsFolderManagement: true,
        templateName: 'loras.html'
    },
    [MODEL_TYPES.CHECKPOINT]: {
@@ -31,6 +32,7 @@ export const MODEL_CONFIG = {
        supportsLetterFilter: false,
        supportsBulkOperations: true,
        supportsMove: true,
+        supportsFolderManagement: true,
        templateName: 'checkpoints.html'
    },
    [MODEL_TYPES.EMBEDDING]: {
@@ -40,6 +42,7 @@ export const MODEL_CONFIG = {
        supportsLetterFilter: true,
        supportsBulkOperations: true,
        supportsMove: true,
+        supportsFolderManagement: true,
        templateName: 'embeddings.html'
    },
    [MODEL_TYPES.OTHER]: {
@@ -49,6 +52,7 @@ export const MODEL_CONFIG = {
        supportsLetterFilter: false,
        supportsBulkOperations: true,
        supportsMove: true,
+        supportsFolderManagement: true,
        templateName: 'other.html'
    }
 };
@@ -79,6 +83,9 @@ export function getApiEndpoints(modelType) {
        // Move operations (now common for all model types that support move)
        moveModel: `/api/lm/${modelType}/move_model`,
        moveBulk: `/api/lm/${modelType}/move_models_bulk`,
+        createFolder: `/api/lm/${modelType}/create-folder`,
+        deleteFolder: `/api/lm/${modelType}/delete-folder`,
+        renameFolder: `/api/lm/${modelType}/rename-folder`,

        // CivitAI integration
        fetchCivitai: `/api/lm/${modelType}/fetch-civitai`,
@@ -115,6 +122,9 @@ export function getApiEndpoints(modelType) {
        autoOrganize: `/api/lm/${modelType}/auto-organize`,
        autoOrganizeProgress: `/api/lm/${modelType}/auto-organize-progress`,

+        // Filename template operations
+        applyFilenameTemplate: `/api/lm/${modelType}/apply-filename-template`,
+
        // Model-specific endpoints (will be merged with specific configs)
        specific: {}
    };
@@ -203,10 +213,18 @@ export const DOWNLOAD_ENDPOINTS = {
    exampleImagesMissing: '/api/lm/download-example-images' // Download only missing example images
 };

-// Hugging Face API endpoints
+// External model source endpoints (Hugging Face / ModelScope).
+// The hf-* paths are the historical names, kept as server-side aliases.
+export const MODEL_SOURCE_ENDPOINTS = {
+    repoFiles: '/api/lm/model-source-files',
+    download: '/api/lm/download-model-source',
+    sources: '/api/lm/model-sources',
+};
+
+/** @deprecated use MODEL_SOURCE_ENDPOINTS */
 export const HF_ENDPOINTS = {
-    repoFiles: '/api/lm/hf-repo-files',
-    download: '/api/lm/download-hf-model',
+    repoFiles: MODEL_SOURCE_ENDPOINTS.repoFiles,
+    download: MODEL_SOURCE_ENDPOINTS.download,
 };

 // WebSocket endpoints
@@ -8,6 +8,7 @@ import {
    isValidModelType,
    DOWNLOAD_ENDPOINTS,
    HF_ENDPOINTS,
+    MODEL_SOURCE_ENDPOINTS,
    WS_ENDPOINTS
 } from './apiConfig.js';
 import { resetAndReload } from './modelApiFactory.js';
@@ -1294,9 +1295,13 @@ export class BaseModelApiClient {
        }
    }

-    async fetchModelFolders() {
+    async fetchModelFolders(options = {}) {
        try {
-            const response = await fetch(this.apiConfig.endpoints.folders);
+            const { includeEmpty = false } = options || {};
+            const url = includeEmpty
+                ? `${this.apiConfig.endpoints.folders}?include_empty=1`
+                : this.apiConfig.endpoints.folders;
+            const response = await fetch(url);
            if (!response.ok) {
                throw new Error(`Failed to fetch ${this.apiConfig.config.displayName} folders`);
            }
@@ -1307,6 +1312,89 @@ export class BaseModelApiClient {
        }
    }

+    async createFolder(folderPath) {
+        const response = await fetch(this.apiConfig.endpoints.createFolder, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({ folder_path: folderPath })
+        });
+
+        const result = await response.json().catch(() => ({}));
+
+        if (!response.ok || result.success === false) {
+            throw new Error(result.error || `Failed to create folder`);
+        }
+
+        return result;
+    }
+
+    /**
+     * Delete a model-free folder inside the library roots.
+     *
+     * Only model-free folders can be removed; the backend answers with a 409
+     * `not_empty`/`busy` conflict otherwise. Those codes are attached to the
+     * thrown Error (`code`, `manifest`) so callers can explain the refusal
+     * instead of showing a bare message.
+     *
+     * @param {string} folderPath Absolute business path of the folder
+     * @param {{dryRun?: boolean}} [options]
+     */
+    async deleteFolder(folderPath, options = {}) {
+        const { dryRun = false } = options || {};
+
+        const response = await fetch(this.apiConfig.endpoints.deleteFolder, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({ folder_path: folderPath, dry_run: dryRun })
+        });
+
+        const result = await response.json().catch(() => ({}));
+
+        if (!response.ok || result.success === false) {
+            const error = new Error(result.error || `Failed to delete folder`);
+            error.code = result.code || null;
+            error.manifest = result.manifest || null;
+            throw error;
+        }
+
+        return result;
+    }
+
+    /**
+     * Rename a folder inside the library roots.
+     *
+     * Works on folders that hold models too — the backend re-keys the affected
+     * cache records instead of cascading. A name collision or a staged delete
+     * inside the subtree surfaces as a 409 conflict, attached to the thrown
+     * Error as `code`.
+     *
+     * @param {string} folderPath Absolute business path of the folder
+     * @param {string} newName New leaf name (a single path segment)
+     */
+    async renameFolder(folderPath, newName) {
+        const response = await fetch(this.apiConfig.endpoints.renameFolder, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({ folder_path: folderPath, new_name: newName })
+        });
+
+        const result = await response.json().catch(() => ({}));
+
+        if (!response.ok || result.success === false) {
+            const error = new Error(result.error || `Failed to rename folder`);
+            error.code = result.code || null;
+            throw error;
+        }
+
+        return result;
+    }
+
    async fetchUnifiedFolderTree(options = {}) {
        try {
            const { includeEmpty = false } = options;
@@ -1367,30 +1455,52 @@ export class BaseModelApiClient {
        }
    }

-    async fetchHfRepoFiles(repo, revision = 'main') {
+    /**
+     * List the downloadable weight files of an external repository.
+     * @param {string} repo - `owner/name`
+     * @param {string} [platform] - `huggingface` (default) or `modelscope`
+     * @param {string} [revision] - branch; each site has its own default
+     */
+    async fetchModelSourceFiles(repo, platform = 'huggingface', revision = '') {
        try {
-            const params = new URLSearchParams({ repo, revision });
-            const response = await fetch(`${HF_ENDPOINTS.repoFiles}?${params}`);
+            const params = new URLSearchParams({ repo, platform });
+            if (revision) params.set('revision', revision);
+            const response = await fetch(`${MODEL_SOURCE_ENDPOINTS.repoFiles}?${params}`);
            if (!response.ok) {
                const err = await response.json().catch(() => ({}));
-                throw new Error(err.error || 'Failed to fetch HF repo files');
+                throw new Error(err.error || 'Failed to fetch repository files');
            }
            return await response.json();
        } catch (error) {
-            console.error('Error fetching HF repo files:', error);
+            console.error('Error fetching repository files:', error);
            throw error;
        }
    }

-    async downloadHfModel({ repo, filename, revision, modelRoot, relativePath, useDefaultPaths, download_id }) {
+    /** Backwards-compatible Hugging Face wrapper. */
+    async fetchHfRepoFiles(repo, revision = 'main') {
+        return this.fetchModelSourceFiles(repo, 'huggingface', revision);
+    }
+
+    async downloadModelSource({
+        platform = 'huggingface',
+        repo,
+        filename,
+        revision,
+        modelRoot,
+        relativePath,
+        useDefaultPaths,
+        download_id,
+    }) {
        try {
-            const response = await fetch(HF_ENDPOINTS.download, {
+            const response = await fetch(MODEL_SOURCE_ENDPOINTS.download, {
                method: 'POST',
                headers: { 'Content-Type': 'application/json' },
                body: JSON.stringify({
+                    platform,
                    repo,
                    filename,
-                    revision: revision || 'main',
+                    revision: revision || '',
                    model_root: modelRoot,
                    relative_path: relativePath || '',
                    use_default_paths: useDefaultPaths || false,
@@ -1404,11 +1514,25 @@ export class BaseModelApiClient {

            return await response.json();
        } catch (error) {
-            console.error('Error downloading HF model:', error);
+            console.error('Error downloading model:', error);
            throw error;
        }
    }

+    /** Backwards-compatible Hugging Face wrapper. */
+    async downloadHfModel({ repo, filename, revision, modelRoot, relativePath, useDefaultPaths, download_id }) {
+        return this.downloadModelSource({
+            platform: 'huggingface',
+            repo,
+            filename,
+            revision: revision || 'main',
+            modelRoot,
+            relativePath,
+            useDefaultPaths,
+            download_id,
+        });
+    }
+
    _buildQueryParams(baseParams, pageState) {
        const params = new URLSearchParams(baseParams);
        const isExcludedView = pageState.viewMode === 'excluded';
@@ -2051,6 +2175,135 @@ export class BaseModelApiClient {
        });
    }

+    /**
+     * Apply the configured download filename template to models, renaming their files
+     * @param {Array} filePaths - Optional array of file paths to rename. If not provided, applies to all models.
+     * @returns {Promise} - Promise that resolves when the operation is complete
+     */
+    async applyFilenameTemplate(filePaths = null) {
+        let ws = null;
+
+        await state.loadingManager.showWithProgress(async (loading) => {
+            loading.showCancelButton(() => this.cancelTask());
+            try {
+                // Connect to WebSocket for progress updates
+                const wsProtocol = window.location.protocol === 'https:' ? 'wss://' : 'ws://';
+                ws = new WebSocket(`${wsProtocol}${window.location.host}${WS_ENDPOINTS.fetchProgress}`);
+
+                const operationComplete = new Promise((resolve, reject) => {
+                    ws.onmessage = (event) => {
+                        const data = JSON.parse(event.data);
+
+                        if (data.type !== 'filename_template_progress') return;
+
+                        switch (data.status) {
+                            case 'started':
+                                loading.setProgress(0);
+                                const operationType = data.operation_type === 'bulk' ? 'selected models' : 'all models';
+                                loading.setStatus(translate('loras.bulkOperations.filenameTemplateProgress.starting', { type: operationType }, `Applying filename template to ${operationType}...`));
+                                break;
+
+                            case 'processing':
+                                const percent = data.total > 0 ? ((data.processed / data.total) * 90).toFixed(1) : 0;
+                                loading.setProgress(percent);
+                                loading.setStatus(
+                                    translate('loras.bulkOperations.filenameTemplateProgress.processing', {
+                                        processed: data.processed,
+                                        total: data.total,
+                                        success: data.success,
+                                        failures: data.failures,
+                                        skipped: data.skipped
+                                    }, `Processing (${data.processed}/${data.total}) - ${data.success} renamed, ${data.skipped} skipped, ${data.failures} failed`)
+                                );
+                                break;
+
+                            case 'completed':
+                                loading.setProgress(100);
+                                loading.setStatus(
+                                    translate('loras.bulkOperations.filenameTemplateProgress.completed', {
+                                        success: data.success,
+                                        skipped: data.skipped,
+                                        failures: data.failures,
+                                        total: data.total
+                                    }, `Completed: ${data.success} renamed, ${data.skipped} skipped, ${data.failures} failed`)
+                                );
+
+                                setTimeout(() => {
+                                    resolve(data);
+                                }, 1500);
+                                break;
+
+                            case 'cancelled':
+                                loading.setStatus(translate('toast.api.operationCancelled', {}, 'Operation cancelled by user'));
+                                resolve(data);
+                                break;
+
+                            case 'error':
+                                loading.setStatus(translate('loras.bulkOperations.filenameTemplateProgress.error', { error: data.error }, `Error: ${data.error}`));
+                                reject(new Error(data.error));
+                                break;
+                        }
+                    };
+
+                    ws.onerror = (error) => {
+                        console.error('WebSocket error during filename template apply:', error);
+                        reject(new Error('Connection error'));
+                    };
+                });
+
+                // Start the filename template operation
+                const endpoint = this.apiConfig.endpoints.applyFilenameTemplate;
+
+                const requestBody = {};
+                if (filePaths) {
+                    requestBody.file_paths = filePaths;
+                }
+
+                const response = await fetch(endpoint, {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify(requestBody),
+                });
+
+                if (!response.ok) {
+                    const errorData = await response.json().catch(() => ({}));
+                    throw new Error(errorData.error || 'Failed to start filename template operation');
+                }
+
+                // Wait for the operation to complete via WebSocket
+                const result = await operationComplete;
+
+                // Show appropriate success message based on results
+                if (result.status === 'cancelled') {
+                    showToast('toast.api.operationCancelledPartial', { success: result.success, total: result.total }, 'info');
+                } else if (result.failures === 0) {
+                    showToast('toast.loras.filenameTemplateSuccess', {
+                        count: result.success,
+                        type: result.operation_type === 'bulk' ? 'selected models' : 'all models'
+                    }, 'success');
+                } else {
+                    showToast('toast.loras.filenameTemplatePartialSuccess', {
+                        success: result.success,
+                        failures: result.failures,
+                        total: result.total
+                    }, 'warning');
+                }
+
+            } catch (error) {
+                console.error('Error applying filename template:', error);
+                showToast('toast.loras.filenameTemplateFailed', { error: error.message }, 'error');
+                throw error;
+            } finally {
+                if (ws && ws.readyState === WebSocket.OPEN) {
+                    ws.close();
+                }
+            }
+        }, {
+            initialMessage: translate('loras.bulkOperations.filenameTemplateProgress.initializing', {}, 'Initializing filename template apply...'),
+            completionMessage: translate('loras.bulkOperations.filenameTemplateProgress.complete', {}, 'Filename template apply complete')
+        });
+    }
+
    async stopExampleImages() {
        try {
            const response = await fetch('/api/lm/stop-example-images', {
@@ -7,6 +7,8 @@ import { MODEL_CONFIG } from '../../api/apiConfig.js';
 import { translate } from '../../utils/i18nHelpers.js';
 import { getNsfwLevelSelector } from '../shared/NsfwLevelSelector.js';
 import { classifyModelRelinkUrl } from '../../utils/civitaiUtils.js';
+import { parseModelSourceUrl, getModelSourceInfo } from '../../utils/modelSourceHelpers.js';
+import { escapeHtml } from '../shared/utils.js';

 // Mixin with shared functionality for LoraContextMenu and CheckpointContextMenu
 export const ModelContextMenuMixin = {
@@ -211,7 +213,7 @@ export const ModelContextMenuMixin = {
        setTimeout(() => urlInput.focus(), 50);
    },

-    // HuggingFace linking methods
+    // External model source linking (Hugging Face / ModelScope / TensorArt)
    showLinkHfModal() {
        const filePath = this.currentCard.dataset.filepath;
        if (!filePath) return;
@@ -225,15 +227,23 @@ export const ModelContextMenuMixin = {
        }

        this._boundLinkHfHandler = async () => {
-            const hfUrl = urlInput.value.trim();
-            if (!hfUrl) {
-                errorDiv.textContent = 'Please enter a HuggingFace repository URL.';
+            const rawUrl = urlInput.value.trim();
+            if (!rawUrl) {
+                errorDiv.textContent = translate(
+                    'modals.linkModelSource.urlRequired',
+                    {},
+                    'Please enter a model page URL.'
+                );
                return;
            }

-            const hfPattern = /^https?:\/\/huggingface\.co\/([^/]+\/[^/]+)\/?$/;
-            if (!hfPattern.test(hfUrl)) {
-                errorDiv.textContent = 'Invalid URL format. Expected: https://huggingface.co/user/repo';
+            const sourceInfo = parseModelSourceUrl(rawUrl);
+            if (!sourceInfo) {
+                errorDiv.textContent = translate(
+                    'modals.linkModelSource.invalidUrl',
+                    {},
+                    'Unsupported URL. Supported sites: Hugging Face, ModelScope, TensorArt.'
+                );
                return;
            }

@@ -241,12 +251,14 @@ export const ModelContextMenuMixin = {
            modalManager.closeModal('linkHfModal');

            try {
-                state.loadingManager.showSimpleLoading('Linking to HuggingFace...');
+                state.loadingManager.showSimpleLoading(
+                    translate('modals.linkModelSource.linking', {}, 'Linking model source...')
+                );

                const response = await fetch('/api/lm/set-hf-url', {
                    method: 'POST',
                    headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify({ file_path: filePath, hf_url: hfUrl }),
+                    body: JSON.stringify({ file_path: filePath, source_url: sourceInfo.url }),
                });

                if (!response.ok) {
@@ -262,7 +274,7 @@ export const ModelContextMenuMixin = {
                    throw new Error(data.error || 'Failed to link model');
                }
            } catch (error) {
-                console.error('Error linking model to HuggingFace:', error);
+                console.error('Error linking model source:', error);
                showToast('toast.contextMenu.linkHfFailed', { message: error.message }, 'error');
            } finally {
                state.loadingManager.hide();
@@ -276,18 +288,68 @@ export const ModelContextMenuMixin = {

        modalManager.showModal('linkHfModal');

+        this._renderSupportedSources();
+
        setTimeout(() => urlInput.focus(), 50);
    },

-    // HF metadata enrichment (AI agent) methods
+    /**
+     * Refresh the supported-site hints from the server so the dialog reflects
+     * whatever sources this backend build actually knows about. Falls back to
+     * the static markup in the template when the request fails.
+     */
+    async _renderSupportedSources() {
+        const container = document.getElementById('hfSupportedSources');
+        if (!container) return;
+
+        try {
+            const response = await fetch('/api/lm/model-sources');
+            if (!response.ok) return;
+            const sources = await response.json();
+            if (!Array.isArray(sources) || sources.length === 0) return;
+
+            const examples = sources
+                .map((source) => source?.example_url)
+                .filter((url) => typeof url === 'string' && url);
+            if (examples.length === 0) return;
+
+            container.innerHTML = examples
+                .map((url) => `<strong>${escapeHtml(url)}</strong>`)
+                .join('<br>');
+        } catch (error) {
+            console.debug('Failed to load supported model sources:', error);
+        }
+    },
+
+    // Model metadata enrichment (AI agent) methods
    updateEnrichMenuItem(card) {
        const enrichItem = this.menu?.querySelector('[data-action="enrich-hf-llm"]');
        if (!enrichItem) return;
-        const hasHfUrl = !!card.dataset.hf_url;
-        enrichItem.classList.toggle('disabled', !hasHfUrl);
-        enrichItem.title = hasHfUrl
-            ? ''
-            : 'Link this model to a HuggingFace repo first (Link Model → Link to HuggingFace)';
+
+        const model = {
+            source_url: card.dataset.source_url || '',
+            source_platform: card.dataset.source_platform || '',
+            hf_url: card.dataset.hf_url || '',
+        };
+        const sourceInfo = getModelSourceInfo(model);
+        const canEnrich = Boolean(sourceInfo && sourceInfo.supportsEnrichment);
+
+        enrichItem.classList.toggle('disabled', !canEnrich);
+        if (canEnrich) {
+            enrichItem.title = '';
+        } else if (!sourceInfo) {
+            enrichItem.title = translate(
+                'toast.contextMenu.enrichNeedsSource',
+                {},
+                'Link this model to a model source first (Link Model → Link to Model Source)'
+            );
+        } else {
+            enrichItem.title = translate(
+                'toast.contextMenu.enrichUnsupportedSource',
+                { source: sourceInfo.label },
+                `AI enrichment is not available for ${sourceInfo.label} models`
+            );
+        }
    },

    async enrichWithAgent(filePath) {
@@ -0,0 +1,206 @@
+import { translate } from '../utils/i18nHelpers.js';
+
+/**
+ * Reusable directory picker modal backed by POST /api/lm/browse-directory.
+ * Self-managed (NOT registered with ModalManager): it stacks above the
+ * settings modal, so ModalManager's "close current modal on open" behavior
+ * would kill the modal underneath.
+ */
+class DirectoryPickerModal {
+  constructor() {
+    this.isOpen = false;
+    this.currentPath = '';
+    this.parentPath = null;
+    this.onSelect = null;
+    this.elements = {};
+    this._bindings = [];
+  }
+
+  open({ initialPath = '', onSelect } = {}) {
+    this._cacheElements();
+    if (!this.elements.modal) {
+      console.warn('DirectoryPickerModal: #directoryPickerModal not found in DOM');
+      return;
+    }
+
+    this._unbindEvents();
+    this.onSelect = typeof onSelect === 'function' ? onSelect : null;
+    this.currentPath = '';
+    this.parentPath = null;
+    this._clearError();
+    this.elements.folderList.innerHTML = '';
+    this.elements.currentPathEl.textContent = '';
+    this.elements.upBtn.disabled = true;
+    this.elements.pathInput.value = initialPath || '';
+
+    this._bindEvents();
+    document.body.classList.add('modal-open');
+    this.elements.modal.style.display = 'block';
+    this.isOpen = true;
+
+    // An empty path lets the server pick its default (user home).
+    this.loadDirectory(initialPath || '');
+  }
+
+  close() {
+    if (!this.isOpen) return;
+    this.isOpen = false;
+    this._unbindEvents();
+    if (this.elements.modal) {
+      this.elements.modal.style.display = 'none';
+    }
+    this.onSelect = null;
+    // Keep body.modal-open: the settings modal underneath may still be open.
+  }
+
+  async loadDirectory(path) {
+    try {
+      const response = await fetch('/api/lm/browse-directory', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ path })
+      });
+      const data = await response.json();
+
+      if (data.success) {
+        this._clearError();
+        this._renderDirectory(data);
+      } else {
+        this._showError(data.error || translate('settings.directoryPicker.loadError', {}, 'Failed to load directory'));
+      }
+    } catch (error) {
+      console.error('Error loading directory:', error);
+      this._showError(translate('settings.directoryPicker.loadError', {}, 'Failed to load directory'));
+    }
+  }
+
+  _cacheElements() {
+    const modal = document.getElementById('directoryPickerModal');
+    this.elements = {
+      modal,
+      closeBtn: document.getElementById('directoryPickerCloseBtn'),
+      pathInput: document.getElementById('directoryPickerPathInput'),
+      goBtn: document.getElementById('directoryPickerGoBtn'),
+      upBtn: document.getElementById('directoryPickerUpBtn'),
+      currentPathEl: document.getElementById('directoryPickerCurrentPath'),
+      folderList: document.getElementById('directoryPickerFolderList'),
+      errorEl: document.getElementById('directoryPickerError'),
+      selectBtn: document.getElementById('directoryPickerSelectBtn')
+    };
+  }
+
+  _bind(target, type, handler, options) {
+    target.addEventListener(type, handler, options);
+    this._bindings.push([target, type, handler, options]);
+  }
+
+  _bindEvents() {
+    const { modal, closeBtn, pathInput, goBtn, upBtn, selectBtn } = this.elements;
+
+    this._bind(closeBtn, 'click', () => this.close());
+    this._bind(goBtn, 'click', () => this.loadDirectory(pathInput.value.trim()));
+    this._bind(pathInput, 'keydown', (event) => {
+      if (event.key === 'Enter') {
+        this.loadDirectory(pathInput.value.trim());
+      }
+    });
+    this._bind(upBtn, 'click', () => {
+      // Server-provided parent_path: Windows paths cannot be derived client-side.
+      if (this.parentPath) {
+        this.loadDirectory(this.parentPath);
+      }
+    });
+    this._bind(selectBtn, 'click', () => this._selectCurrent());
+
+    // Capture phase + stopPropagation so an ESC here never reaches the
+    // settings modal's own ESC handler underneath.
+    this._bind(document, 'keydown', (event) => {
+      if (event.key === 'Escape') {
+        event.stopPropagation();
+        this.close();
+      }
+    }, true);
+
+    // Backdrop click (the .modal element itself, not its content).
+    this._bind(modal, 'click', (event) => {
+      if (event.target === modal) {
+        this.close();
+      }
+    });
+  }
+
+  _unbindEvents() {
+    for (const [target, type, handler, options] of this._bindings) {
+      target.removeEventListener(type, handler, options);
+    }
+    this._bindings = [];
+  }
+
+  _renderDirectory(data) {
+    this.currentPath = data.current_path || '';
+    this.parentPath = data.parent_path || null;
+
+    this.elements.currentPathEl.textContent = this.currentPath;
+    this.elements.pathInput.value = this.currentPath;
+    this.elements.upBtn.disabled = !this.parentPath;
+
+    const folderList = this.elements.folderList;
+    folderList.innerHTML = '';
+
+    const directories = data.directories || [];
+    if (directories.length === 0) {
+      const empty = document.createElement('div');
+      empty.className = 'directory-picker-empty';
+      empty.textContent = translate('settings.directoryPicker.emptyFolder', {}, 'This folder is empty');
+      folderList.appendChild(empty);
+      return;
+    }
+
+    directories.forEach((entry) => {
+      folderList.appendChild(this._createFolderItem(entry));
+    });
+  }
+
+  // Each entry is { name, path, is_parent }; the server supplies the full
+  // child path, so navigation never joins path segments client-side.
+  _createFolderItem(entry) {
+    const item = document.createElement('div');
+    item.className = 'folder-item';
+    item.innerHTML = `
+      <i class="fas fa-folder"></i>
+      <span class="item-name">${this._escapeHtml(entry.name)}</span>
+    `;
+    item.addEventListener('click', () => {
+      this.loadDirectory(entry.path);
+    });
+    return item;
+  }
+
+  _selectCurrent() {
+    if (!this.currentPath) return;
+    if (this.onSelect) {
+      this.onSelect(this.currentPath);
+    }
+    this.close();
+  }
+
+  _showError(message) {
+    this.elements.errorEl.textContent = message;
+    this.elements.errorEl.style.display = 'block';
+  }
+
+  _clearError() {
+    this.elements.errorEl.textContent = '';
+    this.elements.errorEl.style.display = 'none';
+  }
+
+  _escapeHtml(text) {
+    if (!text) return '';
+    const div = document.createElement('div');
+    div.textContent = text;
+    return div.innerHTML;
+  }
+}
+
+export const directoryPickerModal = new DirectoryPickerModal();
+export { DirectoryPickerModal };
@@ -494,6 +494,7 @@ class RecipeModal {
        this.syncGenerationParams(hydratedRecipe.gen_params);
        this.syncResourcesSection(hydratedRecipe);
        this.syncHeaderActions();
+        this.syncBaseModelBadge();
        this.syncMetaFooter();

        // Show the modal
@@ -520,6 +521,32 @@ class RecipeModal {
        }
    }

+    /**
+     * Render the recipe-level base model badge in the header tags row.
+     * Unlike the width-constrained card overlay (which abbreviates), the
+     * modal has room for the full base model name — matching the model
+     * modal's info grid and this modal's resource rows. Falls back to a
+     * dimmed "Unknown" instead of hiding so the header layout does not
+     * shift when hydration fills the value in.
+     */
+    syncBaseModelBadge() {
+        const badge = document.getElementById('recipeBaseModelBadge');
+        if (!badge) {
+            return;
+        }
+
+        const rawLabel = (this.currentRecipe?.base_model || '').trim();
+        const unknownLabel = translate('recipes.modal.metadata.unknown', {}, 'Unknown');
+        const baseModelLabel = rawLabel || unknownLabel;
+        const fieldLabel = translate('recipes.modal.metadata.baseModel', {}, 'Base Model');
+
+        badge.textContent = baseModelLabel;
+        badge.title = `${fieldLabel}: ${baseModelLabel}`;
+        badge.setAttribute('aria-label', badge.title);
+        badge.classList.toggle('is-unknown', !rawLabel);
+        badge.hidden = false;
+    }
+
    /**
     * Render the meta footer: clickable file location (opens the recipe JSON
     * in the OS file manager) plus the truncated recipe ID with copy button.
@@ -661,6 +688,10 @@ class RecipeModal {
                nextRecipe.has_workflow = fullRecipe.has_workflow;
            }

+            if (fullRecipe.base_model !== undefined) {
+                nextRecipe.base_model = fullRecipe.base_model;
+            }
+
            if (fullRecipe.checkpoint !== undefined) {
                nextRecipe.checkpoint = fullRecipe.checkpoint;
            } else {
@@ -718,6 +749,7 @@ class RecipeModal {
            this.updateSourceUrlDisplay(this.currentRecipe.source_path || '');
        }
        this.syncHeaderActions();
+        this.syncBaseModelBadge();
        this.syncMetaFooter();
    }

@@ -1,4 +1,5 @@
 import { showToast, openCivitai, openHuggingFace, copyToClipboard, copyLoraSyntax, sendLoraToWorkflow, sendEmbeddingToWorkflow, openExampleImagesFolder, buildLoraSyntax, sendModelPathToWorkflow } from '../../utils/uiHelpers.js';
+import { getModelSourceInfo, getModelSourceGroupKey, getModelSourceViewTitle, openModelSource } from '../../utils/modelSourceHelpers.js';
 import { state, getCurrentPageState } from '../../state/index.js';
 import { showModelModal } from './ModelModal.js';
 import { hasCivitaiSource } from './utils.js';
@@ -65,12 +66,15 @@ function handleModelCardEvent_internal(event, modelType) {
    if (event.target.closest('.fa-globe')) {
        event.stopPropagation();
        // CivitAI wins when the model actually has CivitAI data; otherwise fall
-        // back to HuggingFace. Relying on `from_civitai` here made the two
-        // sources mutually exclusive whenever one of them was (re)linked (#1094).
+        // back to the linked external source. Relying on `from_civitai` here
+        // made the two sources mutually exclusive whenever one of them was
+        // (re)linked (#1094).
        if (card.dataset.has_civitai === 'true') {
            openCivitai(card.dataset.filepath);
-        } else if (card.dataset.hf_url) {
+        } else if (card.dataset.source_platform === 'huggingface' && card.dataset.hf_url) {
            openHuggingFace(card.dataset.hf_url);
+        } else if (card.dataset.source_url) {
+            openModelSource(card.dataset.source_url);
        }
        return true; // Stop propagation
    }
@@ -337,6 +341,8 @@ async function showModelModalFromCard(card, modelType) {
        modified: card.dataset.modified,
        file_size: parseInt(card.dataset.file_size || '0'),
        from_civitai: card.dataset.from_civitai === 'true',
+        source_platform: card.dataset.source_platform || '',
+        source_url: card.dataset.source_url || '',
        hf_url: card.dataset.hf_url || '',
        base_model: card.dataset.base_model,
        notes: card.dataset.notes || '',
@@ -428,6 +434,8 @@ function showExampleAccessModal(card, modelType) {
                modified: card.dataset.modified,
                file_size: card.dataset.file_size,
                from_civitai: card.dataset.from_civitai === 'true',
+                source_platform: card.dataset.source_platform || '',
+                source_url: card.dataset.source_url || '',
                hf_url: card.dataset.hf_url || '',
                base_model: card.dataset.base_model,
                notes: card.dataset.notes,
@@ -490,7 +498,11 @@ 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 modelSourceInfo = getModelSourceInfo(model);
+    card.dataset.source_url = modelSourceInfo?.url || '';
+    card.dataset.source_platform = modelSourceInfo?.platform || '';
+    // Legacy alias: only Hugging Face models expose `hf_url`.
+    card.dataset.hf_url = modelSourceInfo?.platform === 'huggingface' ? modelSourceInfo.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';
@@ -508,11 +520,12 @@ export function createModelCard(model, modelType) {
    const modelId = civitaiData?.modelId ?? civitaiData?.model_id;
    if (modelId !== undefined && modelId !== null && modelId !== '') {
        card.dataset.modelId = modelId;
-    } else if (model.hf_url) {
-        // For HF-only models, derive a group key from hf_url for version grouping
-        const match = model.hf_url.match(/https?:\/\/huggingface\.co\/([^/]+\/[^/]+)/);
-        if (match) {
-            card.dataset.modelId = 'hf:' + match[1];
+    } else {
+        // For externally-sourced models, derive a group key from the source
+        // URL for version grouping (hf:user/repo, ms:user/repo, ta:<id>).
+        const sourceGroupKey = getModelSourceGroupKey(model);
+        if (sourceGroupKey) {
+            card.dataset.modelId = sourceGroupKey;
        }
    }

@@ -610,10 +623,10 @@ export function createModelCard(model, modelType) {
    const hasCivitai = hasCivitaiSource(model.civitai);
    const globeTitle = hasCivitai ?
        translate('modelCard.actions.viewOnCivitai', {}, 'View on Civitai') :
-        model.hf_url ?
-            translate('modelCard.actions.viewOnHuggingFace', {}, 'View on Hugging Face') :
+        modelSourceInfo ?
+            getModelSourceViewTitle(modelSourceInfo) :
            translate('modelCard.actions.notAvailableFromCivitai', {}, 'Not available from Civitai');
-    const globeEnabled = hasCivitai || !!model.hf_url;
+    const globeEnabled = hasCivitai || !!modelSourceInfo;
    let sendTitle;
    let copyTitle;
    if (modelType === MODEL_TYPES.LORA) {
@@ -1,4 +1,5 @@
 import { showToast, openCivitai, sendLoraToWorkflow, sendEmbeddingToWorkflow, sendModelPathToWorkflow, buildLoraSyntax, copyToClipboard } from '../../utils/uiHelpers.js';
+import { getModelSourceInfo, getModelSourceGroupKey, getModelSourceViewTitle, openModelSource } from '../../utils/modelSourceHelpers.js';
 import { modalManager } from '../../managers/ModalManager.js';
 import { MODEL_TYPES } from '../../api/apiConfig.js';
 import {
@@ -397,10 +398,13 @@ export async function showModelModal(model, modelType) {
 <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')}
+    const sourceInfo = getModelSourceInfo(modelWithFullData);
+    const escapedSourceUrl = sourceInfo?.url ? escapeAttribute(sourceInfo.url) : '';
+    const isHuggingFaceSource = sourceInfo?.platform === 'huggingface';
+    const sourceTitle = sourceInfo ? getModelSourceViewTitle(sourceInfo) : '';
+    const viewOnHuggingFaceAction = escapedSourceUrl ? `
+<div class="civitai-view" title="${escapeAttribute(sourceTitle)}" data-action="${isHuggingFaceSource ? 'view-huggingface' : 'view-model-source'}" ${isHuggingFaceSource ? 'data-hf-url' : 'data-source-url'}="${escapedSourceUrl}">
+    <i class="fas fa-globe"></i> ${escapeHtml(sourceTitle)}
 </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')}">
@@ -520,12 +524,12 @@ export async function showModelModal(model, modelType) {
    const loadingExamplesText = translate('modals.model.loading.examples', {}, 'Loading examples...');

    const loadingVersionsText = translate('modals.model.loading.versions', {}, 'Loading versions...');
-    // Use CivitAI modelId, or derive HF group key for HF-only models
+    // Use CivitAI modelId, or derive a source group key for externally-linked models
    let civitaiModelId = modelWithFullData.civitai?.modelId || '';
-    if (!civitaiModelId && modelWithFullData.hf_url) {
-        const match = modelWithFullData.hf_url.match(/https?:\/\/huggingface\.co\/([^/]+\/[^/]+)/);
-        if (match) {
-            civitaiModelId = 'hf:' + match[1];
+    if (!civitaiModelId) {
+        const sourceGroupKey = getModelSourceGroupKey(modelWithFullData);
+        if (sourceGroupKey) {
+            civitaiModelId = sourceGroupKey;
        }
    }
    const civitaiVersionId = modelWithFullData.civitai?.id || '';
@@ -939,6 +943,11 @@ function setupEventHandlers(filePath, modelType) {
                    window.open(target.dataset.hfUrl, '_blank', 'noopener,noreferrer');
                }
                break;
+            case 'view-model-source':
+                if (target.dataset.sourceUrl) {
+                    openModelSource(target.dataset.sourceUrl);
+                }
+                break;
            case 'view-creator':
                const username = target.dataset.username;
                if (username) {
@@ -7,6 +7,12 @@ import { getModelApiClient } from '../../api/modelApiFactory.js';
 import { translate } from '../../utils/i18nHelpers.js';
 import { getPriorityTagSuggestions } from '../../utils/priorityTagHelpers.js';
 import { state } from '../../state/index.js';
+import { enablePointerSort } from './pointerSort.js';
+import {
+    refreshReorderState,
+    renderReorderHandle,
+    renderReorderHint,
+} from './reorderSupport.js';

 const MODEL_TYPE_SUGGESTION_KEY_MAP = {
    loras: 'lora',
@@ -18,16 +24,22 @@ const MODEL_TYPE_SUGGESTION_KEY_MAP = {
 };
 const METADATA_ITEM_SELECTOR = '.metadata-item';
 const METADATA_ITEMS_CONTAINER_SELECTOR = '.metadata-items';
-const METADATA_ITEM_DRAGGING_CLASS = 'metadata-item-dragging';
-const METADATA_ITEM_PLACEHOLDER_CLASS = 'metadata-item-placeholder';
-const METADATA_ITEMS_SORTING_CLASS = 'metadata-items-sorting';
-const BODY_DRAGGING_CLASS = 'metadata-drag-active';
+
+/**
+ * Tag items have no click action of their own, so the whole chip stays
+ * draggable (handleSelector is null); the small threshold keeps a click on the
+ * grip from starting a drag (it just focuses the grip). Touch users drag by the
+ * grip, which is the element that opts out of scrolling via touch-action.
+ */
+const TAG_SORT_CONFIG = {
+    itemSelector: METADATA_ITEM_SELECTOR,
+    dragThreshold: 5,
+};

 let activeModelTypeKey = '';
 let priorityTagSuggestions = [];
 let priorityTagSuggestionsLoaded = false;
 let priorityTagSuggestionsPromise = null;
-let activeTagDragState = null;

 // Configurable options for tag editing (set by setupTagEditMode)
 let tagEditOptions = {
@@ -423,6 +435,7 @@ function createTagEditUI(currentTags, editBtnHTML = '') {
            <div class="metadata-items">
                ${currentTags.map(tag => `
                    <div class="metadata-item" data-tag="${tag}">
+                        ${renderReorderHandle(translate('common.reorder.dragHandle', {}, 'Drag to reorder'))}
                        <span class="metadata-item-content">${tag}</span>
                        <button class="metadata-delete-btn">
                            <i class="fas fa-times"></i>
@@ -431,6 +444,7 @@ function createTagEditUI(currentTags, editBtnHTML = '') {
                `).join('')}
            </div>
            <div class="metadata-edit-controls">
+                ${renderReorderHint(translate('common.reorder.dragHandle', {}, 'Drag to reorder'))}
                <button class="save-tags-btn" title="Save changes">
                    <i class="fas fa-save"></i> Save
                </button>
@@ -543,8 +557,11 @@ function setupDeleteButtons() {
        btn.addEventListener('click', function(e) {
            e.stopPropagation();
            const tag = this.closest('.metadata-item');
+            const scope = tag?.closest('.model-tags-container');
            tag.remove();
-            
+
+            refreshTagReorderState(scope);
+
            // Update status of items in the suggestion dropdown
            updateSuggestionsDropdown();
        });
@@ -563,204 +580,31 @@ function setupTagDragAndDrop(scopeContainer) {
        return;
    }

-    container.querySelectorAll(METADATA_ITEM_SELECTOR).forEach((item) => {
-        item.removeAttribute('draggable');
-        if (item.classList.contains(METADATA_ITEM_PLACEHOLDER_CLASS)) {
-            return;
-        }
-        if (item.dataset.pointerDragInit === 'true') {
-            return;
-        }
+    const scope = container.closest('.model-tags-container') || container;

-        item.addEventListener('pointerdown', handleTagPointerDown);
-        item.dataset.pointerDragInit = 'true';
+    enablePointerSort(container, {
+        ...TAG_SORT_CONFIG,
+        onSorted: () => {
+            updateSuggestionsDropdown();
+            refreshTagReorderState(scope);
+        },
    });
+
+    refreshTagReorderState(scope);
 }

-function handleTagPointerDown(event) {
-    if (event.button !== 0) {
-        return;
-    }
-
-    if (event.target.closest('.metadata-delete-btn')) {
-        return;
-    }
-
-    const item = event.currentTarget;
-    const container = item?.closest(METADATA_ITEMS_CONTAINER_SELECTOR);
-    if (!item || !container) {
-        return;
-    }
-
-    event.preventDefault();
-    startPointerDrag({ item, container, startEvent: event });
-}
-
-function startPointerDrag({ item, container, startEvent }) {
-    if (activeTagDragState) {
-        finishPointerDrag();
-    }
-
-    const itemRect = item.getBoundingClientRect();
-    const placeholder = document.createElement('div');
-    placeholder.className = `metadata-item ${METADATA_ITEM_PLACEHOLDER_CLASS}`;
-    placeholder.style.width = `${itemRect.width}px`;
-    placeholder.style.height = `${itemRect.height}px`;
-
-    container.insertBefore(placeholder, item);
-
-    item.classList.add(METADATA_ITEM_DRAGGING_CLASS);
-    item.style.width = `${itemRect.width}px`;
-    item.style.height = `${itemRect.height}px`;
-    item.style.position = 'fixed';
-    item.style.left = `${itemRect.left}px`;
-    item.style.top = `${itemRect.top}px`;
-    item.style.pointerEvents = 'none';
-    item.style.zIndex = '1000';
-
-    container.classList.add(METADATA_ITEMS_SORTING_CLASS);
-    if (document.body) {
-        document.body.classList.add(BODY_DRAGGING_CLASS);
-    }
-
-    const dragState = {
-        container,
-        item,
-        placeholder,
-        offsetX: startEvent.clientX - itemRect.left,
-        offsetY: startEvent.clientY - itemRect.top,
-        lastKnownPointer: { x: startEvent.clientX, y: startEvent.clientY },
-        rafId: null,
-    };
-
-    activeTagDragState = dragState;
-
-    document.addEventListener('pointermove', handlePointerMove);
-    document.addEventListener('pointerup', handlePointerUp);
-    document.addEventListener('pointercancel', handlePointerUp);
-}
-
-function handlePointerMove(event) {
-    if (!activeTagDragState) {
-        return;
-    }
-
-    activeTagDragState.lastKnownPointer = { x: event.clientX, y: event.clientY };
-
-    if (activeTagDragState.rafId !== null) {
-        return;
-    }
-
-    activeTagDragState.rafId = requestAnimationFrame(() => {
-        if (!activeTagDragState) {
-            return;
-        }
-        activeTagDragState.rafId = null;
-        updateDraggingItemPosition();
-        updatePlaceholderPosition();
+/**
+ * Refresh the "sortable" flag (and therefore the grip + hint) of a tags section
+ * @param {Element} [tagsSection] - The .model-tags-container element
+ */
+function refreshTagReorderState(tagsSection) {
+    refreshReorderState({
+        container: tagsSection?.querySelector(METADATA_ITEMS_CONTAINER_SELECTOR),
+        scope: tagsSection || undefined,
+        itemSelector: METADATA_ITEM_SELECTOR,
    });
 }

-function handlePointerUp() {
-    finishPointerDrag();
-}
-
-function updateDraggingItemPosition() {
-    if (!activeTagDragState) {
-        return;
-    }
-
-    const { item, offsetX, offsetY, lastKnownPointer } = activeTagDragState;
-    const left = lastKnownPointer.x - offsetX;
-    const top = lastKnownPointer.y - offsetY;
-    item.style.left = `${left}px`;
-    item.style.top = `${top}px`;
-}
-
-function updatePlaceholderPosition() {
-    if (!activeTagDragState) {
-        return;
-    }
-
-    const { container, placeholder, item, lastKnownPointer } = activeTagDragState;
-    const siblings = Array.from(
-        container.querySelectorAll(
-            `${METADATA_ITEM_SELECTOR}:not(.${METADATA_ITEM_PLACEHOLDER_CLASS})`
-        )
-    ).filter((element) => element !== item);
-
-    let insertAfter = null;
-
-    for (const sibling of siblings) {
-        const rect = sibling.getBoundingClientRect();
-
-        if (lastKnownPointer.y < rect.top) {
-            container.insertBefore(placeholder, sibling);
-            return;
-        }
-
-        if (lastKnownPointer.y <= rect.bottom) {
-            if (lastKnownPointer.x < rect.left + rect.width / 2) {
-                container.insertBefore(placeholder, sibling);
-                return;
-            }
-            insertAfter = sibling;
-            continue;
-        }
-
-        insertAfter = sibling;
-    }
-
-    if (!insertAfter) {
-        container.insertBefore(placeholder, container.firstElementChild);
-        return;
-    }
-
-    container.insertBefore(placeholder, insertAfter.nextSibling);
-}
-
-function finishPointerDrag() {
-    if (!activeTagDragState) {
-        return;
-    }
-
-    const { container, item, placeholder, rafId } = activeTagDragState;
-
-    document.removeEventListener('pointermove', handlePointerMove);
-    document.removeEventListener('pointerup', handlePointerUp);
-    document.removeEventListener('pointercancel', handlePointerUp);
-
-    container.classList.remove(METADATA_ITEMS_SORTING_CLASS);
-    if (document.body) {
-        document.body.classList.remove(BODY_DRAGGING_CLASS);
-    }
-
-    if (rafId !== null) {
-        cancelAnimationFrame(rafId);
-        activeTagDragState.rafId = null;
-        updateDraggingItemPosition();
-        updatePlaceholderPosition();
-    }
-
-    if (placeholder && placeholder.parentNode === container) {
-        container.insertBefore(item, placeholder);
-        container.removeChild(placeholder);
-    }
-
-    item.classList.remove(METADATA_ITEM_DRAGGING_CLASS);
-    item.style.position = '';
-    item.style.width = '';
-    item.style.height = '';
-    item.style.left = '';
-    item.style.top = '';
-    item.style.pointerEvents = '';
-    item.style.zIndex = '';
-
-    activeTagDragState = null;
-
-    updateSuggestionsDropdown();
-}
-
 /**
 * Add a new tag
 * @param {string} tag - Tag to add
@@ -799,6 +643,7 @@ function addNewTag(tag, scopeElement = null) {
    newTag.className = 'metadata-item';
    newTag.dataset.tag = tag;
    newTag.innerHTML = `
+        ${renderReorderHandle(translate('common.reorder.dragHandle', {}, 'Drag to reorder'))}
        <span class="metadata-item-content">${tag}</span>
        <button class="metadata-delete-btn">
            <i class="fas fa-times"></i>
@@ -5,6 +5,7 @@ import { openCivitaiUrl, showToast } from '../../utils/uiHelpers.js';
 import { translate } from '../../utils/i18nHelpers.js';
 import { state } from '../../state/index.js';
 import { buildCivitaiModelUrl } from '../../utils/civitaiUtils.js';
+import { parseModelSourceGroupKey } from '../../utils/modelSourceHelpers.js';
 import { formatFileSize } from './utils.js';
 import { setSessionItem, removeSessionItem } from '../../utils/storageHelpers.js';

@@ -993,22 +994,23 @@ export function initVersionsTab({
            renderErrorState(container, translate('modals.model.versions.missingModelId', {}, 'This model is missing a Civitai model id.'));
            return;
        }
-        // HF group keys (e.g. "hf:user/repo") are not real CivitAI model IDs —
-        // skip the remote API call and show a helpful message instead.
-        const isHfGroupKey = typeof modelId === 'string' && modelId.startsWith('hf:');
-        if (isHfGroupKey) {
+        // External source group keys (e.g. "hf:user/repo", "ms:user/repo",
+        // "ta:8278...") are not real CivitAI model IDs — skip the remote API
+        // call and show a helpful message instead.
+        const sourceGroup = parseModelSourceGroupKey(modelId);
+        if (sourceGroup) {
            controller.isLoading = false;
            controller.hasLoaded = true;
            controller.record = null;
-            const hfMsg = translate(
-                'modals.model.versions.hfGroupInfo',
-                {},
-                'This is a HuggingFace model group. Open the library to see all versions in the grid.'
+            const sourceMsg = translate(
+                'modals.model.versions.sourceGroupInfo',
+                { source: sourceGroup.label },
+                `This is a ${sourceGroup.label} model group. Open the library to see all versions in the grid.`
            );
            container.innerHTML = `
                <div class="versions-empty-state">
                    <i class="fas fa-info-circle"></i>
-                    <p>${escapeHtml(hfMsg)}</p>
+                    <p>${escapeHtml(sourceMsg)}</p>
                </div>
            `;
            return;
--- a/Show More
+++ b/Show More