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
feat: refine 1.6.10 intelligence and dictation UX (#947)
ALTIC9b94e10406aa
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.mdindex 8dfb2206..26ab561a 100644--- a/.github/pull_request_template.md+++ b/.github/pull_request_template.md@@ -20,7 +20,7 @@ Closes #(issue number), or links to an accepted Discussion/roadmap item.- [ ] Tested on Intel Mac- [ ] Tested on Apple Silicon Mac- [ ] Tested on macOS version:-- [ ] Ran linter locally: `swiftlint --strict --config .swiftlint.yml Sources`+- [ ] Ran linter locally: `swiftlint --strict --config .swiftlint.yml Sources Tests Package.swift`- [ ] Ran formatter locally: `swiftformat --config .swiftformat Sources`- [ ] Ran tests locally:diff --git a/Sources/Fluid/ContentView.swift b/Sources/Fluid/ContentView.swiftindex 2845e920..c79ff30e 100644--- a/Sources/Fluid/ContentView.swift+++ b/Sources/Fluid/ContentView.swift@@ -2152,18 +2152,52 @@ struct ContentView: View {// MARK: - Modular AI Processing+ private struct AITextProcessingResult {+ let text: String+ let tokensPerSecond: Double?+ }+private func processTextWithAI(_ inputText: String,overrideSystemPrompt: String? = nil,+ overrideProviderID: String? = nil,+ overrideModel: String? = nil,dictationSlot: SettingsStore.DictationShortcutSlot? = nil,streamHandler: PrivateAIStreamHandler? = nil) async throws -> String {- let appInfo = self.recordingAppInfo ?? self.getCurrentAppInfo()- let route = DictationProviderRoute.resolve(- settings: SettingsStore.shared,+ try await self.processTextWithAIMetrics(+ inputText,+ overrideSystemPrompt: overrideSystemPrompt,+ overrideProviderID: overrideProviderID,+ overrideModel: overrideModel,dictationSlot: dictationSlot,- appBundleID: appInfo.bundleId- )+ streamHandler: streamHandler+ ).text+ }++ private func processTextWithAIMetrics(+ _ inputText: String,+ overrideSystemPrompt: String? = nil,+ overrideProviderID: String? = nil,+ overrideModel: String? = nil,+ dictationSlot: SettingsStore.DictationShortcutSlot? = nil,+ streamHandler: PrivateAIStreamHandler? = nil+ ) async throws -> AITextProcessingResult {+ let appInfo = self.recordingAppInfo ?? self.getCurrentAppInfo()+ let route: DictationProviderRoute+ if let overrideProviderID, let overrideModel {+ route = DictationProviderRoute.resolve(+ settings: SettingsStore.shared,+ providerID: overrideProviderID,+ model: overrideModel+ )+ } else {+ route = DictationProviderRoute.resolve(+ settings: SettingsStore.shared,+ dictationSlot: dictationSlot,+ appBundleID: appInfo.bundleId+ )+ }let currentSelectedProviderID = route.providerIDlet derivedCurrentProvider = route.providerKeylet derivedBaseURL = route.baseURL@@ -2216,7 +2250,13 @@ struct ContentView: View {if self.shouldTracePromptProcessing {self.logDictationPromptTrace("Model answer (A)", value: response.outputText)}- return response.outputText+ let tokensPerSecond = response.tokensPerSecond.flatMap { value in+ value.isFinite && value > 0 ? value : nil+ }+ return AITextProcessingResult(+ text: response.outputText,+ tokensPerSecond: tokensPerSecond+ )}// Resolve the effective prompt once so every provider path honors@@ -2384,7 +2424,7 @@ struct ContentView: View {guard !response.content.isEmpty else {throw AIProcessingError.emptyResponse}- return response.content+ return AITextProcessingResult(text: response.content, tokensPerSecond: nil)}// MARK: - Streaming Response Handler (DEPRECATED - Now handled by LLMClient)@@ -2452,6 +2492,7 @@ struct ContentView: View {})self.appBench("asr_stop_return elapsedMs=\(Int(((ProcessInfo.processInfo.systemUptime - asrStopStartedAt) * 1000).rounded()))")let audioSnapshot = self.asr.consumeLastCompletedAudioSnapshot()+ let transcriptionDurationMilliseconds = self.asr.consumeLastFinalTranscriptionDurationMs()DebugLogger.shared.info("Stop transcription result | chars=\(transcribedText.count) | empty=\(transcribedText.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty)",source: "ContentView"@@ -2485,7 +2526,10 @@ struct ContentView: View {promptTest.lastOutputText = ""promptTest.lastError = ""- guard DictationAIPostProcessingGate.isProviderConfigured() else {+ guard DictationAIPostProcessingGate.isProviderConfigured(+ providerID: promptTest.draftProviderID,+ model: promptTest.draftModel+ ) else {promptTest.lastError = "AI post-processing is not configured. Configure a provider/model (and API key for non-local endpoints) to test prompts."self.menuBarManager.setProcessing(false)return@@ -2499,7 +2543,12 @@ struct ContentView: View {}do {- let result = try await self.processTextWithAI(transcribedText, overrideSystemPrompt: promptTest.draftPromptText)+ let result = try await self.processTextWithAI(+ transcribedText,+ overrideSystemPrompt: promptTest.draftPromptText,+ overrideProviderID: promptTest.draftProviderID,+ overrideModel: promptTest.draftModel+ )let appInfo = self.recordingAppInfo ?? self.getCurrentAppInfo()let literalFormattedResult = ASRService.applyDictationLiteralFormatting(result,@@ -2547,6 +2596,8 @@ struct ContentView: View {var finalText: Stringvar aiFallbackReason: String?var postProcessingModel: String?+ var aiProcessingDurationMilliseconds: Int?+ var aiTokensPerSecond: Double?let appInfo = self.recordingAppInfo ?? self.getCurrentAppInfo()let punctuationFormattedText = ASRService.applySpokenPunctuationFormatting(transcribedText,@@ -2585,7 +2636,7 @@ struct ContentView: View {DebugLogger.shared.debug("Routing transcription through AI post-processing", source: "ContentView")postProcessingModel = postProcessingModelInfo.modellet postProcessingInputChars = normalizedTranscribedText.count- let postProcessingStart = Date()+ let postProcessingStart = ProcessInfo.processInfo.systemUptime// Update overlay text to show we're now refining (processing already true)self.appBench("processing_ui_request status=Refining")@@ -2603,12 +2654,14 @@ struct ContentView: View {}do {- finalText = try await self.processTextWithAI(+ let result = try await self.processTextWithAIMetrics(normalizedTranscribedText,overrideSystemPrompt: promptOverride,dictationSlot: activeDictationSlot,streamHandler: streamHandler)+ finalText = result.text+ aiTokensPerSecond = result.tokensPerSecondawait streamPreview.flush()} catch {// Fall back to the raw transcription so the user still gets@@ -2631,7 +2684,10 @@ struct ContentView: View {}finalText = normalizedTranscribedText}- let postProcessingLatencyMs = Int((Date().timeIntervalSince(postProcessingStart) * 1000).rounded())+ let postProcessingLatencyMs = Int(+ ((ProcessInfo.processInfo.systemUptime - postProcessingStart) * 1000).rounded()+ )+ aiProcessingDurationMilliseconds = postProcessingLatencyMslet postProcessingProviderName = postProcessingModelInfo.provider ?? "unknown"let postProcessingModelName = postProcessingModelInfo.model ?? "unknown"DebugLogger.shared.info(@@ -2727,6 +2783,9 @@ struct ContentView: View {windowTitle: appInfo.windowTitle,wasAIProcessed: postProcessingModel != nil && aiFallbackReason == nil,processingModel: postProcessingModel,+ transcriptionDurationMilliseconds: transcriptionDurationMilliseconds,+ aiProcessingDurationMilliseconds: aiProcessingDurationMilliseconds,+ aiTokensPerSecond: aiTokensPerSecond,aiProcessingError: aiFallbackReason)self.persistDictationAudioIfNeeded(@@ -3270,6 +3329,8 @@ struct ContentView: View {var aiFallbackReason: String?var postProcessingModel: String?+ var aiProcessingDurationMilliseconds: Int?+ var aiTokensPerSecond: Double?let appInfo = self.getCurrentAppInfo()let normalizedTranscribedText = ASRService.applySpokenPunctuationFormatting(transcribedText,@@ -3284,11 +3345,14 @@ struct ContentView: View {dictationSlot: .primary,appBundleID: appInfo.bundleId).model+ let postProcessingStart = ProcessInfo.processInfo.systemUptimedo {- finalText = try await self.processTextWithAI(+ let result = try await self.processTextWithAIMetrics(normalizedTranscribedText,dictationSlot: .primary)+ finalText = result.text+ aiTokensPerSecond = result.tokensPerSecond} catch {DebugLogger.shared.error("AI reprocess failed, falling back to raw transcription: \(error.localizedDescription)",@@ -3298,6 +3362,9 @@ struct ContentView: View {NotificationService.showAIProcessingFallback(error: error.localizedDescription)finalText = normalizedTranscribedText}+ aiProcessingDurationMilliseconds = Int(+ ((ProcessInfo.processInfo.systemUptime - postProcessingStart) * 1000).rounded()+ )}NotchOverlayManager.shared.updateTranscriptionText("")@@ -3335,6 +3402,8 @@ struct ContentView: View {windowTitle: appInfo.windowTitle,wasAIProcessed: postProcessingModel != nil && aiFallbackReason == nil,processingModel: postProcessingModel,+ aiProcessingDurationMilliseconds: aiProcessingDurationMilliseconds,+ aiTokensPerSecond: aiTokensPerSecond,aiProcessingError: aiFallbackReason)}@@ -3584,7 +3653,13 @@ struct ContentView: View {private func prewarmPrivateAIDictationIfNeeded(for slot: SettingsStore.DictationShortcutSlot) {let appBundleID = self.recordingAppInfo?.bundleId- guard PrivateAIProviderPromptFormat.isAvailable(settings: SettingsStore.shared),+ let settings = SettingsStore.shared+ let route = DictationProviderRoute.resolve(+ settings: settings,+ dictationSlot: slot,+ appBundleID: appBundleID+ )+ guard route.usesPrivateAI,DictationAIPostProcessingGate.isConfigured(for: slot, appBundleID: appBundleID)else { return }@@ -3751,15 +3826,7 @@ struct ContentView: View {_ = self.handleCancelShortcut()}NotchContentState.shared.onDictationPromptSelectionRequested = { selection in- let privateAIAvailable = PrivateAIProviderPromptFormat.isAvailable()- switch selection {- case .off:- break- case .privateAI:- guard privateAIAvailable else { return }- case .default, .profile:- guard !privateAIAvailable else { return }- }+ guard selection != .privateAI || PrivateAIProviderPromptFormat.isAvailable() else { return }let slot = self.activeDictationShortcutSlot ?? .primarySettingsStore.shared.setDictationPromptSelection(selection, for: slot)self.applyDictationShortcutSelectionContext(for: slot)diff --git a/Sources/Fluid/Persistence/BackupService.swift b/Sources/Fluid/Persistence/BackupService.swiftindex 00cf2610..7610f20c 100644--- a/Sources/Fluid/Persistence/BackupService.swift+++ b/Sources/Fluid/Persistence/BackupService.swift@@ -60,6 +60,8 @@ struct SettingsBackupPayload: Codable, Equatable {let enableStreamingPreview: Bool// Optional so backups created before incremental Parakeet finalization still decode.let experimentalParakeetUnifiedFinalEnabled: Bool?+ // Optional so backups created before History performance details still decode.+ let showHistoryPerformanceMetrics: Bool?// Optional so backups created before the silence filter still decode.let skipSilentRecordingsEnabled: Bool?let enableAIStreaming: Bool@@ -108,6 +110,7 @@ struct SettingsBackupPayload: Codable, Equatable {let contextAwareCapitalizationEnabled: Bool?let pauseMediaDuringTranscription: Boollet automaticDictionaryLearningEnabled: Bool?+ let automaticDictionarySuggestionFrequency: SettingsStore.AutomaticDictionarySuggestionFrequency?let pronunciationMatchingEnabled: Bool?let vocabularyBoostingEnabled: Boollet customDictionaryEntries: [SettingsStore.CustomDictionaryEntry]diff --git a/Sources/Fluid/Persistence/SettingsStore.swift b/Sources/Fluid/Persistence/SettingsStore.swiftindex 5c8b4fed..111f4e84 100644--- a/Sources/Fluid/Persistence/SettingsStore.swift+++ b/Sources/Fluid/Persistence/SettingsStore.swift@@ -720,11 +720,9 @@ final class SettingsStore: ObservableObject {switch self.dictationPromptSelection(for: slot) {case .off:return nil- case .privateAI:- return nilcase let .profile(promptID):return self.dictationPromptProfiles.first(where: { $0.id == promptID && $0.mode.normalized == .dictate })- case .default:+ case .default, .privateAI:guard let binding = self.appPromptBinding(for: .dictate, appBundleID: appBundleID) else { return nil }let promptID = binding.promptIDreturn self.dictationPromptProfiles.first {@@ -734,11 +732,15 @@ final class SettingsStore: ObservableObject {}func isAppDictationPromptBindingActive(for slot: DictationShortcutSlot, appBundleID: String?) -> Bool {- guard !PrivateAIProviderPromptFormat.isAvailable(settings: self) else { return false }- guard self.dictationPromptSelection(for: slot) == .default else { return false }+ let selection = self.dictationPromptSelection(for: slot)+ guard Self.dictationSelectionSupportsAppOverride(selection) else { return false }return self.hasAppPromptBinding(for: .dictate, appBundleID: appBundleID)}+ static func dictationSelectionSupportsAppOverride(_ selection: DictationPromptSelection) -> Bool {+ selection == .default || selection == .privateAI+ }+func dictationPromptDisplayName(for slot: DictationShortcutSlot, appBundleID: String?) -> String {switch self.dictationPromptSelection(for: slot) {case .off:@@ -749,7 +751,15 @@ final class SettingsStore: ObservableObject {return name.isEmpty ? "Untitled" : name}return "Default"- case .privateAI: return PrivateAIProviderFeature.displayName+ case .privateAI:+ if self.isAppDictationPromptBindingActive(for: slot, appBundleID: appBundleID) {+ if let profile = self.resolvedDictationPromptProfile(for: slot, appBundleID: appBundleID) {+ let name = profile.name.trimmingCharacters(in: .whitespacesAndNewlines)+ return name.isEmpty ? "Untitled" : name+ }+ return "Default"+ }+ return PrivateAIProviderFeature.displayNamecase let .profile(promptID):guard let profile = self.dictationPromptProfiles.first(where: { $0.id == promptID && $0.mode.normalized == .dictate }) else {return "Default"@@ -1490,7 +1500,6 @@ final class SettingsStore: ObservableObject {set {objectWillChange.send()self.defaults.set(newValue, forKey: Keys.enableDebugLogs)- DebugLogger.shared.refreshLoggingEnabled()}}@@ -1498,7 +1507,6 @@ final class SettingsStore: ObservableObject {if self.defaults.object(forKey: Keys.enableDebugLogs) == nil {self.defaults.set(true, forKey: Keys.enableDebugLogs)}- DebugLogger.shared.refreshLoggingEnabled()}var selectedModel: String? {@@ -1838,6 +1846,15 @@ final class SettingsStore: ObservableObject {}}+ /// Shows optional ASR and AI performance details in transcription history.+ var showHistoryPerformanceMetrics: Bool {+ get { self.defaults.object(forKey: Keys.showHistoryPerformanceMetrics) as? Bool ?? false }+ set {+ objectWillChange.send()+ self.defaults.set(newValue, forKey: Keys.showHistoryPerformanceMetrics)+ }+ }+/// Skips clearly silent recordings up to four seconds before invoking ASR./// Opt-in so quiet speech keeps the existing transcription behavior by default.var skipSilentRecordingsEnabled: Bool {@@ -3280,6 +3297,7 @@ final class SettingsStore: ObservableObject {hotkeyMode: self.hotkeyMode,enableStreamingPreview: self.enableStreamingPreview,experimentalParakeetUnifiedFinalEnabled: self.experimentalParakeetUnifiedFinalEnabled,+ showHistoryPerformanceMetrics: self.showHistoryPerformanceMetrics,skipSilentRecordingsEnabled: self.skipSilentRecordingsEnabled,enableAIStreaming: self.enableAIStreaming,copyTranscriptionToClipboard: self.copyTranscriptionToClipboard,@@ -3322,6 +3340,7 @@ final class SettingsStore: ObservableObject {contextAwareCapitalizationEnabled: self.contextAwareCapitalizationEnabled,pauseMediaDuringTranscription: self.pauseMediaDuringTranscription,automaticDictionaryLearningEnabled: self.automaticDictionaryLearningEnabled,+ automaticDictionarySuggestionFrequency: self.automaticDictionarySuggestionFrequency,pronunciationMatchingEnabled: self.pronunciationMatchingEnabled,vocabularyBoostingEnabled: self.vocabularyBoostingEnabled,customDictionaryEntries: self.customDictionaryEntries,@@ -3413,6 +3432,9 @@ final class SettingsStore: ObservableObject {if let experimentalParakeetUnifiedFinalEnabled = payload.experimentalParakeetUnifiedFinalEnabled {self.experimentalParakeetUnifiedFinalEnabled = experimentalParakeetUnifiedFinalEnabled}+ if let showHistoryPerformanceMetrics = payload.showHistoryPerformanceMetrics {+ self.showHistoryPerformanceMetrics = showHistoryPerformanceMetrics+ }if let skipSilentRecordingsEnabled = payload.skipSilentRecordingsEnabled {self.skipSilentRecordingsEnabled = skipSilentRecordingsEnabled}@@ -3497,6 +3519,9 @@ final class SettingsStore: ObservableObject {if let automaticDictionaryLearningEnabled = payload.automaticDictionaryLearningEnabled {self.automaticDictionaryLearningEnabled = automaticDictionaryLearningEnabled}+ if let automaticDictionarySuggestionFrequency = payload.automaticDictionarySuggestionFrequency {+ self.automaticDictionarySuggestionFrequency = automaticDictionarySuggestionFrequency+ }if let pronunciationMatchingEnabled = payload.pronunciationMatchingEnabled {self.pronunciationMatchingEnabled = pronunciationMatchingEnabled}@@ -3969,13 +3994,54 @@ final class SettingsStore: ObservableObject {return ModelRepository.shared.defaultModels(for: providerID).first}+ func availableModels(for providerID: String, task: PrivateAIModelTask) -> [String] {+ if self.isPrivateAIProviderID(providerID) {+ return ModelRepository.shared.defaultModels(for: providerID, task: task)+ }++ if let configured = ModelRepository.shared.providerKeys(for: providerID).lazy+ .compactMap({ self.availableModelsByProvider[$0] })+ .first(where: { !$0.isEmpty })+ {+ return configured+ }++ let savedProviderID = providerID.hasPrefix("custom:") ?+ String(providerID.dropFirst("custom:".count)) : providerID+ if let configured = self.savedProviders.first(where: { $0.id == savedProviderID })?.models,+ !configured.isEmpty+ {+ return configured+ }++ return ModelRepository.shared.defaultModels(for: providerID)+ }++ var effectiveRewriteModeProviderID: String {+ self.rewriteModeLinkedToGlobal ? self.selectedProviderID : self.rewriteModeSelectedProviderID+ }++ var effectiveRewriteModeSelectedModel: String {+ let providerID = self.effectiveRewriteModeProviderID+ let models = self.availableModels(for: providerID, task: .edit)+ let preferred: String? = if self.rewriteModeLinkedToGlobal {+ ModelRepository.shared.providerKeys(for: providerID).lazy+ .compactMap { self.selectedModelByProvider[$0] }+ .first { !$0.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty }+ ?? self.selectedModel+ } else {+ self.rewriteModeSelectedModel+ }+ return ModelRepository.eligibleModel(preferred: preferred, from: models) ?? ""+ }+func analyticsAIModelDescriptor(for mode: AnalyticsUsageMode) -> AnalyticsModelDescriptor? {let providerID: Stringlet selectedModel: String?switch mode {case .edit:- providerID = self.rewriteModeLinkedToGlobal ? self.selectedProviderID : self.rewriteModeSelectedProviderID- selectedModel = self.rewriteModeLinkedToGlobal ? self.modelSelection(for: providerID) : self.rewriteModeSelectedModel+ providerID = self.effectiveRewriteModeProviderID+ selectedModel = self.effectiveRewriteModeSelectedModelcase .command:providerID = self.commandModeLinkedToGlobal ? self.selectedProviderID : self.commandModeSelectedProviderIDselectedModel = self.commandModeLinkedToGlobal ? self.modelSelection(for: providerID) : self.commandModeSelectedModel@@ -4522,6 +4588,22 @@ final class SettingsStore: ObservableObject {}}+ enum AutomaticDictionarySuggestionFrequency: Int, Codable, CaseIterable, Identifiable {+ case first = 1+ case second = 2+ case third = 3++ var id: Int { self.rawValue }++ var displayName: String {+ switch self {+ case .first: "1 correction"+ case .second: "2 corrections"+ case .third: "3 corrections"+ }+ }+ }+var automaticDictionaryLearningEnabled: Bool {get { self.defaults.object(forKey: Keys.automaticDictionaryLearningEnabled) as? Bool ?? true }set {@@ -4530,6 +4612,17 @@ final class SettingsStore: ObservableObject {}}+ var automaticDictionarySuggestionFrequency: AutomaticDictionarySuggestionFrequency {+ get {+ let stored = self.defaults.integer(forKey: Keys.automaticDictionarySuggestionFrequency)+ return AutomaticDictionarySuggestionFrequency(rawValue: stored) ?? .first+ }+ set {+ objectWillChange.send()+ self.defaults.set(newValue.rawValue, forKey: Keys.automaticDictionarySuggestionFrequency)+ }+ }+var pronunciationMatchingEnabled: Bool {get { self.defaults.object(forKey: Keys.pronunciationMatchingEnabled) as? Bool ?? false }set {@@ -5355,6 +5448,7 @@ private extension SettingsStore {static let hotkeyMode = "HotkeyMode"static let enableStreamingPreview = "EnableStreamingPreview"static let experimentalParakeetUnifiedFinalEnabled = "ExperimentalParakeetUnifiedFinalEnabled"+ static let showHistoryPerformanceMetrics = "ShowHistoryPerformanceMetrics"static let skipSilentRecordingsEnabled = "SkipSilentRecordingsEnabled"static let enableAIStreaming = "EnableAIStreaming"static let copyTranscriptionToClipboard = "CopyTranscriptionToClipboard"@@ -5439,6 +5533,7 @@ private extension SettingsStore {// Custom Dictionarystatic let customDictionaryEntries = "CustomDictionaryEntries"static let automaticDictionaryLearningEnabled = "AutomaticDictionaryLearningEnabled"+ static let automaticDictionarySuggestionFrequency = "AutomaticDictionarySuggestionFrequency"static let vocabularyBoostingEnabled = "VocabularyBoostingEnabled"static let pronunciationMatchingEnabled = "PronunciationMatchingEnabled"diff --git a/Sources/Fluid/Persistence/TranscriptionHistoryStore.swift b/Sources/Fluid/Persistence/TranscriptionHistoryStore.swiftindex 997b2c44..26bdf650 100644--- a/Sources/Fluid/Persistence/TranscriptionHistoryStore.swift+++ b/Sources/Fluid/Persistence/TranscriptionHistoryStore.swift@@ -20,6 +20,9 @@ struct TranscriptionHistoryEntry: Codable, Identifiable, Equatable {let characterCount: Intlet wasAIProcessed: Boollet processingModel: String?+ let transcriptionDurationMilliseconds: Int?+ let aiProcessingDurationMilliseconds: Int?+ let aiTokensPerSecond: Double?/// Non-nil when AI post-processing was configured but failed and we fell/// back to typing the raw transcription. The string carries the error/// message for display / debugging.@@ -35,6 +38,9 @@ struct TranscriptionHistoryEntry: Codable, Identifiable, Equatable {windowTitle: String,wasAIProcessed: Bool,processingModel: String? = nil,+ transcriptionDurationMilliseconds: Int? = nil,+ aiProcessingDurationMilliseconds: Int? = nil,+ aiTokensPerSecond: Double? = nil,aiProcessingError: String? = nil,audio: DictationAudioMetadata? = nil) {@@ -47,6 +53,9 @@ struct TranscriptionHistoryEntry: Codable, Identifiable, Equatable {self.characterCount = processedText.countself.wasAIProcessed = wasAIProcessedself.processingModel = processingModel+ self.transcriptionDurationMilliseconds = transcriptionDurationMilliseconds+ self.aiProcessingDurationMilliseconds = aiProcessingDurationMilliseconds+ self.aiTokensPerSecond = aiTokensPerSecondself.aiProcessingError = aiProcessingErrorself.audio = audio}@@ -61,6 +70,9 @@ struct TranscriptionHistoryEntry: Codable, Identifiable, Equatable {characterCount: Int,wasAIProcessed: Bool,processingModel: String?,+ transcriptionDurationMilliseconds: Int?,+ aiProcessingDurationMilliseconds: Int?,+ aiTokensPerSecond: Double?,aiProcessingError: String?,audio: DictationAudioMetadata?) {@@ -73,6 +85,9 @@ struct TranscriptionHistoryEntry: Codable, Identifiable, Equatable {self.characterCount = characterCountself.wasAIProcessed = wasAIProcessedself.processingModel = processingModel+ self.transcriptionDurationMilliseconds = transcriptionDurationMilliseconds+ self.aiProcessingDurationMilliseconds = aiProcessingDurationMilliseconds+ self.aiTokensPerSecond = aiTokensPerSecondself.aiProcessingError = aiProcessingErrorself.audio = audio}@@ -88,13 +103,25 @@ struct TranscriptionHistoryEntry: Codable, Identifiable, Equatable {self.characterCount = try container.decode(Int.self, forKey: .characterCount)self.wasAIProcessed = try container.decode(Bool.self, forKey: .wasAIProcessed)self.processingModel = try container.decodeIfPresent(String.self, forKey: .processingModel)+ self.transcriptionDurationMilliseconds = try container.decodeIfPresent(+ Int.self,+ forKey: .transcriptionDurationMilliseconds+ )+ self.aiProcessingDurationMilliseconds = try container.decodeIfPresent(+ Int.self,+ forKey: .aiProcessingDurationMilliseconds+ )+ self.aiTokensPerSecond = try container.decodeIfPresent(Double.self, forKey: .aiTokensPerSecond)self.aiProcessingError = try container.decodeIfPresent(String.self, forKey: .aiProcessingError)self.audio = try container.decodeIfPresent(DictationAudioMetadata.self, forKey: .audio)}private enum CodingKeys: String, CodingKey {case id, timestamp, rawText, processedText, appName, windowTitle- case characterCount, wasAIProcessed, processingModel, aiProcessingError, audio+ case characterCount, wasAIProcessed, processingModel+ case transcriptionDurationMilliseconds, aiProcessingDurationMilliseconds+ case aiTokensPerSecond+ case aiProcessingError, audio}/// Preview text for list display (first 80 chars)@@ -132,6 +159,20 @@ struct TranscriptionHistoryEntry: Codable, Identifiable, Equatable {self.audio != nil}+ static func formattedDuration(milliseconds: Int) -> String {+ if milliseconds < 1000 {+ return "\(milliseconds) ms"+ }+ return String(format: "%.1f s", Double(milliseconds) / 1000)+ }++ static func formattedTokensPerSecond(_ tokensPerSecond: Double, compact: Bool = false) -> String {+ let rounded = tokensPerSecond >= 100+ ? String(Int(tokensPerSecond.rounded()))+ : String(format: "%.1f", tokensPerSecond)+ return compact ? "\(rounded) tok/s" : "\(rounded) tokens/sec"+ }+func replacingAudio(_ audio: DictationAudioMetadata?) -> TranscriptionHistoryEntry {TranscriptionHistoryEntry(id: self.id,@@ -143,6 +184,9 @@ struct TranscriptionHistoryEntry: Codable, Identifiable, Equatable {characterCount: self.characterCount,wasAIProcessed: self.wasAIProcessed,processingModel: self.processingModel,+ transcriptionDurationMilliseconds: self.transcriptionDurationMilliseconds,+ aiProcessingDurationMilliseconds: self.aiProcessingDurationMilliseconds,+ aiTokensPerSecond: self.aiTokensPerSecond,aiProcessingError: self.aiProcessingError,audio: audio)@@ -190,6 +234,9 @@ final class TranscriptionHistoryStore: ObservableObject {windowTitle: String,wasAIProcessed: Bool? = nil,processingModel: String? = nil,+ transcriptionDurationMilliseconds: Int? = nil,+ aiProcessingDurationMilliseconds: Int? = nil,+ aiTokensPerSecond: Double? = nil,aiProcessingError: String? = nil,audio: DictationAudioMetadata? = nil) {@@ -205,6 +252,9 @@ final class TranscriptionHistoryStore: ObservableObject {windowTitle: windowTitle,wasAIProcessed: wasAIProcessed ?? (processingModel != nil && aiProcessingError == nil),processingModel: processingModel,+ transcriptionDurationMilliseconds: transcriptionDurationMilliseconds,+ aiProcessingDurationMilliseconds: aiProcessingDurationMilliseconds,+ aiTokensPerSecond: aiTokensPerSecond,aiProcessingError: aiProcessingError,audio: audio)diff --git a/Sources/Fluid/Services/ASRService.swift b/Sources/Fluid/Services/ASRService.swiftindex 7dc78252..c8dfa708 100644--- a/Sources/Fluid/Services/ASRService.swift+++ b/Sources/Fluid/Services/ASRService.swift@@ -199,6 +199,7 @@ final class ASRService: ObservableObject {private var isMicrophonePreviewRequested = falseprivate(set) var lastDictionaryTrainingResult: ASRTranscriptionResult?private(set) var lastStopOutcome: ASRStopOutcome = .empty+ private var lastFinalTranscriptionDurationMs: Int?private(set) var dictionaryTrainingAudioGeneration = 0@Published private(set) var isStarting: Bool = false // Guard against re-entrant start() calls@@ -1145,6 +1146,12 @@ final class ASRService: ObservableObject {return snapshot}+ func consumeLastFinalTranscriptionDurationMs() -> Int? {+ let duration = self.lastFinalTranscriptionDurationMs+ self.lastFinalTranscriptionDurationMs = nil+ return duration+ }+func dictionaryTrainingAudioChunk(at offset: Int, count: Int) -> [Float] {self.audioBuffer.getRange(startingAt: offset, count: count)}@@ -2327,6 +2334,7 @@ final class ASRService: ObservableObject {) async -> String {DebugLogger.shared.info("🛑 STOP() called - beginning shutdown sequence", source: "ASRService")self.lastStopOutcome = .empty+ self.lastFinalTranscriptionDurationMs = nilif forDictionaryTraining || self.isDictionaryTrainingCaptureActive {self.lastDictionaryTrainingResult = nil}@@ -2535,6 +2543,9 @@ final class ASRService: ObservableObject {finalSource = "full"}let finalElapsedMs = self.elapsedMilliseconds(since: finalStartedAt)+ if !useDictionaryTrainingPath {+ self.lastFinalTranscriptionDurationMs = finalElapsedMs+ }let finalAudioSeconds = Double(pcm.count) / 16_000.0let finalRTF = finalAudioSeconds > 0 ? (Double(finalElapsedMs) / 1000.0) / finalAudioSeconds : 0DebugLogger.shared.debug("stop(): final transcription finished source=\(finalSource)", source: "ASRService")diff --git a/Sources/Fluid/Services/AutomaticDictionaryCorrectionTracker.swift b/Sources/Fluid/Services/AutomaticDictionaryCorrectionTracker.swiftindex 3374daf1..138e1c17 100644--- a/Sources/Fluid/Services/AutomaticDictionaryCorrectionTracker.swift+++ b/Sources/Fluid/Services/AutomaticDictionaryCorrectionTracker.swift@@ -108,7 +108,6 @@ enum AutomaticDictionaryCorrectionDetector {self.isValidCandidate(corrected),self.isMeaningfulCorrection(heard: heard, corrected: corrected),heard != corrected,- heard.caseInsensitiveCompare(corrected) != .orderedSame,heard.count + corrected.count <= self.maxCombinedLengthelse {return nil@@ -224,8 +223,8 @@ enum AutomaticDictionaryCorrectionDetector {return false}- let heardSemantic = String(String.UnicodeScalarView(heardCharacters)).lowercased()- let correctedSemantic = String(String.UnicodeScalarView(correctedCharacters)).lowercased()+ let heardSemantic = String(String.UnicodeScalarView(heardCharacters))+ let correctedSemantic = String(String.UnicodeScalarView(correctedCharacters))return heardSemantic != correctedSemantic}}@@ -233,9 +232,7 @@ enum AutomaticDictionaryCorrectionDetector {struct DictionarySuggestionPolicyConfig {var requiredOccurrences = 2var occurrenceWindow: TimeInterval = 7 * 24 * 60 * 60- var globalCooldown: TimeInterval = 10 * 60var dismissedPairCooldown: TimeInterval = 7 * 24 * 60 * 60- var maximumPairDismissals = 3var maximumSessionIgnores = 3var retentionDuration: TimeInterval = 30 * 24 * 60 * 60var maximumStoredPairs = 200@@ -243,6 +240,7 @@ struct DictionarySuggestionPolicyConfig {enum AutomaticDictionarySuggestionOutcome {case accepted+ case ignoredcase dismissedcase timedOut}@@ -257,13 +255,11 @@ final class AutomaticDictionarySuggestionPolicy {var occurrences: [Date] = []var lastShownAt: Date?var dismissedUntil: Date?- var dismissalCount = 0var isAccepted = false}private struct PersistedState: Codable {var records: [String: PairRecord] = [:]- var lastShownAt: Date?}private static let defaultsKey = "AutomaticDictionarySuggestionPolicyStateV1"@@ -288,7 +284,11 @@ final class AutomaticDictionarySuggestionPolicy {}}- func shouldShow(_ candidate: AutomaticDictionaryCorrectionCandidate, now: Date = Date()) -> Bool {+ func shouldShow(+ _ candidate: AutomaticDictionaryCorrectionCandidate,+ requiredOccurrences: Int? = nil,+ now: Date = Date()+ ) -> Bool {self.prune(now: now)let key = self.key(for: candidate)var record = self.state.records[key] ?? PairRecord(@@ -300,12 +300,16 @@ final class AutomaticDictionarySuggestionPolicy {self.state.records[key] = recordself.save()+ let correctedText = self.normalized(candidate.correctedText)+ let occurrenceCount = self.state.records.values+ .filter { self.normalized($0.correctedText) == correctedText }+ .flatMap(\.occurrences)+ .filter { now.timeIntervalSince($0) <= self.configuration.occurrenceWindow }+ .countguard !record.isAccepted,- record.dismissalCount < self.configuration.maximumPairDismissals,record.dismissedUntil.map({ $0 <= now }) ?? true,- record.occurrences.count >= self.configuration.requiredOccurrences,- self.sessionIgnoreCount < self.configuration.maximumSessionIgnores,- self.state.lastShownAt.map({ now.timeIntervalSince($0) >= self.configuration.globalCooldown }) ?? true+ occurrenceCount >= (requiredOccurrences ?? self.configuration.requiredOccurrences),+ self.sessionIgnoreCount < self.configuration.maximumSessionIgnoreselse {return false}@@ -317,7 +321,6 @@ final class AutomaticDictionarySuggestionPolicy {guard var record = self.state.records[key] else { return }record.lastShownAt = nowself.state.records[key] = record- self.state.lastShownAt = nowself.save()}@@ -329,11 +332,10 @@ final class AutomaticDictionarySuggestionPolicy {let key = self.key(for: candidate)guard var record = self.state.records[key] else { return }switch outcome {- case .accepted:+ case .accepted, .ignored:record.isAccepted = truerecord.dismissedUntil = nilcase .dismissed, .timedOut:- record.dismissalCount += 1record.dismissedUntil = now.addingTimeInterval(self.configuration.dismissedPairCooldown)self.sessionIgnoreCount += 1}@@ -684,7 +686,10 @@ final class AutomaticDictionaryCorrectionTracker {!self.isAlreadySaved(candidate),!AppServices.shared.asr.isRunning,!DictionaryCorrectionOverlayController.shared.isPresented,- AutomaticDictionarySuggestionPolicy.shared.shouldShow(candidate)+ AutomaticDictionarySuggestionPolicy.shared.shouldShow(+ candidate,+ requiredOccurrences: SettingsStore.shared.automaticDictionarySuggestionFrequency.rawValue+ )else {return}@@ -804,6 +809,8 @@ private let automaticDictionaryAXObserverCallback: AXObserverCallback = { _, _,case kAXValueChangedNotification as String:tracker.handleObservedValueChange()case kAXSelectedTextChangedNotification as String:+ // Web-backed editors may move the caret without emitting a value-change notification.+ tracker.handleObservedValueChange()tracker.handleObservedSelectionChange()case kAXFocusedUIElementChangedNotification as String:tracker.handleObservedFocusChange()diff --git a/Sources/Fluid/Services/DebugLogger.swift b/Sources/Fluid/Services/DebugLogger.swiftindex 12fd90ac..917601a4 100644--- a/Sources/Fluid/Services/DebugLogger.swift+++ b/Sources/Fluid/Services/DebugLogger.swift@@ -1,35 +1,10 @@-import Combineimport Foundation-import SwiftUI-class DebugLogger: ObservableObject {+class DebugLogger {static let shared = DebugLogger()- @Published var logs: [LogEntry] = []- private let maxLogs = 1000 // Keep last 1000 log entriesprivate let queue = DispatchQueue(label: "debug.logger", qos: .utility)- // IMPORTANT: Cached setting to avoid circular dependency with SettingsStore- // During SettingsStore.init(), if an error is logged, accessing SettingsStore.shared- // would cause a recursive dispatch_once deadlock. We use a cached value instead.- private var _loggingEnabledCache: Bool?- private var loggingEnabled: Bool {- if let cached = _loggingEnabledCache {- return cached- }- // Delay access to SettingsStore until after initial singleton setup- // Use UserDefaults directly to avoid the circular dependency- let defaults = UserDefaults.standard- let enabled: Bool- if defaults.object(forKey: "EnableDebugLogs") == nil {- enabled = true- } else {- enabled = defaults.bool(forKey: "EnableDebugLogs")- }- self._loggingEnabledCache = enabled- return enabled- }-private static let logFormatter: DateFormatter = {let formatter = DateFormatter()formatter.dateFormat = "HH:mm:ss.SSS"@@ -38,54 +13,16 @@ class DebugLogger: ObservableObject {return formatter}()- struct LogEntry: Identifiable, Equatable {- let id = UUID()- let timestamp: Date- let level: LogLevel- let message: String- let source: String- let formattedTimestamp: String-- init(timestamp: Date, level: LogLevel, message: String, source: String, formattedTimestamp: String) {- self.timestamp = timestamp- self.level = level- self.message = message- self.source = source- self.formattedTimestamp = formattedTimestamp- }- }-- enum LogLevel: String, CaseIterable {+ enum LogLevel: String {case info = "INFO"case warning = "WARN"case error = "ERROR"case debug = "DEBUG"-- var color: Color {- switch self {- case .info: return .blue- case .warning: return .orange- case .error: return .red- case .debug: return .gray- }- }}private init() {}- /// Refresh the cached logging setting (call after SettingsStore is fully initialized)- func refreshLoggingEnabled() {- let defaults = UserDefaults.standard- if defaults.object(forKey: "EnableDebugLogs") == nil {- self._loggingEnabledCache = true- } else {- self._loggingEnabledCache = defaults.bool(forKey: "EnableDebugLogs")- }- }-func log(_ message: String, level: LogLevel = .info, source: String = "App") {- let loggingEnabled = self.loggingEnabled-self.queue.async {let timestamp = Date()let timestampString = Self.logFormatter.string(from: timestamp)@@ -95,48 +32,9 @@ class DebugLogger: ObservableObject {// Always persist diagnostics so issues can be debugged even if UI debug mode is off.FileLogger.shared.append(line: formattedLine)print(formattedLine)-- // UI log panel still respects the in-app debug toggle.- guard loggingEnabled else { return }-- let entry = LogEntry(- timestamp: timestamp,- level: level,- message: message,- source: source,- formattedTimestamp: timestampString- )-- DispatchQueue.main.async {- self.logs.append(entry)-- // Only trim when significantly above capacity to reduce churn- if self.logs.count > self.maxLogs + 100 {- let excess = self.logs.count - self.maxLogs- if excess > 0 {- self.logs.removeFirst(excess)- }- }- }- }- }-- func clear() {- DispatchQueue.main.async {- self.logs.removeAll()}}- func exportLogs() -> String {- return self.logs.map { entry in- self.formatLogEntry(entry)- }.joined(separator: "\n")- }-- private func formatLogEntry(_ entry: LogEntry) -> String {- self.formatLogLine(timestamp: entry.formattedTimestamp, level: entry.level, source: entry.source, message: entry.message)- }-private func formatLogLine(timestamp: String, level: LogLevel, source: String, message: String) -> String {"[\(timestamp)] [\(level.rawValue)] [\(source)] \(message)"}diff --git a/Sources/Fluid/Services/DictationAIPostProcessingGate.swift b/Sources/Fluid/Services/DictationAIPostProcessingGate.swiftindex 7e1e1ece..567cf509 100644--- a/Sources/Fluid/Services/DictationAIPostProcessingGate.swift+++ b/Sources/Fluid/Services/DictationAIPostProcessingGate.swift@@ -21,21 +21,14 @@ enum DictationAIPostProcessingGate {return false}- if promptSelection == .privateAI {- let route = DictationProviderRoute.resolve(- settings: settings,- dictationSlot: slot,- appBundleID: appBundleID- )- return route.usesPrivateAI && self.isPrivateProviderConfigured(settings: settings)- }-let route = DictationProviderRoute.resolve(settings: settings,dictationSlot: slot,appBundleID: appBundleID)- guard !route.usesPrivateAI else { return false }+ if route.usesPrivateAI {+ return self.isPrivateProviderConfigured(settings: settings)+ }return self.isProviderConfigured(route: route, settings: settings)}@@ -50,6 +43,15 @@ enum DictationAIPostProcessingGate {return self.isProviderConfigured(route: route, settings: settings)}+ static func isProviderConfigured(providerID: String, model: String) -> Bool {+ let settings = SettingsStore.shared+ let route = DictationProviderRoute.resolve(settings: settings, providerID: providerID, model: model)+ if route.usesPrivateAI {+ return self.isPrivateProviderConfigured(settings: settings)+ }+ return self.isProviderConfigured(route: route, settings: settings)+ }+private static func isProviderConfigured(route: DictationProviderRoute, settings: SettingsStore) -> Bool {let providerID = route.providerID.trimmingCharacters(in: .whitespacesAndNewlines)let model = route.model.trimmingCharacters(in: .whitespacesAndNewlines)diff --git a/Sources/Fluid/Services/DictationPostProcessingService.swift b/Sources/Fluid/Services/DictationPostProcessingService.swiftindex c3382cd3..978a5f55 100644--- a/Sources/Fluid/Services/DictationPostProcessingService.swift+++ b/Sources/Fluid/Services/DictationPostProcessingService.swift@@ -41,7 +41,15 @@ struct DictationProviderRoute: Equatable {selectedProviderID = providerIDconfiguredModel = model} else {- selectedProviderID = settings.selectedProviderID+ let hasAppBinding = settings.appPromptBinding(for: .dictate, appBundleID: appBundleID) != nil+ if selection == .default, !hasAppBinding, self.shouldUseLegacyPrivateAIRoute(+ selectedProviderID: settings.selectedProviderID,+ configuredProviderID: providerID,+ configuredModel: model+ ) {+ return self.privateAIRoute(settings: settings)+ }+ selectedProviderID = self.externalFallbackProviderID(from: settings.selectedProviderID)configuredModel = nil}} else {@@ -95,6 +103,50 @@ struct DictationProviderRoute: Equatable {)}+ static func resolve(settings: SettingsStore, providerID: String, model: String) -> Self {+ let trimmedProviderID = providerID.trimmingCharacters(in: .whitespacesAndNewlines)+ let trimmedModel = model.trimmingCharacters(in: .whitespacesAndNewlines)+ if let saved = settings.savedProviders.first(where: { $0.id == trimmedProviderID }) {+ let key = "custom:\(saved.id)"+ return Self(+ providerID: trimmedProviderID,+ providerKey: key,+ baseURL: saved.baseURL,+ model: trimmedModel,+ apiKey: settings.providerAPIKeys[key] ?? settings.providerAPIKeys[trimmedProviderID] ?? ""+ )+ }+ return Self(+ providerID: trimmedProviderID,+ providerKey: trimmedProviderID,+ baseURL: ModelRepository.shared.defaultBaseURL(for: trimmedProviderID),+ model: trimmedModel,+ apiKey: settings.providerAPIKeys[trimmedProviderID] ?? ""+ )+ }++ static func externalFallbackProviderID(from providerID: String) -> String {+ let trimmed = providerID.trimmingCharacters(in: .whitespacesAndNewlines)+ return trimmed == PrivateAIProviderFeature.shared.providerID ? "" : trimmed+ }++ static func shouldUseLegacyPrivateAIRoute(+ selectedProviderID: String,+ configuredProviderID: String,+ configuredModel: String+ ) -> Bool {+ selectedProviderID == PrivateAIProviderFeature.shared.providerID &&+ configuredProviderID.isEmpty && configuredModel.isEmpty+ }++ static func allowsPrivateAIRoute(+ selection: SettingsStore.DictationPromptSelection,+ selectedProviderID: String+ ) -> Bool {+ selection == .privateAI ||+ (selection == .default && selectedProviderID == PrivateAIProviderFeature.shared.providerID)+ }+static func resolveForPostProcessing(settings: SettingsStore,dictationSlot: SettingsStore.DictationShortcutSlot@@ -114,10 +166,11 @@ struct DictationProviderRoute: Equatable {appBundleID: String?) -> SettingsStore.DictationPromptSelection {let selection = settings.dictationPromptSelection(for: dictationSlot)- guard selection != .off, selection != .privateAI else { return selection }+ guard selection != .off else { return selection }let usesOnlyAppBindings = settings.promptRoutingScope(for: .dictate) == .selectedAppsOnly- guard usesOnlyAppBindings || selection == .default else { return selection }+ let supportsAppOverride = SettingsStore.dictationSelectionSupportsAppOverride(selection)+ guard usesOnlyAppBindings || supportsAppOverride else { return selection }guard let binding = settings.appPromptBinding(for: .dictate, appBundleID: appBundleID) else {return usesOnlyAppBindings ? .off : selection}@@ -163,12 +216,15 @@ final class DictationPostProcessingService {source: "DictationPostProcessingService")- let usesPrivateAISelection = settings.dictationPromptSelection(for: dictationSlot) == .privateAI- guard usesPrivateAISelection || !resolved.usesPrivateAI else {+ let allowsPrivateAIRoute = DictationProviderRoute.allowsPrivateAIRoute(+ selection: settings.dictationPromptSelection(for: dictationSlot),+ selectedProviderID: settings.selectedProviderID+ )+ guard allowsPrivateAIRoute || !resolved.usesPrivateAI else {throw AIProcessingError.noVerifiedProvider}- if usesPrivateAISelection,+ if allowsPrivateAIRoute,resolved.usesPrivateAI || PrivateAIIntegrationService.shouldHandleDictation(model: resolved.model){let response = try await PrivateAIIntegrationService.shared.enhanceDictation(diff --git a/Sources/Fluid/Services/DictationPromptTestCoordinator.swift b/Sources/Fluid/Services/DictationPromptTestCoordinator.swiftindex 226d2c0e..63f479ac 100644--- a/Sources/Fluid/Services/DictationPromptTestCoordinator.swift+++ b/Sources/Fluid/Services/DictationPromptTestCoordinator.swift@@ -10,6 +10,8 @@ final class DictationPromptTestCoordinator: ObservableObject {@Published private(set) var isActive: Bool = false@Published private(set) var draftPromptText: String = ""+ @Published private(set) var draftProviderID: String = ""+ @Published private(set) var draftModel: String = ""@Published var isProcessing: Bool = false@Published var lastTranscriptionText: String = ""@@ -18,9 +20,11 @@ final class DictationPromptTestCoordinator: ObservableObject {private init() {}- func activate(draftPromptText: String) {+ func activate(draftPromptText: String, providerID: String, model: String) {self.isActive = trueself.draftPromptText = draftPromptText+ self.draftProviderID = providerID+ self.draftModel = modelself.isProcessing = falseself.lastTranscriptionText = ""self.lastOutputText = ""@@ -30,6 +34,8 @@ final class DictationPromptTestCoordinator: ObservableObject {func deactivate() {self.isActive = falseself.draftPromptText = ""+ self.draftProviderID = ""+ self.draftModel = ""self.isProcessing = false}@@ -37,4 +43,10 @@ final class DictationPromptTestCoordinator: ObservableObject {guard self.isActive else { return }self.draftPromptText = text}++ func updateDraftConfiguration(providerID: String, model: String) {+ guard self.isActive else { return }+ self.draftProviderID = providerID+ self.draftModel = model+ }}diff --git a/Sources/Fluid/Services/LocalAPI/HistoryAPIController.swift b/Sources/Fluid/Services/LocalAPI/HistoryAPIController.swiftindex 375a942f..25f783f4 100644--- a/Sources/Fluid/Services/LocalAPI/HistoryAPIController.swift+++ b/Sources/Fluid/Services/LocalAPI/HistoryAPIController.swift@@ -17,6 +17,9 @@ struct HistoryAPIController: LocalAPIRouteHandler {let windowTitle: Stringlet characterCount: Intlet wasAIProcessed: Bool+ let transcriptionDurationMilliseconds: Int?+ let aiProcessingDurationMilliseconds: Int?+ let aiTokensPerSecond: Double?let aiProcessingError: String?}@@ -40,6 +43,9 @@ struct HistoryAPIController: LocalAPIRouteHandler {windowTitle: entry.windowTitle,characterCount: entry.characterCount,wasAIProcessed: entry.wasAIProcessed,+ transcriptionDurationMilliseconds: entry.transcriptionDurationMilliseconds,+ aiProcessingDurationMilliseconds: entry.aiProcessingDurationMilliseconds,+ aiTokensPerSecond: entry.aiTokensPerSecond,aiProcessingError: entry.aiProcessingError)}diff --git a/Sources/Fluid/Services/ModelRepository.swift b/Sources/Fluid/Services/ModelRepository.swiftindex c78adaa7..26237417 100644--- a/Sources/Fluid/Services/ModelRepository.swift+++ b/Sources/Fluid/Services/ModelRepository.swift@@ -56,6 +56,22 @@ final class ModelRepository {}}+ /// Returns models eligible for one app mode. Remote providers keep their+ /// normal model list; Fluid Intelligence supplies task-scoped local models.+ func defaultModels(for providerID: String, task: PrivateAIModelTask) -> [String] {+ if PrivateFeatures.privateAIProvider, providerID == PrivateAIProviderFeature.shared.providerID {+ return PrivateAIProviderFeature.shared.modelIDs(for: task)+ }+ return self.defaultModels(for: providerID)+ }++ static func eligibleModel(preferred: String?, from models: [String]) -> String? {+ if let preferred, models.contains(preferred) {+ return preferred+ }+ return models.first+ }+/// Returns the default base URL for a given provider ID.func defaultBaseURL(for providerID: String) -> String {switch providerID {diff --git a/Sources/Fluid/Services/PrivateAIIntegrationService.swift b/Sources/Fluid/Services/PrivateAIIntegrationService.swiftindex f1797bba..16ab4578 100644--- a/Sources/Fluid/Services/PrivateAIIntegrationService.swift+++ b/Sources/Fluid/Services/PrivateAIIntegrationService.swift@@ -34,6 +34,19 @@ actor PrivateAIIntegrationService {let outputText: Stringlet backendKind: String?let latencyMilliseconds: Int?+ let tokensPerSecond: Double?++ init(+ outputText: String,+ backendKind: String?,+ latencyMilliseconds: Int?,+ tokensPerSecond: Double? = nil+ ) {+ self.outputText = outputText+ self.backendKind = backendKind+ self.latencyMilliseconds = latencyMilliseconds+ self.tokensPerSecond = tokensPerSecond+ }}struct LoadedModelState: Sendable, Equatable {@@ -144,6 +157,27 @@ actor PrivateAIIntegrationService {try await self.provider.prepareModel(model, progressHandler: progressHandler)}+ nonisolated static func modelUpdateStatus(+ _ model: PrivateAIRegisteredModel+ ) async -> PrivateAIModelUpdateStatus {+ await self.provider.modelUpdateStatus(model)+ }++ nonisolated static func updateModel(+ _ model: PrivateAIRegisteredModel,+ progressHandler: PrivateAIModelDownloadProgressHandler? = nil+ ) async throws -> PrivateAIModelUpdateToken {+ try await self.provider.updateModel(model, progressHandler: progressHandler)+ }++ nonisolated static func commitModelUpdate(_ token: PrivateAIModelUpdateToken) async {+ await self.provider.commitModelUpdate(token)+ }++ nonisolated static func rollbackModelUpdate(_ token: PrivateAIModelUpdateToken) async {+ await self.provider.rollbackModelUpdate(token)+ }+nonisolated static var isLocalRuntimeConfigured: Bool {provider.isLocalRuntimeConfigured}@@ -168,6 +202,10 @@ actor PrivateAIIntegrationService {return status}+ func verifyModel(_ model: PrivateAIRegisteredModel) async throws -> PrivateAIStatus {+ try await Self.provider.verifyModel(model)+ }+func removeInactiveInstalledModels(keeping model: PrivateAIRegisteredModel) async {do {try Self.removeInactiveInstalledModels(keeping: model)diff --git a/Sources/Fluid/Services/PrivateAIProvider.swift b/Sources/Fluid/Services/PrivateAIProvider.swiftindex aaff5ddb..3b4ffbc9 100644--- a/Sources/Fluid/Services/PrivateAIProvider.swift+++ b/Sources/Fluid/Services/PrivateAIProvider.swift@@ -124,6 +124,23 @@ enum PrivateAIModelDownloadProgressText {typealias PrivateAIModelDownloadProgressHandler = @Sendable (PrivateAIModelDownloadProgress) async -> Void+enum PrivateAIModelUpdateState: String, Sendable, Codable, Equatable {+ case unavailable+ case notInstalled+ case current+ case updateAvailable+}++struct PrivateAIModelUpdateStatus: Sendable, Codable, Equatable {+ var state: PrivateAIModelUpdateState+ var installedVersion: String?+ var availableVersion: String?+}++struct PrivateAIModelUpdateToken: Sendable, Hashable {+ let id: UUID+}+struct PrivateAIRegisteredModel: Sendable, Codable, Hashable, Identifiable {var id: String { self.artifact.identifier }var displayName: String@@ -138,6 +155,12 @@ struct PrivateAIRegisteredModel: Sendable, Codable, Hashable, Identifiable {}}+enum PrivateAIModelTask: String, Sendable, Codable, Hashable {+ case dictation+ case edit+ case command+}+enum PrivateAIRuntimeState: String, Sendable, Codable, Hashable {case unavailablecase missingModel@@ -170,7 +193,9 @@ protocol PrivateAIProviderFeatureProviding: Sendable {var boostDefaultsKey: String { get }var modelDirectoryName: String { get }+ func selectedModelDefaultsKey(for task: PrivateAIModelTask) -> Stringfunc modelIDs() -> [String]+ func modelIDs(for task: PrivateAIModelTask) -> [String]func model(id: String) -> PrivateAIRegisteredModel?func canonicalModelID(for value: String) -> String?func isKnownModelID(_ value: String) -> Bool@@ -179,6 +204,14 @@ protocol PrivateAIProviderFeatureProviding: Sendable {}extension PrivateAIProviderFeatureProviding {+ func selectedModelDefaultsKey(for _: PrivateAIModelTask) -> String {+ self.selectedModelDefaultsKey+ }++ func modelIDs(for task: PrivateAIModelTask) -> [String] {+ task == .dictation ? self.modelIDs() : []+ }+func matches(model: String) -> Bool {guard self.isAvailable else { return false }@@ -212,10 +245,18 @@ protocol PrivateAIIntegrationProviding: Sendable {_ model: PrivateAIRegisteredModel,progressHandler: PrivateAIModelDownloadProgressHandler?) async throws -> URL+ func modelUpdateStatus(_ model: PrivateAIRegisteredModel) async -> PrivateAIModelUpdateStatus+ func updateModel(+ _ model: PrivateAIRegisteredModel,+ progressHandler: PrivateAIModelDownloadProgressHandler?+ ) async throws -> PrivateAIModelUpdateToken+ func commitModelUpdate(_ token: PrivateAIModelUpdateToken) async+ func rollbackModelUpdate(_ token: PrivateAIModelUpdateToken) asyncfunc shouldHandleDictation(model: String) -> Boolfunc status(for runtime: PrivateAIIntegrationService.RuntimeConfiguration) async -> PrivateAIStatusfunc loadedModelState() async -> PrivateAIIntegrationService.LoadedModelState?func loadModel(_ model: PrivateAIRegisteredModel) async throws -> PrivateAIStatus+ func verifyModel(_ model: PrivateAIRegisteredModel) async throws -> PrivateAIStatusfunc prewarmDictation() asyncfunc unloadCachedRuntime(reason: String) asyncfunc shutdownForTermination() async@@ -239,6 +280,10 @@ protocol PrivateAIIntegrationProviding: Sendable {}extension PrivateAIIntegrationProviding {+ func verifyModel(_ model: PrivateAIRegisteredModel) async throws -> PrivateAIStatus {+ try await self.loadModel(model)+ }+func installedModelURLs(for model: PrivateAIRegisteredModel) -> [URL] {guard let path = self.localModelPath(for: model) else { return [] }return [URL(fileURLWithPath: path)]@@ -250,6 +295,20 @@ extension PrivateAIIntegrationProviding {try await self.prepareModel(model, progressHandler: nil)}+ func modelUpdateStatus(_: PrivateAIRegisteredModel) async -> PrivateAIModelUpdateStatus {+ PrivateAIModelUpdateStatus(state: .unavailable)+ }++ func updateModel(+ _: PrivateAIRegisteredModel,+ progressHandler _: PrivateAIModelDownloadProgressHandler?+ ) async throws -> PrivateAIModelUpdateToken {+ throw PrivateAIUnavailableError()+ }++ func commitModelUpdate(_: PrivateAIModelUpdateToken) async {}+ func rollbackModelUpdate(_: PrivateAIModelUpdateToken) async {}+/// Best-effort, no-op by default. Backends that support prefix priming/// (the local FluidIntelligence bridge) override this to load and prime the/// dictation runtime ahead of the first request.@@ -356,6 +415,10 @@ enum PrivateAIModelRegistry {PrivateAIProviderFeature.shared.modelIDs()}+ nonisolated static func modelIDs(for task: PrivateAIModelTask) -> [String] {+ PrivateAIProviderFeature.shared.modelIDs(for: task)+ }+nonisolated static func localModelURL(for model: PrivateAIRegisteredModel, directoryURL: URL) -> URL {PrivateAIProviderFeature.shared.localModelURL(for: model, directoryURL: directoryURL)}diff --git a/Sources/Fluid/Services/PrivateAIProviderPromptFormat.swift b/Sources/Fluid/Services/PrivateAIProviderPromptFormat.swiftindex 454ef6c4..3cc7a962 100644--- a/Sources/Fluid/Services/PrivateAIProviderPromptFormat.swift+++ b/Sources/Fluid/Services/PrivateAIProviderPromptFormat.swift@@ -6,13 +6,7 @@ enum PrivateAIProviderPromptFormat {}static func isAvailable(settings: SettingsStore = .shared) -> Bool {- guard self.verifiedModelID(settings: settings) != nil else { return false }-- if settings.selectedProviderID == PrivateAIProviderFeature.shared.providerID {- return true- }-- return self.isSoleStoredVerifiedProvider(settings: settings)+ self.verifiedModelID(settings: settings) != nil}static func verifiedModelID(settings: SettingsStore = .shared) -> String? {@@ -52,13 +46,6 @@ enum PrivateAIProviderPromptFormat {settings.verifiedProviderFingerprints[providerKey] == expectedFingerprint}- private static func isSoleStoredVerifiedProvider(settings: SettingsStore) -> Bool {- let key = self.providerKey(for: PrivateAIProviderFeature.shared.providerID)- let fingerprints = settings.verifiedProviderFingerprints- guard fingerprints[key] != nil else { return false }- return fingerprints.keys.allSatisfy { $0 == key }- }-private static func providerKey(for providerID: String) -> String {let trimmed = providerID.trimmingCharacters(in: .whitespacesAndNewlines)guard !trimmed.isEmpty else { return "" }diff --git a/Sources/Fluid/Services/RewriteModeService.swift b/Sources/Fluid/Services/RewriteModeService.swiftindex 41650cc0..404d37bf 100644--- a/Sources/Fluid/Services/RewriteModeService.swift+++ b/Sources/Fluid/Services/RewriteModeService.swift@@ -185,12 +185,7 @@ final class RewriteModeService: ObservableObject {let builtInDefaultPrompt = SettingsStore.defaultSystemPromptText(for: promptMode)let systemPromptBeforeContext = settings.effectiveSystemPrompt(for: promptMode, appBundleID: appBundleID)// Use global provider/model when linked, otherwise use Edit Mode's independent settings.- let providerID: String = {- if settings.rewriteModeLinkedToGlobal {- return settings.selectedProviderID- }- return settings.rewriteModeSelectedProviderID- }()+ let providerID = settings.effectiveRewriteModeProviderIDguard !providerID.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {throw NSError(domain: "RewriteMode",@@ -235,25 +230,7 @@ final class RewriteModeService: ObservableObject {self.logPromptTrace("Conversation input (Q/history)", value: messageDump.isEmpty ? "<empty>" : messageDump)}- let model: String = {- if settings.rewriteModeLinkedToGlobal {- let key: String- if ModelRepository.shared.isBuiltIn(providerID) {- key = providerID- } else if providerID.hasPrefix("custom:") {- key = providerID- } else {- key = "custom:\(providerID)"- }- return settings.selectedModelByProvider[key]- ?? settings.selectedModel- ?? ModelRepository.shared.defaultModels(for: providerID).first- ?? ""- }- return settings.rewriteModeSelectedModel- ?? ModelRepository.shared.defaultModels(for: providerID).first- ?? ""- }()+ let model = settings.effectiveRewriteModeSelectedModelguard !model.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {throw NSError(domain: "RewriteMode",diff --git a/Sources/Fluid/UI/AISettings/AIEnhancementSettingsView.swift b/Sources/Fluid/UI/AISettings/AIEnhancementSettingsView.swiftindex 88873b31..28b06f43 100644--- a/Sources/Fluid/UI/AISettings/AIEnhancementSettingsView.swift+++ b/Sources/Fluid/UI/AISettings/AIEnhancementSettingsView.swift@@ -83,6 +83,7 @@ struct AIEnhancementSettingsView: View {@State var providerSearchText: String = ""@State var privateAISelectedModelID: String = PrivateAIIntegrationService.configuredModelID@State var privateAILoadState: PrivateAIModelLoadState = .idle+ @State var privateAIModelUpdateStatusByID: [String: PrivateAIModelUpdateStatus] = [:]@State var hoveredPromptCardKey: String? = nil@State var selectedPromptMode: SettingsStore.PromptMode = .dictate@State var hoveredPromptModeKey: String? = nil@@ -100,6 +101,7 @@ struct AIEnhancementSettingsView: View {self.viewModel.onAppear()self.privateAISelectedModelID = PrivateAIIntegrationService.configuredModelIDself.refreshPrivateAILoadState()+ self.refreshPrivateAIModelUpdateStatus(self.selectedPrivateAIModel)}.onChange(of: self.viewModel.connectionStatus) { oldValue, newValue inif oldValue == .success && newValue != .success {diff --git a/Sources/Fluid/UI/AISettings/AIEnhancementSettingsViewModel.swift b/Sources/Fluid/UI/AISettings/AIEnhancementSettingsViewModel.swiftindex b9b1ce5c..ebd67642 100644--- a/Sources/Fluid/UI/AISettings/AIEnhancementSettingsViewModel.swift+++ b/Sources/Fluid/UI/AISettings/AIEnhancementSettingsViewModel.swift@@ -45,8 +45,10 @@ final class AIEnhancementSettingsViewModel: ObservableObject {@Published var providerAPIKeys: [String: String] = [:]@Published var currentProvider: String = ""@Published var savedProviders: [SettingsStore.SavedProvider] = []+ private var persistsSelectedProvider = true@Published var selectedProviderID: String {didSet {+ guard self.persistsSelectedProvider else { return }self.settings.selectedProviderID = self.selectedProviderIDself.syncPromptSelectionForSelectedProvider()}@@ -381,7 +383,7 @@ final class AIEnhancementSettingsViewModel: ObservableObject {}do {- let status = try await PrivateAIIntegrationService.shared.loadModel(currentModel)+ let status = try await PrivateAIIntegrationService.shared.verifyModel(currentModel)switch status.state {case .ready:let fingerprint = self.privateAIFingerprint(for: currentModel.id)@@ -393,7 +395,6 @@ final class AIEnhancementSettingsViewModel: ObservableObject {self.settings.verifiedPrivateAIModelFingerprints = modelFingerprintsself.selectedModelByProvider[key] = currentModel.idself.settings.selectedModelByProvider = self.selectedModelByProvider- self.selectProviderForUse(providerID)self.updateConnectionStatus(.success, for: providerID)DebugLogger.shared.info("Private AI Provider verification succeeded for \(currentModel.id)",@@ -447,11 +448,19 @@ final class AIEnhancementSettingsViewModel: ObservableObject {self.fetchedModelsProviders.contains(self.providerKey(for: providerID))}- func selectProvider(_ providerID: String) {+ func configureProvider(_ providerID: String) {+ self.persistsSelectedProvider = falseself.selectProviderForUse(providerID)+ self.persistsSelectedProvider = trueself.setEditingAPIKey(true, for: providerID)}+ func finishConfiguringProvider() {+ self.persistsSelectedProvider = false+ self.selectProviderForUse(self.settings.selectedProviderID)+ self.persistsSelectedProvider = true+ }+private func selectProviderForUse(_ providerID: String) {self.selectedProviderID = providerIDself.handleProviderChange(providerID)@@ -492,7 +501,7 @@ final class AIEnhancementSettingsViewModel: ObservableObject {self.settings.availableModelsByProvider = self.availableModelsByProviderself.settings.selectedModelByProvider = self.selectedModelByProvider- self.selectedProviderID = draft.id+ self.configureProvider(draft.id)self.openAIBaseURL = ""self.updateCurrentProvider()self.availableModels = []@@ -547,7 +556,6 @@ final class AIEnhancementSettingsViewModel: ObservableObject {self.settings.savedProviders = self.savedProvidersself.settings.availableModelsByProvider = self.availableModelsByProviderself.settings.selectedModelByProvider = self.selectedModelByProvider- self.settings.selectedProviderID = self.selectedProviderIDself.refreshProviderItems()}@@ -1090,9 +1098,11 @@ final class AIEnhancementSettingsViewModel: ObservableObject {}func deleteCurrentProvider() {- self.savedProviders.removeAll { $0.id == self.selectedProviderID }+ let deletedProviderID = self.selectedProviderID+ let deletedDefaultProvider = self.settings.selectedProviderID == deletedProviderID+ self.savedProviders.removeAll { $0.id == deletedProviderID }self.saveSavedProviders()- let key = self.providerKey(for: self.selectedProviderID)+ let key = self.providerKey(for: deletedProviderID)self.availableModelsByProvider.removeValue(forKey: key)self.selectedModelByProvider.removeValue(forKey: key)self.providerAPIKeys.removeValue(forKey: key)@@ -1100,11 +1110,10 @@ final class AIEnhancementSettingsViewModel: ObservableObject {self.settings.verifiedProviderFingerprints.removeValue(forKey: key)self.settings.availableModelsByProvider = self.availableModelsByProviderself.settings.selectedModelByProvider = self.selectedModelByProvider- self.selectedProviderID = ""- self.openAIBaseURL = ""- self.updateCurrentProvider()- self.availableModels = []- self.selectedModel = ""+ if deletedDefaultProvider {+ self.settings.selectedProviderID = ""+ }+ self.finishConfiguringProvider()self.refreshVerifiedProviders()self.selectSoleVerifiedProviderIfNeeded()}@@ -1884,10 +1893,6 @@ final class AIEnhancementSettingsViewModel: ObservableObject {PrivateAIProviderPromptFormat.isAvailable(settings: self.settings)}- func isPrivateAIModelSelected() -> Bool {- PrivateAIProviderPromptFormat.isAvailable(settings: self.settings)- }-func isPrivateAIPromptSelected() -> Bool {self.settings.dictationPromptSelection == .privateAI}@@ -1932,8 +1937,9 @@ final class AIEnhancementSettingsViewModel: ObservableObject {func defaultVerifiedPromptProviderID() -> String {let verified = self.verifiedPromptProviders()- if verified.contains(where: { $0.id == self.selectedProviderID }) {- return self.selectedProviderID+ let persistedProviderID = self.settings.selectedProviderID+ if verified.contains(where: { $0.id == persistedProviderID }) {+ return persistedProviderID}return verified.first?.id ?? ""}@@ -2066,11 +2072,7 @@ final class AIEnhancementSettingsViewModel: ObservableObject {func setSelectedPromptID(_ id: String?, for mode: SettingsStore.PromptMode) {if mode.normalized == .dictate {- if self.isPrivateAIModelSelected() {- if id == nil {- self.settings.setDictationPromptSelection(.privateAI)- }- } else if let id {+ if let id {self.settings.setDictationPromptSelection(.profile(id))} else {self.settings.setDictationPromptSelection(.default)diff --git a/Sources/Fluid/UI/AISettingsView+AIConfiguration.swift b/Sources/Fluid/UI/AISettingsView+AIConfiguration.swiftindex 1b1cd518..5bb97825 100644--- a/Sources/Fluid/UI/AISettingsView+AIConfiguration.swift+++ b/Sources/Fluid/UI/AISettingsView+AIConfiguration.swift@@ -161,13 +161,13 @@ extension AIEnhancementSettingsView {self.aiSetupSummaryDividerself.aiSetupSummaryItem(icon: "cloud", text: "Cloud models use provider APIs")self.aiSetupSummaryDivider- self.aiSetupSummaryItem(icon: "keyboard", text: "Shortcuts choose when prompts run")+ self.aiSetupSummaryItem(icon: "wand.and.stars", text: "Cleanup Styles choose what dictation uses")}VStack(alignment: .leading, spacing: 7) {self.aiSetupSummaryItem(icon: "cpu", text: "Local models run on Mac")self.aiSetupSummaryItem(icon: "cloud", text: "Cloud models use provider APIs")- self.aiSetupSummaryItem(icon: "keyboard", text: "Shortcuts choose when prompts run")+ self.aiSetupSummaryItem(icon: "wand.and.stars", text: "Cleanup Styles choose what dictation uses")}}.padding(.horizontal, 2)@@ -576,9 +576,10 @@ extension AIEnhancementSettingsView {self.expandedProviderID = nilself.viewModel.clearEditProviderDraft()self.viewModel.setEditingAPIKey(false, for: providerID)+ self.viewModel.finishConfiguringProvider()} else {self.expandedProviderID = providerID- self.selectProvider(providerID)+ self.viewModel.configureProvider(providerID)}}@@ -594,6 +595,7 @@ extension AIEnhancementSettingsView {let isVerified = self.isPrivateAIModelVerified(model)let isTesting = self.viewModel.isTestingConnection && self.viewModel.selectedProviderID == PrivateAIProviderFeature.shared.providerIDlet isBusy = isDownloading || isLoading || isTesting+ let hasUpdate = isInstalled && self.privateAIModelUpdateStatusByID[model.id]?.state == .updateAvailablelet canVerify = isInstalled && (!isVerified || hasLoadFailure) && !self.privateAISelectedModelID.trimmingCharacters(in: .whitespacesAndNewlines).isEmptyreturn VStack(alignment: .leading, spacing: 10) {@@ -607,6 +609,7 @@ extension AIEnhancementSettingsView {models: PrivateAIModelRegistry.modelIDs(),selectedModel: self.privateAIModelBinding,selectionEnabled: !isBusy,+ displayName: self.privateAIModelDisplayName,controlWidth: 180,controlHeight: AISettingsLayout.providerRowControlHeight)@@ -678,6 +681,24 @@ extension AIEnhancementSettingsView {}.foregroundStyle(.secondary)}+ } else if hasUpdate {+ Button(action: { self.updatePrivateAIModel(model) }) {+ HStack(spacing: 6) {+ if isDownloading {+ ProgressView()+ .controlSize(.mini)+ .fixedSize()+ }+ Text(+ isDownloading+ ? Self.downloadButtonText(progress: downloadProgress)+ : "Update & Verify"+ )+ .font(.system(size: 11, weight: .semibold))+ }+ }+ .fluidButton(.accent, size: .small)+ .disabled(isBusy)} else if canVerify {Button(action: { self.verifyPrivateAIConnection(model) }) {HStack(spacing: 6) {@@ -927,9 +948,18 @@ extension AIEnhancementSettingsView {}self.refreshPrivateAILoadState()+ self.refreshPrivateAIModelUpdateStatus(self.selectedPrivateAIModel)self.viewModel.refreshProviderItems()}+ func refreshPrivateAIModelUpdateStatus(_ model: PrivateAIRegisteredModel) {+ Task { @MainActor in+ let status = await PrivateAIIntegrationService.modelUpdateStatus(model)+ guard self.privateAISelectedModelID == model.id else { return }+ self.privateAIModelUpdateStatusByID[model.id] = status+ }+ }+private func downloadPrivateAIModel(_ model: PrivateAIRegisteredModel) {guard model.canDownload else {self.privateAILoadState = .failed(modelID: model.id, message: "Download URL is not configured yet.")@@ -982,6 +1012,80 @@ extension AIEnhancementSettingsView {}}+ private func updatePrivateAIModel(_ model: PrivateAIRegisteredModel) {+ guard self.privateAIModelUpdateStatusByID[model.id]?.state == .updateAvailable,+ !self.privateAILoadState.isDownloading(model.id)+ else { return }++ let wasPreviouslyVerified = PrivateAIProviderPromptFormat.verifiedModelID(settings: self.settings) == model.id++ self.privateAILoadState = .downloading(+ modelID: model.id,+ progress: PrivateAIModelDownloadProgress(initialExpectedBytes: model.artifact.byteCount)+ )+ Task { @MainActor in+ var updateToken: PrivateAIModelUpdateToken?+ do {+ updateToken = try await PrivateAIIntegrationService.updateModel(model) { progress in+ await MainActor.run {+ guard self.privateAISelectedModelID == model.id else { return }+ self.privateAILoadState = .downloading(+ modelID: model.id,+ progress: progress.withFallbackExpectedBytes(model.artifact.byteCount)+ )+ }+ }+ guard self.privateAISelectedModelID == model.id else {+ if let updateToken {+ await PrivateAIIntegrationService.rollbackModelUpdate(updateToken)+ }+ return+ }++ self.privateAILoadState = .loading(modelID: model.id)+ let start = ContinuousClock.now+ let verified = await self.viewModel.verifyPrivateAIProvider(model: model)+ let latencyMilliseconds = Self.elapsedMilliseconds(since: start)+ guard self.privateAISelectedModelID == model.id else {+ if let updateToken {+ await PrivateAIIntegrationService.rollbackModelUpdate(updateToken)+ }+ return+ }++ if verified, let updateToken {+ await PrivateAIIntegrationService.commitModelUpdate(updateToken)+ self.privateAILoadState = .loaded(+ modelID: model.id,+ latencyMilliseconds: latencyMilliseconds+ )+ } else {+ if let updateToken {+ await PrivateAIIntegrationService.rollbackModelUpdate(updateToken)+ }+ if wasPreviouslyVerified {+ self.viewModel.updateConnectionStatus(.success, for: PrivateAIProviderFeature.shared.providerID)+ }+ let detail = self.viewModel.connectionErrorMessage.isEmpty+ ? "The new model failed verification. The previous model is still active."+ : "The new model failed verification. The previous model is still active. \(self.viewModel.connectionErrorMessage)"+ self.privateAILoadState = .failed(modelID: model.id, message: detail)+ }+ } catch {+ if let updateToken {+ await PrivateAIIntegrationService.rollbackModelUpdate(updateToken)+ }+ guard self.privateAISelectedModelID == model.id else { return }+ self.privateAILoadState = .failed(+ modelID: model.id,+ message: "Update failed. The previous model is still active. \(Self.errorMessage(for: error))"+ )+ }+ self.refreshPrivateAIModelUpdateStatus(model)+ self.viewModel.refreshProviderItems()+ }+ }+private func verifyPrivateAIConnection(_ model: PrivateAIRegisteredModel) {self.privateAILoadState = .loading(modelID: model.id)Task { @MainActor in@@ -1001,10 +1105,14 @@ extension AIEnhancementSettingsView {}}- private var selectedPrivateAIModel: PrivateAIRegisteredModel {+ var selectedPrivateAIModel: PrivateAIRegisteredModel {PrivateAIModelRegistry.model(id: self.privateAISelectedModelID) ?? PrivateAIModelRegistry.defaultModel}+ private func privateAIModelDisplayName(_ modelID: String) -> String {+ PrivateAIModelRegistry.model(id: modelID)?.displayName ?? modelID+ }+private func isPrivateAIModelVerified(_ model: PrivateAIRegisteredModel) -> Bool {PrivateAIProviderPromptFormat.verifiedModelID(for: model.id, settings: self.viewModel.settings) != nil}@@ -1210,6 +1318,7 @@ extension AIEnhancementSettingsView {self.viewModel.selectedModel = model.id}self.viewModel.resetVerification(for: PrivateAIProviderFeature.shared.providerID)+ self.refreshPrivateAIModelUpdateStatus(model)self.viewModel.refreshProviderItems()if PrivateAIIntegrationService.isModelInstalled(model) {self.loadPrivateAIModel(model)@@ -1359,7 +1468,7 @@ extension AIEnhancementSettingsView {opacity: canFetchModels ? 1 : 0.45,help: "Refresh model list") {- self.activateProvider(item.id)+ self.viewModel.configureProvider(item.id)Task { await self.viewModel.fetchModelsForCurrentProvider() }}}@@ -1536,8 +1645,11 @@ extension AIEnhancementSettingsView {private func verifiedProviderRow(_ item: ProviderItem) -> some View {let providerKey = self.viewModel.providerKey(for: item.id)let models = self.viewModel.availableModelsByProvider[providerKey] ?? []- let isSelected = item.id == self.viewModel.selectedProviderIDlet isPrivateAIProvider = item.id == PrivateAIProviderFeature.shared.providerID+ let primaryPromptSelection = self.viewModel.dictationPromptSelection(for: .primary)+ let isDefaultProvider = isPrivateAIProvider+ ? primaryPromptSelection == .privateAI+ : primaryPromptSelection == .default && item.id == self.settings.selectedProviderIDlet fluidModel = self.selectedPrivateAIModellet fluidStatus = self.privateAIModelStatus(for: fluidModel)let isFluidInstalled = PrivateAIIntegrationService.isModelInstalled(fluidModel)@@ -1545,6 +1657,7 @@ extension AIEnhancementSettingsView {let fluidDownloadProgress = self.privateAILoadState.downloadProgress(for: fluidModel.id)let isFluidLoading = self.privateAILoadState.isLoading(fluidModel.id)let hasFluidLoadFailure = self.privateAILoadState.failureMessage(for: fluidModel.id) != nil+ let hasFluidUpdate = self.privateAIModelUpdateStatusByID[fluidModel.id]?.state == .updateAvailablelet isFluidVerified = self.isPrivateAIModelVerified(fluidModel)let isFluidTesting = self.viewModel.isTestingConnection && self.viewModel.selectedProviderID == PrivateAIProviderFeature.shared.providerIDlet isFluidBusy = isFluidDownloading || isFluidLoading || isFluidTesting@@ -1580,11 +1693,35 @@ extension AIEnhancementSettingsView {// Fixed action grid: companion icon, optional reasoning, primary action.HStack(spacing: 8) {+ Button {+ guard !isDefaultProvider else { return }+ self.makePrimaryDefaultProvider(item.id, isPrivateAI: isPrivateAIProvider)+ } label: {+ Label(+ isDefaultProvider ? "Default" : "Use as default",+ systemImage: isDefaultProvider ? "checkmark.circle.fill" : "circle"+ )+ .font(.caption2.weight(.semibold))+ .lineLimit(1)+ .frame(width: 92, height: AISettingsLayout.providerRowControlHeight)+ }+ .fluidCompactButton(+ isReady: isDefaultProvider,+ foreground: isDefaultProvider ? self.theme.palette.accent : nil,+ borderColor: isDefaultProvider ? self.theme.palette.accent.opacity(0.5) : nil+ )+ .help(+ isDefaultProvider+ ? "Used by the main dictation shortcut"+ : "Use this provider for the main dictation shortcut"+ )+if isPrivateAIProvider {SearchableModelPicker(models: PrivateAIModelRegistry.modelIDs(),selectedModel: self.privateAIModelBinding,selectionEnabled: !isFluidBusy,+ displayName: self.privateAIModelDisplayName,controlWidth: 180,controlHeight: AISettingsLayout.providerRowControlHeight)@@ -1594,11 +1731,22 @@ extension AIEnhancementSettingsView {}.frame(width: iconColumnWidth, height: AISettingsLayout.providerRowControlHeight)- Color.clear+ if hasFluidUpdate {+ self.companionIconButton(+ systemName: "arrow.down.circle",+ help: "Update and verify model"+ ) {+ self.updatePrivateAIModel(fluidModel)+ }+ .disabled(isFluidBusy).frame(width: iconColumnWidth, height: AISettingsLayout.providerRowControlHeight)+ } else {+ Color.clear+ .frame(width: iconColumnWidth, height: AISettingsLayout.providerRowControlHeight)+ }Button(action: {- self.activateProvider(item.id)+ self.viewModel.configureProvider(item.id)if isEditing {self.viewModel.clearEditProviderDraft()} else {@@ -1627,7 +1775,7 @@ extension AIEnhancementSettingsView {opacity: canFetchModels ? 1 : 0.45,help: "Refresh model list") {- self.activateProvider(item.id)+ self.viewModel.configureProvider(item.id)Task { await self.viewModel.fetchModelsForCurrentProvider() }}.frame(width: iconColumnWidth, height: AISettingsLayout.providerRowControlHeight)@@ -1636,7 +1784,7 @@ extension AIEnhancementSettingsView {.frame(width: iconColumnWidth, height: AISettingsLayout.providerRowControlHeight)Button(action: {- self.activateProvider(item.id)+ self.viewModel.configureProvider(item.id)if isEditing {self.viewModel.clearEditProviderDraft()self.viewModel.setEditingAPIKey(false, for: item.id)@@ -1707,16 +1855,8 @@ extension AIEnhancementSettingsView {RoundedRectangle(cornerRadius: 12, style: .continuous).stroke(self.theme.palette.cardBorder.opacity(0.25), lineWidth: 0.8))- .overlay(- RoundedRectangle(cornerRadius: 12, style: .continuous)- .stroke(isSelected ? Color.fluidGreen.opacity(0.9) : .clear, lineWidth: 2)- )// Verified rows always have interactive elements, don't use drawingGroup.contentShape(Rectangle())- .onTapGesture {- self.activateProvider(item.id)- self.expandedProviderID = nil- }}private func providerBaseURL(for item: ProviderItem) -> String {@@ -1841,16 +1981,27 @@ extension AIEnhancementSettingsView {return nil}- func selectProvider(_ providerID: String) {- self.viewModel.selectProvider(providerID)- }-private func activateProvider(_ providerID: String) {self.viewModel.selectedProviderID = providerIDself.viewModel.handleProviderChange(providerID)self.viewModel.connectionStatus = self.viewModel.connectionStatus(for: providerID)}+ private func makePrimaryDefaultProvider(_ providerID: String, isPrivateAI: Bool) {+ if isPrivateAI {+ self.viewModel.setDictationPromptSelection(.privateAI, for: .primary)+ return+ }++ self.activateProvider(providerID)++ var defaultConfiguration = self.settings.dictationPromptConfiguration(for: .default)+ defaultConfiguration.providerID = ""+ defaultConfiguration.modelName = ""+ self.settings.setDictationPromptConfiguration(defaultConfiguration, for: .default)+ self.viewModel.setDictationPromptSelection(.default, for: .primary)+ }+private func modelBinding(for providerID: String) -> Binding<String> {Binding(get: {@@ -1867,7 +2018,7 @@ extension AIEnhancementSettingsView {let hasEnabledConfig = self.viewModel.isReasoningEnabled(for: providerID)return Button(action: {- self.activateProvider(providerID)+ self.viewModel.configureProvider(providerID)self.viewModel.openReasoningConfig()}) {Image(systemName: hasEnabledConfig ? "brain.fill" : "brain")@@ -1945,6 +2096,7 @@ extension AIEnhancementSettingsView {models: PrivateAIModelRegistry.modelIDs(),selectedModel: self.privateAIModelBinding,selectionEnabled: !isBusy,+ displayName: self.privateAIModelDisplayName,controlWidth: 260,controlHeight: AISettingsLayout.providerRowControlHeight)diff --git a/Sources/Fluid/UI/AISettingsView+AdvancedSettings.swift b/Sources/Fluid/UI/AISettingsView+AdvancedSettings.swiftindex afdd1c14..46d4b0d0 100644--- a/Sources/Fluid/UI/AISettingsView+AdvancedSettings.swift+++ b/Sources/Fluid/UI/AISettingsView+AdvancedSettings.swift@@ -10,6 +10,7 @@ import SwiftUIprivate struct PromptCardAssignments {let isDefault: Bool+ let isReady: Boollet shortcutDisplay: String?let modelPicker: PromptCardModelPicker?let onMakeDefault: () -> Void@@ -281,6 +282,16 @@ extension AIEnhancementSettingsView {isEnabled: Bool) -> some View {HStack(spacing: 6) {+ if !assignments.isReady {+ self.promptConfigChip(+ systemImage: "exclamationmark.triangle.fill",+ text: assignments.modelPicker?.providerName.isEmpty == false+ ? "Needs setup"+ : "No valid provider configured",+ tone: .orange+ )+ }+// Provider chipif let modelPicker = assignments.modelPicker, !modelPicker.providerName.isEmpty {self.promptConfigChip(@@ -420,6 +431,7 @@ extension AIEnhancementSettingsView {let configuration = self.settings.dictationPromptConfiguration(for: selection)return PromptCardAssignments(isDefault: self.viewModel.isDictationPromptSelection(selection, for: .primary),+ isReady: self.isPromptConfigurationReady(selection: selection, isPrivateAI: isPrivateAI),shortcutDisplay: configuration.shortcut?.displayString,modelPicker: self.promptModelPicker(selection: selection, isPrivateAI: isPrivateAI),onMakeDefault: {@@ -428,6 +440,28 @@ extension AIEnhancementSettingsView {)}+ private func isPromptConfigurationReady(+ selection: SettingsStore.DictationPromptSelection,+ isPrivateAI: Bool+ ) -> Bool {+ if isPrivateAI {+ return self.viewModel.isPrivateAIPromptAvailable()+ }++ let configuration = self.settings.dictationPromptConfiguration(for: selection)+ let configuredProviderID = configuration.providerID.trimmingCharacters(in: .whitespacesAndNewlines)+ let providerID = configuredProviderID.isEmpty+ ? self.defaultExternalPromptProviderID+ : configuredProviderID+ let configuredModel = configuration.modelName.trimmingCharacters(in: .whitespacesAndNewlines)+ let model = configuredModel.isEmpty ? self.viewModel.selectedModel(for: providerID) : configuredModel+ return !providerID.isEmpty && !model.isEmpty && self.viewModel.connectionStatus(for: providerID) == .success+ }++ private var defaultExternalPromptProviderID: String {+ DictationProviderRoute.externalFallbackProviderID(from: self.settings.selectedProviderID)+ }+private func promptEditorSelection(for mode: PromptEditorMode) -> SettingsStore.DictationPromptSelection? {switch mode {case let .defaultPrompt(promptMode):@@ -521,10 +555,35 @@ extension AIEnhancementSettingsView {NotificationCenter.default.post(name: .dictationPromptShortcutsChanged, object: nil)}+ private func hasDefaultPromptCustomization(for mode: SettingsStore.PromptMode) -> Bool {+ if self.viewModel.hasDefaultPromptOverride(for: mode) {+ return true+ }+ guard mode.normalized == .dictate else { return false }+ let configuration = self.settings.dictationPromptConfiguration(for: .default)+ return configuration.shortcut != nil ||+ !configuration.providerID.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ||+ !configuration.modelName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty+ }++ private func resetDefaultPrompt(for mode: SettingsStore.PromptMode) {+ self.viewModel.resetDefaultPromptOverride(for: mode)+ if mode.normalized == .dictate {+ self.settings.removeDictationPromptConfiguration(for: .default)+ self.promptEditorOriginalConfiguration = nil+ self.promptEditorShortcutDraft = nil+ self.promptEditorProviderIDDraft = ""+ self.promptEditorModelDraft = ""+ NotificationCenter.default.post(name: .dictationPromptShortcutsChanged, object: nil)+ }+ self.viewModel.openDefaultPromptViewer(for: mode)+ }+private func promptEditorAssignments(mode: PromptEditorMode) -> PromptCardAssignments? {if case .newPrompt = mode {return PromptCardAssignments(isDefault: false,+ isReady: self.isPromptEditorConfigurationReady(),shortcutDisplay: self.promptEditorShortcutDraft?.displayString,modelPicker: self.promptEditorModelPicker(),onMakeDefault: {@@ -537,6 +596,9 @@ extension AIEnhancementSettingsView {return PromptCardAssignments(isDefault: self.promptEditorPrimarySelectionDraft == selection,+ isReady: mode.isPrivateAI+ ? self.viewModel.isPrivateAIPromptAvailable()+ : self.isPromptEditorConfigurationReady(),shortcutDisplay: self.promptEditorShortcutDraft?.displayString,modelPicker: self.promptEditorModelPicker(),onMakeDefault: {@@ -545,6 +607,12 @@ extension AIEnhancementSettingsView {)}+ private func isPromptEditorConfigurationReady() -> Bool {+ let providerID = self.promptEditorProviderIDDraft.trimmingCharacters(in: .whitespacesAndNewlines)+ let model = self.promptEditorModelDraft.trimmingCharacters(in: .whitespacesAndNewlines)+ return !providerID.isEmpty && !model.isEmpty && self.viewModel.connectionStatus(for: providerID) == .success+ }+private func promptEditorModelPicker() -> PromptCardModelPicker? {let providerID = self.promptEditorProviderIDDraft.trimmingCharacters(in: .whitespacesAndNewlines)guard !providerID.isEmpty else {@@ -836,11 +904,10 @@ extension AIEnhancementSettingsView {)}- guard !self.viewModel.isPrivateAIModelSelected() else { return nil }let configuration = self.settings.dictationPromptConfiguration(for: selection)let configuredProviderID = configuration.providerID.trimmingCharacters(in: .whitespacesAndNewlines)let providerID = configuredProviderID.isEmpty- ? self.viewModel.selectedProviderID.trimmingCharacters(in: .whitespacesAndNewlines)+ ? self.defaultExternalPromptProviderID: configuredProviderIDguard !providerID.isEmpty else {return PromptCardModelPicker(@@ -940,110 +1007,83 @@ extension AIEnhancementSettingsView {private func promptModeSection(mode: SettingsStore.PromptMode) -> some View {let customProfiles = self.viewModel.dictationPromptProfiles.filter { $0.mode.normalized == mode }- let isPrivateAI = mode.normalized == .dictate && self.viewModel.isPrivateAIModelSelected()- let isSelectedAppsOnly = !isPrivateAI && self.viewModel.promptRoutingScope(for: mode) == .selectedAppsOnly+ let privateAIAvailable = mode.normalized == .dictate && self.viewModel.isPrivateAIPromptAvailable()+ let isSelectedAppsOnly = self.viewModel.promptRoutingScope(for: mode) == .selectedAppsOnlyVStack(alignment: .leading, spacing: 10) {VStack(alignment: .leading, spacing: 10) {- if isPrivateAI {+ self.promptRoutingScopeRow(mode: mode)++ if mode.normalized == .dictate {+ self.customPromptOnlyToggleRow+ }++ Text(+ isSelectedAppsOnly+ ? "Custom prompts only run in apps listed in App Overrides."+ : "Custom prompts run based on your shortcut or the app you're in."+ )+ .font(.caption2)+ .foregroundStyle(self.theme.palette.secondaryText)+ .padding(.horizontal, 4)+ .padding(.bottom, 2)++ if privateAIAvailable {let privateAISelection = SettingsStore.DictationPromptSelection.privateAIself.promptProfileCard(cardKey: "\(mode.normalized.rawValue)-\(PrivateAIProviderFeature.shared.providerID)",title: PrivateAIProviderFeature.displayName,subtitle: "",mode: mode,- isSelected: true,+ isSelected: self.viewModel.isPrivateAIPromptSelected(),assignments: self.promptAssignments(selection: privateAISelection, isPrivateAI: true),onManage: { self.viewModel.openPrivateAIPromptEditor() },isEnabled: true)+ }- self.privateAIOnlyNotice- } else {- self.promptRoutingScopeRow(mode: mode)-- if mode.normalized == .dictate {- self.customPromptOnlyToggleRow- }-- Text(- isSelectedAppsOnly- ? "Custom prompts only run in apps listed in App Overrides."- : "Custom prompts run based on your shortcut or the app you're in."+ Group {+ let defaultSelection = SettingsStore.DictationPromptSelection.default+ self.promptProfileCard(+ cardKey: "\(mode.normalized.rawValue)-default",+ title: mode.normalized == .dictate ? "Built-in Default" : "Default \(self.friendlyModeName(mode))",+ subtitle: "",+ mode: mode,+ isSelected: self.viewModel.selectedPromptID(for: mode) == nil,+ assignments: mode.normalized == .dictate+ ? self.promptAssignments(selection: defaultSelection)+ : nil,+ onManage: { self.viewModel.openDefaultPromptViewer(for: mode) },+ isEnabled: !isSelectedAppsOnly)- .font(.caption2)- .foregroundStyle(self.theme.palette.secondaryText)- .padding(.horizontal, 4)- .padding(.bottom, 2)-- Group {- let defaultSelection = SettingsStore.DictationPromptSelection.default- self.promptProfileCard(- cardKey: "\(mode.normalized.rawValue)-default",- title: mode.normalized == .dictate ? "Built-in Default" : "Default \(self.friendlyModeName(mode))",- subtitle: "",- mode: mode,- isSelected: mode.normalized == .dictate- ? (self.viewModel.selectedPromptID(for: mode) == nil)- : (self.viewModel.selectedPromptID(for: mode) == nil),- assignments: mode.normalized == .dictate- ? self.promptAssignments(selection: defaultSelection)- : nil,- onManage: { self.viewModel.openDefaultPromptViewer(for: mode) },- isEnabled: !isSelectedAppsOnly- )- if !customProfiles.isEmpty {- ForEach(customProfiles) { profile in- let profileSelection = SettingsStore.DictationPromptSelection.profile(profile.id)- self.promptProfileCard(- cardKey: "\(profile.mode.normalized.rawValue)-\(profile.id)",- title: profile.name.isEmpty ? "Untitled Prompt" : profile.name,- subtitle: "",- mode: profile.mode,- isSelected: self.viewModel.selectedPromptID(for: profile.mode) == profile.id,- assignments: profile.mode.normalized == .dictate- ? self.promptAssignments(selection: profileSelection)- : nil,- onManage: { self.viewModel.openEditor(for: profile) },- onDelete: { self.viewModel.requestDeletePrompt(profile) },- isEnabled: !isSelectedAppsOnly- )- }+ if !customProfiles.isEmpty {+ ForEach(customProfiles) { profile in+ let profileSelection = SettingsStore.DictationPromptSelection.profile(profile.id)+ self.promptProfileCard(+ cardKey: "\(profile.mode.normalized.rawValue)-\(profile.id)",+ title: profile.name.isEmpty ? "Untitled Prompt" : profile.name,+ subtitle: "",+ mode: profile.mode,+ isSelected: self.viewModel.selectedPromptID(for: profile.mode) == profile.id,+ assignments: profile.mode.normalized == .dictate+ ? self.promptAssignments(selection: profileSelection)+ : nil,+ onManage: { self.viewModel.openEditor(for: profile) },+ onDelete: { self.viewModel.requestDeletePrompt(profile) },+ isEnabled: !isSelectedAppsOnly+ )}}- .opacity(isSelectedAppsOnly ? 0.5 : 1)-- self.appPromptBindingsSection(mode: mode, isEmphasized: isSelectedAppsOnly, isEnabled: true)}+ .opacity(isSelectedAppsOnly ? 0.5 : 1)++ self.appPromptBindingsSection(mode: mode, isEmphasized: isSelectedAppsOnly, isEnabled: true)}}.padding(.top, 2)}- private var privateAIOnlyNotice: some View {- HStack(spacing: 10) {- Image(systemName: "lock.fill")- .font(.system(size: 12, weight: .semibold))- .foregroundStyle(.secondary)- Text("\(PrivateAIProviderFeature.displayName) uses its own built-in system prompt. Switch to another provider to create custom prompts.")- .font(.caption)- .foregroundStyle(.secondary)- .fixedSize(horizontal: false, vertical: true)- Spacer(minLength: 0)- }- .padding(.horizontal, 13)- .padding(.vertical, 10)- .background(- RoundedRectangle(cornerRadius: 10, style: .continuous)- .fill(self.theme.palette.cardBackground)- .overlay(- RoundedRectangle(cornerRadius: 10, style: .continuous)- .stroke(self.theme.palette.cardBorder, lineWidth: 1)- )- )- }-private func promptModeHintRow(mode: SettingsStore.PromptMode) -> some View {HStack {if mode.normalized == .dictate {@@ -1086,7 +1126,7 @@ extension AIEnhancementSettingsView {if mode.normalized == .edit {self.editModeInlineModelControls- } else if !self.viewModel.isPrivateAIModelSelected() {+ } else {Button {self.viewModel.openNewPromptEditor(prefillMode: .dictate)} label: {@@ -1189,7 +1229,7 @@ extension AIEnhancementSettingsView {}} else {let providerID = self.activeEditModeProviderID- let models = self.viewModel.models(for: providerID)+ let models = self.editModeModels(for: providerID)Group {Toggle("Sync", isOn: self.editModeLinkedToGlobalBinding).toggleStyle(.checkbox)@@ -1225,7 +1265,10 @@ extension AIEnhancementSettingsView {SearchableModelPicker(models: models,selectedModel: self.editModeModelBinding(for: providerID),- onRefresh: { await self.viewModel.fetchModels(for: providerID) },+ onRefresh: {+ guard !self.isPrivateAIProviderID(providerID) else { return }+ await self.viewModel.fetchModels(for: providerID)+ },isRefreshing: self.viewModel.refreshingProviderID == providerID,refreshEnabled: !self.settings.rewriteModeLinkedToGlobal && self.canFetchModels(for: providerID),selectionEnabled: !self.settings.rewriteModeLinkedToGlobal && !models.isEmpty,@@ -1450,7 +1493,7 @@ extension AIEnhancementSettingsView {private var activeEditModeProviderID: String {if self.settings.rewriteModeLinkedToGlobal {- return self.viewModel.selectedProviderID+ return self.settings.selectedProviderID}return self.editModeSelectedProviderID}@@ -1468,7 +1511,7 @@ extension AIEnhancementSettingsView {set: { newProviderID inguard !self.settings.rewriteModeLinkedToGlobal else { return }self.settings.rewriteModeSelectedProviderID = newProviderID- let models = self.viewModel.models(for: newProviderID)+ let models = self.editModeModels(for: newProviderID)let current = self.settings.rewriteModeSelectedModel ?? ""if !models.contains(current) {self.settings.rewriteModeSelectedModel = models.first@@ -1480,14 +1523,17 @@ extension AIEnhancementSettingsView {private func editModeModelBinding(for providerID: String) -> Binding<String> {Binding(get: {+ let models = self.editModeModels(for: providerID)if self.settings.rewriteModeLinkedToGlobal {let key = self.viewModel.providerKey(for: providerID)- return self.settings.selectedModelByProvider[key]+ let preferred = self.settings.selectedModelByProvider[key]?? self.settings.selectedModel- ?? self.viewModel.models(for: providerID).first- ?? ""+ return ModelRepository.eligibleModel(preferred: preferred, from: models) ?? ""}- return self.settings.rewriteModeSelectedModel ?? self.viewModel.models(for: providerID).first ?? ""+ return ModelRepository.eligibleModel(+ preferred: self.settings.rewriteModeSelectedModel,+ from: models+ ) ?? ""},set: { newModel inguard !self.settings.rewriteModeLinkedToGlobal else { return }@@ -1504,7 +1550,7 @@ extension AIEnhancementSettingsView {}let providerID = self.settings.rewriteModeSelectedProviderID- let models = self.viewModel.models(for: providerID)+ let models = self.editModeModels(for: providerID)let currentModel = self.settings.rewriteModeSelectedModel ?? ""if !models.contains(currentModel) {self.settings.rewriteModeSelectedModel = models.first@@ -1512,7 +1558,7 @@ extension AIEnhancementSettingsView {}private func syncEditModeToGlobalSelection() {- let global = self.viewModel.selectedProviderID+ let global = self.settings.selectedProviderIDguard !global.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {self.settings.rewriteModeSelectedProviderID = ""self.settings.rewriteModeSelectedModel = nil@@ -1521,6 +1567,11 @@ extension AIEnhancementSettingsView {self.settings.rewriteModeSelectedProviderID = global+ if self.isPrivateAIProviderID(global) {+ self.settings.rewriteModeSelectedModel = self.editModeModels(for: global).first+ return+ }+let key = self.viewModel.providerKey(for: global)let model = self.settings.selectedModelByProvider[key]?? self.settings.selectedModel@@ -1528,6 +1579,19 @@ extension AIEnhancementSettingsView {self.settings.rewriteModeSelectedModel = model}+ private func editModeModels(for providerID: String) -> [String] {+ if self.isPrivateAIProviderID(providerID) {+ return ModelRepository.shared.defaultModels(for: providerID, task: .edit)+ }+ return self.viewModel.models(for: providerID)+ }++ private func isPrivateAIProviderID(_ providerID: String) -> Bool {+ PrivateFeatures.privateAIProvider &&+ providerID.trimmingCharacters(in: .whitespacesAndNewlines)+ == PrivateAIProviderFeature.shared.providerID+ }+private func ensureDefaultEditModeSyncState() {// If no persisted value exists yet, default Sync to ON.if UserDefaults.standard.object(forKey: "RewriteModeLinkedToGlobal") == nil {@@ -1706,14 +1770,21 @@ extension AIEnhancementSettingsView {}let hotkeyDisplay = self.settings.primaryDictationShortcutDisplayString- let canTest = self.viewModel.isAIPostProcessingConfiguredForDictation()+ let canTest = DictationAIPostProcessingGate.isProviderConfigured(+ providerID: self.promptEditorProviderIDDraft,+ model: self.promptEditorModelDraft+ )Toggle(isOn: Binding(get: { self.promptTest.isActive },set: { enabled inif enabled {let combined = self.viewModel.combinedDraftPrompt(self.viewModel.draftPromptText, mode: self.viewModel.draftPromptMode)- self.promptTest.activate(draftPromptText: combined)+ self.promptTest.activate(+ draftPromptText: combined,+ providerID: self.promptEditorProviderIDDraft,+ model: self.promptEditorModelDraft+ )} else {self.promptTest.deactivate()}@@ -1819,15 +1890,14 @@ extension AIEnhancementSettingsView {HStack(spacing: 10) {if mode.isDefault,let promptMode = mode.mode,- self.viewModel.hasDefaultPromptOverride(for: promptMode)+ self.hasDefaultPromptCustomization(for: promptMode){- Button("Reset to Built-in") {- self.viewModel.resetDefaultPromptOverride(for: promptMode)- self.viewModel.openDefaultPromptViewer(for: promptMode)- self.preparePromptEditorConfigurationDraft(mode: .defaultPrompt(mode: promptMode))+ Button("Reset Default") {+ self.resetDefaultPrompt(for: promptMode)}.fluidButton(.compact, size: .compact).frame(minWidth: AISettingsLayout.primaryActionMinWidth, minHeight: AISettingsLayout.controlHeight)+ .help("Clear the custom prompt, provider, model, and shortcut")}Spacer(minLength: 0)@@ -1859,6 +1929,12 @@ extension AIEnhancementSettingsView {.onChange(of: self.viewModel.promptEditorSessionID) { _, _ inself.preparePromptEditorConfigurationDraft(mode: mode)}+ .onChange(of: self.promptEditorProviderIDDraft) { _, providerID in+ self.promptTest.updateDraftConfiguration(providerID: providerID, model: self.promptEditorModelDraft)+ }+ .onChange(of: self.promptEditorModelDraft) { _, model in+ self.promptTest.updateDraftConfiguration(providerID: self.promptEditorProviderIDDraft, model: model)+ }.onChange(of: self.activeShortcutRecordingTarget) { oldValue, newValue inif case .newPrompt = mode {if newValue == nil, oldValue != nil {diff --git a/Sources/Fluid/UI/AppNavigationState.swift b/Sources/Fluid/UI/AppNavigationState.swiftindex fd22fabe..68f2acd7 100644--- a/Sources/Fluid/UI/AppNavigationState.swift+++ b/Sources/Fluid/UI/AppNavigationState.swift@@ -29,6 +29,7 @@ enum SettingsSection: String, CaseIterable, Identifiable, Hashable {case audiocase overlaycase dataAndDiagnostics+ case experimentalvar id: Self {self@@ -42,6 +43,7 @@ enum SettingsSection: String, CaseIterable, Identifiable, Hashable {case .audio: return "Audio"case .overlay: return "Overlay"case .dataAndDiagnostics: return "Data & Diagnostics"+ case .experimental: return "Experimental"}}@@ -53,6 +55,7 @@ enum SettingsSection: String, CaseIterable, Identifiable, Hashable {case .audio: return "speaker.wave.2"case .overlay: return "rectangle.on.rectangle"case .dataAndDiagnostics: return "wrench.and.screwdriver"+ case .experimental: return "flask"}}}diff --git a/Sources/Fluid/UI/CustomDictionaryView.swift b/Sources/Fluid/UI/CustomDictionaryView.swiftindex d151292b..434c62f4 100644--- a/Sources/Fluid/UI/CustomDictionaryView.swift+++ b/Sources/Fluid/UI/CustomDictionaryView.swift@@ -23,7 +23,6 @@ struct CustomDictionaryView: View {@State private var boostStatusMessage = "Add custom words for better Parakeet recognition."@State private var boostHasError = false- @State private var automaticDictionaryLearningEnabled = SettingsStore.shared.automaticDictionaryLearningEnabled@State private var vocabBoostingEnabled: Bool = SettingsStore.shared.vocabularyBoostingEnabled@State private var isCustomWordsPresented = false@State private var isBoostWordEditorPresented = false@@ -303,7 +302,6 @@ struct CustomDictionaryView: View {.onAppear {self.entries = SettingsStore.shared.customDictionaryEntriesself.loadBoostTerms()- self.automaticDictionaryLearningEnabled = SettingsStore.shared.automaticDictionaryLearningEnabledself.pronunciationMatchingEnabled = SettingsStore.shared.pronunciationMatchingEnabledif !SettingsStore.shared.selectedSpeechModel.supportsPronunciationMatching {self.pronunciationMatchingEnabled = false@@ -342,8 +340,6 @@ struct CustomDictionaryView: View {Spacer(minLength: self.theme.metrics.spacing.md)HStack(spacing: self.theme.metrics.spacing.sm) {- self.automaticLearningToggle-Button(action: self.importDictionary) {Label("Import", systemImage: "square.and.arrow.down")}@@ -357,49 +353,6 @@ struct CustomDictionaryView: View {}}- private var automaticLearningToggle: some View {- HStack(spacing: self.theme.metrics.spacing.sm) {- VStack(alignment: .leading, spacing: 1) {- Text("Auto-learn words")- .font(self.theme.typography.captionStrong)- .foregroundStyle(self.theme.palette.primaryText)- .lineLimit(1)-- Text("Show notifications")- .font(self.theme.typography.captionSmall)- .foregroundStyle(self.theme.palette.secondaryText)- .lineLimit(1)- }-- Toggle("Auto-learn words while typing", isOn: self.$automaticDictionaryLearningEnabled)- .labelsHidden()- .toggleStyle(.switch)- .tint(self.theme.palette.accent)- }- .padding(.horizontal, 10)- .frame(height: 40)- .background(- RoundedRectangle(cornerRadius: self.theme.metrics.corners.md, style: .continuous)- .fill(self.theme.palette.contentBackground.opacity(0.72))- .overlay(- RoundedRectangle(cornerRadius: self.theme.metrics.corners.md, style: .continuous)- .stroke(- self.automaticDictionaryLearningEnabled- ? self.theme.palette.accent.opacity(0.42)- : self.theme.palette.cardBorder.opacity(0.3),- lineWidth: 1- )- )- )- .onChange(of: self.automaticDictionaryLearningEnabled) { _, newValue in- SettingsStore.shared.automaticDictionaryLearningEnabled = newValue- if !newValue {- AutomaticDictionaryCorrectionTracker.shared.cancel()- }- }- .help("Notice corrections to recent dictation and show Train by Voice suggestions.")- }-private func settingsIconTile(systemName: String) -> some View {ZStack {RoundedRectangle(cornerRadius: self.theme.metrics.corners.md, style: .continuous)@@ -2958,8 +2911,11 @@ enum CustomDictionaryTrainingMerge {result.reserveCapacity(values.count)for value in values {- guard let trigger = self.normalizedTrigger(value),- trigger.caseInsensitiveCompare(replacement) != .orderedSame,+ let visibleTrigger = value.trimmingCharacters(+ in: CharacterSet.whitespacesAndNewlines.union(self.edgePunctuation)+ )+ guard visibleTrigger != replacement,+ let trigger = self.normalizedTrigger(value),!seen.contains(trigger)else {continue@@ -2987,14 +2943,13 @@ enum CustomDictionaryTrainingMerge {$0.replacement.caseInsensitiveCompare(replacementText) == .orderedSame}let replacementID = matchingIndex.map { entries[$0].id }- let storedReplacementText = matchingIndex.map { entries[$0].replacement } ?? replacementTextlet matchingEntries = entries.filter {- $0.replacement.caseInsensitiveCompare(storedReplacementText) == .orderedSame+ $0.replacement.caseInsensitiveCompare(replacementText) == .orderedSame}let existingTriggers = matchingEntries.flatMap(\.triggers)let combinedTriggers = self.normalizedTriggers(from: existingTriggers + incomingTriggers,- intendedReplacement: storedReplacementText+ intendedReplacement: replacementText)let triggerKeys = Set(combinedTriggers)@@ -3002,11 +2957,11 @@ enum CustomDictionaryTrainingMerge {SettingsStore.CustomDictionaryEntry(id: $0,triggers: combinedTriggers,- replacement: storedReplacementText+ replacement: replacementText)} ?? SettingsStore.CustomDictionaryEntry(triggers: combinedTriggers,- replacement: storedReplacementText+ replacement: replacementText)var didInsertMergedEntry = false@@ -3014,7 +2969,7 @@ enum CustomDictionaryTrainingMerge {updatedEntries.reserveCapacity(entries.count + (matchingIndex == nil ? 1 : 0))for entry in entries {- if entry.replacement.caseInsensitiveCompare(storedReplacementText) == .orderedSame {+ if entry.replacement.caseInsensitiveCompare(replacementText) == .orderedSame {if !didInsertMergedEntry {updatedEntries.append(mergedEntry)didInsertMergedEntry = truediff --git a/Sources/Fluid/UI/SearchableModelPicker.swift b/Sources/Fluid/UI/SearchableModelPicker.swiftindex c8fe8312..f2c75aca 100644--- a/Sources/Fluid/UI/SearchableModelPicker.swift+++ b/Sources/Fluid/UI/SearchableModelPicker.swift@@ -16,6 +16,7 @@ struct SearchableModelPicker: View {var isRefreshing: Bool = falsevar refreshEnabled: Bool = truevar selectionEnabled: Bool = true+ let displayName: (String) -> Stringlet controlWidth: CGFloatlet controlHeight: CGFloat?@@ -26,6 +27,7 @@ struct SearchableModelPicker: View {isRefreshing: Bool = false,refreshEnabled: Bool = true,selectionEnabled: Bool = true,+ displayName: @escaping (String) -> String = { $0 },controlWidth: CGFloat = 180,controlHeight: CGFloat? = nil) {@@ -35,6 +37,7 @@ struct SearchableModelPicker: View {self.isRefreshing = isRefreshingself.refreshEnabled = refreshEnabledself.selectionEnabled = selectionEnabled+ self.displayName = displayNameself.controlWidth = controlWidthself.controlHeight = controlHeight}@@ -57,7 +60,10 @@ struct SearchableModelPicker: View {if self.searchText.isEmpty {return self.models}- return self.models.filter { $0.localizedCaseInsensitiveContains(self.searchText) }+ return self.models.filter {+ $0.localizedCaseInsensitiveContains(self.searchText) ||+ self.displayName($0).localizedCaseInsensitiveContains(self.searchText)+ }}var body: some View {@@ -65,7 +71,7 @@ struct SearchableModelPicker: View {// Model button that opens popoverButton(action: { self.isShowingPopover.toggle() }) {HStack(spacing: 6) {- Text(self.selectedModel.isEmpty ? "Select Model" : self.selectedModel)+ Text(self.selectedModel.isEmpty ? "Select Model" : self.displayName(self.selectedModel)).font(.system(size: 12, weight: .semibold)).lineLimit(1).truncationMode(.middle)@@ -128,7 +134,7 @@ struct SearchableModelPicker: View {self.isShowingPopover = false}) {HStack {- Text(model)+ Text(self.displayName(model)).lineLimit(1)Spacer()if model == self.selectedModel {diff --git a/Sources/Fluid/UI/SettingsSearch.swift b/Sources/Fluid/UI/SettingsSearch.swiftindex cdfd3f8a..83767ca7 100644--- a/Sources/Fluid/UI/SettingsSearch.swift+++ b/Sources/Fluid/UI/SettingsSearch.swift@@ -36,6 +36,7 @@ enum SettingsSearchTarget: Hashable {case usageStreakcase skipSilentRecordingscase pauseMedia+ case dictionarySuggestionscase accessibilityPermissioncase textFormatting@@ -59,7 +60,9 @@ enum SettingsSearchTarget: Hashable {case backupAndRestorecase audioStoragecase debugLogs+ case experimentalcase fasterLongDictation+ case historyPerformancevar section: SettingsSection {switch self {@@ -91,6 +94,7 @@ enum SettingsSearchTarget: Hashable {.usageStreak,.skipSilentRecordings,.pauseMedia,+ .dictionarySuggestions,.accessibilityPermission,.textFormatting:return .dictation@@ -110,8 +114,11 @@ enum SettingsSearchTarget: Hashable {.bottomOffset:return .overlay- case .dataAndDiagnostics, .backupAndRestore, .debugLogs, .fasterLongDictation:+ case .dataAndDiagnostics, .backupAndRestore, .debugLogs:return .dataAndDiagnostics++ case .experimental, .fasterLongDictation, .historyPerformance:+ return .experimental}}}@@ -125,6 +132,7 @@ extension SettingsSection {case .audio: return .audiocase .overlay: return .overlaycase .dataAndDiagnostics: return .dataAndDiagnostics+ case .experimental: return .experimental}}}@@ -255,6 +263,11 @@ enum SettingsSearchIndex {title: "Pause Media During Transcription",terms: ["resume music audio video playback recording"]),+ .init(+ target: .dictionarySuggestions,+ title: "Auto-Learn Corrections",+ terms: ["automatic corrections learn words custom dictionary frequency ignore"]+ ),.init(target: .accessibilityPermission,title: "Accessibility Permission",@@ -346,6 +359,16 @@ enum SettingsSearchIndex {title: "Faster Long Dictation",terms: ["experimental Parakeet reuse live windows remaining tail transcription"]),+ .init(+ target: .experimental,+ title: "Experimental",+ terms: ["preview early access optional features"]+ ),+ .init(+ target: .historyPerformance,+ title: "Show Performance in History",+ terms: ["timing speed tokens per second ASR cleanup Fluid Intelligence"]+ ),]static func results(for query: String) -> [SettingsSearchResult] {diff --git a/Sources/Fluid/UI/SettingsView.swift b/Sources/Fluid/UI/SettingsView.swiftindex bf6eead2..53d6d2c0 100644--- a/Sources/Fluid/UI/SettingsView.swift+++ b/Sources/Fluid/UI/SettingsView.swift@@ -159,13 +159,11 @@ struct SettingsView: View {case "__OFF__":self.settings.setDictationPromptSelection(.off, for: slot)case "__DEFAULT__":- guard !PrivateAIProviderPromptFormat.isAvailable(settings: self.settings) else { return }self.settings.setDictationPromptSelection(.default, for: slot)case PrivateAIProviderPromptFormat.promptSelectionID:guard PrivateAIProviderPromptFormat.isAvailable(settings: self.settings) else { return }self.settings.setDictationPromptSelection(.privateAI, for: slot)default:- guard !PrivateAIProviderPromptFormat.isAvailable(settings: self.settings) else { return }self.settings.setDictationPromptSelection(.profile(newValue), for: slot)}}@@ -175,7 +173,7 @@ struct SettingsView: View {@ViewBuilderprivate func dictationPromptPicker(for slot: SettingsStore.DictationShortcutSlot) -> some View {let profiles = self.settings.promptProfiles(for: .dictate)- let privateAILocked = PrivateAIProviderPromptFormat.isAvailable(settings: self.settings)+ let privateAIAvailable = PrivateAIProviderPromptFormat.isAvailable(settings: self.settings)HStack {Text("AI Prompt").font(self.theme.typography.bodySmall)@@ -188,15 +186,14 @@ struct SettingsView: View {if PrivateFeatures.privateAIProvider {Text("Cleanup — Fluid-1").tag(PrivateAIProviderPromptFormat.promptSelectionID)- .disabled(!privateAILocked)+ .disabled(!privateAIAvailable)}}Section("EXTERNAL") {- Text("Cleanup").tag("__DEFAULT__").disabled(privateAILocked)+ Text("Cleanup").tag("__DEFAULT__")ForEach(profiles) { profile inText(profile.name.isEmpty ? "Untitled" : profile.name).tag(profile.id)- .disabled(privateAILocked)}}}@@ -962,6 +959,10 @@ struct SettingsView: View {.settingsSearchTarget(.pauseMedia)Divider().opacity(0.2)+ DictionarySuggestionsSettingsRow()+ .settingsSearchTarget(.dictionarySuggestions)+ Divider().opacity(0.2)+self.optionToggleRow(title: "Share Detailed Anonymous Analytics",description: "Share anonymous daily feature, onboarding, and model metrics. " +@@ -1110,10 +1111,6 @@ struct SettingsView: View {// Notification Settings CardThemedCard(style: .standard) {VStack(alignment: .leading, spacing: 14) {- Label("Notifications", systemImage: "bell.fill")- .font(.headline)- .foregroundStyle(.primary)-VStack(alignment: .leading, spacing: 12) {self.optionToggleRow(title: "AI Enhancement Failures",@@ -1256,10 +1253,6 @@ struct SettingsView: View {// Overlay Settings CardThemedCard(style: .standard) {VStack(alignment: .leading, spacing: 14) {- Label("Overlay", systemImage: "rectangle.on.rectangle")- .font(.headline)- .foregroundStyle(.primary)-VStack(alignment: .leading, spacing: 12) {HStack {VStack(alignment: .leading, spacing: 2) {@@ -1530,12 +1523,6 @@ struct SettingsView: View {ThemedCard(style: .standard) {VStack(alignment: .leading, spacing: 14) {- HStack(spacing: 8) {- Label("Experimental", systemImage: "flask.fill")- .font(.headline)- .foregroundStyle(.primary)- }-self.settingsToggleRow(title: "Faster Long Dictation",description: "For long recordings, reuse completed live windows and process only the remaining tail when you stop.",@@ -1545,11 +1532,23 @@ struct SettingsView: View {set: { SettingsStore.shared.experimentalParakeetUnifiedFinalEnabled = $0 }))++ Divider().padding(.vertical, 4)++ self.settingsToggleRow(+ title: "Show Performance in History",+ description: "Display transcription time, cleanup time, and Fluid Intelligence speed.",+ isOn: Binding(+ get: { SettingsStore.shared.showHistoryPerformanceMetrics },+ set: { SettingsStore.shared.showHistoryPerformanceMetrics = $0 }+ )+ )+ .settingsSearchTarget(.historyPerformance)}.padding(16)}.settingsSearchTarget(.fasterLongDictation)- .shownInSettingsSection(.dataAndDiagnostics, selectedSection: self.selectedSection)+ .shownInSettingsSection(.experimental, selectedSection: self.selectedSection)}.padding(16).environment(\.settingsSearchPresentation, self.settingsSearchPresentation)@@ -2593,7 +2592,7 @@ private extension SettingsView {await self.prepareAudioSettings()case .dictation:await self.refreshAudioHistoryUsageInBackground()- case .notifications, .overlay, .dataAndDiagnostics:+ case .notifications, .overlay, .dataAndDiagnostics, .experimental:break}}@@ -2930,6 +2929,48 @@ private extension SettingsView {}}+private struct DictionarySuggestionsSettingsRow: View {+ @Environment(\.theme) private var theme+ @ObservedObject private var settings = SettingsStore.shared++ var body: some View {+ HStack(alignment: .center, spacing: 12) {+ VStack(alignment: .leading, spacing: 2) {+ Text("Auto-Learn Corrections")+ .font(self.theme.typography.bodyStrong)+ .foregroundStyle(self.theme.palette.primaryText)+ Text("Suggest saving words after you correct dictated text.")+ .font(self.theme.typography.bodySmall)+ .foregroundStyle(self.theme.palette.secondaryText)+ .fixedSize(horizontal: false, vertical: true)+ }+ .frame(maxWidth: .infinity, alignment: .leading)++ Picker("Suggest after", selection: self.$settings.automaticDictionarySuggestionFrequency) {+ ForEach(SettingsStore.AutomaticDictionarySuggestionFrequency.allCases) { frequency in+ Text(frequency.displayName).tag(frequency)+ }+ }+ .labelsHidden()+ .frame(width: 138)+ .disabled(!self.settings.automaticDictionaryLearningEnabled)++ Toggle("", isOn: Binding(+ get: { self.settings.automaticDictionaryLearningEnabled },+ set: { enabled in+ self.settings.automaticDictionaryLearningEnabled = enabled+ if !enabled {+ AutomaticDictionaryCorrectionTracker.shared.cancel()+ }+ }+ ))+ .toggleStyle(.switch)+ .tint(self.theme.palette.accent)+ .labelsHidden()+ }+ }+}+// MARK: - Analytics modal confirmationstruct AnalyticsConfirmationView: View {diff --git a/Sources/Fluid/UI/TranscriptionHistoryView.swift b/Sources/Fluid/UI/TranscriptionHistoryView.swiftindex b4aab1fa..b3589aca 100644--- a/Sources/Fluid/UI/TranscriptionHistoryView.swift+++ b/Sources/Fluid/UI/TranscriptionHistoryView.swift@@ -4,6 +4,7 @@ import UniformTypeIdentifiersstruct TranscriptionHistoryView: View {@ObservedObject private var historyStore = TranscriptionHistoryStore.shared+ @ObservedObject private var settings = SettingsStore.shared@Environment(\.theme) private var theme@State private var searchQuery: String = ""@@ -147,16 +148,38 @@ struct TranscriptionHistoryView: View {.foregroundStyle(isSelected ? .white : .secondary).lineLimit(1)- if entry.wasAIProcessed {- Text("AI")- .font(.system(size: 9, weight: .bold))- .foregroundStyle(isSelected ? .white.opacity(0.8) : self.theme.palette.accent)- .padding(.horizontal, 4)- .padding(.vertical, 1)- .background(- RoundedRectangle(cornerRadius: 3)- .fill(isSelected ? .white.opacity(0.2) : self.theme.palette.accent.opacity(0.15))- )+ if self.settings.showHistoryPerformanceMetrics,+ let duration = entry.transcriptionDurationMilliseconds+ {+ self.processingBadge(+ text: "ASR \(TranscriptionHistoryEntry.formattedDuration(milliseconds: duration))",+ isSelected: isSelected,+ isAccent: false+ )+ }++ if self.settings.showHistoryPerformanceMetrics,+ entry.wasAIProcessed || entry.aiProcessingError != nil+ {+ self.processingBadge(+ text: entry.aiProcessingDurationMilliseconds.map {+ "AI \(TranscriptionHistoryEntry.formattedDuration(milliseconds: $0))"+ } ?? "AI",+ isSelected: isSelected,+ isAccent: true+ )+ } else if entry.wasAIProcessed {+ self.processingBadge(text: "AI", isSelected: isSelected, isAccent: true)+ }++ if self.settings.showHistoryPerformanceMetrics,+ let tokensPerSecond = entry.aiTokensPerSecond+ {+ self.processingBadge(+ text: TranscriptionHistoryEntry.formattedTokensPerSecond(tokensPerSecond, compact: true),+ isSelected: isSelected,+ isAccent: true+ )}if self.hasAudio(entry) {@@ -529,6 +552,33 @@ struct TranscriptionHistoryView: View {self.metadataItem(icon: "macwindow", label: "Window", value: entry.windowTitle.isEmpty ? "Unknown" : entry.windowTitle)self.metadataItem(icon: "character.cursor.ibeam", label: "Characters", value: "\(entry.characterCount)")self.metadataItem(icon: "sparkles", label: "AI Processed", value: entry.wasAIProcessed ? "Yes" : "No")+ if self.settings.showHistoryPerformanceMetrics,+ let duration = entry.transcriptionDurationMilliseconds+ {+ self.metadataItem(+ icon: "waveform",+ label: "Transcription Time",+ value: TranscriptionHistoryEntry.formattedDuration(milliseconds: duration)+ )+ }+ if self.settings.showHistoryPerformanceMetrics,+ let duration = entry.aiProcessingDurationMilliseconds+ {+ self.metadataItem(+ icon: "sparkles",+ label: "Cleanup Time",+ value: TranscriptionHistoryEntry.formattedDuration(milliseconds: duration)+ )+ }+ if self.settings.showHistoryPerformanceMetrics,+ let tokensPerSecond = entry.aiTokensPerSecond+ {+ self.metadataItem(+ icon: "speedometer",+ label: "AI Speed",+ value: TranscriptionHistoryEntry.formattedTokensPerSecond(tokensPerSecond)+ )+ }self.metadataItem(icon: "waveform", label: "Audio", value: self.audioMetadataText(for: entry))}}@@ -559,6 +609,28 @@ struct TranscriptionHistoryView: View {.fill(self.theme.palette.cardBackground.opacity(0.9)))}+ private func processingBadge(+ text: String,+ isSelected: Bool,+ isAccent: Bool+ ) -> some View {+ Text(text)+ .font(.system(size: 9, weight: .bold))+ .foregroundStyle(+ isSelected ? .white.opacity(0.8) : (isAccent ? self.theme.palette.accent : Color.secondary)+ )+ .padding(.horizontal, 4)+ .padding(.vertical, 1)+ .background(+ RoundedRectangle(cornerRadius: 3)+ .fill(+ isSelected+ ? .white.opacity(0.2)+ : (isAccent ? self.theme.palette.accent.opacity(0.15) : Color.secondary.opacity(0.12))+ )+ )+ }+private func copyToClipboard(_ text: String) {NSPasteboard.general.clearContents()NSPasteboard.general.setString(text, forType: .string)diff --git a/Sources/Fluid/Views/AutomaticDictionaryCorrectionOverlay.swift b/Sources/Fluid/Views/AutomaticDictionaryCorrectionOverlay.swiftindex a9576e10..3a8ddcb3 100644--- a/Sources/Fluid/Views/AutomaticDictionaryCorrectionOverlay.swift+++ b/Sources/Fluid/Views/AutomaticDictionaryCorrectionOverlay.swift@@ -7,7 +7,7 @@ import SwiftUIfinal class DictionaryCorrectionOverlayController {static let shared = DictionaryCorrectionOverlayController()- private static let displayDurationNanoseconds: UInt64 = 5_000_000_000+ private static let displayDurationNanoseconds: UInt64 = 10_000_000_000private static let successDurationNanoseconds: UInt64 = 1_400_000_000private static let presentationDuration: TimeInterval = 0.05private static let dismissalDuration: TimeInterval = 0.05@@ -36,7 +36,6 @@ final class DictionaryCorrectionOverlayController {onOutcome: @escaping (AutomaticDictionarySuggestionOutcome) -> Void) {self.generation &+= 1- let currentGeneration = self.generationself.dismissTask?.cancel()self.session?.cancel()self.outcomeHandler = onOutcome@@ -59,6 +58,18 @@ final class DictionaryCorrectionOverlayController {displayDuration: Double(Self.displayDurationNanoseconds) / 1_000_000_000,onDismiss: { [weak self] inself?.dismiss()+ },+ onIgnore: { [weak self] in+ self?.reportOutcome(.ignored)+ self?.hide()+ },+ onFrequencyChange: { [weak self] frequency in+ SettingsStore.shared.automaticDictionarySuggestionFrequency = frequency+ self?.scheduleChoiceDismissal()+ },+ onDisableSuggestions: { [weak self] in+ SettingsStore.shared.automaticDictionaryLearningEnabled = false+ self?.hide()})@@ -86,6 +97,12 @@ final class DictionaryCorrectionOverlayController {panel.animator().alphaValue = 1}+ self.scheduleChoiceDismissal()+ }++ private func scheduleChoiceDismissal() {+ self.keepVisible()+ let currentGeneration = self.generationself.dismissTask = Task { @MainActor [weak self] intry? await Task.sleep(nanoseconds: Self.displayDurationNanoseconds)guard !Task.isCancelled,@@ -603,6 +620,9 @@ private struct AutomaticDictionaryCorrectionOverlayView: View {let displayDuration: TimeIntervallet onDismiss: () -> Void+ let onIgnore: () -> Void+ let onFrequencyChange: (SettingsStore.AutomaticDictionarySuggestionFrequency) -> Void+ let onDisableSuggestions: () -> Void@Environment(\.accessibilityReduceMotion) private var reduceMotion@State private var isDismissHovered = false@@ -672,11 +692,48 @@ private struct AutomaticDictionaryCorrectionOverlayView: View {accent: self.accent,action: self.session.addOnlyCorrection)++ self.moreOptionsMenu}}.transition(.opacity)}+ private var moreOptionsMenu: some View {+ Menu {+ Button("Ignore This Correction", systemImage: "eye.slash", action: self.onIgnore)++ Menu("Suggest After") {+ ForEach(SettingsStore.AutomaticDictionarySuggestionFrequency.allCases) { frequency in+ Button {+ self.onFrequencyChange(frequency)+ self.startProgressAnimation()+ } label: {+ if self.settings.automaticDictionarySuggestionFrequency == frequency {+ Label(frequency.displayName, systemImage: "checkmark")+ } else {+ Text(frequency.displayName)+ }+ }+ }+ }++ Divider()++ Button("Turn Off Auto-Learn", role: .destructive, action: self.onDisableSuggestions)+ } label: {+ Image(systemName: "ellipsis")+ .font(.system(size: 12, weight: .semibold))+ .foregroundStyle(.white.opacity(0.72))+ .frame(width: 36, height: 36)+ .background(self.panelSurface)+ }+ .menuStyle(.borderlessButton)+ .menuIndicator(.hidden)+ .fixedSize()+ .help("More correction options")+ }+private var trainingContent: some View {VStack(alignment: .leading, spacing: 10) {self.header(title: "Train by Voice", allowsBack: true)diff --git a/Sources/Fluid/Views/BottomOverlayView.swift b/Sources/Fluid/Views/BottomOverlayView.swiftindex 42294c83..ebbaa059 100644--- a/Sources/Fluid/Views/BottomOverlayView.swift+++ b/Sources/Fluid/Views/BottomOverlayView.swift@@ -1445,10 +1445,6 @@ private struct BottomOverlayPromptMenuView: View {let onDismissRequested: () -> Void@State private var hoveredRowID: String?- private var privateAILocked: Bool {- self.promptMode.normalized == .dictate && PrivateAIProviderPromptFormat.isAvailable(settings: self.settings)- }-private func rowBackground(isSelected: Bool, rowID: String) -> some View {let isHovered = self.hoveredRowID == rowIDlet fillColor: Color@@ -1562,13 +1558,12 @@ private struct BottomOverlayPromptMenuView: View {@ViewBuilderprivate func defaultRow(selectedID: String?) -> some View {let activeSlot = self.contentState.activeDictationShortcutSlot ?? .primary- let isSelected = !self.privateAILocked && (+ let isSelected = (self.promptMode.normalized == .dictate? (self.settings.dictationPromptSelection(for: activeSlot) == .default): (selectedID == nil))Button(action: {- guard !self.privateAILocked else { return }if self.promptMode.normalized == .dictate {self.contentState.onDictationPromptSelectionRequested?(.default)} else {@@ -1591,10 +1586,8 @@ private struct BottomOverlayPromptMenuView: View {.background(self.rowBackground(isSelected: isSelected, rowID: "default"))}.buttonStyle(.plain)- .disabled(self.privateAILocked)- .opacity(self.privateAILocked ? 0.45 : 1).onHover { hovering in- self.hoveredRowID = hovering && !self.privateAILocked ? "default" : nil+ self.hoveredRowID = hovering ? "default" : nil}}@@ -1637,13 +1630,12 @@ private struct BottomOverlayPromptMenuView: View {@ViewBuilderprivate func profileRow(_ profile: SettingsStore.DictationPromptProfile, selectedID: String?) -> some View {let activeSlot = self.contentState.activeDictationShortcutSlot ?? .primary- let isSelected = !self.privateAILocked && (+ let isSelected = (self.promptMode.normalized == .dictate? (self.settings.dictationPromptSelection(for: activeSlot) == .profile(profile.id)): (selectedID == profile.id))Button(action: {- guard !self.privateAILocked else { return }if self.promptMode.normalized == .dictate {self.contentState.onDictationPromptSelectionRequested?(.profile(profile.id))} else {@@ -1666,10 +1658,8 @@ private struct BottomOverlayPromptMenuView: View {.background(self.rowBackground(isSelected: isSelected, rowID: profile.id))}.buttonStyle(.plain)- .disabled(self.privateAILocked)- .opacity(self.privateAILocked ? 0.45 : 1).onHover { hovering in- self.hoveredRowID = hovering && !self.privateAILocked ? profile.id : nil+ self.hoveredRowID = hovering ? profile.id : nil}}@@ -1693,23 +1683,21 @@ private struct BottomOverlayPromptMenuView: View {}}- if !self.privateAILocked {- if self.promptMode.normalized == .dictate {- Divider()- .padding(.vertical, 4)- }+ if self.promptMode.normalized == .dictate {+ Divider()+ .padding(.vertical, 4)+ }- Text("EXTERNAL")- .font(.system(size: 10, weight: .semibold))- .foregroundStyle(.white.opacity(0.4))- .padding(.horizontal, 8)- .padding(.top, self.promptMode.normalized == .dictate ? 0 : 4)- .padding(.bottom, 3)+ Text("EXTERNAL")+ .font(.system(size: 10, weight: .semibold))+ .foregroundStyle(.white.opacity(0.4))+ .padding(.horizontal, 8)+ .padding(.top, self.promptMode.normalized == .dictate ? 0 : 4)+ .padding(.bottom, 3)- self.defaultRow(selectedID: selectedID)- }+ self.defaultRow(selectedID: selectedID)- if !self.privateAILocked && !profiles.isEmpty {+ if !profiles.isEmpty {ForEach(profiles) { profile inself.profileRow(profile, selectedID: selectedID)}@@ -3044,6 +3032,26 @@ struct BottomOverlayView: View {.opacity((appIcon != nil || showModelLoading || !self.layout.showsModeLabel) ? 1 : 0)}+ private var leadingAppContextView: some View {+ HStack(spacing: self.isPillSize ? 4 : 8) {+ if self.showsSpokenSendIndicator {+ SpokenSendIndicatorView(+ state: self.contentState.spokenSendIndicatorState,+ color: self.modeColor,+ size: self.isPillSize ? 14 : self.spokenSendIndicatorSize+ )+ .id(self.contentState.spokenSendCountdownID)+ .transition(.scale(scale: 0.8).combined(with: .opacity))+ }++ self.targetAppIconView+ }+ .animation(+ self.reduceMotion ? nil : .easeOut(duration: 0.14),+ value: self.contentState.spokenSendIndicatorState+ )+ }+private func scrollablePreviewText(_ previewText: String) -> some View {ScrollViewReader { proxy inScrollView(.vertical, showsIndicators: false) {@@ -3224,7 +3232,7 @@ struct BottomOverlayView: View {// Waveform + Mode label rowHStack(spacing: self.isPillSize ? 4 : self.layout.hPadding / 1.5) {if !self.layout.showsTopControls {- self.targetAppIconView+ self.leadingAppContextView}// Waveform visualization@@ -3240,47 +3248,14 @@ struct BottomOverlayView: View {height: self.layout.waveformHeight)- if self.isPillSize, self.showsSpokenSendIndicator {- SpokenSendIndicatorView(- state: self.contentState.spokenSendIndicatorState,- color: self.modeColor,- size: 14- )- .id(self.contentState.spokenSendCountdownID)- .transition(.scale(scale: 0.8).combined(with: .opacity))- }-- // Larger overlays already identify the mode in the selector above.- if self.layout.showsTopControls, self.showsSpokenSendIndicator {- SpokenSendIndicatorView(- state: self.contentState.spokenSendIndicatorState,- color: self.modeColor,- size: self.spokenSendIndicatorSize- )- .id(self.contentState.spokenSendCountdownID)- .transition(.scale(scale: 0.8).combined(with: .opacity))- }-// Compact overlays still need a visible mode because they have no selector.if self.layout.showsModeLabel, !self.layout.showsTopControls {VStack(alignment: .leading, spacing: 2) {- HStack(spacing: 5) {- Text(self.modeLabel)- .font(.system(size: self.layout.modeFontSize, weight: .semibold))- .foregroundStyle(self.modeColor)- .lineLimit(1)- .fixedSize(horizontal: true, vertical: false)-- if self.showsSpokenSendIndicator {- SpokenSendIndicatorView(- state: self.contentState.spokenSendIndicatorState,- color: self.modeColor,- size: self.spokenSendIndicatorSize- )- .id(self.contentState.spokenSendCountdownID)- .transition(.scale(scale: 0.8).combined(with: .opacity))- }- }+ Text(self.modeLabel)+ .font(.system(size: self.layout.modeFontSize, weight: .semibold))+ .foregroundStyle(self.modeColor)+ .lineLimit(1)+ .fixedSize(horizontal: true, vertical: false)if !self.appServices.asr.isAsrReady &&(self.appServices.asr.isLoadingModel || self.appServices.asr.isDownloadingModel)@@ -3302,7 +3277,7 @@ struct BottomOverlayView: View {.frame(maxWidth: .infinity, alignment: .center).overlay(alignment: .leading) {if self.layout.showsTopControls {- self.targetAppIconView+ self.leadingAppContextView}}.overlay(alignment: .trailing) {diff --git a/Sources/Fluid/Views/NotchContentViews.swift b/Sources/Fluid/Views/NotchContentViews.swiftindex 10184687..1fd4cc50 100644--- a/Sources/Fluid/Views/NotchContentViews.swift+++ b/Sources/Fluid/Views/NotchContentViews.swift@@ -789,7 +789,6 @@ struct NotchExpandedView: View {private func promptMenuContent() -> some View {let promptMode = self.activePromptMode ?? .dictatelet activeDictationSlot = self.activeDictationShortcutSlot- let privateAILocked = promptMode.normalized == .dictate && PrivateAIProviderPromptFormat.isAvailable(settings: self.settings)return VStack(alignment: .leading, spacing: 2) {Text("AI Prompt").font(.system(size: 8, weight: .semibold))@@ -817,16 +816,14 @@ struct NotchExpandedView: View {}}- if !privateAILocked {- self.promptMenuRow("Default", rowID: "default", isSelected: defaultSelected) {- if promptMode.normalized == .dictate {- self.contentState.onDictationPromptSelectionRequested?(.default)- } else {- self.settings.setSelectedPromptID(nil, for: promptMode)- }- self.restoreRecordingTargetFocus()- self.dismissPromptHoverMenu()+ self.promptMenuRow("Default", rowID: "default", isSelected: defaultSelected) {+ if promptMode.normalized == .dictate {+ self.contentState.onDictationPromptSelectionRequested?(.default)+ } else {+ self.settings.setSelectedPromptID(nil, for: promptMode)}+ self.restoreRecordingTargetFocus()+ self.dismissPromptHoverMenu()}if promptMode.normalized == .dictate && PrivateFeatures.privateAIProvider {@@ -843,7 +840,7 @@ struct NotchExpandedView: View {}}- let profiles = privateAILocked ? [] : self.settings.promptProfiles(for: promptMode)+ let profiles = self.settings.promptProfiles(for: promptMode)if !profiles.isEmpty {ForEach(profiles) { profile inlet isSelected = promptMode.normalized == .dictatediff --git a/Sources/Fluid/Views/RewriteModeView.swift b/Sources/Fluid/Views/RewriteModeView.swiftindex 50e94c1d..33fb9529 100644--- a/Sources/Fluid/Views/RewriteModeView.swift+++ b/Sources/Fluid/Views/RewriteModeView.swift@@ -282,16 +282,7 @@ struct RewriteModeView: View {}// Pull models from the shared pool configured in AI Settings- let possibleKeys = self.providerKeys(for: currentProviderID)- let storedList = possibleKeys.lazy- .compactMap { SettingsStore.shared.availableModelsByProvider[$0] }- .first { !$0.isEmpty }-- if let stored = storedList {- self.availableModels = stored- } else {- self.availableModels = ModelRepository.shared.defaultModels(for: currentProviderID)- }+ self.availableModels = self.settings.availableModels(for: currentProviderID, task: .edit)// If current model not in list, select first availableif !self.availableModels.contains(currentModel) {@@ -299,10 +290,6 @@ struct RewriteModeView: View {}}- private func providerKeys(for providerID: String) -> [String] {- return ModelRepository.shared.providerKeys(for: providerID)- }-private var builtInProvidersList: [(id: String, name: String)] {ModelRepository.shared.builtInProvidersList()}diff --git a/Tests/FluidDictationIntegrationTests/DictationE2ETests.swift b/Tests/FluidDictationIntegrationTests/DictationE2ETests.swiftindex 99206d98..72a76d27 100644--- a/Tests/FluidDictationIntegrationTests/DictationE2ETests.swift+++ b/Tests/FluidDictationIntegrationTests/DictationE2ETests.swift@@ -30,6 +30,7 @@ final class DictationE2ETests: XCTestCase {private let commandModeLinkedToGlobalKey = "CommandModeLinkedToGlobal"private let commandModeSelectedProviderIDKey = "CommandModeSelectedProviderID"private let commandModeSelectedModelKey = "CommandModeSelectedModel"+ private let rewriteModeLinkedToGlobalKey = "RewriteModeLinkedToGlobal"private let rewriteModeSelectedProviderIDKey = "RewriteModeSelectedProviderID"private let rewriteModeSelectedModelKey = "RewriteModeSelectedModel"private var privateAISelectedModelIDKey: String {@@ -52,6 +53,7 @@ final class DictationE2ETests: XCTestCase {private let privateAIContextDefaultMigratedTo4KKey = "PrivateAIProviderContextDefaultMigratedTo4K"private let verifiedProviderFingerprintsKey = "VerifiedProviderFingerprints"+ private let verifiedPrivateAIModelFingerprintsKey = "VerifiedPrivateAIModelFingerprints"private var punctuationFormattingDefaultsKeys: [String] {[@@ -98,6 +100,53 @@ final class DictationE2ETests: XCTestCase {XCTAssertNil(entry.clipboardText)}+ func testTranscriptionHistoryEntryRoundTripPreservesProcessingTimes() throws {+ let entry = TranscriptionHistoryEntry(+ rawText: "raw",+ processedText: "clean",+ appName: "Notes",+ windowTitle: "Draft",+ wasAIProcessed: true,+ transcriptionDurationMilliseconds: 272,+ aiProcessingDurationMilliseconds: 181,+ aiTokensPerSecond: 987.7+ )++ let decoded = try JSONDecoder().decode(+ TranscriptionHistoryEntry.self,+ from: JSONEncoder().encode(entry)+ )++ XCTAssertEqual(decoded.transcriptionDurationMilliseconds, 272)+ XCTAssertEqual(decoded.aiProcessingDurationMilliseconds, 181)+ XCTAssertEqual(decoded.aiTokensPerSecond, 987.7)+ }++ func testOlderTranscriptionHistoryEntryWithoutProcessingTimesStillDecodes() throws {+ struct LegacyEntry: Encodable {+ let id = UUID()+ let timestamp = Date(timeIntervalSince1970: 1000)+ let rawText = "raw"+ let processedText = "clean"+ let appName = "Notes"+ let windowTitle = "Draft"+ let characterCount = 5+ let wasAIProcessed = true+ let processingModel: String? = "fluid-1"+ let aiProcessingError: String? = nil+ let audio: DictationAudioMetadata? = nil+ }++ let decoded = try JSONDecoder().decode(+ TranscriptionHistoryEntry.self,+ from: JSONEncoder().encode(LegacyEntry())+ )++ XCTAssertNil(decoded.transcriptionDurationMilliseconds)+ XCTAssertNil(decoded.aiProcessingDurationMilliseconds)+ XCTAssertNil(decoded.aiTokensPerSecond)+ }+func testTranscriptionStartSound_noneOptionHasNoFile() {XCTAssertEqual(SettingsStore.TranscriptionStartSound.none.displayName, "None")XCTAssertNil(SettingsStore.TranscriptionStartSound.none.startSoundFileName)@@ -646,7 +695,9 @@ final class DictationE2ETests: XCTestCase {[.text("Run /status please")])}+}+extension DictationE2ETests {func testDictionaryTrainingNormalizesSamplesAndIgnoresIntendedText() {let triggers = CustomDictionaryTrainingMerge.normalizedTriggers(from: [" Fluid Voice. ", "FluidVoice", "fluid voice", " "],@@ -668,7 +719,7 @@ final class DictationE2ETests: XCTestCase {let entries = CustomDictionaryTrainingMerge.mergedEntries(current: [existingReplacement, oldReplacement],- replacement: " fluidvoice ",+ replacement: " FluidVoice ",triggers: ["Fluid Voice.", "fluid boys", "FluidVoice", ""])@@ -697,6 +748,34 @@ final class DictationE2ETests: XCTestCase {XCTAssertEqual(entries.first?.triggers, ["fluid voice"])}+ func testDictionaryTrainingPreservesCapitalizationCorrection() {+ let entries = CustomDictionaryTrainingMerge.mergedEntries(+ current: [],+ replacement: "DFlash",+ triggers: ["Dflash"]+ )++ XCTAssertEqual(entries.first?.replacement, "DFlash")+ XCTAssertEqual(entries.first?.triggers, ["dflash"])+ }++ func testDictionaryTrainingUpdatesExistingReplacementCapitalization() {+ let existing = SettingsStore.CustomDictionaryEntry(+ triggers: ["d flash"],+ replacement: "Dflash"+ )++ let entries = CustomDictionaryTrainingMerge.mergedEntries(+ current: [existing],+ replacement: "DFlash",+ triggers: ["Dflash"]+ )++ XCTAssertEqual(entries.first?.id, existing.id)+ XCTAssertEqual(entries.first?.replacement, "DFlash")+ XCTAssertEqual(Set(entries.first?.triggers ?? []), Set(["d flash", "dflash"]))+ }+func testManualDictionaryEntryParsesCommaSeparatedVariants() {XCTAssertEqual(CustomDictionaryManualEntry.normalizedDraftTriggers("fluid voice, fluid boys, fluid voice"),@@ -997,16 +1076,19 @@ final class DictationE2ETests: XCTestCase {))}- func testAutomaticDictionaryCorrectionIgnoresCaseOnlyEdit() {- let before = "fluidvoice"- let after = "FluidVoice"+ func testAutomaticDictionaryCorrectionDetectsCaseOnlyEdit() {+ let before = "Use Dflash today"+ let after = "Use DFlash today"let insertedRange = NSRange(location: 0, length: (before as NSString).length)- XCTAssertNil(AutomaticDictionaryCorrectionDetector.candidate(+ let candidate = AutomaticDictionaryCorrectionDetector.candidate(before: before,after: after,insertedRange: insertedRange- ))+ )++ XCTAssertEqual(candidate?.heardText, "Dflash")+ XCTAssertEqual(candidate?.correctedText, "DFlash")}func testAutomaticDictionaryCorrectionIgnoresPunctuationAndSpacingOnlyEdit() {@@ -1035,8 +1117,7 @@ final class DictationE2ETests: XCTestCase {func testAutomaticDictionarySuggestionRequiresRepeatedCorrection() throws {let defaults = try self.makeSuggestionPolicyDefaults()- var configuration = DictionarySuggestionPolicyConfig()- configuration.globalCooldown = 0+ let configuration = DictionarySuggestionPolicyConfig()let policy = AutomaticDictionarySuggestionPolicy(defaults: defaults, configuration: configuration)let candidate = AutomaticDictionaryCorrectionCandidate(heardText: "Barad", correctedText: "Barath")let now = Date(timeIntervalSince1970: 1000)@@ -1049,7 +1130,6 @@ final class DictationE2ETests: XCTestCase {let defaults = try self.makeSuggestionPolicyDefaults()var configuration = DictionarySuggestionPolicyConfig()configuration.requiredOccurrences = 1- configuration.globalCooldown = 0configuration.dismissedPairCooldown = 100let candidate = AutomaticDictionaryCorrectionCandidate(heardText: "Barad", correctedText: "Barath")let now = Date(timeIntervalSince1970: 2000)@@ -1064,27 +1144,24 @@ final class DictationE2ETests: XCTestCase {XCTAssertTrue(restoredPolicy.shouldShow(candidate, now: now.addingTimeInterval(101)))}- func testAutomaticDictionarySuggestionAppliesGlobalCooldown() throws {+ func testAutomaticDictionarySuggestionAllowsImmediateDifferentCorrection() throws {let defaults = try self.makeSuggestionPolicyDefaults()var configuration = DictionarySuggestionPolicyConfig()configuration.requiredOccurrences = 1- configuration.globalCooldown = 600let policy = AutomaticDictionarySuggestionPolicy(defaults: defaults, configuration: configuration)- let first = AutomaticDictionaryCorrectionCandidate(heardText: "Barad", correctedText: "Barath")- let second = AutomaticDictionaryCorrectionCandidate(heardText: "Floral Voice", correctedText: "FluidVoice")- let now = Date(timeIntervalSince1970: 3000)+ let first = AutomaticDictionaryCorrectionCandidate(heardText: "Claud", correctedText: "Claude")+ let second = AutomaticDictionaryCorrectionCandidate(heardText: "cloud", correctedText: "Claude")+ let now = Date(timeIntervalSince1970: 3500)XCTAssertTrue(policy.shouldShow(first, now: now))policy.markShown(first, now: now)- XCTAssertFalse(policy.shouldShow(second, now: now.addingTimeInterval(60)))- XCTAssertTrue(policy.shouldShow(second, now: now.addingTimeInterval(601)))+ XCTAssertTrue(policy.shouldShow(second, now: now.addingTimeInterval(30)))}func testAutomaticDictionarySuggestionStopsAfterSessionIgnoreLimit() throws {let defaults = try self.makeSuggestionPolicyDefaults()var configuration = DictionarySuggestionPolicyConfig()configuration.requiredOccurrences = 1- configuration.globalCooldown = 0configuration.dismissedPairCooldown = 0let policy = AutomaticDictionarySuggestionPolicy(defaults: defaults, configuration: configuration)let now = Date(timeIntervalSince1970: 4000)@@ -1107,7 +1184,6 @@ final class DictationE2ETests: XCTestCase {let defaults = try self.makeSuggestionPolicyDefaults()var configuration = DictionarySuggestionPolicyConfig()configuration.requiredOccurrences = 1- configuration.globalCooldown = 0let policy = AutomaticDictionarySuggestionPolicy(defaults: defaults, configuration: configuration)let candidate = AutomaticDictionaryCorrectionCandidate(heardText: "Barad", correctedText: "Barath")let now = Date(timeIntervalSince1970: 5000)@@ -1117,23 +1193,55 @@ final class DictationE2ETests: XCTestCase {XCTAssertFalse(policy.shouldShow(candidate, now: now.addingTimeInterval(10_000)))}- func testAutomaticDictionarySuggestionStopsAfterPairDismissalLimit() throws {+ func testAutomaticDictionarySuggestionDismissalRemainsTemporary() throws {let defaults = try self.makeSuggestionPolicyDefaults()var configuration = DictionarySuggestionPolicyConfig()configuration.requiredOccurrences = 1- configuration.globalCooldown = 0configuration.dismissedPairCooldown = 0configuration.maximumSessionIgnores = 10let policy = AutomaticDictionarySuggestionPolicy(defaults: defaults, configuration: configuration)let candidate = AutomaticDictionaryCorrectionCandidate(heardText: "Barad", correctedText: "Barath")let now = Date(timeIntervalSince1970: 6000)- for index in 0..<configuration.maximumPairDismissals {+ for index in 0..<4 {let date = now.addingTimeInterval(Double(index))XCTAssertTrue(policy.shouldShow(candidate, now: date))policy.record(.dismissed, for: candidate, now: date)}- XCTAssertFalse(policy.shouldShow(candidate, now: now.addingTimeInterval(10)))+ XCTAssertTrue(policy.shouldShow(candidate, now: now.addingTimeInterval(10)))+ }++ func testAutomaticDictionarySuggestionCountsDifferentMishearingsForSameCorrection() throws {+ let defaults = try self.makeSuggestionPolicyDefaults()+ let configuration = DictionarySuggestionPolicyConfig()+ let policy = AutomaticDictionarySuggestionPolicy(defaults: defaults, configuration: configuration)+ let now = Date(timeIntervalSince1970: 7000)++ XCTAssertFalse(policy.shouldShow(+ .init(heardText: "Barad", correctedText: "Barath"),+ requiredOccurrences: 2,+ now: now+ ))+ XCTAssertTrue(policy.shouldShow(+ .init(heardText: "Bharat", correctedText: "Barath"),+ requiredOccurrences: 2,+ now: now.addingTimeInterval(10)+ ))+ }++ func testAutomaticDictionarySuggestionIgnoreOnlySuppressesExactCorrection() throws {+ let defaults = try self.makeSuggestionPolicyDefaults()+ var configuration = DictionarySuggestionPolicyConfig()+ configuration.requiredOccurrences = 1+ let policy = AutomaticDictionarySuggestionPolicy(defaults: defaults, configuration: configuration)+ let ignored = AutomaticDictionaryCorrectionCandidate(heardText: "Barad", correctedText: "Barath")+ let alternative = AutomaticDictionaryCorrectionCandidate(heardText: "Bharat", correctedText: "Barath")+ let now = Date(timeIntervalSince1970: 8000)++ XCTAssertTrue(policy.shouldShow(ignored, now: now))+ policy.record(.ignored, for: ignored, now: now)+ XCTAssertFalse(policy.shouldShow(ignored, now: now.addingTimeInterval(10)))+ XCTAssertTrue(policy.shouldShow(alternative, now: now.addingTimeInterval(20)))}private func makeSuggestionPolicyDefaults() throws -> UserDefaults {@@ -1601,6 +1709,127 @@ final class DictationE2ETests: XCTestCase {}}+ func testPromptTestConfigurationUsesDraftProviderInsteadOfGlobalProvider() {+ self.withRestoredDefaults(keys: [self.selectedProviderIDKey, self.verifiedProviderFingerprintsKey]) {+ let settings = SettingsStore.shared+ let baseURL = ModelRepository.shared.defaultBaseURL(for: "ollama")+ settings.selectedProviderID = PrivateAIProviderFeature.shared.providerID+ settings.verifiedProviderFingerprints = [+ "ollama": DictationAIPostProcessingGate.providerFingerprint(baseURL: baseURL, apiKey: "") ?? "",+ ]++ XCTAssertTrue(+ DictationAIPostProcessingGate.isProviderConfigured(+ providerID: "ollama",+ model: "draft-model"+ )+ )+ XCTAssertFalse(+ DictationAIPostProcessingGate.isProviderConfigured(+ providerID: "openai",+ model: "draft-model"+ )+ )+ }+ }++ func testActivePromptTestTracksDraftProviderChanges() {+ let coordinator = DictationPromptTestCoordinator.shared+ defer { coordinator.deactivate() }+ coordinator.activate(draftPromptText: "Polish", providerID: "ollama", model: "first")++ coordinator.updateDraftConfiguration(providerID: "openai", model: "second")++ XCTAssertEqual(coordinator.draftProviderID, "openai")+ XCTAssertEqual(coordinator.draftModel, "second")+ }++ func testLMStudioCleanupRouteIsIndependentOfFluidIntelligenceProviderState() {+ self.withRestoredDefaults(+ keys: [+ self.selectedProviderIDKey,+ self.selectedModelByProviderKey,+ self.verifiedProviderFingerprintsKey,+ self.dictationPromptConfigurationsKey,+ self.dictationPromptOffKey,+ self.selectedDictationPromptIDKey,+ ]+ ) {+ let settings = SettingsStore.shared+ let lmStudioModel = "local-cleanup-model"+ let globalProviderID = PrivateFeatures.privateAIProvider+ ? PrivateAIProviderFeature.shared.providerID+ : "openai"+ settings.selectedProviderID = globalProviderID+ settings.selectedModelByProvider = [+ globalProviderID: PrivateFeatures.privateAIProvider+ ? PrivateAIIntegrationService.configuredModelID+ : "gpt-4.1",+ "lmstudio": lmStudioModel,+ ]+ settings.setDictationPromptSelection(.default, for: .primary)+ settings.setDictationPromptConfiguration(+ SettingsStore.DictationPromptConfiguration(+ providerID: "lmstudio",+ modelName: lmStudioModel+ ),+ for: .default+ )+ settings.verifiedProviderFingerprints = [:]++ let route = DictationProviderRoute.resolve(settings: settings, dictationSlot: .primary)++ XCTAssertEqual(route.providerID, "lmstudio")+ XCTAssertEqual(route.model, lmStudioModel)+ XCTAssertFalse(route.usesPrivateAI)+ XCTAssertFalse(DictationAIPostProcessingGate.isConfigured(for: .primary))++ settings.verifiedProviderFingerprints = [+ "lmstudio": DictationAIPostProcessingGate.providerFingerprint(+ baseURL: route.baseURL,+ apiKey: route.apiKey+ ) ?? "",+ ]++ XCTAssertTrue(DictationAIPostProcessingGate.isConfigured(for: .primary))+ XCTAssertEqual(settings.selectedProviderID, globalProviderID)+ }+ }++ func testExternalCleanupDoesNotInheritFluidIntelligenceProvider() {+ XCTAssertEqual(+ DictationProviderRoute.externalFallbackProviderID(+ from: PrivateAIProviderFeature.shared.providerID+ ),+ ""+ )+ XCTAssertEqual(+ DictationProviderRoute.externalFallbackProviderID(from: "lmstudio"),+ "lmstudio"+ )+ }++ func testResettingDefaultCleanupConfigurationRemovesStaleProviderAndModel() {+ self.withRestoredDefaults(keys: [self.dictationPromptConfigurationsKey]) {+ let settings = SettingsStore.shared+ settings.setDictationPromptConfiguration(+ SettingsStore.DictationPromptConfiguration(+ shortcut: HotkeyShortcut(keyCode: 3, modifierFlags: [.option]),+ providerID: "lmstudio",+ modelName: "removed-model"+ ),+ for: .default+ )++ settings.removeDictationPromptConfiguration(for: .default)++ XCTAssertEqual(+ settings.dictationPromptConfiguration(for: .default),+ SettingsStore.DictationPromptConfiguration()+ )+ }+ }+func testDictationProviderRouteReturnsEmptyRouteForUnverifiedPrivateAI() {self.withPromptAndProviderSettingsRestored {let settings = SettingsStore.shared@@ -1684,6 +1913,13 @@ final class DictationE2ETests: XCTestCase {}}+ func testFluidIntelligenceSelectionSupportsAppOverride() {+ XCTAssertTrue(SettingsStore.dictationSelectionSupportsAppOverride(.privateAI))+ XCTAssertTrue(SettingsStore.dictationSelectionSupportsAppOverride(.default))+ XCTAssertFalse(SettingsStore.dictationSelectionSupportsAppOverride(.profile("global")))+ XCTAssertFalse(SettingsStore.dictationSelectionSupportsAppOverride(.off))+ }+func testPostProcessingRouteUsesGlobalProviderWithoutAppContext() {self.withRestoredDefaults(keys: [@@ -1710,6 +1946,51 @@ final class DictationE2ETests: XCTestCase {}}+ func testEditModelResolutionPreservesConfiguredLocalProviderModel() {+ self.withRestoredDefaults(+ keys: [+ self.savedProvidersKey,+ self.availableModelsByProviderKey,+ self.selectedModelByProviderKey,+ self.selectedProviderIDKey,+ self.rewriteModeLinkedToGlobalKey,+ ]+ ) {+ let settings = SettingsStore.shared+ settings.rewriteModeLinkedToGlobal = true+ settings.selectedProviderID = "lmstudio"+ settings.availableModelsByProvider = ["lmstudio": ["local-edit-model"]]+ settings.selectedModelByProvider = ["lmstudio": "local-edit-model"]++ XCTAssertEqual(settings.availableModels(for: "lmstudio", task: .edit), ["local-edit-model"])+ XCTAssertEqual(settings.effectiveRewriteModeProviderID, "lmstudio")+ XCTAssertEqual(settings.effectiveRewriteModeSelectedModel, "local-edit-model")+ }+ }++ func testEditAnalyticsReportsResolvedEditModel() {+ self.withRestoredDefaults(+ keys: [+ self.availableModelsByProviderKey,+ self.rewriteModeLinkedToGlobalKey,+ self.rewriteModeSelectedProviderIDKey,+ self.rewriteModeSelectedModelKey,+ ]+ ) {+ let settings = SettingsStore.shared+ settings.rewriteModeLinkedToGlobal = false+ settings.rewriteModeSelectedProviderID = "ollama"+ settings.availableModelsByProvider = ["ollama": ["edit-model", "other-model"]]+ settings.rewriteModeSelectedModel = "edit-model"++ XCTAssertEqual(settings.effectiveRewriteModeSelectedModel, "edit-model")+ XCTAssertEqual(+ settings.analyticsAIModelDescriptor(for: .edit),+ AnalyticsModelDescriptor(provider: "ollama", model: "edit-model")+ )+ }+ }+func testPrivateAIProviderDictationPromptSelection_allowsOffAndRestoresNonFluidPrompt() {self.withPromptAndProviderSettingsRestored {let settings = SettingsStore.shared@@ -1729,11 +2010,7 @@ final class DictationE2ETests: XCTestCase {XCTAssertEqual(settings.dictationPromptSelection(for: .primary), .profile(custom.id))settings.selectedProviderID = PrivateAIProviderFeature.shared.providerID- if PrivateFeatures.privateAIProvider {- XCTAssertEqual(settings.dictationPromptSelection(for: .primary), .privateAI)- } else {- XCTAssertEqual(settings.dictationPromptSelection(for: .primary), .profile(custom.id))- }+ XCTAssertEqual(settings.dictationPromptSelection(for: .primary), .profile(custom.id))settings.setDictationPromptSelection(.off)XCTAssertEqual(settings.dictationPromptSelection(for: .primary), .off)@@ -1746,7 +2023,7 @@ final class DictationE2ETests: XCTestCase {}}- func testPrivateAIProviderDictationPromptSelection_usesOnlyFluidPromptOrOffWhileSelected() {+ func testPrivateAIProviderSelectionDoesNotOverrideCleanupStyle() {self.withPromptAndProviderSettingsRestored {let settings = SettingsStore.sharedlet custom = SettingsStore.DictationPromptProfile(@@ -1762,16 +2039,10 @@ final class DictationE2ETests: XCTestCase {settings.selectedProviderID = PrivateAIProviderFeature.shared.providerIDsettings.setDictationPromptSelection(.default)- XCTAssertEqual(- settings.dictationPromptSelection(for: .primary),- PrivateFeatures.privateAIProvider ? .privateAI : .default- )+ XCTAssertEqual(settings.dictationPromptSelection(for: .primary), .default)settings.setDictationPromptSelection(.profile(custom.id))- XCTAssertEqual(- settings.dictationPromptSelection(for: .primary),- PrivateFeatures.privateAIProvider ? .privateAI : .profile(custom.id)- )+ XCTAssertEqual(settings.dictationPromptSelection(for: .primary), .profile(custom.id))settings.setDictationPromptSelection(.off)XCTAssertEqual(settings.dictationPromptSelection(for: .primary), .off)@@ -1783,6 +2054,160 @@ final class DictationE2ETests: XCTestCase {}}+ func testPrivateAIVerificationStateDoesNotReplaceExternalCleanupRoute() {+ self.withPromptAndProviderSettingsRestored {+ let settings = SettingsStore.shared+ let privateProviderID = PrivateAIProviderFeature.shared.providerID+ let privateModelID = PrivateAIProviderFeature.shared.defaultModelID+ settings.selectedProviderID = "openai"+ settings.selectedModelByProvider = [+ "openai": "gpt-4.1",+ privateProviderID: privateModelID,+ ]+ settings.verifiedProviderFingerprints = [+ privateProviderID: "private-model-fingerprint",+ ]+ settings.verifiedPrivateAIModelFingerprints = [+ privateModelID: "private-model-fingerprint",+ ]+ settings.setDictationPromptSelection(.default)++ let route = DictationProviderRoute.resolveForPostProcessing(+ settings: settings,+ dictationSlot: .primary+ )++ XCTAssertEqual(settings.selectedProviderID, "openai")+ XCTAssertEqual(route.providerID, "openai")+ XCTAssertEqual(route.model, "gpt-4.1")+ }+ }++ func testOpeningProviderConfigurationDoesNotChangeDefaultProvider() {+ self.withRestoredDefaults(keys: [self.selectedProviderIDKey]) {+ let settings = SettingsStore.shared+ settings.selectedProviderID = "openai"+ let viewModel = AIEnhancementSettingsViewModel(+ settings: settings,+ menuBarManager: MenuBarManager(),+ promptTest: .shared+ )++ viewModel.configureProvider("lmstudio")+ viewModel.saveSavedProviders()+ viewModel.cachedVerifiedProviderItems = [+ .init(id: "openai", name: "OpenAI", isBuiltIn: true),+ .init(id: "lmstudio", name: "LM Studio", isBuiltIn: true),+ ]++ XCTAssertEqual(viewModel.selectedProviderID, "lmstudio")+ XCTAssertEqual(settings.selectedProviderID, "openai")+ XCTAssertEqual(viewModel.defaultVerifiedPromptProviderID(), "openai")++ viewModel.finishConfiguringProvider()+ XCTAssertEqual(viewModel.selectedProviderID, "openai")+ XCTAssertEqual(settings.selectedProviderID, "openai")+ }+ }++ func testLegacyFluidIntelligenceDefaultUsesPrivateRouteOnlyWithoutExplicitConfiguration() {+ let providerID = PrivateAIProviderFeature.shared.providerID++ XCTAssertTrue(+ DictationProviderRoute.shouldUseLegacyPrivateAIRoute(+ selectedProviderID: providerID,+ configuredProviderID: "",+ configuredModel: ""+ )+ )+ XCTAssertFalse(+ DictationProviderRoute.shouldUseLegacyPrivateAIRoute(+ selectedProviderID: providerID,+ configuredProviderID: "lmstudio",+ configuredModel: "local-model"+ )+ )+ XCTAssertTrue(+ DictationProviderRoute.allowsPrivateAIRoute(+ selection: .default,+ selectedProviderID: providerID+ )+ )+ XCTAssertFalse(+ DictationProviderRoute.allowsPrivateAIRoute(+ selection: .profile("external"),+ selectedProviderID: providerID+ )+ )+ }++ func testExplicitExternalStyleDoesNotUseLegacyFluidIntelligenceRoute() {+ self.withPromptAndProviderSettingsRestored {+ let settings = SettingsStore.shared+ let profile = SettingsStore.DictationPromptProfile(+ name: "External",+ prompt: "Polish this",+ mode: .dictate+ )+ settings.dictationPromptProfiles = [profile]+ settings.selectedProviderID = PrivateAIProviderFeature.shared.providerID+ settings.setDictationPromptSelection(.profile(profile.id))++ let route = DictationProviderRoute.resolve(+ settings: settings,+ dictationSlot: .primary+ )++ XCTAssertFalse(route.usesPrivateAI)+ XCTAssertTrue(route.providerID.isEmpty)+ }+ }++ func testAppDefaultOverrideDoesNotUseLegacyFluidIntelligenceRoute() {+ self.withPromptAndProviderSettingsRestored {+ let settings = SettingsStore.shared+ let appBundleID = "com.example.editor"+ settings.appPromptBindings = [+ SettingsStore.AppPromptBinding(+ mode: .dictate,+ appBundleID: appBundleID,+ appName: "Editor",+ promptID: nil+ ),+ ]+ settings.selectedProviderID = PrivateAIProviderFeature.shared.providerID+ settings.setDictationPromptSelection(.default)++ let route = DictationProviderRoute.resolve(+ settings: settings,+ dictationSlot: .primary,+ appBundleID: appBundleID+ )++ XCTAssertFalse(route.usesPrivateAI)+ XCTAssertTrue(route.providerID.isEmpty)+ }+ }++ func testCreatingAndDeletingProviderDraftPreservesDefaultProvider() {+ self.withProviderSettingsRestored {+ let settings = SettingsStore.shared+ settings.selectedProviderID = "openai"+ let viewModel = AIEnhancementSettingsViewModel(+ settings: settings,+ menuBarManager: MenuBarManager(),+ promptTest: .shared+ )++ XCTAssertNotNil(viewModel.createDraftProvider(named: "Draft"))+ XCTAssertEqual(settings.selectedProviderID, "openai")++ viewModel.deleteCurrentProvider()+ XCTAssertEqual(viewModel.selectedProviderID, "openai")+ XCTAssertEqual(settings.selectedProviderID, "openai")+ }+ }+func testPrivateAIProviderPrefixKVCache_defaultsOnAndPersistsToggle() {self.withRestoredDefaults(keys: [self.privateAIPrefixKVCacheEnabledKey]) {let settings = SettingsStore.shared@@ -2228,6 +2653,7 @@ final class DictationE2ETests: XCTestCase {self.availableModelsByProviderKey,self.selectedModelByProviderKey,self.verifiedProviderFingerprintsKey,+ self.verifiedPrivateAIModelFingerprintsKey,self.privateAISelectedModelIDKey,],run: rundiff --git a/Tests/FluidDictationIntegrationTests/HotkeyShortcutTests.swift b/Tests/FluidDictationIntegrationTests/HotkeyShortcutTests.swiftindex 394cd92f..baea446d 100644--- a/Tests/FluidDictationIntegrationTests/HotkeyShortcutTests.swift+++ b/Tests/FluidDictationIntegrationTests/HotkeyShortcutTests.swift@@ -271,6 +271,36 @@ final class HotkeyShortcutTests: XCTestCase {XCTAssertNil(legacyBackup.settings.experimentalParakeetUnifiedFinalEnabled)}+ @MainActor+ func testHistoryPerformanceDefaultsOffAndRoundTripsWithoutBreakingLegacyBackups() async throws {+ let defaults = UserDefaults.standard+ let key = "ShowHistoryPerformanceMetrics"+ let originalValue = defaults.object(forKey: key)+ defer {+ if let originalValue {+ defaults.set(originalValue, forKey: key)+ } else {+ defaults.removeObject(forKey: key)+ }+ }++ defaults.removeObject(forKey: key)+ XCTAssertFalse(SettingsStore.shared.showHistoryPerformanceMetrics)++ SettingsStore.shared.showHistoryPerformanceMetrics = true+ let document = await BackupService.shared.makeBackupDocument()+ XCTAssertEqual(document.settings.showHistoryPerformanceMetrics, true)++ let encoded = try BackupService.shared.encode(document)+ var root = try XCTUnwrap(JSONSerialization.jsonObject(with: encoded) as? [String: Any])+ var settings = try XCTUnwrap(root["settings"] as? [String: Any])+ settings.removeValue(forKey: "showHistoryPerformanceMetrics")+ root["settings"] = settings++ let legacyBackup = try BackupService.shared.decode(JSONSerialization.data(withJSONObject: root))+ XCTAssertNil(legacyBackup.settings.showHistoryPerformanceMetrics)+ }+@MainActorfunc testIncrementalParakeetCopiesOnlyTheUnacceptedTailAfterSessionStarts() {XCTAssertEqual(diff --git a/Tests/FluidDictationIntegrationTests/PrivateAIProviderPromptFormatTests.swift b/Tests/FluidDictationIntegrationTests/PrivateAIProviderPromptFormatTests.swiftindex 57638c1f..7e5764cb 100644--- a/Tests/FluidDictationIntegrationTests/PrivateAIProviderPromptFormatTests.swift+++ b/Tests/FluidDictationIntegrationTests/PrivateAIProviderPromptFormatTests.swift@@ -3,6 +3,40 @@ import XCTest@MainActorfinal class PrivateAIProviderPromptFormatTests: XCTestCase {+ func testProviderTaskDefaultKeepsDictationAndHidesOtherModes() {+ let provider = TaskDefaultPrivateAIProvider()++ XCTAssertEqual(provider.modelIDs(for: .dictation), ["dictation-model"])+ XCTAssertEqual(provider.modelIDs(for: .edit), [])+ XCTAssertEqual(provider.modelIDs(for: .command), [])+ }++ func testTaskFilteringDoesNotChangeRemoteProviderDefaults() {+ let repository = ModelRepository.shared++ XCTAssertEqual(+ repository.defaultModels(for: "openai", task: .edit),+ repository.defaultModels(for: "openai")+ )+ XCTAssertEqual(+ repository.defaultModels(for: "anthropic", task: .command),+ repository.defaultModels(for: "anthropic")+ )+ }++ func testEligibleTaskModelPreservesAValidNonFirstSelection() {+ let models = ["edit-model-a", "edit-model-b"]++ XCTAssertEqual(+ ModelRepository.eligibleModel(preferred: "edit-model-b", from: models),+ "edit-model-b"+ )+ XCTAssertEqual(+ ModelRepository.eligibleModel(preferred: "dictation-only", from: models),+ "edit-model-a"+ )+ }+func testModelScopedVerificationIsIndependentFromProviderSelection() {self.withRestoredFingerprints { settings insettings.verifiedProviderFingerprints = ["private": "model-a-fingerprint"]@@ -65,3 +99,21 @@ final class PrivateAIProviderPromptFormatTests: XCTestCase {body(settings)}}++private struct TaskDefaultPrivateAIProvider: PrivateAIProviderFeatureProviding {+ let isAvailable = true+ let providerID = "private-test"+ let providerName = "Private Test"+ let promptSelectionID = "private-test"+ let defaultModelID = "dictation-model"+ let selectedModelDefaultsKey = "private-test-model"+ let localModelPathDefaultsKey = "private-test-path"+ let prefixCacheDefaultsKey = "private-test-cache"+ let boostDefaultsKey = "private-test-boost"+ let modelDirectoryName = "PrivateTest"++ func modelIDs() -> [String] { ["dictation-model"] }+ func model(id _: String) -> PrivateAIRegisteredModel? { nil }+ func canonicalModelID(for _: String) -> String? { nil }+ func isKnownModelID(_: String) -> Bool { false }+}diff --git a/Tests/FluidDictationIntegrationTests/SettingsNavigationStateTests.swift b/Tests/FluidDictationIntegrationTests/SettingsNavigationStateTests.swiftindex cc6ab45b..0f252871 100644--- a/Tests/FluidDictationIntegrationTests/SettingsNavigationStateTests.swift+++ b/Tests/FluidDictationIntegrationTests/SettingsNavigationStateTests.swift@@ -114,7 +114,7 @@ final class SettingsNavigationStateTests: XCTestCase {func testSettingsSectionsHaveStableTitlesAndIcons() {XCTAssertEqual(SettingsSection.allCases.map(\.title),- ["General", "Dictation", "Notifications", "Audio", "Overlay", "Data & Diagnostics"]+ ["General", "Dictation", "Notifications", "Audio", "Overlay", "Data & Diagnostics", "Experimental"])XCTAssertTrue(SettingsSection.allCases.allSatisfy { !$0.systemImage.isEmpty })XCTAssertEqual(SettingsSection.overlay.systemImage, "rectangle.on.rectangle")diff --git a/dist/FluidVoice.zip b/dist/FluidVoice.zipdeleted file mode 100644index 06d0c47f..00000000Binary files a/dist/FluidVoice.zip and /dev/null differ