fix migration issue

Signed-off-by: Shawn Yuan <shuai.yuan.zju@gmail.com>

src/common/LanguageModelProvider/FoundryLocal/FoundryClient.cs

@@ -205,12 +205,4 @@ internal sealed class FoundryClient
             return false;
         }
     }
-
-    public async Task EnsureRunning()
-    {
-        if (!_foundryManager.IsServiceRunning)
-        {
-            await _foundryManager.StartServiceAsync();
-        }
-    }
 }

src/common/LanguageModelProvider/FoundryLocalModelProvider.cs

@@ -13,7 +13,7 @@ namespace LanguageModelProvider;
 public sealed class FoundryLocalModelProvider : ILanguageModelProvider
 {
     private IEnumerable<ModelDetails>? _downloadedModels;
-    private FoundryClient? _foundryClient;
+    private FoundryClient? _foundryManager;
     private string? _serviceUrl;
 
     public static FoundryLocalModelProvider Instance { get; } = new();
@@ -22,11 +22,13 @@ public sealed class FoundryLocalModelProvider : ILanguageModelProvider
 
     public string ProviderDescription => "The model will run locally via Foundry Local";
 
-    public IChatClient? GetIChatClient(string modelId)
+    public string UrlPrefix => "fl://";
+
+    public IChatClient? GetIChatClient(string url)
     {
         try
         {
-            Logger.LogInfo($"[FoundryLocal] GetIChatClient called with url: {modelId}");
+            Logger.LogInfo($"[FoundryLocal] GetIChatClient called with url: {url}");
             InitializeAsync().GetAwaiter().GetResult();
         }
         catch (Exception ex)
@@ -35,22 +37,26 @@ public sealed class FoundryLocalModelProvider : ILanguageModelProvider
             return null;
         }
 
-        if (string.IsNullOrWhiteSpace(_serviceUrl) || _foundryClient == null)
+        if (string.IsNullOrWhiteSpace(_serviceUrl) || _foundryManager == null)
         {
             Logger.LogError("[FoundryLocal] Service URL or manager is null");
             return null;
         }
 
+        // Extract model ID from URL (format: fl://modelname)
+        var modelId = url.Replace(UrlPrefix, string.Empty).Trim('/');
         if (string.IsNullOrWhiteSpace(modelId))
         {
             Logger.LogError("[FoundryLocal] Model ID is empty after extraction");
             return null;
         }
 
+        Logger.LogInfo($"[FoundryLocal] Extracted model ID: {modelId}");
+
         // Ensure the model is loaded before returning chat client
         try
         {
-            var isLoaded = _foundryClient.EnsureModelLoaded(modelId).GetAwaiter().GetResult();
+            var isLoaded = _foundryManager.EnsureModelLoaded(modelId).GetAwaiter().GetResult();
             if (!isLoaded)
             {
                 Logger.LogError($"[FoundryLocal] Failed to load model: {modelId}");
@@ -66,7 +72,7 @@ public sealed class FoundryLocalModelProvider : ILanguageModelProvider
         }
 
         // Use ServiceUri instead of Endpoint since Endpoint already includes /v1
-        var baseUri = _foundryClient.GetServiceUri();
+        var baseUri = _foundryManager.GetServiceUri();
         if (baseUri == null)
         {
             Logger.LogError("[FoundryLocal] Service URI is null");
@@ -127,25 +133,24 @@ public sealed class FoundryLocalModelProvider : ILanguageModelProvider
 
     private async Task InitializeAsync(CancellationToken cancelationToken = default)
     {
-        if (_foundryClient != null && _downloadedModels != null && _downloadedModels.Any())
+        if (_foundryManager != null && _downloadedModels != null && _downloadedModels.Any())
         {
-            await _foundryClient.EnsureRunning().ConfigureAwait(false);
             return;
         }
 
         Logger.LogInfo("[FoundryLocal] Initializing provider");
-        _foundryClient ??= await FoundryClient.CreateAsync();
+        _foundryManager ??= await FoundryClient.CreateAsync();
 
-        if (_foundryClient == null)
+        if (_foundryManager == null)
         {
             Logger.LogError("[FoundryLocal] Failed to create Foundry client");
             return;
         }
 
-        _serviceUrl ??= await _foundryClient.GetServiceUrl();
+        _serviceUrl ??= await _foundryManager.GetServiceUrl();
         Logger.LogInfo($"[FoundryLocal] Service URL: {_serviceUrl}");
 
-        var cachedModels = await _foundryClient.ListCachedModels();
+        var cachedModels = await _foundryManager.ListCachedModels();
         Logger.LogInfo($"[FoundryLocal] Found {cachedModels.Count} cached models");
 
         List<ModelDetails> downloadedModels = [];
@@ -157,7 +162,7 @@ public sealed class FoundryLocalModelProvider : ILanguageModelProvider
             {
                 Id = $"fl-{model.Name}",
                 Name = model.Name,
-                Url = $"fl://{model.Name}",
+                Url = $"{UrlPrefix}{model.Name}",
                 Description = $"{model.Name} running locally with Foundry Local",
                 HardwareAccelerators = [HardwareAccelerator.FOUNDRYLOCAL],
                 SupportedOnQualcomm = true,
@@ -173,7 +178,7 @@ public sealed class FoundryLocalModelProvider : ILanguageModelProvider
     {
         Logger.LogInfo("[FoundryLocal] Checking availability");
         await InitializeAsync();
-        var available = _foundryClient != null;
+        var available = _foundryManager != null;
         Logger.LogInfo($"[FoundryLocal] Available: {available}");
         return available;
     }

src/common/LanguageModelProvider/ILanguageModelProvider.cs

@@ -10,11 +10,13 @@ public interface ILanguageModelProvider
 {
     string Name { get; }
 
+    string UrlPrefix { get; }
+
     string ProviderDescription { get; }
 
     Task<IEnumerable<ModelDetails>> GetModelsAsync(bool ignoreCached = false, CancellationToken cancelationToken = default);
 
-    IChatClient? GetIChatClient(string modelId);
+    IChatClient? GetIChatClient(string url);
 
     string GetIChatClientString(string url);
 }

src/common/LanguageModelProvider/LanguageModelService.cs

@@ -0,0 +1,106 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Collections.Concurrent;
+using Microsoft.Extensions.AI;
+
+namespace LanguageModelProvider;
+
+public sealed class LanguageModelService
+{
+    private readonly ConcurrentDictionary<string, ILanguageModelProvider> _providersByPrefix;
+
+    public LanguageModelService(IEnumerable<ILanguageModelProvider> providers)
+    {
+        ArgumentNullException.ThrowIfNull(providers);
+
+        _providersByPrefix = new ConcurrentDictionary<string, ILanguageModelProvider>(StringComparer.OrdinalIgnoreCase);
+
+        foreach (var provider in providers)
+        {
+            if (!string.IsNullOrWhiteSpace(provider.UrlPrefix))
+            {
+                _providersByPrefix[provider.UrlPrefix] = provider;
+            }
+        }
+    }
+
+    public static LanguageModelService CreateDefault()
+    {
+        return new LanguageModelService(new[]
+        {
+            FoundryLocalModelProvider.Instance,
+        });
+    }
+
+    public IReadOnlyCollection<ILanguageModelProvider> Providers => _providersByPrefix.Values.ToArray();
+
+    public bool RegisterProvider(ILanguageModelProvider provider)
+    {
+        ArgumentNullException.ThrowIfNull(provider);
+
+        if (string.IsNullOrWhiteSpace(provider.UrlPrefix))
+        {
+            throw new ArgumentException("Provider must supply a URL prefix.", nameof(provider));
+        }
+
+        _providersByPrefix[provider.UrlPrefix] = provider;
+        return true;
+    }
+
+    public ILanguageModelProvider? GetProviderFor(string? modelReference)
+    {
+        if (string.IsNullOrWhiteSpace(modelReference))
+        {
+            return null;
+        }
+
+        foreach (var provider in _providersByPrefix.Values)
+        {
+            if (modelReference.StartsWith(provider.UrlPrefix, StringComparison.OrdinalIgnoreCase))
+            {
+                return provider;
+            }
+        }
+
+        return null;
+    }
+
+    public async Task<IReadOnlyList<ModelDetails>> GetModelsAsync(bool refresh = false, CancellationToken cancellationToken = default)
+    {
+        List<ModelDetails> models = [];
+
+        foreach (var provider in _providersByPrefix.Values)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+            var providerModels = await provider.GetModelsAsync(refresh, cancellationToken).ConfigureAwait(false);
+            models.AddRange(providerModels);
+        }
+
+        return models;
+    }
+
+    public IChatClient? GetClient(ModelDetails model)
+    {
+        if (model is null)
+        {
+            return null;
+        }
+
+        var reference = !string.IsNullOrWhiteSpace(model.Url) ? model.Url : model.Id;
+        return GetClient(reference);
+    }
+
+    public IChatClient? GetClient(string? modelReference)
+    {
+        if (string.IsNullOrWhiteSpace(modelReference))
+        {
+            return null;
+        }
+
+        var provider = GetProviderFor(modelReference);
+
+        return provider?.GetIChatClient(modelReference);
+    }
+}

src/modules/AdvancedPaste/AdvancedPaste/Helpers/UserSettings.cs

@@ -213,10 +213,11 @@ namespace AdvancedPaste.Settings
                 RemoveLegacyOpenAICredential();
             }
 
+            bool shouldEnableAI = legacyCredential is not null;
             bool enabledUpdated = false;
-            if (!properties.IsAIEnabled && legacyCredential is not null)
+            if (properties.IsAIEnabled != shouldEnableAI)
             {
-                properties.IsAIEnabled = true;
+                properties.IsAIEnabled = shouldEnableAI;
                 enabledUpdated = true;
             }
 

src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/FoundryLocalPasteProvider.cs

@@ -23,7 +23,7 @@ public sealed class FoundryLocalPasteProvider : IPasteAIProvider
 
     public static PasteAIProviderRegistration Registration { get; } = new(SupportedTypes, config => new FoundryLocalPasteProvider(config));
 
-    private static readonly FoundryLocalModelProvider _modelProvider = FoundryLocalModelProvider.Instance;
+    private static readonly LanguageModelService LanguageModels = LanguageModelService.CreateDefault();
 
     private readonly PasteAIConfig _config;
 
@@ -72,11 +72,11 @@ public sealed class FoundryLocalPasteProvider : IPasteAIProvider
                 throw new PasteActionException(
                     "No Foundry Local model selected",
                     new InvalidOperationException("Model identifier is required"),
-                    aiServiceMessage: "Please select a model in the AI provider settings.");
+                    aiServiceMessage: "Please select a model in the AI provider settings. Model identifier should be in the format 'fl://model-name'.");
             }
 
             cancellationToken.ThrowIfCancellationRequested();
-            var chatClient = _modelProvider.GetIChatClient(modelReference);
+            var chatClient = LanguageModels.GetClient(modelReference);
             if (chatClient is null)
             {
                 throw new PasteActionException(
@@ -85,6 +85,9 @@ public sealed class FoundryLocalPasteProvider : IPasteAIProvider
                     aiServiceMessage: "The model may not be downloaded or the Foundry Local service may not be running. Please check the model status in settings.");
             }
 
+            // Extract actual model ID from the URL (format: fl://modelId)
+            var actualModelId = modelReference.Replace("fl://", string.Empty).Trim('/');
+
             var userMessageContent = $"""
                 User instructions:
                 {prompt}
@@ -101,7 +104,7 @@ public sealed class FoundryLocalPasteProvider : IPasteAIProvider
                 new(ChatRole.User, userMessageContent),
             };
 
-            var chatOptions = CreateChatOptions(_config?.SystemPrompt, modelReference);
+            var chatOptions = CreateChatOptions(_config?.SystemPrompt, actualModelId);
 
             progress?.Report(0.1);
 

src/settings-ui/Settings.UI.Library/AdvancedPasteProperties.cs

@@ -34,52 +34,6 @@ namespace Microsoft.PowerToys.Settings.UI.Library
         [JsonConverter(typeof(BoolPropertyJsonConverter))]
         public bool IsAIEnabled { get; set; }
 
-        [JsonExtensionData]
-        public Dictionary<string, JsonElement> ExtensionData
-        {
-            get => _extensionData;
-            set
-            {
-                _extensionData = value;
-
-                if (_extensionData != null && _extensionData.TryGetValue("IsOpenAIEnabled", out var legacyElement) && legacyElement.ValueKind == JsonValueKind.Object && legacyElement.TryGetProperty("value", out var valueElement))
-                {
-                    IsAIEnabled = valueElement.ValueKind switch
-                    {
-                        JsonValueKind.True => true,
-                        JsonValueKind.False => false,
-                        _ => IsAIEnabled,
-                    };
-
-                    _extensionData.Remove("IsOpenAIEnabled");
-                }
-
-                if (_extensionData != null && _extensionData.TryGetValue("IsAdvancedAIEnabled", out var legacyAdvancedElement))
-                {
-                    bool? legacyValue = legacyAdvancedElement.ValueKind switch
-                    {
-                        JsonValueKind.True => true,
-                        JsonValueKind.False => false,
-                        JsonValueKind.Object when legacyAdvancedElement.TryGetProperty("value", out var advancedValueElement) => advancedValueElement.ValueKind switch
-                        {
-                            JsonValueKind.True => true,
-                            JsonValueKind.False => false,
-                            _ => null,
-                        },
-                        _ => null,
-                    };
-
-                    if (legacyValue.HasValue)
-                    {
-                        LegacyAdvancedAIEnabled = legacyValue.Value;
-                    }
-
-                    _extensionData.Remove("IsAdvancedAIEnabled");
-                }
-            }
-        }
-
-        private Dictionary<string, JsonElement> _extensionData;
         private bool? _legacyAdvancedAIEnabled;
 
         [JsonPropertyName("IsAdvancedAIEnabled")]

src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml.cs

@@ -27,6 +27,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
     public sealed partial class AdvancedPastePage : NavigablePage, IRefreshablePage, IDisposable
     {
         private readonly ObservableCollection<ModelDetails> _foundryCachedModels = new();
+        private readonly ObservableCollection<FoundryDownloadableModel> _foundryDownloadableModels = new();
         private CancellationTokenSource _foundryModelLoadCts;
         private bool _suppressFoundrySelectionChanged;
         private bool _isFoundryLocalAvailable;
@@ -56,6 +57,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
             if (FoundryLocalPicker is not null)
             {
                 FoundryLocalPicker.CachedModels = _foundryCachedModels;
+                FoundryLocalPicker.DownloadableModels = _foundryDownloadableModels;
                 FoundryLocalPicker.SelectionChanged += FoundryLocalPicker_SelectionChanged;
                 FoundryLocalPicker.LoadRequested += FoundryLocalPicker_LoadRequested;
             }
@@ -467,7 +469,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
 
                 var cachedModels = cachedModelsEnumerable?.ToList() ?? new List<ModelDetails>();
 
-                UpdateFoundryCollections(cachedModels);
+                UpdateFoundryCollections(cachedModels, []);
                 ShowFoundryAvailableState();
                 RestoreFoundrySelection(cachedModels);
             }
@@ -536,7 +538,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
             UpdateFoundrySaveButtonState();
         }
 
-        private void UpdateFoundryCollections(IReadOnlyCollection<ModelDetails> cachedModels)
+        private void UpdateFoundryCollections(IReadOnlyCollection<ModelDetails> cachedModels, IReadOnlyCollection<ModelDetails> catalogModels)
         {
             _foundryCachedModels.Clear();
 
@@ -545,7 +547,20 @@ namespace Microsoft.PowerToys.Settings.UI.Views
                 _foundryCachedModels.Add(model);
             }
 
-            var cachedReferences = new HashSet<string>(_foundryCachedModels.Select(m => m.Name), StringComparer.OrdinalIgnoreCase);
+            var cachedReferences = new HashSet<string>(_foundryCachedModels.Select(m => NormalizeFoundryModelReference(m.Url ?? m.Name)), StringComparer.OrdinalIgnoreCase);
+
+            _foundryDownloadableModels.Clear();
+
+            foreach (var model in catalogModels.OrderBy(m => m.Name, StringComparer.OrdinalIgnoreCase))
+            {
+                var reference = NormalizeFoundryModelReference(model.Url ?? model.Name);
+                if (cachedReferences.Contains(reference))
+                {
+                    continue;
+                }
+
+                _foundryDownloadableModels.Add(new FoundryDownloadableModel(model));
+            }
         }
 
         private void RestoreFoundrySelection(IReadOnlyCollection<ModelDetails> cachedModels)
@@ -561,8 +576,9 @@ namespace Microsoft.PowerToys.Settings.UI.Views
 
             if (!string.IsNullOrWhiteSpace(currentModelReference))
             {
+                var normalizedReference = NormalizeFoundryModelReference(currentModelReference);
                 matchingModel = cachedModels.FirstOrDefault(model =>
-                    string.Equals(model.Name, currentModelReference, StringComparison.OrdinalIgnoreCase));
+                    string.Equals(NormalizeFoundryModelReference(model.Url ?? model.Name), normalizedReference, StringComparison.OrdinalIgnoreCase));
             }
 
             if (FoundryLocalPicker is null)
@@ -592,7 +608,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
             {
                 if (ViewModel?.PasteAIProviderDraft is not null)
                 {
-                    ViewModel.PasteAIProviderDraft.ModelName = matchingModel.Name;
+                    ViewModel.PasteAIProviderDraft.ModelName = NormalizeFoundryModelReference(matchingModel.Url ?? matchingModel.Name);
                 }
 
                 if (FoundryLocalPicker is not null)
@@ -604,6 +620,19 @@ namespace Microsoft.PowerToys.Settings.UI.Views
             UpdateFoundrySaveButtonState();
         }
 
+        private static string NormalizeFoundryModelReference(string modelReference)
+        {
+            if (string.IsNullOrWhiteSpace(modelReference))
+            {
+                return string.Empty;
+            }
+
+            var prefix = FoundryLocalModelProvider.Instance.UrlPrefix;
+            return modelReference.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)
+                ? modelReference
+                : $"{prefix}{modelReference}";
+        }
+
         private void UpdateFoundrySaveButtonState()
         {
             if (PasteAIProviderConfigurationDialog is null)
@@ -627,7 +656,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
                 return;
             }
 
-            if (!_isFoundryLocalAvailable)
+            if (!_isFoundryLocalAvailable || _foundryDownloadableModels.Any(model => model.IsDownloading))
             {
                 PasteAIProviderConfigurationDialog.IsPrimaryButtonEnabled = false;
                 return;
@@ -648,7 +677,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
             {
                 if (ViewModel?.PasteAIProviderDraft is not null)
                 {
-                    ViewModel.PasteAIProviderDraft.ModelName = selectedModel.Name;
+                    ViewModel.PasteAIProviderDraft.ModelName = NormalizeFoundryModelReference(selectedModel.Url ?? selectedModel.Name);
                 }
 
                 if (FoundryLocalPicker is not null)

src/settings-ui/Settings.UI/ViewModels/AdvancedPasteViewModel.cs

@@ -233,10 +233,11 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
                 RemoveLegacyOpenAICredential();
             }
 
+            bool shouldEnableAI = legacyCredential is not null;
             bool enabledChanged = false;
-            if (!properties.IsAIEnabled && legacyCredential is not null)
+            if (properties.IsAIEnabled != shouldEnableAI)
             {
-                properties.IsAIEnabled = true;
+                properties.IsAIEnabled = shouldEnableAI;
                 enabledChanged = true;
             }