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
fix: polish fluid intelligence routing
altic-devc863a0095278
diff --git a/Sources/Fluid/ContentView.swift b/Sources/Fluid/ContentView.swiftindex 84553168..67dc8f09 100644--- a/Sources/Fluid/ContentView.swift+++ b/Sources/Fluid/ContentView.swift@@ -16,13 +16,19 @@ import SwiftUI// MARK: - AI Processing Errorsenum AIProcessingError: LocalizedError {+ case noVerifiedProvidercase missingAPIKey(provider: String)+ case missingModel(provider: String)case emptyResponsevar errorDescription: String? {switch self {+ case .noVerifiedProvider:+ return "No verified AI provider selected"case let .missingAPIKey(provider):return "API key not set for \(provider)"+ case let .missingModel(provider):+ return "No model selected for \(provider)"case .emptyResponse:return "AI returned an empty response"}@@ -167,7 +173,7 @@ struct ContentView: View {@State private var aiInputText: String = ""@State private var aiOutputText: String = ""@State private var isCallingAI: Bool = false- @State private var openAIBaseURL: String = ModelRepository.shared.defaultBaseURL(for: "openai")+ @State private var openAIBaseURL: String = ""@State private var enableDebugLogs: Bool = SettingsStore.shared.enableDebugLogs@State private var hotkeyMode: HotkeyActivationMode = SettingsStore.shared.hotkeyMode@@ -192,8 +198,8 @@ struct ContentView: View {// Models scoped by provider (name -> [models])@State private var availableModelsByProvider: [String: [String]] = [:]@State private var selectedModelByProvider: [String: String] = [:]- @State private var availableModels: [String] = ["gpt-4.1"] // derived from currentProvider- @State private var selectedModel: String = "gpt-4.1" // derived from currentProvider+ @State private var availableModels: [String] = [] // derived from currentProvider+ @State private var selectedModel: String = "" // derived from currentProvider@State private var showingAddModel: Bool = false@State private var newModelName: String = ""@@ -206,7 +212,7 @@ struct ContentView: View {// MARK: - Provider Management@State private var providerAPIKeys: [String: String] = [:] // [providerKey: apiKey]- @State private var currentProvider: String = "openai" // canonical key: "openai" | "groq" | "custom:<id>"+ @State private var currentProvider: String = "" // canonical key: "openai" | "groq" | "custom:<id>"@State private var savedProviders: [SettingsStore.SavedProvider] = []@State private var selectedProviderID: String = SettingsStore.shared.selectedProviderID@@ -1334,11 +1340,14 @@ struct ContentView: View {// MARK: - Provider Management Functionsprivate func providerKey(for providerID: String) -> String {+ let trimmed = providerID.trimmingCharacters(in: .whitespacesAndNewlines)+ guard !trimmed.isEmpty else { return "" }+// Built-in providers use their ID directly- if ModelRepository.shared.isBuiltIn(providerID) { return providerID }+ if ModelRepository.shared.isBuiltIn(trimmed) { return trimmed }// Saved providers use their stable id with "custom:" prefix (if not already present)- if providerID.hasPrefix("custom:") { return providerID }- return providerID.isEmpty ? self.currentProvider : "custom:\(providerID)"+ if trimmed.hasPrefix("custom:") { return trimmed }+ return "custom:\(trimmed)"}private func updateCurrentProvider() {@@ -1571,6 +1580,15 @@ struct ContentView: View {derivedSelectedModel = storedSelectedModelByProvider[currentSelectedProviderID] ?? ""}+ guard !derivedCurrentProvider.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {+ throw AIProcessingError.noVerifiedProvider+ }+ if currentSelectedProviderID != "apple-intelligence",+ derivedSelectedModel.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty+ {+ throw AIProcessingError.missingModel(provider: derivedCurrentProvider)+ }+DebugLogger.shared.debug("processTextWithAI using provider=\(derivedCurrentProvider), model=\(derivedSelectedModel)", source: "ContentView")let appInfo = self.recordingAppInfo ?? self.getCurrentAppInfo()@@ -1813,6 +1831,7 @@ struct ContentView: View {private func stopAndProcessTranscription(route: DictationOutputRoute = .normal) async {DebugLogger.shared.debug("stopAndProcessTranscription called", source: "ContentView")DebugLogger.shared.info("Output route selected: \(route.rawValue)", source: "ContentView")+ self.appBench("stop_path_enter route=\(route.rawValue)")// Check if we're in rewrite or command modelet modeAtStop = self.activeRecordingMode@@ -1831,8 +1850,10 @@ struct ContentView: View {// The asr.stop() call performs the final transcription which can take a moment// (especially for slower models like Whisper Medium/Large).DebugLogger.shared.debug("Showing transcription processing state", source: "ContentView")+ self.appBench("processing_ui_request status=Transcribing")self.menuBarManager.setProcessing(true)NotchOverlayManager.shared.updateTranscriptionText("Transcribing")+ self.appBench("processing_ui_requested status=Transcribing")// Give SwiftUI a chance to render the processing state before we do heavier work// (ASR finalization + optional AI post-processing).@@ -1840,7 +1861,10 @@ struct ContentView: View {// Stop the ASR service and wait for transcription to complete// The processing indicator will stay visible during this phase+ let asrStopStartedAt = ProcessInfo.processInfo.systemUptime+ self.appBench("asr_stop_call")let transcribedText = await asr.stop()+ self.appBench("asr_stop_return elapsedMs=\(Int(((ProcessInfo.processInfo.systemUptime - asrStopStartedAt) * 1000).rounded()))")let audioSnapshot = self.asr.consumeLastCompletedAudioSnapshot()TranscriptionSoundPlayer.shared.playStopSound()DebugLogger.shared.info(@@ -1940,7 +1964,9 @@ struct ContentView: View {let postProcessingStart = Date()// Update overlay text to show we're now refining (processing already true)+ self.appBench("processing_ui_request status=Refining")NotchOverlayManager.shared.updateTranscriptionText("Refining")+ self.appBench("processing_ui_requested status=Refining")// Ensure the status label becomes visible immediately.await Task.yield()@@ -1993,6 +2019,7 @@ struct ContentView: View {self.asr.finalText = finalTextDebugLogger.shared.info("Transcription finalized (chars: \(finalText.count))", source: "ContentView")+ self.appBench("transcription_finalized chars=\(finalText.count)")AnalyticsService.shared.capture(.transcriptionCompleted,@@ -2597,8 +2624,13 @@ struct ContentView: View {/// Adds a short delay after activation so macOS can deliver focus before typing begins.private func restoreFocusToRecordingTarget() async {guard let pid = NotchContentState.shared.recordingTargetPID else { return }+ let startedAt = ProcessInfo.processInfo.systemUptime+ self.appBench("focus_restore_start targetPID=\(pid)")let activated = TypingService.activateApp(pid: pid)let focusedElementRestored = TypingService.restoreCapturedFocus(in: pid)+ self.appBench(+ "focus_restore_result activated=\(activated) element=\(focusedElementRestored) elapsedMs=\(Int(((ProcessInfo.processInfo.systemUptime - startedAt) * 1000).rounded()))"+ )DebugLogger.shared.debug("Restore focus -> appActivated: \(activated), elementFocusRestored: \(focusedElementRestored), targetPID: \(pid)",source: "ContentView"@@ -2607,6 +2639,7 @@ struct ContentView: View {// Small delay to allow focus to settle before typing events fire.let settleNanos: UInt64 = 10_000_000try? await Task.sleep(nanoseconds: settleNanos)+ self.appBench("focus_restore_settle_done delayMs=10")}}@@ -3103,22 +3136,39 @@ extension ContentView {private func beginDictationRecording(for slot: SettingsStore.DictationShortcutSlot, mode: ActiveRecordingMode) {DebugLogger.shared.debug("Begin dictation recording for slot \(slot.rawValue)", source: "ContentView")+ self.appBench("begin_recording slot=\(slot.rawValue) mode=\(mode.rawValue)")self.captureRecordingContext()self.applyDictationShortcutSelectionContext(for: slot)self.setActiveRecordingMode(mode)self.rewriteModeService.clearState()+ self.appBench("overlay_mode_request mode=Dictation")self.menuBarManager.setOverlayMode(.dictation)+ self.appBench("overlay_mode_requested mode=Dictation")self.prewarmPrivateAIDictationIfNeeded(for: slot)- guard !self.asr.isRunning else { return }+ guard !self.asr.isRunning else {+ self.appBench("asr_start_skipped reason=already_running")+ return+ }if SettingsStore.shared.enableTranscriptionSounds {TranscriptionSoundPlayer.shared.playStartSound()}Task {+ let asrStartStartedAt = ProcessInfo.processInfo.systemUptime+ DebugLogger.shared.benchmark("APP_BENCH", message: "asr_start_call", source: "AppBenchmark")await self.asr.start()+ DebugLogger.shared.benchmark(+ "APP_BENCH",+ message: "asr_start_return elapsedMs=\(Int(((ProcessInfo.processInfo.systemUptime - asrStartStartedAt) * 1000).rounded()))",+ source: "AppBenchmark"+ )}}+ private func appBench(_ message: String) {+ DebugLogger.shared.benchmark("APP_BENCH", message: message, source: "AppBenchmark")+ }+private func callOpenAIChat() async {guard !self.isCallingAI else { return }await MainActor.run { self.isCallingAI = true }diff --git a/Sources/Fluid/Persistence/BackupService.swift b/Sources/Fluid/Persistence/BackupService.swiftindex 89fb7ee3..024148e3 100644--- a/Sources/Fluid/Persistence/BackupService.swift+++ b/Sources/Fluid/Persistence/BackupService.swift@@ -72,6 +72,7 @@ struct SettingsBackupPayload: Codable, Equatable {let selectedDictationPromptID: String?let dictationPromptOff: Bool?let dictationPromptRoutingScope: SettingsStore.PromptRoutingScope?+ let editPromptOff: Bool?let selectedEditPromptID: String?let editPromptRoutingScope: SettingsStore.PromptRoutingScope?let defaultDictationPromptOverride: String?diff --git a/Sources/Fluid/Persistence/SettingsStore+CommandMode.swift b/Sources/Fluid/Persistence/SettingsStore+CommandMode.swiftindex 3072eb46..0db8994d 100644--- a/Sources/Fluid/Persistence/SettingsStore+CommandMode.swift+++ b/Sources/Fluid/Persistence/SettingsStore+CommandMode.swift@@ -20,14 +20,14 @@ extension SettingsStore {var effectiveCommandModeProviderID: String {if self.commandModeLinkedToGlobal {- return self.selectedProviderID.trimmingCharacters(in: .whitespacesAndNewlines)+ return self.supportedCommandModeProviderID(self.selectedProviderID) ?? ""}if let providerID = self.supportedCommandModeProviderID(self.commandModeSelectedProviderID) {return providerID}- return self.commandModeSelectedProviderID.trimmingCharacters(in: .whitespacesAndNewlines)+ return ""}var effectiveCommandModeSelectedModel: String {@@ -54,8 +54,15 @@ extension SettingsStore {if sourceProviderID == "apple-intelligence" || sourceProviderID == "apple-intelligence-disabled" {return "Command Mode cannot use Apple Intelligence because terminal tools require a chat API. Choose a verified chat provider or turn Sync off."}+ if self.isPrivateAIProviderID(sourceProviderID) {+ return "\(PrivateAIProviderFeature.displayName) for Command Mode is coming soon. Choose a verified chat provider or turn Sync off."+ }let providerID = self.effectiveCommandModeProviderID+ guard !providerID.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {+ return "Command Mode needs a verified chat provider."+ }+let model = self.effectiveCommandModeSelectedModel.trimmingCharacters(in: .whitespacesAndNewlines)guard !model.isEmpty else {return "Command Mode needs a selected chat model."@@ -87,10 +94,12 @@ extension SettingsStore {let trimmed = providerID.trimmingCharacters(in: .whitespacesAndNewlines)guard !trimmed.isEmpty else { return nil }guard trimmed != "apple-intelligence", trimmed != "apple-intelligence-disabled" else { return nil }+ guard !self.isPrivateAIProviderID(trimmed) else { return nil }return trimmed}func isCommandModeProviderVerified(_ providerID: String) -> Bool {+ guard !self.isPrivateAIProviderID(providerID) else { return false }let key = ModelRepository.shared.providerKey(for: providerID)guard let stored = self.verifiedProviderFingerprints[key] else { return false }@@ -118,8 +127,16 @@ extension SettingsStore {return digest.map { String(format: "%02x", $0) }.joined()}+ private func isPrivateAIProviderID(_ providerID: String) -> Bool {+ PrivateFeatures.privateAIProvider &&+ providerID.trimmingCharacters(in: .whitespacesAndNewlines) == PrivateAIProviderFeature.shared.providerID+ }+private func isUnsupportedCommandModeModel(_ model: String) -> Bool {let value = model.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()+ if PrivateAIIntegrationService.shouldHandleDictation(model: value) {+ return true+ }if value.contains("embedding") || value.contains("rerank") || value.contains("moderation") {return true}diff --git a/Sources/Fluid/Persistence/SettingsStore.swift b/Sources/Fluid/Persistence/SettingsStore.swiftindex 2f9a4cd8..9a077fbc 100644--- a/Sources/Fluid/Persistence/SettingsStore.swift+++ b/Sources/Fluid/Persistence/SettingsStore.swift@@ -1,6 +1,7 @@import AppKitimport ApplicationServicesimport Combine+import CryptoKitimport Foundationimport ServiceManagementimport SwiftUI@@ -29,6 +30,7 @@ final class SettingsStore: ObservableObject {self.migrateDictationPromptProfilesIfNeeded()self.migrateLegacyDictationAIPreferenceIfNeeded()self.normalizePromptSelectionsIfNeeded()+ self.normalizeProviderSelectionForCurrentVerificationState()self.migrateOverlayBottomOffsetTo50IfNeeded()self.refreshLaunchAtStartupStatus(clearError: true, logMismatch: false)}@@ -301,6 +303,14 @@ final class SettingsStore: ObservableObject {}}+ var isEditPromptOff: Bool {+ get { self.defaults.bool(forKey: Keys.editPromptOff) }+ set {+ objectWillChange.send()+ self.defaults.set(newValue, forKey: Keys.editPromptOff)+ }+ }+var dictationPromptSelection: DictationPromptSelection {self.dictationPromptSelection(for: .primary)}@@ -434,6 +444,24 @@ final class SettingsStore: ObservableObject {}}+ func isPromptOff(for mode: PromptMode) -> Bool {+ switch mode.normalized {+ case .dictate:+ return self.isDictationPromptOff+ case .edit, .write, .rewrite:+ return self.isEditPromptOff+ }+ }++ func setPromptOff(_ isOff: Bool, for mode: PromptMode) {+ switch mode.normalized {+ case .dictate:+ self.setDictationPromptSelection(isOff ? .off : .default)+ case .edit, .write, .rewrite:+ self.isEditPromptOff = isOff+ }+ }+func selectedDictationPromptProfile(for slot: DictationShortcutSlot) -> DictationPromptProfile? {guard let id = self.selectedDictationPromptID(for: slot) else { return nil }return self.dictationPromptProfiles.first(where: { $0.id == id && $0.mode.normalized == .dictate })@@ -489,8 +517,10 @@ final class SettingsStore: ObservableObject {self.setDictationPromptSelection(.default)}case .edit:+ self.isEditPromptOff = falseself.selectedEditPromptID = idcase .write, .rewrite:+ self.isEditPromptOff = falseself.selectedEditPromptID = id}}@@ -865,6 +895,15 @@ final class SettingsStore: ObservableObject {func promptResolution(for mode: PromptMode, appBundleID: String? = nil) -> PromptResolution {let normalizedMode = mode.normalized+ if normalizedMode == .edit, self.isEditPromptOff {+ return self.defaultPromptResolution(+ for: normalizedMode,+ source: .builtInDefault,+ appBinding: nil,+ allowDefaultOverride: false+ )+ }+if let binding = self.appPromptBinding(for: normalizedMode, appBundleID: appBundleID) {if let promptID = binding.promptID,let profile = self.dictationPromptProfiles.first(where: {@@ -1225,10 +1264,36 @@ final class SettingsStore: ObservableObject {set {objectWillChange.send()let trimmed = newValue.trimmingCharacters(in: .whitespacesAndNewlines)- self.defaults.set(trimmed.isEmpty ? "openai" : trimmed, forKey: Keys.selectedProviderID)+ if trimmed.isEmpty {+ self.defaults.removeObject(forKey: Keys.selectedProviderID)+ } else {+ self.defaults.set(trimmed, forKey: Keys.selectedProviderID)+ }}}+ func normalizeProviderSelectionForCurrentVerificationState() {+ let currentProviderID = self.selectedProviderID+ if self.isVerifiedProviderForCurrentConfiguration(currentProviderID) {+ self.syncLinkedProviderSelections(to: currentProviderID)+ return+ }++ let verifiedProviderIDs = self.verifiedProviderIDsForCurrentConfiguration()+ guard verifiedProviderIDs.count == 1,+ let providerID = verifiedProviderIDs.first+ else {+ if currentProviderID.isEmpty {+ self.selectedProviderID = ""+ self.syncLinkedProviderSelections(to: "")+ }+ return+ }++ self.selectedProviderID = providerID+ self.syncLinkedProviderSelections(to: providerID)+ }+var privateAIPrefixKVCacheEnabled: Bool {get { self.defaults.object(forKey: PrivateAIProviderFeature.shared.prefixCacheDefaultsKey) as? Bool ?? true }set {@@ -1923,10 +1988,15 @@ final class SettingsStore: ObservableObject {}var commandModeSelectedProviderID: String {- get { self.defaults.string(forKey: Keys.commandModeSelectedProviderID) ?? "openai" }+ get { self.defaults.string(forKey: Keys.commandModeSelectedProviderID) ?? "" }set {objectWillChange.send()- self.defaults.set(newValue, forKey: Keys.commandModeSelectedProviderID)+ let trimmed = newValue.trimmingCharacters(in: .whitespacesAndNewlines)+ if trimmed.isEmpty {+ self.defaults.removeObject(forKey: Keys.commandModeSelectedProviderID)+ } else {+ self.defaults.set(trimmed, forKey: Keys.commandModeSelectedProviderID)+ }}}@@ -2074,10 +2144,15 @@ final class SettingsStore: ObservableObject {}var rewriteModeSelectedProviderID: String {- get { self.defaults.string(forKey: Keys.rewriteModeSelectedProviderID) ?? "openai" }+ get { self.defaults.string(forKey: Keys.rewriteModeSelectedProviderID) ?? "" }set {objectWillChange.send()- self.defaults.set(newValue, forKey: Keys.rewriteModeSelectedProviderID)+ let trimmed = newValue.trimmingCharacters(in: .whitespacesAndNewlines)+ if trimmed.isEmpty {+ self.defaults.removeObject(forKey: Keys.rewriteModeSelectedProviderID)+ } else {+ self.defaults.set(trimmed, forKey: Keys.rewriteModeSelectedProviderID)+ }}}@@ -2391,6 +2466,7 @@ final class SettingsStore: ObservableObject {selectedDictationPromptID: self.selectedDictationPromptID,dictationPromptOff: self.isDictationPromptOff,dictationPromptRoutingScope: self.dictationPromptRoutingScope,+ editPromptOff: self.isEditPromptOff,selectedEditPromptID: self.selectedEditPromptID,editPromptRoutingScope: self.editPromptRoutingScope,defaultDictationPromptOverride: self.defaultDictationPromptOverride,@@ -2481,6 +2557,7 @@ final class SettingsStore: ObservableObject {self.selectedDictationPromptID = payload.selectedDictationPromptIDself.isDictationPromptOff = payload.dictationPromptOff ?? self.isDictationPromptOffself.dictationPromptRoutingScope = payload.dictationPromptRoutingScope ?? .allApps+ self.isEditPromptOff = payload.editPromptOff ?? self.isEditPromptOffself.editPromptRoutingScope = payload.editPromptRoutingScope ?? .allAppsself.selectedEditPromptID = payload.selectedEditPromptIDself.defaultDictationPromptOverride = payload.defaultDictationPromptOverride@@ -2771,19 +2848,124 @@ final class SettingsStore: ObservableObject {}private func canonicalProviderKey(for providerID: String) -> String {+ let trimmed = providerID.trimmingCharacters(in: .whitespacesAndNewlines)+ guard !trimmed.isEmpty else { return "" }+// Built-in providers use their ID directly+ if ModelRepository.shared.isBuiltIn(trimmed) {+ return trimmed+ }+ if trimmed.hasPrefix("custom:") {+ return trimmed+ }+ return "custom:\(trimmed)"+ }++ private func verifiedProviderIDsForCurrentConfiguration() -> [String] {+ let providerIDs = ModelRepository.builtInProviderIDs + self.savedProviders.map(\.id)+ return providerIDs.filter { self.isVerifiedProviderForCurrentConfiguration($0) }+ }++ private func isVerifiedProviderForCurrentConfiguration(_ providerID: String) -> Bool {+ let trimmed = providerID.trimmingCharacters(in: .whitespacesAndNewlines)+ guard !trimmed.isEmpty else { return false }++ if trimmed == "apple-intelligence" {+ return AppleIntelligenceService.isAvailable &&+ self.verifiedProviderFingerprints[self.canonicalProviderKey(for: trimmed)] == "apple-intelligence"+ }++ if PrivateFeatures.privateAIProvider,+ trimmed == PrivateAIProviderFeature.shared.providerID+ {+ return PrivateAIProviderPromptFormat.verifiedModelID(settings: self) != nil+ }++ let key = self.canonicalProviderKey(for: trimmed)+ guard let stored = self.verifiedProviderFingerprints[key] else { return false }++ let baseURL = self.providerBaseURLForVerification(for: trimmed)+ let apiKey = (self.getAPIKey(for: trimmed) ?? "").trimmingCharacters(in: .whitespacesAndNewlines)+ guard ModelRepository.shared.isLocalEndpoint(baseURL) || !apiKey.isEmpty else { return false }++ return self.providerFingerprint(baseURL: baseURL, apiKey: apiKey) == stored+ }++ private func providerBaseURLForVerification(for providerID: String) -> String {+ let savedProviderID = providerID.hasPrefix("custom:") ?+ String(providerID.dropFirst("custom:".count)) : providerID+ if let saved = self.savedProviders.first(where: { $0.id == savedProviderID }) {+ return saved.baseURL.trimmingCharacters(in: .whitespacesAndNewlines)+ }if ModelRepository.shared.isBuiltIn(providerID) {- return providerID+ return ModelRepository.shared.defaultBaseURL(for: providerID).trimmingCharacters(in: .whitespacesAndNewlines)}- if providerID.hasPrefix("custom:") {- return providerID+ return ""+ }++ private func providerFingerprint(baseURL: String, apiKey: String) -> String? {+ let trimmedBaseURL = baseURL.trimmingCharacters(in: .whitespacesAndNewlines)+ let trimmedAPIKey = apiKey.trimmingCharacters(in: .whitespacesAndNewlines)+ guard !trimmedBaseURL.isEmpty else { return nil }++ let input = "\(trimmedBaseURL)|\(trimmedAPIKey)"+ let digest = SHA256.hash(data: Data(input.utf8))+ return digest.map { String(format: "%02x", $0) }.joined()+ }++ private func syncLinkedProviderSelections(to providerID: String) {+ let trimmed = providerID.trimmingCharacters(in: .whitespacesAndNewlines)+ let linkedProviderID = self.isPrivateAIProviderID(trimmed) ? "" : trimmed+ let model = self.modelSelection(for: linkedProviderID)++ if self.rewriteModeLinkedToGlobal {+ self.rewriteModeSelectedProviderID = linkedProviderID+ self.rewriteModeSelectedModel = model+ }++ if self.commandModeLinkedToGlobal {+ self.commandModeSelectedProviderID = linkedProviderID+ self.commandModeSelectedModel = model+ }+ }++ private func isPrivateAIProviderID(_ providerID: String) -> Bool {+ PrivateFeatures.privateAIProvider &&+ providerID.trimmingCharacters(in: .whitespacesAndNewlines) == PrivateAIProviderFeature.shared.providerID+ }++ private func modelSelection(for providerID: String) -> String? {+ guard !providerID.isEmpty else { return nil }++ if PrivateFeatures.privateAIProvider,+ providerID == PrivateAIProviderFeature.shared.providerID,+ let modelID = PrivateAIProviderPromptFormat.verifiedModelID(settings: self)+ {+ return modelID}- return "custom:\(providerID)"++ let key = self.canonicalProviderKey(for: providerID)+ if let selected = self.selectedModelByProvider[key],+ !selected.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty+ {+ return selected+ }++ let savedProviderID = providerID.hasPrefix("custom:") ?+ String(providerID.dropFirst("custom:".count)) : providerID+ if let savedModel = self.savedProviders.first(where: { $0.id == savedProviderID })?.models.first,+ !savedModel.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty+ {+ return savedModel+ }++ return ModelRepository.shared.defaultModels(for: providerID).first}private func availableSelectedProviderID(for rawValue: String?) -> String {let trimmed = rawValue?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""- let providerID = trimmed.isEmpty ? "openai" : trimmed+ guard !trimmed.isEmpty else { return "" }+ let providerID = trimmedif ModelRepository.shared.isBuiltIn(providerID) { return providerID }let savedProviderID = providerID.hasPrefix("custom:") ?@@ -2792,7 +2974,7 @@ final class SettingsStore: ObservableObject {return savedProviderID}- return "openai"+ return ""}private func sanitizeAPIKeys(_ values: [String: String]) -> [String: String] {@@ -3760,6 +3942,7 @@ private extension SettingsStore {static let dictationPromptProfiles = "DictationPromptProfiles"static let appPromptBindings = "AppPromptBindings"static let selectedDictationPromptID = "SelectedDictationPromptID"+ static let editPromptOff = "EditPromptOff"static let selectedEditPromptID = "SelectedEditPromptID"static let selectedWritePromptID = "SelectedWritePromptID" // legacy fallback keystatic let selectedRewritePromptID = "SelectedRewritePromptID" // legacy fallback keydiff --git a/Sources/Fluid/Services/ASRService.swift b/Sources/Fluid/Services/ASRService.swiftindex 70b82adf..9bd68c48 100644--- a/Sources/Fluid/Services/ASRService.swift+++ b/Sources/Fluid/Services/ASRService.swift@@ -280,7 +280,7 @@ final class ASRService: ObservableObject {}private func benchmarkLog(_ message: String) {- DebugLogger.shared.info("ASR_BENCH session=\(self.benchmarkSessionID) \(message)", source: "ASRBenchmark")+ DebugLogger.shared.benchmark("ASR_BENCH", message: "session=\(self.benchmarkSessionID) \(message)", source: "ASRBenchmark")}private func streamingChunkErrorCategory(for error: Error) -> String {@@ -2772,11 +2772,23 @@ final class ASRService: ObservableObject {private let typingService = TypingService() // Reuse instance to avoid conflictsfunc typeTextToActiveField(_ text: String) {+ DebugLogger.shared.benchmark("TYPING_BENCH", message: "asr_type_request chars=\(text.count) preferredPID=nil", source: "TypingBenchmark")self.typingService.typeTextInstantly(text)+ DebugLogger.shared.benchmark("TYPING_BENCH", message: "asr_type_dispatched chars=\(text.count) preferredPID=nil", source: "TypingBenchmark")}func typeTextToActiveField(_ text: String, preferredTargetPID: pid_t?) {+ DebugLogger.shared.benchmark(+ "TYPING_BENCH",+ message: "asr_type_request chars=\(text.count) preferredPID=\(preferredTargetPID.map { String($0) } ?? "nil")",+ source: "TypingBenchmark"+ )self.typingService.typeTextInstantly(text, preferredTargetPID: preferredTargetPID)+ DebugLogger.shared.benchmark(+ "TYPING_BENCH",+ message: "asr_type_dispatched chars=\(text.count) preferredPID=\(preferredTargetPID.map { String($0) } ?? "nil")",+ source: "TypingBenchmark"+ )}/// Removes filler sounds from transcribed textdiff --git a/Sources/Fluid/Services/DebugLogger.swift b/Sources/Fluid/Services/DebugLogger.swiftindex c6fbc480..12fd90ac 100644--- a/Sources/Fluid/Services/DebugLogger.swift+++ b/Sources/Fluid/Services/DebugLogger.swift@@ -148,6 +148,11 @@ extension DebugLogger {self.log(message, level: .info, source: source)}+ func benchmark(_ marker: String, message: String, source: String = "Benchmark") {+ let now = ProcessInfo.processInfo.systemUptime+ self.info("\(marker) t=\(String(format: "%.6f", now)) \(message)", source: source)+ }+func warning(_ message: String, source: String = "App") {self.log(message, level: .warning, source: source)}diff --git a/Sources/Fluid/Services/DictationAIPostProcessingGate.swift b/Sources/Fluid/Services/DictationAIPostProcessingGate.swiftindex 08be95bd..f83fb3a7 100644--- a/Sources/Fluid/Services/DictationAIPostProcessingGate.swift+++ b/Sources/Fluid/Services/DictationAIPostProcessingGate.swift@@ -31,6 +31,12 @@ enum DictationAIPostProcessingGate {static func isProviderConfigured() -> Bool {let settings = SettingsStore.sharedlet providerID = settings.selectedProviderID+ if PrivateFeatures.privateAIProvider,+ providerID == PrivateAIProviderFeature.shared.providerID+ {+ return self.isPrivateProviderConfigured(settings: settings)+ }+let key = self.providerKey(for: providerID)guard let storedFingerprint = settings.verifiedProviderFingerprints[key] else { return false }@@ -58,9 +64,11 @@ enum DictationAIPostProcessingGate {}static func providerKey(for providerID: String) -> String {- if ModelRepository.shared.isBuiltIn(providerID) { return providerID }- if providerID.hasPrefix("custom:") { return providerID }- return "custom:\(providerID)"+ let trimmed = providerID.trimmingCharacters(in: .whitespacesAndNewlines)+ guard !trimmed.isEmpty else { return "" }+ if ModelRepository.shared.isBuiltIn(trimmed) { return trimmed }+ if trimmed.hasPrefix("custom:") { return trimmed }+ return "custom:\(trimmed)"}static func providerFingerprint(baseURL: String, apiKey: String) -> String? {@@ -74,14 +82,7 @@ enum DictationAIPostProcessingGate {}private static func isPrivateProviderConfigured(settings: SettingsStore) -> Bool {- guard PrivateAIIntegrationService.isLocalRuntimeConfigured else { return false }-- let providerID = PrivateAIProviderFeature.shared.providerID- let key = self.providerKey(for: providerID)- let modelID = settings.selectedModelByProvider[key] ?? PrivateAIIntegrationService.configuredModelID- guard !modelID.isEmpty else { return false }-- return settings.verifiedProviderFingerprints[key] == PrivateAIProviderFeature.verificationFingerprint(for: modelID)+ PrivateAIProviderPromptFormat.verifiedModelID(settings: settings) != nil}static func isLocalEndpoint(_ urlString: String) -> Bool {diff --git a/Sources/Fluid/Services/DictationPostProcessingService.swift b/Sources/Fluid/Services/DictationPostProcessingService.swiftindex bdcadd32..28ec06d3 100644--- a/Sources/Fluid/Services/DictationPostProcessingService.swift+++ b/Sources/Fluid/Services/DictationPostProcessingService.swift@@ -27,7 +27,10 @@ final class DictationPostProcessingService {}let settings = SettingsStore.shared- let resolved = self.resolveProvider(settings: settings)+ let resolved = self.resolveProvider(settings: settings, dictationSlot: dictationSlot)+ guard !resolved.providerID.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {+ throw AIProcessingError.noVerifiedProvider+ }DebugLogger.shared.debug("DictationPostProcessingService using provider=\(resolved.providerKey), model=\(resolved.model)",source: "DictationPostProcessingService"@@ -82,6 +85,10 @@ final class DictationPostProcessingService {return Result(text: trimmed, providerID: resolved.providerID, model: resolved.model)}+ guard !resolved.model.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {+ throw AIProcessingError.missingModel(provider: resolved.providerKey)+ }+let isLocal = ModelRepository.shared.isLocalEndpoint(resolved.baseURL)if !isLocal, resolved.apiKey.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {throw AIProcessingError.missingAPIKey(provider: resolved.providerKey)@@ -123,7 +130,20 @@ final class DictationPostProcessingService {)}- private func resolveProvider(settings: SettingsStore) -> ResolvedProvider {+ private func resolveProvider(settings: SettingsStore, dictationSlot: SettingsStore.DictationShortcutSlot) -> ResolvedProvider {+ if settings.dictationPromptSelection(for: dictationSlot) == .privateAI,+ let modelID = PrivateAIProviderPromptFormat.verifiedModelID(settings: settings)+ {+ let providerID = PrivateAIProviderFeature.shared.providerID+ return ResolvedProvider(+ providerID: providerID,+ providerKey: providerID,+ baseURL: ModelRepository.shared.defaultBaseURL(for: providerID),+ model: modelID,+ apiKey: ""+ )+ }+let providerID = settings.selectedProviderIDlet selectedModels = settings.selectedModelByProviderlet providerKeys = settings.providerAPIKeysdiff --git a/Sources/Fluid/Services/MenuBarManager.swift b/Sources/Fluid/Services/MenuBarManager.swiftindex dc59882a..881cdb1a 100644--- a/Sources/Fluid/Services/MenuBarManager.swift+++ b/Sources/Fluid/Services/MenuBarManager.swift@@ -97,15 +97,21 @@ final class MenuBarManager: NSObject, ObservableObject, NSMenuDelegate {}private func handleOverlayState(isRunning: Bool, asrService: ASRService) {+ self.overlayBench("handle_state isRunning=\(isRunning) overlayVisible=\(self.overlayVisible) processing=\(self.isProcessingActive) mode=\(self.currentOverlayMode.rawValue)")+// Don't hide the overlay while AI processing is active.// Without this, the notch can disappear during the short "Refining..." phase because// `isRunning` becomes false before post-processing completes.if !isRunning, self.isProcessingActive {+ self.overlayBench("handle_state_return reason=processing_active")return}// Prevent rapid state changes that could cause cycles- guard self.overlayVisible != isRunning else { return }+ guard self.overlayVisible != isRunning else {+ self.overlayBench("handle_state_return reason=visibility_unchanged")+ return+ }if isRunning {// Cancel any pending hide operation@@ -113,6 +119,7 @@ final class MenuBarManager: NSObject, ObservableObject, NSMenuDelegate {self.pendingHideOperation = nilself.overlayVisible = true+ self.overlayBench("show_request mode=\(self.currentOverlayMode.rawValue)")// If expanded command output is showing, check if we should keep it or close itif NotchOverlayManager.shared.isCommandOutputExpanded {@@ -151,10 +158,12 @@ final class MenuBarManager: NSObject, ObservableObject, NSMenuDelegate {}// Show notch overlay+ self.overlayBench("show_workitem_execute mode=\(self.currentOverlayMode.rawValue)")NotchOverlayManager.shared.show(audioLevelPublisher: asrService.audioLevelPublisher,mode: self.currentOverlayMode)+ self.overlayBench("show_workitem_return mode=\(self.currentOverlayMode.rawValue)")self.pendingShowOperation = nil}@@ -166,6 +175,7 @@ final class MenuBarManager: NSObject, ObservableObject, NSMenuDelegate {self.pendingShowOperation = nilself.overlayVisible = false+ self.overlayBench("hide_request delayMs=30")// If expanded command output is showing, don't hide it - let it stay visibleif NotchOverlayManager.shared.isCommandOutputExpanded {@@ -188,7 +198,9 @@ final class MenuBarManager: NSObject, ObservableObject, NSMenuDelegate {}// Hide notch overlay+ self.overlayBench("hide_workitem_execute")NotchOverlayManager.shared.hide()+ self.overlayBench("hide_workitem_return")self.pendingHideOperation = nil}@@ -204,11 +216,14 @@ final class MenuBarManager: NSObject, ObservableObject, NSMenuDelegate {}func setOverlayMode(_ mode: OverlayMode) {+ self.overlayBench("set_mode mode=\(mode.rawValue)")self.currentOverlayMode = modeNotchOverlayManager.shared.setMode(mode)}func setProcessing(_ processing: Bool) {+ self.overlayBench("set_processing_request processing=\(processing) overlayVisible=\(self.overlayVisible) active=\(self.isProcessingActive)")+// Track processing state to prevent hide during AI refinementself.isProcessingActive = processing@@ -221,7 +236,9 @@ final class MenuBarManager: NSObject, ObservableObject, NSMenuDelegate {let showItem = DispatchWorkItem { [weak self] inguard let self = self, self.isProcessingActive else { return }+ self.overlayBench("processing_show_workitem_execute delayMs=100")NotchOverlayManager.shared.setProcessing(true)+ self.overlayBench("processing_show_workitem_return")self.pendingProcessingShowOperation = nil}self.pendingProcessingShowOperation = showItem@@ -236,6 +253,7 @@ final class MenuBarManager: NSObject, ObservableObject, NSMenuDelegate {if NotchOverlayManager.shared.isCommandOutputExpanded {self.pendingHideOperation = nilNotchOverlayManager.shared.setProcessing(processing)+ self.overlayBench("set_processing_return reason=expanded_command_output")return}@@ -248,16 +266,23 @@ final class MenuBarManager: NSObject, ObservableObject, NSMenuDelegate {return}+ self.overlayBench("processing_hide_workitem_execute delayMs=100")NotchOverlayManager.shared.hide()+ self.overlayBench("processing_hide_workitem_return")self.pendingHideOperation = nil}self.pendingHideOperation = hideItemDispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(100), execute: hideItem)NotchOverlayManager.shared.setProcessing(false)+ self.overlayBench("processing_forwarded processing=false hideDelayMs=100")return}}+ private func overlayBench(_ message: String) {+ DebugLogger.shared.benchmark("OVERLAY_BENCH", message: "manager \(message)", source: "OverlayBenchmark")+ }+private func setupMenuBarSafely() {do {try self.setupMenuBar()diff --git a/Sources/Fluid/Services/NotchOverlayManager.swift b/Sources/Fluid/Services/NotchOverlayManager.swiftindex 33b48b66..b6bd753f 100644--- a/Sources/Fluid/Services/NotchOverlayManager.swift+++ b/Sources/Fluid/Services/NotchOverlayManager.swift@@ -142,11 +142,13 @@ final class NotchOverlayManager {func show(audioLevelPublisher: AnyPublisher<CGFloat, Never>, mode: OverlayMode) {self.refreshNotchPresentationPolicy()+ Self.overlayBench("show_called mode=\(mode.rawValue) state=\(self.state) commandExpanded=\(self.isCommandOutputExpanded)")// Don't show regular notch if expanded command output is visibleif self.isCommandOutputExpanded {// Just store the publisher for later useself.lastAudioPublisher = audioLevelPublisher+ Self.overlayBench("show_return reason=command_output_expanded")return}@@ -156,6 +158,8 @@ final class NotchOverlayManager {// If already visible or in transition, wait for cleanup to completeif self.notch != nil || self.state != .idle {+ Self.overlayBench("show_retry_after_cleanup state=\(self.state) notchExists=\(self.notch != nil)")+// Increment generation to invalidate stale operationsself.generation &+= 1let targetGeneration = self.generation@@ -183,6 +187,7 @@ final class NotchOverlayManager {}private func showInternal(audioLevelPublisher: AnyPublisher<CGFloat, Never>, mode: OverlayMode) {+ Self.overlayBench("show_internal_enter mode=\(mode.rawValue) state=\(self.state)")guard self.state == .idle else { return }// Store for potential re-show during processing@@ -194,16 +199,21 @@ final class NotchOverlayManager {// Route to bottom overlay if user preference is setif SettingsStore.shared.overlayPosition == .bottom {+ Self.overlayBench("show_internal_route target=bottom")self.showBottomOverlay(audioLevelPublisher: audioLevelPublisher, mode: mode)return}// Otherwise show notch overlay (original behavior)+ Self.overlayBench("show_internal_route target=notch")self.showNotchOverlay(audioLevelPublisher: audioLevelPublisher, mode: mode, screen: targetScreen)}/// Show bottom overlay (alternative to notch)private func showBottomOverlay(audioLevelPublisher: AnyPublisher<CGFloat, Never>, mode: OverlayMode) {+ let startedAt = ProcessInfo.processInfo.systemUptime+ Self.overlayBench("bottom_route_start mode=\(mode.rawValue)")+// Hide any existing notch firstif self.notch != nil {Task { await self.performCleanup() }@@ -214,10 +224,12 @@ final class NotchOverlayManager {BottomOverlayWindowController.shared.show(audioPublisher: audioLevelPublisher, mode: self.currentMode)self.isBottomOverlayVisible = true+ Self.overlayBench("bottom_route_return elapsedMs=\(Self.elapsedMs(since: startedAt))")}/// Show notch overlay (original behavior)private func showNotchOverlay(audioLevelPublisher: AnyPublisher<CGFloat, Never>, mode: OverlayMode, screen: NSScreen?) {+ let startedAt = ProcessInfo.processInfo.systemUptimelet targetScreen = screen ?? self.preferredPresentationScreen()self.presentationPolicyScreen = targetScreenself.refreshNotchPresentationPolicy(for: targetScreen)@@ -256,21 +268,32 @@ final class NotchOverlayManager {self.notch = newNotchlet shouldUseCompactPresentation = self.currentNotchPresentationPolicy.usesCompactPresentation+ let presentation = shouldUseCompactPresentation ? "compact" : "expanded"+ Self.overlayBench("notch_task_scheduled mode=\(self.currentMode.rawValue) presentation=\(presentation) screen=\(targetScreen.localizedName)")// Resolve presentation from policy so future notch modes don't require call-site changes.Task { [weak self] in+ Self.overlayBench("notch_animation_start presentation=\(presentation)")if shouldUseCompactPresentation {await newNotch.compact(on: targetScreen)} else {await newNotch.expand(on: targetScreen)}+ Self.overlayBench("notch_animation_complete presentation=\(presentation) elapsedMs=\(Self.elapsedMs(since: startedAt))")// Only update state if we're still the active generation- guard let self = self, self.generation == currentGeneration else { return }+ guard let self = self, self.generation == currentGeneration else {+ Self.overlayBench("notch_visible_drop reason=stale_generation")+ return+ }self.state = .visible+ Self.overlayBench("state_visible target=notch presentation=\(presentation)")}}func hide() {+ let startedAt = ProcessInfo.processInfo.systemUptime+ Self.overlayBench("hide_called state=\(self.state) bottomVisible=\(self.isBottomOverlayVisible)")+// Stop monitoring active app changesActiveAppMonitor.shared.stopMonitoring()@@ -294,6 +317,7 @@ final class NotchOverlayManager {// Handle visible or showing states (can hide while still expanding)guard self.state == .visible || self.state == .showing, let currentNotch = notch else {// Force cleanup if stuck or in inconsistent state+ Self.overlayBench("hide_return reason=not_visible state=\(self.state) notchExists=\(self.notch != nil)")Task { [weak self] in await self?.performCleanup() }return}@@ -301,16 +325,22 @@ final class NotchOverlayManager {self.state = .hidingTask { [weak self] in+ Self.overlayBench("hide_animation_start")await currentNotch.hide()+ Self.overlayBench("hide_animation_complete elapsedMs=\(Self.elapsedMs(since: startedAt))")// Only clear if we're still the active operationguard let self = self, self.generation == currentGeneration else { return }self.notch = nilself.state = .idle+ Self.overlayBench("state_idle target=notch")}}/// Async cleanup that properly waits for hide to completeprivate func performCleanup() async {+ let startedAt = ProcessInfo.processInfo.systemUptime+ Self.overlayBench("cleanup_start state=\(self.state) notchExists=\(self.notch != nil)")+// Cancel any pending retry operationsself.pendingRetryTask?.cancel()self.pendingRetryTask = nil@@ -320,10 +350,12 @@ final class NotchOverlayManager {}self.notch = nilself.state = .idle+ Self.overlayBench("cleanup_complete elapsedMs=\(Self.elapsedMs(since: startedAt))")}func setMode(_ mode: OverlayMode) {self.refreshNotchPresentationPolicy()+ Self.overlayBench("set_mode mode=\(mode.rawValue)")// Always update NotchContentState to ensure UI stays in sync// (can get out of sync during show/hide transitions)@@ -346,8 +378,12 @@ final class NotchOverlayManager {}func updateTranscriptionText(_ text: String) {+ let trimmedText = text.trimmingCharacters(in: .whitespacesAndNewlines)+ if trimmedText.isEmpty || Self.transientOverlayStatusTexts.contains(trimmedText) {+ Self.overlayBench("text_update status=\(trimmedText.isEmpty ? "empty" : trimmedText)")+ }+guard self.shouldShowOrTrackLivePreviewText else {- let trimmedText = text.trimmingCharacters(in: .whitespacesAndNewlines)if trimmedText.isEmpty || Self.transientOverlayStatusTexts.contains(trimmedText) {NotchContentState.shared.updateTranscription(text)} else if !NotchContentState.shared.transcriptionText.isEmpty {@@ -359,22 +395,26 @@ final class NotchOverlayManager {}func setProcessing(_ processing: Bool) {+ Self.overlayBench("set_processing processing=\(processing) state=\(self.state) bottomVisible=\(self.isBottomOverlayVisible) commandExpanded=\(self.isCommandOutputExpanded)")NotchContentState.shared.setProcessing(processing)// If expanded command output is showing, don't mess with regular notchif self.isCommandOutputExpanded {+ Self.overlayBench("set_processing_return reason=command_output_expanded")return}// If bottom overlay is visible, update its processing stateif self.isBottomOverlayVisible {BottomOverlayWindowController.shared.setProcessing(processing)+ Self.overlayBench("set_processing_forwarded target=bottom")return}if processing {// If notch isn't visible, re-show it for processing stateif self.state == .idle || self.state == .hiding {+ Self.overlayBench("set_processing_reshow state=\(self.state)")// Use stored publisher or create empty onelet publisher = self.lastAudioPublisher ?? Empty<CGFloat, Never>().eraseToAnyPublisher()self.show(audioLevelPublisher: publisher, mode: self.currentMode)@@ -382,6 +422,14 @@ final class NotchOverlayManager {}}+ private static func overlayBench(_ message: String) {+ DebugLogger.shared.benchmark("OVERLAY_BENCH", message: "notch \(message)", source: "OverlayBenchmark")+ }++ private static func elapsedMs(since start: TimeInterval) -> Int {+ Int(((ProcessInfo.processInfo.systemUptime - start) * 1000).rounded())+ }+// MARK: - Expanded Command Output/// Show expanded command output notchdiff --git a/Sources/Fluid/Services/PrivateAIProviderPromptFormat.swift b/Sources/Fluid/Services/PrivateAIProviderPromptFormat.swiftindex 50bdb4d2..785ebd8a 100644--- a/Sources/Fluid/Services/PrivateAIProviderPromptFormat.swift+++ b/Sources/Fluid/Services/PrivateAIProviderPromptFormat.swift@@ -5,27 +5,43 @@ enum PrivateAIProviderPromptFormat {PrivateAIProviderFeature.shared.promptSelectionID}- nonisolated static func matches(model: String) -> Bool {- PrivateAIProviderFeature.shared.matches(model: model)- }-static func isAvailable(settings: SettingsStore = .shared) -> Bool {- self.matches(model: self.selectedDictationModel(settings: settings))- }+ guard self.verifiedModelID(settings: settings) != nil else { return false }- private static func selectedDictationModel(settings: SettingsStore) -> String {- let providerID = settings.selectedProviderID- let selectedModelByProvider = settings.selectedModelByProvider-- if let saved = settings.savedProviders.first(where: { $0.id == providerID }) {- let key = "custom:\(saved.id)"- return selectedModelByProvider[key] ?? saved.models.first ?? ""+ if settings.selectedProviderID == PrivateAIProviderFeature.shared.providerID {+ return true}- if ModelRepository.shared.isBuiltIn(providerID) {- return selectedModelByProvider[providerID] ?? ModelRepository.shared.defaultModels(for: providerID).first ?? ""+ return self.isSoleStoredVerifiedProvider(settings: settings)+ }++ static func verifiedModelID(settings: SettingsStore = .shared) -> String? {+ guard PrivateFeatures.privateAIProvider else { return nil }+ let key = self.providerKey(for: PrivateAIProviderFeature.shared.providerID)+ let configuredModelID = PrivateAIIntegrationService.configuredModelID+ let modelID = PrivateAIModelRegistry.canonicalModelID(for: settings.selectedModelByProvider[key] ?? configuredModelID) ?? configuredModelID+ guard let model = PrivateAIModelRegistry.model(id: modelID),+ PrivateAIIntegrationService.isModelInstalled(model),+ settings.verifiedProviderFingerprints[key] == PrivateAIProviderFeature.verificationFingerprint(for: modelID)+ else {+ return nil}- return selectedModelByProvider[providerID] ?? ""+ return modelID+ }++ 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 "" }+ if ModelRepository.shared.isBuiltIn(trimmed) { return trimmed }+ if trimmed.hasPrefix("custom:") { return trimmed }+ return "custom:\(trimmed)"}}diff --git a/Sources/Fluid/Services/RewriteModeService.swift b/Sources/Fluid/Services/RewriteModeService.swiftindex 1366d5d2..0ac9ee25 100644--- a/Sources/Fluid/Services/RewriteModeService.swift+++ b/Sources/Fluid/Services/RewriteModeService.swift@@ -208,14 +208,31 @@ final class RewriteModeService: ObservableObject {// Use global provider/model when linked, otherwise use Edit Mode's independent settings.let providerID: String = {if settings.rewriteModeLinkedToGlobal {- let globalProvider = settings.selectedProviderID- if self.isProviderVerified(globalProvider, settings: settings) {- return globalProvider- }- return settings.rewriteModeSelectedProviderID+ return settings.selectedProviderID}return settings.rewriteModeSelectedProviderID}()+ guard !providerID.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {+ throw NSError(+ domain: "RewriteMode",+ code: -2,+ userInfo: [NSLocalizedDescriptionKey: "No verified AI provider selected"]+ )+ }+ guard !self.isPrivateAIProviderID(providerID) else {+ throw NSError(+ domain: "RewriteMode",+ code: -5,+ userInfo: [NSLocalizedDescriptionKey: "\(PrivateAIProviderFeature.displayName) for Edit Mode is coming soon. Choose a verified chat provider or turn Sync off."]+ )+ }+ guard self.isProviderVerified(providerID, settings: settings) else {+ throw NSError(+ domain: "RewriteMode",+ code: -3,+ userInfo: [NSLocalizedDescriptionKey: "Selected AI provider is not verified"]+ )+ }var systemPrompt = systemPromptBeforeContextlet contextText = self.selectedContextText.trimmingCharacters(in: .whitespacesAndNewlines)@@ -279,10 +296,27 @@ final class RewriteModeService: ObservableObject {}return settings.selectedModelByProvider[key]?? settings.selectedModel- ?? "gpt-4.1"+ ?? ModelRepository.shared.defaultModels(for: providerID).first+ ?? ""}- return settings.rewriteModeSelectedModel ?? "gpt-4.1"+ return settings.rewriteModeSelectedModel+ ?? ModelRepository.shared.defaultModels(for: providerID).first+ ?? ""}()+ guard !model.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {+ throw NSError(+ domain: "RewriteMode",+ code: -4,+ userInfo: [NSLocalizedDescriptionKey: "No AI model selected"]+ )+ }+ guard !PrivateAIIntegrationService.shouldHandleDictation(model: model) else {+ throw NSError(+ domain: "RewriteMode",+ code: -6,+ userInfo: [NSLocalizedDescriptionKey: "\(PrivateAIProviderFeature.displayName) for Edit Mode is coming soon. Choose a verified chat provider model."]+ )+ }self.appendDiagnosticLog("LLM config | writeMode=\(isWriteMode) | linkedToGlobal=\(settings.rewriteModeLinkedToGlobal) | " +"provider=\(providerID) | model=\(model) | profile=\(selectedPromptName) | " +@@ -409,9 +443,11 @@ final class RewriteModeService: ObservableObject {}private func providerKey(for providerID: String) -> String {- if ModelRepository.shared.isBuiltIn(providerID) { return providerID }- if providerID.hasPrefix("custom:") { return providerID }- return "custom:\(providerID)"+ let trimmed = providerID.trimmingCharacters(in: .whitespacesAndNewlines)+ guard !trimmed.isEmpty else { return "" }+ if ModelRepository.shared.isBuiltIn(trimmed) { return trimmed }+ if trimmed.hasPrefix("custom:") { return trimmed }+ return "custom:\(trimmed)"}private func providerBaseURL(for providerID: String, settings: SettingsStore) -> String {@@ -434,6 +470,7 @@ final class RewriteModeService: ObservableObject {}private func isProviderVerified(_ providerID: String, settings: SettingsStore) -> Bool {+ guard !self.isPrivateAIProviderID(providerID) else { return false }let key = self.providerKey(for: providerID)guard let stored = settings.verifiedProviderFingerprints[key] else { return false }if providerID == "apple-intelligence" {@@ -444,4 +481,9 @@ final class RewriteModeService: ObservableObject {let current = self.providerFingerprint(baseURL: baseURL, apiKey: apiKey)return current == stored}++ private func isPrivateAIProviderID(_ providerID: String) -> Bool {+ PrivateFeatures.privateAIProvider &&+ providerID.trimmingCharacters(in: .whitespacesAndNewlines) == PrivateAIProviderFeature.shared.providerID+ }}diff --git a/Sources/Fluid/Services/TypingService.swift b/Sources/Fluid/Services/TypingService.swiftindex b0976577..03460d51 100644--- a/Sources/Fluid/Services/TypingService.swift+++ b/Sources/Fluid/Services/TypingService.swift@@ -231,22 +231,29 @@ final class TypingService {/// Types/inserts text, optionally preferring a specific target PID for CGEvent posting./// This helps when our overlay temporarily has focus; we can still target the original app.func typeTextInstantly(_ text: String, preferredTargetPID: pid_t?) {+ let requestedAt = ProcessInfo.processInfo.systemUptime+ let mode = self.textInsertionMode+ let settleDelayMs = mode == .reliablePaste ? 80 : 200+ self.bench("request chars=\(text.count) mode=\(mode.rawValue) preferredPID=\(preferredTargetPID.map { String($0) } ?? "nil")")self.log("[TypingService] ENTRY: typeTextInstantly called with text length: \(text.count)")self.log("[TypingService] Text preview: \"\(String(text.prefix(100)))\"")guard text.isEmpty == false else {+ self.bench("request_return reason=empty_text")self.log("[TypingService] ERROR: Empty text provided, aborting")return}// Prevent concurrent typing operationsguard !self.isCurrentlyTyping else {+ self.bench("request_return reason=already_typing")self.log("[TypingService] WARNING: Skipping text injection - already in progress")return}// Check accessibility permissions firstguard AXIsProcessTrusted() else {+ self.bench("request_return reason=accessibility_not_trusted")self.log("[TypingService] ERROR: Accessibility permissions required for text injection")self.log("[TypingService] Current accessibility status: \(AXIsProcessTrusted())")return@@ -256,24 +263,46 @@ final class TypingService {self.isCurrentlyTyping = trueDispatchQueue.global(qos: .userInitiated).async {+ let workerStartedAt = ProcessInfo.processInfo.systemUptime+ self.bench("worker_start queueDelayMs=\(Self.elapsedMs(from: requestedAt, to: workerStartedAt))")+defer {self.isCurrentlyTyping = false+ self.bench("complete totalMs=\(Self.elapsedMs(since: requestedAt))")self.log("[TypingService] Typing operation completed, isCurrentlyTyping set to false")}self.log("[TypingService] Starting async text insertion process")- if self.textInsertionMode == .reliablePaste {+ if mode == .reliablePaste {// Reliable Paste still needs a short settle window after focus restoration.usleep(80_000)} else {// Direct typing paths are more timing-sensitive after app activation.usleep(200_000)}+ self.bench("settle_delay_done delayMs=\(settleDelayMs) elapsedMs=\(Self.elapsedMs(since: requestedAt))")self.log("[TypingService] Delay completed, calling insertTextInstantly")+ let insertStartedAt = ProcessInfo.processInfo.systemUptime+ self.bench("insert_call")self.insertTextInstantly(text, preferredTargetPID: preferredTargetPID)+ self.bench(+ "insert_return elapsedMs=\(Self.elapsedMs(since: insertStartedAt)) totalMs=\(Self.elapsedMs(since: requestedAt))"+ )}}+ private func bench(_ message: String) {+ DebugLogger.shared.benchmark("TYPING_BENCH", message: message, source: "TypingBenchmark")+ }++ private static func elapsedMs(since start: TimeInterval) -> Int {+ Int(((ProcessInfo.processInfo.systemUptime - start) * 1000).rounded())+ }++ private static func elapsedMs(from start: TimeInterval, to end: TimeInterval) -> Int {+ Int(((end - start) * 1000).rounded())+ }+// MARK: - Internal insertion pipelineprivate func insertTextInstantly(_ text: String, preferredTargetPID: pid_t?) {diff --git a/Sources/Fluid/UI/AISettings/AIEnhancementSettingsViewModel.swift b/Sources/Fluid/UI/AISettings/AIEnhancementSettingsViewModel.swiftindex d8793396..92adcce2 100644--- a/Sources/Fluid/UI/AISettings/AIEnhancementSettingsViewModel.swift+++ b/Sources/Fluid/UI/AISettings/AIEnhancementSettingsViewModel.swift@@ -14,14 +14,16 @@ final class AIEnhancementSettingsViewModel: ObservableObject {@Published var appear: Bool = false@Published var openAIBaseURL: String@Published var isDictationPromptOff: Bool = false+ @Published var isEditPromptOff: Bool = false// Model Management@Published var availableModelsByProvider: [String: [String]] = [:]@Published var selectedModelByProvider: [String: String] = [:]- @Published var availableModels: [String] = ["gpt-4.1"]- @Published var selectedModel: String = "gpt-4.1" {+ @Published var availableModels: [String] = []+ @Published var selectedModel: String = "" {didSet {guard self.selectedModel != "__ADD_MODEL__" else { return }+ guard !self.currentProvider.isEmpty else { return }self.selectedModelByProvider[self.currentProvider] = self.selectedModelself.settings.selectedModelByProvider = self.selectedModelByProvider}@@ -42,7 +44,7 @@ final class AIEnhancementSettingsViewModel: ObservableObject {// Provider Management@Published var appleIntelligenceAvailable: Bool = false@Published var providerAPIKeys: [String: String] = [:]- @Published var currentProvider: String = "openai"+ @Published var currentProvider: String = ""@Published var savedProviders: [SettingsStore.SavedProvider] = []@Published var selectedProviderID: String {didSet {@@ -123,7 +125,7 @@ final class AIEnhancementSettingsViewModel: ObservableObject {self.settings = settingsself.menuBarManager = menuBarManagerself.promptTest = promptTest- self.openAIBaseURL = ModelRepository.shared.defaultBaseURL(for: "openai")+ self.openAIBaseURL = ""self.selectedProviderID = settings.selectedProviderID}@@ -135,6 +137,7 @@ final class AIEnhancementSettingsViewModel: ObservableObject {// MARK: - Load Settingsfunc loadSettings() {+ self.settings.normalizeProviderSelectionForCurrentVerificationState()self.selectedProviderID = self.settings.selectedProviderIDself.availableModelsByProvider = self.settings.availableModelsByProvider@@ -147,11 +150,13 @@ final class AIEnhancementSettingsViewModel: ObservableObject {self.selectedDictationPromptID = self.settings.selectedDictationPromptIDself.selectedEditPromptID = self.settings.selectedEditPromptIDself.isDictationPromptOff = self.settings.isDictationPromptOff+ self.isEditPromptOff = self.settings.isEditPromptOff- if !ModelRepository.shared.isBuiltIn(self.selectedProviderID),+ if !self.selectedProviderID.isEmpty,+ !ModelRepository.shared.isBuiltIn(self.selectedProviderID),self.savedProviders.contains(where: { $0.id == self.selectedProviderID }) == false{- self.selectedProviderID = "openai"+ self.selectedProviderID = ""}// Normalize provider keys@@ -194,6 +199,7 @@ final class AIEnhancementSettingsViewModel: ObservableObject {self.openAIBaseURL = ModelRepository.shared.defaultBaseURL(for: self.selectedProviderID)self.availableModels = []} else {+ self.openAIBaseURL = ""self.availableModels = []}@@ -205,8 +211,9 @@ final class AIEnhancementSettingsViewModel: ObservableObject {self.availableModels = self.availableModelsByProvider[selectedKey] ?? []self.selectedModel = self.selectedModelByProvider[selectedKey] ?? ""- self.connectionStatus = self.connectionStatusByProvider[self.selectedProviderID] ?? .unknownself.refreshVerifiedProviders()+ self.selectSoleVerifiedProviderIfNeeded()+ self.connectionStatus = self.connectionStatusByProvider[self.selectedProviderID] ?? .unknownself.refreshProviderItems()DebugLogger.shared.debug(@@ -218,11 +225,14 @@ final class AIEnhancementSettingsViewModel: ObservableObject {// MARK: - Helper Functionsfunc providerKey(for providerID: String) -> String {+ let trimmed = providerID.trimmingCharacters(in: .whitespacesAndNewlines)+ guard !trimmed.isEmpty else { return "" }+// Built-in providers use their ID directly- if ModelRepository.shared.isBuiltIn(providerID) { return providerID }+ if ModelRepository.shared.isBuiltIn(trimmed) { return trimmed }// Custom providers get "custom:" prefix (if not already present)- if providerID.hasPrefix("custom:") { return providerID }- return providerID.isEmpty ? self.currentProvider : "custom:\(providerID)"+ if trimmed.hasPrefix("custom:") { return trimmed }+ return "custom:\(trimmed)"}func providerAPIKey(for providerID: String) -> String {@@ -248,6 +258,7 @@ final class AIEnhancementSettingsViewModel: ObservableObject {}switch providerID {+ case "": return "No Provider"case "openai": return "OpenAI"case "groq": return "Groq"case "apple-intelligence": return "Apple Intelligence"@@ -371,6 +382,7 @@ final class AIEnhancementSettingsViewModel: ObservableObject {self.settings.verifiedProviderFingerprints = fingerprintsself.selectedModelByProvider[key] = model.idself.settings.selectedModelByProvider = self.selectedModelByProvider+ self.selectProviderForUse(providerID)self.updateConnectionStatus(.success, for: providerID)self.connectionErrorMessage = ""DebugLogger.shared.info(@@ -419,11 +431,15 @@ final class AIEnhancementSettingsViewModel: ObservableObject {}func selectProvider(_ providerID: String) {+ self.selectProviderForUse(providerID)+ self.setEditingAPIKey(true, for: providerID)+ }++ private func selectProviderForUse(_ providerID: String) {self.selectedProviderID = providerIDself.handleProviderChange(providerID)self.connectionStatus = self.connectionStatusByProvider[providerID] ?? .unknownself.connectionErrorMessage = self.connectionErrorMessage(for: providerID)- self.setEditingAPIKey(true, for: providerID)}@discardableResult@@ -984,6 +1000,14 @@ final class AIEnhancementSettingsViewModel: ObservableObject {// MARK: - Provider/Model Handlingfunc handleProviderChange(_ newValue: String) {+ if newValue.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {+ self.openAIBaseURL = ""+ self.updateCurrentProvider()+ self.availableModels = []+ self.selectedModel = ""+ return+ }+// Handle Apple Intelligence specially (no base URL)if newValue == "apple-intelligence" {self.openAIBaseURL = ""@@ -1060,13 +1084,13 @@ final class AIEnhancementSettingsViewModel: ObservableObject {self.settings.verifiedProviderFingerprints.removeValue(forKey: key)self.settings.availableModelsByProvider = self.availableModelsByProviderself.settings.selectedModelByProvider = self.selectedModelByProvider- // Reset to OpenAI- self.selectedProviderID = "openai"- self.openAIBaseURL = ModelRepository.shared.defaultBaseURL(for: "openai")+ self.selectedProviderID = ""+ self.openAIBaseURL = ""self.updateCurrentProvider()- // Use fetched models if available, fall back to defaults (same logic as handleProviderChange)- self.availableModels = self.availableModelsByProvider["openai"] ?? ModelRepository.shared.defaultModels(for: "openai")- self.selectedModel = self.selectedModelByProvider["openai"] ?? self.availableModels.first ?? ""+ self.availableModels = []+ self.selectedModel = ""+ self.refreshVerifiedProviders()+ self.selectSoleVerifiedProviderIfNeeded()}func saveEditedProvider() {@@ -1266,6 +1290,8 @@ final class AIEnhancementSettingsViewModel: ObservableObject {}private func providerBaseURL(for providerID: String) -> String {+ guard !providerID.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else { return "" }+let currentBaseURL = self.openAIBaseURL.trimmingCharacters(in: .whitespacesAndNewlines)if let saved = self.savedProviders.first(where: { $0.id == providerID }) {return saved.baseURL.trimmingCharacters(in: .whitespacesAndNewlines)@@ -1354,8 +1380,7 @@ final class AIEnhancementSettingsViewModel: ObservableObject {continue}if providerID == PrivateAIProviderFeature.shared.providerID {- let selected = self.selectedModelByProvider[key] ?? PrivateAIIntegrationService.configuredModelID- if self.settings.verifiedProviderFingerprints[key] == self.privateAIFingerprint(for: selected) {+ if PrivateAIProviderPromptFormat.verifiedModelID(settings: self.settings) != nil {statuses[providerID] = .success} else if statuses[providerID] == .success {statuses[providerID] = .unknown@@ -1379,6 +1404,21 @@ final class AIEnhancementSettingsViewModel: ObservableObject {self.connectionStatus = statuses[self.selectedProviderID] ?? .unknown}+ private func selectSoleVerifiedProviderIfNeeded() {+ guard self.connectionStatusByProvider[self.selectedProviderID] != .success else { return }+ let currentProviderIDs = ModelRepository.builtInProviderIDs + self.savedProviders.map(\.id)+ let verifiedProviderIDs = currentProviderIDs.filter { providerID in+ self.connectionStatusByProvider[providerID] == .success+ }+ guard verifiedProviderIDs.count == 1,+ let providerID = verifiedProviderIDs.first+ else {+ return+ }++ self.selectProviderForUse(providerID)+ }+func openReasoningConfig() {let pKey = self.providerKey(for: self.selectedProviderID)if let config = self.settings.getReasoningConfig(forModel: selectedModel, provider: pKey) {@@ -1763,12 +1803,17 @@ final class AIEnhancementSettingsViewModel: ObservableObject {self.selectedDictationPromptID = self.settings.selectedDictationPromptIDself.selectedEditPromptID = self.settings.selectedEditPromptIDself.isDictationPromptOff = self.settings.isDictationPromptOff+ self.isEditPromptOff = self.settings.isEditPromptOff}func isPrimaryDictationPromptSelectionOff() -> Bool {return self.settings.isDictationPromptOff}+ func isPromptSelectionOff(for mode: SettingsStore.PromptMode) -> Bool {+ self.settings.isPromptOff(for: mode)+ }+func isPrivateAIPromptAvailable() -> Bool {PrivateAIProviderPromptFormat.isAvailable(settings: self.settings)}@@ -1786,12 +1831,22 @@ final class AIEnhancementSettingsViewModel: ObservableObject {self.settings.setDictationPromptSelection(.privateAI)self.selectedDictationPromptID = self.settings.selectedDictationPromptIDself.isDictationPromptOff = self.settings.isDictationPromptOff+ self.isEditPromptOff = self.settings.isEditPromptOff}func selectPrimaryDictationPromptOff() {self.settings.setDictationPromptSelection(.off)self.selectedDictationPromptID = self.settings.selectedDictationPromptIDself.isDictationPromptOff = self.settings.isDictationPromptOff+ self.isEditPromptOff = self.settings.isEditPromptOff+ }++ func setPromptSelectionOff(_ isOff: Bool, for mode: SettingsStore.PromptMode) {+ self.settings.setPromptOff(isOff, for: mode)+ self.selectedDictationPromptID = self.settings.selectedDictationPromptID+ self.selectedEditPromptID = self.settings.selectedEditPromptID+ self.isDictationPromptOff = self.settings.isDictationPromptOff+ self.isEditPromptOff = self.settings.isEditPromptOff}private func resolveBindingTargetApp() -> (name: String, bundleID: String)? {@@ -1890,6 +1945,7 @@ final class AIEnhancementSettingsViewModel: ObservableObject {self.selectedDictationPromptID = self.settings.selectedDictationPromptIDself.selectedEditPromptID = self.settings.selectedEditPromptIDself.isDictationPromptOff = self.settings.isDictationPromptOff+ self.isEditPromptOff = self.settings.isEditPromptOff}func hasDefaultPromptOverride(for mode: SettingsStore.PromptMode) -> Bool {diff --git a/Sources/Fluid/UI/AISettingsView+AIConfiguration.swift b/Sources/Fluid/UI/AISettingsView+AIConfiguration.swiftindex e35e1a87..00524a04 100644--- a/Sources/Fluid/UI/AISettingsView+AIConfiguration.swift+++ b/Sources/Fluid/UI/AISettingsView+AIConfiguration.swift@@ -542,9 +542,10 @@ extension AIEnhancementSettingsView {let isLoading = self.privateAILoadState.isLoading(model.id)let isLoaded = self.privateAILoadState.isLoaded(model.id)let hasLoadFailure = self.privateAILoadState.failureMessage(for: model.id) != nil+ let isVerified = self.isPrivateAIModelVerified(model)let isTesting = self.viewModel.isTestingConnection && self.viewModel.selectedProviderID == PrivateAIProviderFeature.shared.providerIDlet isBusy = isDownloading || isLoading || isTesting- let canVerify = isInstalled && !self.privateAISelectedModelID.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty+ let canVerify = isInstalled && (!isVerified || hasLoadFailure) && !self.privateAISelectedModelID.trimmingCharacters(in: .whitespacesAndNewlines).isEmptyreturn VStack(alignment: .leading, spacing: 10) {HStack(spacing: 10) {@@ -570,7 +571,7 @@ extension AIEnhancementSettingsView {.help("Open downloaded model folder")}- if isDownloading || isLoading || isLoaded || hasLoadFailure || !isInstalled {+ if isDownloading || isLoading || isLoaded || hasLoadFailure || isVerified || !isInstalled {self.privateAIModelStatusRow(status: status,progress: downloadProgress,@@ -599,42 +600,44 @@ extension AIEnhancementSettingsView {)}- if canVerify {- Button(action: { self.verifyPrivateAIConnection(model) }) {- HStack(spacing: 6) {- if isTesting {- ProgressView()- .controlSize(.mini)- .fixedSize()+ if !isInstalled {+ if model.canDownload {+ Button(action: { self.downloadPrivateAIModel(model) }) {+ HStack(spacing: 6) {+ if isDownloading {+ ProgressView()+ .controlSize(.mini)+ .fixedSize()+ }+ Text(isDownloading ? Self.downloadButtonText(progress: downloadProgress) : "Download & Verify")+ .font(.system(size: 13, weight: .semibold))}- Text(isTesting ? "Loading..." : "Verify")- .font(.system(size: 13, weight: .semibold))}+ .buttonStyle(AccentButtonStyle(compact: true))+ .disabled(isBusy)+ } else {+ HStack(spacing: 6) {+ Image(systemName: "info.circle")+ .font(.caption)+ Text("Install the selected model to enable verification")+ .font(.caption)+ }+ .foregroundStyle(.secondary)}- .buttonStyle(AccentButtonStyle(compact: true))- .disabled(isBusy)- } else if model.canDownload {- Button(action: { self.downloadPrivateAIModel(model) }) {+ } else if canVerify {+ Button(action: { self.verifyPrivateAIConnection(model) }) {HStack(spacing: 6) {- if isDownloading {+ if isTesting {ProgressView().controlSize(.mini).fixedSize()}- Text(isDownloading ? Self.downloadButtonText(progress: downloadProgress) : "Download & Verify")+ Text(isTesting ? "Loading..." : "Verify").font(.system(size: 13, weight: .semibold))}}.buttonStyle(AccentButtonStyle(compact: true)).disabled(isBusy)- } else {- HStack(spacing: 6) {- Image(systemName: "info.circle")- .font(.caption)- Text("Install the selected model to enable verification")- .font(.caption)- }- .foregroundStyle(.secondary)}}}@@ -817,6 +820,12 @@ extension AIEnhancementSettingsView {PrivateAIModelRegistry.model(id: self.privateAISelectedModelID) ?? PrivateAIModelRegistry.defaultModel}+ private func isPrivateAIModelVerified(_ model: PrivateAIRegisteredModel) -> Bool {+ guard PrivateAIIntegrationService.isModelInstalled(model) else { return false }+ let key = self.viewModel.providerKey(for: PrivateAIProviderFeature.shared.providerID)+ return self.viewModel.settings.verifiedProviderFingerprints[key] == PrivateAIProviderFeature.verificationFingerprint(for: model.id)+ }+private func privateAIModelStatus(for model: PrivateAIRegisteredModel) -> PrivateAIProviderModelStatus {@@ -836,7 +845,7 @@ extension AIEnhancementSettingsView {if self.privateAILoadState.isLoaded(model.id) {return PrivateAIProviderModelStatus(- detail: "Ready.",+ detail: "Ready. Supports dictation mode only.",color: Color.fluidGreen)}@@ -848,6 +857,13 @@ extension AIEnhancementSettingsView {)}+ if self.isPrivateAIModelVerified(model) {+ return PrivateAIProviderModelStatus(+ detail: "Ready. Supports dictation mode only.",+ color: Color.fluidGreen+ )+ }+if PrivateAIIntegrationService.isModelInstalled(model) {return PrivateAIProviderModelStatus(detail: "Ready to verify.",@@ -1354,6 +1370,7 @@ extension AIEnhancementSettingsView {let isFluidLoading = self.privateAILoadState.isLoading(fluidModel.id)let isFluidLoaded = self.privateAILoadState.isLoaded(fluidModel.id)let hasFluidLoadFailure = self.privateAILoadState.failureMessage(for: fluidModel.id) != nil+ let isFluidVerified = self.isPrivateAIModelVerified(fluidModel)let isFluidTesting = self.viewModel.isTestingConnection && self.viewModel.selectedProviderID == PrivateAIProviderFeature.shared.providerIDlet isFluidBusy = isFluidDownloading || isFluidLoading || isFluidTestinglet isRefreshing = self.viewModel.isFetchingModels && self.viewModel.selectedProviderID == item.id@@ -1432,7 +1449,7 @@ extension AIEnhancementSettingsView {.buttonStyle(AccentButtonStyle(compact: true)).disabled(!fluidModel.canDownload || isFluidBusy).help(fluidModel.canDownload ? "Download and verify selected model" : "Download URL is not configured yet")- } else if !isFluidLoaded {+ } else if !isFluidVerified || hasFluidLoadFailure {Button(action: { self.verifyPrivateAIConnection(fluidModel) }) {HStack(spacing: 5) {if isFluidLoading || isFluidTesting {@@ -1473,7 +1490,7 @@ extension AIEnhancementSettingsView {}}- if isPrivateAIProvider, isFluidDownloading || isFluidLoading || isFluidLoaded || hasFluidLoadFailure || !isFluidInstalled {+ if isPrivateAIProvider, isFluidDownloading || isFluidLoading || isFluidLoaded || hasFluidLoadFailure || isFluidVerified || !isFluidInstalled {self.privateAIModelStatusRow(status: fluidStatus,progress: fluidDownloadProgress,diff --git a/Sources/Fluid/UI/AISettingsView+AdvancedSettings.swift b/Sources/Fluid/UI/AISettingsView+AdvancedSettings.swiftindex a8c4d23d..4db0dd1f 100644--- a/Sources/Fluid/UI/AISettingsView+AdvancedSettings.swift+++ b/Sources/Fluid/UI/AISettingsView+AdvancedSettings.swift@@ -189,16 +189,22 @@ extension AIEnhancementSettingsView {}private var promptProcessingControl: some View {- let isPrivateAILocked = self.viewModel.isPrivateAIModelSelected()- let isOff = self.viewModel.isPrimaryDictationPromptSelectionOff()+ let mode = self.selectedPromptMode.normalized+ let isPrivateAILocked = mode == .dictate && self.viewModel.isPrivateAIModelSelected()+ let isOff = self.viewModel.isPromptSelectionOff(for: mode)let helpText: String = {if isOff {- return "Off: dictation types the raw transcript. Prompts and app overrides are paused."+ switch mode {+ case .dictate:+ return "Off: dictation types the raw transcript. Prompts and app overrides are paused."+ case .edit, .write, .rewrite:+ return "Off: Edit Text uses the built-in prompt. Custom prompts and app overrides are paused."+ }}if isPrivateAILocked {return "On: \(PrivateAIProviderFeature.displayName) uses the \(PrivateAIProviderFeature.displayName) prompt."}- return "On: dictation follows the selected prompt scope."+ return mode == .dictate ? "On: dictation follows the selected prompt scope." : "On: Edit Text follows the selected prompt scope."}()return HStack(alignment: .center, spacing: 7) {@@ -207,7 +213,7 @@ extension AIEnhancementSettingsView {.foregroundStyle(self.theme.palette.secondaryText).lineLimit(1)- self.cleanupSegmentedControl(isOff: isOff, mode: .dictate)+ self.cleanupSegmentedControl(isOff: isOff, mode: mode)}.help(helpText)}@@ -276,7 +282,7 @@ extension AIEnhancementSettingsView {let tone = self.modeAccentColor(mode)let isPrivateAILocked = mode.normalized == .dictate && self.viewModel.isPrivateAIModelSelected()let isSelectedAppsOnly = !isPrivateAILocked && self.viewModel.promptRoutingScope(for: mode) == .selectedAppsOnly- let isPromptRoutingPaused = mode.normalized == .dictate && self.viewModel.isPrimaryDictationPromptSelectionOff()+ let isPromptRoutingPaused = self.viewModel.isPromptSelectionOff(for: mode)VStack(alignment: .leading, spacing: 8) {HStack(spacing: 8) {@@ -298,6 +304,19 @@ extension AIEnhancementSettingsView {}.padding(.horizontal, 2)+ if isPrivateAILocked {+ HStack(spacing: 5) {+ Image(systemName: "exclamationmark.circle.fill")+ .font(.caption2)+ Text("\(PrivateAIProviderFeature.displayName) only works with the \(PrivateAIProviderFeature.displayName) prompt.")+ .font(.caption2)+ .fontWeight(.semibold)+ .lineLimit(1)+ }+ .foregroundStyle(.orange)+ .padding(.horizontal, 4)+ }+self.promptModeHintRow(mode: mode)VStack(alignment: .leading, spacing: 8) {@@ -305,7 +324,7 @@ extension AIEnhancementSettingsView {if isSelectedAppsOnly {self.selectedAppsOnlySummary(mode: mode)- self.appPromptBindingsSection(mode: mode, isEmphasized: true)+ self.appPromptBindingsSection(mode: mode, isEmphasized: true, isEnabled: !isPromptRoutingPaused)} else {self.promptProfileCard(cardKey: "\(mode.normalized.rawValue)-default",@@ -314,14 +333,14 @@ extension AIEnhancementSettingsView {mode: mode,isSelected: mode.normalized == .dictate? (!isPrivateAILocked && !self.viewModel.isPrimaryDictationPromptSelectionOff() && self.viewModel.selectedPromptID(for: mode) == nil)- : self.viewModel.selectedPromptID(for: mode) == nil,+ : (!isPromptRoutingPaused && self.viewModel.selectedPromptID(for: mode) == nil),onUse: {self.viewModel.setSelectedPromptID(nil, for: mode)},onManage: { self.viewModel.openDefaultPromptViewer(for: mode) },onResetDefault: { self.viewModel.resetDefaultPromptOverride(for: mode) },canResetDefault: self.viewModel.hasDefaultPromptOverride(for: mode),- isEnabled: !isPrivateAILocked+ isEnabled: !isPrivateAILocked && !isPromptRoutingPaused)if mode.normalized == .dictate && PrivateFeatures.privateAIProvider {@@ -354,25 +373,18 @@ extension AIEnhancementSettingsView {? "Empty prompt (uses Default)": self.viewModel.promptPreview(SettingsStore.stripBasePrompt(for: profile.mode, from: profile.prompt)),mode: profile.mode,- isSelected: !isPrivateAILocked && self.viewModel.selectedPromptID(for: profile.mode) == profile.id,+ isSelected: !isPrivateAILocked && !isPromptRoutingPaused && self.viewModel.selectedPromptID(for: profile.mode) == profile.id,onUse: {self.viewModel.setSelectedPromptID(profile.id, for: profile.mode)},onManage: { self.viewModel.openEditor(for: profile) },onDelete: { self.viewModel.requestDeletePrompt(profile) },- isEnabled: !isPrivateAILocked+ isEnabled: !isPrivateAILocked && !isPromptRoutingPaused)}}- self.appPromptBindingsSection(mode: mode, isEnabled: !isPrivateAILocked)- }-- if isPrivateAILocked {- Text("\(PrivateAIProviderFeature.displayName) selected. Only the \(PrivateAIProviderFeature.displayName) prompt is available when AI Enhancement is On.")- .font(.caption2)- .foregroundStyle(.secondary)- .padding(.horizontal, 4)+ self.appPromptBindingsSection(mode: mode, isEnabled: !isPrivateAILocked && !isPromptRoutingPaused)}}.opacity(isPromptRoutingPaused ? 0.34 : 1)@@ -414,7 +426,7 @@ extension AIEnhancementSettingsView {key: "off",isSelected: isOff,tone: tone,- action: { self.viewModel.selectPrimaryDictationPromptOff() }+ action: { self.viewModel.setPromptSelectionOff(true, for: mode) })self.cleanupSegmentButton(@@ -592,12 +604,35 @@ extension AIEnhancementSettingsView {.font(.system(size: 12, weight: .semibold)).foregroundStyle(self.theme.palette.secondaryText)- if verified.isEmpty {+ if self.isEditModeLinkedToPrivateAI {+ Toggle("Sync", isOn: self.editModeLinkedToGlobalBinding)+ .toggleStyle(.checkbox)+ .font(.caption)+ .foregroundStyle(.secondary)+ .fixedSize(horizontal: true, vertical: false)+ .onChange(of: self.settings.rewriteModeLinkedToGlobal) { _, linked in+ if linked {+ self.syncEditModeToGlobalSelection()+ } else {+ self.normalizeEditModeProviderSelection()+ }+ }++ HStack(spacing: 8) {+ Image(systemName: "clock")+ .font(.system(size: 12))+ .foregroundStyle(.secondary)+ Text("\(PrivateAIProviderFeature.displayName) for Edit Mode is coming soon")+ .font(.caption)+ .foregroundStyle(.secondary)+ .lineLimit(1)+ }+ } else if verified.isEmpty {HStack(spacing: 8) {Image(systemName: "info.circle").font(.system(size: 12)).foregroundStyle(.secondary)- Text("No verified provider")+ Text("No verified chat provider").font(.caption).foregroundStyle(.secondary).lineLimit(1)@@ -655,7 +690,9 @@ extension AIEnhancementSettingsView {.frame(maxWidth: .infinity, alignment: .trailing).onAppear {self.ensureDefaultEditModeSyncState()- if !verified.isEmpty {+ if self.settings.rewriteModeLinkedToGlobal {+ self.syncEditModeToGlobalSelection()+ } else if !verified.isEmpty {self.normalizeEditModeProviderSelection()}}@@ -838,9 +875,11 @@ extension AIEnhancementSettingsView {}private var editModeVerifiedProviders: [AIEnhancementSettingsViewModel.ProviderItemData] {- self.viewModel.cachedVerifiedProviderItems.sorted { lhs, rhs in- lhs.name.localizedCaseInsensitiveCompare(rhs.name) == .orderedAscending- }+ self.viewModel.cachedVerifiedProviderItems+ .filter { !self.isPrivateAIProviderID($0.id) }+ .sorted { lhs, rhs in+ lhs.name.localizedCaseInsensitiveCompare(rhs.name) == .orderedAscending+ }}private var editModeSelectedProviderID: String {@@ -854,14 +893,16 @@ extension AIEnhancementSettingsView {private var activeEditModeProviderID: String {if self.settings.rewriteModeLinkedToGlobal {let global = self.viewModel.selectedProviderID- if self.editModeVerifiedProviders.contains(where: { $0.id == global }) {- return global- }- return self.editModeSelectedProviderID+ return self.isPrivateAIProviderID(global) ? "" : global}return self.editModeSelectedProviderID}+ private var isEditModeLinkedToPrivateAI: Bool {+ self.settings.rewriteModeLinkedToGlobal &&+ self.isPrivateAIProviderID(self.viewModel.selectedProviderID)+ }+private var editModeLinkedToGlobalBinding: Binding<Bool> {Binding(get: { self.settings.rewriteModeLinkedToGlobal },@@ -920,20 +961,20 @@ extension AIEnhancementSettingsView {private func syncEditModeToGlobalSelection() {let global = self.viewModel.selectedProviderID- let providerID: String- if self.editModeVerifiedProviders.contains(where: { $0.id == global }) {- providerID = global- } else if let fallback = self.editModeVerifiedProviders.first?.id {- providerID = fallback- } else {- providerID = global+ guard !global.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty,+ !self.isPrivateAIProviderID(global)+ else {+ self.settings.rewriteModeSelectedProviderID = ""+ self.settings.rewriteModeSelectedModel = nil+ return}- self.settings.rewriteModeSelectedProviderID = providerID- let key = self.viewModel.providerKey(for: providerID)+ self.settings.rewriteModeSelectedProviderID = global++ let key = self.viewModel.providerKey(for: global)let model = self.settings.selectedModelByProvider[key]?? self.settings.selectedModel- ?? self.viewModel.models(for: providerID).first+ ?? self.viewModel.models(for: global).firstself.settings.rewriteModeSelectedModel = model}@@ -945,6 +986,11 @@ extension AIEnhancementSettingsView {}}+ private func isPrivateAIProviderID(_ providerID: String) -> Bool {+ PrivateFeatures.privateAIProvider &&+ providerID.trimmingCharacters(in: .whitespacesAndNewlines) == PrivateAIProviderFeature.shared.providerID+ }+private func canFetchModels(for providerID: String) -> Bool {let apiKey = self.viewModel.providerAPIKey(for: providerID)let hasAPIKey = !apiKey.trimmingCharacters(in: .whitespacesAndNewlines).isEmptydiff --git a/Sources/Fluid/Views/BottomOverlayView.swift b/Sources/Fluid/Views/BottomOverlayView.swiftindex 6cd366e7..6d699c5c 100644--- a/Sources/Fluid/Views/BottomOverlayView.swift+++ b/Sources/Fluid/Views/BottomOverlayView.swift@@ -52,6 +52,9 @@ final class BottomOverlayWindowController {}func show(audioPublisher: AnyPublisher<CGFloat, Never>, mode: OverlayMode) {+ let startedAt = ProcessInfo.processInfo.systemUptime+ Self.overlayBench("bottom_show_start mode=\(mode.rawValue) windowExists=\(self.window != nil)")+self.endReleaseTransition(flushDeferredUpdate: false)self.pendingResizeWorkItem?.cancel()self.pendingResizeWorkItem = nil@@ -91,15 +94,24 @@ final class BottomOverlayWindowController {// Show with animationself.window?.alphaValue = 0self.window?.orderFrontRegardless()+ Self.overlayBench("bottom_order_front elapsedMs=\(Self.elapsedMs(since: startedAt))")NSAnimationContext.runAnimationGroup { context incontext.duration = 0.25context.timingFunction = CAMediaTimingFunction(name: .easeOut)self.window?.animator().alphaValue = 1+ } completionHandler: {+ let elapsedMs = Int(((ProcessInfo.processInfo.systemUptime - startedAt) * 1000).rounded())+ Task { @MainActor in+ Self.overlayBench("bottom_fade_complete elapsedMs=\(elapsedMs)")+ }}}func hide() {+ let startedAt = ProcessInfo.processInfo.systemUptime+ Self.overlayBench("bottom_hide_start windowExists=\(self.window != nil)")+// Cancel audio subscriptionself.audioSubscription?.cancel()self.audioSubscription = nil@@ -120,6 +132,7 @@ final class BottomOverlayWindowController {guard let window = window else {self.endReleaseTransition(flushDeferredUpdate: false)NotchContentState.shared.setBottomOverlayDismissing(false)+ Self.overlayBench("bottom_hide_return reason=no_window")return}@@ -133,6 +146,10 @@ final class BottomOverlayWindowController {window.animator().alphaValue = 0} completionHandler: {window.orderOut(nil)+ let elapsedMs = Int(((ProcessInfo.processInfo.systemUptime - startedAt) * 1000).rounded())+ Task { @MainActor in+ Self.overlayBench("bottom_hide_complete elapsedMs=\(elapsedMs)")+ }Task { @MainActor inself.endReleaseTransition(flushDeferredUpdate: false)NotchContentState.shared.setBottomOverlayDismissing(false)@@ -141,6 +158,7 @@ final class BottomOverlayWindowController {}func setProcessing(_ processing: Bool) {+ Self.overlayBench("bottom_set_processing processing=\(processing)")NotchContentState.shared.setProcessing(processing)}@@ -186,6 +204,14 @@ final class BottomOverlayWindowController {}}+ private static func overlayBench(_ message: String) {+ DebugLogger.shared.benchmark("OVERLAY_BENCH", message: message, source: "OverlayBenchmark")+ }++ private static func elapsedMs(since start: TimeInterval) -> Int {+ Int(((ProcessInfo.processInfo.systemUptime - start) * 1000).rounded())+ }+private func scheduleSizeAndPositionUpdate(after delay: TimeInterval = 0.08) {if self.isReleaseTransitionActive {self.deferredResizePending = truediff --git a/Sources/Fluid/Views/CommandModeView.swift b/Sources/Fluid/Views/CommandModeView.swiftindex 1f1660de..1423d658 100644--- a/Sources/Fluid/Views/CommandModeView.swift+++ b/Sources/Fluid/Views/CommandModeView.swift@@ -500,6 +500,7 @@ struct CommandModeView: View {if newValue == "apple-intelligence-disabled" || newValue == "apple-intelligence" {return}+ guard !self.isPrivateAIProviderID(newValue) else { return }self.settings.commandModeSelectedProviderID = newValueself.updateAvailableModels()}@@ -612,6 +613,10 @@ struct CommandModeView: View {private func updateAvailableModels() {let currentProviderID = self.settings.effectiveCommandModeProviderIDlet currentModel = self.settings.commandModeSelectedModel ?? ""+ guard !currentProviderID.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {+ self.availableModels = []+ return+ }self.availableModels = self.settings.commandModeModels(for: currentProviderID)// If current model not in list, select first available@@ -626,7 +631,7 @@ struct CommandModeView: View {includeAppleIntelligence: true,appleIntelligenceAvailable: false,appleIntelligenceDisabledReason: "No tools"- )+ ).filter { !self.isPrivateAIProviderID($0.id) }}private var verifiedBuiltInProvidersList: [(id: String, name: String)] {@@ -636,6 +641,11 @@ struct CommandModeView: View {private var verifiedSavedProviders: [SettingsStore.SavedProvider] {self.settings.savedProviders.filter { self.settings.isCommandModeProviderVerified($0.id) }}++ private func isPrivateAIProviderID(_ providerID: String) -> Bool {+ PrivateFeatures.privateAIProvider &&+ providerID.trimmingCharacters(in: .whitespacesAndNewlines) == PrivateAIProviderFeature.shared.providerID+ }}// MARK: - Shimmer Effect (Cursor-style)diff --git a/Sources/Fluid/Views/RewriteModeView.swift b/Sources/Fluid/Views/RewriteModeView.swiftindex 85f7a6be..0ef20925 100644--- a/Sources/Fluid/Views/RewriteModeView.swift+++ b/Sources/Fluid/Views/RewriteModeView.swift@@ -175,13 +175,15 @@ struct RewriteModeView: View {// Provider Selector (compact, searchable)SearchableProviderPicker(builtInProviders: self.builtInProvidersList,- savedProviders: self.settings.savedProviders,+ savedProviders: self.settings.savedProviders.filter { !self.isPrivateAIProviderID($0.id) },selectedProviderID: Binding(get: { self.settings.rewriteModeSelectedProviderID },set: { newValue in// Prevent selecting disabled Apple Intelligenceif newValue == "apple-intelligence-disabled" {- self.settings.rewriteModeSelectedProviderID = "openai"+ return+ } else if self.isPrivateAIProviderID(newValue) {+ return} else {self.settings.rewriteModeSelectedProviderID = newValue}@@ -283,7 +285,17 @@ struct RewriteModeView: View {private func updateAvailableModels() {let currentProviderID = self.settings.rewriteModeSelectedProviderID- let currentModel = self.settings.rewriteModeSelectedModel ?? "gpt-4.1"+ let currentModel = self.settings.rewriteModeSelectedModel ?? ""+ if self.isPrivateAIProviderID(currentProviderID) {+ self.settings.rewriteModeSelectedProviderID = ""+ self.settings.rewriteModeSelectedModel = nil+ self.availableModels = []+ return+ }+ guard !currentProviderID.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {+ self.availableModels = []+ return+ }// Apple Intelligence has only one modelif currentProviderID == "apple-intelligence" {@@ -305,7 +317,7 @@ struct RewriteModeView: View {// If current model not in list, select first availableif !self.availableModels.contains(currentModel) {- self.settings.rewriteModeSelectedModel = self.availableModels.first ?? "gpt-4.1"+ self.settings.rewriteModeSelectedModel = self.availableModels.first}}@@ -317,7 +329,12 @@ struct RewriteModeView: View {ModelRepository.shared.builtInProvidersList(includeAppleIntelligence: true,appleIntelligenceAvailable: AppleIntelligenceService.isAvailable- )+ ).filter { !self.isPrivateAIProviderID($0.id) }+ }++ private func isPrivateAIProviderID(_ providerID: String) -> Bool {+ PrivateFeatures.privateAIProvider &&+ providerID.trimmingCharacters(in: .whitespacesAndNewlines) == PrivateAIProviderFeature.shared.providerID}private var shortcutDisplay: String {diff --git a/Tests/FluidDictationIntegrationTests/DictationE2ETests.swift b/Tests/FluidDictationIntegrationTests/DictationE2ETests.swiftindex 5799ef42..a7b695ab 100644--- a/Tests/FluidDictationIntegrationTests/DictationE2ETests.swift+++ b/Tests/FluidDictationIntegrationTests/DictationE2ETests.swift@@ -12,12 +12,16 @@ final class DictationE2ETests: XCTestCase {private let selectedDictationPromptIDKey = "SelectedDictationPromptID"private let selectedEditPromptIDKey = "SelectedEditPromptID"private let dictationPromptOffKey = "DictationPromptOff"+ private let editPromptOffKey = "EditPromptOff"private let defaultDictationPromptOverrideKey = "DefaultDictationPromptOverride"private let defaultEditPromptOverrideKey = "DefaultEditPromptOverride"private let savedProvidersKey = "SavedProviders"private let selectedProviderIDKey = "SelectedProviderID"private let availableModelsByProviderKey = "AvailableModelsByProvider"private let selectedModelByProviderKey = "SelectedModelByProvider"+ private let commandModeLinkedToGlobalKey = "CommandModeLinkedToGlobal"+ private let commandModeSelectedProviderIDKey = "CommandModeSelectedProviderID"+ private let commandModeSelectedModelKey = "CommandModeSelectedModel"private var privateAISelectedModelIDKey: String { PrivateAIProviderFeature.shared.selectedModelDefaultsKey }private var privateAILocalModelPathKey: String { PrivateAIProviderFeature.shared.localModelPathDefaultsKey }private var privateAIPrefixKVCacheEnabledKey: String { PrivateAIProviderFeature.shared.prefixCacheDefaultsKey }@@ -155,6 +159,48 @@ final class DictationE2ETests: XCTestCase {}}+ func testEditPromptOffUsesBuiltInDefaultAndPausesOverrides() {+ self.withPromptSettingsRestored {+ let settings = SettingsStore.shared++ let global = SettingsStore.DictationPromptProfile(+ name: "Global Edit",+ prompt: "Global edit prompt",+ mode: .edit+ )+ let mail = SettingsStore.DictationPromptProfile(+ name: "Mail Edit",+ prompt: "Mail edit prompt",+ mode: .edit+ )++ settings.dictationPromptProfiles = [global, mail]+ settings.selectedEditPromptID = global.id+ settings.defaultEditPromptOverride = "Custom default edit prompt"+ settings.appPromptBindings = [+ SettingsStore.AppPromptBinding(+ mode: .edit,+ appBundleID: "com.apple.mail",+ appName: "Mail",+ promptID: mail.id+ ),+ ]++ settings.setPromptOff(true, for: .edit)++ let paused = settings.promptResolution(for: .edit, appBundleID: "com.apple.mail")+ XCTAssertEqual(paused.source, .builtInDefault)+ XCTAssertNil(paused.profile)+ XCTAssertNil(paused.appBinding)+ XCTAssertEqual(paused.systemPrompt, SettingsStore.defaultSystemPromptText(for: .edit))++ settings.setSelectedPromptID(global.id, for: .edit)++ XCTAssertFalse(settings.isPromptOff(for: .edit))+ XCTAssertEqual(settings.promptResolution(for: .edit, appBundleID: nil).profile?.id, global.id)+ }+ }+func testAppPromptBindings_reconcileInvalidPromptAndLegacyMode() {self.withPromptSettingsRestored {let settings = SettingsStore.shared@@ -244,14 +290,14 @@ final class DictationE2ETests: XCTestCase {}}- func testUnavailableSelectedProviderFallsBackToOpenAI() {+ func testUnavailableSelectedProviderClearsSelection() {self.withProviderSettingsRestored {let settings = SettingsStore.sharedsettings.savedProviders = []settings.selectedProviderID = "removed-provider"- XCTAssertEqual(settings.selectedProviderID, "openai")+ XCTAssertEqual(settings.selectedProviderID, "")}}@@ -394,6 +440,29 @@ final class DictationE2ETests: XCTestCase {}}+ func testPrivateAIProviderDoesNotConfigureCommandMode() {+ guard PrivateFeatures.privateAIProvider else { return }++ self.withRestoredDefaults(+ keys: [+ self.selectedProviderIDKey,+ self.commandModeLinkedToGlobalKey,+ self.commandModeSelectedProviderIDKey,+ self.commandModeSelectedModelKey,+ ]+ ) {+ let settings = SettingsStore.shared+ settings.selectedProviderID = PrivateAIProviderFeature.shared.providerID+ settings.commandModeLinkedToGlobal = true+ settings.commandModeSelectedProviderID = PrivateAIProviderFeature.shared.providerID+ settings.commandModeSelectedModel = PrivateAIProviderFeature.shared.providerID++ XCTAssertEqual(settings.effectiveCommandModeProviderID, "")+ XCTAssertTrue(settings.commandModeReadinessIssue?.contains("coming soon") == true)+ XCTAssertFalse(settings.isCommandModeProviderVerified(PrivateAIProviderFeature.shared.providerID))+ }+ }+func testRollbackBackupsPreferFilenameTimestampOverModificationDate() {let firstBackupWithNewestModificationDate = URL(fileURLWithPath: "/tmp/FluidVoice-1.5.11-beta.1-100.app"@@ -504,6 +573,7 @@ final class DictationE2ETests: XCTestCase {self.selectedDictationPromptIDKey,self.selectedEditPromptIDKey,self.dictationPromptOffKey,+ self.editPromptOffKey,self.defaultDictationPromptOverrideKey,self.defaultEditPromptOverrideKey,],@@ -531,6 +601,7 @@ final class DictationE2ETests: XCTestCase {self.selectedDictationPromptIDKey,self.selectedEditPromptIDKey,self.dictationPromptOffKey,+ self.editPromptOffKey,self.defaultDictationPromptOverrideKey,self.defaultEditPromptOverrideKey,self.savedProvidersKey,