Merge branch 'dev' into pr-connected-metadata-organizer

Author: mohnjiles

.github/workflows/cla.yml

@@ -31,7 +31,7 @@ jobs:
           path-to-document: 'https://lykos.ai/cla'
           # branch should not be protected
           branch: 'main'
-          allowlist: ionite34,mohnjiles,bot*
+          allowlist: ionite34,mohnjiles,claude,bot*
           # the followings are the optional inputs - If the optional inputs are not given, then default values will be taken
           remote-organization-name: LykosAI
           remote-repository-name: clabot-config

CHANGELOG.md

@@ -24,7 +24,7 @@
     <PackageVersion Include="DynamicData" Version="9.3.1" />
     <PackageVersion Include="ExifLibNet" Version="2.1.4" />
     <PackageVersion Include="Exceptionless.DateTimeExtensions" Version="3.4.3" />
-    <PackageVersion Include="FreneticLLC.FreneticUtilities" Version="1.0.32" />
+    <PackageVersion Include="FreneticLLC.FreneticUtilities" Version="1.1.4" />
     <PackageVersion Include="FuzzySharp" Version="2.0.2" />
     <PackageVersion Include="Hardware.Info" Version="100.1.0.1" />
     <PackageVersion Include="Injectio" Version="4.0.0" />
@@ -133,4 +133,4 @@
     <PackageVersion Include="xunit" Version="2.9.0" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
   </ItemGroup>
-</Project>
+</Project>

Directory.Packages.props

@@ -383,11 +383,13 @@ internal static void ConfigurePageViewModels(IServiceCollection services)
             provider.GetRequiredService<IModelIndexService>(),
             provider.GetRequiredService<Lazy<IModelDownloadLinkHandler>>(),
             provider.GetRequiredService<INotificationService>(),
+            provider.GetRequiredService<IAppNotificationService>(),
             provider.GetRequiredService<IAnalyticsHelper>(),
             provider.GetRequiredService<IUpdateHelper>(),
             provider.GetRequiredService<ISecretsManager>(),
             provider.GetRequiredService<INavigationService<MainWindowViewModel>>(),
-            provider.GetRequiredService<INavigationService<SettingsViewModel>>()
+            provider.GetRequiredService<INavigationService<SettingsViewModel>>(),
+            provider.GetRequiredService<IDistributedSubscriber<string, Uri>>()
         )
         {
             Pages =
@@ -459,6 +461,14 @@ internal static IServiceCollection ConfigureServices(bool disableMessagePipeInte
         // Named pipe interprocess communication on Windows and Linux for uri handling
         if (!disableMessagePipeInterprocess && (Compat.IsWindows || Compat.IsLinux))
         {
+            // On Linux, named pipes use Unix domain sockets which leave stale socket files
+            // if the app crashes or exits without cleanup. Delete the stale file if no other
+            // instance is running, so the new instance can bind successfully.
+            if (Compat.IsLinux)
+            {
+                CleanupStaleUnixSocket("StabilityMatrix");
+            }
+
             services.AddMessagePipe().AddNamedPipeInterprocess("StabilityMatrix");
         }
         else
@@ -1005,6 +1015,47 @@ private void OnExit(object? sender, EventArgs _)
         }
     }
 
+    /// <summary>
+    /// On Linux, .NET named pipes use Unix domain sockets. If the app exits without cleanup,
+    /// the socket file remains and prevents the next instance from binding.
+    /// This deletes the stale socket file if no other instance holds it.
+    /// </summary>
+    private static void CleanupStaleUnixSocket(string pipeName)
+    {
+        try
+        {
+            var tempPath = Path.GetTempPath();
+            var socketPath = Path.Combine(tempPath, $"CoreFxPipe_{pipeName}");
+
+            if (!File.Exists(socketPath))
+                return;
+
+            // Try connecting to see if another instance is actually listening
+            using var socket = new System.Net.Sockets.Socket(
+                System.Net.Sockets.AddressFamily.Unix,
+                System.Net.Sockets.SocketType.Stream,
+                System.Net.Sockets.ProtocolType.Unspecified
+            );
+
+            try
+            {
+                socket.Connect(new System.Net.Sockets.UnixDomainSocketEndPoint(socketPath));
+                // Connected successfully - another instance is running, don't delete
+            }
+            catch (System.Net.Sockets.SocketException ex)
+                when (ex.SocketErrorCode == System.Net.Sockets.SocketError.ConnectionRefused)
+            {
+                // A refused connection means the socket file exists but nothing is listening anymore.
+                File.Delete(socketPath);
+                Logger.Info("Deleted stale Unix domain socket: {SocketPath}", socketPath);
+            }
+        }
+        catch (Exception e)
+        {
+            Logger.Warn(e, "Failed to clean up stale Unix domain socket");
+        }
+    }
+
     private static void OnServiceProviderDisposing(ServiceProvider serviceProvider)
     {
         // Force materialize SharedFolders so its DisposeAsync is called

StabilityMatrix.Avalonia/App.axaml.cs

@@ -196,6 +196,10 @@ internal static class Assets
 
     public static Uri PatreonUrl { get; } = new("https://patreon.com/StabilityMatrix");
 
+    public static Uri MembershipUrl { get; } = new("https://lykos.ai/membership?ref=a1");
+
+    public static Uri PatreonBlogPostUrl { get; } = new("https://lykos.ai/blog/patreon-update");
+
     public static Uri CivitAIUrl { get; } = new("https://civitai.com");
 
     public static Uri LykosForgotPasswordUrl { get; } = new("https://lykos.ai/forgot-password");

StabilityMatrix.Avalonia/Assets.cs

@@ -198,6 +198,14 @@ public bool CloseOnClickOutside
 
     public BetterContentDialog()
     {
+        // Ensure the dialog uses the correct platform font (e.g. NotoSansJP for Japanese).
+        // ContentDialog is shown as an overlay and its template elements (title, buttons)
+        // don't inherit ContentControlThemeFontFamily from the app resources.
+        if (App.Current is { } app)
+        {
+            FontFamily = app.GetPlatformDefaultFontFamily();
+        }
+
         AddHandler(LoadedEvent, OnLoaded);
         AddHandler(UnloadedEvent, OnUnloaded);
     }

StabilityMatrix.Avalonia/Controls/BetterContentDialog.cs

@@ -2,12 +2,17 @@
 using System.Threading.Tasks;
 using AsyncAwaitBestPractices;
 using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.VisualTree;
 using CommunityToolkit.Mvvm.Input;
 using FluentAvalonia.UI.Controls;
 using Microsoft.Extensions.DependencyInjection;
 using StabilityMatrix.Avalonia.Services;
 using StabilityMatrix.Avalonia.ViewModels.Base;
 using StabilityMatrix.Avalonia.ViewModels.Dialogs;
+using StabilityMatrix.Core.Helper;
 using StabilityMatrix.Core.Models;
 
 namespace StabilityMatrix.Avalonia.Controls;
@@ -17,6 +22,66 @@ public partial class FADownloadableComboBox : FAComboBox
 {
     protected override Type StyleKeyOverride => typeof(FAComboBox);
 
+    private Popup? dropDownPopup;
+    private IDisposable? openSubscription;
+
+    protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+    {
+        base.OnApplyTemplate(e);
+
+        CleanupSubscription();
+        DropDownOpened -= OnDropDownOpenedHandler;
+        DropDownClosed -= OnDropDownClosedHandler;
+
+        // Template part name is "Popup" per FAComboBox.properties.cs (s_tpPopup = "Popup")
+        dropDownPopup = e.NameScope.Find<Popup>("Popup");
+
+        DropDownOpened += OnDropDownOpenedHandler;
+        DropDownClosed += OnDropDownClosedHandler;
+    }
+
+    private void OnDropDownOpenedHandler(object? sender, EventArgs e)
+    {
+        CleanupSubscription();
+
+        if (dropDownPopup?.Child is not Control popupChild)
+            return;
+
+        var scrollViewer = popupChild.GetVisualDescendants().OfType<ScrollViewer>().FirstOrDefault();
+
+        if (scrollViewer == null)
+            return;
+
+        // On Unix-like systems, overlay popups share the same TopLevel visual root as the main window.
+        // FAComboBox.OnPopupOpened adds a TopLevel tunnel handler that marks all wheel eventsas handled while the dropdown is open,
+        // which inadvertently blocks scroll-wheelevents in popup menus in Inference model cards.
+        // Resetting e.Handled on the ScrollViewer's tunnel phase counters this.
+        if (!Compat.IsUnix)
+            return;
+
+        openSubscription = scrollViewer.AddDisposableHandler(
+            PointerWheelChangedEvent,
+            static (_, ev) =>
+            {
+                if (ev.Handled)
+                    ev.Handled = false;
+            },
+            RoutingStrategies.Tunnel,
+            handledEventsToo: true
+        );
+    }
+
+    private void OnDropDownClosedHandler(object? sender, EventArgs e)
+    {
+        CleanupSubscription();
+    }
+
+    private void CleanupSubscription()
+    {
+        openSubscription?.Dispose();
+        openSubscription = null;
+    }
+
     static FADownloadableComboBox()
     {
         SelectionChangedEvent.AddClassHandler<FADownloadableComboBox>(

StabilityMatrix.Avalonia/Controls/FADownloadableComboBox.cs

@@ -0,0 +1,33 @@
+<UserControl
+    x:Class="StabilityMatrix.Avalonia.Controls.NotificationBanner"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:designData="clr-namespace:StabilityMatrix.Avalonia.DesignData"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="using:FluentAvalonia.UI.Controls"
+    xmlns:vm="using:StabilityMatrix.Avalonia.ViewModels"
+    d:DataContext="{x:Static designData:DesignData.NotificationBannerViewModel}"
+    d:DesignHeight="150"
+    d:DesignWidth="1100"
+    x:DataType="vm:NotificationBannerViewModel"
+    IsVisible="{Binding IsVisible}"
+    mc:Ignorable="d">
+
+    <ui:InfoBar
+        Margin="12,8,12,4"
+        CloseButtonCommand="{Binding DismissClickedCommand}"
+        FontSize="14"
+        FontWeight="SemiBold"
+        IsClosable="{Binding IsDismissible}"
+        IsOpen="True"
+        Message="{Binding Message}"
+        Severity="{Binding Severity}">
+        <ui:InfoBar.ActionButton>
+            <Button
+                Command="{Binding ActionClickedCommand}"
+                Content="{Binding ActionLabel}"
+                IsVisible="{Binding HasAction}" />
+        </ui:InfoBar.ActionButton>
+    </ui:InfoBar>
+</UserControl>

StabilityMatrix.Avalonia/Controls/NotificationBanner.axaml

@@ -0,0 +1,13 @@
+using Avalonia.Controls;
+using Injectio.Attributes;
+
+namespace StabilityMatrix.Avalonia.Controls;
+
+[RegisterTransient<NotificationBanner>]
+public partial class NotificationBanner : UserControlBase
+{
+    public NotificationBanner()
+    {
+        InitializeComponent();
+    }
+}

StabilityMatrix.Avalonia/Controls/NotificationBanner.axaml.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
@@ -138,7 +138,7 @@ public static void Initialize()
             .AddSingleton(Substitute.For<INotificationService>())
             .AddSingleton(Substitute.For<ISharedFolders>())
             .AddSingleton(Substitute.For<IDownloadService>())
-            .AddSingleton(Substitute.For<IHttpClientFactory>())
+            .AddSingleton(CreateHttpClientFactory())
             .AddSingleton(Substitute.For<IApiFactory>())
             .AddSingleton(Substitute.For<IDiscordRichPresenceService>())
             .AddSingleton(Substitute.For<ITrackedDownloadService>())
@@ -459,6 +459,13 @@ public static void Initialize()
     [NotNull]
     public static PackageInstallBrowserViewModel? NewInstallerDialogViewModel { get; private set; }
 
+    private static IHttpClientFactory CreateHttpClientFactory()
+    {
+        var httpClientFactory = Substitute.For<IHttpClientFactory>();
+        httpClientFactory.CreateClient(Arg.Any<string>()).Returns(_ => new HttpClient());
+        return httpClientFactory;
+    }
+
     [NotNull]
     public static PackageInstallDetailViewModel? PackageInstallDetailViewModel { get; private set; }
 
@@ -477,6 +484,27 @@ public static void Initialize()
     public static FirstLaunchSetupViewModel FirstLaunchSetupViewModel =>
         Services.GetRequiredService<FirstLaunchSetupViewModel>();
 
+    public static NotificationBannerViewModel NotificationBannerViewModel =>
+        DialogFactory.Get<NotificationBannerViewModel>(vm =>
+        {
+            vm.Show(
+                new Core.Models.Notifications.AppNotification
+                {
+                    Id = "test",
+                    Type = Core.Models.Notifications.AppNotificationType.Banner,
+                    Priority = Core.Models.Notifications.AppNotificationPriority.Normal,
+                    Message = new Dictionary<string, string> { { "en", "This is a test notification." } },
+                    Style = new Core.Models.Notifications.AppNotificationStyle { Variant = "info" },
+                    Action = new Core.Models.Notifications.AppNotificationAction
+                    {
+                        Type = Core.Models.Notifications.AppNotificationActionType.Url,
+                        Label = new Dictionary<string, string> { { "en", "Learn More" } },
+                        Url = "https://example.com",
+                    },
+                }
+            );
+        });
+
     public static LaunchPageViewModel LaunchPageViewModel =>
         Services.GetRequiredService<LaunchPageViewModel>();