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
refactor(AI Settings): Extract MVVM ViewModels for Voice Engine and AI Enhancement settings
altic-dev7fe5b74e3866
diff --git a/Sources/Fluid/ContentView.swift b/Sources/Fluid/ContentView.swiftindex 47940779..0b96b54f 100644--- a/Sources/Fluid/ContentView.swift+++ b/Sources/Fluid/ContentView.swift@@ -757,7 +757,11 @@ struct ContentView: View {case .welcome:return AnyView(self.welcomeView)case .aiSettings:- return AnyView(AISettingsView())+ return AnyView(AISettingsView(+ appServices: self.appServices,+ menuBarManager: self.menuBarManager,+ theme: self.theme+ ))case .preferences:return AnyView(self.preferencesView)case .meetingTools:diff --git a/Sources/Fluid/Theme/NativeButtonStyles.swift b/Sources/Fluid/Theme/NativeButtonStyles.swiftindex e0e6e515..2113b06a 100644--- a/Sources/Fluid/Theme/NativeButtonStyles.swift+++ b/Sources/Fluid/Theme/NativeButtonStyles.swift@@ -178,9 +178,16 @@ struct SecondaryButtonStyle: ButtonStyle {struct CompactButtonStyle: ButtonStyle {var isReady: Bool = false+ var foreground: Color? = nil+ var borderColor: Color? = nilfunc makeBody(configuration: Configuration) -> some View {- CompactButton(configuration: configuration, isReady: self.isReady)+ CompactButton(+ configuration: configuration,+ isReady: self.isReady,+ foreground: self.foreground,+ borderColor: self.borderColor+ )}private struct CompactButton: View {@@ -188,32 +195,35 @@ struct CompactButtonStyle: ButtonStyle {@State private var isHovered = falselet configuration: ButtonStyle.Configurationlet isReady: Bool+ let foreground: Color?+ let borderColor: Color?private var shape: RoundedRectangle {RoundedRectangle(cornerRadius: self.theme.metrics.corners.sm, style: .continuous)}var body: some View {+ let border = self.borderColor ?? (self.isReady ? self.theme.palette.accent : self.theme.palette.cardBorder)+ let foregroundColor = self.foreground ?? self.theme.palette.primaryText+self.configuration.label.fontWeight(.medium)- .frame(maxWidth: .infinity)+ .padding(.horizontal, self.theme.metrics.spacing.md).frame(height: 34)- .foregroundStyle(self.theme.palette.primaryText)+ .foregroundStyle(foregroundColor).background(self.theme.materials.card, in: self.shape).background(self.shape.fill(self.theme.palette.cardBackground).overlay(self.shape.stroke(- (self.isReady ? self.theme.palette.accent : self.theme.palette.cardBorder)- .opacity(self.isHovered ? 0.45 : 0.25),+ border.opacity(self.isHovered ? 0.45 : 0.25),lineWidth: 1))).shadow(- color: (self.isReady ? self.theme.palette.accent : self.theme.palette.cardBorder)- .opacity(self.isHovered ? 0.3 : 0.12),+ color: border.opacity(self.isHovered ? 0.3 : 0.12),radius: self.isHovered ? self.theme.metrics.cardShadow.radius - 2 : 2,x: 0,y: self.isHovered ? self.theme.metrics.cardShadow.y - 1 : 1diff --git a/Sources/Fluid/UI/AISettings/AIEnhancementSettingsView.swift b/Sources/Fluid/UI/AISettings/AIEnhancementSettingsView.swiftnew file mode 100644index 00000000..9e303645--- /dev/null+++ b/Sources/Fluid/UI/AISettings/AIEnhancementSettingsView.swift@@ -0,0 +1,32 @@+import SwiftUI++struct AIEnhancementSettingsView: View {+ @ObservedObject var viewModel: AIEnhancementSettingsViewModel+ @ObservedObject var settings: SettingsStore+ @ObservedObject var promptTest: DictationPromptTestCoordinator+ let theme: AppTheme++ var body: some View {+ self.aiConfigurationCard+ .onAppear { self.viewModel.onAppear() }+ .onChange(of: self.viewModel.showKeychainPermissionAlert) { _, isPresented in+ guard isPresented else { return }+ self.viewModel.presentKeychainAccessAlert(message: self.viewModel.keychainPermissionMessage)+ self.viewModel.showKeychainPermissionAlert = false+ }+ .alert("Delete Prompt?", isPresented: self.$viewModel.showingDeletePromptConfirm) {+ Button("Delete", role: .destructive) {+ self.viewModel.deletePendingPrompt()+ }+ Button("Cancel", role: .cancel) {+ self.viewModel.clearPendingDeletePrompt()+ }+ } message: {+ if self.viewModel.pendingDeletePromptName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {+ Text("This cannot be undone.")+ } else {+ Text("Delete “\(self.viewModel.pendingDeletePromptName)”? This cannot be undone.")+ }+ }+ }+}diff --git a/Sources/Fluid/UI/AISettings/AIEnhancementSettingsViewModel.swift b/Sources/Fluid/UI/AISettings/AIEnhancementSettingsViewModel.swiftnew file mode 100644index 00000000..77a3fbcc--- /dev/null+++ b/Sources/Fluid/UI/AISettings/AIEnhancementSettingsViewModel.swift@@ -0,0 +1,835 @@+import AppKit+import Combine+import Security+import SwiftUI++@MainActor+final class AIEnhancementSettingsViewModel: ObservableObject {+ let settings: SettingsStore+ let menuBarManager: MenuBarManager+ let promptTest: DictationPromptTestCoordinator++ @Published var appear: Bool = false+ @Published var openAIBaseURL: String+ @Published var enableAIProcessing: Bool {+ didSet {+ guard enableAIProcessing != oldValue else { return }+ self.settings.enableAIProcessing = enableAIProcessing+ self.menuBarManager.aiProcessingEnabled = enableAIProcessing+ }+ }++ // Model Management+ @Published var availableModelsByProvider: [String: [String]] = [:]+ @Published var selectedModelByProvider: [String: String] = [:]+ @Published var availableModels: [String] = ["gpt-4.1"]+ @Published var selectedModel: String = "gpt-4.1" {+ didSet {+ guard selectedModel != "__ADD_MODEL__" else { return }+ self.selectedModelByProvider[self.currentProvider] = selectedModel+ self.settings.selectedModelByProvider = self.selectedModelByProvider+ }+ }+ @Published var showingAddModel: Bool = false+ @Published var newModelName: String = ""+ @Published var isFetchingModels: Bool = false+ @Published var fetchModelsError: String? = nil++ // Reasoning Configuration+ @Published var showingReasoningConfig: Bool = false+ @Published var editingReasoningParamName: String = "reasoning_effort"+ @Published var editingReasoningParamValue: String = "low"+ @Published var editingReasoningEnabled: Bool = false++ // Provider Management+ @Published var providerAPIKeys: [String: String] = [:]+ @Published var currentProvider: String = "openai"+ @Published var savedProviders: [SettingsStore.SavedProvider] = []+ @Published var selectedProviderID: String {+ didSet {+ self.settings.selectedProviderID = selectedProviderID+ }+ }++ // Connection Testing+ @Published var isTestingConnection: Bool = false+ @Published var connectionStatus: AIConnectionStatus = .unknown+ @Published var connectionErrorMessage: String = ""++ // UI State+ @Published var showHelp: Bool = false+ @Published var showingSaveProvider: Bool = false+ @Published var showAPIKeyEditor: Bool = false+ @Published var showingEditProvider: Bool = false++ // Provider Form State+ @Published var newProviderName: String = ""+ @Published var newProviderBaseURL: String = ""+ @Published var newProviderApiKey: String = ""+ @Published var newProviderModels: String = ""+ @Published var editProviderName: String = ""+ @Published var editProviderBaseURL: String = ""++ // Keychain State+ @Published var showKeychainPermissionAlert: Bool = false+ @Published var keychainPermissionMessage: String = ""++ // Dictation Prompt Profiles UI+ @Published var promptEditorMode: PromptEditorMode? = nil+ @Published var draftPromptName: String = ""+ @Published var draftPromptText: String = ""+ @Published var promptEditorSessionID: UUID = .init()++ // Prompt Deletion UI+ @Published var showingDeletePromptConfirm: Bool = false+ @Published var pendingDeletePromptID: String? = nil+ @Published var pendingDeletePromptName: String = ""++ init(settings: SettingsStore, menuBarManager: MenuBarManager, promptTest: DictationPromptTestCoordinator) {+ self.settings = settings+ self.menuBarManager = menuBarManager+ self.promptTest = promptTest+ self.openAIBaseURL = ModelRepository.shared.defaultBaseURL(for: "openai")+ self.enableAIProcessing = settings.enableAIProcessing+ self.selectedProviderID = settings.selectedProviderID+ }++ func onAppear() {+ self.appear = true+ self.loadSettings()+ }++ // MARK: - Load Settings++ func loadSettings() {+ self.selectedProviderID = self.settings.selectedProviderID++ self.enableAIProcessing = self.settings.enableAIProcessing+ self.availableModelsByProvider = self.settings.availableModelsByProvider+ self.selectedModelByProvider = self.settings.selectedModelByProvider+ self.providerAPIKeys = self.settings.providerAPIKeys+ self.savedProviders = self.settings.savedProviders++ // Normalize provider keys+ var normalized: [String: [String]] = [:]+ for (key, models) in self.availableModelsByProvider {+ let lower = key.lowercased()+ let newKey: String+ // Use ModelRepository to correctly identify ALL built-in providers+ if ModelRepository.shared.isBuiltIn(lower) {+ newKey = lower+ } else {+ newKey = key.hasPrefix("custom:") ? key : "custom:\(key)"+ }+ let clean = Array(Set(models.map { $0.trimmingCharacters(in: .whitespacesAndNewlines) })).sorted()+ if !clean.isEmpty { normalized[newKey] = clean }+ }+ self.availableModelsByProvider = normalized+ self.settings.availableModelsByProvider = normalized++ // Normalize selected model by provider+ var normalizedSel: [String: String] = [:]+ for (key, model) in self.selectedModelByProvider {+ let lower = key.lowercased()+ // 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+ self.settings.selectedModelByProvider = normalizedSel++ // Determine initial model list AND set baseURL BEFORE calling updateCurrentProvider+ if let saved = savedProviders.first(where: { $0.id == selectedProviderID }) {+ let key = self.providerKey(for: self.selectedProviderID)+ let stored = self.availableModelsByProvider[key]+ self.availableModels = saved.models.isEmpty ? (stored ?? []) : saved.models+ self.openAIBaseURL = saved.baseURL // Set this FIRST+ } 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))+ }++ // NOW update currentProvider after openAIBaseURL is set correctly+ self.updateCurrentProvider()++ // Restore selected model using the correct currentProvider+ // 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+ }++ DebugLogger.shared.debug(+ "loadSettings complete: provider=\(self.selectedProviderID), currentProvider=\(self.currentProvider), model=\(self.selectedModel), baseURL=\(self.openAIBaseURL)",+ source: "AISettingsView"+ )+ }++ // MARK: - Helper Functions++ func providerKey(for providerID: String) -> String {+ // Built-in providers use their ID directly+ if ModelRepository.shared.isBuiltIn(providerID) { return providerID }+ // Custom providers get "custom:" prefix (if not already present)+ if providerID.hasPrefix("custom:") { return providerID }+ return providerID.isEmpty ? self.currentProvider : "custom:\(providerID)"+ }++ func providerDisplayName(for providerID: String) -> String {+ switch providerID {+ case "openai": return "OpenAI"+ case "groq": return "Groq"+ case "apple-intelligence": return "Apple Intelligence"+ default:+ return self.savedProviders.first(where: { $0.id == providerID })?.name ?? providerID.capitalized+ }+ }++ func saveProviderAPIKeys() {+ self.settings.providerAPIKeys = self.providerAPIKeys+ }++ func updateCurrentProvider() {+ let url = self.openAIBaseURL.trimmingCharacters(in: .whitespacesAndNewlines)+ if url.contains("openai.com") { self.currentProvider = "openai"; return }+ if url.contains("groq.com") { self.currentProvider = "groq"; return }+ self.currentProvider = self.providerKey(for: self.selectedProviderID)+ }++ func saveSavedProviders() {+ self.settings.savedProviders = self.savedProviders+ }++ func isLocalEndpoint(_ urlString: String) -> Bool {+ return ModelRepository.shared.isLocalEndpoint(urlString)+ }++ func hasReasoningConfigForCurrentModel() -> Bool {+ let pKey = self.providerKey(for: self.selectedProviderID)+ if self.settings.hasCustomReasoningConfig(forModel: self.selectedModel, provider: pKey) {+ if let config = self.settings.getReasoningConfig(forModel: selectedModel, provider: pKey) {+ return config.isEnabled+ }+ }+ return self.settings.isReasoningModel(self.selectedModel)+ }++ func addNewModel() {+ guard !self.newModelName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else { return }+ let modelName = self.newModelName.trimmingCharacters(in: .whitespacesAndNewlines)+ let key = self.providerKey(for: self.selectedProviderID)++ var list = self.availableModelsByProvider[key] ?? self.availableModels+ if !list.contains(modelName) {+ list.append(modelName)+ self.availableModelsByProvider[key] = list+ self.settings.availableModelsByProvider = self.availableModelsByProvider++ if let providerIndex = savedProviders.firstIndex(where: { $0.id == selectedProviderID }) {+ let updatedProvider = SettingsStore.SavedProvider(+ id: self.savedProviders[providerIndex].id,+ name: self.savedProviders[providerIndex].name,+ baseURL: self.savedProviders[providerIndex].baseURL,+ models: list+ )+ self.savedProviders[providerIndex] = updatedProvider+ self.saveSavedProviders()+ }++ self.availableModels = list+ self.selectedModel = modelName+ self.selectedModelByProvider[key] = modelName+ self.settings.selectedModelByProvider = self.selectedModelByProvider+ }++ self.showingAddModel = false+ self.newModelName = ""+ }++ // MARK: - Keychain Access Helpers++ private enum KeychainAccessCheckResult {+ case granted+ case denied(OSStatus)+ }++ func handleAPIKeyButtonTapped() {+ switch self.probeKeychainAccess() {+ case .granted:+ self.newProviderApiKey = self.providerAPIKeys[self.currentProvider] ?? ""+ self.showAPIKeyEditor = true+ case let .denied(status):+ self.keychainPermissionMessage = self.keychainPermissionExplanation(for: status)+ self.showKeychainPermissionAlert = true+ }+ }++ private func probeKeychainAccess() -> KeychainAccessCheckResult {+ let service = "com.fluidvoice.provider-api-keys"+ let account = "fluidApiKeys"++ let query: [String: Any] = [+ kSecClass as String: kSecClassGenericPassword,+ kSecAttrService as String: service,+ kSecAttrAccount as String: account,+ ]++ var readQuery = query+ readQuery[kSecReturnData as String] = kCFBooleanTrue+ readQuery[kSecMatchLimit as String] = kSecMatchLimitOne++ let readStatus = SecItemCopyMatching(readQuery as CFDictionary, nil)+ switch readStatus {+ case errSecSuccess:+ return .granted+ case errSecItemNotFound:+ var addQuery = query+ addQuery[kSecAttrAccessible as String] = kSecAttrAccessibleAfterFirstUnlock+ addQuery[kSecValueData as String] = (try? JSONEncoder().encode([String: String]())) ?? Data()++ let addStatus = SecItemAdd(addQuery as CFDictionary, nil)+ if addStatus == errSecSuccess {+ SecItemDelete(query as CFDictionary)+ }++ switch addStatus {+ case errSecSuccess, errSecDuplicateItem:+ return .granted+ case errSecAuthFailed, errSecInteractionNotAllowed, errSecUserCanceled:+ return .denied(addStatus)+ default:+ return .denied(addStatus)+ }+ case errSecAuthFailed, errSecInteractionNotAllowed, errSecUserCanceled:+ return .denied(readStatus)+ default:+ return .denied(readStatus)+ }+ }++ private func keychainPermissionExplanation(for status: OSStatus) -> String {+ var message = "FluidVoice stores provider API keys securely in your macOS Keychain but does not currently have permission to access it."+ if let detail = SecCopyErrorMessageString(status, nil) as String? {+ message += "\n\nmacOS reported: \(detail) (\(status))"+ }+ message += "\n\nClick \"Always Allow\" when the Keychain prompt appears, or open Keychain Access > login > Passwords, locate the FluidVoice entry, and grant access."+ return message+ }++ func presentKeychainAccessAlert(message: String) {+ let msg = message.isEmpty+ ? "FluidVoice stores provider API keys securely in your macOS Keychain. Please grant access by choosing \"Always Allow\" when prompted."+ : message++ let alert = NSAlert()+ alert.messageText = "Keychain Access Required"+ alert.informativeText = msg+ alert.alertStyle = .warning+ alert.addButton(withTitle: "Open Keychain Access")+ alert.addButton(withTitle: "OK")++ let response = alert.runModal()+ if response == .alertFirstButtonReturn {+ if let appURL = NSWorkspace.shared.urlForApplication(withBundleIdentifier: "com.apple.keychainaccess") {+ NSWorkspace.shared.openApplication(+ at: appURL,+ configuration: NSWorkspace.OpenConfiguration(),+ completionHandler: nil+ )+ }+ }+ }++ // MARK: - API Connection Testing++ func testAPIConnection() async {+ guard !self.isTestingConnection else { return }++ let apiKey = self.providerAPIKeys[self.currentProvider] ?? ""+ let baseURL = self.openAIBaseURL.trimmingCharacters(in: .whitespacesAndNewlines)+ let isLocal = self.isLocalEndpoint(baseURL)++ if isLocal {+ guard !baseURL.isEmpty else {+ await MainActor.run {+ self.connectionStatus = .failed+ self.connectionErrorMessage = "Base URL is required"+ }+ return+ }+ } else {+ guard !apiKey.isEmpty, !baseURL.isEmpty else {+ await MainActor.run {+ self.connectionStatus = .failed+ self.connectionErrorMessage = "API key and base URL are required"+ }+ return+ }+ }++ await MainActor.run {+ self.isTestingConnection = true+ self.connectionStatus = .testing+ self.connectionErrorMessage = ""+ }++ do {+ let endpoint = baseURL.trimmingCharacters(in: .whitespacesAndNewlines)+ let fullURL: String+ if endpoint.contains("/chat/completions") || endpoint.contains("/api/chat") || endpoint+ .contains("/api/generate")+ {+ fullURL = endpoint+ } else {+ fullURL = endpoint + "/chat/completions"+ }++ // Debug logging to diagnose test failures+ DebugLogger.shared.debug(+ "testAPIConnection: provider=\(self.selectedProviderID), model=\(self.selectedModel), baseURL=\(endpoint), fullURL=\(fullURL)",+ source: "AISettingsView"+ )++ guard let url = URL(string: fullURL) else {+ await MainActor.run {+ self.connectionStatus = .failed+ self.connectionErrorMessage = "Invalid Base URL format"+ }+ return+ }++ let provKey = self.providerKey(for: self.selectedProviderID)+ let reasoningConfig = self.settings.getReasoningConfig(forModel: self.selectedModel, provider: provKey)++ let usesMaxCompletionTokens = self.settings.isReasoningModel(self.selectedModel)++ var requestDict: [String: Any] = [+ "model": selectedModel,+ "messages": [["role": "user", "content": "test"]],+ ]++ if usesMaxCompletionTokens {+ requestDict["max_completion_tokens"] = 50+ } else {+ requestDict["max_tokens"] = 50+ }++ if let config = reasoningConfig, config.isEnabled {+ if config.parameterName == "enable_thinking" {+ requestDict[config.parameterName] = config.parameterValue == "true"+ } else {+ requestDict[config.parameterName] = config.parameterValue+ }+ }++ guard let jsonData = try? JSONSerialization.data(withJSONObject: requestDict, options: []) else {+ await MainActor.run {+ self.connectionStatus = .failed+ self.connectionErrorMessage = "Failed to create test payload"+ }+ return+ }++ var request = URLRequest(url: url)+ request.httpMethod = "POST"+ request.setValue("application/json", forHTTPHeaderField: "Content-Type")+ if !apiKey.isEmpty {+ request.setValue("Bearer \(apiKey)", forHTTPHeaderField: "Authorization")+ }+ request.httpBody = jsonData+ request.timeoutInterval = 12++ let (_, response) = try await URLSession.shared.data(for: request)+ if let httpResponse = response as? HTTPURLResponse, httpResponse.statusCode >= 200, httpResponse.statusCode < 300 {+ await MainActor.run {+ self.connectionStatus = .success+ self.connectionErrorMessage = ""+ }+ } else if let httpResponse = response as? HTTPURLResponse {+ await MainActor.run {+ self.connectionStatus = .failed+ self.connectionErrorMessage = "HTTP \(httpResponse.statusCode)"+ }+ } else {+ await MainActor.run {+ self.connectionStatus = .failed+ self.connectionErrorMessage = "Unexpected response"+ }+ }+ } catch {+ await MainActor.run {+ self.connectionStatus = .failed+ self.connectionErrorMessage = error.localizedDescription+ }+ }++ await MainActor.run {+ self.isTestingConnection = false+ }+ }++ // MARK: - Provider/Model Handling++ func handleProviderChange(_ newValue: String) {+ // Handle Apple Intelligence specially (no base URL)+ if newValue == "apple-intelligence" {+ self.openAIBaseURL = ""+ self.updateCurrentProvider()+ self.availableModels = ["System Model"]+ self.selectedModel = "System Model"+ 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+ }+ }++ 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+ self.showingEditProvider = true+ }+ }++ func deleteCurrentProvider() {+ self.savedProviders.removeAll { $0.id == self.selectedProviderID }+ self.saveSavedProviders()+ let key = self.providerKey(for: self.selectedProviderID)+ self.availableModelsByProvider.removeValue(forKey: key)+ self.selectedModelByProvider.removeValue(forKey: key)+ self.providerAPIKeys.removeValue(forKey: key)+ self.saveProviderAPIKeys()+ self.settings.availableModelsByProvider = self.availableModelsByProvider+ self.settings.selectedModelByProvider = self.selectedModelByProvider+ // Reset to OpenAI+ self.selectedProviderID = "openai"+ self.openAIBaseURL = ModelRepository.shared.defaultBaseURL(for: "openai")+ self.updateCurrentProvider()+ // Use fetched models if available, fall back to defaults (same logic as handleProviderChange)+ self.availableModels = self.availableModelsByProvider["openai"] ?? ModelRepository.shared.defaultModels(for: "openai")+ self.selectedModel = self.selectedModelByProvider["openai"] ?? self.availableModels.first ?? ""+ }++ func saveEditedProvider() {+ let name = self.editProviderName.trimmingCharacters(in: .whitespacesAndNewlines)+ 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)+ self.savedProviders[providerIndex] = updatedProvider+ self.saveSavedProviders()+ self.openAIBaseURL = base+ self.updateCurrentProvider()+ }+ self.showingEditProvider = false+ self.editProviderName = ""; self.editProviderBaseURL = ""+ }++ func deleteSelectedModel() {+ let key = self.providerKey(for: self.selectedProviderID)+ var list = self.availableModelsByProvider[key] ?? self.availableModels+ list.removeAll { $0 == self.selectedModel }+ if list.isEmpty { list = ModelRepository.shared.defaultModels(for: key) }+ self.availableModelsByProvider[key] = list+ self.settings.availableModelsByProvider = self.availableModelsByProvider++ if let providerIndex = savedProviders.firstIndex(where: { $0.id == selectedProviderID }) {+ let updatedProvider = SettingsStore.SavedProvider(+ id: self.savedProviders[providerIndex].id,+ name: self.savedProviders[providerIndex].name,+ baseURL: self.savedProviders[providerIndex].baseURL,+ models: list+ )+ self.savedProviders[providerIndex] = updatedProvider+ self.saveSavedProviders()+ }++ self.availableModels = list+ self.selectedModel = list.first ?? ""+ self.selectedModelByProvider[key] = self.selectedModel+ self.settings.selectedModelByProvider = self.selectedModelByProvider+ }++ 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+ self.settings.availableModelsByProvider = self.availableModelsByProvider++ if let providerIndex = self.savedProviders.firstIndex(where: { $0.id == self.selectedProviderID }) {+ let updatedProvider = SettingsStore.SavedProvider(+ id: self.savedProviders[providerIndex].id,+ name: self.savedProviders[providerIndex].name,+ baseURL: self.savedProviders[providerIndex].baseURL,+ models: models+ )+ self.savedProviders[providerIndex] = updatedProvider+ self.saveSavedProviders()+ }++ // Select first model if current selection not in list+ if !models.contains(self.selectedModel) {+ self.selectedModel = models.first ?? ""+ self.selectedModelByProvider[key] = self.selectedModel+ self.settings.selectedModelByProvider = self.selectedModelByProvider+ }+ }+ }+ } catch {+ await MainActor.run {+ self.fetchModelsError = error.localizedDescription+ }+ }+ }++ func openReasoningConfig() {+ let pKey = self.providerKey(for: self.selectedProviderID)+ if let config = self.settings.getReasoningConfig(forModel: selectedModel, provider: pKey) {+ self.editingReasoningParamName = config.parameterName+ self.editingReasoningParamValue = config.parameterValue+ self.editingReasoningEnabled = config.isEnabled+ } else {+ let modelLower = self.selectedModel.lowercased()+ if modelLower.hasPrefix("gpt-5") || modelLower.hasPrefix("o1") || modelLower.hasPrefix("o3") || modelLower.contains("gpt-oss") {+ self.editingReasoningParamName = "reasoning_effort"; self.editingReasoningParamValue = "low"; self.editingReasoningEnabled = true+ } else if modelLower.contains("deepseek"), modelLower.contains("reasoner") {+ self.editingReasoningParamName = "enable_thinking"; self.editingReasoningParamValue = "true"; self.editingReasoningEnabled = true+ } else {+ self.editingReasoningParamName = "reasoning_effort"; self.editingReasoningParamValue = "low"; self.editingReasoningEnabled = false+ }+ }+ self.showingReasoningConfig = true+ }++ func saveReasoningConfig() {+ let pKey = self.providerKey(for: self.selectedProviderID)+ if self.editingReasoningEnabled {+ let config = SettingsStore.ModelReasoningConfig(+ parameterName: self.editingReasoningParamName,+ parameterValue: self.editingReasoningParamValue,+ isEnabled: true+ )+ self.settings.setReasoningConfig(config, forModel: self.selectedModel, provider: pKey)+ } else {+ let config = SettingsStore.ModelReasoningConfig(parameterName: "", parameterValue: "", isEnabled: false)+ self.settings.setReasoningConfig(config, forModel: self.selectedModel, provider: pKey)+ }+ self.showingReasoningConfig = false+ }++ func saveNewProvider() {+ let name = self.newProviderName.trimmingCharacters(in: .whitespacesAndNewlines)+ let base = self.newProviderBaseURL.trimmingCharacters(in: .whitespacesAndNewlines)+ let api = self.newProviderApiKey.trimmingCharacters(in: .whitespacesAndNewlines)+ guard !name.isEmpty, !base.isEmpty else { return }++ let modelsList = self.newProviderModels.split(separator: ",").map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }.filter { !$0.isEmpty }+ let models = modelsList.isEmpty ? ModelRepository.shared.defaultModels(for: "openai") : modelsList++ let newProvider = SettingsStore.SavedProvider(name: name, baseURL: base, models: models)+ self.savedProviders.removeAll { $0.name.lowercased() == name.lowercased() }+ self.savedProviders.append(newProvider)+ self.saveSavedProviders()++ let key = self.providerKey(for: newProvider.id)+ self.providerAPIKeys[key] = api+ self.availableModelsByProvider[key] = models+ self.selectedModelByProvider[key] = models.first ?? self.selectedModel+ self.settings.providerAPIKeys = self.providerAPIKeys+ self.settings.availableModelsByProvider = self.availableModelsByProvider+ self.settings.selectedModelByProvider = self.selectedModelByProvider++ self.selectedProviderID = newProvider.id+ self.openAIBaseURL = base+ self.updateCurrentProvider()+ self.availableModels = models+ self.selectedModel = models.first ?? self.selectedModel++ self.showingSaveProvider = false+ self.newProviderName = ""; self.newProviderBaseURL = ""; self.newProviderApiKey = ""; self.newProviderModels = ""+ }++ // MARK: - Prompt Editor / Test++ func promptPreview(_ text: String) -> String {+ let trimmed = text.trimmingCharacters(in: .whitespacesAndNewlines)+ guard !trimmed.isEmpty else { return "Empty prompt" }+ let singleLine = trimmed.replacingOccurrences(of: "\n", with: " ")+ return singleLine.count > 120 ? String(singleLine.prefix(120)) + "…" : singleLine+ }++ /// Combine a user-visible body with the hidden base prompt to ensure role/intent is always present.+ func combinedDraftPrompt(_ text: String) -> String {+ let body = SettingsStore.stripBaseDictationPrompt(from: text)+ return SettingsStore.combineBasePrompt(with: body)+ }++ func requestDeletePrompt(_ profile: SettingsStore.DictationPromptProfile) {+ self.pendingDeletePromptID = profile.id+ self.pendingDeletePromptName = profile.name.isEmpty ? "Untitled Prompt" : profile.name+ self.showingDeletePromptConfirm = true+ }++ func clearPendingDeletePrompt() {+ self.showingDeletePromptConfirm = false+ self.pendingDeletePromptID = nil+ self.pendingDeletePromptName = ""+ }++ func deletePendingPrompt() {+ guard let id = self.pendingDeletePromptID else {+ self.clearPendingDeletePrompt()+ return+ }++ // Remove profile+ var profiles = self.settings.dictationPromptProfiles+ profiles.removeAll { $0.id == id }+ self.settings.dictationPromptProfiles = profiles++ // If the deleted profile was active, reset to Default+ if self.settings.selectedDictationPromptID == id {+ self.settings.selectedDictationPromptID = nil+ }++ self.clearPendingDeletePrompt()+ }++ func isAIPostProcessingConfiguredForDictation() -> Bool {+ DictationAIPostProcessingGate.isConfigured()+ }++ func openDefaultPromptViewer() {+ self.draftPromptName = "Default"+ if let override = self.settings.defaultDictationPromptOverride {+ self.draftPromptText = SettingsStore.stripBaseDictationPrompt(from: override)+ } else {+ self.draftPromptText = SettingsStore.defaultDictationPromptBodyText()+ }+ self.promptEditorSessionID = UUID()+ self.promptEditorMode = .defaultPrompt+ }++ func openNewPromptEditor() {+ self.draftPromptName = "New Prompt"+ self.draftPromptText = ""+ self.promptEditorSessionID = UUID()+ self.promptEditorMode = .newPrompt+ }++ func openEditor(for profile: SettingsStore.DictationPromptProfile) {+ self.draftPromptName = profile.name+ self.draftPromptText = SettingsStore.stripBaseDictationPrompt(from: profile.prompt)+ self.promptEditorSessionID = UUID()+ self.promptEditorMode = .edit(promptID: profile.id)+ }++ func closePromptEditor() {+ self.promptEditorMode = nil+ self.draftPromptName = ""+ self.draftPromptText = ""+ self.promptTest.deactivate()+ }++ func savePromptEditor(mode: PromptEditorMode) {+ // Default prompt is non-deletable; save it via the optional override (empty is allowed).+ if mode.isDefault {+ let body = SettingsStore.stripBaseDictationPrompt(from: self.draftPromptText)+ self.settings.defaultDictationPromptOverride = body+ self.closePromptEditor()+ return+ }++ let name = self.draftPromptName.trimmingCharacters(in: .whitespacesAndNewlines)+ let promptBody = SettingsStore.stripBaseDictationPrompt(from: self.draftPromptText)++ var profiles = self.settings.dictationPromptProfiles+ let now = Date()++ if let id = mode.editingPromptID,+ let idx = profiles.firstIndex(where: { $0.id == id })+ {+ var updated = profiles[idx]+ updated.name = name+ updated.prompt = promptBody+ updated.updatedAt = now+ profiles[idx] = updated+ } else {+ let newProfile = SettingsStore.DictationPromptProfile(name: name, prompt: promptBody, createdAt: now, updatedAt: now)+ profiles.append(newProfile)+ }++ self.settings.dictationPromptProfiles = profiles+ self.closePromptEditor()+ }+}diff --git a/Sources/Fluid/UI/AISettings/VoiceEngineSettingsView.swift b/Sources/Fluid/UI/AISettings/VoiceEngineSettingsView.swiftnew file mode 100644index 00000000..a8b531f8--- /dev/null+++ b/Sources/Fluid/UI/AISettings/VoiceEngineSettingsView.swift@@ -0,0 +1,15 @@+import SwiftUI++struct VoiceEngineSettingsView: View {+ @ObservedObject var viewModel: VoiceEngineSettingsViewModel+ @ObservedObject var settings: SettingsStore+ let theme: AppTheme++ var body: some View {+ self.speechRecognitionCard+ .onAppear { self.viewModel.onAppear() }+ .onChange(of: self.settings.selectedSpeechModel) { _, newValue in+ self.viewModel.handleSelectedSpeechModelChange(newValue)+ }+ }+}diff --git a/Sources/Fluid/UI/AISettings/VoiceEngineSettingsViewModel.swift b/Sources/Fluid/UI/AISettings/VoiceEngineSettingsViewModel.swiftnew file mode 100644index 00000000..f2b016e1--- /dev/null+++ b/Sources/Fluid/UI/AISettings/VoiceEngineSettingsViewModel.swift@@ -0,0 +1,211 @@+import Combine+import SwiftUI++@MainActor+final class VoiceEngineSettingsViewModel: ObservableObject {+ let settings: SettingsStore+ private let appServices: AppServices++ var asr: ASRService { self.appServices.asr }++ @Published var modelSortOption: ModelSortOption = .name+ @Published var providerFilter: SpeechProviderFilter = .all+ @Published var englishOnlyFilter: Bool = false+ @Published var installedOnlyFilter: Bool = false+ @Published var showSpeechFilters: Bool = false++ @Published var selectedSpeechProvider: SettingsStore.SpeechModel.Provider+ @Published var previewSpeechModel: SettingsStore.SpeechModel+ @Published var showAdvancedSpeechInfo: Bool = false+ @Published var suppressSpeechProviderSync: Bool = false+ @Published var skipNextSpeechModelSync: Bool = false++ @Published var removeFillerWordsEnabled: Bool++ init(settings: SettingsStore, appServices: AppServices) {+ self.settings = settings+ self.appServices = appServices+ self.previewSpeechModel = settings.selectedSpeechModel+ self.selectedSpeechProvider = settings.selectedSpeechModel.provider+ self.removeFillerWordsEnabled = settings.removeFillerWordsEnabled+ }++ func onAppear() {+ self.previewSpeechModel = self.settings.selectedSpeechModel+ self.selectedSpeechProvider = self.settings.selectedSpeechModel.provider+ self.removeFillerWordsEnabled = self.settings.removeFillerWordsEnabled++ Task {+ await self.asr.checkIfModelsExistAsync()+ }+ }++ func handleSelectedSpeechModelChange(_ newValue: SettingsStore.SpeechModel) {+ if self.skipNextSpeechModelSync {+ self.skipNextSpeechModelSync = false+ return+ }+ guard !self.suppressSpeechProviderSync else { return }+ self.previewSpeechModel = newValue+ self.setSelectedSpeechProvider(newValue.provider)+ }++ var filteredSpeechModels: [SettingsStore.SpeechModel] {+ var models = SettingsStore.SpeechModel.availableModels++ switch self.providerFilter {+ case .all:+ break+ case .nvidia:+ models = models.filter { $0.provider == .nvidia }+ case .apple:+ models = models.filter { $0.provider == .apple }+ case .openai:+ models = models.filter { $0.provider == .openai }+ }++ if self.englishOnlyFilter {+ models = models.filter { model in+ let label = model.languageSupport.lowercased()+ let title = model.humanReadableName.lowercased()+ return label.contains("english only") || title.contains("english")+ }+ }++ if self.installedOnlyFilter {+ models = models.filter { $0.isInstalled }+ }++ switch self.modelSortOption {+ case .name:+ models.sort { $0.humanReadableName.localizedCaseInsensitiveCompare($1.humanReadableName) == .orderedAscending }+ case .accuracy:+ models.sort { $0.accuracyPercent > $1.accuracyPercent }+ case .speed:+ models.sort { $0.speedPercent > $1.speedPercent }+ }++ return models+ }++ func activateSpeechModel(_ model: SettingsStore.SpeechModel) {+ guard !self.asr.isRunning else { return }+ withAnimation(.spring(response: 0.3, dampingFraction: 0.7)) {+ self.settings.selectedSpeechModel = model+ self.previewSpeechModel = model+ self.setSelectedSpeechProvider(model.provider)+ }+ self.asr.resetTranscriptionProvider()+ Task {+ do {+ try await self.asr.ensureAsrReady()+ } catch {+ DebugLogger.shared.error("Failed to prepare model after activation: \(error)", source: "AISettingsView")+ }+ }+ }++ func downloadSpeechModel(_ model: SettingsStore.SpeechModel) {+ guard !self.asr.isRunning else { return }+ let previousActive = self.settings.selectedSpeechModel++ Task {+ let shouldRestore = previousActive != model+ await MainActor.run {+ if shouldRestore {+ self.suppressSpeechProviderSync = true+ }+ self.settings.selectedSpeechModel = model+ self.asr.resetTranscriptionProvider()+ }++ defer {+ Task { @MainActor in+ guard shouldRestore else { return }+ if self.settings.selectedSpeechModel == model {+ self.skipNextSpeechModelSync = true+ self.settings.selectedSpeechModel = previousActive+ self.asr.resetTranscriptionProvider()+ }+ if self.previewSpeechModel == model {+ self.previewSpeechModel = model+ }+ self.suppressSpeechProviderSync = false+ }+ }++ await self.downloadModels()+ }+ }++ func deleteSpeechModel(_ model: SettingsStore.SpeechModel) {+ guard !self.asr.isRunning else { return }+ let previousActive = self.settings.selectedSpeechModel++ Task {+ let shouldRestore = previousActive != model+ await MainActor.run {+ if shouldRestore {+ self.suppressSpeechProviderSync = true+ }+ self.settings.selectedSpeechModel = model+ self.asr.resetTranscriptionProvider()+ }++ defer {+ Task { @MainActor in+ guard shouldRestore else { return }+ self.skipNextSpeechModelSync = true+ self.settings.selectedSpeechModel = previousActive+ self.asr.resetTranscriptionProvider()+ if self.previewSpeechModel == model {+ self.previewSpeechModel = model+ }+ self.suppressSpeechProviderSync = false+ }+ }++ await self.deleteModels()+ }+ }++ func isActiveSpeechModel(_ model: SettingsStore.SpeechModel) -> Bool {+ self.settings.selectedSpeechModel == model+ }++ var modelDescriptionText: String {+ let model = self.settings.selectedSpeechModel+ switch model {+ case .appleSpeech:+ return "Apple Speech (Legacy) uses on-device recognition. No download required, works on Intel and Apple Silicon."+ case .appleSpeechAnalyzer:+ return "Apple Speech uses advanced on-device recognition with fast, accurate transcription. Requires macOS 26+."+ case .parakeetTDT:+ return "Parakeet TDT v3 uses CoreML and Neural Engine for fastest transcription (25 languages) on Apple Silicon."+ case .parakeetTDTv2:+ return "Parakeet TDT v2 is an English-only model optimized for accuracy and consistency on Apple Silicon."+ default:+ return "Whisper models support 99 languages and work on any Mac."+ }+ }++ func downloadModels() async {+ do {+ try await self.asr.ensureAsrReady()+ } catch {+ DebugLogger.shared.error("Failed to download models: \(error)", source: "AISettingsView")+ }+ }++ func deleteModels() async {+ do {+ try await self.asr.clearModelCache()+ } catch {+ DebugLogger.shared.error("Failed to delete models: \(error)", source: "AISettingsView")+ }+ }++ func setSelectedSpeechProvider(_ provider: SettingsStore.SpeechModel.Provider) {+ self.selectedSpeechProvider = provider+ }+}diff --git a/Sources/Fluid/UI/AISettingsView+AIConfiguration.swift b/Sources/Fluid/UI/AISettingsView+AIConfiguration.swiftindex 4606e656..1ed79050 100644--- a/Sources/Fluid/UI/AISettingsView+AIConfiguration.swift+++ b/Sources/Fluid/UI/AISettingsView+AIConfiguration.swift@@ -6,309 +6,25 @@//import AppKit-import Securityimport SwiftUI-extension AISettingsView {+extension AIEnhancementSettingsView {// MARK: - Helper Functions- func providerKey(for providerID: String) -> String {- // Built-in providers use their ID directly- if ModelRepository.shared.isBuiltIn(providerID) { return providerID }- // Custom providers get "custom:" prefix (if not already present)- if providerID.hasPrefix("custom:") { return providerID }- return providerID.isEmpty ? self.currentProvider : "custom:\(providerID)"- }-- func providerDisplayName(for providerID: String) -> String {- switch providerID {- case "openai": return "OpenAI"- case "groq": return "Groq"- case "apple-intelligence": return "Apple Intelligence"- default:- return self.savedProviders.first(where: { $0.id == providerID })?.name ?? providerID.capitalized- }- }-- func saveProviderAPIKeys() {- SettingsStore.shared.providerAPIKeys = self.providerAPIKeys- }-- func updateCurrentProvider() {- let url = self.openAIBaseURL.trimmingCharacters(in: .whitespacesAndNewlines)- if url.contains("openai.com") { self.currentProvider = "openai"; return }- if url.contains("groq.com") { self.currentProvider = "groq"; return }- self.currentProvider = self.providerKey(for: self.selectedProviderID)- }-- func saveSavedProviders() {- SettingsStore.shared.savedProviders = self.savedProviders- }-- func isLocalEndpoint(_ urlString: String) -> Bool {- return ModelRepository.shared.isLocalEndpoint(urlString)- }-- func hasReasoningConfigForCurrentModel() -> Bool {- let pKey = self.providerKey(for: self.selectedProviderID)- if SettingsStore.shared.hasCustomReasoningConfig(forModel: self.selectedModel, provider: pKey) {- if let config = SettingsStore.shared.getReasoningConfig(forModel: selectedModel, provider: pKey) {- return config.isEnabled- }- }- return SettingsStore.shared.isReasoningModel(self.selectedModel)- }-- func addNewModel() {- guard !self.newModelName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else { return }- let modelName = self.newModelName.trimmingCharacters(in: .whitespacesAndNewlines)- let key = self.providerKey(for: self.selectedProviderID)-- var list = self.availableModelsByProvider[key] ?? self.availableModels- if !list.contains(modelName) {- list.append(modelName)- self.availableModelsByProvider[key] = list- SettingsStore.shared.availableModelsByProvider = self.availableModelsByProvider-- if let providerIndex = savedProviders.firstIndex(where: { $0.id == selectedProviderID }) {- let updatedProvider = SettingsStore.SavedProvider(- id: self.savedProviders[providerIndex].id,- name: self.savedProviders[providerIndex].name,- baseURL: self.savedProviders[providerIndex].baseURL,- models: list+ func formLabel(_ title: String) -> some View {+ Text(title)+ .fontWeight(.medium)+ .padding(.horizontal, 10)+ .padding(.vertical, 4)+ .frame(width: AISettingsLayout.labelWidth, alignment: .leading)+ .background(+ LinearGradient(+ colors: [self.theme.palette.accent.opacity(0.15), self.theme.palette.accent.opacity(0.05)],+ startPoint: .leading,+ endPoint: .trailing)- self.savedProviders[providerIndex] = updatedProvider- self.saveSavedProviders()- }-- self.availableModels = list- self.selectedModel = modelName- self.selectedModelByProvider[key] = modelName- SettingsStore.shared.selectedModelByProvider = self.selectedModelByProvider- }-- self.showingAddModel = false- self.newModelName = ""- }-- // MARK: - Keychain Access Helpers-- private enum KeychainAccessCheckResult {- case granted- case denied(OSStatus)- }-- func handleAPIKeyButtonTapped() {- switch self.probeKeychainAccess() {- case .granted:- self.newProviderApiKey = self.providerAPIKeys[self.currentProvider] ?? ""- self.showAPIKeyEditor = true- case let .denied(status):- self.keychainPermissionMessage = self.keychainPermissionExplanation(for: status)- self.showKeychainPermissionAlert = true- }- }-- private func probeKeychainAccess() -> KeychainAccessCheckResult {- let service = "com.fluidvoice.provider-api-keys"- let account = "fluidApiKeys"-- let query: [String: Any] = [- kSecClass as String: kSecClassGenericPassword,- kSecAttrService as String: service,- kSecAttrAccount as String: account,- ]-- var readQuery = query- readQuery[kSecReturnData as String] = kCFBooleanTrue- readQuery[kSecMatchLimit as String] = kSecMatchLimitOne-- let readStatus = SecItemCopyMatching(readQuery as CFDictionary, nil)- switch readStatus {- case errSecSuccess:- return .granted- case errSecItemNotFound:- var addQuery = query- addQuery[kSecAttrAccessible as String] = kSecAttrAccessibleAfterFirstUnlock- addQuery[kSecValueData as String] = (try? JSONEncoder().encode([String: String]())) ?? Data()-- let addStatus = SecItemAdd(addQuery as CFDictionary, nil)- if addStatus == errSecSuccess {- SecItemDelete(query as CFDictionary)- }-- switch addStatus {- case errSecSuccess, errSecDuplicateItem:- return .granted- case errSecAuthFailed, errSecInteractionNotAllowed, errSecUserCanceled:- return .denied(addStatus)- default:- return .denied(addStatus)- }- case errSecAuthFailed, errSecInteractionNotAllowed, errSecUserCanceled:- return .denied(readStatus)- default:- return .denied(readStatus)- }- }-- private func keychainPermissionExplanation(for status: OSStatus) -> String {- var message = "FluidVoice stores provider API keys securely in your macOS Keychain but does not currently have permission to access it."- if let detail = SecCopyErrorMessageString(status, nil) as String? {- message += "\n\nmacOS reported: \(detail) (\(status))"- }- message += "\n\nClick \"Always Allow\" when the Keychain prompt appears, or open Keychain Access > login > Passwords, locate the FluidVoice entry, and grant access."- return message- }-- @MainActor- func presentKeychainAccessAlert(message: String) {- let msg = message.isEmpty- ? "FluidVoice stores provider API keys securely in your macOS Keychain. Please grant access by choosing \"Always Allow\" when prompted."- : message-- let alert = NSAlert()- alert.messageText = "Keychain Access Required"- alert.informativeText = msg- alert.alertStyle = .warning- alert.addButton(withTitle: "Open Keychain Access")- alert.addButton(withTitle: "OK")-- let response = alert.runModal()- if response == .alertFirstButtonReturn {- if let appURL = NSWorkspace.shared.urlForApplication(withBundleIdentifier: "com.apple.keychainaccess") {- NSWorkspace.shared.openApplication(- at: appURL,- configuration: NSWorkspace.OpenConfiguration(),- completionHandler: nil- )- }- }- }-- // MARK: - API Connection Testing-- func testAPIConnection() async {- guard !self.isTestingConnection else { return }-- let apiKey = self.providerAPIKeys[self.currentProvider] ?? ""- let baseURL = self.openAIBaseURL.trimmingCharacters(in: .whitespacesAndNewlines)- let isLocal = self.isLocalEndpoint(baseURL)-- if isLocal {- guard !baseURL.isEmpty else {- await MainActor.run {- self.connectionStatus = .failed- self.connectionErrorMessage = "Base URL is required"- }- return- }- } else {- guard !apiKey.isEmpty, !baseURL.isEmpty else {- await MainActor.run {- self.connectionStatus = .failed- self.connectionErrorMessage = "API key and base URL are required"- }- return- }- }-- await MainActor.run {- self.isTestingConnection = true- self.connectionStatus = .testing- self.connectionErrorMessage = ""- }-- do {- let endpoint = baseURL.trimmingCharacters(in: .whitespacesAndNewlines)- let fullURL: String- if endpoint.contains("/chat/completions") || endpoint.contains("/api/chat") || endpoint- .contains("/api/generate")- {- fullURL = endpoint- } else {- fullURL = endpoint + "/chat/completions"- }-- // Debug logging to diagnose test failures- DebugLogger.shared.debug("testAPIConnection: provider=\(self.selectedProviderID), model=\(self.selectedModel), baseURL=\(endpoint), fullURL=\(fullURL)", source: "AISettingsView")-- guard let url = URL(string: fullURL) else {- await MainActor.run {- self.connectionStatus = .failed- self.connectionErrorMessage = "Invalid Base URL format"- }- return- }-- let provKey = self.providerKey(for: self.selectedProviderID)- let reasoningConfig = SettingsStore.shared.getReasoningConfig(forModel: self.selectedModel, provider: provKey)-- let usesMaxCompletionTokens = SettingsStore.shared.isReasoningModel(self.selectedModel)-- var requestDict: [String: Any] = [- "model": selectedModel,- "messages": [["role": "user", "content": "test"]],- ]-- if usesMaxCompletionTokens {- requestDict["max_completion_tokens"] = 50- } else {- requestDict["max_tokens"] = 50- }-- if let config = reasoningConfig, config.isEnabled {- if config.parameterName == "enable_thinking" {- requestDict[config.parameterName] = config.parameterValue == "true"- } else {- requestDict[config.parameterName] = config.parameterValue- }- }-- guard let jsonData = try? JSONSerialization.data(withJSONObject: requestDict, options: []) else {- await MainActor.run {- self.connectionStatus = .failed- self.connectionErrorMessage = "Failed to create test payload"- }- return- }-- var request = URLRequest(url: url)- request.httpMethod = "POST"- request.setValue("application/json", forHTTPHeaderField: "Content-Type")- if !apiKey.isEmpty {- request.setValue("Bearer \(apiKey)", forHTTPHeaderField: "Authorization")- }- request.httpBody = jsonData- request.timeoutInterval = 12-- let (_, response) = try await URLSession.shared.data(for: request)- if let httpResponse = response as? HTTPURLResponse, httpResponse.statusCode >= 200, httpResponse.statusCode < 300 {- await MainActor.run {- self.connectionStatus = .success- self.connectionErrorMessage = ""- }- } else if let httpResponse = response as? HTTPURLResponse {- await MainActor.run {- self.connectionStatus = .failed- self.connectionErrorMessage = "HTTP \(httpResponse.statusCode)"- }- } else {- await MainActor.run {- self.connectionStatus = .failed- self.connectionErrorMessage = "Unexpected response"- }- }- } catch {- await MainActor.run {- self.connectionStatus = .failed- self.connectionErrorMessage = error.localizedDescription- }- }-- await MainActor.run {- self.isTestingConnection = false- }+ )+ .cornerRadius(6)}// MARK: - AI Configuration Card@@ -328,13 +44,13 @@ extension AISettingsView {.fontWeight(.semibold)}Spacer()- Toggle("", isOn: self.$enableAIProcessing)+ Toggle("", isOn: self.$viewModel.enableAIProcessing).toggleStyle(.switch).labelsHidden()}// Streaming Toggle- if self.enableAIProcessing && self.selectedProviderID != "apple-intelligence" {+ if self.viewModel.enableAIProcessing && self.viewModel.selectedProviderID != "apple-intelligence" {HStack(spacing: 20) {Toggle("Enable Streaming", isOn: Binding(get: { SettingsStore.shared.enableAIStreaming },@@ -355,18 +71,18 @@ extension AISettingsView {}// API Key Warning- if self.enableAIProcessing && self.selectedProviderID != "apple-intelligence" &&- !self.isLocalEndpoint(self.openAIBaseURL.trimmingCharacters(in: .whitespacesAndNewlines)) &&- (self.providerAPIKeys[self.currentProvider] ?? "").trimmingCharacters(in: .whitespacesAndNewlines).isEmpty+ if self.viewModel.enableAIProcessing && self.viewModel.selectedProviderID != "apple-intelligence" &&+ !self.viewModel.isLocalEndpoint(self.viewModel.openAIBaseURL.trimmingCharacters(in: .whitespacesAndNewlines)) &&+ (self.viewModel.providerAPIKeys[self.viewModel.currentProvider] ?? "").trimmingCharacters(in: .whitespacesAndNewlines).isEmpty{self.apiKeyWarningView}// Help Section- if self.showHelp { self.helpSectionView }+ if self.viewModel.showHelp { self.helpSectionView }// Provider/Model Configuration (only shown when AI Enhancement is enabled)- if self.enableAIProcessing {+ if self.viewModel.enableAIProcessing {HStack(spacing: 12) {HStack(spacing: 8) {Image(systemName: "key.fill")@@ -378,7 +94,7 @@ extension AISettingsView {}// Compatibility Badge- if self.selectedProviderID == "apple-intelligence" {+ if self.viewModel.selectedProviderID == "apple-intelligence" {HStack(spacing: 4) {Image(systemName: "apple.logo").font(.caption2)Text("On-device").font(.caption)@@ -400,8 +116,8 @@ extension AISettingsView {Spacer()- Button(action: { self.showHelp.toggle() }) {- Image(systemName: self.showHelp ? "questionmark.circle.fill" : "questionmark.circle")+ Button(action: { self.viewModel.showHelp.toggle() }) {+ Image(systemName: self.viewModel.showHelp ? "questionmark.circle.fill" : "questionmark.circle").font(.system(size: 20)).foregroundStyle(self.theme.palette.accent.opacity(0.8))}@@ -415,7 +131,7 @@ extension AISettingsView {}.padding(14)}- .modifier(CardAppearAnimation(delay: 0.1, appear: self.$appear))+ .modifier(CardAppearAnimation(delay: 0.1, appear: self.$viewModel.appear))}}@@ -470,47 +186,47 @@ extension AISettingsView {VStack(alignment: .leading, spacing: 10) {self.providerPickerRow- if self.showingEditProvider { self.editProviderSection }+ if self.viewModel.showingEditProvider { self.editProviderSection }- if self.selectedProviderID == "apple-intelligence" { self.appleIntelligenceBadge }+ if self.viewModel.selectedProviderID == "apple-intelligence" { self.appleIntelligenceBadge }// API Key Management- if self.selectedProviderID != "apple-intelligence" {+ if self.viewModel.selectedProviderID != "apple-intelligence" {HStack(spacing: 8) {- Button(action: { self.handleAPIKeyButtonTapped() }) {+ Button(action: { self.viewModel.handleAPIKeyButtonTapped() }) {Label("Add or Modify API Key", systemImage: "key.fill").labelStyle(.titleAndIcon).font(.caption)}- .buttonStyle(.borderedProminent)- .controlSize(.small)- .tint(self.theme.palette.accent.opacity(0.8))+ .buttonStyle(CompactButtonStyle(isReady: true))+ .frame(minWidth: AISettingsLayout.primaryActionMinWidth, minHeight: AISettingsLayout.controlHeight)// Get API Key / Download button for built-in providers- if let websiteInfo = ModelRepository.shared.providerWebsiteURL(for: self.selectedProviderID),+ if let websiteInfo = ModelRepository.shared.providerWebsiteURL(for: self.viewModel.selectedProviderID),let url = URL(string: websiteInfo.url){Button(action: { NSWorkspace.shared.open(url) }) {Label(websiteInfo.label, systemImage: websiteInfo.label.contains("Download") ? "arrow.down.circle.fill" : (websiteInfo.label.contains("Guide") ? "book.fill" : "link")).labelStyle(.titleAndIcon).font(.caption)}- .buttonStyle(GlassButtonStyle())+ .buttonStyle(CompactButtonStyle())+ .frame(minWidth: AISettingsLayout.actionMinWidth, minHeight: AISettingsLayout.controlHeight)}}}// Model Row- if self.selectedProviderID == "apple-intelligence" {+ if self.viewModel.selectedProviderID == "apple-intelligence" {self.appleIntelligenceModelRow} else {self.standardModelRow- if self.showingAddModel { self.addModelSection }- if self.showingReasoningConfig { self.reasoningConfigSection }+ if self.viewModel.showingAddModel { self.addModelSection }+ if self.viewModel.showingReasoningConfig { self.reasoningConfigSection }}// Connection Test- if self.selectedProviderID != "apple-intelligence" {+ if self.viewModel.selectedProviderID != "apple-intelligence" {self.connectionTestSection- if self.showingSaveProvider { self.addProviderSection }+ if self.viewModel.showingSaveProvider { self.addProviderSection }}}.padding(.horizontal, 4)@@ -518,48 +234,50 @@ extension AISettingsView {var providerPickerRow: some View {HStack(spacing: 12) {- HStack {- Text("Provider:").fontWeight(.medium)- }- .frame(width: 90, alignment: .leading)- .padding(.horizontal, 10).padding(.vertical, 4)- .background(LinearGradient(colors: [self.theme.palette.accent.opacity(0.15), self.theme.palette.accent.opacity(0.05)], startPoint: .leading, endPoint: .trailing))- .cornerRadius(6)+ self.formLabel("Provider:")// Searchable provider picker with bounded popoverSearchableProviderPicker(builtInProviders: self.builtInProvidersList,- savedProviders: self.savedProviders,+ savedProviders: self.viewModel.savedProviders,selectedProviderID: Binding(- get: { self.selectedProviderID },+ get: { self.viewModel.selectedProviderID },set: { newValue in- self.selectedProviderID = newValue- self.handleProviderChange(newValue)+ self.viewModel.selectedProviderID = newValue+ self.viewModel.handleProviderChange(newValue)}- )+ ),+ controlWidth: AISettingsLayout.pickerWidth,+ controlHeight: AISettingsLayout.controlHeight)// Edit button for all providers (including built-in)- if self.selectedProviderID != "apple-intelligence" {- Button(action: { self.startEditingProvider() }) {+ if self.viewModel.selectedProviderID != "apple-intelligence" {+ Button(action: { self.viewModel.startEditingProvider() }) {HStack(spacing: 4) { Image(systemName: "pencil"); Text("Edit") }.font(.caption)}.buttonStyle(CompactButtonStyle())+ .frame(minWidth: AISettingsLayout.compactActionMinWidth, minHeight: AISettingsLayout.controlHeight)}// 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)+ if !ModelRepository.shared.isBuiltIn(self.viewModel.selectedProviderID) {+ Button(action: { self.viewModel.deleteCurrentProvider() }) {+ HStack(spacing: 4) { Image(systemName: "trash"); Text("Delete") }.font(.caption)}- .buttonStyle(CompactButtonStyle())+ .buttonStyle(CompactButtonStyle(foreground: .red, borderColor: .red.opacity(0.6)))+ .frame(minWidth: AISettingsLayout.compactActionMinWidth, minHeight: AISettingsLayout.controlHeight)}Button("+ Add Provider") {- self.showingSaveProvider = true- self.newProviderName = ""; self.newProviderBaseURL = ""; self.newProviderApiKey = ""; self.newProviderModels = ""+ self.viewModel.showingSaveProvider = true+ self.viewModel.newProviderName = ""+ self.viewModel.newProviderBaseURL = ""+ self.viewModel.newProviderApiKey = ""+ self.viewModel.newProviderModels = ""}- .buttonStyle(CompactButtonStyle())+ .buttonStyle(CompactButtonStyle(isReady: true))+ .frame(minWidth: AISettingsLayout.wideActionMinWidth, minHeight: AISettingsLayout.controlHeight)}}@@ -570,93 +288,36 @@ extension AISettingsView {)}- func handleProviderChange(_ newValue: String) {- // Handle Apple Intelligence specially (no base URL)- if newValue == "apple-intelligence" {- self.openAIBaseURL = ""- self.updateCurrentProvider()- self.availableModels = ["System Model"]- self.selectedModel = "System Model"- 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- }- }-- 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- self.showingEditProvider = true- }- }-- func deleteCurrentProvider() {- self.savedProviders.removeAll { $0.id == self.selectedProviderID }- self.saveSavedProviders()- let key = self.providerKey(for: self.selectedProviderID)- self.availableModelsByProvider.removeValue(forKey: key)- self.selectedModelByProvider.removeValue(forKey: key)- self.providerAPIKeys.removeValue(forKey: key)- self.saveProviderAPIKeys()- SettingsStore.shared.availableModelsByProvider = self.availableModelsByProvider- SettingsStore.shared.selectedModelByProvider = self.selectedModelByProvider- // Reset to OpenAI- self.selectedProviderID = "openai"- self.openAIBaseURL = ModelRepository.shared.defaultBaseURL(for: "openai")- self.updateCurrentProvider()- // Use fetched models if available, fall back to defaults (same logic as handleProviderChange)- self.availableModels = self.availableModelsByProvider["openai"] ?? ModelRepository.shared.defaultModels(for: "openai")- self.selectedModel = self.selectedModelByProvider["openai"] ?? self.availableModels.first ?? ""- }-var editProviderSection: some View {VStack(spacing: 12) {HStack { Text("Edit Provider").font(.headline).fontWeight(.semibold); Spacer() }HStack(spacing: 8) {VStack(alignment: .leading, spacing: 4) {Text("Name").font(.caption).foregroundStyle(.secondary)- TextField("Provider name", text: self.$editProviderName).textFieldStyle(.roundedBorder).frame(width: 200)+ TextField("Provider name", text: self.$viewModel.editProviderName)+ .textFieldStyle(.roundedBorder)+ .frame(width: 200)}VStack(alignment: .leading, spacing: 4) {Text("Base URL").font(.caption).foregroundStyle(.secondary)- TextField("e.g., http://localhost:11434/v1", text: self.$editProviderBaseURL).textFieldStyle(.roundedBorder).font(.system(.body, design: .monospaced))+ TextField("e.g., http://localhost:11434/v1", text: self.$viewModel.editProviderBaseURL)+ .textFieldStyle(.roundedBorder)+ .font(.system(.body, design: .monospaced))}}HStack(spacing: 8) {- Button("Save") { self.saveEditedProvider() }.buttonStyle(GlassButtonStyle())- .disabled(self.editProviderName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty || self.editProviderBaseURL.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty)- Button("Cancel") { self.showingEditProvider = false; self.editProviderName = ""; self.editProviderBaseURL = "" }.buttonStyle(GlassButtonStyle())+ Button("Save") { self.viewModel.saveEditedProvider() }+ .buttonStyle(GlassButtonStyle())+ .frame(minWidth: AISettingsLayout.actionMinWidth, minHeight: AISettingsLayout.controlHeight)+ .disabled(self.viewModel.editProviderName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ||+ self.viewModel.editProviderBaseURL.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty)+ Button("Cancel") {+ self.viewModel.showingEditProvider = false+ self.viewModel.editProviderName = ""+ self.viewModel.editProviderBaseURL = ""+ }+ .buttonStyle(GlassButtonStyle())+ .frame(minWidth: AISettingsLayout.actionMinWidth, minHeight: AISettingsLayout.controlHeight)}}.padding(12)@@ -667,33 +328,6 @@ extension AISettingsView {.transition(.move(edge: .top).combined(with: .opacity))}- func saveEditedProvider() {- let name = self.editProviderName.trimmingCharacters(in: .whitespacesAndNewlines)- 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)- self.savedProviders[providerIndex] = updatedProvider- self.saveSavedProviders()- self.openAIBaseURL = base- self.updateCurrentProvider()- }- self.showingEditProvider = false- self.editProviderName = ""; self.editProviderBaseURL = ""- }-var appleIntelligenceBadge: some View {HStack(spacing: 8) {Image(systemName: "apple.logo").font(.system(size: 14))@@ -713,11 +347,7 @@ extension AISettingsView {var appleIntelligenceModelRow: some View {HStack(spacing: 12) {- HStack { Text("Model:").fontWeight(.medium) }- .frame(width: 90, alignment: .leading)- .padding(.horizontal, 10).padding(.vertical, 4)- .background(LinearGradient(colors: [self.theme.palette.accent.opacity(0.15), self.theme.palette.accent.opacity(0.05)], startPoint: .leading, endPoint: .trailing))- .cornerRadius(6)+ self.formLabel("Model:")Text("System Language Model").foregroundStyle(.secondary).font(.system(.body))Spacer()}@@ -725,166 +355,99 @@ extension AISettingsView {var standardModelRow: some View {HStack(spacing: 12) {- HStack { Text("Model:").fontWeight(.medium) }- .frame(width: 90, alignment: .leading)- .padding(.horizontal, 10).padding(.vertical, 4)- .background(LinearGradient(colors: [self.theme.palette.accent.opacity(0.15), self.theme.palette.accent.opacity(0.05)], startPoint: .leading, endPoint: .trailing))- .cornerRadius(6)+ self.formLabel("Model:")// Searchable model picker with refresh buttonSearchableModelPicker(- models: self.availableModels,- selectedModel: self.$selectedModel,- onRefresh: { await self.fetchModelsForCurrentProvider() },- isRefreshing: self.isFetchingModels+ models: self.viewModel.availableModels,+ selectedModel: self.$viewModel.selectedModel,+ onRefresh: { await self.viewModel.fetchModelsForCurrentProvider() },+ isRefreshing: self.viewModel.isFetchingModels,+ controlWidth: AISettingsLayout.pickerWidth,+ controlHeight: AISettingsLayout.controlHeight)- if !ModelRepository.shared.isBuiltIn(self.selectedProviderID) {- Button(action: { self.deleteSelectedModel() }) {- HStack(spacing: 4) { Image(systemName: "trash"); Text("Delete") }.font(.caption).foregroundStyle(.red)+ if !ModelRepository.shared.isBuiltIn(self.viewModel.selectedProviderID) {+ Button(action: { self.viewModel.deleteSelectedModel() }) {+ HStack(spacing: 4) { Image(systemName: "trash"); Text("Delete") }.font(.caption)}- .buttonStyle(CompactButtonStyle())+ .buttonStyle(CompactButtonStyle(foreground: .red, borderColor: .red.opacity(0.6)))+ .frame(minWidth: AISettingsLayout.compactActionMinWidth, minHeight: AISettingsLayout.controlHeight)}- if !self.showingAddModel {- Button("+ Add Model") { self.showingAddModel = true; self.newModelName = "" }.buttonStyle(CompactButtonStyle())+ if !self.viewModel.showingAddModel {+ Button("+ Add Model") {+ self.viewModel.showingAddModel = true+ self.viewModel.newModelName = ""+ }+ .buttonStyle(CompactButtonStyle(isReady: true))+ .frame(minWidth: AISettingsLayout.wideActionMinWidth, minHeight: AISettingsLayout.controlHeight)}- Button(action: { self.openReasoningConfig() }) {+ Button(action: { self.viewModel.openReasoningConfig() }) {HStack(spacing: 4) {- Image(systemName: self.hasReasoningConfigForCurrentModel() ? "brain.fill" : "brain")+ Image(systemName: self.viewModel.hasReasoningConfigForCurrentModel() ? "brain.fill" : "brain")Text("Reasoning")}.font(.caption)- .foregroundStyle(self.hasReasoningConfigForCurrentModel() ? self.theme.palette.accent : .secondary)- }- .buttonStyle(CompactButtonStyle())- }- }-- func deleteSelectedModel() {- let key = self.providerKey(for: self.selectedProviderID)- var list = self.availableModelsByProvider[key] ?? self.availableModels- list.removeAll { $0 == self.selectedModel }- if list.isEmpty { list = ModelRepository.shared.defaultModels(for: key) }- self.availableModelsByProvider[key] = list- SettingsStore.shared.availableModelsByProvider = self.availableModelsByProvider-- if let providerIndex = savedProviders.firstIndex(where: { $0.id == selectedProviderID }) {- let updatedProvider = SettingsStore.SavedProvider(id: self.savedProviders[providerIndex].id, name: self.savedProviders[providerIndex].name, baseURL: self.savedProviders[providerIndex].baseURL, models: list)- self.savedProviders[providerIndex] = updatedProvider- self.saveSavedProviders()- }-- self.availableModels = list- self.selectedModel = list.first ?? ""- self.selectedModelByProvider[key] = self.selectedModel- SettingsStore.shared.selectedModelByProvider = self.selectedModelByProvider- }-- 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-- if let providerIndex = self.savedProviders.firstIndex(where: { $0.id == self.selectedProviderID }) {- let updatedProvider = SettingsStore.SavedProvider(- id: self.savedProviders[providerIndex].id,- name: self.savedProviders[providerIndex].name,- baseURL: self.savedProviders[providerIndex].baseURL,- models: models- )- self.savedProviders[providerIndex] = updatedProvider- self.saveSavedProviders()- }-- // 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}+ .buttonStyle(CompactButtonStyle(+ foreground: self.viewModel.hasReasoningConfigForCurrentModel() ? self.theme.palette.accent : nil,+ borderColor: self.viewModel.hasReasoningConfigForCurrentModel() ? self.theme.palette.accent.opacity(0.6) : nil+ ))+ .frame(minWidth: AISettingsLayout.compactActionMinWidth, minHeight: AISettingsLayout.controlHeight)}}func openReasoningConfig() {- let pKey = self.providerKey(for: self.selectedProviderID)- if let config = SettingsStore.shared.getReasoningConfig(forModel: selectedModel, provider: pKey) {- self.editingReasoningParamName = config.parameterName- self.editingReasoningParamValue = config.parameterValue- self.editingReasoningEnabled = config.isEnabled- } else {- let modelLower = self.selectedModel.lowercased()- if modelLower.hasPrefix("gpt-5") || modelLower.hasPrefix("o1") || modelLower.hasPrefix("o3") || modelLower.contains("gpt-oss") {- self.editingReasoningParamName = "reasoning_effort"; self.editingReasoningParamValue = "low"; self.editingReasoningEnabled = true- } else if modelLower.contains("deepseek"), modelLower.contains("reasoner") {- self.editingReasoningParamName = "enable_thinking"; self.editingReasoningParamValue = "true"; self.editingReasoningEnabled = true- } else {- self.editingReasoningParamName = "reasoning_effort"; self.editingReasoningParamValue = "low"; self.editingReasoningEnabled = false- }- }- self.showingReasoningConfig = true+ self.viewModel.openReasoningConfig()}var addModelSection: some View {HStack(spacing: 8) {- TextField("Enter model name", text: self.$newModelName)+ TextField("Enter model name", text: self.$viewModel.newModelName).textFieldStyle(.roundedBorder)- .onSubmit { if !self.newModelName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty { self.addNewModel() } }- Button("Add") { self.addNewModel() }.buttonStyle(CompactButtonStyle())- .disabled(self.newModelName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty)- Button("Cancel") { self.showingAddModel = false; self.newModelName = "" }.buttonStyle(CompactButtonStyle())+ .onSubmit {+ if !self.viewModel.newModelName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {+ self.viewModel.addNewModel()+ }+ }+ Button("Add") { self.viewModel.addNewModel() }+ .buttonStyle(CompactButtonStyle(isReady: true))+ .frame(minWidth: AISettingsLayout.compactActionMinWidth, minHeight: AISettingsLayout.controlHeight)+ .disabled(self.viewModel.newModelName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty)+ Button("Cancel") {+ self.viewModel.showingAddModel = false+ self.viewModel.newModelName = ""+ }+ .buttonStyle(CompactButtonStyle())+ .frame(minWidth: AISettingsLayout.compactActionMinWidth, minHeight: AISettingsLayout.controlHeight)}- .padding(.leading, 122)+ .padding(.leading, AISettingsLayout.rowLeadingIndent)}var reasoningConfigSection: some View {VStack(alignment: .leading, spacing: 10) {HStack {Image(systemName: "brain.head.profile").foregroundStyle(self.theme.palette.accent)- Text("Reasoning Config for \(self.selectedModel)").font(.caption).fontWeight(.semibold)+ Text("Reasoning Config for \(self.viewModel.selectedModel)").font(.caption).fontWeight(.semibold)Spacer()}- Toggle("Enable reasoning parameter", isOn: self.$editingReasoningEnabled).toggleStyle(.switch).font(.caption)+ Toggle("Enable reasoning parameter", isOn: self.$viewModel.editingReasoningEnabled)+ .toggleStyle(.switch)+ .font(.caption)- if self.editingReasoningEnabled {+ if self.viewModel.editingReasoningEnabled {HStack(spacing: 12) {VStack(alignment: .leading, spacing: 4) {Text("Parameter Name").font(.caption2).foregroundStyle(.secondary)Picker("", selection: Binding(get: {// Map current value to picker options- if self.editingReasoningParamName == "reasoning_effort" {+ if self.viewModel.editingReasoningParamName == "reasoning_effort" {return "reasoning_effort"- } else if self.editingReasoningParamName == "enable_thinking" {+ } else if self.viewModel.editingReasoningParamName == "enable_thinking" {return "enable_thinking"} else {return "custom"@@ -893,11 +456,12 @@ extension AISettingsView {set: { newValue inif newValue == "custom" {// Keep the current value for custom editing- if self.editingReasoningParamName == "reasoning_effort" || self.editingReasoningParamName == "enable_thinking" {- self.editingReasoningParamName = ""+ if self.viewModel.editingReasoningParamName == "reasoning_effort" ||+ self.viewModel.editingReasoningParamName == "enable_thinking" {+ self.viewModel.editingReasoningParamName = ""}} else {- self.editingReasoningParamName = newValue+ self.viewModel.editingReasoningParamName = newValue}})) {@@ -909,10 +473,11 @@ extension AISettingsView {}// Show TextField for custom parameter name- if self.editingReasoningParamName != "reasoning_effort" && self.editingReasoningParamName != "enable_thinking" {+ if self.viewModel.editingReasoningParamName != "reasoning_effort" &&+ self.viewModel.editingReasoningParamName != "enable_thinking" {VStack(alignment: .leading, spacing: 4) {Text("Custom Name").font(.caption2).foregroundStyle(.secondary)- TextField("e.g., thinking_budget", text: self.$editingReasoningParamName)+ TextField("e.g., thinking_budget", text: self.$viewModel.editingReasoningParamName).textFieldStyle(.roundedBorder).frame(width: 150)}@@ -920,19 +485,19 @@ extension AISettingsView {VStack(alignment: .leading, spacing: 4) {Text("Value").font(.caption2).foregroundStyle(.secondary)- if self.editingReasoningParamName == "reasoning_effort" {- Picker("", selection: self.$editingReasoningParamValue) {+ if self.viewModel.editingReasoningParamName == "reasoning_effort" {+ Picker("", selection: self.$viewModel.editingReasoningParamValue) {Text("none").tag("none"); Text("minimal").tag("minimal"); Text("low").tag("low"); Text("medium").tag("medium"); Text("high").tag("high")}.pickerStyle(.menu).labelsHidden().frame(width: 100)- } else if self.editingReasoningParamName == "enable_thinking" {- Picker("", selection: self.$editingReasoningParamValue) {+ } else if self.viewModel.editingReasoningParamName == "enable_thinking" {+ Picker("", selection: self.$viewModel.editingReasoningParamValue) {Text("true").tag("true"); Text("false").tag("false")}.pickerStyle(.menu).labelsHidden().frame(width: 100)} else {// Free-form value for custom parameters- TextField("value", text: self.$editingReasoningParamValue)+ TextField("value", text: self.$viewModel.editingReasoningParamValue).textFieldStyle(.roundedBorder).frame(width: 100)}@@ -941,57 +506,59 @@ extension AISettingsView {}HStack(spacing: 8) {- Button("Save") { self.saveReasoningConfig() }.buttonStyle(GlassButtonStyle())- Button("Cancel") { self.showingReasoningConfig = false }.buttonStyle(CompactButtonStyle())+ Button("Save") { self.saveReasoningConfig() }+ .buttonStyle(GlassButtonStyle())+ .frame(minWidth: AISettingsLayout.actionMinWidth, minHeight: AISettingsLayout.controlHeight)+ Button("Cancel") { self.viewModel.showingReasoningConfig = false }+ .buttonStyle(CompactButtonStyle())+ .frame(minWidth: AISettingsLayout.actionMinWidth, minHeight: AISettingsLayout.controlHeight)}}.padding(12).background(RoundedRectangle(cornerRadius: 8).fill(self.theme.palette.accent.opacity(0.08)).overlay(RoundedRectangle(cornerRadius: 8).stroke(self.theme.palette.accent.opacity(0.2), lineWidth: 1)))- .padding(.leading, 122)+ .padding(.leading, AISettingsLayout.rowLeadingIndent).transition(.opacity)}func saveReasoningConfig() {- let pKey = self.providerKey(for: self.selectedProviderID)- if self.editingReasoningEnabled {- let config = SettingsStore.ModelReasoningConfig(parameterName: self.editingReasoningParamName, parameterValue: self.editingReasoningParamValue, isEnabled: true)- SettingsStore.shared.setReasoningConfig(config, forModel: self.selectedModel, provider: pKey)- } else {- let config = SettingsStore.ModelReasoningConfig(parameterName: "", parameterValue: "", isEnabled: false)- SettingsStore.shared.setReasoningConfig(config, forModel: self.selectedModel, provider: pKey)- }- self.showingReasoningConfig = false+ self.viewModel.saveReasoningConfig()}var connectionTestSection: some View {VStack(alignment: .leading, spacing: 8) {HStack(spacing: 12) {- Button(action: { Task { await self.testAPIConnection() } }) {- Text(self.isTestingConnection ? "Verifying..." : "Verify Connection").font(.caption).fontWeight(.semibold)+ Button(action: { Task { await self.viewModel.testAPIConnection() } }) {+ Text(self.viewModel.isTestingConnection ? "Verifying..." : "Verify Connection")+ .font(.caption)+ .fontWeight(.semibold)}- .buttonStyle(.borderedProminent)- .controlSize(.small)- .tint(self.theme.palette.accent.opacity(0.8))- .disabled(self.isTestingConnection || (!self.isLocalEndpoint(self.openAIBaseURL.trimmingCharacters(in: .whitespacesAndNewlines)) && (self.providerAPIKeys[self.currentProvider] ?? "").isEmpty))+ .buttonStyle(CompactButtonStyle(isReady: true))+ .frame(minWidth: AISettingsLayout.primaryActionMinWidth, minHeight: AISettingsLayout.controlHeight)+ .disabled(self.viewModel.isTestingConnection ||+ (!self.viewModel.isLocalEndpoint(self.viewModel.openAIBaseURL.trimmingCharacters(in: .whitespacesAndNewlines)) &&+ (self.viewModel.providerAPIKeys[self.viewModel.currentProvider] ?? "").isEmpty))}// Connection Status Display- if self.connectionStatus == .success {+ if self.viewModel.connectionStatus == .success {HStack(spacing: 8) {Image(systemName: "checkmark.circle.fill").foregroundStyle(Color.fluidGreen).font(.caption)Text("Connection verified").font(.caption).foregroundStyle(Color.fluidGreen)}- } else if self.connectionStatus == .failed {+ } else if self.viewModel.connectionStatus == .failed {HStack(spacing: 8) {Image(systemName: "exclamationmark.circle.fill").foregroundStyle(.red).font(.caption)VStack(alignment: .leading, spacing: 2) {Text("Connection failed").font(.caption).foregroundStyle(.red)- if !self.connectionErrorMessage.isEmpty {- Text(self.connectionErrorMessage).font(.caption2).foregroundStyle(.red.opacity(0.8)).lineLimit(1)+ if !self.viewModel.connectionErrorMessage.isEmpty {+ Text(self.viewModel.connectionErrorMessage)+ .font(.caption2)+ .foregroundStyle(.red.opacity(0.8))+ .lineLimit(1)}}}- } else if self.connectionStatus == .testing {+ } else if self.viewModel.connectionStatus == .testing {HStack(spacing: 8) {ProgressView().frame(width: 16, height: 16)Text("Verifying...").font(.caption).foregroundStyle(self.theme.palette.accent)@@ -1000,7 +567,7 @@ extension AISettingsView {// API Key Editor SheetColor.clear.frame(height: 0)- .sheet(isPresented: self.$showAPIKeyEditor) {+ .sheet(isPresented: self.$viewModel.showAPIKeyEditor) {self.apiKeyEditorSheet}}@@ -1008,20 +575,28 @@ extension AISettingsView {var apiKeyEditorSheet: some View {VStack(spacing: 14) {- Text("Enter \(self.providerDisplayName(for: self.selectedProviderID)) API Key").font(.headline)- SecureField("API Key (optional for local endpoints)", text: self.$newProviderApiKey)+ Text("Enter \(self.viewModel.providerDisplayName(for: self.viewModel.selectedProviderID)) API Key")+ .font(.headline)+ SecureField("API Key (optional for local endpoints)", text: self.$viewModel.newProviderApiKey).textFieldStyle(.roundedBorder).frame(width: 300)HStack(spacing: 12) {- Button("Cancel") { self.showAPIKeyEditor = false }.buttonStyle(.bordered)+ Button("Cancel") { self.viewModel.showAPIKeyEditor = false }+ .buttonStyle(CompactButtonStyle())+ .frame(minWidth: AISettingsLayout.actionMinWidth, minHeight: AISettingsLayout.controlHeight)Button("OK") {- let trimmedKey = self.newProviderApiKey.trimmingCharacters(in: .whitespacesAndNewlines)- self.providerAPIKeys[self.currentProvider] = trimmedKey- self.saveProviderAPIKeys()- if self.connectionStatus != .unknown { self.connectionStatus = .unknown; self.connectionErrorMessage = "" }- self.showAPIKeyEditor = false+ let trimmedKey = self.viewModel.newProviderApiKey.trimmingCharacters(in: .whitespacesAndNewlines)+ self.viewModel.providerAPIKeys[self.viewModel.currentProvider] = trimmedKey+ self.viewModel.saveProviderAPIKeys()+ if self.viewModel.connectionStatus != .unknown {+ self.viewModel.connectionStatus = .unknown+ self.viewModel.connectionErrorMessage = ""+ }+ self.viewModel.showAPIKeyEditor = false}- .buttonStyle(.borderedProminent)- .disabled(!self.isLocalEndpoint(self.openAIBaseURL.trimmingCharacters(in: .whitespacesAndNewlines)) && self.newProviderApiKey.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty)+ .buttonStyle(GlassButtonStyle())+ .frame(minWidth: AISettingsLayout.actionMinWidth, minHeight: AISettingsLayout.controlHeight)+ .disabled(!self.viewModel.isLocalEndpoint(self.viewModel.openAIBaseURL.trimmingCharacters(in: .whitespacesAndNewlines)) &&+ self.viewModel.newProviderApiKey.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty)}}.padding()@@ -1031,56 +606,42 @@ extension AISettingsView {var addProviderSection: some View {VStack(spacing: 12) {HStack(spacing: 8) {- TextField("Provider name", text: self.$newProviderName).textFieldStyle(.roundedBorder).frame(width: 200)- TextField("Base URL", text: self.$newProviderBaseURL).textFieldStyle(.roundedBorder).frame(width: 250)+ TextField("Provider name", text: self.$viewModel.newProviderName)+ .textFieldStyle(.roundedBorder)+ .frame(width: 200)+ TextField("Base URL", text: self.$viewModel.newProviderBaseURL)+ .textFieldStyle(.roundedBorder)+ .frame(width: 250)}HStack(spacing: 8) {- SecureField("API Key (optional for local)", text: self.$newProviderApiKey).textFieldStyle(.roundedBorder).frame(width: 200)- TextField("Models (comma-separated)", text: self.$newProviderModels).textFieldStyle(.roundedBorder).frame(width: 250)+ SecureField("API Key (optional for local)", text: self.$viewModel.newProviderApiKey)+ .textFieldStyle(.roundedBorder)+ .frame(width: 200)+ TextField("Models (comma-separated)", text: self.$viewModel.newProviderModels)+ .textFieldStyle(.roundedBorder)+ .frame(width: 250)}HStack(spacing: 8) {Button("Save Provider") { self.saveNewProvider() }.buttonStyle(GlassButtonStyle())- .disabled(self.newProviderName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty || self.newProviderBaseURL.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty)+ .frame(minWidth: AISettingsLayout.actionMinWidth, minHeight: AISettingsLayout.controlHeight)+ .disabled(self.viewModel.newProviderName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ||+ self.viewModel.newProviderBaseURL.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty)Button("Cancel") {- self.showingSaveProvider = false; self.newProviderName = ""; self.newProviderBaseURL = ""; self- .newProviderApiKey = ""; self.newProviderModels = ""+ self.viewModel.showingSaveProvider = false+ self.viewModel.newProviderName = ""+ self.viewModel.newProviderBaseURL = ""+ self.viewModel.newProviderApiKey = ""+ self.viewModel.newProviderModels = ""}.buttonStyle(GlassButtonStyle())+ .frame(minWidth: AISettingsLayout.actionMinWidth, minHeight: AISettingsLayout.controlHeight)}}.transition(.opacity)}func saveNewProvider() {- let name = self.newProviderName.trimmingCharacters(in: .whitespacesAndNewlines)- let base = self.newProviderBaseURL.trimmingCharacters(in: .whitespacesAndNewlines)- let api = self.newProviderApiKey.trimmingCharacters(in: .whitespacesAndNewlines)- guard !name.isEmpty, !base.isEmpty else { return }-- let modelsList = self.newProviderModels.split(separator: ",").map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }.filter { !$0.isEmpty }- let models = modelsList.isEmpty ? ModelRepository.shared.defaultModels(for: "openai") : modelsList-- let newProvider = SettingsStore.SavedProvider(name: name, baseURL: base, models: models)- self.savedProviders.removeAll { $0.name.lowercased() == name.lowercased() }- self.savedProviders.append(newProvider)- self.saveSavedProviders()-- let key = self.providerKey(for: newProvider.id)- self.providerAPIKeys[key] = api- self.availableModelsByProvider[key] = models- self.selectedModelByProvider[key] = models.first ?? self.selectedModel- SettingsStore.shared.providerAPIKeys = self.providerAPIKeys- SettingsStore.shared.availableModelsByProvider = self.availableModelsByProvider- SettingsStore.shared.selectedModelByProvider = self.selectedModelByProvider-- self.selectedProviderID = newProvider.id- self.openAIBaseURL = base- self.updateCurrentProvider()- self.availableModels = models- self.selectedModel = models.first ?? self.selectedModel-- self.showingSaveProvider = false- self.newProviderName = ""; self.newProviderBaseURL = ""; self.newProviderApiKey = ""; self.newProviderModels = ""+ self.viewModel.saveNewProvider()}}diff --git a/Sources/Fluid/UI/AISettingsView+AdvancedSettings.swift b/Sources/Fluid/UI/AISettingsView+AdvancedSettings.swiftindex ca1356c5..890d0690 100644--- a/Sources/Fluid/UI/AISettingsView+AdvancedSettings.swift+++ b/Sources/Fluid/UI/AISettingsView+AdvancedSettings.swift@@ -8,7 +8,7 @@import AppKitimport SwiftUI-extension AISettingsView {+extension AIEnhancementSettingsView {// MARK: - Advanced Settings Cardvar advancedSettingsCard: some View {@@ -38,23 +38,23 @@ extension AISettingsView {}Spacer()Button("+ Add Prompt") {- self.openNewPromptEditor()+ self.viewModel.openNewPromptEditor()}- .buttonStyle(CompactButtonStyle())- .frame(width: 120)+ .buttonStyle(CompactButtonStyle(isReady: true))+ .frame(minWidth: AISettingsLayout.actionMinWidth, minHeight: AISettingsLayout.controlHeight)}// Default prompt cardself.promptProfileCard(title: "Default",- subtitle: self.promptPreview(+ subtitle: self.viewModel.promptPreview(self.settings.defaultDictationPromptOverride.map {SettingsStore.stripBaseDictationPrompt(from: $0)} ?? SettingsStore.defaultDictationPromptBodyText()),isSelected: self.settings.selectedDictationPromptProfile == nil,onUse: { self.settings.selectedDictationPromptID = nil },- onOpen: { self.openDefaultPromptViewer() }+ onOpen: { self.viewModel.openDefaultPromptViewer() })// User prompt cards@@ -68,11 +68,13 @@ extension AISettingsView {ForEach(profiles) { profile inself.promptProfileCard(title: profile.name.isEmpty ? "Untitled Prompt" : profile.name,- subtitle: profile.prompt.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ? "Empty prompt (uses Default)" : self.promptPreview(SettingsStore.stripBaseDictationPrompt(from: profile.prompt)),+ subtitle: profile.prompt.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty+ ? "Empty prompt (uses Default)"+ : self.viewModel.promptPreview(SettingsStore.stripBaseDictationPrompt(from: profile.prompt)),isSelected: self.settings.selectedDictationPromptID == profile.id,onUse: { self.settings.selectedDictationPromptID = profile.id },- onOpen: { self.openEditor(for: profile) },- onDelete: { self.requestDeletePrompt(profile) }+ onOpen: { self.viewModel.openEditor(for: profile) },+ onDelete: { self.viewModel.requestDeletePrompt(profile) })}}@@ -81,56 +83,12 @@ extension AISettingsView {}.padding(14)}- .modifier(CardAppearAnimation(delay: 0.3, appear: self.$appear))- .sheet(item: self.$promptEditorMode) { mode in+ .modifier(CardAppearAnimation(delay: 0.3, appear: self.$viewModel.appear))+ .sheet(item: self.$viewModel.promptEditorMode) { mode inself.promptEditorSheet(mode: mode)}}- func promptPreview(_ text: String) -> String {- let trimmed = text.trimmingCharacters(in: .whitespacesAndNewlines)- guard !trimmed.isEmpty else { return "Empty prompt" }- let singleLine = trimmed.replacingOccurrences(of: "\n", with: " ")- return singleLine.count > 120 ? String(singleLine.prefix(120)) + "…" : singleLine- }-- /// Combine a user-visible body with the hidden base prompt to ensure role/intent is always present.- func combinedDraftPrompt(_ text: String) -> String {- let body = SettingsStore.stripBaseDictationPrompt(from: text)- return SettingsStore.combineBasePrompt(with: body)- }-- func requestDeletePrompt(_ profile: SettingsStore.DictationPromptProfile) {- self.pendingDeletePromptID = profile.id- self.pendingDeletePromptName = profile.name.isEmpty ? "Untitled Prompt" : profile.name- self.showingDeletePromptConfirm = true- }-- func clearPendingDeletePrompt() {- self.showingDeletePromptConfirm = false- self.pendingDeletePromptID = nil- self.pendingDeletePromptName = ""- }-- func deletePendingPrompt() {- guard let id = self.pendingDeletePromptID else {- self.clearPendingDeletePrompt()- return- }-- // Remove profile- var profiles = self.settings.dictationPromptProfiles- profiles.removeAll { $0.id == id }- self.settings.dictationPromptProfiles = profiles-- // If the deleted profile was active, reset to Default- if self.settings.selectedDictationPromptID == id {- self.settings.selectedDictationPromptID = nil- }-- self.clearPendingDeletePrompt()- }-func promptProfileCard(title: String,subtitle: String,@@ -171,17 +129,16 @@ extension AISettingsView {HStack(spacing: 8) {Button("Use") { onUse() }.buttonStyle(CompactButtonStyle())- .frame(width: 54)+ .frame(minWidth: AISettingsLayout.promptActionMinWidth, minHeight: AISettingsLayout.controlHeight).disabled(isSelected)if let onDelete {Button(action: { onDelete() }) {HStack(spacing: 4) { Image(systemName: "trash"); Text("Delete") }.font(.caption)- .foregroundStyle(.red)}- .buttonStyle(CompactButtonStyle())- .frame(width: 74)+ .buttonStyle(CompactButtonStyle(foreground: .red, borderColor: .red.opacity(0.6)))+ .frame(minWidth: AISettingsLayout.promptActionMinWidth, minHeight: AISettingsLayout.controlHeight)}}}@@ -223,7 +180,7 @@ extension AISettingsView {.font(.caption).foregroundStyle(.secondary)let isDefaultNameLocked = mode.isDefault- TextField("Prompt name", text: self.$draftPromptName)+ TextField("Prompt name", text: self.$viewModel.draftPromptName).textFieldStyle(.roundedBorder).disabled(isDefaultNameLocked)}@@ -233,11 +190,11 @@ extension AISettingsView {.font(.caption).foregroundStyle(.secondary)PromptTextView(- text: self.$draftPromptText,+ text: self.$viewModel.draftPromptText,isEditable: true,font: NSFont.monospacedSystemFont(ofSize: NSFont.smallSystemFontSize, weight: .regular))- .id(self.promptEditorSessionID)+ .id(self.viewModel.promptEditorSessionID).frame(minHeight: 180).background(RoundedRectangle(cornerRadius: 8, style: .continuous)@@ -247,8 +204,8 @@ extension AISettingsView {.stroke(self.theme.palette.cardBorder.opacity(0.35), lineWidth: 1)))- .onChange(of: self.draftPromptText) { _, newValue in- let combined = self.combinedDraftPrompt(newValue)+ .onChange(of: self.viewModel.draftPromptText) { _, newValue in+ let combined = self.viewModel.combinedDraftPrompt(newValue)self.promptTest.updateDraftPromptText(combined)}}@@ -265,14 +222,14 @@ extension AISettingsView {Spacer()}- let hotkeyDisplay = SettingsStore.shared.hotkeyShortcut.displayString- let canTest = self.isAIPostProcessingConfiguredForDictation()+ let hotkeyDisplay = self.settings.hotkeyShortcut.displayString+ let canTest = self.viewModel.isAIPostProcessingConfiguredForDictation()Toggle(isOn: Binding(get: { self.promptTest.isActive },set: { enabled inif enabled {- let combined = self.combinedDraftPrompt(self.draftPromptText)+ let combined = self.viewModel.combinedDraftPrompt(self.viewModel.draftPromptText)self.promptTest.activate(draftPromptText: combined)} else {self.promptTest.deactivate()@@ -367,15 +324,17 @@ extension AISettingsView {HStack(spacing: 10) {Button(mode.isDefault ? "Close" : "Cancel") {- self.closePromptEditor()+ self.viewModel.closePromptEditor()}- .buttonStyle(.bordered)+ .buttonStyle(CompactButtonStyle())+ .frame(minWidth: AISettingsLayout.actionMinWidth, minHeight: AISettingsLayout.controlHeight)Button("Save") {- self.savePromptEditor(mode: mode)+ self.viewModel.savePromptEditor(mode: mode)}- .buttonStyle(.borderedProminent)- .disabled(!mode.isDefault && self.draftPromptName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty)+ .buttonStyle(GlassButtonStyle())+ .frame(minWidth: AISettingsLayout.actionMinWidth, minHeight: AISettingsLayout.controlHeight)+ .disabled(!mode.isDefault && self.viewModel.draftPromptName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty)}}.padding()@@ -386,72 +345,28 @@ extension AISettingsView {}func openDefaultPromptViewer() {- self.draftPromptName = "Default"- if let override = self.settings.defaultDictationPromptOverride {- self.draftPromptText = SettingsStore.stripBaseDictationPrompt(from: override)- } else {- self.draftPromptText = SettingsStore.defaultDictationPromptBodyText()- }- self.promptEditorSessionID = UUID()- self.promptEditorMode = .defaultPrompt+ self.viewModel.openDefaultPromptViewer()}func openNewPromptEditor() {- self.draftPromptName = "New Prompt"- self.draftPromptText = ""- self.promptEditorSessionID = UUID()- self.promptEditorMode = .newPrompt+ self.viewModel.openNewPromptEditor()}func openEditor(for profile: SettingsStore.DictationPromptProfile) {- self.draftPromptName = profile.name- self.draftPromptText = SettingsStore.stripBaseDictationPrompt(from: profile.prompt)- self.promptEditorSessionID = UUID()- self.promptEditorMode = .edit(promptID: profile.id)+ self.viewModel.openEditor(for: profile)}func closePromptEditor() {- self.promptEditorMode = nil- self.draftPromptName = ""- self.draftPromptText = ""- self.promptTest.deactivate()+ self.viewModel.closePromptEditor()}// MARK: - Prompt Test Gatingfunc isAIPostProcessingConfiguredForDictation() -> Bool {- DictationAIPostProcessingGate.isConfigured()+ self.viewModel.isAIPostProcessingConfiguredForDictation()}func savePromptEditor(mode: PromptEditorMode) {- // Default prompt is non-deletable; save it via the optional override (empty is allowed).- if mode.isDefault {- let body = SettingsStore.stripBaseDictationPrompt(from: self.draftPromptText)- self.settings.defaultDictationPromptOverride = body- self.closePromptEditor()- return- }-- let name = self.draftPromptName.trimmingCharacters(in: .whitespacesAndNewlines)- let promptBody = SettingsStore.stripBaseDictationPrompt(from: self.draftPromptText)-- var profiles = SettingsStore.shared.dictationPromptProfiles- let now = Date()-- if let id = mode.editingPromptID,- let idx = profiles.firstIndex(where: { $0.id == id })- {- var updated = profiles[idx]- updated.name = name- updated.prompt = promptBody- updated.updatedAt = now- profiles[idx] = updated- } else {- let newProfile = SettingsStore.DictationPromptProfile(name: name, prompt: promptBody, createdAt: now, updatedAt: now)- profiles.append(newProfile)- }-- SettingsStore.shared.dictationPromptProfiles = profiles- self.closePromptEditor()+ self.viewModel.savePromptEditor(mode: mode)}}diff --git a/Sources/Fluid/UI/AISettingsView+SpeechRecognition.swift b/Sources/Fluid/UI/AISettingsView+SpeechRecognition.swiftindex 7b034454..c7728c51 100644--- a/Sources/Fluid/UI/AISettingsView+SpeechRecognition.swift+++ b/Sources/Fluid/UI/AISettingsView+SpeechRecognition.swift@@ -7,12 +7,12 @@import SwiftUI-extension AISettingsView {+extension VoiceEngineSettingsView {// MARK: - Speech Recognition Cardvar speechRecognitionCard: some View {- let activeModel = SettingsStore.shared.selectedSpeechModel- let otherModels = self.filteredSpeechModels.filter { $0 != activeModel }+ let activeModel = self.settings.selectedSpeechModel+ let otherModels = self.viewModel.filteredSpeechModels.filter { $0 != activeModel }return ThemedCard(hoverEffect: false) {VStack(alignment: .leading, spacing: 14) {@@ -51,14 +51,14 @@ extension AISettingsView {Menu {ForEach(SpeechProviderFilter.allCases) { option inButton(option.rawValue) {- self.providerFilter = option+ self.viewModel.providerFilter = option}}} label: {HStack(spacing: 6) {Image(systemName: "line.3.horizontal.decrease.circle").font(.caption)- Text("Filter: \(self.providerFilter.rawValue)")+ Text("Filter: \(self.viewModel.providerFilter.rawValue)").font(.caption).fontWeight(.semibold)}@@ -77,12 +77,12 @@ extension AISettingsView {Menu {ForEach(ModelSortOption.allCases) { option inButton(option.rawValue) {- self.modelSortOption = option+ self.viewModel.modelSortOption = option}}} label: {HStack(spacing: 6) {- Text("Sort by: \(self.modelSortOption.rawValue)")+ Text("Sort by: \(self.viewModel.modelSortOption.rawValue)").font(.caption).fontWeight(.semibold)}@@ -146,7 +146,7 @@ extension AISettingsView {/// Stats panel showing speed/accuracy bars that animate when model changesvar modelStatsPanel: some View {- let model = self.previewSpeechModel+ let model = self.viewModel.previewSpeechModelreturn HStack(alignment: .center, spacing: 20) {VStack(alignment: .leading, spacing: 8) {@@ -226,48 +226,10 @@ extension AISettingsView {.padding(.vertical, 6)}- var filteredSpeechModels: [SettingsStore.SpeechModel] {- var models = SettingsStore.SpeechModel.availableModels-- switch self.providerFilter {- case .all:- break- case .nvidia:- models = models.filter { $0.provider == .nvidia }- case .apple:- models = models.filter { $0.provider == .apple }- case .openai:- models = models.filter { $0.provider == .openai }- }-- if self.englishOnlyFilter {- models = models.filter { model in- let label = model.languageSupport.lowercased()- let title = model.humanReadableName.lowercased()- return label.contains("english only") || title.contains("english")- }- }-- if self.installedOnlyFilter {- models = models.filter { $0.isInstalled }- }-- switch self.modelSortOption {- case .name:- models.sort { $0.humanReadableName.localizedCaseInsensitiveCompare($1.humanReadableName) == .orderedAscending }- case .accuracy:- models.sort { $0.accuracyPercent > $1.accuracyPercent }- case .speed:- models.sort { $0.speedPercent > $1.speedPercent }- }-- return models- }-/// Simplified card for selecting a speech modelfunc speechModelCard(for model: SettingsStore.SpeechModel) -> some View {- let isSelected = self.previewSpeechModel == model- let isActive = self.isActiveSpeechModel(model)+ let isSelected = self.viewModel.previewSpeechModel == model+ let isActive = self.viewModel.isActiveSpeechModel(model)return HStack(alignment: .top, spacing: 10) {// Selection indicator@@ -306,7 +268,7 @@ extension AISettingsView {Text(model.humanReadableName).font(.system(size: 14, weight: isSelected ? .semibold : .regular)).foregroundStyle(isSelected ? self.theme.palette.primaryText : .secondary)- if self.showAdvancedSpeechInfo {+ if self.viewModel.showAdvancedSpeechInfo {Text(model.displayName).font(.caption).foregroundStyle(.secondary.opacity(0.7))@@ -341,9 +303,9 @@ extension AISettingsView {.frame(maxWidth: .infinity, alignment: .leading)// Action area (right side)- if (self.asr.isDownloadingModel || self.asr.isLoadingModel) && isActive && !self.asr.isAsrReady {+ if (self.viewModel.asr.isDownloadingModel || self.viewModel.asr.isLoadingModel) && isActive && !self.viewModel.asr.isAsrReady {VStack(alignment: .trailing, spacing: 4) {- if let progress = self.asr.downloadProgress, self.asr.isDownloadingModel {+ if let progress = self.viewModel.asr.downloadProgress, self.viewModel.asr.isDownloadingModel {ProgressView(value: progress).progressViewStyle(.linear).frame(width: 90)@@ -353,7 +315,7 @@ extension AISettingsView {} else {ProgressView().controlSize(.mini)- Text(self.asr.isLoadingModel ? "Loading…" : "Downloading…")+ Text(self.viewModel.asr.isLoadingModel ? "Loading…" : "Downloading…").font(.caption2).foregroundStyle(.secondary)}@@ -361,7 +323,7 @@ extension AISettingsView {} else if model.isInstalled {HStack(spacing: 8) {if isActive {- let isLoading = (self.asr.isLoadingModel || self.asr.isDownloadingModel) && !self.asr.isAsrReady+ let isLoading = (self.viewModel.asr.isLoadingModel || self.viewModel.asr.isDownloadingModel) && !self.viewModel.asr.isAsrReadyText(isLoading ? "Loading…" : "Active").font(.caption2).fontWeight(.semibold)@@ -371,27 +333,27 @@ extension AISettingsView {.foregroundStyle(isLoading ? .orange : Color.fluidGreen)} else {Button("Activate") {- self.activateSpeechModel(model)+ self.viewModel.activateSpeechModel(model)}.buttonStyle(.borderedProminent).controlSize(.small).tint(Color.fluidGreen).fontWeight(.semibold).shadow(color: Color.fluidGreen.opacity(0.35), radius: 4, x: 0, y: 1)- .disabled(self.asr.isRunning)+ .disabled(self.viewModel.asr.isRunning)}if !model.usesAppleLogo {if isSelected {Button {- self.deleteSpeechModel(model)+ self.viewModel.deleteSpeechModel(model)} label: {Image(systemName: "trash").font(.system(size: 15)).foregroundStyle(.red.opacity(0.7))}.buttonStyle(.plain)- .disabled(self.asr.isRunning)+ .disabled(self.viewModel.asr.isRunning).offset(x: isSelected ? 0 : 12).opacity(isSelected ? 1 : 0)}@@ -405,13 +367,13 @@ extension AISettingsView {.opacity(isSelected ? 0 : 1)Button("Download") {- self.previewSpeechModel = model- self.downloadSpeechModel(model)+ self.viewModel.previewSpeechModel = model+ self.viewModel.downloadSpeechModel(model)}.buttonStyle(.borderedProminent).controlSize(.small).tint(.blue)- .disabled(self.asr.isRunning)+ .disabled(self.viewModel.asr.isRunning).offset(x: isSelected ? 0 : 16).opacity(isSelected ? 1 : 0)}@@ -435,128 +397,26 @@ extension AISettingsView {)).onTapGesture {- self.previewSpeechModel = model- }- .opacity(self.asr.isRunning ? 0.6 : 1.0)- .allowsHitTesting(!self.asr.isRunning)- }-- func activateSpeechModel(_ model: SettingsStore.SpeechModel) {- guard !self.asr.isRunning else { return }- withAnimation(.spring(response: 0.3, dampingFraction: 0.7)) {- SettingsStore.shared.selectedSpeechModel = model- self.previewSpeechModel = model- self.setSelectedSpeechProvider(model.provider)- }- self.asr.resetTranscriptionProvider()- Task {- do {- try await self.asr.ensureAsrReady()- } catch {- DebugLogger.shared.error("Failed to prepare model after activation: \(error)", source: "AISettingsView")- }- }- }-- func downloadSpeechModel(_ model: SettingsStore.SpeechModel) {- guard !self.asr.isRunning else { return }- let previousActive = SettingsStore.shared.selectedSpeechModel-- Task {- let shouldRestore = previousActive != model- await MainActor.run {- if shouldRestore {- self.suppressSpeechProviderSync = true- }- SettingsStore.shared.selectedSpeechModel = model- self.asr.resetTranscriptionProvider()- }-- defer {- Task { @MainActor in- guard shouldRestore else { return }- if SettingsStore.shared.selectedSpeechModel == model {- self.skipNextSpeechModelSync = true- SettingsStore.shared.selectedSpeechModel = previousActive- self.asr.resetTranscriptionProvider()- }- if self.previewSpeechModel == model {- self.previewSpeechModel = model- }- self.suppressSpeechProviderSync = false- }- }-- await self.downloadModels()- }- }-- func deleteSpeechModel(_ model: SettingsStore.SpeechModel) {- guard !self.asr.isRunning else { return }- let previousActive = SettingsStore.shared.selectedSpeechModel-- Task {- let shouldRestore = previousActive != model- await MainActor.run {- if shouldRestore {- self.suppressSpeechProviderSync = true- }- SettingsStore.shared.selectedSpeechModel = model- self.asr.resetTranscriptionProvider()- }-- defer {- Task { @MainActor in- guard shouldRestore else { return }- self.skipNextSpeechModelSync = true- SettingsStore.shared.selectedSpeechModel = previousActive- self.asr.resetTranscriptionProvider()- if self.previewSpeechModel == model {- self.previewSpeechModel = model- }- self.suppressSpeechProviderSync = false- }- }-- await self.deleteModels()- }- }-- func isActiveSpeechModel(_ model: SettingsStore.SpeechModel) -> Bool {- SettingsStore.shared.selectedSpeechModel == model- }-- /// Returns the appropriate description text for the currently selected speech model- var modelDescriptionText: String {- let model = SettingsStore.shared.selectedSpeechModel- switch model {- case .appleSpeech:- return "Apple Speech (Legacy) uses on-device recognition. No download required, works on Intel and Apple Silicon."- case .appleSpeechAnalyzer:- return "Apple Speech uses advanced on-device recognition with fast, accurate transcription. Requires macOS 26+."- case .parakeetTDT:- return "Parakeet TDT v3 uses CoreML and Neural Engine for fastest transcription (25 languages) on Apple Silicon."- case .parakeetTDTv2:- return "Parakeet TDT v2 is an English-only model optimized for accuracy and consistency on Apple Silicon."- default:- return "Whisper models support 99 languages and work on any Mac."+ self.viewModel.previewSpeechModel = model}+ .opacity(self.viewModel.asr.isRunning ? 0.6 : 1.0)+ .allowsHitTesting(!self.viewModel.asr.isRunning)}var modelStatusView: some View {HStack(spacing: 12) {- if (self.asr.isDownloadingModel || self.asr.isLoadingModel) && !self.asr.isAsrReady {+ if (self.viewModel.asr.isDownloadingModel || self.viewModel.asr.isLoadingModel) && !self.viewModel.asr.isAsrReady {HStack(spacing: 8) {ProgressView().controlSize(.small)- Text(self.asr.isLoadingModel ? "Loading model…" : "Downloading…")+ Text(self.viewModel.asr.isLoadingModel ? "Loading model…" : "Downloading…").font(.caption).foregroundStyle(.secondary)}- } else if self.asr.isAsrReady {+ } else if self.viewModel.asr.isAsrReady {Image(systemName: "checkmark.circle.fill").foregroundStyle(Color.fluidGreen).font(.caption)Text("Ready").font(.caption).foregroundStyle(.secondary)- Button(action: { Task { await self.deleteModels() } }) {+ Button(action: { Task { await self.viewModel.deleteModels() } }) {HStack(spacing: 4) {Image(systemName: "trash")Text("Delete")@@ -565,11 +425,11 @@ extension AISettingsView {.foregroundStyle(.red)}.buttonStyle(.plain)- } else if self.asr.modelsExistOnDisk {+ } else if self.viewModel.asr.modelsExistOnDisk {Image(systemName: "doc.fill").foregroundStyle(self.theme.palette.accent).font(.caption)Text("Cached").font(.caption).foregroundStyle(.secondary)- Button(action: { Task { await self.deleteModels() } }) {+ Button(action: { Task { await self.viewModel.deleteModels() } }) {HStack(spacing: 4) {Image(systemName: "trash")Text("Delete")@@ -579,7 +439,7 @@ extension AISettingsView {}.buttonStyle(.plain)} else {- Button(action: { Task { await self.downloadModels() } }) {+ Button(action: { Task { await self.viewModel.downloadModels() } }) {HStack(spacing: 4) {Image(systemName: "arrow.down.circle.fill")Text("Download")@@ -608,41 +468,18 @@ extension AISettingsView {.foregroundStyle(.secondary)}Spacer()- Toggle("", isOn: self.$removeFillerWordsEnabled)+ Toggle("", isOn: self.$viewModel.removeFillerWordsEnabled).toggleStyle(.switch).labelsHidden()- .onChange(of: self.removeFillerWordsEnabled) { _, newValue in- SettingsStore.shared.removeFillerWordsEnabled = newValue+ .onChange(of: self.viewModel.removeFillerWordsEnabled) { _, newValue in+ self.settings.removeFillerWordsEnabled = newValue}}- if self.removeFillerWordsEnabled {+ if self.viewModel.removeFillerWordsEnabled {FillerWordsEditor()}}}- // MARK: - Model Download/Delete-- func downloadModels() async {- do {- try await self.asr.ensureAsrReady()- } catch {- DebugLogger.shared.error("Failed to download models: \(error)", source: "AISettingsView")- }- }-- func deleteModels() async {- do {- try await self.asr.clearModelCache()- } catch {- DebugLogger.shared.error("Failed to delete models: \(error)", source: "AISettingsView")- }- }-- // MARK: - Helper Functions-- func setSelectedSpeechProvider(_ provider: SettingsStore.SpeechModel.Provider) {- self.selectedSpeechProvider = provider- }}diff --git a/Sources/Fluid/UI/AISettingsView.swift b/Sources/Fluid/UI/AISettingsView.swiftindex 74d1d404..a29a9cfb 100644--- a/Sources/Fluid/UI/AISettingsView.swift+++ b/Sources/Fluid/UI/AISettingsView.swift@@ -6,8 +6,6 @@// Created: 2025-12-14//-import AppKit-import Securityimport SwiftUI// MARK: - Connection Status Enum@@ -57,230 +55,57 @@ enum SpeechProviderFilter: String, CaseIterable, Identifiable {var id: String { self.rawValue }}-struct AISettingsView: View {- @EnvironmentObject var appServices: AppServices- @EnvironmentObject var menuBarManager: MenuBarManager- @Environment(\.theme) var theme- @ObservedObject var promptTest = DictationPromptTestCoordinator.shared-- var asr: ASRService { self.appServices.asr }-- // MARK: - State Variables (moved from ContentView)-- @ObservedObject var settings = SettingsStore.shared-- @State var appear = false- @State var openAIBaseURL: String = ModelRepository.shared.defaultBaseURL(for: "openai")- @State var enableAIProcessing: Bool = false-- // Model Management- @State var availableModelsByProvider: [String: [String]] = [:]- @State var selectedModelByProvider: [String: String] = [:]- @State var availableModels: [String] = ["gpt-4.1"]- @State var selectedModel: String = "gpt-4.1"- @State var showingAddModel: Bool = false- @State var newModelName: String = ""- @State var isFetchingModels: Bool = false- @State var fetchModelsError: String? = nil-- // Reasoning Configuration- @State var showingReasoningConfig: Bool = false- @State var editingReasoningParamName: String = "reasoning_effort"- @State var editingReasoningParamValue: String = "low"- @State var editingReasoningEnabled: Bool = false-- // Provider Management- @State var providerAPIKeys: [String: String] = [:]- @State var currentProvider: String = "openai"- @State var savedProviders: [SettingsStore.SavedProvider] = []- @State var selectedProviderID: String = SettingsStore.shared.selectedProviderID-- // Connection Testing- @State var isTestingConnection: Bool = false- @State var connectionStatus: AIConnectionStatus = .unknown- @State var connectionErrorMessage: String = ""-- // UI State- @State var showHelp: Bool = false- @State var showingSaveProvider: Bool = false- @State var showAPIKeyEditor: Bool = false-- // Speech Model Controls- @State var modelSortOption: ModelSortOption = .name- @State var providerFilter: SpeechProviderFilter = .all- @State var englishOnlyFilter: Bool = false- @State var installedOnlyFilter: Bool = false- @State var showSpeechFilters: Bool = false-- @State var showingEditProvider: Bool = false-- // Provider Form State- @State var newProviderName: String = ""- @State var newProviderBaseURL: String = ""- @State var newProviderApiKey: String = ""- @State var newProviderModels: String = ""- @State var editProviderName: String = ""- @State var editProviderBaseURL: String = ""-- // Keychain State- @State var showKeychainPermissionAlert: Bool = false- @State var keychainPermissionMessage: String = ""-- // Filler Words State - local state to ensure UI reactivity- @State var removeFillerWordsEnabled: Bool = SettingsStore.shared.removeFillerWordsEnabled-- // Dictation Prompt Profiles UI- @State var promptEditorMode: PromptEditorMode? = nil- @State var draftPromptName: String = ""- @State var draftPromptText: String = ""- @State var promptEditorSessionID: UUID = .init()-- // Prompt Deletion UI- @State var showingDeletePromptConfirm: Bool = false- @State var pendingDeletePromptID: String? = nil- @State var pendingDeletePromptName: String = ""+enum AISettingsLayout {+ static let labelWidth: CGFloat = 110+ static let pickerWidth: CGFloat = 220+ static let controlHeight: CGFloat = 34+ static let actionMinWidth: CGFloat = 120+ static let compactActionMinWidth: CGFloat = 96+ static let wideActionMinWidth: CGFloat = 140+ static let primaryActionMinWidth: CGFloat = 150+ static let promptActionMinWidth: CGFloat = 90+ static let rowLeadingIndent: CGFloat = labelWidth + 12+}- // Speech Model Provider Tab Selection- @State var selectedSpeechProvider: SettingsStore.SpeechModel.Provider = .nvidia- @State var previewSpeechModel: SettingsStore.SpeechModel = SettingsStore.shared.selectedSpeechModel- @State var showAdvancedSpeechInfo: Bool = false- @State var suppressSpeechProviderSync: Bool = false- @State var skipNextSpeechModelSync: Bool = false+struct AISettingsView: View {+ let appServices: AppServices+ let menuBarManager: MenuBarManager+ let theme: AppTheme++ @StateObject private var voiceViewModel: VoiceEngineSettingsViewModel+ @StateObject private var enhancementViewModel: AIEnhancementSettingsViewModel++ init(appServices: AppServices, menuBarManager: MenuBarManager, theme: AppTheme) {+ self.appServices = appServices+ self.menuBarManager = menuBarManager+ self.theme = theme+ _voiceViewModel = StateObject(wrappedValue: VoiceEngineSettingsViewModel(+ settings: SettingsStore.shared,+ appServices: appServices+ ))+ _enhancementViewModel = StateObject(wrappedValue: AIEnhancementSettingsViewModel(+ settings: SettingsStore.shared,+ menuBarManager: menuBarManager,+ promptTest: DictationPromptTestCoordinator.shared+ ))+ }var body: some View {ScrollView(.vertical, showsIndicators: false) {VStack(alignment: .leading, spacing: 14) {- self.speechRecognitionCard- self.aiConfigurationCard+ VoiceEngineSettingsView(+ viewModel: self.voiceViewModel,+ settings: self.voiceViewModel.settings,+ theme: self.theme+ )+ AIEnhancementSettingsView(+ viewModel: self.enhancementViewModel,+ settings: self.enhancementViewModel.settings,+ promptTest: self.enhancementViewModel.promptTest,+ theme: self.theme+ )}.padding(14)}- .onAppear {- self.appear = true- self.loadSettings()-- // CRITICAL FIX: Refresh model status immediately on appear- // This ensures the speech recognition card shows current download status- // Use async variant for accurate detection (especially for AppleSpeechAnalyzerProvider)- Task {- await self.asr.checkIfModelsExistAsync()- }- }- .onChange(of: self.enableAIProcessing) { _, newValue in- SettingsStore.shared.enableAIProcessing = newValue- // Keep menu bar UI in sync when toggled from this screen- self.menuBarManager.aiProcessingEnabled = newValue- }- .onChange(of: self.selectedModel) { _, newValue in- if newValue != "__ADD_MODEL__" {- self.selectedModelByProvider[self.currentProvider] = newValue- SettingsStore.shared.selectedModelByProvider = self.selectedModelByProvider- }- }- .onChange(of: self.selectedProviderID) { _, newValue in- SettingsStore.shared.selectedProviderID = newValue- }- .onChange(of: self.settings.selectedSpeechModel) { _, newValue in- // Keep preview in sync if the active model changes elsewhere- if self.skipNextSpeechModelSync {- self.skipNextSpeechModelSync = false- return- }- guard !self.suppressSpeechProviderSync else { return }- self.previewSpeechModel = newValue- self.setSelectedSpeechProvider(newValue.provider)- }- .onChange(of: self.showKeychainPermissionAlert) { _, isPresented in- guard isPresented else { return }- self.presentKeychainAccessAlert(message: self.keychainPermissionMessage)- self.showKeychainPermissionAlert = false- }- .alert("Delete Prompt?", isPresented: self.$showingDeletePromptConfirm) {- Button("Delete", role: .destructive) {- self.deletePendingPrompt()- }- Button("Cancel", role: .cancel) {- self.clearPendingDeletePrompt()- }- } message: {- if self.pendingDeletePromptName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {- Text("This cannot be undone.")- } else {- Text("Delete “\(self.pendingDeletePromptName)”? This cannot be undone.")- }- }- }-- // MARK: - Load Settings-- private func loadSettings() {- self.selectedProviderID = SettingsStore.shared.selectedProviderID-- self.enableAIProcessing = SettingsStore.shared.enableAIProcessing- self.availableModelsByProvider = SettingsStore.shared.availableModelsByProvider- self.selectedModelByProvider = SettingsStore.shared.selectedModelByProvider- self.providerAPIKeys = SettingsStore.shared.providerAPIKeys- self.savedProviders = SettingsStore.shared.savedProviders- self.previewSpeechModel = SettingsStore.shared.selectedSpeechModel- self.selectedSpeechProvider = SettingsStore.shared.selectedSpeechModel.provider-- // Normalize provider keys- var normalized: [String: [String]] = [:]- for (key, models) in self.availableModelsByProvider {- let lower = key.lowercased()- let newKey: String- // Use ModelRepository to correctly identify ALL built-in providers- if ModelRepository.shared.isBuiltIn(lower) {- newKey = lower- } else {- newKey = key.hasPrefix("custom:") ? key : "custom:\(key)"- }- let clean = Array(Set(models.map { $0.trimmingCharacters(in: .whitespacesAndNewlines) })).sorted()- if !clean.isEmpty { normalized[newKey] = clean }- }- self.availableModelsByProvider = normalized- SettingsStore.shared.availableModelsByProvider = normalized-- // Normalize selected model by provider- var normalizedSel: [String: String] = [:]- for (key, model) in self.selectedModelByProvider {- let lower = key.lowercased()- // 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- SettingsStore.shared.selectedModelByProvider = normalizedSel-- // Determine initial model list AND set baseURL BEFORE calling updateCurrentProvider- if let saved = savedProviders.first(where: { $0.id == selectedProviderID }) {- let key = self.providerKey(for: self.selectedProviderID)- let stored = self.availableModelsByProvider[key]- self.availableModels = saved.models.isEmpty ? (stored ?? []) : saved.models- self.openAIBaseURL = saved.baseURL // Set this FIRST- } 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))- }-- // NOW update currentProvider after openAIBaseURL is set correctly- self.updateCurrentProvider()-- // Restore selected model using the correct currentProvider- // 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- }-- DebugLogger.shared.debug("loadSettings complete: provider=\(self.selectedProviderID), currentProvider=\(self.currentProvider), model=\(self.selectedModel), baseURL=\(self.openAIBaseURL)", source: "AISettingsView")}}diff --git a/Sources/Fluid/UI/SearchableModelPicker.swift b/Sources/Fluid/UI/SearchableModelPicker.swiftindex 3080232f..5fdd2e93 100644--- a/Sources/Fluid/UI/SearchableModelPicker.swift+++ b/Sources/Fluid/UI/SearchableModelPicker.swift@@ -14,6 +14,24 @@ struct SearchableModelPicker: View {@Binding var selectedModel: Stringvar onRefresh: (() async -> Void)?var isRefreshing: Bool = false+ let controlWidth: CGFloat+ let controlHeight: CGFloat?++ init(+ models: [String],+ selectedModel: Binding<String>,+ onRefresh: (() async -> Void)? = nil,+ isRefreshing: Bool = false,+ controlWidth: CGFloat = 180,+ controlHeight: CGFloat? = nil+ ) {+ self.models = models+ self._selectedModel = selectedModel+ self.onRefresh = onRefresh+ self.isRefreshing = isRefreshing+ self.controlWidth = controlWidth+ self.controlHeight = controlHeight+ }@State private var searchText = ""@State private var isShowingPopover = false@@ -29,18 +47,29 @@ struct SearchableModelPicker: View {HStack(spacing: 8) {// Model button that opens popoverButton(action: { self.isShowingPopover.toggle() }) {- HStack(spacing: 4) {+ HStack(spacing: 8) {Text(self.selectedModel.isEmpty ? "Select Model" : self.selectedModel).lineLimit(1).truncationMode(.middle).foregroundStyle(self.selectedModel.isEmpty ? .secondary : .primary)+ Spacer(minLength: 6)Image(systemName: "chevron.down")- .font(.caption)+ .font(.caption2).foregroundStyle(.secondary)+ .frame(width: 20, height: 20)+ .background(+ Circle()+ .fill(self.theme.palette.cardBackground.opacity(0.7))+ .overlay(+ Circle()+ .stroke(self.theme.palette.cardBorder.opacity(0.4), lineWidth: 1)+ )+ )}- .frame(width: 180, alignment: .leading)+ .frame(width: self.controlWidth, alignment: .leading).padding(.horizontal, 8).padding(.vertical, 5)+ .frame(height: self.controlHeight).background(RoundedRectangle(cornerRadius: 6, style: .continuous).fill(self.theme.palette.cardBackground)@@ -135,20 +164,38 @@ struct SearchableModelPicker: View {// Refresh buttonif 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")+ if self.controlHeight == nil {+ 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")+ } else {+ Button(action: {+ Task { await onRefresh() }+ }) {+ if self.isRefreshing {+ ProgressView()+ .scaleEffect(0.6)+ .frame(width: 16, height: 16)+ } else {+ Image(systemName: "arrow.clockwise")+ }}+ .buttonStyle(CompactButtonStyle())+ .frame(width: self.controlHeight, height: self.controlHeight)+ .disabled(self.isRefreshing)+ .help("Fetch models from API")}- .buttonStyle(.borderless)- .disabled(self.isRefreshing)- .help("Fetch models from API")}}}diff --git a/Sources/Fluid/UI/SearchableProviderPicker.swift b/Sources/Fluid/UI/SearchableProviderPicker.swiftindex f1485762..10435dd3 100644--- a/Sources/Fluid/UI/SearchableProviderPicker.swift+++ b/Sources/Fluid/UI/SearchableProviderPicker.swift@@ -13,6 +13,22 @@ struct SearchableProviderPicker: View {let builtInProviders: [(id: String, name: String)]let savedProviders: [SettingsStore.SavedProvider]@Binding var selectedProviderID: String+ let controlWidth: CGFloat+ let controlHeight: CGFloat?++ init(+ builtInProviders: [(id: String, name: String)],+ savedProviders: [SettingsStore.SavedProvider],+ selectedProviderID: Binding<String>,+ controlWidth: CGFloat = 180,+ controlHeight: CGFloat? = nil+ ) {+ self.builtInProviders = builtInProviders+ self.savedProviders = savedProviders+ self._selectedProviderID = selectedProviderID+ self.controlWidth = controlWidth+ self.controlHeight = controlHeight+ }@State private var searchText = ""@State private var isShowingPopover = false@@ -52,17 +68,28 @@ struct SearchableProviderPicker: View {var body: some View {Button(action: { self.isShowingPopover.toggle() }) {- HStack(spacing: 4) {+ HStack(spacing: 8) {Text(self.selectedProviderName).lineLimit(1).truncationMode(.tail)+ Spacer(minLength: 6)Image(systemName: "chevron.down")- .font(.caption)+ .font(.caption2).foregroundStyle(.secondary)+ .frame(width: 20, height: 20)+ .background(+ Circle()+ .fill(self.theme.palette.cardBackground.opacity(0.7))+ .overlay(+ Circle()+ .stroke(self.theme.palette.cardBorder.opacity(0.4), lineWidth: 1)+ )+ )}- .frame(width: 180, alignment: .leading)+ .frame(width: self.controlWidth, alignment: .leading).padding(.horizontal, 8).padding(.vertical, 5)+ .frame(height: self.controlHeight).background(RoundedRectangle(cornerRadius: 6, style: .continuous).fill(self.theme.palette.cardBackground)