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(fi): enforce verified backend swaps
altic-dev2c4677ab6caa
diff --git a/Sources/Fluid/Persistence/SettingsStore.swift b/Sources/Fluid/Persistence/SettingsStore.swiftindex 278d8bfc..a9d51ad8 100644--- a/Sources/Fluid/Persistence/SettingsStore.swift+++ b/Sources/Fluid/Persistence/SettingsStore.swift@@ -85,20 +85,22 @@ final class SettingsStore: ObservableObject {var displayName: String {switch self {- case .auto: return "Auto"- case .llama: return "llama.cpp"- case .mlx: return "MLX"+ case .auto: return Self.systemDefault.displayName+ case .llama: return "llama.cpp (Compatibility)"+ case .mlx: return "MLX (Recommended)"}}var detail: String {switch self {case .auto:- return CPUArchitecture.isAppleSilicon ? "Uses MLX on Apple Silicon; errors if MLX is missing." : "Uses llama.cpp on Intel."+ return Self.systemDefault.detailcase .llama:- return "GGUF baseline; works on Intel and Apple Silicon."+ return CPUArchitecture.isAppleSilicon+ ? "Optional and slower than MLX. Replaces MLX after verification."+ : "Recommended compatibility backend for Intel Macs."case .mlx:- return "Apple Silicon only; fastest local Fluid-1 path."+ return "Recommended and faster than llama.cpp. Replaces it after verification."}}}@@ -1501,8 +1503,11 @@ final class SettingsStore: ObservableObject {let rawValue = self.defaults.string(forKey: Keys.privateAIBackendPreference)?.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()- let preference = rawValue.flatMap(PrivateAIBackendPreference.init(rawValue:))+ var preference = rawValue.flatMap(PrivateAIBackendPreference.init(rawValue:))?? PrivateAIBackendPreference.systemDefault+ if preference == .auto {+ preference = PrivateAIBackendPreference.systemDefault+ }if preference == .mlx, CPUArchitecture.isIntel {return .llama}@@ -1510,7 +1515,10 @@ final class SettingsStore: ObservableObject {}set {objectWillChange.send()- let preference = newValue == .mlx && CPUArchitecture.isIntel ? .llama : newValue+ var preference = newValue == .auto ? PrivateAIBackendPreference.systemDefault : newValue+ if preference == .mlx, CPUArchitecture.isIntel {+ preference = .llama+ }self.defaults.set(preference.rawValue, forKey: Keys.privateAIBackendPreference)}}diff --git a/Sources/Fluid/Services/PrivateAIIntegrationService.swift b/Sources/Fluid/Services/PrivateAIIntegrationService.swiftindex 2d2e7c18..489046e6 100644--- a/Sources/Fluid/Services/PrivateAIIntegrationService.swift+++ b/Sources/Fluid/Services/PrivateAIIntegrationService.swift@@ -79,35 +79,53 @@ actor PrivateAIIntegrationService {}nonisolated static func canRemoveInstalledModel(_ model: PrivateAIRegisteredModel) -> Bool {- guard let path = self.provider.localModelPath(for: model) else {+ guard let targetURLs = try? self.validatedModelURLs(self.provider.installedModelURLs(for: model)) else {return false}-- let targetURL = URL(fileURLWithPath: path).standardizedFileURL- let modelDirectoryURL = self.modelDirectoryURL.standardizedFileURL- let expectedURL = self.expectedLocalModelURL(for: model).standardizedFileURL- let targetPath = targetURL.path- let modelDirectoryPath = modelDirectoryURL.path-- return targetPath == expectedURL.path || targetPath.hasPrefix(modelDirectoryPath + "/")+ return !targetURLs.isEmpty}nonisolated static func removeInstalledModel(_ model: PrivateAIRegisteredModel) throws {- guard let path = self.provider.localModelPath(for: model) else {- return- }+ let requestedURLs = self.provider.installedModelURLs(for: model)+ guard !requestedURLs.isEmpty else { return }+ let targetURLs = try self.validatedModelURLs(requestedURLs)+ try self.removeModelFiles(at: targetURLs)+ }++ nonisolated static func removeInactiveInstalledModels(keeping model: PrivateAIRegisteredModel) throws {+ let requestedURLs = self.provider.inactiveInstalledModelURLs(keeping: model)+ guard !requestedURLs.isEmpty else { return }+ let targetURLs = try self.validatedModelURLs(requestedURLs)+ try self.removeModelFiles(at: targetURLs)+ }- let targetURL = URL(fileURLWithPath: path).standardizedFileURL- let modelDirectoryURL = self.modelDirectoryURL.standardizedFileURL- let expectedURL = self.expectedLocalModelURL(for: model).standardizedFileURL- let targetPath = targetURL.path+ private nonisolated static func validatedModelURLs(_ urls: [URL]) throws -> [URL] {+ guard !urls.isEmpty else { return [] }+ let modelDirectoryURL = self.modelDirectoryURL.resolvingSymlinksInPath().standardizedFileURLlet modelDirectoryPath = modelDirectoryURL.path+ let targetURLs = Array(Set(urls.map { $0.resolvingSymlinksInPath().standardizedFileURL }))+ guard targetURLs.allSatisfy({ $0.path.hasPrefix(modelDirectoryPath + "/") }) else {+ throw PrivateAIModelRemovalError(message: "A model file is not in FluidVoice's model folder.")+ }+ return targetURLs+ }- guard targetPath == expectedURL.path || targetPath.hasPrefix(modelDirectoryPath + "/") else {- throw PrivateAIModelRemovalError(message: "This model is not in FluidVoice's model folder.")+ private nonisolated static func removeModelFiles(at targetURLs: [URL]) throws {+ let modelDirectoryURL = self.modelDirectoryURL.resolvingSymlinksInPath().standardizedFileURL+ let fileManager = FileManager.default+ for targetURL in targetURLs where fileManager.fileExists(atPath: targetURL.path) {+ try fileManager.removeItem(at: targetURL)}- try FileManager.default.removeItem(at: targetURL)+ let parentDirectories = Set(targetURLs.map { $0.deletingLastPathComponent() })+ .filter { $0 != modelDirectoryURL }+ .sorted { $0.path.count > $1.path.count }+ for directoryURL in parentDirectories {+ guard let contents = try? fileManager.contentsOfDirectory(atPath: directoryURL.path),+ contents.isEmpty+ else { continue }+ try? fileManager.removeItem(at: directoryURL)+ }}func unloadAndRemoveInstalledModel(_ model: PrivateAIRegisteredModel, reason: String) async throws {@@ -139,7 +157,29 @@ actor PrivateAIIntegrationService {}func loadModel(_ model: PrivateAIRegisteredModel) async throws -> PrivateAIStatus {- try await Self.provider.loadModel(model)+ let status = try await Self.provider.loadModel(model)+ guard status.state == .ready else { return status }++ do {+ try Self.removeInactiveInstalledModels(keeping: model)+ } catch {+ await MainActor.run {+ DebugLogger.shared.warning(+ "Could not remove inactive Fluid Intelligence backend: \(Self.errorMessage(for: error))",+ source: "PrivateAIProvider"+ )+ }+ }+ return status+ }++ private nonisolated static func errorMessage(for error: Error) -> String {+ if let localizedError = error as? LocalizedError,+ let description = localizedError.errorDescription+ {+ return description+ }+ return String(describing: error)}func prewarmDictation() async {diff --git a/Sources/Fluid/Services/PrivateAIProvider.swift b/Sources/Fluid/Services/PrivateAIProvider.swiftindex 176d5c50..19ec4d36 100644--- a/Sources/Fluid/Services/PrivateAIProvider.swift+++ b/Sources/Fluid/Services/PrivateAIProvider.swift@@ -206,6 +206,8 @@ protocol PrivateAIIntegrationProviding: Sendable {func expectedLocalModelURL(for model: PrivateAIRegisteredModel) -> URLfunc localModelPath(for model: PrivateAIRegisteredModel) -> String?func isModelInstalled(_ model: PrivateAIRegisteredModel) -> Bool+ func installedModelURLs(for model: PrivateAIRegisteredModel) -> [URL]+ func inactiveInstalledModelURLs(keeping model: PrivateAIRegisteredModel) -> [URL]func prepareModel(_ model: PrivateAIRegisteredModel,progressHandler: PrivateAIModelDownloadProgressHandler?@@ -231,6 +233,13 @@ protocol PrivateAIIntegrationProviding: Sendable {}extension PrivateAIIntegrationProviding {+ func installedModelURLs(for model: PrivateAIRegisteredModel) -> [URL] {+ guard let path = self.localModelPath(for: model) else { return [] }+ return [URL(fileURLWithPath: path)]+ }++ func inactiveInstalledModelURLs(keeping _: PrivateAIRegisteredModel) -> [URL] { [] }+func prepareModel(_ model: PrivateAIRegisteredModel) async throws -> URL {try await self.prepareModel(model, progressHandler: nil)}@@ -289,9 +298,11 @@ enum PrivateAIProviderFeature {let normalizedBackendPreference: Stringif let backendPreference,!backendPreference.isEmpty,- SettingsStore.PrivateAIBackendPreference(rawValue: backendPreference) != nil+ let preference = SettingsStore.PrivateAIBackendPreference(rawValue: backendPreference){- normalizedBackendPreference = backendPreference+ normalizedBackendPreference = preference == .auto+ ? SettingsStore.PrivateAIBackendPreference.systemDefault.rawValue+ : preference.rawValue} else {// Keep fingerprint in sync with SettingsStore.privateAIBackendPreference default.normalizedBackendPreference = SettingsStore.PrivateAIBackendPreference.systemDefault.rawValuediff --git a/Sources/Fluid/UI/AISettingsView+AIConfiguration.swift b/Sources/Fluid/UI/AISettingsView+AIConfiguration.swiftindex 9bf57e57..51e828a0 100644--- a/Sources/Fluid/UI/AISettingsView+AIConfiguration.swift+++ b/Sources/Fluid/UI/AISettingsView+AIConfiguration.swift@@ -728,8 +728,12 @@ extension AIEnhancementSettingsView {.controlSize(.mini).fixedSize()}- Text(isDownloading ? Self.downloadButtonText(progress: downloadProgress) : "Download & Verify")- .font(.system(size: 11, weight: .semibold))+ Text(+ isDownloading+ ? Self.downloadButtonText(progress: downloadProgress)+ : "Download \(self.privateAIBackendShortName) & Verify"+ )+ .font(.system(size: 11, weight: .semibold))}}.fluidButton(.accent, size: .small)@@ -786,7 +790,7 @@ extension AIEnhancementSettingsView {.frame(width: 124, alignment: .leading)self.privateAIBackendPicker(isBusy: isBusy)- .frame(width: 140)+ .frame(width: 190)Text(self.settings.privateAIBackendPreference.detail).font(.caption2)@@ -810,7 +814,18 @@ extension AIEnhancementSettingsView {}private var privateAISelectableBackendPreferences: [SettingsStore.PrivateAIBackendPreference] {- CPUArchitecture.isIntel ? [.auto, .llama] : SettingsStore.PrivateAIBackendPreference.allCases+ CPUArchitecture.isIntel ? [.llama] : [.mlx, .llama]+ }++ private var privateAIBackendShortName: String {+ switch self.settings.privateAIBackendPreference {+ case .auto:+ return SettingsStore.PrivateAIBackendPreference.systemDefault == .mlx ? "MLX" : "llama.cpp"+ case .llama:+ return "llama.cpp"+ case .mlx:+ return "MLX"+ }}private func privateAIBoostRow(isBusy: Bool) -> some View {@@ -1118,8 +1133,11 @@ extension AIEnhancementSettingsView {}if model.canDownload {+ let size = model.artifact.byteCount.map {+ " (\(ByteCountFormatter.string(fromByteCount: $0, countStyle: .file)))"+ } ?? ""return PrivateAIProviderModelStatus(- detail: "Model not downloaded.",+ detail: "\(self.privateAIBackendShortName) model not downloaded\(size).",color: self.theme.palette.accent)}@@ -2088,7 +2106,7 @@ extension AIEnhancementSettingsView {self.privateAISettingLabel("Backend", systemImage: "cpu")self.privateAIBackendPicker(isBusy: isBusy)- .frame(width: 160)+ .frame(width: 210)Text(self.settings.privateAIBackendPreference.detail).font(.caption2)