Skip to content

Fastest and only macOS Dictation app with on-device STT and custom trained AI enhancement model. Windows, iOS testflight! Android, Linux waitlist open! A local Wispr Flow alternative. Follow https://x.com/fluidvoiceapp for more

Unified AI settings part to have a single source of model repo info - earlier used to be in 3 areas for different modes ; cleaned up legacy model hardcode for OpenAI and Groq as supported providers ; Added Cerebras,Ollama, LM Stdio, OpenRouter as built in providers ; Added auto model retrieval for different providers once they are configured ; Once it is configured and the API key is entered, you can press the Refresh button to get all the models from each provider

altic-dev1fb2a3640b6e
diff --git a/Sources/Fluid/ContentView.swift b/Sources/Fluid/ContentView.swift
index 60c0d048..65078235 100644
--- a/Sources/Fluid/ContentView.swift
+++ b/Sources/Fluid/ContentView.swift
@@ -88,7 +88,7 @@ struct ContentView: View {
@State private var aiInputText: String = ""
@State private var aiOutputText: String = ""
@State private var isCallingAI: Bool = false
- @State private var openAIBaseURL: String = "https://api.openai.com/v1"
+ @State private var openAIBaseURL: String = ModelRepository.shared.defaultBaseURL(for: "openai")
@State private var enableDebugLogs: Bool = SettingsStore.shared.enableDebugLogs
@State private var pressAndHoldModeEnabled: Bool = SettingsStore.shared.pressAndHoldMode
@@ -278,10 +278,11 @@ struct ContentView: View {
for (key, models) in self.availableModelsByProvider {
let lower = key.lowercased()
let newKey: String
- if lower == "openai" || lower == "groq" {
+ // Use ModelRepository to correctly identify ALL built-in providers
+ if ModelRepository.shared.isBuiltIn(lower) {
newKey = lower
} else {
- newKey = key.hasPrefix("custom:") ? key : "custom:\\(key)"
+ newKey = key.hasPrefix("custom:") ? key : "custom:\(key)"
}
// Keep only unique, trimmed models
let clean = Array(Set(models.map { $0.trimmingCharacters(in: .whitespacesAndNewlines) })).sorted()
@@ -294,8 +295,9 @@ struct ContentView: View {
var normalizedSel: [String: String] = [:]
for (key, model) in self.selectedModelByProvider {
let lower = key.lowercased()
- let newKey: String = (lower == "openai" || lower == "groq") ? lower :
- (key.hasPrefix("custom:") ? key : "custom:\\(key)")
+ // Use ModelRepository to correctly identify ALL built-in providers
+ let newKey: String = ModelRepository.shared.isBuiltIn(lower) ? lower :
+ (key.hasPrefix("custom:") ? key : "custom:\(key)")
if let list = normalized[newKey], list.contains(model) { normalizedSel[newKey] = model }
}
self.selectedModelByProvider = normalizedSel
@@ -978,13 +980,12 @@ struct ContentView: View {
// MARK: - Provider Management Functions
private func providerKey(for providerID: String) -> String {
- if providerID == "openai" || providerID == "groq" { return providerID }
- // Saved providers use their stable id
+ // Built-in providers use their ID directly
+ if ModelRepository.shared.isBuiltIn(providerID) { return providerID }
+ // Saved providers use their stable id with "custom:" prefix
return providerID.isEmpty ? self.currentProvider : "custom:\(providerID)"
}
-
-
private func updateCurrentProvider() {
// Map baseURL to canonical key for built-ins; else keep existing
let url = self.openAIBaseURL.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
@@ -1218,20 +1219,19 @@ struct ContentView: View {
// Get provider info
if let saved = storedSavedProviders.first(where: { $0.id == currentSelectedProviderID }) {
+ // Saved/custom provider
derivedCurrentProvider = "custom:\(saved.id)"
derivedBaseURL = saved.baseURL
derivedSelectedModel = storedSelectedModelByProvider[derivedCurrentProvider] ?? saved.models.first ?? ""
- } else if currentSelectedProviderID == "openai" {
- derivedCurrentProvider = "openai"
- derivedBaseURL = "https://api.openai.com/v1"
- derivedSelectedModel = storedSelectedModelByProvider["openai"] ?? "gpt-4.1"
- } else if currentSelectedProviderID == "groq" {
- derivedCurrentProvider = "groq"
- derivedBaseURL = "https://api.groq.com/openai/v1"
- derivedSelectedModel = storedSelectedModelByProvider["groq"] ?? "openai/gpt-oss-120b"
+ } else if ModelRepository.shared.isBuiltIn(currentSelectedProviderID) {
+ // Built-in provider (openai, groq, cerebras, google, openrouter, ollama, lmstudio)
+ derivedCurrentProvider = currentSelectedProviderID
+ derivedBaseURL = ModelRepository.shared.defaultBaseURL(for: currentSelectedProviderID)
+ derivedSelectedModel = storedSelectedModelByProvider[currentSelectedProviderID] ?? ModelRepository.shared.defaultModels(for: currentSelectedProviderID).first ?? ""
} else {
+ // Unknown provider - fallback to OpenAI
derivedCurrentProvider = currentSelectedProviderID
- derivedBaseURL = "https://api.openai.com/v1"
+ derivedBaseURL = ModelRepository.shared.defaultBaseURL(for: "openai")
derivedSelectedModel = storedSelectedModelByProvider[currentSelectedProviderID] ?? ""
}
diff --git a/Sources/Fluid/Networking/AIProvider.swift b/Sources/Fluid/Networking/AIProvider.swift
index abc594a2..1541d9d8 100644
--- a/Sources/Fluid/Networking/AIProvider.swift
+++ b/Sources/Fluid/Networking/AIProvider.swift
@@ -69,7 +69,7 @@ final class OpenAICompatibleProvider: AIProvider {
}
func process(systemPrompt: String, userText: String, model: String, apiKey: String, baseURL: String, stream: Bool = false) async -> String {
- let endpoint = baseURL.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ? "https://api.openai.com/v1" : baseURL.trimmingCharacters(in: .whitespacesAndNewlines)
+ let endpoint = baseURL.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ? ModelRepository.shared.defaultBaseURL(for: "openai") : baseURL.trimmingCharacters(in: .whitespacesAndNewlines)
// Build the full URL - only append /chat/completions if not already present
let fullEndpoint: String
diff --git a/Sources/Fluid/Networking/FunctionCallingProvider.swift b/Sources/Fluid/Networking/FunctionCallingProvider.swift
index 87e238f1..0dfcefb8 100644
--- a/Sources/Fluid/Networking/FunctionCallingProvider.swift
+++ b/Sources/Fluid/Networking/FunctionCallingProvider.swift
@@ -186,7 +186,7 @@ final class FunctionCallingProvider {
baseURL: String
) async -> LLMResult {
let endpoint = baseURL.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ?
- "https://api.openai.com/v1" : baseURL.trimmingCharacters(in: .whitespacesAndNewlines)
+ ModelRepository.shared.defaultBaseURL(for: "openai") : baseURL.trimmingCharacters(in: .whitespacesAndNewlines)
// Build the full URL
let fullEndpoint: String
@@ -327,7 +327,7 @@ final class FunctionCallingProvider {
baseURL: String
) async -> LLMResult {
let endpoint = baseURL.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ?
- "https://api.openai.com/v1" : baseURL.trimmingCharacters(in: .whitespacesAndNewlines)
+ ModelRepository.shared.defaultBaseURL(for: "openai") : baseURL.trimmingCharacters(in: .whitespacesAndNewlines)
let fullEndpoint: String
if endpoint.contains("/chat/completions") ||
diff --git a/Sources/Fluid/Persistence/SettingsStore.swift b/Sources/Fluid/Persistence/SettingsStore.swift
index 0304ad40..4a3685d7 100644
--- a/Sources/Fluid/Persistence/SettingsStore.swift
+++ b/Sources/Fluid/Persistence/SettingsStore.swift
@@ -1124,7 +1124,8 @@ final class SettingsStore: ObservableObject {
}
private func canonicalProviderKey(for providerID: String) -> String {
- if providerID == "openai" || providerID == "groq" {
+ // Built-in providers use their ID directly
+ if ModelRepository.shared.isBuiltIn(providerID) {
return providerID
}
if providerID.hasPrefix("custom:") {
diff --git a/Sources/Fluid/Services/CommandModeService.swift b/Sources/Fluid/Services/CommandModeService.swift
index 886af5cf..be5d5dcb 100644
--- a/Sources/Fluid/Services/CommandModeService.swift
+++ b/Sources/Fluid/Services/CommandModeService.swift
@@ -701,10 +701,10 @@ final class CommandModeService: ObservableObject {
let baseURL: String
if let provider = settings.savedProviders.first(where: { $0.id == providerID }) {
baseURL = provider.baseURL
- } else if providerID == "groq" {
- baseURL = "https://api.groq.com/openai/v1"
+ } else if ModelRepository.shared.isBuiltIn(providerID) {
+ baseURL = ModelRepository.shared.defaultBaseURL(for: providerID)
} else {
- baseURL = "https://api.openai.com/v1"
+ baseURL = ModelRepository.shared.defaultBaseURL(for: "openai")
}
// Build conversation with agentic system prompt
diff --git a/Sources/Fluid/Services/DictationAIPostProcessingGate.swift b/Sources/Fluid/Services/DictationAIPostProcessingGate.swift
index 08ddc2fb..70b8302e 100644
--- a/Sources/Fluid/Services/DictationAIPostProcessingGate.swift
+++ b/Sources/Fluid/Services/DictationAIPostProcessingGate.swift
@@ -28,10 +28,12 @@ enum DictationAIPostProcessingGate {
if let saved = settings.savedProviders.first(where: { $0.id == providerID }) {
return saved.baseURL.trimmingCharacters(in: .whitespacesAndNewlines)
}
- if providerID == "groq" {
- return "https://api.groq.com/openai/v1"
+ // Use ModelRepository for all built-in providers (openai, groq, cerebras, google, openrouter, ollama, lmstudio)
+ if ModelRepository.shared.isBuiltIn(providerID) {
+ return ModelRepository.shared.defaultBaseURL(for: providerID)
}
- return "https://api.openai.com/v1"
+ // Unknown provider - fallback to OpenAI
+ return ModelRepository.shared.defaultBaseURL(for: "openai")
}
static func isLocalEndpoint(_ urlString: String) -> Bool {
diff --git a/Sources/Fluid/Services/LLMClient.swift b/Sources/Fluid/Services/LLMClient.swift
index d2ea85f1..3a2c51f8 100644
--- a/Sources/Fluid/Services/LLMClient.swift
+++ b/Sources/Fluid/Services/LLMClient.swift
@@ -163,7 +163,7 @@ final class LLMClient {
{
endpoint = baseURL
} else {
- endpoint = baseURL.isEmpty ? "https://api.openai.com/v1/chat/completions" : "\(baseURL)/chat/completions"
+ endpoint = baseURL.isEmpty ? "\(ModelRepository.shared.defaultBaseURL(for: "openai"))/chat/completions" : "\(baseURL)/chat/completions"
}
guard let url = URL(string: endpoint) else {
diff --git a/Sources/Fluid/Services/ModelRepository.swift b/Sources/Fluid/Services/ModelRepository.swift
index 15492c10..8993e3d2 100644
--- a/Sources/Fluid/Services/ModelRepository.swift
+++ b/Sources/Fluid/Services/ModelRepository.swift
@@ -2,7 +2,7 @@
// ModelRepository.swift
// Fluid
//
-// Single source of truth for default model lists per provider.
+// Single source of truth for default model lists and base URLs per provider.
// All views (AISettings, ContentView, CommandMode, RewriteMode) should use this
// instead of maintaining their own hardcoded lists.
//
@@ -14,6 +14,11 @@ final class ModelRepository {
private init() {}
+ /// All built-in provider IDs (not including custom/saved providers)
+ static let builtInProviderIDs = [
+ "openai", "groq", "cerebras", "google", "openrouter", "ollama", "lmstudio", "apple-intelligence",
+ ]
+
/// Returns the default models for a given provider ID.
/// This is used when the user has not added any custom models for that provider.
func defaultModels(for providerID: String) -> [String] {
@@ -22,6 +27,15 @@ final class ModelRepository {
return ["gpt-4.1"]
case "groq":
return ["openai/gpt-oss-120b"]
+ case "cerebras":
+ return ["gpt-oss-120b"]
+ case "google":
+ return ["gemini-2.5-flash"]
+ case "openrouter":
+ return ["openai/gpt-oss-20b"]
+ case "ollama", "lmstudio":
+ // Local providers - models vary per user, they must add their own
+ return []
case "apple-intelligence":
return ["System Model"]
default:
@@ -29,4 +43,196 @@ final class ModelRepository {
return []
}
}
+
+ /// Returns the default base URL for a given provider ID.
+ func defaultBaseURL(for providerID: String) -> String {
+ switch providerID {
+ case "openai":
+ return "https://api.openai.com/v1"
+ case "groq":
+ return "https://api.groq.com/openai/v1"
+ case "cerebras":
+ return "https://api.cerebras.ai/v1"
+ case "google":
+ return "https://generativelanguage.googleapis.com/v1beta/openai"
+ case "openrouter":
+ return "https://openrouter.ai/api/v1"
+ case "ollama":
+ return "http://localhost:11434/v1"
+ case "lmstudio":
+ return "http://localhost:1234/v1"
+ default:
+ return ""
+ }
+ }
+
+ /// Returns the display name for a provider ID
+ func displayName(for providerID: String) -> String {
+ switch providerID {
+ case "openai": return "OpenAI"
+ case "groq": return "Groq"
+ case "cerebras": return "Cerebras"
+ case "google": return "Google"
+ case "openrouter": return "OpenRouter"
+ case "ollama": return "Ollama"
+ case "lmstudio": return "LM Studio"
+ case "apple-intelligence": return "Apple Intelligence"
+ default: return providerID.capitalized
+ }
+ }
+
+ /// Check if a provider ID is a built-in provider
+ func isBuiltIn(_ providerID: String) -> Bool {
+ Self.builtInProviderIDs.contains(providerID)
+ }
+
+ /// Returns the list of built-in providers for UI pickers
+ /// - Parameter includeAppleIntelligence: Whether to include Apple Intelligence
+ /// - Parameter appleIntelligenceAvailable: Whether Apple Intelligence is available on this device
+ /// - Parameter appleIntelligenceDisabledReason: Optional reason if disabled (e.g., "No tools")
+ func builtInProvidersList(
+ includeAppleIntelligence: Bool = true,
+ appleIntelligenceAvailable: Bool = false,
+ appleIntelligenceDisabledReason: String? = nil
+ ) -> [(id: String, name: String)] {
+ var list: [(id: String, name: String)] = [
+ ("openai", "OpenAI"),
+ ("groq", "Groq"),
+ ("cerebras", "Cerebras"),
+ ("google", "Google"),
+ ("openrouter", "OpenRouter"),
+ ("ollama", "Ollama"),
+ ("lmstudio", "LM Studio"),
+ ]
+
+ if includeAppleIntelligence {
+ if appleIntelligenceAvailable {
+ list.append(("apple-intelligence", "Apple Intelligence"))
+ } else if let reason = appleIntelligenceDisabledReason {
+ list.append(("apple-intelligence-disabled", "Apple Intelligence (\(reason))"))
+ } else {
+ list.append(("apple-intelligence-disabled", "Apple Intelligence (Unavailable)"))
+ }
+ }
+
+ return list
+ }
+
+ /// Converts a provider ID to a storage key for UserDefaults
+ /// Built-in providers use their ID directly; custom providers get "custom:" prefix
+ func providerKey(for providerID: String) -> String {
+ let trimmed = providerID.trimmingCharacters(in: .whitespacesAndNewlines)
+ if trimmed.isEmpty { return providerID }
+
+ // Built-in providers use their ID directly
+ if self.isBuiltIn(trimmed) {
+ return trimmed
+ }
+
+ // Custom providers: ensure "custom:" prefix
+ if trimmed.hasPrefix("custom:") {
+ return trimmed
+ }
+ return "custom:\(trimmed)"
+ }
+
+ /// Returns all possible keys for a provider (for looking up stored settings)
+ func providerKeys(for providerID: String) -> [String] {
+ var keys: [String] = []
+ let trimmed = providerID.trimmingCharacters(in: .whitespacesAndNewlines)
+
+ if trimmed.isEmpty {
+ return [providerID]
+ }
+
+ // Built-in providers: just use the ID
+ if self.isBuiltIn(trimmed) {
+ return [trimmed]
+ }
+
+ // Custom providers: try both with and without prefix
+ if trimmed.hasPrefix("custom:") {
+ keys.append(trimmed)
+ keys.append(String(trimmed.dropFirst("custom:".count)))
+ } else {
+ keys.append("custom:\(trimmed)")
+ keys.append(trimmed)
+ }
+
+ return Array(Set(keys))
+ }
+
+ // MARK: - Fetch Models from API
+
+ /// Fetches available models from the provider's API
+ /// - Parameters:
+ /// - providerID: The provider identifier
+ /// - baseURL: The base URL for the API (e.g., "https://api.openai.com/v1")
+ /// - apiKey: Optional API key for authentication
+ /// - Returns: Array of model IDs sorted alphabetically
+ func fetchModels(for providerID: String, baseURL: String, apiKey: String?) async throws -> [String] {
+ // Construct the models endpoint URL
+ let urlString = baseURL.hasSuffix("/") ? "\(baseURL)models" : "\(baseURL)/models"
+ guard let url = URL(string: urlString) else {
+ throw FetchError.invalidURL
+ }
+
+ var request = URLRequest(url: url)
+ request.httpMethod = "GET"
+ request.timeoutInterval = 15
+
+ // Add authorization header if API key is provided
+ if let key = apiKey, !key.isEmpty {
+ request.setValue("Bearer \(key)", forHTTPHeaderField: "Authorization")
+ }
+
+ let (data, response) = try await URLSession.shared.data(for: request)
+
+ // Check for HTTP errors
+ if let httpResponse = response as? HTTPURLResponse, httpResponse.statusCode != 200 {
+ throw FetchError.httpError(statusCode: httpResponse.statusCode)
+ }
+
+ // Parse the response - OpenAI format: { "data": [{ "id": "model-name" }, ...] }
+ guard let json = try JSONSerialization.jsonObject(with: data) as? [String: Any] else {
+ throw FetchError.invalidResponse
+ }
+
+ // Try OpenAI/Groq/Cerebras format first
+ if let dataArray = json["data"] as? [[String: Any]] {
+ let models = dataArray.compactMap { $0["id"] as? String }
+ return models.sorted()
+ }
+
+ // Try Google format: { "models": [{ "name": "models/gemini-pro" }, ...] }
+ if let modelsArray = json["models"] as? [[String: Any]] {
+ let models = modelsArray.compactMap { dict -> String? in
+ if let name = dict["name"] as? String {
+ // Google returns "models/gemini-pro", extract just the model name
+ return name.hasPrefix("models/") ? String(name.dropFirst(7)) : name
+ }
+ return nil
+ }
+ return models.sorted()
+ }
+
+ throw FetchError.invalidResponse
+ }
+
+ enum FetchError: LocalizedError {
+ case invalidURL
+ case httpError(statusCode: Int)
+ case invalidResponse
+
+ var errorDescription: String? {
+ switch self {
+ case .invalidURL:
+ return "Invalid API URL"
+ case let .httpError(code):
+ return "API returned error \(code)"
+ case .invalidResponse:
+ return "Could not parse API response"
+ }
+ }
+ }
}
diff --git a/Sources/Fluid/Services/RewriteModeService.swift b/Sources/Fluid/Services/RewriteModeService.swift
index d2d20ecc..24920287 100644
--- a/Sources/Fluid/Services/RewriteModeService.swift
+++ b/Sources/Fluid/Services/RewriteModeService.swift
@@ -169,10 +169,10 @@ final class RewriteModeService: ObservableObject {
let baseURL: String
if let provider = settings.savedProviders.first(where: { $0.id == providerID }) {
baseURL = provider.baseURL
- } else if providerID == "groq" {
- baseURL = "https://api.groq.com/openai/v1"
+ } else if ModelRepository.shared.isBuiltIn(providerID) {
+ baseURL = ModelRepository.shared.defaultBaseURL(for: providerID)
} else {
- baseURL = "https://api.openai.com/v1"
+ baseURL = ModelRepository.shared.defaultBaseURL(for: "openai")
}
// Different system prompts for each mode
diff --git a/Sources/Fluid/UI/AISettingsView.swift b/Sources/Fluid/UI/AISettingsView.swift
index 1b17e8a4..e52399f9 100644
--- a/Sources/Fluid/UI/AISettingsView.swift
+++ b/Sources/Fluid/UI/AISettingsView.swift
@@ -53,7 +53,7 @@ struct AISettingsView: View {
@ObservedObject private var settings = SettingsStore.shared
@State private var appear = false
- @State private var openAIBaseURL: String = "https://api.openai.com/v1"
+ @State private var openAIBaseURL: String = ModelRepository.shared.defaultBaseURL(for: "openai")
@State private var enableAIProcessing: Bool = false
// Model Management
@@ -63,6 +63,8 @@ struct AISettingsView: View {
@State private var selectedModel: String = "gpt-4.1"
@State private var showingAddModel: Bool = false
@State private var newModelName: String = ""
+ @State private var isFetchingModels: Bool = false
+ @State private var fetchModelsError: String? = nil
// Reasoning Configuration
@State private var showingReasoningConfig: Bool = false
@@ -184,7 +186,8 @@ struct AISettingsView: View {
for (key, models) in self.availableModelsByProvider {
let lower = key.lowercased()
let newKey: String
- if lower == "openai" || lower == "groq" {
+ // Use ModelRepository to correctly identify ALL built-in providers
+ if ModelRepository.shared.isBuiltIn(lower) {
newKey = lower
} else {
newKey = key.hasPrefix("custom:") ? key : "custom:\(key)"
@@ -199,7 +202,8 @@ struct AISettingsView: View {
var normalizedSel: [String: String] = [:]
for (key, model) in self.selectedModelByProvider {
let lower = key.lowercased()
- let newKey: String = (lower == "openai" || lower == "groq") ? lower :
+ // Use ModelRepository to correctly identify ALL built-in providers
+ let newKey: String = ModelRepository.shared.isBuiltIn(lower) ? lower :
(key.hasPrefix("custom:") ? key : "custom:\(key)")
if let list = normalized[newKey], list.contains(model) { normalizedSel[newKey] = model }
}
@@ -210,12 +214,11 @@ struct AISettingsView: View {
if let saved = savedProviders.first(where: { $0.id == selectedProviderID }) {
self.availableModels = saved.models
self.openAIBaseURL = saved.baseURL // Set this FIRST
- } else if self.selectedProviderID == "openai" {
- self.openAIBaseURL = "https://api.openai.com/v1"
- self.availableModels = self.availableModelsByProvider["openai"] ?? ModelRepository.shared.defaultModels(for: "openai")
- } else if self.selectedProviderID == "groq" {
- self.openAIBaseURL = "https://api.groq.com/openai/v1"
- self.availableModels = self.availableModelsByProvider["groq"] ?? ModelRepository.shared.defaultModels(for: "groq")
+ } else if ModelRepository.shared.isBuiltIn(self.selectedProviderID) {
+ // Handle all built-in providers using ModelRepository
+ self.openAIBaseURL = ModelRepository.shared.defaultBaseURL(for: self.selectedProviderID)
+ let key = self.selectedProviderID
+ self.availableModels = self.availableModelsByProvider[key] ?? ModelRepository.shared.defaultModels(for: key)
} else {
self.availableModels = ModelRepository.shared.defaultModels(for: self.providerKey(for: self.selectedProviderID))
}
@@ -224,7 +227,10 @@ struct AISettingsView: View {
self.updateCurrentProvider()
// Restore selected model using the correct currentProvider
- if let sel = selectedModelByProvider[currentProvider], availableModels.contains(sel) {
+ // If no models available, clear selection
+ if self.availableModels.isEmpty {
+ self.selectedModel = ""
+ } else if let sel = selectedModelByProvider[currentProvider], availableModels.contains(sel) {
self.selectedModel = sel
} else if let first = availableModels.first {
self.selectedModel = first
@@ -439,7 +445,9 @@ struct AISettingsView: View {
// MARK: - Helper Functions
private func providerKey(for providerID: String) -> String {
- if providerID == "openai" || providerID == "groq" { return providerID }
+ // Built-in providers use their ID directly
+ if ModelRepository.shared.isBuiltIn(providerID) { return providerID }
+ // Custom providers get "custom:" prefix
return providerID.isEmpty ? self.currentProvider : "custom:\(providerID)"
}
@@ -453,8 +461,6 @@ struct AISettingsView: View {
}
}
-
-
private func saveProviderAPIKeys() {
SettingsStore.shared.providerAPIKeys = self.providerAPIKeys
}
@@ -1014,31 +1020,29 @@ struct AISettingsView: View {
.background(LinearGradient(colors: [self.theme.palette.accent.opacity(0.15), self.theme.palette.accent.opacity(0.05)], startPoint: .leading, endPoint: .trailing))
.cornerRadius(6)
- Picker("", selection: self.$selectedProviderID) {
- Text("OpenAI").tag("openai")
- Text("Groq").tag("groq")
- if AppleIntelligenceService.isAvailable {
- Text("Apple Intelligence").tag("apple-intelligence")
- }
- if !self.savedProviders.isEmpty {
- Divider()
- ForEach(self.savedProviders) { provider in
- Text(provider.name).tag(provider.id)
+ // Searchable provider picker with bounded popover
+ SearchableProviderPicker(
+ builtInProviders: self.builtInProvidersList,
+ savedProviders: self.savedProviders,
+ selectedProviderID: Binding(
+ get: { self.selectedProviderID },
+ set: { newValue in
+ self.selectedProviderID = newValue
+ self.handleProviderChange(newValue)
}
- }
- }
- .pickerStyle(.menu).labelsHidden().frame(width: 200)
- .onChange(of: self.selectedProviderID) { _, newValue in
- self.handleProviderChange(newValue)
- }
+ )
+ )
- // Edit/Delete buttons for custom providers
- if !["openai", "groq", "apple-intelligence"].contains(self.selectedProviderID) {
+ // Edit button for all providers (including built-in)
+ if self.selectedProviderID != "apple-intelligence" {
Button(action: { self.startEditingProvider() }) {
HStack(spacing: 4) { Image(systemName: "pencil"); Text("Edit") }.font(.caption)
}
.buttonStyle(CompactButtonStyle())
+ }
+ // Delete button only for custom providers
+ if !ModelRepository.shared.isBuiltIn(self.selectedProviderID) {
Button(action: { self.deleteCurrentProvider() }) {
HStack(spacing: 4) { Image(systemName: "trash"); Text("Delete") }.font(.caption).foregroundStyle(.red)
}
@@ -1053,37 +1057,57 @@ struct AISettingsView: View {
}
}
+ private var builtInProvidersList: [(id: String, name: String)] {
+ ModelRepository.shared.builtInProvidersList(
+ includeAppleIntelligence: true,
+ appleIntelligenceAvailable: AppleIntelligenceService.isAvailable
+ )
+ }
+
private func handleProviderChange(_ newValue: String) {
- switch newValue {
- case "openai":
- self.openAIBaseURL = "https://api.openai.com/v1"
- self.updateCurrentProvider()
- let key = "openai"
- self.availableModels = self.availableModelsByProvider[key] ?? ModelRepository.shared.defaultModels(for: key)
- self.selectedModel = self.selectedModelByProvider[key] ?? self.availableModels.first ?? self.selectedModel
- case "groq":
- self.openAIBaseURL = "https://api.groq.com/openai/v1"
- self.updateCurrentProvider()
- let key = "groq"
- self.availableModels = self.availableModelsByProvider[key] ?? ModelRepository.shared.defaultModels(for: key)
- self.selectedModel = self.selectedModelByProvider[key] ?? self.availableModels.first ?? self.selectedModel
- case "apple-intelligence":
+ // Handle Apple Intelligence specially (no base URL)
+ if newValue == "apple-intelligence" {
self.openAIBaseURL = ""
self.updateCurrentProvider()
self.availableModels = ["System Model"]
self.selectedModel = "System Model"
- default:
- if let provider = savedProviders.first(where: { $0.id == newValue }) {
- self.openAIBaseURL = provider.baseURL
- self.updateCurrentProvider()
- let key = self.providerKey(for: newValue)
- self.availableModels = provider.models.isEmpty ? (self.availableModelsByProvider[key] ?? []) : provider.models
- self.selectedModel = self.selectedModelByProvider[key] ?? self.availableModels.first ?? self.selectedModel
+ return
+ }
+
+ // Check if it's a built-in provider
+ if ModelRepository.shared.isBuiltIn(newValue) {
+ self.openAIBaseURL = ModelRepository.shared.defaultBaseURL(for: newValue)
+ self.updateCurrentProvider()
+ let key = newValue
+ self.availableModels = self.availableModelsByProvider[key] ?? ModelRepository.shared.defaultModels(for: key)
+ // If no models available, clear selection; otherwise use saved or first
+ if self.availableModels.isEmpty {
+ self.selectedModel = ""
+ } else {
+ self.selectedModel = self.selectedModelByProvider[key] ?? self.availableModels.first ?? ""
}
+ return
+ }
+
+ // Handle saved/custom providers
+ if let provider = savedProviders.first(where: { $0.id == newValue }) {
+ self.openAIBaseURL = provider.baseURL
+ self.updateCurrentProvider()
+ let key = self.providerKey(for: newValue)
+ self.availableModels = provider.models.isEmpty ? (self.availableModelsByProvider[key] ?? []) : provider.models
+ self.selectedModel = self.selectedModelByProvider[key] ?? self.availableModels.first ?? self.selectedModel
}
}
private func startEditingProvider() {
+ // Handle built-in providers
+ if ModelRepository.shared.isBuiltIn(self.selectedProviderID) {
+ self.editProviderName = ModelRepository.shared.displayName(for: self.selectedProviderID)
+ self.editProviderBaseURL = self.openAIBaseURL // Use current URL (may have been customized)
+ self.showingEditProvider = true
+ return
+ }
+ // Handle saved/custom providers
if let provider = savedProviders.first(where: { $0.id == selectedProviderID }) {
self.editProviderName = provider.name
self.editProviderBaseURL = provider.baseURL
@@ -1102,7 +1126,7 @@ struct AISettingsView: View {
SettingsStore.shared.availableModelsByProvider = self.availableModelsByProvider
SettingsStore.shared.selectedModelByProvider = self.selectedModelByProvider
self.selectedProviderID = "openai"
- self.openAIBaseURL = "https://api.openai.com/v1"
+ self.openAIBaseURL = ModelRepository.shared.defaultBaseURL(for: "openai")
self.updateCurrentProvider()
self.availableModels = ModelRepository.shared.defaultModels(for: "openai")
self.selectedModel = self.availableModels.first ?? self.selectedModel
@@ -1140,6 +1164,16 @@ struct AISettingsView: View {
let base = self.editProviderBaseURL.trimmingCharacters(in: .whitespacesAndNewlines)
guard !name.isEmpty, !base.isEmpty else { return }
+ // For built-in providers, we just update the base URL (name is not editable)
+ if ModelRepository.shared.isBuiltIn(self.selectedProviderID) {
+ self.openAIBaseURL = base
+ self.updateCurrentProvider()
+ self.showingEditProvider = false
+ self.editProviderName = ""; self.editProviderBaseURL = ""
+ return
+ }
+
+ // For saved/custom providers, update the full provider record
if let providerIndex = savedProviders.firstIndex(where: { $0.id == selectedProviderID }) {
let oldProvider = self.savedProviders[providerIndex]
let updatedProvider = SettingsStore.SavedProvider(id: oldProvider.id, name: name, baseURL: base, models: oldProvider.models)
@@ -1189,12 +1223,15 @@ struct AISettingsView: View {
.background(LinearGradient(colors: [self.theme.palette.accent.opacity(0.15), self.theme.palette.accent.opacity(0.05)], startPoint: .leading, endPoint: .trailing))
.cornerRadius(6)
- Picker("", selection: self.$selectedModel) {
- ForEach(self.availableModels, id: \.self) { model in Text(model).tag(model) }
- }
- .pickerStyle(.menu).labelsHidden().frame(width: 200)
+ // Searchable model picker with refresh button
+ SearchableModelPicker(
+ models: self.availableModels,
+ selectedModel: self.$selectedModel,
+ onRefresh: { await self.fetchModelsForCurrentProvider() },
+ isRefreshing: self.isFetchingModels
+ )
- if !["openai", "groq"].contains(self.selectedProviderID) {
+ if !ModelRepository.shared.isBuiltIn(self.selectedProviderID) {
Button(action: { self.deleteSelectedModel() }) {
HStack(spacing: 4) { Image(systemName: "trash"); Text("Delete") }.font(.caption).foregroundStyle(.red)
}
@@ -1237,6 +1274,47 @@ struct AISettingsView: View {
SettingsStore.shared.selectedModelByProvider = self.selectedModelByProvider
}
+ private func fetchModelsForCurrentProvider() async {
+ self.isFetchingModels = true
+ self.fetchModelsError = nil
+ defer { self.isFetchingModels = false }
+
+ let baseURL = self.openAIBaseURL
+ let key = self.providerKey(for: self.selectedProviderID)
+ let apiKey = self.providerAPIKeys[key] ?? self.providerAPIKeys[self.selectedProviderID]
+
+ do {
+ let models = try await ModelRepository.shared.fetchModels(
+ for: self.selectedProviderID,
+ baseURL: baseURL,
+ apiKey: apiKey
+ )
+
+ // Update state on main thread
+ await MainActor.run {
+ if models.isEmpty {
+ // Keep existing models if fetch returned empty
+ self.fetchModelsError = "No models returned from API"
+ } else {
+ self.availableModels = models
+ self.availableModelsByProvider[key] = models
+ SettingsStore.shared.availableModelsByProvider = self.availableModelsByProvider
+
+ // Select first model if current selection not in list
+ if !models.contains(self.selectedModel) {
+ self.selectedModel = models.first ?? ""
+ self.selectedModelByProvider[key] = self.selectedModel
+ SettingsStore.shared.selectedModelByProvider = self.selectedModelByProvider
+ }
+ }
+ }
+ } catch {
+ await MainActor.run {
+ self.fetchModelsError = error.localizedDescription
+ }
+ }
+ }
+
private func openReasoningConfig() {
let pKey = self.providerKey(for: self.selectedProviderID)
if let config = SettingsStore.shared.getReasoningConfig(forModel: selectedModel, provider: pKey) {
diff --git a/Sources/Fluid/UI/SearchableModelPicker.swift b/Sources/Fluid/UI/SearchableModelPicker.swift
new file mode 100644
index 00000000..2b59d638
--- /dev/null
+++ b/Sources/Fluid/UI/SearchableModelPicker.swift
@@ -0,0 +1,151 @@
+//
+// SearchableModelPicker.swift
+// Fluid
+//
+// A searchable picker for selecting AI models.
+// Uses a popover with search field for better UX.
+//
+
+import SwiftUI
+
+struct SearchableModelPicker: View {
+ let models: [String]
+ @Binding var selectedModel: String
+ var onRefresh: (() async -> Void)?
+ var isRefreshing: Bool = false
+
+ @State private var searchText = ""
+ @State private var isShowingPopover = false
+
+ private var filteredModels: [String] {
+ if self.searchText.isEmpty {
+ return self.models
+ }
+ return self.models.filter { $0.localizedCaseInsensitiveContains(self.searchText) }
+ }
+
+ var body: some View {
+ HStack(spacing: 8) {
+ // Model button that opens popover
+ Button(action: { self.isShowingPopover.toggle() }) {
+ HStack(spacing: 4) {
+ Text(self.selectedModel.isEmpty ? "Select Model" : self.selectedModel)
+ .lineLimit(1)
+ .truncationMode(.middle)
+ .foregroundStyle(self.selectedModel.isEmpty ? .secondary : .primary)
+ Image(systemName: "chevron.down")
+ .font(.caption)
+ .foregroundStyle(.secondary)
+ }
+ .frame(width: 180, alignment: .leading)
+ .padding(.horizontal, 8)
+ .padding(.vertical, 5)
+ .background(Color(nsColor: .controlBackgroundColor))
+ .cornerRadius(6)
+ }
+ .buttonStyle(.plain)
+ .popover(isPresented: self.$isShowingPopover, arrowEdge: .bottom) {
+ VStack(spacing: 0) {
+ // Search field
+ HStack {
+ Image(systemName: "magnifyingglass")
+ .foregroundStyle(.secondary)
+ TextField("Search models...", text: self.$searchText)
+ .textFieldStyle(.plain)
+ }
+ .padding(8)
+ .background(Color(nsColor: .textBackgroundColor))
+
+ Divider()
+
+ // Model list
+ if self.models.isEmpty {
+ VStack(spacing: 8) {
+ Image(systemName: "tray")
+ .font(.title2)
+ .foregroundStyle(.secondary)
+ Text("No models")
+ .font(.caption)
+ .foregroundStyle(.secondary)
+ Text("Click refresh to fetch from API")
+ .font(.caption2)
+ .foregroundStyle(.tertiary)
+ }
+ .frame(height: 100)
+ .frame(maxWidth: .infinity)
+ } else if self.filteredModels.isEmpty {
+ Text("No models match '\(self.searchText)'")
+ .font(.caption)
+ .foregroundStyle(.secondary)
+ .padding()
+ } else {
+ ScrollView {
+ LazyVStack(alignment: .leading, spacing: 0) {
+ ForEach(self.filteredModels.prefix(100), id: \.self) { model in
+ Button(action: {
+ self.selectedModel = model
+ self.searchText = ""
+ self.isShowingPopover = false
+ }) {
+ HStack {
+ Text(model)
+ .lineLimit(1)
+ Spacer()
+ if model == self.selectedModel {
+ Image(systemName: "checkmark")
+ .foregroundStyle(.blue)
+ }
+ }
+ .padding(.horizontal, 10)
+ .padding(.vertical, 6)
+ .contentShape(Rectangle())
+ }
+ .buttonStyle(.plain)
+ .background(model == self.selectedModel ? Color.blue.opacity(0.1) : Color.clear)
+ }
+ }
+ }
+ .frame(maxHeight: 250)
+
+ if self.filteredModels.count > 100 {
+ Divider()
+ Text("\(self.filteredModels.count - 100) more (use search)")
+ .font(.caption2)
+ .foregroundStyle(.secondary)
+ .padding(6)
+ }
+ }
+ }
+ .frame(width: 280)
+ }
+
+ // Refresh button
+ if let onRefresh = onRefresh {
+ Button(action: {
+ Task { await onRefresh() }
+ }) {
+ if self.isRefreshing {
+ ProgressView()
+ .scaleEffect(0.6)
+ .frame(width: 16, height: 16)
+ } else {
+ Image(systemName: "arrow.clockwise")
+ }
+ }
+ .buttonStyle(.borderless)
+ .disabled(self.isRefreshing)
+ .help("Fetch models from API")
+ }
+ }
+ }
+}
+
+#Preview {
+ SearchableModelPicker(
+ models: ["gpt-4.1", "gpt-4o", "gpt-3.5-turbo", "claude-3-opus", "claude-3-sonnet"],
+ selectedModel: .constant("gpt-4.1"),
+ onRefresh: { try? await Task.sleep(nanoseconds: 1_000_000_000) },
+ isRefreshing: false
+ )
+ .padding()
+}
diff --git a/Sources/Fluid/UI/SearchableProviderPicker.swift b/Sources/Fluid/UI/SearchableProviderPicker.swift
new file mode 100644
index 00000000..4b9b4f79
--- /dev/null
+++ b/Sources/Fluid/UI/SearchableProviderPicker.swift
@@ -0,0 +1,172 @@
+//
+// SearchableProviderPicker.swift
+// Fluid
+//
+// A searchable picker for selecting AI providers.
+// Uses a popover with search field for better UX when there are many providers.
+//
+
+import SwiftUI
+
+struct SearchableProviderPicker: View {
+ let builtInProviders: [(id: String, name: String)]
+ let savedProviders: [SettingsStore.SavedProvider]
+ @Binding var selectedProviderID: String
+
+ @State private var searchText = ""
+ @State private var isShowingPopover = false
+
+ private var allProviders: [(id: String, name: String, isBuiltIn: Bool)] {
+ var result: [(id: String, name: String, isBuiltIn: Bool)] = []
+
+ // Add built-in providers
+ for provider in self.builtInProviders {
+ result.append((id: provider.id, name: provider.name, isBuiltIn: true))
+ }
+
+ // Add saved providers
+ for provider in self.savedProviders {
+ result.append((id: provider.id, name: provider.name, isBuiltIn: false))
+ }
+
+ return result
+ }
+
+ private var filteredProviders: [(id: String, name: String, isBuiltIn: Bool)] {
+ if self.searchText.isEmpty {
+ return self.allProviders
+ }
+ return self.allProviders.filter {
+ $0.name.localizedCaseInsensitiveContains(self.searchText) ||
+ $0.id.localizedCaseInsensitiveContains(self.searchText)
+ }
+ }
+
+ private var selectedProviderName: String {
+ if let provider = allProviders.first(where: { $0.id == selectedProviderID }) {
+ return provider.name
+ }
+ return self.selectedProviderID.isEmpty ? "Select Provider" : self.selectedProviderID
+ }
+
+ var body: some View {
+ Button(action: { self.isShowingPopover.toggle() }) {
+ HStack(spacing: 4) {
+ Text(self.selectedProviderName)
+ .lineLimit(1)
+ .truncationMode(.tail)
+ Image(systemName: "chevron.down")
+ .font(.caption)
+ .foregroundStyle(.secondary)
+ }
+ .frame(width: 180, alignment: .leading)
+ .padding(.horizontal, 8)
+ .padding(.vertical, 5)
+ .background(Color(nsColor: .controlBackgroundColor))
+ .cornerRadius(6)
+ }
+ .buttonStyle(.plain)
+ .popover(isPresented: self.$isShowingPopover, arrowEdge: .bottom) {
+ VStack(spacing: 0) {
+ // Search field
+ HStack {
+ Image(systemName: "magnifyingglass")
+ .foregroundStyle(.secondary)
+ TextField("Search providers...", text: self.$searchText)
+ .textFieldStyle(.plain)
+ }
+ .padding(8)
+ .background(Color(nsColor: .textBackgroundColor))
+
+ Divider()
+
+ // Provider list
+ ScrollView {
+ LazyVStack(alignment: .leading, spacing: 0) {
+ // Built-in section
+ let builtIns = self.filteredProviders.filter { $0.isBuiltIn }
+ if !builtIns.isEmpty {
+ Text("BUILT-IN")
+ .font(.caption2)
+ .fontWeight(.semibold)
+ .foregroundStyle(.secondary)
+ .padding(.horizontal, 10)
+ .padding(.top, 8)
+ .padding(.bottom, 4)
+
+ ForEach(builtIns, id: \.id) { provider in
+ self.providerRow(provider)
+ }
+ }
+
+ // Saved/Custom section
+ let saved = self.filteredProviders.filter { !$0.isBuiltIn }
+ if !saved.isEmpty {
+ if !builtIns.isEmpty {
+ Divider()
+ .padding(.vertical, 4)
+ }
+
+ Text("CUSTOM")
+ .font(.caption2)
+ .fontWeight(.semibold)
+ .foregroundStyle(.secondary)
+ .padding(.horizontal, 10)
+ .padding(.top, 4)
+ .padding(.bottom, 4)
+
+ ForEach(saved, id: \.id) { provider in
+ self.providerRow(provider)
+ }
+ }
+
+ if self.filteredProviders.isEmpty {
+ Text("No providers match '\(self.searchText)'")
+ .font(.caption)
+ .foregroundStyle(.secondary)
+ .padding()
+ }
+ }
+ }
+ .frame(maxHeight: 300)
+ }
+ .frame(width: 240)
+ }
+ }
+
+ private func providerRow(_ provider: (id: String, name: String, isBuiltIn: Bool)) -> some View {
+ Button(action: {
+ self.selectedProviderID = provider.id
+ self.searchText = ""
+ self.isShowingPopover = false
+ }) {
+ HStack {
+ Text(provider.name)
+ .lineLimit(1)
+ Spacer()
+ if provider.id == self.selectedProviderID {
+ Image(systemName: "checkmark")
+ .foregroundStyle(.blue)
+ }
+ }
+ .padding(.horizontal, 10)
+ .padding(.vertical, 6)
+ .contentShape(Rectangle())
+ }
+ .buttonStyle(.plain)
+ .background(provider.id == self.selectedProviderID ? Color.blue.opacity(0.1) : Color.clear)
+ }
+}
+
+#Preview {
+ SearchableProviderPicker(
+ builtInProviders: [
+ ("openai", "OpenAI"),
+ ("groq", "Groq"),
+ ("cerebras", "Cerebras"),
+ ],
+ savedProviders: [],
+ selectedProviderID: .constant("openai")
+ )
+ .padding()
+}
diff --git a/Sources/Fluid/Views/CommandModeView.swift b/Sources/Fluid/Views/CommandModeView.swift
index ea60f3d7..c36aab41 100644
--- a/Sources/Fluid/Views/CommandModeView.swift
+++ b/Sources/Fluid/Views/CommandModeView.swift
@@ -497,38 +497,34 @@ struct CommandModeView: View {
private var inputArea: some View {
HStack(spacing: 8) {
- // Provider Selector (compact)
- Picker("", selection: self.$settings.commandModeSelectedProviderID) {
- Text("OpenAI").tag("openai")
- Text("Groq").tag("groq")
-
- // Apple Intelligence - disabled for Command Mode (no tool support)
- Text("Apple Intelligence (No tools)")
- .foregroundColor(.secondary)
- .tag("apple-intelligence-disabled")
-
- ForEach(self.settings.savedProviders) { provider in
- Text(provider.name).tag(provider.id)
- }
- }
- .frame(width: 110)
- .onChange(of: self.settings.commandModeSelectedProviderID) { _, newValue in
- // Prevent selecting disabled Apple Intelligence
- if newValue == "apple-intelligence-disabled" || newValue == "apple-intelligence" {
- self.settings.commandModeSelectedProviderID = "openai"
- }
- }
+ // Provider Selector (compact, searchable)
+ SearchableProviderPicker(
+ builtInProviders: self.builtInProvidersList,
+ savedProviders: self.settings.savedProviders,
+ selectedProviderID: Binding(
+ get: { self.settings.commandModeSelectedProviderID },
+ set: { newValue in
+ // Prevent selecting disabled Apple Intelligence
+ if newValue == "apple-intelligence-disabled" || newValue == "apple-intelligence" {
+ self.settings.commandModeSelectedProviderID = "openai"
+ } else {
+ self.settings.commandModeSelectedProviderID = newValue
+ }
+ self.updateAvailableModels()
+ }
+ )
+ )
- // Model Selector (compact)
- Picker("", selection: Binding(
- get: { self.settings.commandModeSelectedModel ?? self.availableModels.first ?? "gpt-4.1" },
- set: { self.settings.commandModeSelectedModel = $0 }
- )) {
- ForEach(self.availableModels, id: \.self) { model in
- Text(model).tag(model)
- }
- }
- .frame(width: 130)
+ // Model Selector (compact, searchable)
+ SearchableModelPicker(
+ models: self.availableModels,
+ selectedModel: Binding(
+ get: { self.settings.commandModeSelectedModel ?? self.availableModels.first ?? "" },
+ set: { self.settings.commandModeSelectedModel = $0 }
+ ),
+ onRefresh: nil,
+ isRefreshing: false
+ )
// Input field (flexible)
TextField("Type a command or ask a question...", text: self.$inputText)
@@ -606,7 +602,8 @@ struct CommandModeView: View {
return [providerID]
}
- if trimmed == "openai" || trimmed == "groq" {
+ // Built-in providers use their ID directly
+ if ModelRepository.shared.isBuiltIn(trimmed) {
return [trimmed]
}
@@ -624,7 +621,14 @@ struct CommandModeView: View {
return Array(Set(keys))
}
-
+ private var builtInProvidersList: [(id: String, name: String)] {
+ // Apple Intelligence disabled for Command Mode (no tool support)
+ ModelRepository.shared.builtInProvidersList(
+ includeAppleIntelligence: true,
+ appleIntelligenceAvailable: false,
+ appleIntelligenceDisabledReason: "No tools"
+ )
+ }
}
// MARK: - Shimmer Effect (Cursor-style)
diff --git a/Sources/Fluid/Views/RewriteModeView.swift b/Sources/Fluid/Views/RewriteModeView.swift
index 7c953c52..3670307b 100644
--- a/Sources/Fluid/Views/RewriteModeView.swift
+++ b/Sources/Fluid/Views/RewriteModeView.swift
@@ -148,44 +148,35 @@ struct RewriteModeView: View {
// Input Area with model selectors inline
HStack(spacing: 8) {
- // Provider Selector (compact)
- Picker("", selection: self.$settings.rewriteModeSelectedProviderID) {
- Text("OpenAI").tag("openai")
- Text("Groq").tag("groq")
-
- // Apple Intelligence
- if AppleIntelligenceService.isAvailable {
- Text("Apple Intelligence").tag("apple-intelligence")
- } else {
- Text("Apple Intelligence (Unavailable)")
- .foregroundColor(.secondary)
- .tag("apple-intelligence-disabled")
- }
-
- ForEach(self.settings.savedProviders) { provider in
- Text(provider.name).tag(provider.id)
- }
- }
- .frame(width: 110)
- .onChange(of: self.settings.rewriteModeSelectedProviderID) { _, newValue in
- // Prevent selecting disabled Apple Intelligence
- if newValue == "apple-intelligence-disabled" {
- self.settings.rewriteModeSelectedProviderID = "openai"
- }
- self.updateAvailableModels()
- }
+ // Provider Selector (compact, searchable)
+ SearchableProviderPicker(
+ builtInProviders: self.builtInProvidersList,
+ savedProviders: self.settings.savedProviders,
+ selectedProviderID: Binding(
+ get: { self.settings.rewriteModeSelectedProviderID },
+ set: { newValue in
+ // Prevent selecting disabled Apple Intelligence
+ if newValue == "apple-intelligence-disabled" {
+ self.settings.rewriteModeSelectedProviderID = "openai"
+ } else {
+ self.settings.rewriteModeSelectedProviderID = newValue
+ }
+ self.updateAvailableModels()
+ }
+ )
+ )
// Model Selector (hidden for Apple Intelligence)
if self.settings.rewriteModeSelectedProviderID != "apple-intelligence" {
- Picker("", selection: Binding(
- get: { self.settings.rewriteModeSelectedModel ?? self.availableModels.first ?? "gpt-4.1" },
- set: { self.settings.rewriteModeSelectedModel = $0 }
- )) {
- ForEach(self.availableModels, id: \.self) { model in
- Text(model).tag(model)
- }
- }
- .frame(width: 130)
+ SearchableModelPicker(
+ models: self.availableModels,
+ selectedModel: Binding(
+ get: { self.settings.rewriteModeSelectedModel ?? self.availableModels.first ?? "" },
+ set: { self.settings.rewriteModeSelectedModel = $0 }
+ ),
+ onRefresh: nil,
+ isRefreshing: false
+ )
}
// Input field (flexible)
@@ -298,7 +289,8 @@ struct RewriteModeView: View {
return [providerID]
}
- if trimmed == "openai" || trimmed == "groq" {
+ // Built-in providers use their ID directly
+ if ModelRepository.shared.isBuiltIn(trimmed) {
return [trimmed]
}
@@ -313,9 +305,12 @@ struct RewriteModeView: View {
return Array(Set(keys))
}
-
-
- // MARK: - How To Section
+ private var builtInProvidersList: [(id: String, name: String)] {
+ ModelRepository.shared.builtInProvidersList(
+ includeAppleIntelligence: true,
+ appleIntelligenceAvailable: AppleIntelligenceService.isAvailable
+ )
+ }
private var shortcutDisplay: String {
self.settings.rewriteModeHotkeyShortcut.displayString