Skip to content

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: remove apple intelligence routing

altic-devb9f5c23b3aa0
diff --git a/Sources/Fluid/Assets.xcassets/Provider_AppleIntelligence.imageset/Contents.json b/Sources/Fluid/Assets.xcassets/Provider_AppleIntelligence.imageset/Contents.json
deleted file mode 100644
index 1c4a4c4b..00000000
--- a/Sources/Fluid/Assets.xcassets/Provider_AppleIntelligence.imageset/Contents.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "images" : [
- { "filename" : "logo.png", "idiom" : "universal", "scale" : "1x" },
- { "filename" : "[email protected]", "idiom" : "universal", "scale" : "2x" }
- ],
- "info" : { "author" : "xcode", "version" : 1 }
-}
diff --git a/Sources/Fluid/Assets.xcassets/Provider_AppleIntelligence.imageset/logo.png b/Sources/Fluid/Assets.xcassets/Provider_AppleIntelligence.imageset/logo.png
deleted file mode 100644
index 1c060981..00000000
Binary files a/Sources/Fluid/Assets.xcassets/Provider_AppleIntelligence.imageset/logo.png and /dev/null differ
diff --git a/Sources/Fluid/Assets.xcassets/Provider_AppleIntelligence.imageset/[email protected] b/Sources/Fluid/Assets.xcassets/Provider_AppleIntelligence.imageset/[email protected]
deleted file mode 100644
index 1ec55ff6..00000000
Binary files a/Sources/Fluid/Assets.xcassets/Provider_AppleIntelligence.imageset/[email protected] and /dev/null differ
diff --git a/Sources/Fluid/ContentView.swift b/Sources/Fluid/ContentView.swift
index 3623bcf7..051c4f19 100644
--- a/Sources/Fluid/ContentView.swift
+++ b/Sources/Fluid/ContentView.swift
@@ -905,35 +905,17 @@ struct ContentView: View {
// MARK: - Analytics helpers
- private func currentDictationAIModelInfo() -> (provider: String?, model: String?) {
- let providerID = SettingsStore.shared.selectedProviderID
-
- if providerID == "apple-intelligence" {
- return (provider: "apple-intelligence", model: "apple-intelligence")
- }
-
- let storedSelectedModelByProvider = SettingsStore.shared.selectedModelByProvider
- let storedSavedProviders = SettingsStore.shared.savedProviders
-
- let derivedProvider: String
- let derivedModel: String
-
- if let saved = storedSavedProviders.first(where: { $0.id == providerID }) {
- derivedProvider = "custom:\(saved.id)"
- derivedModel = storedSelectedModelByProvider[derivedProvider] ?? saved.models.first ?? ""
- } else if providerID == "openai" {
- derivedProvider = "openai"
- derivedModel = storedSelectedModelByProvider["openai"] ?? "gpt-4.1"
- } else if providerID == "groq" {
- derivedProvider = "groq"
- derivedModel = storedSelectedModelByProvider["groq"] ?? "llama-3.3-70b-versatile"
- } else {
- derivedProvider = providerID
- derivedModel = storedSelectedModelByProvider[providerID] ?? ""
- }
-
- let providerOut = derivedProvider.isEmpty ? nil : derivedProvider
- let modelOut = derivedModel.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ? nil : derivedModel
+ private func currentDictationAIModelInfo(
+ dictationSlot: SettingsStore.DictationShortcutSlot? = nil,
+ appBundleID: String? = nil
+ ) -> (provider: String?, model: String?) {
+ let route = DictationProviderRoute.resolve(
+ settings: SettingsStore.shared,
+ dictationSlot: dictationSlot,
+ appBundleID: appBundleID
+ )
+ let providerOut = route.providerKey.isEmpty ? nil : route.providerKey
+ let modelOut = route.model.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ? nil : route.model
return (provider: providerOut, model: modelOut)
}
@@ -1806,52 +1788,28 @@ struct ContentView: View {
dictationSlot: SettingsStore.DictationShortcutSlot? = nil,
streamHandler: PrivateAIStreamHandler? = nil
) async throws -> String {
- // CRITICAL FIX: Read current settings from SettingsStore, not stale @State copies
- // This ensures AI provider/model changes in AISettingsView take effect immediately
- let currentSelectedProviderID = SettingsStore.shared.selectedProviderID
- let storedProviderAPIKeys = SettingsStore.shared.providerAPIKeys
- let storedSelectedModelByProvider = SettingsStore.shared.selectedModelByProvider
- let storedSavedProviders = SettingsStore.shared.savedProviders
-
- // Derive currentProvider and openAIBaseURL from the current settings
- let derivedCurrentProvider: String
- let derivedBaseURL: String
- let derivedSelectedModel: String
-
- // Get provider info
- if let saved = storedSavedProviders.first(where: { $0.id == currentSelectedProviderID }) {
- // Saved/custom provider
- derivedCurrentProvider = "custom:\(saved.id)"
- derivedBaseURL = saved.baseURL
- derivedSelectedModel = storedSelectedModelByProvider[derivedCurrentProvider] ?? saved.models.first ?? ""
- } else if ModelRepository.shared.isBuiltIn(currentSelectedProviderID) {
- // Built-in provider (openai, groq, cerebras, google, openrouter, ollama, lmstudio)
- derivedCurrentProvider = currentSelectedProviderID
- derivedBaseURL = ModelRepository.shared.defaultBaseURL(for: currentSelectedProviderID)
- derivedSelectedModel = storedSelectedModelByProvider[currentSelectedProviderID] ?? ModelRepository.shared.defaultModels(for: currentSelectedProviderID).first ?? ""
- } else {
- // Unknown provider - fail closed instead of silently sending to OpenAI.
- derivedCurrentProvider = currentSelectedProviderID
- derivedBaseURL = ""
- derivedSelectedModel = storedSelectedModelByProvider[currentSelectedProviderID] ?? ""
- }
+ let appInfo = self.recordingAppInfo ?? self.getCurrentAppInfo()
+ let route = DictationProviderRoute.resolve(
+ settings: SettingsStore.shared,
+ dictationSlot: dictationSlot,
+ appBundleID: appInfo.bundleId
+ )
+ let currentSelectedProviderID = route.providerID
+ let derivedCurrentProvider = route.providerKey
+ let derivedBaseURL = route.baseURL
+ let derivedSelectedModel = route.model
guard !derivedCurrentProvider.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {
throw AIProcessingError.noVerifiedProvider
}
- if currentSelectedProviderID != "apple-intelligence",
- derivedSelectedModel.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
- {
+ if 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()
let isDictationCall = overrideSystemPrompt != nil || dictationSlot != nil
- let isPrivateAIProvider = currentSelectedProviderID == PrivateAIProviderFeature.shared.providerID ||
- derivedCurrentProvider == PrivateAIProviderFeature.shared.providerID ||
- derivedCurrentProvider == "custom:\(PrivateAIProviderFeature.shared.providerID)"
+ let isPrivateAIProvider = route.usesPrivateAI
let usePrivateAIProvider = overrideSystemPrompt == nil &&
isDictationCall &&
(isPrivateAIProvider || PrivateAIIntegrationService.shouldHandleDictation(model: derivedSelectedModel))
@@ -1863,7 +1821,6 @@ struct ContentView: View {
self.logDictationPromptTrace("Selected context text", value: "<none (dictation mode)>")
}
- let apiKey = storedProviderAPIKeys[derivedCurrentProvider] ?? storedProviderAPIKeys[currentSelectedProviderID] ?? ""
let response = try await PrivateAIIntegrationService.shared.enhanceDictation(
inputText,
runtime: PrivateAIIntegrationService.RuntimeConfiguration(
@@ -1871,7 +1828,7 @@ struct ContentView: View {
providerKey: derivedCurrentProvider,
baseURL: derivedBaseURL,
model: derivedSelectedModel,
- apiKey: apiKey,
+ apiKey: route.apiKey,
localModelPath: PrivateAIIntegrationService.configuredLocalModelPath,
usesStablePromptPrefixKVCache: SettingsStore.shared.privateAIPrefixKVCacheEnabled,
usesFluid1Boost: SettingsStore.shared.privateAIBoostEnabled,
@@ -1918,53 +1875,9 @@ struct ContentView: View {
userMessageContent = inputText
}
- // Route to Apple Intelligence if selected
- if currentSelectedProviderID == "apple-intelligence" {
- #if canImport(FoundationModels)
- if #available(macOS 26.0, *) {
- let provider = AppleIntelligenceProvider()
- if self.shouldTracePromptProcessing {
- let activeSlot = dictationSlot ?? self.currentDictationShortcutSlot(for: self.activeRecordingMode) ?? .primary
- let selectedProfile = SettingsStore.shared.resolvedDictationPromptProfile(
- for: activeSlot,
- appBundleID: appInfo.bundleId
- )
- let selectedPromptName: String = {
- if SettingsStore.shared.dictationPromptSelection(for: activeSlot) == .off {
- return "Off"
- }
- if let profile = selectedProfile {
- return profile.name.isEmpty ? "Untitled Prompt" : profile.name
- }
- return "Default"
- }()
- self.logDictationPromptTrace("Selected prompt profile", value: selectedPromptName)
- self.logDictationPromptTrace(
- "Prompt body (custom/default body)",
- value: SettingsStore.shared.effectiveDictationPromptBody(for: activeSlot, appBundleID: appInfo.bundleId)
- )
- self.logDictationPromptTrace("Built-in default system prompt (baseline)", value: SettingsStore.defaultSystemPromptText(for: .dictate))
- self.logDictationPromptTrace("Final system prompt sent to model", value: systemPrompt)
- self.logDictationPromptTrace("Input transcription (Q)", value: inputText)
- if userMessageContent != inputText {
- self.logDictationPromptTrace("Final user message sent to model", value: userMessageContent)
- }
- self.logDictationPromptTrace("Selected context text", value: "<none (dictation mode)>")
- }
- DebugLogger.shared.debug("Using Apple Intelligence for transcription enhancement", source: "ContentView")
- let output = try await provider.process(systemPrompt: systemPrompt, userText: userMessageContent)
- if self.shouldTracePromptProcessing {
- self.logDictationPromptTrace("Model answer (A)", value: output)
- }
- return output
- }
- #endif
- return inputText // Fallback if not available
- }
-
// Skip API key validation for local endpoints
let isLocal = self.isLocalEndpoint(derivedBaseURL)
- let apiKey = storedProviderAPIKeys[derivedCurrentProvider] ?? ""
+ let apiKey = route.apiKey
if !isLocal {
guard !apiKey.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines).isEmpty else {
@@ -2273,7 +2186,10 @@ struct ContentView: View {
if shouldUseAI {
DebugLogger.shared.debug("Routing transcription through AI post-processing", source: "ContentView")
- let postProcessingModelInfo = self.currentDictationAIModelInfo()
+ let postProcessingModelInfo = self.currentDictationAIModelInfo(
+ dictationSlot: activeDictationSlot,
+ appBundleID: appInfo.bundleId
+ )
postProcessingModel = postProcessingModelInfo.model
let postProcessingInputChars = normalizedTranscribedText.count
let postProcessingStart = Date()
@@ -2505,7 +2421,10 @@ struct ContentView: View {
// Register the post-transcription edit observation after insertion is dispatched.
let wordsBucket = AnalyticsBuckets.bucketWords(AnalyticsBuckets.wordCount(in: finalText))
- let modelInfo = self.currentDictationAIModelInfo()
+ let modelInfo = self.currentDictationAIModelInfo(
+ dictationSlot: activeDictationSlot,
+ appBundleID: appInfo.bundleId
+ )
await PostTranscriptionEditTracker.shared.markTranscriptionCompleted(
mode: AnalyticsMode.dictation.rawValue,
outputMethod: AnalyticsOutputMethod.typed.rawValue,
@@ -2865,7 +2784,10 @@ struct ContentView: View {
var finalText = normalizedTranscribedText
let shouldUseAI = DictationAIPostProcessingGate.isConfigured(for: .primary, appBundleID: appInfo.bundleId)
if shouldUseAI {
- postProcessingModel = self.currentDictationAIModelInfo().model
+ postProcessingModel = self.currentDictationAIModelInfo(
+ dictationSlot: .primary,
+ appBundleID: appInfo.bundleId
+ ).model
do {
finalText = try await self.processTextWithAI(
normalizedTranscribedText,
@@ -3775,7 +3697,6 @@ extension ContentView {
}
await self.asr.start(onCaptureStarted: {
self.captureRecordingContext()
- self.applyDictationPromptConfiguration(for: SettingsStore.shared.dictationPromptSelection(for: slot))
self.appBench("overlay_mode_request mode=Dictation")
self.menuBarManager.setOverlayMode(.dictation)
self.menuBarManager.showRecordingOverlayImmediately()
@@ -3796,35 +3717,9 @@ extension ContentView {
private func beginDictationRecording(for selection: SettingsStore.DictationPromptSelection, mode: ActiveRecordingMode) {
let settings = SettingsStore.shared
settings.setDictationPromptSelection(selection, for: .secondary)
- self.applyDictationPromptConfiguration(for: selection)
self.beginDictationRecording(for: .secondary, mode: mode)
}
- private func applyDictationPromptConfiguration(for selection: SettingsStore.DictationPromptSelection) {
- let providerID: String
- let modelName: String
-
- if selection == .privateAI {
- providerID = PrivateAIProviderFeature.shared.providerID
- modelName = PrivateAIIntegrationService.configuredModelID
- } else {
- let configuration = SettingsStore.shared.dictationPromptConfiguration(for: selection)
- providerID = configuration.providerID.trimmingCharacters(in: .whitespacesAndNewlines)
- modelName = configuration.modelName.trimmingCharacters(in: .whitespacesAndNewlines)
- guard !providerID.isEmpty, !modelName.isEmpty else { return }
- }
-
- let providerKey = self.providerKey(for: providerID)
- SettingsStore.shared.selectedProviderID = providerID
- var selectedModels = SettingsStore.shared.selectedModelByProvider
- selectedModels[providerKey] = modelName
- SettingsStore.shared.selectedModelByProvider = selectedModels
- self.selectedProviderID = providerID
- self.currentProvider = providerKey
- self.selectedModelByProvider = selectedModels
- self.selectedModel = modelName
- }
-
private func appBench(_ message: String) {
DebugLogger.shared.benchmark("APP_BENCH", message: message, source: "AppBenchmark")
}
diff --git a/Sources/Fluid/Networking/AppleIntelligenceProvider.swift b/Sources/Fluid/Networking/AppleIntelligenceProvider.swift
deleted file mode 100644
index 978a654f..00000000
--- a/Sources/Fluid/Networking/AppleIntelligenceProvider.swift
+++ /dev/null
@@ -1,86 +0,0 @@
-import Foundation
-
-#if canImport(FoundationModels)
-import FoundationModels
-#endif
-
-// MARK: - Apple Intelligence Availability Service
-
-enum AppleIntelligenceService {
- /// Whether the current OS supports FoundationModels (compile-time + runtime check)
- static var isSupported: Bool {
- if #available(macOS 26.0, *) {
- return true
- }
- return false
- }
-
- /// Whether Apple Intelligence is available and enabled on this device
- static var isAvailable: Bool {
- guard isSupported else { return false }
- #if canImport(FoundationModels)
- if #available(macOS 26.0, *) {
- return SystemLanguageModel.default.isAvailable
- }
- #endif
- return false
- }
-
- /// Human-readable reason why Apple Intelligence is unavailable
- static var unavailabilityReason: String? {
- if !isSupported {
- return "Requires macOS 26 (Tahoe) or later"
- }
- if !isAvailable {
- return "Enable in System Settings → Apple Intelligence & Siri"
- }
- return nil
- }
-}
-
-// MARK: - Apple Intelligence Provider
-
-#if canImport(FoundationModels)
-@available(macOS 26.0, *)
-final class AppleIntelligenceProvider {
- /// Process text with a system prompt (for transcription enhancement)
- func process(systemPrompt: String, userText: String) async throws -> String {
- let session = LanguageModelSession()
-
- let fullPrompt = """
- \(systemPrompt)
-
- \(userText)
- """
-
- let response = try await session.respond(to: fullPrompt)
- return response.content
- }
-
- /// Process rewrite/write requests with conversation history
- func processRewrite(messages: [(role: String, content: String)], systemPrompt: String) async throws -> String {
- let session = LanguageModelSession()
-
- // Build the conversation as a single prompt since FoundationModels
- // doesn't have the same multi-turn API as OpenAI
- var fullPrompt = ""
-
- // Add system context
- fullPrompt += "\(systemPrompt)\n\n"
-
- // Add conversation history
- for message in messages {
- if message.role == "user" {
- fullPrompt += "User: \(message.content)\n\n"
- } else if message.role == "assistant" {
- fullPrompt += "Assistant: \(message.content)\n\n"
- }
- }
-
- fullPrompt += "Assistant:"
-
- let response = try await session.respond(to: fullPrompt)
- return response.content
- }
-}
-#endif
diff --git a/Sources/Fluid/Persistence/SettingsStore+CommandMode.swift b/Sources/Fluid/Persistence/SettingsStore+CommandMode.swift
index 0db8994d..7c9a06eb 100644
--- a/Sources/Fluid/Persistence/SettingsStore+CommandMode.swift
+++ b/Sources/Fluid/Persistence/SettingsStore+CommandMode.swift
@@ -51,9 +51,6 @@ extension SettingsStore {
var commandModeReadinessIssue: String? {
let sourceProviderID = self.commandModeLinkedToGlobal ? self.selectedProviderID : self.commandModeSelectedProviderID
- 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."
}
@@ -93,7 +90,6 @@ extension SettingsStore {
private func supportedCommandModeProviderID(_ providerID: String) -> String? {
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
}
diff --git a/Sources/Fluid/Persistence/SettingsStore.swift b/Sources/Fluid/Persistence/SettingsStore.swift
index f8d997e6..4cb7c599 100644
--- a/Sources/Fluid/Persistence/SettingsStore.swift
+++ b/Sources/Fluid/Persistence/SettingsStore.swift
@@ -40,7 +40,7 @@ final class SettingsStore: ObservableObject {
self.migrateSecondaryPromptShortcutIfNeeded()
self.retireLegacySecondaryPromptShortcutIfNeeded()
self.normalizePromptSelectionsIfNeeded()
- self.normalizeProviderSelectionForCurrentVerificationState()
+ self.purgeRetiredAppleIntelligenceState()
self.repairForcedOnboardingResetIfNeeded()
self.migrateOverlayBottomOffsetTo50IfNeeded()
self.migratePrivateAIContextDefaultTo4KIfNeeded()
@@ -1473,14 +1473,55 @@ final class SettingsStore: ObservableObject {
}
}
- /// No-op: never override the user's provider selection on launch.
- ///
- /// The per-prompt shortcut system means the global default provider is no longer the
- /// authoritative routing source — each shortcut can bind to its own provider/model, or be off.
- /// The only time we set a provider is during onboarding (Fluid Intelligence flow); after that
- /// the selection is sticky across restarts and updates. Default is off (empty).
- func normalizeProviderSelectionForCurrentVerificationState() {
- // Intentionally empty. Selection is sticky.
+ func purgeRetiredAppleIntelligenceState() {
+ let retiredProviderIDs = Set(["apple-intelligence", "apple-intelligence-disabled"])
+ let rawSelectedProviderID = self.defaults.string(forKey: Keys.selectedProviderID)?
+ .trimmingCharacters(in: .whitespacesAndNewlines)
+
+ if let rawSelectedProviderID, retiredProviderIDs.contains(rawSelectedProviderID) {
+ self.selectedProviderID = ""
+ self.selectedModel = nil
+ }
+
+ if retiredProviderIDs.contains(self.commandModeSelectedProviderID) {
+ self.commandModeSelectedProviderID = ""
+ self.commandModeSelectedModel = nil
+ }
+ if retiredProviderIDs.contains(self.rewriteModeSelectedProviderID) {
+ self.rewriteModeSelectedProviderID = ""
+ self.rewriteModeSelectedModel = nil
+ }
+
+ var fingerprints = self.verifiedProviderFingerprints
+ var availableModels = self.availableModelsByProvider
+ var selectedModels = self.selectedModelByProvider
+ for providerID in retiredProviderIDs {
+ fingerprints.removeValue(forKey: providerID)
+ availableModels.removeValue(forKey: providerID)
+ selectedModels.removeValue(forKey: providerID)
+ fingerprints.removeValue(forKey: "custom:\(providerID)")
+ availableModels.removeValue(forKey: "custom:\(providerID)")
+ selectedModels.removeValue(forKey: "custom:\(providerID)")
+ }
+ if fingerprints != self.verifiedProviderFingerprints {
+ self.verifiedProviderFingerprints = fingerprints
+ }
+ if availableModels != self.availableModelsByProvider {
+ self.availableModelsByProvider = availableModels
+ }
+ if selectedModels != self.selectedModelByProvider {
+ self.selectedModelByProvider = selectedModels
+ }
+
+ let configurations = self.dictationPromptConfigurations.compactMapValues { configuration in
+ let providerID = configuration.providerID.trimmingCharacters(in: .whitespacesAndNewlines)
+ guard retiredProviderIDs.contains(providerID) else { return configuration }
+ guard configuration.shortcut != nil else { return nil }
+ return DictationPromptConfiguration(shortcut: configuration.shortcut)
+ }
+ if configurations != self.dictationPromptConfigurations {
+ self.dictationPromptConfigurations = configurations
+ }
}
var privateAIPrefixKVCacheEnabled: Bool {
@@ -1572,10 +1613,7 @@ final class SettingsStore: ObservableObject {
var isAIConfigured: Bool {
let providerID = self.selectedProviderID
- // 1. Apple Intelligence is always considered configured
- if providerID == "apple-intelligence" { return true }
-
- // 2. Get base URL to check for local endpoints
+ // Get base URL to check for local endpoints
var baseURL = ""
if let saved = self.savedProviders.first(where: { $0.id == providerID }) {
baseURL = saved.baseURL
@@ -1585,7 +1623,7 @@ final class SettingsStore: ObservableObject {
let isLocal = ModelRepository.shared.isLocalEndpoint(baseURL)
- // 3. Check for API key and selected model
+ // Check for API key and selected model
let key = self.canonicalProviderKey(for: providerID)
let hasApiKey = !(self.providerAPIKeys[key]?.isEmpty ?? true)
@@ -3119,6 +3157,7 @@ final class SettingsStore: ObservableObject {
self.promptModeSelectedPromptID = payload.promptModeSelectedPromptID
self.isSecondaryDictationPromptOff = payload.secondaryDictationPromptOff ?? false
self.normalizePromptSelectionsIfNeeded()
+ self.purgeRetiredAppleIntelligenceState()
}
// MARK: - Private Methods
@@ -3479,11 +3518,6 @@ final class SettingsStore: ObservableObject {
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
{
diff --git a/Sources/Fluid/Services/DictationAIPostProcessingGate.swift b/Sources/Fluid/Services/DictationAIPostProcessingGate.swift
index 62dfa2de..7e1e1ece 100644
--- a/Sources/Fluid/Services/DictationAIPostProcessingGate.swift
+++ b/Sources/Fluid/Services/DictationAIPostProcessingGate.swift
@@ -22,34 +22,42 @@ enum DictationAIPostProcessingGate {
}
if promptSelection == .privateAI {
- return self.isPrivateProviderConfigured(settings: settings)
+ let route = DictationProviderRoute.resolve(
+ settings: settings,
+ dictationSlot: slot,
+ appBundleID: appBundleID
+ )
+ return route.usesPrivateAI && self.isPrivateProviderConfigured(settings: settings)
}
- if self.isSelectedPrivateProvider(settings: settings) { return false }
-
- return self.isProviderConfigured()
+ let route = DictationProviderRoute.resolve(
+ settings: settings,
+ dictationSlot: slot,
+ appBundleID: appBundleID
+ )
+ guard !route.usesPrivateAI else { return false }
+ return self.isProviderConfigured(route: route, settings: settings)
}
/// Returns true if the selected AI provider is currently verified/configured,
/// regardless of the AI toggle or prompt selection. Used to gate prompt-mode hotkey AI processing.
static func isProviderConfigured() -> Bool {
let settings = SettingsStore.shared
- let providerID = settings.selectedProviderID
- if PrivateFeatures.privateAIProvider,
- providerID == PrivateAIProviderFeature.shared.providerID
- {
+ let route = DictationProviderRoute.resolve(settings: settings)
+ if route.usesPrivateAI {
return self.isPrivateProviderConfigured(settings: settings)
}
+ return self.isProviderConfigured(route: route, settings: settings)
+ }
- let key = self.providerKey(for: providerID)
- guard let storedFingerprint = settings.verifiedProviderFingerprints[key] else { return false }
-
- if providerID == "apple-intelligence" {
- return storedFingerprint == "apple-intelligence" && AppleIntelligenceService.isAvailable
- }
+ private static func isProviderConfigured(route: DictationProviderRoute, settings: SettingsStore) -> Bool {
+ let providerID = route.providerID.trimmingCharacters(in: .whitespacesAndNewlines)
+ let model = route.model.trimmingCharacters(in: .whitespacesAndNewlines)
+ guard !providerID.isEmpty, !model.isEmpty else { return false }
+ guard let storedFingerprint = settings.verifiedProviderFingerprints[route.providerKey] else { return false }
- let baseURL = self.baseURL(for: providerID, settings: settings)
- let apiKey = (settings.getAPIKey(for: providerID) ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
+ let baseURL = route.baseURL.trimmingCharacters(in: .whitespacesAndNewlines)
+ let apiKey = route.apiKey.trimmingCharacters(in: .whitespacesAndNewlines)
guard self.isLocalEndpoint(baseURL) || !apiKey.isEmpty else { return false }
return self.providerFingerprint(baseURL: baseURL, apiKey: apiKey) == storedFingerprint
@@ -89,11 +97,6 @@ enum DictationAIPostProcessingGate {
PrivateAIProviderPromptFormat.verifiedModelID(settings: settings) != nil
}
- private static func isSelectedPrivateProvider(settings: SettingsStore) -> Bool {
- PrivateFeatures.privateAIProvider &&
- settings.selectedProviderID == PrivateAIProviderFeature.shared.providerID
- }
-
static func isLocalEndpoint(_ urlString: String) -> Bool {
guard let url = URL(string: urlString), let host = url.host else { return false }
let hostLower = host.lowercased()
diff --git a/Sources/Fluid/Services/DictationPostProcessingService.swift b/Sources/Fluid/Services/DictationPostProcessingService.swift
index d1499988..73f14b05 100644
--- a/Sources/Fluid/Services/DictationPostProcessingService.swift
+++ b/Sources/Fluid/Services/DictationPostProcessingService.swift
@@ -1,5 +1,119 @@
import Foundation
+struct DictationProviderRoute: Equatable {
+ let providerID: String
+ let providerKey: String
+ let baseURL: String
+ let model: String
+ let apiKey: String
+
+ var usesPrivateAI: Bool {
+ self.providerID == PrivateAIProviderFeature.shared.providerID ||
+ self.providerKey == PrivateAIProviderFeature.shared.providerID ||
+ self.providerKey == "custom:\(PrivateAIProviderFeature.shared.providerID)"
+ }
+
+ static func resolve(
+ settings: SettingsStore,
+ dictationSlot: SettingsStore.DictationShortcutSlot? = nil,
+ appBundleID: String? = nil
+ ) -> Self {
+ let selectedProviderID: String
+ let configuredModel: String?
+
+ if let dictationSlot {
+ let selection = self.effectivePromptSelection(
+ settings: settings,
+ dictationSlot: dictationSlot,
+ appBundleID: appBundleID
+ )
+ if selection == .off {
+ return Self(providerID: "", providerKey: "", baseURL: "", model: "", apiKey: "")
+ }
+ if selection == .privateAI,
+ let modelID = PrivateAIProviderPromptFormat.verifiedModelID(settings: settings)
+ {
+ return Self(
+ providerID: PrivateAIProviderFeature.shared.providerID,
+ providerKey: PrivateAIProviderFeature.shared.providerID,
+ baseURL: ModelRepository.shared.defaultBaseURL(for: PrivateAIProviderFeature.shared.providerID),
+ model: modelID,
+ apiKey: ""
+ )
+ }
+
+ let configuration = settings.dictationPromptConfiguration(for: selection)
+ let providerID = configuration.providerID.trimmingCharacters(in: .whitespacesAndNewlines)
+ let model = configuration.modelName.trimmingCharacters(in: .whitespacesAndNewlines)
+ if !providerID.isEmpty, !model.isEmpty {
+ selectedProviderID = providerID
+ configuredModel = model
+ } else {
+ selectedProviderID = settings.selectedProviderID
+ configuredModel = nil
+ }
+ } else {
+ selectedProviderID = settings.selectedProviderID
+ configuredModel = nil
+ }
+
+ let selectedModels = settings.selectedModelByProvider
+ let providerKeys = settings.providerAPIKeys
+
+ if let saved = settings.savedProviders.first(where: { $0.id == selectedProviderID }) {
+ let key = "custom:\(saved.id)"
+ return Self(
+ providerID: selectedProviderID,
+ providerKey: key,
+ baseURL: saved.baseURL,
+ model: configuredModel ?? selectedModels[key] ?? saved.models.first ?? "",
+ apiKey: providerKeys[key] ?? providerKeys[selectedProviderID] ?? ""
+ )
+ }
+
+ if ModelRepository.shared.isBuiltIn(selectedProviderID) {
+ return Self(
+ providerID: selectedProviderID,
+ providerKey: selectedProviderID,
+ baseURL: ModelRepository.shared.defaultBaseURL(for: selectedProviderID),
+ model: configuredModel ?? selectedModels[selectedProviderID] ?? ModelRepository.shared.defaultModels(for: selectedProviderID).first ?? "",
+ apiKey: providerKeys[selectedProviderID] ?? ""
+ )
+ }
+
+ return Self(
+ providerID: selectedProviderID,
+ providerKey: selectedProviderID,
+ baseURL: "",
+ model: configuredModel ?? selectedModels[selectedProviderID] ?? "",
+ apiKey: providerKeys[selectedProviderID] ?? ""
+ )
+ }
+
+ private static func effectivePromptSelection(
+ settings: SettingsStore,
+ dictationSlot: SettingsStore.DictationShortcutSlot,
+ appBundleID: String?
+ ) -> SettingsStore.DictationPromptSelection {
+ let selection = settings.dictationPromptSelection(for: dictationSlot)
+ guard selection != .off, selection != .privateAI else { return selection }
+
+ let usesOnlyAppBindings = settings.promptRoutingScope(for: .dictate) == .selectedAppsOnly
+ guard usesOnlyAppBindings || selection == .default else { return selection }
+ guard let binding = settings.appPromptBinding(for: .dictate, appBundleID: appBundleID) else {
+ return usesOnlyAppBindings ? .off : selection
+ }
+ guard let promptID = binding.promptID,
+ settings.dictationPromptProfiles.contains(where: {
+ $0.id == promptID && $0.mode.normalized == .dictate
+ })
+ else {
+ return .default
+ }
+ return .profile(promptID)
+ }
+}
+
@MainActor
final class DictationPostProcessingService {
static let shared = DictationPostProcessingService()
@@ -12,14 +126,6 @@ final class DictationPostProcessingService {
let model: String
}
- private struct ResolvedProvider {
- let providerID: String
- let providerKey: String
- let baseURL: String
- let model: String
- let apiKey: String
- }
-
func process(_ inputText: String, dictationSlot: SettingsStore.DictationShortcutSlot = .primary) async throws -> Result {
let trimmed = inputText.trimmingCharacters(in: .whitespacesAndNewlines)
guard !trimmed.isEmpty else {
@@ -27,7 +133,7 @@ final class DictationPostProcessingService {
}
let settings = SettingsStore.shared
- let resolved = self.resolveProvider(settings: settings, dictationSlot: dictationSlot)
+ let resolved = DictationProviderRoute.resolve(settings: settings, dictationSlot: dictationSlot)
guard !resolved.providerID.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {
throw AIProcessingError.noVerifiedProvider
}
@@ -37,16 +143,12 @@ final class DictationPostProcessingService {
)
let usesPrivateAISelection = settings.dictationPromptSelection(for: dictationSlot) == .privateAI
- let isPrivateAIProvider = resolved.providerID == PrivateAIProviderFeature.shared.providerID ||
- resolved.providerKey == PrivateAIProviderFeature.shared.providerID ||
- resolved.providerKey == "custom:\(PrivateAIProviderFeature.shared.providerID)"
-
- guard usesPrivateAISelection || !isPrivateAIProvider else {
+ guard usesPrivateAISelection || !resolved.usesPrivateAI else {
throw AIProcessingError.noVerifiedProvider
}
if usesPrivateAISelection,
- isPrivateAIProvider || PrivateAIIntegrationService.shouldHandleDictation(model: resolved.model)
+ resolved.usesPrivateAI || PrivateAIIntegrationService.shouldHandleDictation(model: resolved.model)
{
let response = try await PrivateAIIntegrationService.shared.enhanceDictation(
trimmed,
@@ -82,18 +184,6 @@ final class DictationPostProcessingService {
transcript: trimmed
)
- if resolved.providerID == "apple-intelligence" {
- #if canImport(FoundationModels)
- if #available(macOS 26.0, *) {
- let provider = AppleIntelligenceProvider()
- let output = try await provider.process(systemPrompt: systemPrompt, userText: userMessageContent)
- guard !output.isEmpty else { throw AIProcessingError.emptyResponse }
- return Result(text: ASRService.applyGAAVFormatting(output), providerID: resolved.providerID, model: resolved.model)
- }
- #endif
- return Result(text: trimmed, providerID: resolved.providerID, model: resolved.model)
- }
-
guard !resolved.model.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {
throw AIProcessingError.missingModel(provider: resolved.providerKey)
}
@@ -138,52 +228,4 @@ final class DictationPostProcessingService {
model: resolved.model
)
}
-
- 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.selectedProviderID
- let selectedModels = settings.selectedModelByProvider
- let providerKeys = settings.providerAPIKeys
-
- if let saved = settings.savedProviders.first(where: { $0.id == providerID }) {
- let key = "custom:\(saved.id)"
- return ResolvedProvider(
- providerID: providerID,
- providerKey: key,
- baseURL: saved.baseURL,
- model: selectedModels[key] ?? saved.models.first ?? "",
- apiKey: providerKeys[key] ?? providerKeys[providerID] ?? ""
- )
- }
-
- if ModelRepository.shared.isBuiltIn(providerID) {
- return ResolvedProvider(
- providerID: providerID,
- providerKey: providerID,
- baseURL: ModelRepository.shared.defaultBaseURL(for: providerID),
- model: selectedModels[providerID] ?? ModelRepository.shared.defaultModels(for: providerID).first ?? "",
- apiKey: providerKeys[providerID] ?? ""
- )
- }
-
- return ResolvedProvider(
- providerID: providerID,
- providerKey: providerID,
- baseURL: "",
- model: selectedModels[providerID] ?? "",
- apiKey: providerKeys[providerID] ?? ""
- )
- }
}
diff --git a/Sources/Fluid/Services/ModelRepository.swift b/Sources/Fluid/Services/ModelRepository.swift
index 335e21a7..c78adaa7 100644
--- a/Sources/Fluid/Services/ModelRepository.swift
+++ b/Sources/Fluid/Services/ModelRepository.swift
@@ -17,7 +17,7 @@ final class ModelRepository {
/// All built-in provider IDs (not including custom/saved providers)
static var builtInProviderIDs: [String] {
var providers = [
- "openai", "anthropic", "xai", "groq", "cerebras", "google", "openrouter", "ollama", "lmstudio", "apple-intelligence",
+ "openai", "anthropic", "xai", "groq", "cerebras", "google", "openrouter", "ollama", "lmstudio",
]
if PrivateFeatures.privateAIProvider {
providers.insert(PrivateAIProviderFeature.shared.providerID, at: 0)
@@ -50,8 +50,6 @@ final class ModelRepository {
case "ollama", "lmstudio":
// Local providers - models vary per user, they must add their own
return []
- case "apple-intelligence":
- return ["System Model"]
default:
// Custom providers start with no default models; user must add them
return []
@@ -100,7 +98,6 @@ final class ModelRepository {
case "openrouter": return "OpenRouter"
case "ollama": return "Ollama"
case "lmstudio": return "LM Studio"
- case "apple-intelligence": return "Apple Intelligence"
default: return providerID.capitalized
}
}
@@ -111,7 +108,7 @@ final class ModelRepository {
}
/// Returns the website URL for getting an API key or downloading the provider software.
- /// Returns nil for providers that don't have a relevant URL (e.g., Apple Intelligence).
+ /// Returns nil for providers that don't have a relevant URL.
func providerWebsiteURL(for providerID: String) -> (url: String, label: String)? {
switch providerID {
case "openai":
@@ -153,14 +150,7 @@ final class ModelRepository {
}
/// Returns the list of built-in providers for UI pickers
- /// - Parameter includeAppleIntelligence: Whether to include Apple Intelligence
- /// - Parameter appleIntelligenceAvailable: Whether Apple Intelligence is available on this device
- /// - Parameter appleIntelligenceDisabledReason: Optional reason if disabled (e.g., "No tools")
- func builtInProvidersList(
- includeAppleIntelligence: Bool = true,
- appleIntelligenceAvailable: Bool = false,
- appleIntelligenceDisabledReason: String? = nil
- ) -> [(id: String, name: String)] {
+ func builtInProvidersList() -> [(id: String, name: String)] {
var list: [(id: String, name: String)] = [
("openai", "OpenAI"),
("anthropic", "Anthropic"),
@@ -177,16 +167,6 @@ final class ModelRepository {
list.insert((PrivateAIProviderFeature.shared.providerID, PrivateAIProviderFeature.shared.providerName), at: 0)
}
- if includeAppleIntelligence {
- if appleIntelligenceAvailable {
- list.append(("apple-intelligence", "Apple Intelligence"))
- } else if let reason = appleIntelligenceDisabledReason {
- list.append(("apple-intelligence-disabled", "Apple Intelligence (\(reason))"))
- } else {
- list.append(("apple-intelligence-disabled", "Apple Intelligence (Unavailable)"))
- }
- }
-
return list
}
diff --git a/Sources/Fluid/Services/RewriteModeService.swift b/Sources/Fluid/Services/RewriteModeService.swift
index 0ac9ee25..d476a25d 100644
--- a/Sources/Fluid/Services/RewriteModeService.swift
+++ b/Sources/Fluid/Services/RewriteModeService.swift
@@ -262,28 +262,6 @@ final class RewriteModeService: ObservableObject {
self.logPromptTrace("Conversation input (Q/history)", value: messageDump.isEmpty ? "<empty>" : messageDump)
}
- // Route to Apple Intelligence if selected
- if providerID == "apple-intelligence" {
- #if canImport(FoundationModels)
- if #available(macOS 26.0, *) {
- let provider = AppleIntelligenceProvider()
- let messageTuples = messages
- .map { (role: $0.role == .user ? "user" : "assistant", content: $0.content) }
- DebugLogger.shared.debug("Using Apple Intelligence for edit mode", source: "RewriteModeService")
- let output = try await provider.processRewrite(messages: messageTuples, systemPrompt: systemPrompt)
- if self.shouldTracePromptProcessing {
- self.logPromptTrace("Model answer (A)", value: output)
- }
- return output
- }
- #endif
- throw NSError(
- domain: "RewriteMode",
- code: -1,
- userInfo: [NSLocalizedDescriptionKey: "Apple Intelligence not available"]
- )
- }
-
let model: String = {
if settings.rewriteModeLinkedToGlobal {
let key: String
@@ -473,9 +451,6 @@ final class RewriteModeService: ObservableObject {
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" {
- return stored == "apple-intelligence"
- }
let baseURL = self.providerBaseURL(for: providerID, settings: settings)
let apiKey = settings.getAPIKey(for: providerID) ?? ""
let current = self.providerFingerprint(baseURL: baseURL, apiKey: apiKey)
diff --git a/Sources/Fluid/UI/AISettings/AIEnhancementSettingsViewModel.swift b/Sources/Fluid/UI/AISettings/AIEnhancementSettingsViewModel.swift
index 8c0fe73e..08a869b1 100644
--- a/Sources/Fluid/UI/AISettings/AIEnhancementSettingsViewModel.swift
+++ b/Sources/Fluid/UI/AISettings/AIEnhancementSettingsViewModel.swift
@@ -42,7 +42,6 @@ final class AIEnhancementSettingsViewModel: ObservableObject {
@Published var editingReasoningEnabled: Bool = false
// Provider Management
- @Published var appleIntelligenceAvailable: Bool = false
@Published var providerAPIKeys: [String: String] = [:]
@Published var currentProvider: String = ""
@Published var savedProviders: [SettingsStore.SavedProvider] = []
@@ -155,13 +154,11 @@ final class AIEnhancementSettingsViewModel: ObservableObject {
// MARK: - Load Settings
func loadSettings() {
- self.settings.normalizeProviderSelectionForCurrentVerificationState()
self.settings.reconcilePromptStateAfterProfileChanges()
self.selectedProviderID = self.settings.selectedProviderID
self.availableModelsByProvider = self.settings.availableModelsByProvider
self.selectedModelByProvider = self.settings.selectedModelByProvider
- self.appleIntelligenceAvailable = AppleIntelligenceService.isAvailable
self.providerAPIKeys = self.settings.providerAPIKeys
self.savedProviders = self.settings.savedProviders
self.dictationPromptProfiles = self.settings.dictationPromptProfiles
@@ -282,7 +279,6 @@ final class AIEnhancementSettingsViewModel: ObservableObject {
case "": return "No Provider"
case "openai": return "OpenAI"
case "groq": return "Groq"
- case "apple-intelligence": return "Apple Intelligence"
default:
return self.savedProviders.first(where: { $0.id == providerID })?.name ?? providerID.capitalized
}
@@ -320,10 +316,7 @@ final class AIEnhancementSettingsViewModel: ObservableObject {
var seen = Set<String>()
// Built-in providers list
- let builtInList = ModelRepository.shared.builtInProvidersList(
- includeAppleIntelligence: true,
- appleIntelligenceAvailable: self.appleIntelligenceAvailable
- )
+ let builtInList = ModelRepository.shared.builtInProvidersList()
for provider in builtInList {
guard !seen.contains(provider.id) else { continue }
@@ -368,13 +361,6 @@ final class AIEnhancementSettingsViewModel: ObservableObject {
}
}
- func verifyAppleIntelligence() {
- let providerID = "apple-intelligence"
- let key = self.providerKey(for: providerID)
- self.settings.verifiedProviderFingerprints[key] = "apple-intelligence"
- self.updateConnectionStatus(.success, for: providerID)
- }
-
func verifyPrivateAIProvider(model: PrivateAIRegisteredModel) async -> Bool {
let providerID = PrivateAIProviderFeature.shared.providerID
let key = self.providerKey(for: providerID)
@@ -1028,15 +1014,6 @@ final class AIEnhancementSettingsViewModel: ObservableObject {
return
}
- // Handle Apple Intelligence specially (no base URL)
- if newValue == "apple-intelligence" {
- self.openAIBaseURL = ""
- self.updateCurrentProvider()
- self.availableModels = ["System Model"]
- self.selectedModel = "System Model"
- return
- }
-
// Check if it's a built-in provider
if ModelRepository.shared.isBuiltIn(newValue) {
self.openAIBaseURL = ModelRepository.shared.defaultBaseURL(for: newValue)
@@ -1425,14 +1402,6 @@ final class AIEnhancementSettingsViewModel: ObservableObject {
let providers = ModelRepository.builtInProviderIDs + self.savedProviders.map { $0.id }
for providerID in providers {
let key = self.providerKey(for: providerID)
- if providerID == "apple-intelligence" {
- if self.settings.verifiedProviderFingerprints[key] == "apple-intelligence" {
- statuses[providerID] = .success
- } else if statuses[providerID] == .success {
- statuses[providerID] = .unknown
- }
- continue
- }
if providerID == PrivateAIProviderFeature.shared.providerID {
if PrivateAIProviderPromptFormat.verifiedModelID(settings: self.settings) != nil {
statuses[providerID] = .success
diff --git a/Sources/Fluid/UI/AISettingsView+AIConfiguration.swift b/Sources/Fluid/UI/AISettingsView+AIConfiguration.swift
index 51e828a0..299cc5a8 100644
--- a/Sources/Fluid/UI/AISettingsView+AIConfiguration.swift
+++ b/Sources/Fluid/UI/AISettingsView+AIConfiguration.swift
@@ -532,10 +532,8 @@ extension AIEnhancementSettingsView {
}
private func providerCard(_ item: ProviderItem) -> some View {
- let isAppleDisabled = item.id == "apple-intelligence-disabled"
let isPrivateAIProvider = item.id == PrivateAIProviderFeature.shared.providerID
- let isComingSoon = isAppleDisabled
- let isExpanded = self.expandedProviderID == item.id && !isAppleDisabled
+ let isExpanded = self.expandedProviderID == item.id
let status = self.providerStatus(for: item)
let borderColor = isExpanded
? self.theme.palette.accent.opacity(0.5)
@@ -551,7 +549,7 @@ extension AIEnhancementSettingsView {
.foregroundStyle(status.color)
return VStack(alignment: .leading, spacing: 0) {
- Button(action: { if !isComingSoon { self.toggleProviderExpansion(item.id) } }) {
+ Button(action: { self.toggleProviderExpansion(item.id) }) {
HStack(alignment: .center, spacing: 10) {
self.providerLogoView(for: item)
.frame(width: 34, height: 34)
@@ -559,24 +557,21 @@ extension AIEnhancementSettingsView {
HStack(spacing: 8) {
Text(item.name)
.font(.system(size: 14, weight: .semibold))
- .foregroundStyle(isComingSoon ? self.theme.palette.accent : self.theme.palette.primaryText)
+ .foregroundStyle(self.theme.palette.primaryText)
statusView
}
Spacer()
- if !isComingSoon {
- Image(systemName: isExpanded ? "chevron.down" : "chevron.right")
- .font(.system(size: 11, weight: .semibold))
- .foregroundStyle(.secondary.opacity(0.7))
- }
+ Image(systemName: isExpanded ? "chevron.down" : "chevron.right")
+ .font(.system(size: 11, weight: .semibold))
+ .foregroundStyle(.secondary.opacity(0.7))
}
.frame(maxWidth: .infinity, alignment: .leading)
.contentShape(Rectangle())
}
.buttonStyle(.plain)
- .disabled(isComingSoon)
.padding(.horizontal, 12)
.padding(.vertical, 10)
@@ -618,12 +613,6 @@ extension AIEnhancementSettingsView {
}
private func providerStatus(for item: ProviderItem) -> (text: String, color: Color, icon: String) {
- if item.id == "apple-intelligence-disabled" {
- return ("Unavailable", .secondary, "lock.slash")
- }
- if item.id == "apple-intelligence" {
- return ("On-device", .secondary, "lock.shield")
- }
switch self.viewModel.connectionStatus(for: item.id) {
case .success:
return ("Connection verified", Color.fluidGreen, "checkmark.circle.fill")
@@ -636,10 +625,6 @@ extension AIEnhancementSettingsView {
}
}
- private var isComingSoonProvider: (ProviderItem) -> Bool {
- { $0.id == "apple-intelligence-disabled" }
- }
-
private func toggleProviderExpansion(_ providerID: String) {
if self.expandedProviderID == providerID {
self.expandedProviderID = nil
@@ -1314,31 +1299,7 @@ extension AIEnhancementSettingsView {
}
private func providerDetailsSection(for item: ProviderItem) -> AnyView {
- let isAppleDisabled = item.id == "apple-intelligence-disabled"
- let isApple = item.id == "apple-intelligence"
let providerKey = self.viewModel.providerKey(for: item.id)
- if isAppleDisabled {
- return AnyView(
- HStack(spacing: 10) {
- Image(systemName: "lock.slash")
- .font(.system(size: 14))
- .foregroundStyle(.secondary)
- Text("Apple Intelligence is unavailable on this device. Enable it in System Settings → Apple Intelligence & Siri.")
- .font(.system(size: 13))
- .foregroundStyle(.secondary)
- }
- .padding(12)
- .frame(maxWidth: .infinity, alignment: .leading)
- .background(
- RoundedRectangle(cornerRadius: 10, style: .continuous)
- .fill(self.theme.palette.contentBackground.opacity(0.6))
- .overlay(
- RoundedRectangle(cornerRadius: 10, style: .continuous)
- .stroke(self.theme.palette.cardBorder.opacity(0.35), lineWidth: 1)
- )
- )
- )
- }
let isCustom = !ModelRepository.shared.isBuiltIn(item.id)
let baseURL = self.viewModel.openAIBaseURL.trimmingCharacters(in: .whitespacesAndNewlines)
let isLocal = self.viewModel.isLocalEndpoint(baseURL)
@@ -1350,7 +1311,6 @@ extension AIEnhancementSettingsView {
let hasName = isCustom ? !(self.viewModel.savedProviders.first { $0.id == item.id }?.name ?? "").trimmingCharacters(in: .whitespacesAndNewlines).isEmpty : true
let canFetchModels = hasName && (isLocal ? !baseURL.isEmpty : (hasAPIKey && !baseURL.isEmpty))
let canVerify = hasModels && !self.viewModel.selectedModel.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty && canFetchModels
- let isVerified = self.viewModel.connectionStatus(for: item.id) == .success
let apiKeyBinding = Binding(
get: { self.viewModel.providerAPIKey(for: item.id) },
set: { self.viewModel.updateProviderAPIKey($0, for: item.id, persistEmptyValue: true) }
@@ -1369,43 +1329,7 @@ extension AIEnhancementSettingsView {
)
return AnyView(VStack(alignment: .leading, spacing: 10) {
- if isApple {
- VStack(alignment: .leading, spacing: 10) {
- HStack(spacing: 10) {
- Image(systemName: "lock.shield.fill")
- .font(.system(size: 14))
- .foregroundStyle(Color.fluidGreen)
- Text("Apple Intelligence runs on-device and does not require an API key.")
- .font(.system(size: 13))
- .foregroundStyle(.secondary)
- }
-
- HStack(spacing: 10) {
- Image(systemName: "exclamationmark.triangle.fill")
- .font(.system(size: 14))
- .foregroundStyle(.orange)
- Text("Output quality can be poor and inconsistent. Use it at your discretion.")
- .font(.system(size: 13, weight: .medium))
- .foregroundStyle(.secondary)
- }
- }
- .padding(12)
- .frame(maxWidth: .infinity, alignment: .leading)
- .background(
- RoundedRectangle(cornerRadius: 10, style: .continuous)
- .fill(Color.fluidGreen.opacity(0.08))
- .overlay(
- RoundedRectangle(cornerRadius: 10, style: .continuous)
- .stroke(Color.fluidGreen.opacity(0.2), lineWidth: 1)
- )
- )
- if !isVerified {
- Button("Verify") {
- self.viewModel.verifyAppleIntelligence()
- }
- .fluidButton(.glass, size: .compact)
- }
- } else {
+ Group {
if isCustom {
VStack(alignment: .leading, spacing: 8) {
HStack(spacing: 6) {
@@ -1931,9 +1855,6 @@ extension AIEnhancementSettingsView {
if id.contains("lmstudio") || name.contains("lm studio") || name.contains("lmstudio") {
return Color(red: 0.15, green: 0.55, blue: 0.35) // Green
}
- if id.contains("apple") || name.contains("apple intelligence") {
- return Color(red: 0.6, green: 0.4, blue: 0.7) // Purple for Apple Intelligence
- }
// Default fallback
return Color(red: 0.9, green: 0.9, blue: 0.92)
}
@@ -1978,9 +1899,6 @@ extension AIEnhancementSettingsView {
if id.contains("lmstudio") || name.contains("lm studio") || name.contains("lmstudio") {
return "Provider_LMStudio"
}
- if id.contains("apple") || name.contains("apple intelligence") {
- return "Provider_AppleIntelligence"
- }
if id.contains("compatible") || name.contains("compatible") {
return "Provider_Compatible"
}
@@ -2063,10 +1981,7 @@ extension AIEnhancementSettingsView {
}
var builtInProvidersList: [(id: String, name: String)] {
- ModelRepository.shared.builtInProvidersList(
- includeAppleIntelligence: true,
- appleIntelligenceAvailable: self.viewModel.appleIntelligenceAvailable
- )
+ ModelRepository.shared.builtInProvidersList()
}
func privateAIEditProviderSection(
diff --git a/Sources/Fluid/Views/CommandModeView.swift b/Sources/Fluid/Views/CommandModeView.swift
index aa1fd62f..1e7005ad 100644
--- a/Sources/Fluid/Views/CommandModeView.swift
+++ b/Sources/Fluid/Views/CommandModeView.swift
@@ -497,9 +497,6 @@ struct CommandModeView: View {
get: { self.settings.effectiveCommandModeProviderID },
set: { newValue in
guard !self.settings.commandModeLinkedToGlobal else { return }
- if newValue == "apple-intelligence-disabled" || newValue == "apple-intelligence" {
- return
- }
guard !self.isPrivateAIProviderID(newValue) else { return }
self.settings.commandModeSelectedProviderID = newValue
self.updateAvailableModels()
@@ -626,12 +623,7 @@ struct CommandModeView: View {
}
private var builtInProvidersList: [(id: String, name: String)] {
- // Apple Intelligence disabled for Command Mode (no tool support)
- ModelRepository.shared.builtInProvidersList(
- includeAppleIntelligence: true,
- appleIntelligenceAvailable: false,
- appleIntelligenceDisabledReason: "No tools"
- ).filter { !self.isPrivateAIProviderID($0.id) }
+ ModelRepository.shared.builtInProvidersList().filter { !self.isPrivateAIProviderID($0.id) }
}
private var verifiedBuiltInProvidersList: [(id: String, name: String)] {
diff --git a/Sources/Fluid/Views/RewriteModeView.swift b/Sources/Fluid/Views/RewriteModeView.swift
index 0ef20925..3f578ba4 100644
--- a/Sources/Fluid/Views/RewriteModeView.swift
+++ b/Sources/Fluid/Views/RewriteModeView.swift
@@ -179,10 +179,7 @@ struct RewriteModeView: View {
selectedProviderID: Binding(
get: { self.settings.rewriteModeSelectedProviderID },
set: { newValue in
- // Prevent selecting disabled Apple Intelligence
- if newValue == "apple-intelligence-disabled" {
- return
- } else if self.isPrivateAIProviderID(newValue) {
+ if self.isPrivateAIProviderID(newValue) {
return
} else {
self.settings.rewriteModeSelectedProviderID = newValue
@@ -192,18 +189,15 @@ struct RewriteModeView: View {
)
)
- // Model Selector (hidden for Apple Intelligence)
- if self.settings.rewriteModeSelectedProviderID != "apple-intelligence" {
- SearchableModelPicker(
- models: self.availableModels,
- selectedModel: Binding(
- get: { self.settings.rewriteModeSelectedModel ?? self.availableModels.first ?? "" },
- set: { self.settings.rewriteModeSelectedModel = $0 }
- ),
- onRefresh: nil,
- isRefreshing: false
- )
- }
+ SearchableModelPicker(
+ models: self.availableModels,
+ selectedModel: Binding(
+ get: { self.settings.rewriteModeSelectedModel ?? self.availableModels.first ?? "" },
+ set: { self.settings.rewriteModeSelectedModel = $0 }
+ ),
+ onRefresh: nil,
+ isRefreshing: false
+ )
// Input field (flexible)
TextField(
@@ -297,12 +291,6 @@ struct RewriteModeView: View {
return
}
- // Apple Intelligence has only one model
- if currentProviderID == "apple-intelligence" {
- self.availableModels = ["System Model"]
- return
- }
-
// Pull models from the shared pool configured in AI Settings
let possibleKeys = self.providerKeys(for: currentProviderID)
let storedList = possibleKeys.lazy
@@ -326,10 +314,7 @@ struct RewriteModeView: View {
}
private var builtInProvidersList: [(id: String, name: String)] {
- ModelRepository.shared.builtInProvidersList(
- includeAppleIntelligence: true,
- appleIntelligenceAvailable: AppleIntelligenceService.isAvailable
- ).filter { !self.isPrivateAIProviderID($0.id) }
+ ModelRepository.shared.builtInProvidersList().filter { !self.isPrivateAIProviderID($0.id) }
}
private func isPrivateAIProviderID(_ providerID: String) -> Bool {
diff --git a/Tests/FluidDictationIntegrationTests/DictationE2ETests.swift b/Tests/FluidDictationIntegrationTests/DictationE2ETests.swift
index dea25cac..acd04198 100644
--- a/Tests/FluidDictationIntegrationTests/DictationE2ETests.swift
+++ b/Tests/FluidDictationIntegrationTests/DictationE2ETests.swift
@@ -14,10 +14,13 @@ final class DictationE2ETests: XCTestCase {
private let editPromptOffKey = "EditPromptOff"
private let defaultDictationPromptOverrideKey = "DefaultDictationPromptOverride"
private let defaultEditPromptOverrideKey = "DefaultEditPromptOverride"
+ private let dictationPromptRoutingScopeKey = "DictationPromptRoutingScope"
private let savedProvidersKey = "SavedProviders"
private let selectedProviderIDKey = "SelectedProviderID"
+ private let selectedAIModelKey = "SelectedAIModel"
private let availableModelsByProviderKey = "AvailableModelsByProvider"
private let selectedModelByProviderKey = "SelectedModelByProvider"
+ private let dictationPromptConfigurationsKey = "DictationPromptConfigurations"
private let customDictionaryEntriesKey = "CustomDictionaryEntries"
private let autoConvertPunctuationEnabledKey = "AutoConvertPunctuationEnabled"
private let literalDictationFormattingEnabledKey = "LiteralDictationFormattingEnabled"
@@ -26,6 +29,8 @@ final class DictationE2ETests: XCTestCase {
private let commandModeLinkedToGlobalKey = "CommandModeLinkedToGlobal"
private let commandModeSelectedProviderIDKey = "CommandModeSelectedProviderID"
private let commandModeSelectedModelKey = "CommandModeSelectedModel"
+ private let rewriteModeSelectedProviderIDKey = "RewriteModeSelectedProviderID"
+ private let rewriteModeSelectedModelKey = "RewriteModeSelectedModel"
private var privateAISelectedModelIDKey: String {
PrivateAIProviderFeature.shared.selectedModelDefaultsKey
}
@@ -1494,6 +1499,174 @@ final class DictationE2ETests: XCTestCase {
}
}
+ func testAppleIntelligenceIsNotAvailableAsABuiltInProvider() {
+ XCTAssertFalse(ModelRepository.builtInProviderIDs.contains("apple-intelligence"))
+ XCTAssertFalse(ModelRepository.shared.builtInProvidersList().contains { $0.id.contains("apple-intelligence") })
+ }
+
+ func testRetiredAppleIntelligenceStateIsPurgedWithoutSelectingAFallbackProvider() {
+ self.withRestoredDefaults(
+ keys: [
+ self.selectedProviderIDKey,
+ self.selectedAIModelKey,
+ self.availableModelsByProviderKey,
+ self.selectedModelByProviderKey,
+ self.verifiedProviderFingerprintsKey,
+ self.commandModeSelectedProviderIDKey,
+ self.commandModeSelectedModelKey,
+ self.rewriteModeSelectedProviderIDKey,
+ self.rewriteModeSelectedModelKey,
+ self.dictationPromptConfigurationsKey,
+ ]
+ ) {
+ let settings = SettingsStore.shared
+ let shortcut = HotkeyShortcut(keyCode: 1, modifierFlags: [.command])
+ settings.selectedProviderID = "apple-intelligence"
+ settings.selectedModel = "System Model"
+ settings.availableModelsByProvider = ["apple-intelligence": ["System Model"]]
+ settings.selectedModelByProvider = ["apple-intelligence": "System Model"]
+ settings.verifiedProviderFingerprints = ["apple-intelligence": "apple-intelligence"]
+ settings.commandModeSelectedProviderID = "apple-intelligence-disabled"
+ settings.commandModeSelectedModel = "System Model"
+ settings.rewriteModeSelectedProviderID = "apple-intelligence"
+ settings.rewriteModeSelectedModel = "System Model"
+ settings.dictationPromptConfigurations = [
+ "__default__": SettingsStore.DictationPromptConfiguration(
+ shortcut: shortcut,
+ providerID: "apple-intelligence",
+ modelName: "System Model"
+ ),
+ ]
+
+ settings.purgeRetiredAppleIntelligenceState()
+ settings.purgeRetiredAppleIntelligenceState()
+
+ XCTAssertEqual(settings.selectedProviderID, "")
+ XCTAssertNil(settings.selectedModel)
+ XCTAssertEqual(settings.commandModeSelectedProviderID, "")
+ XCTAssertNil(settings.commandModeSelectedModel)
+ XCTAssertEqual(settings.rewriteModeSelectedProviderID, "")
+ XCTAssertNil(settings.rewriteModeSelectedModel)
+ XCTAssertNil(settings.availableModelsByProvider["apple-intelligence"])
+ XCTAssertNil(settings.selectedModelByProvider["apple-intelligence"])
+ XCTAssertNil(settings.verifiedProviderFingerprints["apple-intelligence"])
+ XCTAssertEqual(settings.dictationPromptConfigurations["__default__"]?.shortcut, shortcut)
+ XCTAssertEqual(settings.dictationPromptConfigurations["__default__"]?.providerID, "")
+ XCTAssertEqual(settings.dictationPromptConfigurations["__default__"]?.modelName, "")
+ XCTAssertFalse(DictationAIPostProcessingGate.isProviderConfigured())
+ }
+ }
+
+ func testDictationProviderRouteUsesPromptConfigurationWithoutMutatingGlobalSelection() {
+ self.withRestoredDefaults(
+ keys: [
+ self.selectedProviderIDKey,
+ self.selectedModelByProviderKey,
+ self.verifiedProviderFingerprintsKey,
+ self.dictationPromptConfigurationsKey,
+ self.dictationPromptOffKey,
+ self.selectedDictationPromptIDKey,
+ ]
+ ) {
+ let settings = SettingsStore.shared
+ settings.selectedProviderID = "openai"
+ settings.selectedModelByProvider = ["openai": "gpt-4.1", "ollama": "test-local-model"]
+ settings.verifiedProviderFingerprints = [
+ "ollama": DictationAIPostProcessingGate.providerFingerprint(
+ baseURL: ModelRepository.shared.defaultBaseURL(for: "ollama"),
+ apiKey: ""
+ ) ?? "",
+ ]
+ settings.setDictationPromptSelection(.default, for: .primary)
+ settings.setDictationPromptConfiguration(
+ SettingsStore.DictationPromptConfiguration(
+ providerID: "ollama",
+ modelName: "test-local-model"
+ ),
+ for: .default
+ )
+
+ let route = DictationProviderRoute.resolve(settings: settings, dictationSlot: .primary)
+
+ XCTAssertEqual(route.providerID, "ollama")
+ XCTAssertEqual(route.providerKey, "ollama")
+ XCTAssertEqual(route.model, "test-local-model")
+ XCTAssertEqual(settings.selectedProviderID, "openai")
+ XCTAssertEqual(settings.selectedModelByProvider["openai"], "gpt-4.1")
+
+ XCTAssertTrue(DictationAIPostProcessingGate.isConfigured(for: .primary))
+ XCTAssertEqual(settings.selectedProviderID, "openai")
+ }
+ }
+
+ func testDictationProviderRouteUsesAppBoundPromptConfiguration() {
+ self.withRestoredDefaults(
+ keys: [
+ self.dictationPromptProfilesKey,
+ self.appPromptBindingsKey,
+ self.dictationPromptRoutingScopeKey,
+ self.selectedProviderIDKey,
+ self.selectedModelByProviderKey,
+ self.verifiedProviderFingerprintsKey,
+ self.dictationPromptConfigurationsKey,
+ self.dictationPromptOffKey,
+ self.selectedDictationPromptIDKey,
+ ]
+ ) {
+ let settings = SettingsStore.shared
+ let appBundleID = "com.example.editor"
+ let profile = SettingsStore.DictationPromptProfile(
+ name: "Editor",
+ prompt: "Clean up text for this editor.",
+ mode: .dictate
+ )
+ settings.dictationPromptProfiles = [profile]
+ settings.appPromptBindings = [
+ SettingsStore.AppPromptBinding(
+ mode: .dictate,
+ appBundleID: appBundleID,
+ appName: "Editor",
+ promptID: profile.id
+ ),
+ ]
+ settings.dictationPromptRoutingScope = .allApps
+ settings.selectedProviderID = "openai"
+ settings.selectedModelByProvider = ["openai": "gpt-4.1", "ollama": "editor-model"]
+ settings.verifiedProviderFingerprints = [
+ "ollama": DictationAIPostProcessingGate.providerFingerprint(
+ baseURL: ModelRepository.shared.defaultBaseURL(for: "ollama"),
+ apiKey: ""
+ ) ?? "",
+ ]
+ settings.setDictationPromptSelection(.default, for: .primary)
+ settings.setDictationPromptConfiguration(
+ SettingsStore.DictationPromptConfiguration(
+ providerID: "openai",
+ modelName: "gpt-4.1"
+ ),
+ for: .default
+ )
+ settings.setDictationPromptConfiguration(
+ SettingsStore.DictationPromptConfiguration(
+ providerID: "ollama",
+ modelName: "editor-model"
+ ),
+ for: .profile(profile.id)
+ )
+
+ let route = DictationProviderRoute.resolve(
+ settings: settings,
+ dictationSlot: .primary,
+ appBundleID: appBundleID
+ )
+
+ XCTAssertEqual(route.providerID, "ollama")
+ XCTAssertEqual(route.model, "editor-model")
+ XCTAssertEqual(settings.selectedProviderID, "openai")
+ XCTAssertTrue(DictationAIPostProcessingGate.isConfigured(for: .primary, appBundleID: appBundleID))
+ }
+ }
+
func testPrivateAIProviderDictationPromptSelection_allowsOffAndRestoresNonFluidPrompt() {
self.withPromptAndProviderSettingsRestored {
let settings = SettingsStore.shared