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
Persist provider edits on Done and avoid selection-driven audio scans
altic-dev5e9ed09cc02b
diff --git a/Sources/Fluid/UI/AISettings/AIEnhancementSettingsViewModel.swift b/Sources/Fluid/UI/AISettings/AIEnhancementSettingsViewModel.swiftindex 0e94b24a..69e1cfa1 100644--- a/Sources/Fluid/UI/AISettings/AIEnhancementSettingsViewModel.swift+++ b/Sources/Fluid/UI/AISettings/AIEnhancementSettingsViewModel.swift@@ -480,6 +480,15 @@ final class AIEnhancementSettingsViewModel: ObservableObject {self.persistsSelectedProvider = true}+ /// Commit a managed provider's key before dismissing, but never save a removed provider+ /// or the default selected by the removal cleanup in its place.+ func saveManagedProviderBeforeClosing(_ providerID: String) -> Bool {+ guard !self.isFetchingModels, !self.isTestingConnection else { return false }+ guard self.selectedProviderID == providerID else { return true }+ guard self.hasProviderAPIKeyDraft(for: providerID) else { return true }+ return self.saveProviderAPIKeys(invalidating: providerID)+ }+private func selectProviderForUse(_ providerID: String) {self.selectedProviderID = providerIDself.handleProviderChange(providerID)diff --git a/Sources/Fluid/UI/AISettingsView+AIConfiguration.swift b/Sources/Fluid/UI/AISettingsView+AIConfiguration.swiftindex df94bd60..995d97c9 100644--- a/Sources/Fluid/UI/AISettingsView+AIConfiguration.swift+++ b/Sources/Fluid/UI/AISettingsView+AIConfiguration.swift@@ -133,6 +133,9 @@ extension AIEnhancementSettingsView {private func closeExternalProviderManager() {guard !self.viewModel.isFetchingModels, !self.viewModel.isTestingConnection else { return }+ if let providerID = self.managedExternalProviderID,+ !self.viewModel.saveManagedProviderBeforeClosing(providerID)+ { return }self.viewModel.clearEditProviderDraft()self.viewModel.showingAddModel = falseself.viewModel.newModelName = ""@@ -158,7 +161,7 @@ extension AIEnhancementSettingsView {}}}- .interactiveDismissDisabled(self.viewModel.isFetchingModels || self.viewModel.isTestingConnection)+ .interactiveDismissDisabled().alert("Remove provider?", isPresented: self.$showingRemoveProviderConfirmation) {Button("Cancel", role: .cancel) {}Button("Remove", role: .destructive) {@@ -1379,6 +1382,7 @@ extension AIEnhancementSettingsView {}.fluidGlassAction().foregroundStyle(.red)+ .tint(.red).disabled(self.viewModel.isFetchingModels || self.viewModel.isTestingConnection).frame(maxWidth: .infinity, alignment: .trailing)}diff --git a/Sources/Fluid/UI/TranscriptionHistoryView.swift b/Sources/Fluid/UI/TranscriptionHistoryView.swiftindex ec95c0dc..b8fc3e85 100644--- a/Sources/Fluid/UI/TranscriptionHistoryView.swift+++ b/Sources/Fluid/UI/TranscriptionHistoryView.swift@@ -21,14 +21,12 @@ struct TranscriptionHistoryView: View {private struct AudioAvailabilityRequest: Equatable {let fileNames: [String]let revision: UUID- let selectedID: UUID?}private var audioAvailabilityRequest: AudioAvailabilityRequest {AudioAvailabilityRequest(fileNames: self.historyStore.entries.compactMap { $0.audio?.fileName },- revision: self.audioAvailabilityRevision,- selectedID: self.selectedEntry?.id+ revision: self.audioAvailabilityRevision)}diff --git a/Tests/ProviderSetupBoundaryTests.swift b/Tests/ProviderSetupBoundaryTests.swiftindex fc7c5179..9ddbc212 100644--- a/Tests/ProviderSetupBoundaryTests.swift+++ b/Tests/ProviderSetupBoundaryTests.swift@@ -59,10 +59,18 @@ final class AIEnhancementSettingsViewModel {var cachedAddedProviderItems: [ProviderItemData] = []var failKeychain = falsevar saves = 0+ var keySaves = 0+ var persistedKeys: [String: String] = [:]func providerKey(for id: String) -> String { id }func providerAPIKey(for id: String) -> String { providerAPIKeys[id] ?? "" }func updateProviderAPIKey(_ value: String, for id: String) { providerAPIKeys[id] = value }- func saveProviderAPIKeys(invalidating id: String) -> Bool { !failKeychain }+ func saveProviderAPIKeys(invalidating id: String) -> Bool {+ keySaves += 1+ guard !failKeychain else { return false }+ persistedKeys = providerAPIKeys+ return true+ }+ func hasProviderAPIKeyDraft(for id: String) -> Bool { providerAPIKeys[id] != nil }func refreshProviderItems() {let items = [ProviderItemData(id: "openai", name: "OpenAI", isBuiltIn: true),ProviderItemData(id: "ollama", name: "Ollama", isBuiltIn: true),@@ -160,6 +168,25 @@ final class AIEnhancementSettingsViewModel {check(removal.deleteCurrentProvider() && removal.settings.selectedProviderID.isEmpty && removal.settings.selectedModel == nil, "Removing the default clears its model without selecting another provider")removal.selectedProviderID = "fluid"check(!removal.deleteCurrentProvider(), "External provider removal cannot remove private AI")+ let closing = AIEnhancementSettingsViewModel()+ closing.providerAPIKeys["openai"] = "edited-key"+ closing.failKeychain = true+ check(!closing.saveManagedProviderBeforeClosing("openai"), "Keychain failure keeps Manage open")+ check(closing.providerAPIKeys["openai"] == "edited-key" && closing.settings.selectedProviderID == "fluid", "Failed close preserves the draft and default")+ closing.failKeychain = false+ check(closing.saveManagedProviderBeforeClosing("openai") && closing.persistedKeys["openai"] == "edited-key", "Done persists an edited key without verification or model refresh")+ let savedCount = closing.keySaves+ closing.selectedProviderID = "fluid"+ check(closing.saveManagedProviderBeforeClosing("openai") && closing.keySaves == savedCount, "Removal cleanup must not save a different selected provider")+ closing.selectedProviderID = "ollama"+ check(closing.saveManagedProviderBeforeClosing("ollama") && closing.keySaves == savedCount, "Keyless provider close does not touch Keychain")+ closing.isTestingConnection = true+ check(!closing.saveManagedProviderBeforeClosing("ollama"), "Busy editor cannot dismiss")+ check(manager.contains(".interactiveDismissDisabled()"), "Interactive dismissal cannot bypass failed persistence")+ let historySource = try String(contentsOfFile: "Sources/Fluid/UI/TranscriptionHistoryView.swift", encoding: .utf8)+ let audioRequest = historySource.components(separatedBy: "private struct AudioAvailabilityRequest")[1]+ .components(separatedBy: "private var filteredEntries")[0]+ check(!audioRequest.contains("selectedEntry") && !audioRequest.contains("selectedID"), "Row selection cannot restart audio scans")print("Passed \(count) provider setup assertions")}}diff --git a/scripts/test_provider_setup_boundary.sh b/scripts/test_provider_setup_boundary.shindex 6e69312c..4d55e684 100644--- a/scripts/test_provider_setup_boundary.sh+++ b/scripts/test_provider_setup_boundary.sh@@ -11,6 +11,7 @@ task_test_dir=$(mktemp -d /tmp/fluidvoice-provider-setup.XXXXXX)# Exercise the exact production removal method against the same isolated settings doubles.{ echo 'extension AIEnhancementSettingsViewModel {'sed -n '/^ func deleteCurrentProvider() -> Bool {/,/^ func saveEditedProvider() {/p' Sources/Fluid/UI/AISettings/AIEnhancementSettingsViewModel.swift | sed '$d'+ sed -n '/^ func saveManagedProviderBeforeClosing(/,/^ private func selectProviderForUse(/p' Sources/Fluid/UI/AISettings/AIEnhancementSettingsViewModel.swift | sed '$d'echo '}'} > "$task_test_dir/Removal.swift"xcrun swiftc -parse-as-library \