Merge branch 'dev' into codex/unet-workflow-support

Author: mohnjiles

CHANGELOG.md

@@ -18,6 +18,12 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 - Fixed CivitAI model browsing breaking during Discovery API outages — the browser now falls back to the direct CivitAI API when Discovery returns a server error, authentication failure, or times out
 - Fixed UNet-only model selection sometimes clearing during model-list refreshes, which could hide text encoder slots after generating, cancelling, or reconnecting to ComfyUI
 - Fixed SwarmUI user settings (theme, output format, server configuration, etc.) and any user-added backend entries being overwritten when the install flow ran over an existing install — `Settings.fds` and `Backends.fds` are now merged with their existing contents instead of being rewritten from a stale template
+- Fixed pip requirements handling for environment-marker dependencies - thanks to @NeuralFault!
+- Fixed [#1608](https://github.com/LykosAI/StabilityMatrix/issues/1608) - Crash when cdn fetch fails due to error notification not being shown on UI Thread - thanks to @NeuralFault!
+- Fixed ComfyUI-Zluda inheriting `--enable-manager` from the base ComfyUI launch options, which blocked the bundled custom-node manager from initializing - thanks to @NeuralFault!
+### Supporters
+#### 🌟 Visionaries
+So much love to our Visionaries — **Waterclouds**, **bluepopsicle**, **Ibixat**, **Droolguy**, **snotty**, **LG**, and **whudunit** — thank you for your continued enthusiasm, kindness, and sheer staying-power. You've been with us through some big changes, and we're so lucky to have you in our corner. And the warmest welcome to our newest Visionaries **MrMxyzptlk12836**, **Psilocyfer18731**, **KalAbaddon**, **RustCupcake**, and **moon_milky2843** — we're so happy you're here, and we can't wait to get to know you. 💛
 
 ## v2.16.0-dev.3
 ### Added
@@ -133,6 +139,23 @@ Huge shoutout to our amazing Visionaries: **Waterclouds**, **JungleDragon**, **b
 #### 🌟 Visionaries
 A massive thank you to our esteemed Visionaries: **Waterclouds**, **JungleDragon**, **bluepopsicle**, **Bob S**, and **whudunit**! Your generosity is the powerhouse behind Stability Matrix, enabling us to keep building and refining with confidence. We are truly grateful for your partnership!
 
+## v2.15.8
+### Added
+- Added support for the civitai.red (mature-content) domain — NSFW CivitAI links now open and copy as civitai.red URLs, and pasting a civitai.red URL into the CivitAI model browser search works the same as a civitai.com URL
+### Changed
+- The CivitAI base model type filter now uses CivitAI's official `/api/v1/enums` endpoint, with fallbacks to the previous technique and a built-in list, so the filter stays populated even if the CivitAI response format changes or the service is unreachable
+### Fixed
+- Fixed CivitAI model browsing breaking during Discovery API outages — the browser now falls back to the direct CivitAI API when Discovery returns a server error, authentication failure, or times out
+- Fixed SwarmUI user settings (theme, output format, server configuration, etc.) and any user-added backend entries being overwritten when the install flow ran over an existing install — `Settings.fds` and `Backends.fds` are now merged with their existing contents instead of being rewritten from a stale template
+- Fixed pip requirements handling for environment-marker dependencies - thanks to @NeuralFault!
+- Fixed [#1608](https://github.com/LykosAI/StabilityMatrix/issues/1608) - Crash when cdn fetch fails due to error notification not being shown on UI Thread - thanks to @NeuralFault!
+- Fixed ComfyUI-Zluda inheriting `--enable-manager` from the base ComfyUI launch options, which blocked the bundled custom-node manager from initializing - thanks to @NeuralFault!
+### Supporters
+#### 🌟 Visionaries
+Heaps of gratitude to our Visionaries — **Waterclouds**, **bluepopsicle**, **Ibixat**, **Droolguy**, **snotty**, **LG**, and **whudunit** — for sticking with us release after release. Your encouragement, your patience while we chase down those last bugs, and the sheer fact of you being here keeps us showing up at the keyboard. We're so glad you're part of this little corner of the internet with us. And big warm welcomes again to our newest Visionaries **MrMxyzptlk12836**, **Psilocyfer18731**, **KalAbaddon**, **RustCupcake**, and **moon_milky2843** — make yourselves at home, you're among friends! 💛
+#### 🚀 Pioneers
+And the Pioneer crew — what a lineup. A massive thank-you to **Szir777**, **[USA]TechDude**, **takyamtom**, **SinthCore**, **Commissar Lord Death**, **Ahmed S**, **SeraphOfSalem**, and **Jisuren** — your steady presence, kind words, and patience as we've shifted things around mean more than you know. A heartfelt welcome back to **Tigon**, who's returned to the Pioneer ranks after a little time away — so glad you're back. 🎉 And a special hello to **jweg79**, who's been quietly supporting us for a while and just decided to step up and join the Pioneer crew this round — so happy to have you here. To our newest Pioneers, an enormous welcome: **rwx14662**, **Hurbie53**, **ahnhj.al**, **drew.lukas**, **Firelight**, **joeto332987**, **Tuskaruho**, **Cjloha**, and **Alligator1907**. We're absolutely thrilled to have you with us. (And to our anonymous Pioneer out there too, our thanks reaches you — we see you. 💛)
+
 ## v2.15.7
 ### Added
 - Added single-instance window activation signaling so reopening the app restores and focuses the existing desktop window instead of launching a duplicate instance
@@ -141,9 +164,14 @@ A massive thank you to our esteemed Visionaries: **Waterclouds**, **JungleDragon
 - Added support in the Checkpoints page to distinguish standard updates from Early Access-only updates - thanks to @x0x0b!
 - Added torch index for Strix/Gorgon Point Ryzen AI APUs on Windows - thanks to @NeuralFault!
 - Added retry button to failed downloads - thanks to @NeuralFault!
+- Added new Membership support in Account Settings with Patreon migration prompt
 ### Changed
 - Settings file saves are now atomic to prevent corruption from interrupted writes
 - Updated torch indexes for A1111, ComfyUI, InvokeAI, and Forge-based UIs to rocm7.2 / cu128 depending on GPU - thanks to @NeuralFault!
+- Replaced the "Become a Patron" footer button with "Support Us", linking to the new direct Lykos support page at lykos.ai/membership
+- Updated the prompt dialog shown when enabling features like Accelerated Model Discovery to use Lykos accounts instead of Patreon linking
+- Moved the Patreon connection in Account Settings to a new "Legacy Connections" section, only shown for users with an existing Patreon link
+- Localized previously hardcoded strings on the Account Settings page (menu items, descriptions, section headers) and added Japanese, Korean, German, and French translations
 ### Fixed
 - Fixed an issue where `Align Your Steps` scheduler and Unet Loader workflows ignored Regional Prompting (and other addon) conditioning modifiers.
 - Fixed the Package Manager "Add Package" teaching tip opening inopportunely while packages were still loading or after opening the add-package dialog
@@ -163,9 +191,9 @@ A massive thank you to our esteemed Visionaries: **Waterclouds**, **JungleDragon
 - Fixed [#1397](https://github.com/LykosAI/StabilityMatrix/issues/1397), [#610](https://github.com/LykosAI/StabilityMatrix/issues/610) - duplicate pip package entries in results - thanks to @e-nord!
 ### Supporters
 #### 🌟 Visionaries
-Lifting up our legendary Visionaries: **Waterclouds**, **JungleDragon**, **bluepopsicle**, **Bob S**, and **whudunit**. Through every release, every milestone, and every twist of this wild journey, your support has been our north star. A huge welcome to our newest Visionaries **Droolguy** and **snotty** (leveling up from the Pioneer crew!), a warm welcome back to longtime Visionary **Ibixat**, and an equally huge welcome to **LG**, making their Stability Matrix debut straight at the Visionary tier - so glad to have you all on board! We cannot thank you enough for standing behind Stability Matrix!
+Lifting up our legendary Visionaries: **Waterclouds**, **JungleDragon**, **bluepopsicle**, **Bob S**, and **whudunit**. Through every release, every milestone, and every twist of this wild journey, your support has been our north star. A huge welcome to our newest Visionaries **Droolguy** and **snotty** (leveling up from the Pioneer crew!), a warm welcome back to longtime Visionary **Ibixat**, and an equally huge welcome to **LG** and **MrMxyzptlk12836**, making their Stability Matrix debut straight at the Visionary tier - so glad to have you all on board! We cannot thank you enough for standing behind Stability Matrix!
 #### 🚀 Pioneers
-And to our mighty Pioneer crew - the folks who keep the engine humming - thank you for everything! Massive shoutout to: **Szir777**, **Noah M**, **[USA]TechDude**, **Thom**, **SeraphOfSalem**, **Desert Viber**, **Adam**, **ACTUALLY_the_Real_Willem_Dafoe**, **takyamtom**, **robek**, **Ghislain G**, **Phil R**, **Tundra Everquill**, **Andrew B**, **SinthCore**, and **Ahmed S**. And a very warm welcome to our newest Pioneer **Commissar Lord Death**, plus a heartfelt shoutout to one more new Pioneer who joined us quietly through the Stripe migration - you know who you are, and we're so glad to have you!
+And to our mighty Pioneer crew - the folks who keep the engine humming - thank you for everything! Massive shoutout to: **Szir777**, **Noah M**, **[USA]TechDude**, **Thom**, **SeraphOfSalem**, **Desert Viber**, **Adam**, **ACTUALLY_the_Real_Willem_Dafoe**, **takyamtom**, **robek**, **Ghislain G**, **Phil R**, **Tundra Everquill**, **Andrew B**, **SinthCore**, and **Ahmed S**. And a very warm welcome to our newest Pioneers **Commissar Lord Death**, **Firelight**, and **jweg**, plus a heartfelt shoutout to one more new Pioneer who joined us quietly through the Stripe migration - you know who you are, and we're so glad to have you!
 
 And one more heartfelt thank you to everyone now supporting us directly through our new platform - this next chapter wouldn't be possible without your trust, and we're so grateful you've come along for the ride!
 

StabilityMatrix.Avalonia/Services/NotificationService.cs

@@ -45,14 +45,8 @@ public void Initialize(
 
     public void Show(INotification notification)
     {
-        if (Dispatcher.UIThread.CheckAccess())
-        {
-            notificationManager?.Show(notification);
-        }
-        else
-        {
-            Dispatcher.UIThread.Post(() => notificationManager?.Show(notification));
-        }
+        // Must marshal to UI thread - WindowNotificationManager requires it
+        Dispatcher.UIThread.Invoke(() => notificationManager?.Show(notification));
     }
 
     /// <inheritdoc />

StabilityMatrix.Avalonia/Views/Settings/AccountSettingsPage.axaml

@@ -1,4 +1,4 @@
-<controls:UserControlBase
+<controls:UserControlBase
     x:Class="StabilityMatrix.Avalonia.Views.Settings.AccountSettingsPage"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

StabilityMatrix.Core/Models/Packages/ComfyZluda.cs

@@ -102,7 +102,11 @@ public override List<LaunchOptionDefinition> LaunchOptions
                 },
             };
 
-            options.AddRange(base.LaunchOptions.Where(x => x.Name != "Cross Attention Method"));
+            options.AddRange(
+                base.LaunchOptions.Where(x =>
+                    x.Name != "Cross Attention Method" && !x.Options.Contains("--enable-manager")
+                )
+            );
             return options;
         }
     }

StabilityMatrix.Core/Processes/ProcessRunner.cs

@@ -651,8 +651,15 @@ public static Task<ProcessResult> RunBashCommand(
     /// </summary>
     public static string Quote(string argument)
     {
-        var inner = argument.Trim('"');
-        return inner.Contains(' ') ? $"\"{inner}\"" : argument;
+        var inner = argument.Length >= 2 && argument.StartsWith('"') && argument.EndsWith('"')
+            ? argument[1..^1]
+            : argument;
+
+        if (!inner.Contains(' ') && !inner.Contains('"'))
+            return argument;
+
+        var escaped = inner.Replace("\"", "\\\"");
+        return $"\"{escaped}\"";
     }
 
     /// <summary>

StabilityMatrix.Core/Python/PipInstallArgs.cs

@@ -57,7 +57,15 @@ public PipInstallArgs WithParsedFromRequirementsTxt(
             requirementsEntries = requirementsEntries.Where(s => !excludeRegex.IsMatch(s));
         }
 
-        return this.AddArgs(requirementsEntries.Select(Argument.Quoted).ToArray());
+        return this.AddArgs(requirementsEntries.Select(ToRequirementArgument).ToArray());
+    }
+
+    private static Argument ToRequirementArgument(string requirementEntry)
+    {
+        if (requirementEntry.StartsWith('-'))
+            return Argument.Quoted(requirementEntry);
+
+        return new Argument(requirementEntry);
     }
 
     /// <summary>

StabilityMatrix.Tests/Core/PipInstallArgsTests.cs

@@ -81,6 +81,26 @@ public void TestParsedFromRequirementsTxt()
         Assert.AreEqual("torch~=2.0.0 torchvision --extra-index-url https://example.org", args.ToString());
     }
 
+    [TestMethod]
+    public void TestParsedFromRequirementsTxt_KeepsEnvironmentMarkerRequirementAsSingleArgument()
+    {
+        const string requirements = """
+                                    onnxruntime-gpu==1.22.0; python_version < "3.11"
+                                    """;
+
+        var args = new PipInstallArgs().WithParsedFromRequirementsTxt(requirements).ToProcessArgs();
+
+        Assert.AreEqual(1, args.Count());
+        Assert.AreEqual(
+            "\"onnxruntime-gpu==1.22.0; python_version < \\\"3.11\\\"\"",
+            args.Single().GetQuotedValue()
+        );
+        Assert.AreEqual(
+            "\"onnxruntime-gpu==1.22.0; python_version < \\\"3.11\\\"\"",
+            args.ToString()
+        );
+    }
+
     [TestMethod]
     public void TestWithUserOverrides()
     {