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

Refactored Monolithic ContentView from ~4000 lines to < 2000 lines and moved AI Settings and Feedback - This could have caused crash during launch before of attributegraph race condition. Also this commit adds more whisper models (cpu based for now) ; Also fixed preview disabling not working

altic-devb9e1289481fa
diff --git a/Sources/Fluid/ContentView.swift b/Sources/Fluid/ContentView.swift
index 35a787af..760574c8 100644
--- a/Sources/Fluid/ContentView.swift
+++ b/Sources/Fluid/ContentView.swift
@@ -37,6 +37,13 @@ private struct StreamingDelta: Codable { let role: String?; let content: String?
private struct StreamingChoice: Codable { let index: Int?; let delta: StreamingDelta; let finish_reason: String? }
private struct StreamingChunk: Codable { let choices: [StreamingChoice] }
+// MARK: - AI Processing Response Structures
+// NOTE: Keep Codable types out of View methods to avoid SwiftUI/metadata blowups at launch.
+private struct AIProcessingMessage: Codable { let role: String; let content: String }
+private struct AIProcessingChoiceMessage: Codable { let role: String; let content: String }
+private struct AIProcessingChoice: Codable { let index: Int?; let message: AIProcessingChoiceMessage }
+private struct AIProcessingResponse: Codable { let choices: [AIProcessingChoice] }
+
struct ContentView: View {
@StateObject private var audioObserver = AudioHardwareObserver()
@StateObject private var asr = ASRService()
@@ -84,9 +91,6 @@ struct ContentView: View {
@State private var isCallingAI: Bool = false
@State private var openAIBaseURL: String = "https://api.openai.com/v1"
- // MARK: - AI Enhancement checkbox state
- @State private var enableAIProcessing: Bool = false
-
@State private var enableDebugLogs: Bool = SettingsStore.shared.enableDebugLogs
@State private var pressAndHoldModeEnabled: Bool = SettingsStore.shared.pressAndHoldMode
@State private var enableStreamingPreview: Bool = SettingsStore.shared.enableStreamingPreview
@@ -120,55 +124,28 @@ struct ContentView: View {
@State private var providerAPIKeys: [String: String] = [:] // [providerKey: apiKey]
@State private var currentProvider: String = "openai" // canonical key: "openai" | "groq" | "custom:<id>"
- // API Connection Testing States
- @State private var isTestingConnection: Bool = false
- @State private var connectionStatus: ConnectionStatus = .unknown
- @State private var connectionErrorMessage: String = ""
- @State private var showHelp: Bool = false
-
- enum ConnectionStatus {
- case unknown, testing, success, failed
- }
@State private var savedProviders: [SettingsStore.SavedProvider] = []
@State private var selectedProviderID: String = SettingsStore.shared.selectedProviderID
- @State private var showingSaveProvider: Bool = false
- @State private var newProviderName: String = ""
- @State private var newProviderModels: String = ""
- @State private var newProviderApiKey: String = ""
- @State private var showAPIKeyEditor: Bool = false
- @State private var newProviderBaseURL: String = ""
- @State private var keyJustSaved: Bool = false
- @State private var showAPIKeysGuide: Bool = false
- @State private var showKeychainPermissionAlert: Bool = false
- @State private var keychainPermissionMessage: String = ""
-
- // Edit Provider State
- @State private var showingEditProvider: Bool = false
- @State private var editProviderName: String = ""
- @State private var editProviderBaseURL: String = ""
-
- // Feedback State
- @State private var feedbackText: String = ""
- @State private var feedbackEmail: String = ""
- @State private var includeDebugLogs: Bool = false
- @State private var isSendingFeedback: Bool = false
- @State private var showFeedbackConfirmation: Bool = false
+
+
var body: some View {
- NavigationSplitView {
- sidebarView
- .environmentObject(mouseTracker)
- .navigationSplitViewColumnWidth(min: 220, ideal: 250, max: 300)
- } detail: {
- detailView
- .environmentObject(mouseTracker)
- }
- .withMouseTracking(mouseTracker)
- .environmentObject(mouseTracker)
- .onChange(of: menuBarManager.requestedNavigationDestination) { _, destination in
+ let splitView: AnyView = AnyView(
+ NavigationSplitView {
+ sidebarView
+ .navigationSplitViewColumnWidth(min: 220, ideal: 250, max: 300)
+ } detail: {
+ detailView
+ }
+ )
+
+ let tracked = splitView.withMouseTracking(mouseTracker)
+ let env = tracked.environmentObject(mouseTracker)
+ let nav = env.onChange(of: menuBarManager.requestedNavigationDestination) { _, destination in
handleMenuBarNavigation(destination)
}
- .onAppear {
+
+ return nav.onAppear {
appear = true
accessibilityEnabled = checkAccessibilityPermissions()
@@ -235,7 +212,7 @@ struct ContentView: View {
}
// Set up notch click callback for expanding command conversation
- NotchOverlayManager.shared.onNotchClicked = { [weak commandModeService] in
+ NotchOverlayManager.shared.onNotchClicked = {
// When notch is clicked in command mode, show expanded conversation
if !NotchContentState.shared.commandConversationHistory.isEmpty {
NotchOverlayManager.shared.showExpandedCommandOutput()
@@ -283,7 +260,6 @@ struct ContentView: View {
// Establish provider context first
updateCurrentProvider()
- enableAIProcessing = SettingsStore.shared.enableAIProcessing
enableDebugLogs = SettingsStore.shared.enableDebugLogs
availableModelsByProvider = SettingsStore.shared.availableModelsByProvider
selectedModelByProvider = SettingsStore.shared.selectedModelByProvider
@@ -482,24 +458,19 @@ struct ContentView: View {
return event
}
}
- .onChange(of: accessibilityEnabled) { enabled in
+ .onChange(of: accessibilityEnabled) { _, enabled in
if enabled && hotkeyManager != nil && !hotkeyManagerInitialized {
DebugLogger.shared.debug("Accessibility enabled, reinitializing hotkey manager", source: "ContentView")
hotkeyManager?.reinitialize()
}
}
- .onChange(of: enableAIProcessing) { newValue in
- SettingsStore.shared.enableAIProcessing = newValue
- // Sync to menu bar immediately
- menuBarManager.aiProcessingEnabled = newValue
- }
- .onChange(of: selectedModel) { newValue in
+ .onChange(of: selectedModel) { _, newValue in
if newValue != "__ADD_MODEL__" {
selectedModelByProvider[currentProvider] = newValue
SettingsStore.shared.selectedModelByProvider = selectedModelByProvider
}
}
- .onChange(of: selectedProviderID) { newValue in
+ .onChange(of: selectedProviderID) { _, newValue in
SettingsStore.shared.selectedProviderID = newValue
}
.onReceive(NotificationCenter.default.publisher(for: NSApplication.didBecomeActiveNotification)) { _ in
@@ -510,22 +481,13 @@ struct ContentView: View {
}
.overlay(alignment: .center) {
}
- .alert("Keychain Access Required", isPresented: $showKeychainPermissionAlert) {
- Button("Open Keychain Access") {
- openKeychainAccessApp()
- }
- Button("OK", role: .cancel) { }
- } message: {
- Text(keychainPermissionMessage.isEmpty
- ? "FluidVoice stores provider API keys securely in your macOS Keychain. Please grant access by choosing \"Always Allow\" when prompted."
- : keychainPermissionMessage)
- }
+
.alert(asr.errorTitle, isPresented: $asr.showError) {
Button("OK", role: .cancel) { }
} message: {
Text(asr.errorMessage)
}
- .onReceive(audioObserver.changePublisher) { _ in
+ .onChange(of: audioObserver.changeTick) { _, _ in
// Hardware change detected → refresh lists and apply preferences if available
refreshDevices()
@@ -565,7 +527,7 @@ struct ContentView: View {
accessibilityPollingTask?.cancel()
accessibilityPollingTask = nil
}
- .onChange(of: hotkeyShortcut) { newValue in
+ .onChange(of: hotkeyShortcut) { _, newValue in
DebugLogger.shared.debug("Hotkey shortcut changed to \(newValue.displayString)", source: "ContentView")
hotkeyManager?.updateShortcut(newValue)
@@ -575,7 +537,7 @@ struct ContentView: View {
DebugLogger.shared.debug("Hotkey manager initialized: \(self.hotkeyManagerInitialized)", source: "ContentView")
}
}
- .onChange(of: selectedSidebarItem) { newValue in
+ .onChange(of: selectedSidebarItem) { _, newValue in
handleModeTransition(from: previousSidebarItem, to: newValue)
previousSidebarItem = newValue
}
@@ -717,37 +679,39 @@ struct ContentView: View {
.fill(theme.materials.window)
.ignoresSafeArea()
- Group {
- switch selectedSidebarItem ?? .welcome {
- case .welcome:
- welcomeView
- case .aiSettings:
- aiSettingsView
- case .preferences:
- preferencesView
- case .meetingTools:
- meetingToolsView
- case .stats:
- statsView
- case .feedback:
- feedbackView
- case .commandMode:
- commandModeView
- case .rewriteMode:
- rewriteModeView
- case .history:
- TranscriptionHistoryView()
- }
- }
- .transition(.opacity)
+ detailContent
+ .transition(.opacity)
}
.toolbar(.hidden, for: .automatic)
}
+ private var detailContent: AnyView {
+ switch selectedSidebarItem ?? .welcome {
+ case .welcome:
+ return AnyView(welcomeView)
+ case .aiSettings:
+ return AnyView(AISettingsView())
+ case .preferences:
+ return AnyView(preferencesView)
+ case .meetingTools:
+ return AnyView(meetingToolsView)
+ case .stats:
+ return AnyView(statsView)
+ case .feedback:
+ return AnyView(FeedbackView())
+ case .commandMode:
+ return AnyView(commandModeView)
+ case .rewriteMode:
+ return AnyView(rewriteModeView)
+ case .history:
+ return AnyView(TranscriptionHistoryView())
+ }
+ }
+
// MARK: - Welcome Guide
private var welcomeView: some View {
WelcomeView(
- asr: asr,
+
selectedSidebarItem: $selectedSidebarItem,
playgroundUsed: $playgroundUsed,
isTranscriptionFocused: $isTranscriptionFocused,
@@ -871,7 +835,7 @@ struct ContentView: View {
// MARK: - Preferences View
private var preferencesView: some View {
SettingsView(
- asr: asr,
+
appear: $appear,
visualizerNoiseThreshold: $visualizerNoiseThreshold,
selectedInputUID: $selectedInputUID,
@@ -902,7 +866,7 @@ struct ContentView: View {
private var recordingView: some View {
RecordingView(
- asr: asr,
+
appear: $appear,
stopAndProcessTranscription: { await stopAndProcessTranscription() },
startRecording: startRecording
@@ -910,1321 +874,17 @@ struct ContentView: View {
}
private var commandModeView: some View {
- CommandModeView(service: commandModeService, asr: asr, onClose: {
+ CommandModeView(service: commandModeService, onClose: {
self.selectedSidebarItem = .welcome
})
}
private var rewriteModeView: some View {
- RewriteModeView(service: rewriteModeService, asr: asr, onClose: {
+ RewriteModeView(service: rewriteModeService, onClose: {
self.selectedSidebarItem = .welcome
})
}
- // MARK: - AI Settings Tab
- private var aiSettingsView: some View {
- ScrollView(.vertical, showsIndicators: false) {
- VStack(alignment: .leading, spacing: 14) {
- // Voice to Text Model Card
- ThemedCard(hoverEffect: false) {
- VStack(alignment: .leading, spacing: 10) {
- HStack {
- Image(systemName: "brain.head.profile")
- .font(.title2)
- .foregroundStyle(.white)
- Text("Voice to Text Model")
- .font(.title3)
- .fontWeight(.semibold)
- }
-
- VStack(alignment: .leading, spacing: 10) {
- HStack(spacing: 12) {
- Text("Model")
- .fontWeight(.medium)
- Spacer()
- Menu(asr.selectedModel.displayName) {
- ForEach(ASRService.ModelOption.allCases) { option in
- Button(option.displayName) { asr.selectedModel = option }
- }
- }
- .disabled(asr.isRunning)
- }
-
- // Model status indicator with action buttons
- HStack(spacing: 12) {
- if asr.isDownloadingModel || asr.isLoadingModel {
- HStack(spacing: 8) {
- ProgressView()
- .controlSize(.small)
- Text(asr.isLoadingModel ? "Loading model…" : "Downloading…")
- .font(.caption)
- .foregroundStyle(.secondary)
- }
- } else if asr.isAsrReady {
- Image(systemName: "checkmark.circle.fill")
- .foregroundStyle(.green)
- .font(.caption)
-
- Button(action: {
- Task { await deleteModels() }
- }) {
- HStack(spacing: 4) {
- Image(systemName: "trash")
- Text("Delete")
- }
- .font(.caption)
- .foregroundStyle(.red)
- }
- .buttonStyle(.plain)
- .help("Delete downloaded models (~500MB)")
- } else if asr.modelsExistOnDisk {
- Image(systemName: "doc.fill")
- .foregroundStyle(theme.palette.accent)
- .font(.caption)
-
- Button(action: {
- Task { await deleteModels() }
- }) {
- HStack(spacing: 4) {
- Image(systemName: "trash")
- Text("Delete")
- }
- .font(.caption)
- .foregroundStyle(.red)
- }
- .buttonStyle(.plain)
- .help("Delete downloaded models (~500MB)")
- } else {
- Image(systemName: "arrow.down.circle")
- .foregroundStyle(.orange)
- .font(.caption)
-
- Button(action: {
- Task { await downloadModels() }
- }) {
- HStack(spacing: 4) {
- Image(systemName: "arrow.down.circle.fill")
- Text("Download")
- }
- .font(.caption)
- .foregroundStyle(theme.palette.accent)
- }
- .buttonStyle(.plain)
- .help("Download ASR models (~500MB)")
- }
- }
- .padding(.horizontal, 12)
- .padding(.vertical, 8)
- .background(
- RoundedRectangle(cornerRadius: 8)
- .fill(.ultraThinMaterial.opacity(0.3))
- .overlay(
- RoundedRectangle(cornerRadius: 8)
- .stroke(.white.opacity(0.1), lineWidth: 1)
- )
- )
-
- // Loading/Download status message
- if asr.isLoadingModel {
- Text("Loading model into memory (30-60 sec)...")
- .font(.caption2)
- .foregroundStyle(.secondary)
- .padding(.leading, 4)
- } else if asr.isDownloadingModel {
- Text("Downloading model (~500MB)...")
- .font(.caption2)
- .foregroundStyle(.secondary)
- .padding(.leading, 4)
- }
-
- // Helpful link: Supported languages
- HStack(alignment: .firstTextBaseline, spacing: 8) {
- Image(systemName: "link")
- .foregroundStyle(.secondary)
- Link(
- "Supported languages",
- destination: URL(string: "https://huggingface.co/nvidia/parakeet-tdt-0.6b-v3")!
- )
- }
- .font(.caption)
- .foregroundStyle(.secondary)
-
- Divider()
- .padding(.vertical, 4)
-
- // Filler Words Section
- VStack(alignment: .leading, spacing: 8) {
- HStack(alignment: .center) {
- VStack(alignment: .leading, spacing: 2) {
- Text("Remove Filler Words")
- .font(.body)
- Text("Automatically remove filler sounds like 'um', 'uh', 'er' from transcriptions")
- .font(.caption)
- .foregroundStyle(.secondary)
- }
-
- Spacer()
-
- Toggle("", isOn: Binding(
- get: { SettingsStore.shared.removeFillerWordsEnabled },
- set: { SettingsStore.shared.removeFillerWordsEnabled = $0 }
- ))
- .toggleStyle(.switch)
- .labelsHidden()
- }
-
- if SettingsStore.shared.removeFillerWordsEnabled {
- FillerWordsEditor()
- }
- }
- }
- }
- .padding(14)
- }
-
- aiConfigurationCard
- }
- .padding(14)
- }
- .onAppear {
- // Ensure the toggle reflects persisted value when navigating between tabs
- enableAIProcessing = SettingsStore.shared.enableAIProcessing
- }
- }
-
- private var aiConfigurationCard: some View {
- VStack(spacing: 14) {
- // API Configuration Section
- ThemedCard(style: .prominent, hoverEffect: false) {
- VStack(alignment: .leading, spacing: 12) {
- HStack {
- Image(systemName: "key.fill")
- .font(.title3)
- .foregroundStyle(theme.palette.accent)
- Text("API Configuration")
- .font(.headline)
- .fontWeight(.semibold)
-
- Spacer()
-
- Button(action: { showHelp.toggle() }) {
- Image(systemName: showHelp ? "questionmark.circle.fill" : "questionmark.circle")
- .font(.system(size: 20))
- .foregroundStyle(theme.palette.accent.opacity(0.8))
- }
- .buttonStyle(.plain)
- .buttonHoverEffect()
- }
-
- Divider()
- .padding(.vertical, 3)
-
- // AI Enhancement Toggle - Aligned with Grid below
- HStack(alignment: .top, spacing: 16) {
- VStack(alignment: .leading, spacing: 4) {
- Text("Enable AI Enhancement")
- .font(.system(size: 15, weight: .semibold))
- .foregroundStyle(theme.palette.primaryText)
-
- Text("Automatically enhance transcriptions with AI")
- .font(.system(size: 13))
- .foregroundStyle(theme.palette.secondaryText)
- }
-
- Spacer()
-
- Toggle("", isOn: $enableAIProcessing)
- .toggleStyle(.switch)
- .labelsHidden()
- .onChange(of: enableAIProcessing) { newValue in
- SettingsStore.shared.enableAIProcessing = newValue
- }
- }
- .padding(.horizontal, 4)
-
- // Streaming Toggle (only for OpenAI-compatible APIs, not Apple Intelligence)
- if enableAIProcessing && selectedProviderID != "apple-intelligence" {
- Divider()
- .padding(.vertical, 3)
-
- HStack(alignment: .top, spacing: 16) {
- VStack(alignment: .leading, spacing: 4) {
- Text("Enable Streaming")
- .font(.system(size: 15, weight: .semibold))
- .foregroundStyle(theme.palette.primaryText)
-
- Text("Currently only Command Mode shows real-time streaming")
- .font(.system(size: 13))
- .foregroundStyle(theme.palette.secondaryText)
- }
-
- Spacer()
-
- Toggle("", isOn: Binding(
- get: { SettingsStore.shared.enableAIStreaming },
- set: { SettingsStore.shared.enableAIStreaming = $0 }
- ))
- .toggleStyle(.switch)
- .labelsHidden()
- }
- .padding(.horizontal, 4)
- }
-
- // API Key Warning (not for Apple Intelligence - it doesn't need a key)
- if enableAIProcessing &&
- selectedProviderID != "apple-intelligence" &&
- !isLocalEndpoint(openAIBaseURL.trimmingCharacters(in: .whitespacesAndNewlines)) &&
- (providerAPIKeys[currentProvider] ?? "").trimmingCharacters(in: CharacterSet.whitespacesAndNewlines).isEmpty {
- HStack(spacing: 10) {
- Image(systemName: "exclamationmark.triangle.fill")
- .foregroundStyle(.orange)
- .font(.system(size: 16))
-
- Text("API key required for AI enhancement to work")
- .font(.system(size: 13, weight: .medium))
- .foregroundStyle(.orange)
-
- Spacer()
- }
- .padding(12)
- .background(.orange.opacity(0.12))
- .clipShape(RoundedRectangle(cornerRadius: 8))
- .overlay(
- RoundedRectangle(cornerRadius: 8)
- .stroke(.orange.opacity(0.3), lineWidth: 1)
- )
- .padding(.horizontal, 4)
- }
-
- // Help Section
- if showHelp {
- VStack(alignment: .leading, spacing: 10) {
- HStack {
- Image(systemName: "lightbulb.fill")
- .foregroundStyle(.yellow)
- Text("Quick Start Guide")
- .font(.subheadline)
- .fontWeight(.semibold)
- }
-
- VStack(alignment: .leading, spacing: 6) {
- HStack(alignment: .top, spacing: 8) {
- Text("1.")
- .font(.caption)
- .fontWeight(.semibold)
- .frame(width: 16, alignment: .trailing)
- Text("Enable AI enhancement if needed")
- .font(.caption)
- .foregroundStyle(.secondary)
- }
-
- HStack(alignment: .top, spacing: 8) {
- Text("2.")
- .font(.caption)
- .fontWeight(.semibold)
- .frame(width: 16, alignment: .trailing)
- Text("Add/choose any provider of your choice along with its API key")
- .font(.caption)
- .foregroundStyle(.secondary)
- }
-
- HStack(alignment: .top, spacing: 8) {
- Text("3.")
- .font(.caption)
- .fontWeight(.semibold)
- .frame(width: 16, alignment: .trailing)
- Text("Add/choose any good model of your liking")
- .font(.caption)
- .foregroundStyle(.secondary)
- }
-
- HStack(alignment: .top, spacing: 8) {
- Text("4.")
- .font(.caption)
- .fontWeight(.semibold)
- .frame(width: 16, alignment: .trailing)
- Text("If it's OpenAI compatible endpoint, then update the base URL")
- .font(.caption)
- .foregroundStyle(.secondary)
- }
-
- HStack(alignment: .top, spacing: 8) {
- Text("5.")
- .font(.caption)
- .fontWeight(.semibold)
- .frame(width: 16, alignment: .trailing)
- Text("Once everything is set, click verify to check if the connection works")
- .font(.caption)
- .foregroundStyle(.secondary)
- }
-
- HStack(alignment: .top, spacing: 8) {
- Text("6.")
- .font(.caption)
- .fontWeight(.semibold)
- .frame(width: 16, alignment: .trailing)
- Text("Try something like \"Bullet point 1 - Apple, 2 - Orange, 3 - Banana\" and see AI write it perfectly")
- .font(.caption)
- .foregroundStyle(.secondary)
- }
- }
- }
- .padding(14)
- .background(theme.palette.accent.opacity(0.08))
- .cornerRadius(12)
- .overlay(
- RoundedRectangle(cornerRadius: 12)
- .stroke(theme.palette.accent.opacity(0.2), lineWidth: 1)
- )
- .padding(.horizontal, 4)
- .transition(.opacity)
- }
-
- Divider()
- .padding(.vertical, 3)
-
- VStack(alignment: .leading, spacing: 10) {
- // Compatibility note (different for Apple Intelligence)
- if selectedProviderID == "apple-intelligence" {
- HStack(spacing: 6) {
- Image(systemName: "apple.logo")
- .font(.caption2)
- .foregroundStyle(theme.palette.accent)
- Text("Powered by on-device Apple Intelligence")
- .font(.caption)
- .foregroundStyle(.secondary)
- }
- .padding(.horizontal, 4)
- } else {
- HStack(spacing: 6) {
- Image(systemName: "checkmark.seal.fill")
- .font(.caption2)
- .foregroundStyle(theme.palette.accent)
- Text("Supports any OpenAI compatible API endpoints")
- .font(.caption)
- .foregroundStyle(.secondary)
- }
- .padding(.horizontal, 4)
- }
-
- Divider()
-
- // Provider Row
- HStack(spacing: 12) {
- HStack {
- Text("Provider:")
- .fontWeight(.medium)
- }
- .frame(width: 90, alignment: .leading)
- .padding(.horizontal, 10)
- .padding(.vertical, 4)
- .background(
- LinearGradient(
- colors: [theme.palette.accent.opacity(0.15), theme.palette.accent.opacity(0.05)],
- startPoint: .leading,
- endPoint: .trailing
- )
- )
- .cornerRadius(6)
-
- Picker("", selection: $selectedProviderID) {
- Text("OpenAI").tag("openai")
- Text("Groq").tag("groq")
-
- // Apple Intelligence - show but disable if unavailable
- if AppleIntelligenceService.isAvailable {
- Text("Apple Intelligence").tag("apple-intelligence")
- } else {
- Text("Apple Intelligence (Unavailable)")
- .foregroundColor(.secondary)
- .tag("apple-intelligence-disabled")
- }
-
- if !savedProviders.isEmpty {
- Divider()
- ForEach(savedProviders) { provider in
- Text(provider.name).tag(provider.id)
- }
- }
- }
- .pickerStyle(.menu)
- .labelsHidden()
- .frame(width: 200)
- .onChange(of: selectedProviderID) { newValue in
- // Prevent selecting disabled Apple Intelligence
- if newValue == "apple-intelligence-disabled" {
- selectedProviderID = "openai"
- return
- }
-
- switch newValue {
- case "openai":
- openAIBaseURL = "https://api.openai.com/v1"
- updateCurrentProvider()
- let key = "openai"
- if let stored = availableModelsByProvider[key], !stored.isEmpty { availableModels = stored }
- else { availableModels = defaultModels(for: key) }
- if let sel = selectedModelByProvider[key], availableModels.contains(sel) { selectedModel = sel }
- else { selectedModel = availableModels.first ?? selectedModel }
- case "groq":
- openAIBaseURL = "https://api.groq.com/openai/v1"
- updateCurrentProvider()
- let key = "groq"
- if let stored = availableModelsByProvider[key], !stored.isEmpty { availableModels = stored }
- else { availableModels = defaultModels(for: key) }
- if let sel = selectedModelByProvider[key], availableModels.contains(sel) { selectedModel = sel }
- else { selectedModel = availableModels.first ?? selectedModel }
- case "apple-intelligence":
- // Apple Intelligence - no base URL or models needed
- openAIBaseURL = ""
- updateCurrentProvider()
- availableModels = ["System Model"]
- selectedModel = "System Model"
- default:
- if let provider = savedProviders.first(where: { $0.id == newValue }) {
- openAIBaseURL = provider.baseURL
- updateCurrentProvider()
- let key = providerKey(for: newValue)
- availableModels = provider.models.isEmpty ? (availableModelsByProvider[key] ?? defaultModels(for: key)) : provider.models
- if let sel = selectedModelByProvider[key], availableModels.contains(sel) { selectedModel = sel }
- else { selectedModel = availableModels.first ?? selectedModel }
- }
- }
- }
-
- // Edit button for custom providers
- Button(action: {
- if let provider = savedProviders.first(where: { $0.id == selectedProviderID }) {
- editProviderName = provider.name
- editProviderBaseURL = provider.baseURL
- showingEditProvider = true
- }
- }) {
- HStack(spacing: 4) {
- Image(systemName: "pencil")
- Text("Edit")
- }
- .font(.caption)
- }
- .buttonStyle(CompactButtonStyle())
- .buttonHoverEffect()
- .disabled(selectedProviderID == "openai" || selectedProviderID == "groq" || selectedProviderID == "apple-intelligence")
-
- // Delete button for custom providers
- Button(action: {
- // Only delete if it's a custom provider
- if !selectedProviderID.isEmpty && selectedProviderID != "openai" && selectedProviderID != "groq" {
- savedProviders.removeAll { $0.id == selectedProviderID }
- saveSavedProviders()
- let key = providerKey(for: selectedProviderID)
- availableModelsByProvider.removeValue(forKey: key)
- selectedModelByProvider.removeValue(forKey: key)
- providerAPIKeys.removeValue(forKey: key)
- saveProviderAPIKeys()
- SettingsStore.shared.availableModelsByProvider = availableModelsByProvider
- SettingsStore.shared.selectedModelByProvider = selectedModelByProvider
- selectedProviderID = "openai"
- openAIBaseURL = "https://api.openai.com/v1"
- updateCurrentProvider()
- availableModels = defaultModels(for: "openai")
- selectedModel = availableModels.first ?? selectedModel
- }
- }) {
- HStack(spacing: 4) {
- Image(systemName: "trash")
- Text("Delete")
- }
- .font(.caption)
- .foregroundStyle(.red)
- }
- .buttonStyle(CompactButtonStyle())
- .buttonHoverEffect()
- .disabled(selectedProviderID == "openai" || selectedProviderID == "groq" || selectedProviderID == "apple-intelligence")
-
- Button("+ Add Provider") {
- showingSaveProvider = true
- newProviderName = ""
- newProviderBaseURL = ""
- newProviderApiKey = ""
- newProviderModels = ""
- }
- .buttonStyle(CompactButtonStyle())
- .buttonHoverEffect()
- }
-
- // Edit Provider Modal (Inline)
- if showingEditProvider {
- VStack(spacing: 12) {
- HStack {
- Text("Edit Provider")
- .font(.headline)
- .fontWeight(.semibold)
- Spacer()
- }
-
- HStack(spacing: 8) {
- VStack(alignment: .leading, spacing: 4) {
- Text("Name")
- .font(.caption)
- .foregroundStyle(.secondary)
- TextField("Provider name", text: $editProviderName)
- .textFieldStyle(.roundedBorder)
- .frame(width: 200)
- }
-
- VStack(alignment: .leading, spacing: 4) {
- Text("Base URL")
- .font(.caption)
- .foregroundStyle(.secondary)
- TextField("e.g., http://localhost:11434/v1", text: $editProviderBaseURL)
- .textFieldStyle(.roundedBorder)
- .font(.system(.body, design: .monospaced))
- }
- }
-
- HStack(spacing: 8) {
- Button("Save") {
- let name = editProviderName.trimmingCharacters(in: .whitespacesAndNewlines)
- let base = editProviderBaseURL.trimmingCharacters(in: .whitespacesAndNewlines)
-
- guard !name.isEmpty, !base.isEmpty else { return }
-
- if let providerIndex = savedProviders.firstIndex(where: { $0.id == selectedProviderID }) {
- let oldProvider = savedProviders[providerIndex]
- let updatedProvider = SettingsStore.SavedProvider(
- id: oldProvider.id,
- name: name,
- baseURL: base,
- models: oldProvider.models
- )
- savedProviders[providerIndex] = updatedProvider
- saveSavedProviders()
-
- openAIBaseURL = base
- updateCurrentProvider()
- }
-
- showingEditProvider = false
- editProviderName = ""; editProviderBaseURL = ""
- }
- .buttonStyle(GlassButtonStyle())
- .disabled(editProviderName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty || editProviderBaseURL.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty)
-
- Button("Cancel") {
- showingEditProvider = false
- editProviderName = ""; editProviderBaseURL = ""
- }
- .buttonStyle(GlassButtonStyle())
- }
- }
- .padding(12)
- .background(theme.palette.cardBackground.opacity(0.5))
- .cornerRadius(12)
- .overlay(RoundedRectangle(cornerRadius: 12).stroke(theme.palette.accent.opacity(0.3), lineWidth: 1))
- .padding(.vertical, 8)
- .transition(.move(edge: .top).combined(with: .opacity))
- }
-
- // Apple Intelligence Badge (when selected)
- if selectedProviderID == "apple-intelligence" {
- HStack(spacing: 8) {
- Image(systemName: "apple.logo")
- .font(.system(size: 14))
- Text("On-Device")
- .fontWeight(.medium)
- Text("•")
- .foregroundStyle(.secondary)
- Image(systemName: "lock.shield.fill")
- .font(.system(size: 12))
- Text("Private")
- .fontWeight(.medium)
- }
- .font(.caption)
- .foregroundStyle(.green)
- .padding(.horizontal, 12)
- .padding(.vertical, 8)
- .background(
- RoundedRectangle(cornerRadius: 8)
- .fill(.green.opacity(0.15))
- .overlay(
- RoundedRectangle(cornerRadius: 8)
- .stroke(.green.opacity(0.3), lineWidth: 1)
- )
- )
-
- Divider()
- }
-
-
-
- // API Key Management (not for Apple Intelligence)
- if selectedProviderID != "apple-intelligence" {
- Divider()
-
- Button(action: {
- handleAPIKeyButtonTapped()
- }) {
- Label("Add or Modify API Key", systemImage: "key.fill")
- .labelStyle(.titleAndIcon)
- .font(.caption)
- }
- .buttonStyle(GlassButtonStyle())
- .buttonHoverEffect()
- }
-
- Divider()
-
- // Model Row (simplified for Apple Intelligence)
- if selectedProviderID == "apple-intelligence" {
- HStack(spacing: 12) {
- HStack {
- Text("Model:")
- .fontWeight(.medium)
- }
- .frame(width: 90, alignment: .leading)
- .padding(.horizontal, 10)
- .padding(.vertical, 4)
- .background(
- LinearGradient(
- colors: [theme.palette.accent.opacity(0.15), theme.palette.accent.opacity(0.05)],
- startPoint: .leading,
- endPoint: .trailing
- )
- )
- .cornerRadius(6)
-
- Text("System Language Model")
- .foregroundStyle(.secondary)
- .font(.system(.body))
-
- Spacer()
- }
- } else {
- // Standard Model Row for other providers
- HStack(spacing: 12) {
- HStack {
- Text("Model:")
- .fontWeight(.medium)
- }
- .frame(width: 90, alignment: .leading)
- .padding(.horizontal, 10)
- .padding(.vertical, 4)
- .background(
- LinearGradient(
- colors: [theme.palette.accent.opacity(0.15), theme.palette.accent.opacity(0.05)],
- startPoint: .leading,
- endPoint: .trailing
- )
- )
- .cornerRadius(6)
-
- Picker("", selection: $selectedModel) {
- ForEach(availableModels, id: \.self) { model in
- Text(model).tag(model)
- }
- }
- .pickerStyle(.menu)
- .labelsHidden()
- .frame(width: 200)
- .onChange(of: selectedModel) { newValue in
- let key = providerKey(for: selectedProviderID)
- selectedModelByProvider[key] = newValue
- SettingsStore.shared.selectedModelByProvider = selectedModelByProvider
- }
-
- // Always show delete button
- Button(action: {
- let key = providerKey(for: selectedProviderID)
- // Allow deletion for any model except for OpenAI/Groq providers
- if selectedProviderID != "openai" && selectedProviderID != "groq" {
- var list = availableModelsByProvider[key] ?? availableModels
- list.removeAll { $0 == selectedModel }
-
- // If no models left, add back the default
- if list.isEmpty {
- list = defaultModels(for: key)
- }
-
- availableModelsByProvider[key] = list
- SettingsStore.shared.availableModelsByProvider = availableModelsByProvider
-
- if let providerIndex = savedProviders.firstIndex(where: { $0.id == selectedProviderID }) {
- let updatedProvider = SettingsStore.SavedProvider(
- id: savedProviders[providerIndex].id,
- name: savedProviders[providerIndex].name,
- baseURL: savedProviders[providerIndex].baseURL,
- models: list
- )
- savedProviders[providerIndex] = updatedProvider
- saveSavedProviders()
- }
-
- availableModels = list
- selectedModel = list.first ?? ""
- selectedModelByProvider[key] = selectedModel
- SettingsStore.shared.selectedModelByProvider = selectedModelByProvider
- }
- }) {
- HStack(spacing: 4) {
- Image(systemName: "trash")
- Text("Delete")
- }
- .font(.caption)
- .foregroundStyle(.red)
- }
- .buttonStyle(CompactButtonStyle())
- .buttonHoverEffect()
- .disabled(selectedProviderID == "openai" || selectedProviderID == "groq")
-
- // Add Model button (when not in add mode)
- if !showingAddModel {
- Button("+ Add Model") {
- showingAddModel = true
- newModelName = ""
- }
- .buttonStyle(CompactButtonStyle())
- .buttonHoverEffect()
- }
-
- // Reasoning Config button
- Button(action: {
- // Load current config for this model
- let providerKey = self.providerKey(for: selectedProviderID)
- if let config = SettingsStore.shared.getReasoningConfig(forModel: selectedModel, provider: providerKey) {
- editingReasoningParamName = config.parameterName
- editingReasoningParamValue = config.parameterValue
- editingReasoningEnabled = config.isEnabled
- } else {
- // Check if model has auto-detected defaults
- let modelLower = selectedModel.lowercased()
- if modelLower.hasPrefix("gpt-5") || modelLower.contains("gpt-5.") ||
- modelLower.hasPrefix("o1") || modelLower.hasPrefix("o3") ||
- modelLower.contains("gpt-oss") || modelLower.hasPrefix("openai/") {
- editingReasoningParamName = "reasoning_effort"
- editingReasoningParamValue = "low"
- editingReasoningEnabled = true
- } else if modelLower.contains("deepseek") && modelLower.contains("reasoner") {
- editingReasoningParamName = "enable_thinking"
- editingReasoningParamValue = "true"
- editingReasoningEnabled = true
- } else {
- editingReasoningParamName = "reasoning_effort"
- editingReasoningParamValue = "low"
- editingReasoningEnabled = false
- }
- }
- showingReasoningConfig = true
- }) {
- HStack(spacing: 4) {
- Image(systemName: hasReasoningConfigForCurrentModel() ? "brain.fill" : "brain")
- Text("Reasoning")
- }
- .font(.caption)
- .foregroundStyle(hasReasoningConfigForCurrentModel() ? theme.palette.accent : .secondary)
- }
- .buttonStyle(CompactButtonStyle())
- .buttonHoverEffect()
- .help("Configure reasoning/thinking parameters for this model")
- }
-
- // Add model input (appears below on new line when in add mode)
- if showingAddModel {
- HStack(spacing: 8) {
- TextField("Enter model name", text: $newModelName)
- .textFieldStyle(.roundedBorder)
- .onSubmit {
- // Submit on Enter key
- if !newModelName.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines).isEmpty {
- addNewModel()
- }
- }
-
- Button("Add") {
- addNewModel()
- }
- .buttonStyle(CompactButtonStyle())
- .buttonHoverEffect()
- .disabled(newModelName.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines).isEmpty)
-
- Button("Cancel") {
- showingAddModel = false
- newModelName = ""
- }
- .buttonStyle(CompactButtonStyle())
- .buttonHoverEffect()
- }
- .padding(.leading, 122) // Align with model picker
- }
-
- // Reasoning Config Editor (appears below when editing)
- if showingReasoningConfig {
- VStack(alignment: .leading, spacing: 10) {
- HStack {
- Image(systemName: "brain.head.profile")
- .foregroundStyle(theme.palette.accent)
- Text("Reasoning Config for \(selectedModel)")
- .font(.caption)
- .fontWeight(.semibold)
- Spacer()
-
- // Auto-detect indicator
- if !SettingsStore.shared.hasCustomReasoningConfig(forModel: selectedModel, provider: providerKey(for: selectedProviderID)) && editingReasoningEnabled {
- Text("Auto-detected")
- .font(.caption2)
- .foregroundStyle(.green)
- .padding(.horizontal, 6)
- .padding(.vertical, 2)
- .background(.green.opacity(0.15))
- .cornerRadius(4)
- }
- }
-
- Toggle("Enable reasoning parameter", isOn: $editingReasoningEnabled)
- .toggleStyle(.switch)
- .font(.caption)
-
- if editingReasoningEnabled {
- HStack(spacing: 12) {
- VStack(alignment: .leading, spacing: 4) {
- Text("Parameter Name")
- .font(.caption2)
- .foregroundStyle(.secondary)
- Picker("", selection: $editingReasoningParamName) {
- Text("reasoning_effort").tag("reasoning_effort")
- Text("enable_thinking").tag("enable_thinking")
- Text("thinking").tag("thinking")
- Text("Custom...").tag("__custom__")
- }
- .pickerStyle(.menu)
- .labelsHidden()
- .frame(width: 150)
- }
-
- VStack(alignment: .leading, spacing: 4) {
- Text("Value")
- .font(.caption2)
- .foregroundStyle(.secondary)
-
- if editingReasoningParamName == "reasoning_effort" {
- Picker("", selection: $editingReasoningParamValue) {
- Text("minimal").tag("minimal")
- Text("low").tag("low")
- Text("medium").tag("medium")
- Text("high").tag("high")
- }
- .pickerStyle(.menu)
- .labelsHidden()
- .frame(width: 100)
- } else if editingReasoningParamName == "enable_thinking" {
- Picker("", selection: $editingReasoningParamValue) {
- Text("true").tag("true")
- Text("false").tag("false")
- }
- .pickerStyle(.menu)
- .labelsHidden()
- .frame(width: 100)
- } else {
- TextField("Value", text: $editingReasoningParamValue)
- .textFieldStyle(.roundedBorder)
- .frame(width: 100)
- }
- }
- }
-
- // Help text
- HStack(spacing: 6) {
- Image(systemName: "info.circle")
- .font(.caption2)
- Text("gpt-5.x, o1, gpt-oss models use reasoning_effort. DeepSeek uses enable_thinking.")
- .font(.caption2)
- }
- .foregroundStyle(.secondary)
- }
-
- HStack(spacing: 8) {
- Button("Save") {
- let providerKey = self.providerKey(for: selectedProviderID)
- if editingReasoningEnabled {
- let config = SettingsStore.ModelReasoningConfig(
- parameterName: editingReasoningParamName,
- parameterValue: editingReasoningParamValue,
- isEnabled: true
- )
- SettingsStore.shared.setReasoningConfig(config, forModel: selectedModel, provider: providerKey)
- } else {
- // Save as disabled config to override auto-detection
- let config = SettingsStore.ModelReasoningConfig(
- parameterName: "",
- parameterValue: "",
- isEnabled: false
- )
- SettingsStore.shared.setReasoningConfig(config, forModel: selectedModel, provider: providerKey)
- }
- showingReasoningConfig = false
- }
- .buttonStyle(GlassButtonStyle())
- .buttonHoverEffect()
-
- Button("Cancel") {
- showingReasoningConfig = false
- }
- .buttonStyle(CompactButtonStyle())
- .buttonHoverEffect()
-
- Spacer()
-
- // Reset to auto-detect
- if SettingsStore.shared.hasCustomReasoningConfig(forModel: selectedModel, provider: providerKey(for: selectedProviderID)) {
- Button("Reset to Auto") {
- let providerKey = self.providerKey(for: selectedProviderID)
- SettingsStore.shared.setReasoningConfig(nil, forModel: selectedModel, provider: providerKey)
- showingReasoningConfig = false
- }
- .buttonStyle(CompactButtonStyle())
- .buttonHoverEffect()
- .foregroundStyle(.orange)
- }
- }
- }
- .padding(12)
- .background(
- RoundedRectangle(cornerRadius: 8)
- .fill(theme.palette.accent.opacity(0.08))
- .overlay(
- RoundedRectangle(cornerRadius: 8)
- .stroke(theme.palette.accent.opacity(0.2), lineWidth: 1)
- )
- )
- .padding(.leading, 122) // Align with model picker
- .transition(.opacity)
- }
- } // End of else block for non-Apple Intelligence model row
-
-
- Divider()
-
- // Connection Test (not applicable for Apple Intelligence)
- if selectedProviderID != "apple-intelligence" {
- HStack(spacing: 12) {
- Button(action: {
- DebugLogger.shared.info("=== TEST CONNECTION BUTTON PRESSED ===", source: "ContentView")
- Task { await testAPIConnection() }
- }) {
- Text(isTestingConnection ? "Verifying..." : "Verify Connection")
- .font(.caption)
- .fontWeight(.semibold)
- }
- .buttonStyle(GlassButtonStyle())
- .buttonHoverEffect()
- .disabled(isTestingConnection ||
- (!isLocalEndpoint(openAIBaseURL.trimmingCharacters(in: .whitespacesAndNewlines)) &&
- (providerAPIKeys[currentProvider] ?? "").isEmpty))
-
- Image(systemName: "questionmark.circle")
- .font(.caption)
- .foregroundStyle(.secondary)
- .help("Sends a test prompt to verify the API connection works correctly")
- }
-
- // API Key Editor Sheet
- Color.clear.frame(height: 0)
- .sheet(isPresented: $showAPIKeyEditor) {
- VStack(spacing: 14) {
- Text("Enter \(providerDisplayName(for: selectedProviderID)) API Key")
- .font(.headline)
-
- SecureField("API Key (optional for local endpoints)", text: $newProviderApiKey)
- .textFieldStyle(.roundedBorder)
- .frame(width: 300)
-
- HStack(spacing: 12) {
- Button("Cancel") {
- showAPIKeyEditor = false
- }
- .buttonStyle(.bordered)
-
- Button("OK") {
- let trimmedKey = newProviderApiKey.trimmingCharacters(in: .whitespacesAndNewlines)
- providerAPIKeys[currentProvider] = trimmedKey
- saveProviderAPIKeys()
- if connectionStatus != .unknown {
- connectionStatus = .unknown
- connectionErrorMessage = ""
- }
- showAPIKeyEditor = false
- }
- .buttonStyle(.borderedProminent)
- // Allow empty API key for local endpoints
- .disabled(!isLocalEndpoint(openAIBaseURL.trimmingCharacters(in: .whitespacesAndNewlines)) &&
- newProviderApiKey.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty)
- }
- }
- .padding()
- .frame(minWidth: 350, minHeight: 150)
- }
-
- // Connection Status Display (only shown when there's something to show)
- if (providerAPIKeys[currentProvider] ?? "").isEmpty &&
- !isLocalEndpoint(openAIBaseURL.trimmingCharacters(in: .whitespacesAndNewlines)) ||
- connectionStatus == .success ||
- connectionStatus == .failed ||
- connectionStatus == .testing {
- HStack(spacing: 8) {
- // Only show API key warning for non-local endpoints
- if (providerAPIKeys[currentProvider] ?? "").isEmpty &&
- !isLocalEndpoint(openAIBaseURL.trimmingCharacters(in: .whitespacesAndNewlines)) {
- Image(systemName: "exclamationmark.triangle.fill")
- .foregroundStyle(.orange)
- .font(.caption)
- Text("API key required")
- .font(.caption)
- .foregroundStyle(.orange)
- } else if connectionStatus == .success {
- Image(systemName: "checkmark.circle.fill")
- .foregroundStyle(.green)
- .font(.caption)
- Text("Connection verified")
- .font(.caption)
- .foregroundStyle(.green)
- } else if connectionStatus == .failed {
- Image(systemName: "exclamationmark.circle.fill")
- .foregroundStyle(.red)
- .font(.caption)
- VStack(alignment: .leading, spacing: 2) {
- Text("Connection failed")
- .font(.caption)
- .foregroundStyle(.red)
- if !connectionErrorMessage.isEmpty {
- Text(connectionErrorMessage)
- .font(.caption2)
- .foregroundStyle(.red.opacity(0.8))
- .lineLimit(1)
- }
- }
- } else if connectionStatus == .testing {
- ProgressView()
- .frame(width: 16, height: 16)
- Text("Verifying...")
- .font(.caption)
- .foregroundStyle(theme.palette.accent)
- }
-
- Spacer()
- }
- .padding(.top, 6)
- }
- } // End of if selectedProviderID != "apple-intelligence" for connection test section
-
- // Add Provider Modal
- if showingSaveProvider {
- VStack(spacing: 12) {
- HStack(spacing: 8) {
- TextField("Provider name (e.g., Local Ollama)", text: $newProviderName)
- .textFieldStyle(.roundedBorder)
- .frame(width: 250)
- TextField("Base URL (e.g., http://localhost:11434/v1)", text: $newProviderBaseURL)
- .textFieldStyle(.roundedBorder)
- .frame(width: 300)
- }
-
- HStack(spacing: 8) {
- SecureField("API Key (optional for local)", text: $newProviderApiKey)
- .textFieldStyle(.roundedBorder)
- .frame(width: 300)
- TextField("Available models (comma-separated)", text: $newProviderModels)
- .textFieldStyle(.roundedBorder)
- .frame(width: 300)
- }
-
- Text("Example: llama-3.1-8b, codellama-13b, mistral-7b")
- .font(.caption)
- .foregroundStyle(.secondary)
-
- HStack(spacing: 8) {
- Button("Save Provider") {
- let name = newProviderName.trimmingCharacters(in: .whitespacesAndNewlines)
- let base = newProviderBaseURL.trimmingCharacters(in: .whitespacesAndNewlines)
- let api = newProviderApiKey.trimmingCharacters(in: .whitespacesAndNewlines)
- let isLocal = isLocalEndpoint(base)
- // Name and URL always required, API key only required for non-local endpoints
- guard !name.isEmpty, !base.isEmpty, (isLocal || !api.isEmpty) else { return }
-
- let modelsList = newProviderModels
- .split(separator: ",")
- .map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
- .filter { !$0.isEmpty }
- let models = modelsList.isEmpty ? defaultModels(for: "openai") : modelsList
-
- let newProvider = SettingsStore.SavedProvider(
- name: name,
- baseURL: base,
- models: models
- )
-
- // upsert by name
- savedProviders.removeAll { $0.name.lowercased() == name.lowercased() }
- savedProviders.append(newProvider)
- saveSavedProviders()
-
- // bind API key and models to canonical key
- let key = providerKey(for: newProvider.id)
- providerAPIKeys[key] = api
- availableModelsByProvider[key] = models
- selectedModelByProvider[key] = models.first ?? selectedModel
- SettingsStore.shared.providerAPIKeys = providerAPIKeys
- SettingsStore.shared.availableModelsByProvider = availableModelsByProvider
- SettingsStore.shared.selectedModelByProvider = selectedModelByProvider
-
- // switch selection to the new provider
- selectedProviderID = newProvider.id
- openAIBaseURL = base
- updateCurrentProvider()
- availableModels = models
- selectedModel = models.first ?? selectedModel
-
- showingSaveProvider = false
- newProviderName = ""; newProviderBaseURL = ""; newProviderApiKey = ""; newProviderModels = ""
- }
- .buttonStyle(GlassButtonStyle())
- .buttonHoverEffect()
- .disabled({
- let nameEmpty = newProviderName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
- let urlEmpty = newProviderBaseURL.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
- let apiKeyEmpty = newProviderApiKey.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
- let isLocal = isLocalEndpoint(newProviderBaseURL.trimmingCharacters(in: .whitespacesAndNewlines))
-
- // Name and URL are always required
- // API key is only required for non-local endpoints
- return nameEmpty || urlEmpty || (!isLocal && apiKeyEmpty)
- }())
-
- Button("Cancel") {
- showingSaveProvider = false
- newProviderName = ""; newProviderBaseURL = ""; newProviderApiKey = ""; newProviderModels = ""
- }
- .buttonStyle(GlassButtonStyle())
- .buttonHoverEffect()
- }
- }
- .transition(.opacity)
- }
- }
- .padding(.horizontal, 4)
-
- }
- .padding(14)
- }
- .modifier(CardAppearAnimation(delay: 0.1, appear: $appear))
-
- // Get API Keys Guide (Collapsible)
- ThemedCard(style: .prominent, hoverEffect: false) {
- VStack(alignment: .leading, spacing: 12) {
- Button(action: { showAPIKeysGuide.toggle() }) {
- HStack {
- Image(systemName: "key.fill")
- .font(.title3)
- .foregroundStyle(.purple)
- Text("Get API Keys")
- .font(.headline)
- .fontWeight(.semibold)
- .foregroundStyle(.primary)
-
- Spacer()
-
- Image(systemName: showAPIKeysGuide ? "chevron.up" : "chevron.down")
- .font(.caption)
- .foregroundStyle(.secondary)
- }
- .contentShape(Rectangle())
- }
- .buttonStyle(.plain)
-
- if showAPIKeysGuide {
- VStack(alignment: .leading, spacing: 12) {
- ProviderGuide(
- name: "OpenAI",
- url: "https://platform.openai.com/api-keys",
- baseURL: "https://api.openai.com/v1",
- keyPrefix: "sk-"
- )
-
- ProviderGuide(
- name: "Groq",
- url: "https://console.groq.com/keys",
- baseURL: "https://api.groq.com/openai/v1",
- keyPrefix: "gsk_"
- )
-
- ProviderGuide(
- name: "OpenRouter",
- url: "https://openrouter.ai/keys",
- baseURL: "https://openrouter.ai/api/v1",
- keyPrefix: "sk-or-"
- )
-
- ProviderGuide(
- name: "Google AI Studio",
- url: "https://aistudio.google.com/app/apikey",
- baseURL: "https://generativelanguage.googleapis.com/v1beta/openai/",
- keyPrefix: "AIza"
- )
-
- ProviderGuide(
- name: "Cerebras",
- url: "https://cloud.cerebras.ai/",
- baseURL: "https://api.cerebras.ai/v1",
- keyPrefix: "csk-"
- )
-
- Divider()
-
- // Note about OpenAI compatible endpoints
- HStack(spacing: 8) {
- Image(systemName: "info.circle.fill")
- .font(.caption)
- .foregroundStyle(theme.palette.accent)
- VStack(alignment: .leading, spacing: 4) {
- Text("Any OpenAI compatible API endpoint is supported")
- .font(.caption)
- .fontWeight(.semibold)
- Text("Use the '+ Add Provider' button above to add custom providers like Ollama, LM Studio, or other local/cloud services")
- .font(.caption2)
- .foregroundStyle(.secondary)
- }
- }
- .padding(12)
- .background(theme.palette.accent.opacity(0.08))
- .cornerRadius(8)
-
- // Custom Trained Local Models Coming Soon
- ThemedCard(hoverEffect: false) {
- HStack {
- Text("Custom Trained Local Models")
- .font(.system(size: 14, weight: .semibold))
- .foregroundStyle(.secondary)
-
- Spacer()
-
- Text("Coming Soon")
- .font(.system(size: 12))
- .foregroundStyle(theme.palette.warning)
- .padding(.horizontal, 8)
- .padding(.vertical, 2)
- .background(theme.palette.warning.opacity(0.12))
- .cornerRadius(8)
- }
- .padding(12)
- }
- }
- .transition(.opacity)
- }
- }
- .padding(14)
- }
- .modifier(CardAppearAnimation(delay: 0.2, appear: $appear))
- }
- }
-
// MARK: - Meeting Transcription (Coming Soon)
private var meetingToolsView: some View
{
@@ -2236,180 +896,6 @@ struct ContentView: View {
StatsView()
}
- // MARK: - Feedback View
- private var feedbackView: some View {
- ScrollView {
- VStack(alignment: .leading, spacing: 20) {
- // Header
- VStack(alignment: .leading, spacing: 8) {
- HStack {
- Image(systemName: "envelope.fill")
- .font(.system(size: 32))
- .foregroundStyle(theme.palette.accent)
- VStack(alignment: .leading) {
- Text("Send Feedback")
- .font(.system(size: 28, weight: .bold))
- Text("Help us improve FluidVoice")
- .font(.system(size: 16))
- .foregroundStyle(.secondary)
- }
- }
- }
- .padding(.bottom, 8)
-
- // Friendly Message & GitHub CTA
- ThemedCard(style: .prominent, hoverEffect: false) {
- VStack(alignment: .leading, spacing: 12) {
- HStack(spacing: 12) {
- Image(systemName: "heart.fill")
- .font(.system(size: 28))
- .foregroundStyle(.pink)
-
- VStack(alignment: .leading, spacing: 4) {
- Text("We'd love to hear from you!")
- .font(.system(size: 18, weight: .semibold))
- .foregroundStyle(theme.palette.primaryText)
-
- Text("Your feedback helps us make FluidVoice even better")
- .font(.system(size: 14))
- .foregroundStyle(theme.palette.secondaryText)
- }
- }
-
- Divider()
- .padding(.vertical, 4)
-
- HStack(spacing: 12) {
- Image(systemName: "star.fill")
- .font(.system(size: 24))
- .foregroundStyle(.yellow)
-
- VStack(alignment: .leading, spacing: 6) {
- Text("Loving FluidVoice?")
- .font(.system(size: 16, weight: .semibold))
- .foregroundStyle(theme.palette.primaryText)
-
- Text("Give us a star on GitHub! It helps others discover the project and motivates us to keep improving.")
- .font(.system(size: 13))
- .foregroundStyle(theme.palette.secondaryText)
- .fixedSize(horizontal: false, vertical: true)
- }
-
- Spacer()
-
- Link(destination: URL(string: "https://github.com/altic-dev/Fluid-oss")!) {
- HStack(spacing: 8) {
- Image(systemName: "star.fill")
- Text("Star on GitHub")
- .fontWeight(.semibold)
- }
- .font(.system(size: 14))
- .foregroundStyle(.white)
- .padding(.horizontal, 16)
- .padding(.vertical, 10)
- .background(
- LinearGradient(
- colors: [.purple, .blue],
- startPoint: .leading,
- endPoint: .trailing
- )
- )
- .cornerRadius(8)
- }
- .buttonStyle(.plain)
- .buttonHoverEffect()
- }
- }
- .padding(20)
- }
-
- // Feedback Form
- ThemedCard(style: .standard, hoverEffect: false) {
- VStack(alignment: .leading, spacing: 16) {
- VStack(alignment: .leading, spacing: 12) {
- Text("Email")
- .font(.headline)
- .fontWeight(.semibold)
-
- TextField("[email protected]", text: $feedbackEmail)
- .textFieldStyle(.roundedBorder)
- .font(.system(size: 14))
-
- Text("Feedback")
- .font(.headline)
- .fontWeight(.semibold)
- .padding(.top, 8)
-
- TextEditor(text: $feedbackText)
- .font(.system(size: 14))
- .frame(height: 120)
- .padding(12)
- .background(
- RoundedRectangle(cornerRadius: 8)
- .fill(Color(nsColor: NSColor.textBackgroundColor))
- .overlay(
- RoundedRectangle(cornerRadius: 8)
- .strokeBorder(Color(nsColor: NSColor.separatorColor), lineWidth: 1.5)
- )
- )
- .scrollContentBackground(.hidden)
- .overlay(
- VStack {
- if feedbackText.isEmpty {
- Text("Share your thoughts, report bugs, or suggest features...")
- .font(.subheadline)
- .foregroundStyle(.secondary)
- }
- }
- .allowsHitTesting(false)
- )
-
- // Debug logs option
- Toggle("Include debug logs", isOn: $includeDebugLogs)
- .toggleStyle(GlassToggleStyle())
-
- // Send Button
- HStack {
- Spacer()
-
- Button(action: {
- Task {
- await sendFeedback()
- }
- }) {
- HStack(spacing: 8) {
- if isSendingFeedback {
- ProgressView()
- .scaleEffect(0.8)
- } else {
- Image(systemName: "paperplane.fill")
- }
- Text(isSendingFeedback ? "Sending..." : "Send Feedback")
- .fontWeight(.semibold)
- }
- .padding(.horizontal, 20)
- .padding(.vertical, 10)
- }
- .buttonStyle(GlassButtonStyle())
- .disabled(feedbackText.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ||
- feedbackEmail.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ||
- isSendingFeedback)
- .buttonHoverEffect()
- }
- }
- }
- .padding(20)
- }
- .modifier(CardAppearAnimation(delay: 0.1, appear: $appear))
- }
- .padding(24)
- }
- .alert("Feedback Sent", isPresented: $showFeedbackConfirmation) {
- Button("OK") { }
- } message: {
- Text("Thank you for helping us improve FluidVoice.")
- }
- }
// Audio settings merged into SettingsView
@@ -2429,15 +915,6 @@ struct ContentView: View {
return providerID.isEmpty ? currentProvider : "custom:\(providerID)"
}
- private func providerDisplayName(for providerID: String) -> String {
- switch providerID {
- case "openai": return "OpenAI"
- case "groq": return "Groq"
- case "apple-intelligence": return "Apple Intelligence"
- default:
- return savedProviders.first(where: { $0.id == providerID })?.name ?? providerID.capitalized
- }
- }
private func defaultModels(for providerKey: String) -> [String] {
switch providerKey {
@@ -2447,85 +924,8 @@ struct ContentView: View {
}
}
- private func saveProviderAPIKeys() {
- SettingsStore.shared.providerAPIKeys = providerAPIKeys
- }
-
- // MARK: - Keychain Access Helpers
- private enum KeychainAccessCheckResult {
- case granted
- case denied(OSStatus)
- }
-
- private func handleAPIKeyButtonTapped() {
- switch probeKeychainAccess() {
- case .granted:
- newProviderApiKey = providerAPIKeys[currentProvider] ?? ""
- showAPIKeyEditor = true
- case .denied(let status):
- keychainPermissionMessage = keychainPermissionExplanation(for: status)
- showKeychainPermissionAlert = true
- }
- }
-
- private func probeKeychainAccess() -> KeychainAccessCheckResult {
- let service = "com.fluidvoice.provider-api-keys"
- let account = "fluidApiKeys"
-
- var query: [String: Any] = [
- kSecClass as String: kSecClassGenericPassword,
- kSecAttrService as String: service,
- kSecAttrAccount as String: account
- ]
-
- var readQuery = query
- readQuery[kSecReturnData as String] = kCFBooleanTrue
- readQuery[kSecMatchLimit as String] = kSecMatchLimitOne
-
- let readStatus = SecItemCopyMatching(readQuery as CFDictionary, nil)
- switch readStatus {
- case errSecSuccess:
- return .granted
- case errSecItemNotFound:
- var addQuery = query
- addQuery[kSecAttrAccessible as String] = kSecAttrAccessibleAfterFirstUnlock
- addQuery[kSecValueData as String] = (try? JSONEncoder().encode([String: String]())) ?? Data()
-
- let addStatus = SecItemAdd(addQuery as CFDictionary, nil)
- if addStatus == errSecSuccess {
- SecItemDelete(query as CFDictionary)
- }
-
- switch addStatus {
- case errSecSuccess, errSecDuplicateItem:
- return .granted
- case errSecAuthFailed, errSecInteractionNotAllowed, errSecUserCanceled:
- return .denied(addStatus)
- default:
- DebugLogger.shared.warning("Keychain access probe failed with status \(addStatus)", source: "ContentView")
- return .denied(addStatus)
- }
- case errSecAuthFailed, errSecInteractionNotAllowed, errSecUserCanceled:
- return .denied(readStatus)
- default:
- DebugLogger.shared.warning("Keychain access probe failed with status \(readStatus)", source: "ContentView")
- return .denied(readStatus)
- }
- }
-
- private func keychainPermissionExplanation(for status: OSStatus) -> String {
- var message = "FluidVoice stores provider API keys securely in your macOS Keychain but does not currently have permission to access it."
- if let detail = SecCopyErrorMessageString(status, nil) as String? {
- message += "\n\nmacOS reported: \(detail) (\(status))"
- }
- message += "\n\nClick \"Always Allow\" when the Keychain prompt appears, or open Keychain Access > login > Passwords, locate the FluidVoice entry, and grant access."
- return message
- }
-
- private func openKeychainAccessApp() {
- NSWorkspace.shared.launchApplication("Keychain Access")
- }
-
+
+
private func updateCurrentProvider() {
// Map baseURL to canonical key for built-ins; else keep existing
let url = openAIBaseURL.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
@@ -2754,8 +1154,41 @@ struct ContentView: View {
// MARK: - Modular AI Processing
private func processTextWithAI(_ inputText: String) async -> 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 }) {
+ derivedCurrentProvider = "custom:\(saved.id)"
+ derivedBaseURL = saved.baseURL
+ derivedSelectedModel = storedSelectedModelByProvider[derivedCurrentProvider] ?? saved.models.first ?? ""
+ } else if currentSelectedProviderID == "openai" {
+ derivedCurrentProvider = "openai"
+ derivedBaseURL = "https://api.openai.com/v1"
+ derivedSelectedModel = storedSelectedModelByProvider["openai"] ?? "gpt-4.1"
+ } else if currentSelectedProviderID == "groq" {
+ derivedCurrentProvider = "groq"
+ derivedBaseURL = "https://api.groq.com/openai/v1"
+ derivedSelectedModel = storedSelectedModelByProvider["groq"] ?? "llama-3.3-70b-versatile"
+ } else {
+ derivedCurrentProvider = currentSelectedProviderID
+ derivedBaseURL = "https://api.openai.com/v1"
+ derivedSelectedModel = storedSelectedModelByProvider[currentSelectedProviderID] ?? ""
+ }
+
+ DebugLogger.shared.debug("processTextWithAI using provider=\(derivedCurrentProvider), model=\(derivedSelectedModel)", source: "ContentView")
+
// Route to Apple Intelligence if selected
- if selectedProviderID == "apple-intelligence" {
+ if currentSelectedProviderID == "apple-intelligence" {
#if canImport(FoundationModels)
if #available(macOS 26.0, *) {
let provider = AppleIntelligenceProvider()
@@ -2768,7 +1201,7 @@ struct ContentView: View {
return inputText // Fallback if not available
}
- let endpoint = openAIBaseURL.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines).isEmpty ? "https://api.openai.com/v1" : openAIBaseURL.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
+ let endpoint = derivedBaseURL.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines).isEmpty ? "https://api.openai.com/v1" : derivedBaseURL.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
// Build the full URL - only append /chat/completions if not already present
let fullEndpoint: String
@@ -2787,26 +1220,14 @@ struct ContentView: View {
}
let isLocal = isLocalEndpoint(endpoint)
- let apiKey = providerAPIKeys[currentProvider] ?? ""
+ let apiKey = storedProviderAPIKeys[derivedCurrentProvider] ?? ""
// Skip API key validation for local endpoints
if !isLocal {
guard !apiKey.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines).isEmpty else {
- return "Error: API Key not set for \(currentProvider)"
+ return "Error: API Key not set for \(derivedCurrentProvider)"
}
}
-
- struct ChatMessage: Codable { let role: String; let content: String }
- struct ChatRequest: Codable {
- let model: String
- let messages: [ChatMessage]
- let temperature: Double?
- let reasoning_effort: String?
- let stream: Bool?
- }
- struct ChatChoiceMessage: Codable { let role: String; let content: String }
- struct ChatChoice: Codable { let index: Int?; let message: ChatChoiceMessage }
- struct ChatResponse: Codable { let choices: [ChatChoice] }
// Get app context captured at start of recording if available
@@ -2815,13 +1236,13 @@ struct ContentView: View {
DebugLogger.shared.debug("Using app context for AI: app=\(appInfo.name), bundleId=\(appInfo.bundleId), title=\(appInfo.windowTitle)", source: "ContentView")
// Get reasoning config for this model (uses per-model settings or auto-detection)
- let providerKey = self.providerKey(for: selectedProviderID)
- let reasoningConfig = SettingsStore.shared.getReasoningConfig(forModel: selectedModel, provider: providerKey)
+ let providerKey = self.providerKey(for: currentSelectedProviderID)
+ let reasoningConfig = SettingsStore.shared.getReasoningConfig(forModel: derivedSelectedModel, provider: providerKey)
if let config = reasoningConfig {
- DebugLogger.shared.debug("Model '\(selectedModel)' reasoning config: \(config.parameterName)=\(config.parameterValue), enabled=\(config.isEnabled)", source: "ContentView")
+ DebugLogger.shared.debug("Model '\(derivedSelectedModel)' reasoning config: \(config.parameterName)=\(config.parameterValue), enabled=\(config.isEnabled)", source: "ContentView")
} else {
- DebugLogger.shared.debug("Model '\(selectedModel)' has no reasoning config", source: "ContentView")
+ DebugLogger.shared.debug("Model '\(derivedSelectedModel)' has no reasoning config", source: "ContentView")
}
// Get streaming setting
@@ -2829,7 +1250,7 @@ struct ContentView: View {
// Build request body dynamically to support different reasoning parameters
var requestDict: [String: Any] = [
- "model": selectedModel,
+ "model": derivedSelectedModel,
"messages": [
["role": "system", "content": systemPrompt],
["role": "user", "content": inputText]
@@ -2888,7 +1309,7 @@ struct ContentView: View {
let errText = String(data: data, encoding: .utf8) ?? "Unknown error"
return "Error: HTTP \(http.statusCode): \(errText)"
}
- let decoded = try JSONDecoder().decode(ChatResponse.self, from: data)
+ let decoded = try JSONDecoder().decode(AIProcessingResponse.self, from: data)
return decoded.choices.first?.message.content ?? "<no content>"
}
} catch {
@@ -3004,10 +1425,20 @@ struct ContentView: View {
let finalText: String
// Check if we should use AI processing
- let apiKey = (providerAPIKeys[currentProvider] ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
- let baseURL = openAIBaseURL.trimmingCharacters(in: .whitespacesAndNewlines)
- let isLocal = isLocalEndpoint(baseURL)
- let shouldUseAI = enableAIProcessing && (isLocal || !apiKey.isEmpty)
+ // IMPORTANT: Derive provider context from SettingsStore so AISettingsView changes take effect immediately.
+ let currentProviderID = SettingsStore.shared.selectedProviderID
+ let baseURL: String
+ if let saved = SettingsStore.shared.savedProviders.first(where: { $0.id == currentProviderID }) {
+ baseURL = saved.baseURL
+ } else if currentProviderID == "groq" {
+ baseURL = "https://api.groq.com/openai/v1"
+ } else {
+ baseURL = "https://api.openai.com/v1"
+ }
+ let trimmedBaseURL = baseURL.trimmingCharacters(in: .whitespacesAndNewlines)
+ let isLocal = isLocalEndpoint(trimmedBaseURL)
+ let apiKey = (SettingsStore.shared.getAPIKey(for: currentProviderID) ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
+ let shouldUseAI = SettingsStore.shared.enableAIProcessing && (isLocal || !apiKey.isEmpty)
if shouldUseAI {
DebugLogger.shared.debug("Routing transcription through AI post-processing", source: "ContentView")
@@ -3208,199 +1639,6 @@ struct ContentView: View {
newModelName = ""
}
- // MARK: - API Connection Testing
- private func testAPIConnection() async {
- guard !isTestingConnection else { return }
-
- let apiKey = providerAPIKeys[currentProvider] ?? ""
- let baseURL = openAIBaseURL.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
- let isLocal = isLocalEndpoint(baseURL)
-
- // For local endpoints, only baseURL is required
- if isLocal {
- guard !baseURL.isEmpty else {
- await MainActor.run {
- connectionStatus = .failed
- connectionErrorMessage = "Base URL is required"
- }
- return
- }
- } else {
- // For remote endpoints, both API key and baseURL are required
- guard !apiKey.isEmpty && !baseURL.isEmpty else {
- await MainActor.run {
- connectionStatus = .failed
- connectionErrorMessage = "API key and base URL are required"
- }
- return
- }
- }
-
- await MainActor.run {
- isTestingConnection = true
- connectionStatus = .testing
- connectionErrorMessage = ""
- }
-
- do {
- let endpoint = baseURL.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
-
- // Build the full URL - only append /chat/completions if not already present
- let fullURL: String
- if endpoint.contains("/chat/completions") ||
- endpoint.contains("/api/chat") ||
- endpoint.contains("/api/generate") {
- fullURL = endpoint
- } else {
- fullURL = endpoint + "/chat/completions"
- }
-
- guard let url = URL(string: fullURL) else {
- await MainActor.run {
- connectionStatus = .failed
- connectionErrorMessage = "Invalid Base URL format"
- }
- return
- }
-
- // Get reasoning config for this model (uses per-model settings or auto-detection)
- let providerKey = self.providerKey(for: selectedProviderID)
- let reasoningConfig = SettingsStore.shared.getReasoningConfig(forModel: selectedModel, provider: providerKey)
-
- // Build request body dynamically based on model requirements
- let modelLower = selectedModel.lowercased()
- let usesMaxCompletionTokens = modelLower.hasPrefix("gpt-5") || modelLower.contains("gpt-5.") ||
- modelLower.hasPrefix("o1") || modelLower.hasPrefix("o3")
-
- var requestDict: [String: Any] = [
- "model": selectedModel,
- "messages": [["role": "user", "content": "test"]]
- ]
-
- // Use appropriate token limit parameter
- if usesMaxCompletionTokens {
- requestDict["max_completion_tokens"] = 50
- } else {
- requestDict["max_tokens"] = 50
- }
-
- // Add reasoning parameter if configured for this model
- if let config = reasoningConfig, config.isEnabled {
- if config.parameterName == "enable_thinking" {
- requestDict[config.parameterName] = config.parameterValue == "true"
- } else {
- requestDict[config.parameterName] = config.parameterValue
- }
- }
-
- guard let jsonData = try? JSONSerialization.data(withJSONObject: requestDict, options: []) else {
- await MainActor.run {
- connectionStatus = .failed
- connectionErrorMessage = "Failed to encode test request"
- }
- return
- }
-
- var request = URLRequest(url: url)
- request.httpMethod = "POST"
- request.setValue("application/json", forHTTPHeaderField: "Content-Type")
- request.timeoutInterval = 30
-
- if !isLocal {
- request.setValue("Bearer \(apiKey)", forHTTPHeaderField: "Authorization")
- }
-
- request.httpBody = jsonData
-
- let (data, response) = try await URLSession.shared.data(for: request)
-
- if let httpResponse = response as? HTTPURLResponse {
- if (200...299).contains(httpResponse.statusCode) {
- await MainActor.run {
- connectionStatus = .success
- connectionErrorMessage = ""
- }
- } else {
- // Parse error response for better error messages
- var errorMessage = "HTTP \(httpResponse.statusCode)"
-
- if let responseBody = String(data: data, encoding: .utf8),
- let jsonData = responseBody.data(using: .utf8),
- let json = try? JSONSerialization.jsonObject(with: jsonData) as? [String: Any] {
-
- if let error = json["error"] as? [String: Any],
- let message = error["message"] as? String {
- errorMessage = message
- } else if let message = json["message"] as? String {
- errorMessage = message
- } else if let errorStr = json["error"] as? String {
- errorMessage = errorStr
- }
- }
-
- // Provide helpful error messages based on status code
- if errorMessage == "HTTP \(httpResponse.statusCode)" {
- switch httpResponse.statusCode {
- case 400:
- errorMessage = "Bad Request - Model '\(selectedModel)' may be invalid"
- case 401:
- errorMessage = "Invalid API key or unauthorized"
- case 403:
- errorMessage = "Access forbidden - check API key permissions"
- case 404:
- errorMessage = "Model '\(selectedModel)' not found"
- case 429:
- errorMessage = "Rate limited - try again later"
- case 500...599:
- errorMessage = "Server error - provider may be down"
- default:
- break
- }
- }
-
- await MainActor.run {
- connectionStatus = .failed
- connectionErrorMessage = errorMessage
- }
- }
- } else {
- await MainActor.run {
- connectionStatus = .failed
- connectionErrorMessage = "Invalid response from server"
- }
- }
- } catch let urlError as URLError {
- var errorMessage: String
- switch urlError.code {
- case .timedOut:
- errorMessage = "Request timed out - server not responding"
- case .cannotConnectToHost:
- errorMessage = "Cannot connect to host - check URL"
- case .notConnectedToInternet:
- errorMessage = "No internet connection"
- case .secureConnectionFailed:
- errorMessage = "SSL/TLS connection failed"
- case .serverCertificateUntrusted:
- errorMessage = "Server certificate not trusted"
- default:
- errorMessage = urlError.localizedDescription
- }
-
- await MainActor.run {
- connectionStatus = .failed
- connectionErrorMessage = errorMessage
- }
- } catch {
- await MainActor.run {
- connectionStatus = .failed
- connectionErrorMessage = error.localizedDescription
- }
- }
-
- await MainActor.run {
- isTestingConnection = false
- }
- }
// MARK: - OpenAI-compatible call for playground
private func callOpenAIChat() async {
@@ -3503,93 +1741,7 @@ struct ContentView: View {
NSWorkspace.shared.open(URL(fileURLWithPath: "/Applications"))
}
- // MARK: - Feedback Functions
- private func sendFeedback() async {
- guard !feedbackEmail.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty,
- !feedbackText.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {
- return
- }
-
- await MainActor.run {
- isSendingFeedback = true
- }
-
- let feedbackData = createFeedbackData()
- let success = await submitFeedback(data: feedbackData)
-
- await MainActor.run {
- isSendingFeedback = false
- if success {
- // Show confirmation and clear form
- showFeedbackConfirmation = true
- feedbackText = ""
- feedbackEmail = ""
- includeDebugLogs = false
- }
- }
- }
-
- private func createFeedbackData() -> [String: Any] {
- var feedbackContent = feedbackText.trimmingCharacters(in: .whitespacesAndNewlines)
-
- if includeDebugLogs {
- feedbackContent += "\n\n--- Debug Information ---\n"
- feedbackContent += "App Version: \(Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "Unknown")\n"
- feedbackContent += "Build: \(Bundle.main.infoDictionary?["CFBundleVersion"] as? String ?? "Unknown")\n"
- feedbackContent += "macOS Version: \(ProcessInfo.processInfo.operatingSystemVersionString)\n"
- feedbackContent += "Date: \(Date().formatted())\n\n"
-
- // Add recent log entries
- let logFileURL = FileLogger.shared.currentLogFileURL()
- if FileManager.default.fileExists(atPath: logFileURL.path) {
- do {
- let logContent = try String(contentsOf: logFileURL)
- let lines = logContent.components(separatedBy: .newlines)
- let recentLines = Array(lines.suffix(30)) // Last 30 lines
- feedbackContent += "Recent Log Entries:\n"
- feedbackContent += recentLines.joined(separator: "\n")
- } catch {
- feedbackContent += "Could not read log file: \(error.localizedDescription)\n"
- }
- }
- }
-
- return [
- "email_id": feedbackEmail.trimmingCharacters(in: .whitespacesAndNewlines),
- "feedback": feedbackContent
- ]
- }
-
- private func submitFeedback(data: [String: Any]) async -> Bool {
- guard let url = URL(string: "https://altic.dev/api/fluid/feedback") else {
- DebugLogger.shared.error("Invalid feedback API URL", source: "ContentView")
- return false
- }
-
- do {
- var request = URLRequest(url: url)
- request.httpMethod = "POST"
- request.setValue("application/json", forHTTPHeaderField: "Content-Type")
- request.httpBody = try JSONSerialization.data(withJSONObject: data)
-
- let (_, response) = try await URLSession.shared.data(for: request)
-
- if let httpResponse = response as? HTTPURLResponse {
- let success = (200...299).contains(httpResponse.statusCode)
- if success {
- DebugLogger.shared.info("Feedback submitted successfully", source: "ContentView")
- } else {
- DebugLogger.shared.error("Feedback submission failed with status: \(httpResponse.statusCode)", source: "ContentView")
- }
- return success
- }
- return false
- } catch {
- DebugLogger.shared.error("Network error submitting feedback: \(error.localizedDescription)", source: "ContentView")
- return false
- }
- }
-
+
private func initializeHotkeyManagerIfNeeded() {
guard hotkeyManager == nil else { return }
@@ -3791,3 +1943,4 @@ struct CardAppearAnimation: ViewModifier {
.animation(.spring(response: 0.8, dampingFraction: 0.75, blendDuration: 0.2).delay(delay), value: appear)
}
}
+
diff --git a/Sources/Fluid/CustomAnimations.swift b/Sources/Fluid/CustomAnimations.swift
index 87e22cc3..15eaf431 100644
--- a/Sources/Fluid/CustomAnimations.swift
+++ b/Sources/Fluid/CustomAnimations.swift
@@ -52,7 +52,7 @@ struct PulseAudioVisualizationView: View {
.frame(width: 12, height: 12)
}
.frame(width: 100, height: 100)
- .onChange(of: data.audioLevel) { newLevel in
+ .onChange(of: data.audioLevel) { _, newLevel in
// Only trigger animation update for significant changes to prevent cycles
if abs(newLevel - (data.audioLevel)) > 0.1 {
animationId = UUID()
@@ -86,7 +86,7 @@ struct WaveAudioVisualizationView: View {
}
}
.frame(width: 60, height: 40)
- .onChange(of: data.audioLevel) { newLevel in
+ .onChange(of: data.audioLevel) { _, newLevel in
// Only trigger animation update for significant changes to prevent cycles
if abs(newLevel - (data.audioLevel)) > 0.1 {
animationId = UUID()
diff --git a/Sources/Fluid/Persistence/SettingsStore.swift b/Sources/Fluid/Persistence/SettingsStore.swift
index 86a49ef3..02624630 100644
--- a/Sources/Fluid/Persistence/SettingsStore.swift
+++ b/Sources/Fluid/Persistence/SettingsStore.swift
@@ -67,6 +67,10 @@ final class SettingsStore: ObservableObject
// Transcription Provider (ASR)
static let selectedTranscriptionProvider = "SelectedTranscriptionProvider"
+ static let whisperModelSize = "WhisperModelSize"
+
+ // Unified Speech Model (replaces above two)
+ static let selectedSpeechModel = "SelectedSpeechModel"
}
// MARK: - Model Reasoning Configuration
@@ -763,6 +767,113 @@ final class SettingsStore: ObservableObject
}
}
+ // MARK: - Speech Model (Unified ASR Model Selection)
+
+ /// Unified speech recognition model selection.
+ /// Replaces the old TranscriptionProviderOption + WhisperModelSize dual-setting.
+ enum SpeechModel: String, CaseIterable, Identifiable, Codable {
+ // MARK: - FluidAudio Models (Apple Silicon Only)
+ case parakeetTDT = "parakeet-tdt"
+
+ // MARK: - Whisper Models (Universal)
+ case whisperTiny = "whisper-tiny"
+ case whisperBase = "whisper-base"
+ case whisperSmall = "whisper-small"
+ case whisperMedium = "whisper-medium"
+ case whisperLargeTurbo = "whisper-large-turbo"
+ case whisperLarge = "whisper-large"
+
+ var id: String { rawValue }
+
+ // MARK: - Display Properties
+
+ var displayName: String {
+ switch self {
+ case .parakeetTDT: return "Parakeet TDT"
+ case .whisperTiny: return "Whisper Tiny"
+ case .whisperBase: return "Whisper Base"
+ case .whisperSmall: return "Whisper Small"
+ case .whisperMedium: return "Whisper Medium"
+ case .whisperLargeTurbo: return "Whisper Large Turbo"
+ case .whisperLarge: return "Whisper Large"
+ }
+ }
+
+ var languageSupport: String {
+ switch self {
+ case .parakeetTDT: return "English"
+ case .whisperTiny, .whisperBase, .whisperSmall, .whisperMedium, .whisperLargeTurbo, .whisperLarge:
+ return "99 Languages"
+ }
+ }
+
+ var downloadSize: String {
+ switch self {
+ case .parakeetTDT: return "~500 MB"
+ case .whisperTiny: return "~75 MB"
+ case .whisperBase: return "~142 MB"
+ case .whisperSmall: return "~466 MB"
+ case .whisperMedium: return "~1.5 GB"
+ case .whisperLargeTurbo: return "~1.6 GB"
+ case .whisperLarge: return "~2.9 GB"
+ }
+ }
+
+ var requiresAppleSilicon: Bool {
+ switch self {
+ case .parakeetTDT: return true
+ default: return false
+ }
+ }
+
+ var isWhisperModel: Bool {
+ switch self {
+ case .parakeetTDT: return false
+ default: return true
+ }
+ }
+
+ /// The ggml filename for Whisper models
+ var whisperModelFile: String? {
+ switch self {
+ case .whisperTiny: return "ggml-tiny.bin"
+ case .whisperBase: return "ggml-base.bin"
+ case .whisperSmall: return "ggml-small.bin"
+ case .whisperMedium: return "ggml-medium.bin"
+ case .whisperLargeTurbo: return "ggml-large-v3-turbo.bin"
+ case .whisperLarge: return "ggml-large-v3.bin"
+ default: return nil
+ }
+ }
+
+ /// The short model name for whisper.cpp internal usage
+ var whisperModelName: String? {
+ switch self {
+ case .whisperTiny: return "tiny"
+ case .whisperBase: return "base"
+ case .whisperSmall: return "small"
+ case .whisperMedium: return "medium"
+ case .whisperLargeTurbo: return "large-v3-turbo"
+ case .whisperLarge: return "large-v3"
+ default: return nil
+ }
+ }
+
+ // MARK: - Architecture Filtering
+
+ /// Returns models available for the current Mac's architecture
+ static var availableModels: [SpeechModel] {
+ allCases.filter { model in
+ !model.requiresAppleSilicon || CPUArchitecture.isAppleSilicon
+ }
+ }
+
+ /// Default model for the current architecture
+ static var defaultModel: SpeechModel {
+ CPUArchitecture.isAppleSilicon ? .parakeetTDT : .whisperBase
+ }
+ }
+
// MARK: - Transcription Provider (ASR)
/// Available transcription providers
@@ -785,7 +896,38 @@ final class SettingsStore: ObservableObject
switch self {
case .auto: return "Uses FluidAudio on Apple Silicon, Whisper on Intel"
case .fluidAudio: return "Fast CoreML-based transcription optimized for M-series chips"
- case .whisper: return "whisper.cpp - works on any Mac, useful for testing"
+ case .whisper: return "whisper.cpp - CPU-based, works on any Mac"
+ }
+ }
+ }
+
+ /// Available Whisper model sizes
+ enum WhisperModelSize: String, CaseIterable, Identifiable {
+ case tiny = "ggml-tiny.bin"
+ case base = "ggml-base.bin"
+ case small = "ggml-small.bin"
+ case medium = "ggml-medium.bin"
+ case large = "ggml-large-v3.bin"
+
+ var id: String { rawValue }
+
+ var displayName: String {
+ switch self {
+ case .tiny: return "Tiny (~75 MB)"
+ case .base: return "Base (~142 MB)"
+ case .small: return "Small (~466 MB)"
+ case .medium: return "Medium (~1.5 GB)"
+ case .large: return "Large (~2.9 GB)"
+ }
+ }
+
+ var description: String {
+ switch self {
+ case .tiny: return "Fastest, lower accuracy"
+ case .base: return "Good balance of speed and accuracy"
+ case .small: return "Better accuracy, slower"
+ case .medium: return "High accuracy, requires more memory"
+ case .large: return "Best accuracy, large download"
}
}
}
@@ -804,4 +946,75 @@ final class SettingsStore: ObservableObject
defaults.set(newValue.rawValue, forKey: Keys.selectedTranscriptionProvider)
}
}
+
+ /// Selected Whisper model size - defaults to "base"
+ var whisperModelSize: WhisperModelSize {
+ get {
+ guard let rawValue = defaults.string(forKey: Keys.whisperModelSize),
+ let size = WhisperModelSize(rawValue: rawValue) else {
+ return .base
+ }
+ return size
+ }
+ set {
+ objectWillChange.send()
+ defaults.set(newValue.rawValue, forKey: Keys.whisperModelSize)
+ }
+ }
+
+ // MARK: - Unified Speech Model Selection
+
+ /// The selected speech recognition model.
+ /// This unified setting replaces the old TranscriptionProviderOption + WhisperModelSize combination.
+ var selectedSpeechModel: SpeechModel {
+ get {
+ // Check if already using new system
+ if let rawValue = defaults.string(forKey: Keys.selectedSpeechModel),
+ let model = SpeechModel(rawValue: rawValue) {
+ // Validate model is available on this architecture
+ if model.requiresAppleSilicon && !CPUArchitecture.isAppleSilicon {
+ return .whisperBase
+ }
+ return model
+ }
+
+ // Migration: Convert old settings to new SpeechModel
+ return migrateToSpeechModel()
+ }
+ set {
+ objectWillChange.send()
+ defaults.set(newValue.rawValue, forKey: Keys.selectedSpeechModel)
+ }
+ }
+
+ /// Migrates old TranscriptionProviderOption + WhisperModelSize settings to new SpeechModel
+ private func migrateToSpeechModel() -> SpeechModel {
+ let oldProvider = defaults.string(forKey: Keys.selectedTranscriptionProvider) ?? "auto"
+ let oldWhisperSize = defaults.string(forKey: Keys.whisperModelSize) ?? "ggml-base.bin"
+
+ let newModel: SpeechModel
+
+ switch oldProvider {
+ case "whisper":
+ // Map old whisper size to new model
+ switch oldWhisperSize {
+ case "ggml-tiny.bin": newModel = .whisperTiny
+ case "ggml-base.bin": newModel = .whisperBase
+ case "ggml-small.bin": newModel = .whisperSmall
+ case "ggml-medium.bin": newModel = .whisperMedium
+ case "ggml-large-v3.bin": newModel = .whisperLarge
+ default: newModel = .whisperBase
+ }
+ case "fluidAudio":
+ newModel = CPUArchitecture.isAppleSilicon ? .parakeetTDT : .whisperBase
+ default: // "auto"
+ newModel = SpeechModel.defaultModel
+ }
+
+ // Persist the migrated value
+ defaults.set(newModel.rawValue, forKey: Keys.selectedSpeechModel)
+ DebugLogger.shared.info("Migrated speech model settings: \(oldProvider)/\(oldWhisperSize) -> \(newModel.rawValue)", source: "SettingsStore")
+
+ return newModel
+ }
}
diff --git a/Sources/Fluid/Services/ASRService.swift b/Sources/Fluid/Services/ASRService.swift
index e8dde906..47266643 100644
--- a/Sources/Fluid/Services/ASRService.swift
+++ b/Sources/Fluid/Services/ASRService.swift
@@ -71,7 +71,6 @@ final class ASRService: ObservableObject
@Published var isDownloadingModel: Bool = false
@Published var isLoadingModel: Bool = false // True when loading cached model into memory (not downloading)
@Published var modelsExistOnDisk: Bool = false
- @Published var selectedModel: ModelOption = .parakeetTdt06bV3
// MARK: - Error Handling
@Published var errorTitle: String = "Error"
@@ -86,14 +85,6 @@ final class ASRService: ObservableObject
if modelsExistOnDisk { return "Model cached, needs loading" }
return "Model not downloaded"
}
-
- enum ModelOption: String, CaseIterable, Identifiable, Hashable
- {
- case parakeetTdt06bV3 = "Parakeet TDT-0.6b v3"
- case whisperBase = "Whisper Base (Intel)"
- var id: String { rawValue }
- var displayName: String { rawValue }
- }
// MARK: - Transcription Provider (Settable)
@@ -106,25 +97,15 @@ final class ASRService: ObservableObject
private var ensureReadyTask: Task<Void, Error>?
private var ensureReadyProviderKey: String?
- /// The transcription provider, selected based on user settings or architecture:
- /// - Auto: Uses FluidAudio on Apple Silicon, Whisper on Intel
- /// - FluidAudio: Forces FluidAudio (may not work well on Intel)
- /// - Whisper: Forces Whisper (works on any Mac, useful for testing)
+ /// The transcription provider, selected based on the unified SpeechModel setting.
+ /// Uses the new SettingsStore.selectedSpeechModel instead of old TranscriptionProviderOption.
private var transcriptionProvider: TranscriptionProvider {
- let setting = SettingsStore.shared.selectedTranscriptionProvider
+ let model = SettingsStore.shared.selectedSpeechModel
- switch setting {
- case .auto:
- // Auto-select based on architecture
- if CPUArchitecture.isAppleSilicon {
- return getFluidAudioProvider()
- } else {
- return getWhisperProvider()
- }
- case .fluidAudio:
- return getFluidAudioProvider()
- case .whisper:
+ if model.isWhisperModel {
return getWhisperProvider()
+ } else {
+ return getFluidAudioProvider()
}
}
@@ -148,9 +129,9 @@ final class ASRService: ObservableObject
return provider
}
- /// Returns the name of the active transcription provider
+ /// Returns the user-friendly name of the currently selected speech model
var activeProviderName: String {
- transcriptionProvider.name
+ SettingsStore.shared.selectedSpeechModel.displayName
}
/// Call this when the transcription provider setting changes to reset state
@@ -161,14 +142,33 @@ final class ASRService: ObservableObject
ensureReadyTask = nil
ensureReadyProviderKey = nil
DebugLogger.shared.info("ASRService: Provider reset, will re-initialize on next use", source: "ASRService")
+
+ // CRITICAL FIX: Immediately check if the NEW model's files exist on disk
+ // This prevents UI from showing "Download" when model is already downloaded
+ checkIfModelsExist()
}
- // CRITICAL FIX: Use lazy initialization to prevent AVAudioEngine() from being called during
- // @StateObject init. AVAudioEngine's constructor triggers CoreAudio's HALSystem::InitializeShell()
- // which races with SwiftUI's AttributeGraph metadata processing and causes EXC_BAD_ACCESS crashes.
- // By making this lazy, the engine is only created when first accessed (after app launch is complete).
- private lazy var engine: AVAudioEngine = AVAudioEngine()
+ // CRITICAL FIX (launch-time crash mitigation):
+ // Combine's default ObservableObject.objectWillChange implementation uses Swift reflection to walk *stored*
+ // properties. If we store an AVFoundation ObjC class type (like AVAudioEngine) directly, the reflection
+ // path can trigger Objective-C class lookup for "AVAudioEngine" during SwiftUI/AttributeGraph's early
+ // metadata processing window. On some systems this manifests as an EXC_BAD_ACCESS at 0x0 inside
+ // swift_getTypeByMangledName / AttributeGraph (very similar to the crash reports we've been seeing).
+ //
+ // To reduce risk:
+ // - We do NOT store AVAudioEngine as a stored property.
+ // - We store it as AnyObject? and expose it through a computed property.
+ // This keeps initialization lazy *and* keeps AVAudioEngine out of the reflected stored layout.
+ private var engineStorage: AnyObject?
+ private var engine: AVAudioEngine {
+ if let existing = engineStorage as? AVAudioEngine {
+ return existing
+ }
+ let created = AVAudioEngine()
+ engineStorage = created
+ return created
+ }
private var inputFormat: AVAudioFormat?
private var micPermissionGranted = false
@@ -208,15 +208,18 @@ final class ASRService: ObservableObject
private let noiseGateThreshold: CGFloat = 0.06
init()
{
- // CRITICAL FIX: Do NOT call any audio-related APIs here!
- // This includes AVCaptureDevice.authorizationStatus, which can trigger AVFCapture/CoreAudio
- // initialization. All audio API calls are deferred to initialize() which runs after
- // SwiftUI's view graph is stable.
+ // CRITICAL FIX: Do NOT call any framework-triggering APIs here!
+ // This includes:
+ // - AVCaptureDevice.authorizationStatus (triggers AVFCapture/CoreAudio)
+ // - checkIfModelsExist() (accesses transcriptionProvider, can trigger FluidAudio/CoreML)
+ //
+ // All such calls are deferred to initialize() which runs 1.5 seconds after
+ // SwiftUI's view graph is stable, preventing race conditions with AttributeGraph.
//
// Default values are set in the property declarations:
// - micStatus = .notDetermined
// - micPermissionGranted = false
- checkIfModelsExist()
+ // - modelsExistOnDisk = false
}
/// Call this AFTER the app has finished launching to complete ASR initialization.
@@ -228,6 +231,9 @@ final class ASRService: ObservableObject
registerDefaultDeviceChangeListener()
+ // Check if models exist on disk (deferred from init to avoid FluidAudio/CoreML race)
+ checkIfModelsExist()
+
// Auto-load models if they exist on disk to avoid "Downloaded but not loaded" state
if modelsExistOnDisk {
DebugLogger.shared.info("Models found on disk, auto-loading...", source: "ASRService")
@@ -395,10 +401,10 @@ final class ASRService: ObservableObject
DebugLogger.shared.error("Error domain: \(nsError.domain), code: \(nsError.code)", source: "ASRService")
DebugLogger.shared.error("Error userInfo: \(nsError.userInfo)", source: "ASRService")
- // Expose error to UI (specifically for model download failures on Intel)
- self.errorTitle = "Transcription Failed"
- self.errorMessage = error.localizedDescription
- self.showError = true
+ // Note: We intentionally do NOT show an error popup here.
+ // Common errors like "audio too short" are expected during normal use
+ // (e.g., accidental hotkey press) and would disrupt the user's workflow.
+ // Errors are logged for debugging purposes.
return ""
}
diff --git a/Sources/Fluid/Services/AppServices.swift b/Sources/Fluid/Services/AppServices.swift
new file mode 100644
index 00000000..46eba6b8
--- /dev/null
+++ b/Sources/Fluid/Services/AppServices.swift
@@ -0,0 +1,49 @@
+//
+// AppServices.swift
+// Fluid
+//
+// Centralized service container to reduce SwiftUI view type complexity.
+// By holding heavy services here (outside ContentView's @StateObject declarations),
+// we reduce the generic type signature of ContentView, which helps avoid
+// Swift runtime type metadata crashes at app launch.
+//
+
+import Foundation
+import Combine
+
+/// Centralized container for app-wide services.
+/// This exists to reduce ContentView's generic type signature complexity,
+/// which has been observed to cause EXC_BAD_ACCESS crashes during Swift
+/// runtime type metadata resolution at app launch.
+@MainActor
+final class AppServices: ObservableObject {
+ /// Shared singleton instance
+ static let shared = AppServices()
+
+ /// Audio hardware observation service
+ let audioObserver = AudioHardwareObserver()
+
+ /// Automatic speech recognition service
+ let asr = ASRService()
+
+ private var cancellables = Set<AnyCancellable>()
+
+ private init() {
+ // Services are created but NOT started here.
+ // Actual initialization (CoreAudio listeners, model loading) is deferred
+ // to when the UI is ready, via AudioStartupGate.
+
+ // CRITICAL: Forward changes from child services to this container.
+ // This allows ContentView to observe 'AppServices' (which is metadata-safe)
+ // instead of observing 'ASRService' directly (which causes metadata crashes),
+ // while still triggering UI updates when transcription or audio state changes.
+
+ audioObserver.objectWillChange
+ .sink { [weak self] _ in self?.objectWillChange.send() }
+ .store(in: &cancellables)
+
+ asr.objectWillChange
+ .sink { [weak self] _ in self?.objectWillChange.send() }
+ .store(in: &cancellables)
+ }
+}
diff --git a/Sources/Fluid/Services/AudioDeviceService.swift b/Sources/Fluid/Services/AudioDeviceService.swift
index 175fef71..3cdb93c2 100644
--- a/Sources/Fluid/Services/AudioDeviceService.swift
+++ b/Sources/Fluid/Services/AudioDeviceService.swift
@@ -167,8 +167,10 @@ enum AudioDevice {
// MARK: - Audio Hardware Observer
final class AudioHardwareObserver: ObservableObject {
- private let subject = PassthroughSubject<Void, Never>()
- var changePublisher: AnyPublisher<Void, Never> { subject.eraseToAnyPublisher() }
+ /// Incremented every time CoreAudio reports a hardware/default-device change.
+ /// Using a simple `@Published` value avoids putting `AnyPublisher`/`SubscriptionView` generics into
+ /// SwiftUI's root view type, which can trigger AttributeGraph metadata-instantiation crashes at launch.
+ @Published private(set) var changeTick: UInt64 = 0
private var installed: Bool = false
@@ -211,13 +213,13 @@ final class AudioHardwareObserver: ObservableObject {
let sys = AudioObjectID(kAudioObjectSystemObject)
_ = AudioObjectAddPropertyListenerBlock(sys, &addrDevices, queue) { [weak self] _, _ in
- self?.subject.send(())
+ self?.changeTick &+= 1
}
_ = AudioObjectAddPropertyListenerBlock(sys, &addrDefaultIn, queue) { [weak self] _, _ in
- self?.subject.send(())
+ self?.changeTick &+= 1
}
_ = AudioObjectAddPropertyListenerBlock(sys, &addrDefaultOut, queue) { [weak self] _, _ in
- self?.subject.send(())
+ self?.changeTick &+= 1
}
installed = true
diff --git a/Sources/Fluid/Services/AudioStartupGate.swift b/Sources/Fluid/Services/AudioStartupGate.swift
new file mode 100644
index 00000000..5d9d2b19
--- /dev/null
+++ b/Sources/Fluid/Services/AudioStartupGate.swift
@@ -0,0 +1,62 @@
+//
+// AudioStartupGate.swift
+// Fluid
+//
+// A centralized gate to prevent CoreAudio/AVFoundation initialization during SwiftUI's
+// early AttributeGraph metadata processing (a known crash-prone window).
+//
+
+import Foundation
+
+/// Centralized startup gate for any code paths that can trigger CoreAudio initialization.
+///
+/// Why this exists:
+/// - SwiftUI/AttributeGraph does not expose a reliable "initial metadata processing is finished" signal.
+/// - CoreAudio/AVFoundation initialization can race that work during app launch and crash with EXC_BAD_ACCESS.
+/// - A single shared gate makes it much harder for new call-sites (e.g., Settings views) to accidentally
+/// trigger CoreAudio too early.
+actor AudioStartupGate {
+ static let shared = AudioStartupGate()
+
+ private var isOpen: Bool = false
+ private var openTask: Task<Void, Never>?
+ private var waiters: [CheckedContinuation<Void, Never>] = []
+
+ /// Schedule opening the gate once. Safe to call multiple times.
+ func scheduleOpenAfterInitialUISettled(delayNanoseconds: UInt64 = 2_000_000_000) {
+ guard isOpen == false, openTask == nil else { return }
+
+ openTask = Task { @MainActor [weak self] in
+ guard let self else { return }
+
+ // Give SwiftUI a couple runloop turns to finish initial layout/metadata passes.
+ await Task.yield()
+ await Task.yield()
+
+ // Safety delay for slower / loaded systems (e.g., long uptime, heavy background load).
+ try? await Task.sleep(nanoseconds: delayNanoseconds)
+
+ await self.open()
+ }
+ }
+
+ /// Await until the gate is open. Returns immediately if already open.
+ func waitUntilOpen() async {
+ if isOpen { return }
+
+ await withCheckedContinuation { cont in
+ waiters.append(cont)
+ }
+ }
+
+ private func open() {
+ guard isOpen == false else { return }
+ isOpen = true
+
+ let pending = waiters
+ waiters.removeAll(keepingCapacity: false)
+ pending.forEach { $0.resume() }
+ }
+}
+
+
diff --git a/Sources/Fluid/Services/CommandModeService.swift b/Sources/Fluid/Services/CommandModeService.swift
index d928d70d..1279ab5b 100644
--- a/Sources/Fluid/Services/CommandModeService.swift
+++ b/Sources/Fluid/Services/CommandModeService.swift
@@ -186,7 +186,7 @@ final class CommandModeService: ObservableObject {
/// Save current conversation to store
func saveCurrentChat() {
- guard let chatID = currentChatID else { return }
+ guard currentChatID != nil else { return }
let messages = conversationHistory.map { messageToChatMessage($0) }
chatStore.updateCurrentChat(messages: messages)
diff --git a/Sources/Fluid/Services/GlobalHotkeyManager.swift b/Sources/Fluid/Services/GlobalHotkeyManager.swift
index 91e00a5c..687602bb 100644
--- a/Sources/Fluid/Services/GlobalHotkeyManager.swift
+++ b/Sources/Fluid/Services/GlobalHotkeyManager.swift
@@ -595,8 +595,13 @@ final class GlobalHotkeyManager: NSObject
}
func validateEventTapHealth() -> Bool {
- guard isInitialized else { return false }
- return isEventTapEnabled()
+ // Treat an enabled event tap as "healthy", even if our internal `isInitialized` flag drifted.
+ // This prevents false "initializing" UI while hotkeys are already working.
+ let enabled = isEventTapEnabled()
+ if enabled && !isInitialized {
+ isInitialized = true
+ }
+ return enabled
}
func reinitialize() {
@@ -625,6 +630,7 @@ final class GlobalHotkeyManager: NSObject
}
if self.setupGlobalHotkey() {
+ self.isInitialized = true
if UserDefaults.standard.bool(forKey: "enableDebugLogs") {
print("[GlobalHotkeyManager] Health check recovery successful")
}
diff --git a/Sources/Fluid/Services/MeetingTranscriptionService.swift b/Sources/Fluid/Services/MeetingTranscriptionService.swift
index bfc0e711..3a09ff88 100644
--- a/Sources/Fluid/Services/MeetingTranscriptionService.swift
+++ b/Sources/Fluid/Services/MeetingTranscriptionService.swift
@@ -8,7 +8,7 @@ import Combine
import Combine
/// Result of a transcription operation
-struct TranscriptionResult: Identifiable, Sendable, Codable {
+nonisolated struct TranscriptionResult: Identifiable, Sendable, Codable {
let id = UUID()
let text: String
let confidence: Float
diff --git a/Sources/Fluid/Services/MenuBarManager.swift b/Sources/Fluid/Services/MenuBarManager.swift
index cf679410..8e25ce4c 100644
--- a/Sources/Fluid/Services/MenuBarManager.swift
+++ b/Sources/Fluid/Services/MenuBarManager.swift
@@ -89,7 +89,11 @@ final class MenuBarManager: ObservableObject {
.receive(on: DispatchQueue.main)
.sink { [weak self] newText in
guard self != nil else { return }
- NotchOverlayManager.shared.updateTranscriptionText(newText)
+ // CRITICAL FIX: Check if streaming preview is enabled before updating notch
+ // The "Show Live Preview" toggle in Preferences should control this behavior
+ if SettingsStore.shared.enableStreamingPreview {
+ NotchOverlayManager.shared.updateTranscriptionText(newText)
+ }
}
.store(in: &cancellables)
diff --git a/Sources/Fluid/Services/WhisperProvider.swift b/Sources/Fluid/Services/WhisperProvider.swift
index 2e59888b..903626d2 100644
--- a/Sources/Fluid/Services/WhisperProvider.swift
+++ b/Sources/Fluid/Services/WhisperProvider.swift
@@ -16,9 +16,11 @@ final class WhisperProvider: TranscriptionProvider {
private var whisper: Whisper?
private(set) var isReady: Bool = false
- /// Model size to use - base is a good balance of speed and accuracy
+ /// Model filename to use - reads from the unified SpeechModel setting
/// Models: tiny (~75MB), base (~142MB), small (~466MB), medium (~1.5GB), large (~2.9GB)
- private let modelName = "ggml-base.bin"
+ private var modelName: String {
+ SettingsStore.shared.selectedSpeechModel.whisperModelFile ?? "ggml-base.bin"
+ }
private var modelURL: URL {
let cacheDir = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first!
diff --git a/Sources/Fluid/UI/AISettingsView.swift b/Sources/Fluid/UI/AISettingsView.swift
new file mode 100644
index 00000000..6e21b252
--- /dev/null
+++ b/Sources/Fluid/UI/AISettingsView.swift
@@ -0,0 +1,1364 @@
+//
+// AISettingsView.swift
+// fluid
+//
+// Extracted from ContentView.swift to reduce monolithic architecture.
+// Created: 2025-12-14
+//
+
+import SwiftUI
+import AppKit
+import Security
+
+// MARK: - Connection Status Enum
+enum AIConnectionStatus {
+ case unknown, testing, success, failed
+}
+
+struct AISettingsView: View {
+ @EnvironmentObject private var appServices: AppServices
+ @EnvironmentObject private var menuBarManager: MenuBarManager
+ @Environment(\.theme) private var theme
+
+ private var asr: ASRService { appServices.asr }
+
+ // MARK: - State Variables (moved from ContentView)
+ @State private var appear = false
+ @State private var openAIBaseURL: String = "https://api.openai.com/v1"
+ @State private var enableAIProcessing: Bool = false
+
+ // Model Management
+ @State private var availableModelsByProvider: [String: [String]] = [:]
+ @State private var selectedModelByProvider: [String: String] = [:]
+ @State private var availableModels: [String] = ["gpt-4.1"]
+ @State private var selectedModel: String = "gpt-4.1"
+ @State private var showingAddModel: Bool = false
+ @State private var newModelName: String = ""
+
+ // Reasoning Configuration
+ @State private var showingReasoningConfig: Bool = false
+ @State private var editingReasoningParamName: String = "reasoning_effort"
+ @State private var editingReasoningParamValue: String = "low"
+ @State private var editingReasoningEnabled: Bool = false
+
+ // Provider Management
+ @State private var providerAPIKeys: [String: String] = [:]
+ @State private var currentProvider: String = "openai"
+ @State private var savedProviders: [SettingsStore.SavedProvider] = []
+ @State private var selectedProviderID: String = SettingsStore.shared.selectedProviderID
+
+ // Connection Testing
+ @State private var isTestingConnection: Bool = false
+ @State private var connectionStatus: AIConnectionStatus = .unknown
+ @State private var connectionErrorMessage: String = ""
+
+ // UI State
+ @State private var showHelp: Bool = false
+ @State private var showingSaveProvider: Bool = false
+ @State private var showAPIKeyEditor: Bool = false
+ @State private var showAPIKeysGuide: Bool = false
+ @State private var showingEditProvider: Bool = false
+
+ // Provider Form State
+ @State private var newProviderName: String = ""
+ @State private var newProviderBaseURL: String = ""
+ @State private var newProviderApiKey: String = ""
+ @State private var newProviderModels: String = ""
+ @State private var editProviderName: String = ""
+ @State private var editProviderBaseURL: String = ""
+
+ // Keychain State
+ @State private var showKeychainPermissionAlert: Bool = false
+ @State private var keychainPermissionMessage: String = ""
+
+ var body: some View {
+ ScrollView(.vertical, showsIndicators: false) {
+ VStack(alignment: .leading, spacing: 14) {
+ speechRecognitionCard
+ aiConfigurationCard
+ }
+ .padding(14)
+ }
+ .onAppear {
+ appear = true
+ loadSettings()
+
+ // CRITICAL FIX: Refresh model status immediately on appear
+ // This ensures the speech recognition card shows current download status
+ asr.checkIfModelsExist()
+ }
+ .onChange(of: enableAIProcessing) { _, newValue in
+ SettingsStore.shared.enableAIProcessing = newValue
+ // Keep menu bar UI in sync when toggled from this screen
+ menuBarManager.aiProcessingEnabled = newValue
+ }
+ .onChange(of: selectedModel) { _, newValue in
+ if newValue != "__ADD_MODEL__" {
+ selectedModelByProvider[currentProvider] = newValue
+ SettingsStore.shared.selectedModelByProvider = selectedModelByProvider
+ }
+ }
+ .onChange(of: selectedProviderID) { _, newValue in
+ SettingsStore.shared.selectedProviderID = newValue
+ }
+ .onChange(of: showKeychainPermissionAlert) { _, isPresented in
+ guard isPresented else { return }
+ presentKeychainAccessAlert(message: keychainPermissionMessage)
+ showKeychainPermissionAlert = false
+ }
+ }
+
+ // MARK: - Load Settings
+ private func loadSettings() {
+ selectedProviderID = SettingsStore.shared.selectedProviderID
+ updateCurrentProvider()
+
+ enableAIProcessing = SettingsStore.shared.enableAIProcessing
+ availableModelsByProvider = SettingsStore.shared.availableModelsByProvider
+ selectedModelByProvider = SettingsStore.shared.selectedModelByProvider
+ providerAPIKeys = SettingsStore.shared.providerAPIKeys
+ savedProviders = SettingsStore.shared.savedProviders
+
+ // Normalize provider keys
+ var normalized: [String: [String]] = [:]
+ for (key, models) in availableModelsByProvider {
+ let lower = key.lowercased()
+ let newKey: String
+ if lower == "openai" || lower == "groq" { newKey = lower }
+ else { newKey = key.hasPrefix("custom:") ? key : "custom:\(key)" }
+ let clean = Array(Set(models.map { $0.trimmingCharacters(in: .whitespacesAndNewlines) })).sorted()
+ if !clean.isEmpty { normalized[newKey] = clean }
+ }
+ availableModelsByProvider = normalized
+ SettingsStore.shared.availableModelsByProvider = normalized
+
+ // Normalize selected model by provider
+ var normalizedSel: [String: String] = [:]
+ for (key, model) in selectedModelByProvider {
+ let lower = key.lowercased()
+ let newKey: String = (lower == "openai" || lower == "groq") ? lower : (key.hasPrefix("custom:") ? key : "custom:\(key)")
+ if let list = normalized[newKey], list.contains(model) { normalizedSel[newKey] = model }
+ }
+ selectedModelByProvider = normalizedSel
+ SettingsStore.shared.selectedModelByProvider = normalizedSel
+
+ // Determine initial model list
+ if let saved = savedProviders.first(where: { $0.id == selectedProviderID }) {
+ availableModels = saved.models
+ openAIBaseURL = saved.baseURL
+ } else if let stored = availableModelsByProvider[currentProvider], !stored.isEmpty {
+ availableModels = stored
+ } else {
+ availableModels = defaultModels(for: providerKey(for: selectedProviderID))
+ }
+
+ // Restore selected model
+ if let sel = selectedModelByProvider[currentProvider], availableModels.contains(sel) {
+ selectedModel = sel
+ } else if let first = availableModels.first {
+ selectedModel = first
+ }
+ }
+
+ // MARK: - Speech Recognition Card
+ private var speechRecognitionCard: some View {
+ ThemedCard(hoverEffect: false) {
+ VStack(alignment: .leading, spacing: 10) {
+ HStack {
+ Image(systemName: "brain.head.profile")
+ .font(.title2)
+ .foregroundStyle(.white)
+ Text("Speech Recognition")
+ .font(.title3)
+ .fontWeight(.semibold)
+ }
+
+ VStack(alignment: .leading, spacing: 10) {
+ // Single unified model picker
+ HStack(spacing: 12) {
+ Text("Model")
+ .fontWeight(.medium)
+ Spacer()
+ Menu(SettingsStore.shared.selectedSpeechModel.displayName) {
+ ForEach(SettingsStore.SpeechModel.availableModels) { model in
+ Button {
+ SettingsStore.shared.selectedSpeechModel = model
+ asr.resetTranscriptionProvider()
+ } label: {
+ HStack {
+ Text(model.displayName)
+ Spacer()
+ Text("\(model.languageSupport) • \(model.downloadSize)")
+ .foregroundStyle(.secondary)
+ }
+ }
+ }
+ }
+ .disabled(asr.isRunning)
+ }
+
+ // Model info badges
+ HStack(spacing: 8) {
+ Label(SettingsStore.shared.selectedSpeechModel.languageSupport, systemImage: "globe")
+ .font(.caption)
+ .padding(.horizontal, 8)
+ .padding(.vertical, 4)
+ .background(RoundedRectangle(cornerRadius: 5).fill(.quaternary))
+
+ Label(SettingsStore.shared.selectedSpeechModel.downloadSize, systemImage: "arrow.down.circle")
+ .font(.caption)
+ .padding(.horizontal, 8)
+ .padding(.vertical, 4)
+ .background(RoundedRectangle(cornerRadius: 5).fill(.quaternary))
+
+ Spacer()
+
+ if !SettingsStore.shared.selectedSpeechModel.isWhisperModel {
+ Text("Apple Silicon")
+ .font(.caption)
+ .padding(.horizontal, 8)
+ .padding(.vertical, 4)
+ .background(RoundedRectangle(cornerRadius: 5, style: .continuous).fill(theme.palette.accent.opacity(0.2)))
+ }
+ }
+
+ // Model status indicator
+ modelStatusView
+
+ // Performance note
+ HStack(alignment: .top, spacing: 8) {
+ Image(systemName: "info.circle.fill")
+ .foregroundStyle(theme.palette.accent)
+ .font(.caption)
+ Text(SettingsStore.shared.selectedSpeechModel.isWhisperModel
+ ? "Whisper models support 99 languages and work on any Mac."
+ : "Parakeet TDT uses CoreML and Neural Engine for fastest English transcription on Apple Silicon.")
+ .font(.caption)
+ .foregroundStyle(.secondary)
+ }
+ .padding(10)
+ .background(RoundedRectangle(cornerRadius: 8).fill(.ultraThinMaterial.opacity(0.3)))
+
+ Divider().padding(.vertical, 4)
+
+ // Filler Words Section
+ fillerWordsSection
+ }
+ }
+ .padding(14)
+ }
+ }
+
+ private var modelStatusView: some View {
+ HStack(spacing: 12) {
+ if asr.isDownloadingModel || asr.isLoadingModel {
+ HStack(spacing: 8) {
+ ProgressView().controlSize(.small)
+ Text(asr.isLoadingModel ? "Loading model…" : "Downloading…")
+ .font(.caption)
+ .foregroundStyle(.secondary)
+ }
+ } else if asr.isAsrReady {
+ Image(systemName: "checkmark.circle.fill").foregroundStyle(.green).font(.caption)
+ Text("Ready").font(.caption).foregroundStyle(.secondary)
+
+ Button(action: { Task { await deleteModels() } }) {
+ HStack(spacing: 4) {
+ Image(systemName: "trash")
+ Text("Delete")
+ }
+ .font(.caption)
+ .foregroundStyle(.red)
+ }
+ .buttonStyle(.plain)
+ } else if asr.modelsExistOnDisk {
+ Image(systemName: "doc.fill").foregroundStyle(theme.palette.accent).font(.caption)
+ Text("Cached").font(.caption).foregroundStyle(.secondary)
+
+ Button(action: { Task { await deleteModels() } }) {
+ HStack(spacing: 4) {
+ Image(systemName: "trash")
+ Text("Delete")
+ }
+ .font(.caption)
+ .foregroundStyle(.red)
+ }
+ .buttonStyle(.plain)
+ } else {
+ Image(systemName: "arrow.down.circle").foregroundStyle(.orange).font(.caption)
+
+ Button(action: { Task { await downloadModels() } }) {
+ HStack(spacing: 4) {
+ Image(systemName: "arrow.down.circle.fill")
+ Text("Download")
+ }
+ .font(.caption)
+ .foregroundStyle(theme.palette.accent)
+ }
+ .buttonStyle(.plain)
+ }
+ }
+ .padding(.horizontal, 12)
+ .padding(.vertical, 8)
+ .background(
+ RoundedRectangle(cornerRadius: 8)
+ .fill(.ultraThinMaterial.opacity(0.3))
+ .overlay(RoundedRectangle(cornerRadius: 8).stroke(.white.opacity(0.1), lineWidth: 1))
+ )
+ }
+
+ private var fillerWordsSection: some View {
+ VStack(alignment: .leading, spacing: 8) {
+ HStack(alignment: .center) {
+ VStack(alignment: .leading, spacing: 2) {
+ Text("Remove Filler Words").font(.body)
+ Text("Automatically remove filler sounds like 'um', 'uh', 'er' from transcriptions")
+ .font(.caption)
+ .foregroundStyle(.secondary)
+ }
+ Spacer()
+ Toggle("", isOn: Binding(
+ get: { SettingsStore.shared.removeFillerWordsEnabled },
+ set: { SettingsStore.shared.removeFillerWordsEnabled = $0 }
+ ))
+ .toggleStyle(.switch)
+ .labelsHidden()
+ }
+
+ if SettingsStore.shared.removeFillerWordsEnabled {
+ FillerWordsEditor()
+ }
+ }
+ }
+
+ // MARK: - Model Download/Delete
+ private func downloadModels() async {
+ do {
+ try await asr.ensureAsrReady()
+ } catch {
+ DebugLogger.shared.error("Failed to download models: \(error)", source: "AISettingsView")
+ }
+ }
+
+ private func deleteModels() async {
+ do {
+ try await asr.clearModelCache()
+ } catch {
+ DebugLogger.shared.error("Failed to delete models: \(error)", source: "AISettingsView")
+ }
+ }
+
+ // MARK: - Helper Functions
+ private func providerKey(for providerID: String) -> String {
+ if providerID == "openai" || providerID == "groq" { return providerID }
+ return providerID.isEmpty ? currentProvider : "custom:\(providerID)"
+ }
+
+ private func providerDisplayName(for providerID: String) -> String {
+ switch providerID {
+ case "openai": return "OpenAI"
+ case "groq": return "Groq"
+ case "apple-intelligence": return "Apple Intelligence"
+ default:
+ return savedProviders.first(where: { $0.id == providerID })?.name ?? providerID.capitalized
+ }
+ }
+
+ private func defaultModels(for providerKey: String) -> [String] {
+ switch providerKey {
+ case "openai": return ["gpt-4.1"]
+ case "groq": return ["openai/gpt-oss-120b"]
+ default: return []
+ }
+ }
+
+ private func saveProviderAPIKeys() {
+ SettingsStore.shared.providerAPIKeys = providerAPIKeys
+ }
+
+ private func updateCurrentProvider() {
+ let url = openAIBaseURL.trimmingCharacters(in: .whitespacesAndNewlines)
+ if url.contains("openai.com") { currentProvider = "openai"; return }
+ if url.contains("groq.com") { currentProvider = "groq"; return }
+ currentProvider = providerKey(for: selectedProviderID)
+ }
+
+ private func saveSavedProviders() {
+ SettingsStore.shared.savedProviders = savedProviders
+ }
+
+ private func isLocalEndpoint(_ urlString: String) -> Bool {
+ guard let url = URL(string: urlString), let host = url.host else { return false }
+ let hostLower = host.lowercased()
+ if hostLower == "localhost" || hostLower == "127.0.0.1" { return true }
+ if hostLower.hasPrefix("127.") || hostLower.hasPrefix("10.") || hostLower.hasPrefix("192.168.") { return true }
+ if hostLower.hasPrefix("172.") {
+ let components = hostLower.split(separator: ".")
+ if components.count >= 2, let secondOctet = Int(components[1]), secondOctet >= 16 && secondOctet <= 31 {
+ return true
+ }
+ }
+ return false
+ }
+
+ private func hasReasoningConfigForCurrentModel() -> Bool {
+ let pKey = providerKey(for: selectedProviderID)
+ if SettingsStore.shared.hasCustomReasoningConfig(forModel: selectedModel, provider: pKey) {
+ if let config = SettingsStore.shared.getReasoningConfig(forModel: selectedModel, provider: pKey) {
+ return config.isEnabled
+ }
+ }
+ let modelLower = selectedModel.lowercased()
+ return modelLower.hasPrefix("gpt-5") || modelLower.contains("gpt-5.") ||
+ modelLower.hasPrefix("o1") || modelLower.hasPrefix("o3") ||
+ modelLower.contains("gpt-oss") || modelLower.hasPrefix("openai/") ||
+ (modelLower.contains("deepseek") && modelLower.contains("reasoner"))
+ }
+
+ private func addNewModel() {
+ guard !newModelName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else { return }
+ let modelName = newModelName.trimmingCharacters(in: .whitespacesAndNewlines)
+ let key = providerKey(for: selectedProviderID)
+
+ var list = availableModelsByProvider[key] ?? availableModels
+ if !list.contains(modelName) {
+ list.append(modelName)
+ availableModelsByProvider[key] = list
+ SettingsStore.shared.availableModelsByProvider = availableModelsByProvider
+
+ if let providerIndex = savedProviders.firstIndex(where: { $0.id == selectedProviderID }) {
+ let updatedProvider = SettingsStore.SavedProvider(
+ id: savedProviders[providerIndex].id,
+ name: savedProviders[providerIndex].name,
+ baseURL: savedProviders[providerIndex].baseURL,
+ models: list
+ )
+ savedProviders[providerIndex] = updatedProvider
+ saveSavedProviders()
+ }
+
+ availableModels = list
+ selectedModel = modelName
+ selectedModelByProvider[key] = modelName
+ SettingsStore.shared.selectedModelByProvider = selectedModelByProvider
+ }
+
+ showingAddModel = false
+ newModelName = ""
+ }
+
+ // MARK: - Keychain Access Helpers
+ private enum KeychainAccessCheckResult {
+ case granted
+ case denied(OSStatus)
+ }
+
+ private func handleAPIKeyButtonTapped() {
+ switch probeKeychainAccess() {
+ case .granted:
+ newProviderApiKey = providerAPIKeys[currentProvider] ?? ""
+ showAPIKeyEditor = true
+ case .denied(let status):
+ keychainPermissionMessage = keychainPermissionExplanation(for: status)
+ showKeychainPermissionAlert = true
+ }
+ }
+
+ private func probeKeychainAccess() -> KeychainAccessCheckResult {
+ let service = "com.fluidvoice.provider-api-keys"
+ let account = "fluidApiKeys"
+
+ let query: [String: Any] = [
+ kSecClass as String: kSecClassGenericPassword,
+ kSecAttrService as String: service,
+ kSecAttrAccount as String: account
+ ]
+
+ var readQuery = query
+ readQuery[kSecReturnData as String] = kCFBooleanTrue
+ readQuery[kSecMatchLimit as String] = kSecMatchLimitOne
+
+ let readStatus = SecItemCopyMatching(readQuery as CFDictionary, nil)
+ switch readStatus {
+ case errSecSuccess:
+ return .granted
+ case errSecItemNotFound:
+ var addQuery = query
+ addQuery[kSecAttrAccessible as String] = kSecAttrAccessibleAfterFirstUnlock
+ addQuery[kSecValueData as String] = (try? JSONEncoder().encode([String: String]())) ?? Data()
+
+ let addStatus = SecItemAdd(addQuery as CFDictionary, nil)
+ if addStatus == errSecSuccess {
+ SecItemDelete(query as CFDictionary)
+ }
+
+ switch addStatus {
+ case errSecSuccess, errSecDuplicateItem:
+ return .granted
+ case errSecAuthFailed, errSecInteractionNotAllowed, errSecUserCanceled:
+ return .denied(addStatus)
+ default:
+ return .denied(addStatus)
+ }
+ case errSecAuthFailed, errSecInteractionNotAllowed, errSecUserCanceled:
+ return .denied(readStatus)
+ default:
+ return .denied(readStatus)
+ }
+ }
+
+ private func keychainPermissionExplanation(for status: OSStatus) -> String {
+ var message = "FluidVoice stores provider API keys securely in your macOS Keychain but does not currently have permission to access it."
+ if let detail = SecCopyErrorMessageString(status, nil) as String? {
+ message += "\n\nmacOS reported: \(detail) (\(status))"
+ }
+ message += "\n\nClick \"Always Allow\" when the Keychain prompt appears, or open Keychain Access > login > Passwords, locate the FluidVoice entry, and grant access."
+ return message
+ }
+
+ @MainActor
+ private func presentKeychainAccessAlert(message: String) {
+ let msg = message.isEmpty
+ ? "FluidVoice stores provider API keys securely in your macOS Keychain. Please grant access by choosing \"Always Allow\" when prompted."
+ : message
+
+ let alert = NSAlert()
+ alert.messageText = "Keychain Access Required"
+ alert.informativeText = msg
+ alert.alertStyle = .warning
+ alert.addButton(withTitle: "Open Keychain Access")
+ alert.addButton(withTitle: "OK")
+
+ let response = alert.runModal()
+ if response == .alertFirstButtonReturn {
+ if let appURL = NSWorkspace.shared.urlForApplication(withBundleIdentifier: "com.apple.keychainaccess") {
+ NSWorkspace.shared.openApplication(at: appURL, configuration: NSWorkspace.OpenConfiguration(), completionHandler: nil)
+ }
+ }
+ }
+
+ // MARK: - API Connection Testing
+ private func testAPIConnection() async {
+ guard !isTestingConnection else { return }
+
+ let apiKey = providerAPIKeys[currentProvider] ?? ""
+ let baseURL = openAIBaseURL.trimmingCharacters(in: .whitespacesAndNewlines)
+ let isLocal = isLocalEndpoint(baseURL)
+
+ if isLocal {
+ guard !baseURL.isEmpty else {
+ await MainActor.run {
+ connectionStatus = .failed
+ connectionErrorMessage = "Base URL is required"
+ }
+ return
+ }
+ } else {
+ guard !apiKey.isEmpty && !baseURL.isEmpty else {
+ await MainActor.run {
+ connectionStatus = .failed
+ connectionErrorMessage = "API key and base URL are required"
+ }
+ return
+ }
+ }
+
+ await MainActor.run {
+ isTestingConnection = true
+ connectionStatus = .testing
+ connectionErrorMessage = ""
+ }
+
+ do {
+ let endpoint = baseURL.trimmingCharacters(in: .whitespacesAndNewlines)
+ let fullURL: String
+ if endpoint.contains("/chat/completions") || endpoint.contains("/api/chat") || endpoint.contains("/api/generate") {
+ fullURL = endpoint
+ } else {
+ fullURL = endpoint + "/chat/completions"
+ }
+
+ guard let url = URL(string: fullURL) else {
+ await MainActor.run {
+ connectionStatus = .failed
+ connectionErrorMessage = "Invalid Base URL format"
+ }
+ return
+ }
+
+ let provKey = providerKey(for: selectedProviderID)
+ let reasoningConfig = SettingsStore.shared.getReasoningConfig(forModel: selectedModel, provider: provKey)
+
+ let modelLower = selectedModel.lowercased()
+ let usesMaxCompletionTokens = modelLower.hasPrefix("gpt-5") || modelLower.contains("gpt-5.") ||
+ modelLower.hasPrefix("o1") || modelLower.hasPrefix("o3")
+
+ var requestDict: [String: Any] = [
+ "model": selectedModel,
+ "messages": [["role": "user", "content": "test"]]
+ ]
+
+ if usesMaxCompletionTokens {
+ requestDict["max_completion_tokens"] = 50
+ } else {
+ requestDict["max_tokens"] = 50
+ }
+
+ if let config = reasoningConfig, config.isEnabled {
+ if config.parameterName == "enable_thinking" {
+ requestDict[config.parameterName] = config.parameterValue == "true"
+ } else {
+ requestDict[config.parameterName] = config.parameterValue
+ }
+ }
+
+ guard let jsonData = try? JSONSerialization.data(withJSONObject: requestDict, options: []) else {
+ await MainActor.run {
+ connectionStatus = .failed
+ connectionErrorMessage = "Failed to encode test request"
+ }
+ return
+ }
+
+ var request = URLRequest(url: url)
+ request.httpMethod = "POST"
+ request.setValue("application/json", forHTTPHeaderField: "Content-Type")
+ request.timeoutInterval = 30
+
+ if !isLocal {
+ request.setValue("Bearer \(apiKey)", forHTTPHeaderField: "Authorization")
+ }
+
+ request.httpBody = jsonData
+
+ let (data, response) = try await URLSession.shared.data(for: request)
+
+ if let httpResponse = response as? HTTPURLResponse {
+ if (200...299).contains(httpResponse.statusCode) {
+ await MainActor.run {
+ connectionStatus = .success
+ connectionErrorMessage = ""
+ }
+ } else {
+ var errorMessage = "HTTP \(httpResponse.statusCode)"
+
+ if let responseBody = String(data: data, encoding: .utf8),
+ let jsonData = responseBody.data(using: .utf8),
+ let json = try? JSONSerialization.jsonObject(with: jsonData) as? [String: Any] {
+ if let error = json["error"] as? [String: Any], let message = error["message"] as? String {
+ errorMessage = message
+ } else if let message = json["message"] as? String {
+ errorMessage = message
+ }
+ }
+
+ await MainActor.run {
+ connectionStatus = .failed
+ connectionErrorMessage = errorMessage
+ }
+ }
+ }
+ } catch let urlError as URLError {
+ var errorMessage: String
+ switch urlError.code {
+ case .timedOut: errorMessage = "Request timed out - server not responding"
+ case .cannotConnectToHost: errorMessage = "Cannot connect to host - check URL"
+ case .notConnectedToInternet: errorMessage = "No internet connection"
+ default: errorMessage = urlError.localizedDescription
+ }
+
+ await MainActor.run {
+ connectionStatus = .failed
+ connectionErrorMessage = errorMessage
+ }
+ } catch {
+ await MainActor.run {
+ connectionStatus = .failed
+ connectionErrorMessage = error.localizedDescription
+ }
+ }
+
+ await MainActor.run {
+ isTestingConnection = false
+ }
+ }
+
+ // MARK: - AI Configuration Card
+ private var aiConfigurationCard: some View {
+ VStack(spacing: 14) {
+ ThemedCard(style: .prominent, hoverEffect: false) {
+ VStack(alignment: .leading, spacing: 12) {
+ // Header
+ HStack {
+ Image(systemName: "key.fill")
+ .font(.title3)
+ .foregroundStyle(theme.palette.accent)
+ Text("API Configuration")
+ .font(.headline)
+ .fontWeight(.semibold)
+ Spacer()
+ Button(action: { showHelp.toggle() }) {
+ Image(systemName: showHelp ? "questionmark.circle.fill" : "questionmark.circle")
+ .font(.system(size: 20))
+ .foregroundStyle(theme.palette.accent.opacity(0.8))
+ }
+ .buttonStyle(.plain)
+ }
+
+ Divider().padding(.vertical, 3)
+
+ // AI Enhancement Toggle
+ aiEnhancementToggle
+
+ // Streaming Toggle
+ if enableAIProcessing && selectedProviderID != "apple-intelligence" {
+ streamingToggle
+ }
+
+ // API Key Warning
+ if enableAIProcessing && selectedProviderID != "apple-intelligence" &&
+ !isLocalEndpoint(openAIBaseURL.trimmingCharacters(in: .whitespacesAndNewlines)) &&
+ (providerAPIKeys[currentProvider] ?? "").trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
+ apiKeyWarningView
+ }
+
+ // Help Section
+ if showHelp { helpSectionView }
+
+ Divider().padding(.vertical, 3)
+
+ // Provider/Model Configuration
+ providerConfigurationSection
+ }
+ .padding(14)
+ }
+ .modifier(CardAppearAnimation(delay: 0.1, appear: $appear))
+
+ // API Keys Guide
+ apiKeysGuideCard
+ }
+ }
+
+ private var aiEnhancementToggle: some View {
+ HStack(alignment: .top, spacing: 16) {
+ VStack(alignment: .leading, spacing: 4) {
+ Text("Enable AI Enhancement")
+ .font(.system(size: 15, weight: .semibold))
+ .foregroundStyle(theme.palette.primaryText)
+ Text("Automatically enhance transcriptions with AI")
+ .font(.system(size: 13))
+ .foregroundStyle(theme.palette.secondaryText)
+ }
+ Spacer()
+ Toggle("", isOn: $enableAIProcessing)
+ .toggleStyle(.switch)
+ .labelsHidden()
+ }
+ .padding(.horizontal, 4)
+ }
+
+ private var streamingToggle: some View {
+ Group {
+ Divider().padding(.vertical, 3)
+ HStack(alignment: .top, spacing: 16) {
+ VStack(alignment: .leading, spacing: 4) {
+ Text("Enable Streaming")
+ .font(.system(size: 15, weight: .semibold))
+ .foregroundStyle(theme.palette.primaryText)
+ Text("Currently only Command Mode shows real-time streaming")
+ .font(.system(size: 13))
+ .foregroundStyle(theme.palette.secondaryText)
+ }
+ Spacer()
+ Toggle("", isOn: Binding(
+ get: { SettingsStore.shared.enableAIStreaming },
+ set: { SettingsStore.shared.enableAIStreaming = $0 }
+ ))
+ .toggleStyle(.switch)
+ .labelsHidden()
+ }
+ .padding(.horizontal, 4)
+ }
+ }
+
+ private var apiKeyWarningView: some View {
+ HStack(spacing: 10) {
+ Image(systemName: "exclamationmark.triangle.fill")
+ .foregroundStyle(.orange)
+ .font(.system(size: 16))
+ Text("API key required for AI enhancement to work")
+ .font(.system(size: 13, weight: .medium))
+ .foregroundStyle(.orange)
+ Spacer()
+ }
+ .padding(12)
+ .background(.orange.opacity(0.12))
+ .clipShape(RoundedRectangle(cornerRadius: 8))
+ .overlay(RoundedRectangle(cornerRadius: 8).stroke(.orange.opacity(0.3), lineWidth: 1))
+ .padding(.horizontal, 4)
+ }
+
+ private var helpSectionView: some View {
+ VStack(alignment: .leading, spacing: 10) {
+ HStack {
+ Image(systemName: "lightbulb.fill").foregroundStyle(.yellow)
+ Text("Quick Start Guide").font(.subheadline).fontWeight(.semibold)
+ }
+ VStack(alignment: .leading, spacing: 6) {
+ helpStep("1", "Enable AI enhancement if needed")
+ helpStep("2", "Add/choose any provider of your choice along with its API key")
+ helpStep("3", "Add/choose any good model of your liking")
+ helpStep("4", "If it's OpenAI compatible endpoint, then update the base URL")
+ helpStep("5", "Once everything is set, click verify to check if the connection works")
+ }
+ }
+ .padding(14)
+ .background(theme.palette.accent.opacity(0.08))
+ .cornerRadius(12)
+ .overlay(RoundedRectangle(cornerRadius: 12).stroke(theme.palette.accent.opacity(0.2), lineWidth: 1))
+ .padding(.horizontal, 4)
+ .transition(.opacity)
+ }
+
+ private func helpStep(_ number: String, _ text: String) -> some View {
+ HStack(alignment: .top, spacing: 8) {
+ Text("\(number).")
+ .font(.caption).fontWeight(.semibold).frame(width: 16, alignment: .trailing)
+ Text(text).font(.caption).foregroundStyle(.secondary)
+ }
+ }
+
+ private var providerConfigurationSection: some View {
+ VStack(alignment: .leading, spacing: 10) {
+ // Compatibility note
+ if selectedProviderID == "apple-intelligence" {
+ HStack(spacing: 6) {
+ Image(systemName: "apple.logo").font(.caption2).foregroundStyle(theme.palette.accent)
+ Text("Powered by on-device Apple Intelligence").font(.caption).foregroundStyle(.secondary)
+ }
+ .padding(.horizontal, 4)
+ } else {
+ HStack(spacing: 6) {
+ Image(systemName: "checkmark.seal.fill").font(.caption2).foregroundStyle(theme.palette.accent)
+ Text("Supports any OpenAI compatible API endpoints").font(.caption).foregroundStyle(.secondary)
+ }
+ .padding(.horizontal, 4)
+ }
+
+ Divider()
+
+ providerPickerRow
+
+ if showingEditProvider { editProviderSection }
+
+ if selectedProviderID == "apple-intelligence" { appleIntelligenceBadge }
+
+ // API Key Management
+ if selectedProviderID != "apple-intelligence" {
+ Divider()
+ Button(action: { handleAPIKeyButtonTapped() }) {
+ Label("Add or Modify API Key", systemImage: "key.fill")
+ .labelStyle(.titleAndIcon).font(.caption)
+ }
+ .buttonStyle(GlassButtonStyle())
+ }
+
+ Divider()
+
+ // Model Row
+ if selectedProviderID == "apple-intelligence" {
+ appleIntelligenceModelRow
+ } else {
+ standardModelRow
+ if showingAddModel { addModelSection }
+ if showingReasoningConfig { reasoningConfigSection }
+ }
+
+ Divider()
+
+ // Connection Test
+ if selectedProviderID != "apple-intelligence" {
+ connectionTestSection
+ if showingSaveProvider { addProviderSection }
+ }
+ }
+ .padding(.horizontal, 4)
+ }
+
+ private var providerPickerRow: some View {
+ HStack(spacing: 12) {
+ HStack {
+ Text("Provider:").fontWeight(.medium)
+ }
+ .frame(width: 90, alignment: .leading)
+ .padding(.horizontal, 10).padding(.vertical, 4)
+ .background(LinearGradient(colors: [theme.palette.accent.opacity(0.15), theme.palette.accent.opacity(0.05)], startPoint: .leading, endPoint: .trailing))
+ .cornerRadius(6)
+
+ Picker("", selection: $selectedProviderID) {
+ Text("OpenAI").tag("openai")
+ Text("Groq").tag("groq")
+ if AppleIntelligenceService.isAvailable {
+ Text("Apple Intelligence").tag("apple-intelligence")
+ }
+ if !savedProviders.isEmpty {
+ Divider()
+ ForEach(savedProviders) { provider in
+ Text(provider.name).tag(provider.id)
+ }
+ }
+ }
+ .pickerStyle(.menu).labelsHidden().frame(width: 200)
+ .onChange(of: selectedProviderID) { _, newValue in
+ handleProviderChange(newValue)
+ }
+
+ // Edit/Delete buttons for custom providers
+ if !["openai", "groq", "apple-intelligence"].contains(selectedProviderID) {
+ Button(action: { startEditingProvider() }) {
+ HStack(spacing: 4) { Image(systemName: "pencil"); Text("Edit") }.font(.caption)
+ }
+ .buttonStyle(CompactButtonStyle())
+
+ Button(action: { deleteCurrentProvider() }) {
+ HStack(spacing: 4) { Image(systemName: "trash"); Text("Delete") }.font(.caption).foregroundStyle(.red)
+ }
+ .buttonStyle(CompactButtonStyle())
+ }
+
+ Button("+ Add Provider") {
+ showingSaveProvider = true
+ newProviderName = ""; newProviderBaseURL = ""; newProviderApiKey = ""; newProviderModels = ""
+ }
+ .buttonStyle(CompactButtonStyle())
+ }
+ }
+
+ private func handleProviderChange(_ newValue: String) {
+ switch newValue {
+ case "openai":
+ openAIBaseURL = "https://api.openai.com/v1"
+ updateCurrentProvider()
+ let key = "openai"
+ availableModels = availableModelsByProvider[key] ?? defaultModels(for: key)
+ selectedModel = selectedModelByProvider[key] ?? availableModels.first ?? selectedModel
+ case "groq":
+ openAIBaseURL = "https://api.groq.com/openai/v1"
+ updateCurrentProvider()
+ let key = "groq"
+ availableModels = availableModelsByProvider[key] ?? defaultModels(for: key)
+ selectedModel = selectedModelByProvider[key] ?? availableModels.first ?? selectedModel
+ case "apple-intelligence":
+ openAIBaseURL = ""
+ updateCurrentProvider()
+ availableModels = ["System Model"]
+ selectedModel = "System Model"
+ default:
+ if let provider = savedProviders.first(where: { $0.id == newValue }) {
+ openAIBaseURL = provider.baseURL
+ updateCurrentProvider()
+ let key = providerKey(for: newValue)
+ availableModels = provider.models.isEmpty ? (availableModelsByProvider[key] ?? []) : provider.models
+ selectedModel = selectedModelByProvider[key] ?? availableModels.first ?? selectedModel
+ }
+ }
+ }
+
+ private func startEditingProvider() {
+ if let provider = savedProviders.first(where: { $0.id == selectedProviderID }) {
+ editProviderName = provider.name
+ editProviderBaseURL = provider.baseURL
+ showingEditProvider = true
+ }
+ }
+
+ private func deleteCurrentProvider() {
+ savedProviders.removeAll { $0.id == selectedProviderID }
+ saveSavedProviders()
+ let key = providerKey(for: selectedProviderID)
+ availableModelsByProvider.removeValue(forKey: key)
+ selectedModelByProvider.removeValue(forKey: key)
+ providerAPIKeys.removeValue(forKey: key)
+ saveProviderAPIKeys()
+ SettingsStore.shared.availableModelsByProvider = availableModelsByProvider
+ SettingsStore.shared.selectedModelByProvider = selectedModelByProvider
+ selectedProviderID = "openai"
+ openAIBaseURL = "https://api.openai.com/v1"
+ updateCurrentProvider()
+ availableModels = defaultModels(for: "openai")
+ selectedModel = availableModels.first ?? selectedModel
+ }
+
+ private var editProviderSection: some View {
+ VStack(spacing: 12) {
+ HStack { Text("Edit Provider").font(.headline).fontWeight(.semibold); Spacer() }
+ HStack(spacing: 8) {
+ VStack(alignment: .leading, spacing: 4) {
+ Text("Name").font(.caption).foregroundStyle(.secondary)
+ TextField("Provider name", text: $editProviderName).textFieldStyle(.roundedBorder).frame(width: 200)
+ }
+ VStack(alignment: .leading, spacing: 4) {
+ Text("Base URL").font(.caption).foregroundStyle(.secondary)
+ TextField("e.g., http://localhost:11434/v1", text: $editProviderBaseURL).textFieldStyle(.roundedBorder).font(.system(.body, design: .monospaced))
+ }
+ }
+ HStack(spacing: 8) {
+ Button("Save") { saveEditedProvider() }.buttonStyle(GlassButtonStyle())
+ .disabled(editProviderName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty || editProviderBaseURL.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty)
+ Button("Cancel") { showingEditProvider = false; editProviderName = ""; editProviderBaseURL = "" }.buttonStyle(GlassButtonStyle())
+ }
+ }
+ .padding(12)
+ .background(theme.palette.cardBackground.opacity(0.5))
+ .cornerRadius(12)
+ .overlay(RoundedRectangle(cornerRadius: 12).stroke(theme.palette.accent.opacity(0.3), lineWidth: 1))
+ .padding(.vertical, 8)
+ .transition(.move(edge: .top).combined(with: .opacity))
+ }
+
+ private func saveEditedProvider() {
+ let name = editProviderName.trimmingCharacters(in: .whitespacesAndNewlines)
+ let base = editProviderBaseURL.trimmingCharacters(in: .whitespacesAndNewlines)
+ guard !name.isEmpty, !base.isEmpty else { return }
+
+ if let providerIndex = savedProviders.firstIndex(where: { $0.id == selectedProviderID }) {
+ let oldProvider = savedProviders[providerIndex]
+ let updatedProvider = SettingsStore.SavedProvider(id: oldProvider.id, name: name, baseURL: base, models: oldProvider.models)
+ savedProviders[providerIndex] = updatedProvider
+ saveSavedProviders()
+ openAIBaseURL = base
+ updateCurrentProvider()
+ }
+ showingEditProvider = false
+ editProviderName = ""; editProviderBaseURL = ""
+ }
+
+ private var appleIntelligenceBadge: some View {
+ HStack(spacing: 8) {
+ Image(systemName: "apple.logo").font(.system(size: 14))
+ Text("On-Device").fontWeight(.medium)
+ Text("•").foregroundStyle(.secondary)
+ Image(systemName: "lock.shield.fill").font(.system(size: 12))
+ Text("Private").fontWeight(.medium)
+ }
+ .font(.caption).foregroundStyle(.green)
+ .padding(.horizontal, 12).padding(.vertical, 8)
+ .background(RoundedRectangle(cornerRadius: 8).fill(.green.opacity(0.15)).overlay(RoundedRectangle(cornerRadius: 8).stroke(.green.opacity(0.3), lineWidth: 1)))
+ }
+
+ private var appleIntelligenceModelRow: some View {
+ HStack(spacing: 12) {
+ HStack { Text("Model:").fontWeight(.medium) }
+ .frame(width: 90, alignment: .leading)
+ .padding(.horizontal, 10).padding(.vertical, 4)
+ .background(LinearGradient(colors: [theme.palette.accent.opacity(0.15), theme.palette.accent.opacity(0.05)], startPoint: .leading, endPoint: .trailing))
+ .cornerRadius(6)
+ Text("System Language Model").foregroundStyle(.secondary).font(.system(.body))
+ Spacer()
+ }
+ }
+
+ private var standardModelRow: some View {
+ HStack(spacing: 12) {
+ HStack { Text("Model:").fontWeight(.medium) }
+ .frame(width: 90, alignment: .leading)
+ .padding(.horizontal, 10).padding(.vertical, 4)
+ .background(LinearGradient(colors: [theme.palette.accent.opacity(0.15), theme.palette.accent.opacity(0.05)], startPoint: .leading, endPoint: .trailing))
+ .cornerRadius(6)
+
+ Picker("", selection: $selectedModel) {
+ ForEach(availableModels, id: \.self) { model in Text(model).tag(model) }
+ }
+ .pickerStyle(.menu).labelsHidden().frame(width: 200)
+
+ if !["openai", "groq"].contains(selectedProviderID) {
+ Button(action: { deleteSelectedModel() }) {
+ HStack(spacing: 4) { Image(systemName: "trash"); Text("Delete") }.font(.caption).foregroundStyle(.red)
+ }
+ .buttonStyle(CompactButtonStyle())
+ }
+
+ if !showingAddModel {
+ Button("+ Add Model") { showingAddModel = true; newModelName = "" }.buttonStyle(CompactButtonStyle())
+ }
+
+ Button(action: { openReasoningConfig() }) {
+ HStack(spacing: 4) {
+ Image(systemName: hasReasoningConfigForCurrentModel() ? "brain.fill" : "brain")
+ Text("Reasoning")
+ }
+ .font(.caption)
+ .foregroundStyle(hasReasoningConfigForCurrentModel() ? theme.palette.accent : .secondary)
+ }
+ .buttonStyle(CompactButtonStyle())
+ }
+ }
+
+ private func deleteSelectedModel() {
+ let key = providerKey(for: selectedProviderID)
+ var list = availableModelsByProvider[key] ?? availableModels
+ list.removeAll { $0 == selectedModel }
+ if list.isEmpty { list = defaultModels(for: key) }
+ availableModelsByProvider[key] = list
+ SettingsStore.shared.availableModelsByProvider = availableModelsByProvider
+
+ if let providerIndex = savedProviders.firstIndex(where: { $0.id == selectedProviderID }) {
+ let updatedProvider = SettingsStore.SavedProvider(id: savedProviders[providerIndex].id, name: savedProviders[providerIndex].name, baseURL: savedProviders[providerIndex].baseURL, models: list)
+ savedProviders[providerIndex] = updatedProvider
+ saveSavedProviders()
+ }
+
+ availableModels = list
+ selectedModel = list.first ?? ""
+ selectedModelByProvider[key] = selectedModel
+ SettingsStore.shared.selectedModelByProvider = selectedModelByProvider
+ }
+
+ private func openReasoningConfig() {
+ let pKey = providerKey(for: selectedProviderID)
+ if let config = SettingsStore.shared.getReasoningConfig(forModel: selectedModel, provider: pKey) {
+ editingReasoningParamName = config.parameterName
+ editingReasoningParamValue = config.parameterValue
+ editingReasoningEnabled = config.isEnabled
+ } else {
+ let modelLower = selectedModel.lowercased()
+ if modelLower.hasPrefix("gpt-5") || modelLower.hasPrefix("o1") || modelLower.hasPrefix("o3") || modelLower.contains("gpt-oss") {
+ editingReasoningParamName = "reasoning_effort"; editingReasoningParamValue = "low"; editingReasoningEnabled = true
+ } else if modelLower.contains("deepseek") && modelLower.contains("reasoner") {
+ editingReasoningParamName = "enable_thinking"; editingReasoningParamValue = "true"; editingReasoningEnabled = true
+ } else {
+ editingReasoningParamName = "reasoning_effort"; editingReasoningParamValue = "low"; editingReasoningEnabled = false
+ }
+ }
+ showingReasoningConfig = true
+ }
+
+ private var addModelSection: some View {
+ HStack(spacing: 8) {
+ TextField("Enter model name", text: $newModelName)
+ .textFieldStyle(.roundedBorder)
+ .onSubmit { if !newModelName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty { addNewModel() } }
+ Button("Add") { addNewModel() }.buttonStyle(CompactButtonStyle())
+ .disabled(newModelName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty)
+ Button("Cancel") { showingAddModel = false; newModelName = "" }.buttonStyle(CompactButtonStyle())
+ }
+ .padding(.leading, 122)
+ }
+
+ private var reasoningConfigSection: some View {
+ VStack(alignment: .leading, spacing: 10) {
+ HStack {
+ Image(systemName: "brain.head.profile").foregroundStyle(theme.palette.accent)
+ Text("Reasoning Config for \(selectedModel)").font(.caption).fontWeight(.semibold)
+ Spacer()
+ }
+
+ Toggle("Enable reasoning parameter", isOn: $editingReasoningEnabled).toggleStyle(.switch).font(.caption)
+
+ if editingReasoningEnabled {
+ HStack(spacing: 12) {
+ VStack(alignment: .leading, spacing: 4) {
+ Text("Parameter Name").font(.caption2).foregroundStyle(.secondary)
+ Picker("", selection: $editingReasoningParamName) {
+ Text("reasoning_effort").tag("reasoning_effort")
+ Text("enable_thinking").tag("enable_thinking")
+ }
+ .pickerStyle(.menu).labelsHidden().frame(width: 150)
+ }
+ VStack(alignment: .leading, spacing: 4) {
+ Text("Value").font(.caption2).foregroundStyle(.secondary)
+ if editingReasoningParamName == "reasoning_effort" {
+ Picker("", selection: $editingReasoningParamValue) {
+ Text("minimal").tag("minimal"); Text("low").tag("low"); Text("medium").tag("medium"); Text("high").tag("high")
+ }
+ .pickerStyle(.menu).labelsHidden().frame(width: 100)
+ } else {
+ Picker("", selection: $editingReasoningParamValue) {
+ Text("true").tag("true"); Text("false").tag("false")
+ }
+ .pickerStyle(.menu).labelsHidden().frame(width: 100)
+ }
+ }
+ }
+ }
+
+ HStack(spacing: 8) {
+ Button("Save") { saveReasoningConfig() }.buttonStyle(GlassButtonStyle())
+ Button("Cancel") { showingReasoningConfig = false }.buttonStyle(CompactButtonStyle())
+ }
+ }
+ .padding(12)
+ .background(RoundedRectangle(cornerRadius: 8).fill(theme.palette.accent.opacity(0.08)).overlay(RoundedRectangle(cornerRadius: 8).stroke(theme.palette.accent.opacity(0.2), lineWidth: 1)))
+ .padding(.leading, 122)
+ .transition(.opacity)
+ }
+
+ private func saveReasoningConfig() {
+ let pKey = providerKey(for: selectedProviderID)
+ if editingReasoningEnabled {
+ let config = SettingsStore.ModelReasoningConfig(parameterName: editingReasoningParamName, parameterValue: editingReasoningParamValue, isEnabled: true)
+ SettingsStore.shared.setReasoningConfig(config, forModel: selectedModel, provider: pKey)
+ } else {
+ let config = SettingsStore.ModelReasoningConfig(parameterName: "", parameterValue: "", isEnabled: false)
+ SettingsStore.shared.setReasoningConfig(config, forModel: selectedModel, provider: pKey)
+ }
+ showingReasoningConfig = false
+ }
+
+ private var connectionTestSection: some View {
+ VStack(alignment: .leading, spacing: 8) {
+ HStack(spacing: 12) {
+ Button(action: { Task { await testAPIConnection() } }) {
+ Text(isTestingConnection ? "Verifying..." : "Verify Connection").font(.caption).fontWeight(.semibold)
+ }
+ .buttonStyle(GlassButtonStyle())
+ .disabled(isTestingConnection || (!isLocalEndpoint(openAIBaseURL.trimmingCharacters(in: .whitespacesAndNewlines)) && (providerAPIKeys[currentProvider] ?? "").isEmpty))
+ }
+
+ // Connection Status Display
+ if connectionStatus == .success {
+ HStack(spacing: 8) {
+ Image(systemName: "checkmark.circle.fill").foregroundStyle(.green).font(.caption)
+ Text("Connection verified").font(.caption).foregroundStyle(.green)
+ }
+ } else if connectionStatus == .failed {
+ HStack(spacing: 8) {
+ Image(systemName: "exclamationmark.circle.fill").foregroundStyle(.red).font(.caption)
+ VStack(alignment: .leading, spacing: 2) {
+ Text("Connection failed").font(.caption).foregroundStyle(.red)
+ if !connectionErrorMessage.isEmpty {
+ Text(connectionErrorMessage).font(.caption2).foregroundStyle(.red.opacity(0.8)).lineLimit(1)
+ }
+ }
+ }
+ } else if connectionStatus == .testing {
+ HStack(spacing: 8) {
+ ProgressView().frame(width: 16, height: 16)
+ Text("Verifying...").font(.caption).foregroundStyle(theme.palette.accent)
+ }
+ }
+
+ // API Key Editor Sheet
+ Color.clear.frame(height: 0)
+ .sheet(isPresented: $showAPIKeyEditor) {
+ apiKeyEditorSheet
+ }
+ }
+ }
+
+ private var apiKeyEditorSheet: some View {
+ VStack(spacing: 14) {
+ Text("Enter \(providerDisplayName(for: selectedProviderID)) API Key").font(.headline)
+ SecureField("API Key (optional for local endpoints)", text: $newProviderApiKey)
+ .textFieldStyle(.roundedBorder).frame(width: 300)
+ HStack(spacing: 12) {
+ Button("Cancel") { showAPIKeyEditor = false }.buttonStyle(.bordered)
+ Button("OK") {
+ let trimmedKey = newProviderApiKey.trimmingCharacters(in: .whitespacesAndNewlines)
+ providerAPIKeys[currentProvider] = trimmedKey
+ saveProviderAPIKeys()
+ if connectionStatus != .unknown { connectionStatus = .unknown; connectionErrorMessage = "" }
+ showAPIKeyEditor = false
+ }
+ .buttonStyle(.borderedProminent)
+ .disabled(!isLocalEndpoint(openAIBaseURL.trimmingCharacters(in: .whitespacesAndNewlines)) && newProviderApiKey.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty)
+ }
+ }
+ .padding()
+ .frame(minWidth: 350, minHeight: 150)
+ }
+
+ private var addProviderSection: some View {
+ VStack(spacing: 12) {
+ HStack(spacing: 8) {
+ TextField("Provider name", text: $newProviderName).textFieldStyle(.roundedBorder).frame(width: 200)
+ TextField("Base URL", text: $newProviderBaseURL).textFieldStyle(.roundedBorder).frame(width: 250)
+ }
+ HStack(spacing: 8) {
+ SecureField("API Key (optional for local)", text: $newProviderApiKey).textFieldStyle(.roundedBorder).frame(width: 200)
+ TextField("Models (comma-separated)", text: $newProviderModels).textFieldStyle(.roundedBorder).frame(width: 250)
+ }
+ HStack(spacing: 8) {
+ Button("Save Provider") { saveNewProvider() }
+ .buttonStyle(GlassButtonStyle())
+ .disabled(newProviderName.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty || newProviderBaseURL.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty)
+ Button("Cancel") { showingSaveProvider = false; newProviderName = ""; newProviderBaseURL = ""; newProviderApiKey = ""; newProviderModels = "" }
+ .buttonStyle(GlassButtonStyle())
+ }
+ }
+ .transition(.opacity)
+ }
+
+ private func saveNewProvider() {
+ let name = newProviderName.trimmingCharacters(in: .whitespacesAndNewlines)
+ let base = newProviderBaseURL.trimmingCharacters(in: .whitespacesAndNewlines)
+ let api = newProviderApiKey.trimmingCharacters(in: .whitespacesAndNewlines)
+ guard !name.isEmpty, !base.isEmpty else { return }
+
+ let modelsList = newProviderModels.split(separator: ",").map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }.filter { !$0.isEmpty }
+ let models = modelsList.isEmpty ? defaultModels(for: "openai") : modelsList
+
+ let newProvider = SettingsStore.SavedProvider(name: name, baseURL: base, models: models)
+ savedProviders.removeAll { $0.name.lowercased() == name.lowercased() }
+ savedProviders.append(newProvider)
+ saveSavedProviders()
+
+ let key = providerKey(for: newProvider.id)
+ providerAPIKeys[key] = api
+ availableModelsByProvider[key] = models
+ selectedModelByProvider[key] = models.first ?? selectedModel
+ SettingsStore.shared.providerAPIKeys = providerAPIKeys
+ SettingsStore.shared.availableModelsByProvider = availableModelsByProvider
+ SettingsStore.shared.selectedModelByProvider = selectedModelByProvider
+
+ selectedProviderID = newProvider.id
+ openAIBaseURL = base
+ updateCurrentProvider()
+ availableModels = models
+ selectedModel = models.first ?? selectedModel
+
+ showingSaveProvider = false
+ newProviderName = ""; newProviderBaseURL = ""; newProviderApiKey = ""; newProviderModels = ""
+ }
+
+ private var apiKeysGuideCard: some View {
+ ThemedCard(style: .prominent, hoverEffect: false) {
+ VStack(alignment: .leading, spacing: 12) {
+ Button(action: { showAPIKeysGuide.toggle() }) {
+ HStack {
+ Image(systemName: "key.fill").font(.title3).foregroundStyle(.purple)
+ Text("Get API Keys").font(.headline).fontWeight(.semibold).foregroundStyle(.primary)
+ Spacer()
+ Image(systemName: showAPIKeysGuide ? "chevron.up" : "chevron.down").font(.caption).foregroundStyle(.secondary)
+ }
+ .contentShape(Rectangle())
+ }
+ .buttonStyle(.plain)
+
+ if showAPIKeysGuide {
+ VStack(alignment: .leading, spacing: 12) {
+ ProviderGuide(name: "OpenAI", url: "https://platform.openai.com/api-keys", baseURL: "https://api.openai.com/v1", keyPrefix: "sk-")
+ ProviderGuide(name: "Groq", url: "https://console.groq.com/keys", baseURL: "https://api.groq.com/openai/v1", keyPrefix: "gsk_")
+ ProviderGuide(name: "OpenRouter", url: "https://openrouter.ai/keys", baseURL: "https://openrouter.ai/api/v1", keyPrefix: "sk-or-")
+
+ Divider()
+
+ HStack(spacing: 8) {
+ Image(systemName: "info.circle.fill").font(.caption).foregroundStyle(theme.palette.accent)
+ VStack(alignment: .leading, spacing: 4) {
+ Text("Any OpenAI compatible API endpoint is supported").font(.caption).fontWeight(.semibold)
+ Text("Use '+ Add Provider' to add custom providers like Ollama, LM Studio, etc.").font(.caption2).foregroundStyle(.secondary)
+ }
+ }
+ .padding(12)
+ .background(theme.palette.accent.opacity(0.08))
+ .cornerRadius(8)
+ }
+ .transition(.opacity)
+ }
+ }
+ .padding(14)
+ }
+ .modifier(CardAppearAnimation(delay: 0.2, appear: $appear))
+ }
+}
diff --git a/Sources/Fluid/UI/FeedbackView.swift b/Sources/Fluid/UI/FeedbackView.swift
new file mode 100644
index 00000000..af5ca04d
--- /dev/null
+++ b/Sources/Fluid/UI/FeedbackView.swift
@@ -0,0 +1,291 @@
+//
+// FeedbackView.swift
+// fluid
+//
+// Extracted from ContentView.swift to reduce monolithic architecture.
+// Created: 2025-12-14
+//
+
+import SwiftUI
+import AppKit
+
+struct FeedbackView: View {
+ @Environment(\.theme) private var theme
+
+ // MARK: - State Variables (moved from ContentView)
+ @State private var feedbackText: String = ""
+ @State private var feedbackEmail: String = ""
+ @State private var includeDebugLogs: Bool = false
+ @State private var isSendingFeedback: Bool = false
+ @State private var showFeedbackConfirmation: Bool = false
+ @State private var appear: Bool = false
+
+ var body: some View {
+ ScrollView {
+ VStack(alignment: .leading, spacing: 20) {
+ // Header
+ VStack(alignment: .leading, spacing: 8) {
+ HStack {
+ Image(systemName: "envelope.fill")
+ .font(.system(size: 32))
+ .foregroundStyle(theme.palette.accent)
+ VStack(alignment: .leading) {
+ Text("Send Feedback")
+ .font(.system(size: 28, weight: .bold))
+ Text("Help us improve FluidVoice")
+ .font(.system(size: 16))
+ .foregroundStyle(.secondary)
+ }
+ }
+ }
+ .padding(.bottom, 8)
+
+ // Friendly Message & GitHub CTA
+ ThemedCard(style: .prominent, hoverEffect: false) {
+ VStack(alignment: .leading, spacing: 12) {
+ HStack(spacing: 12) {
+ Image(systemName: "heart.fill")
+ .font(.system(size: 28))
+ .foregroundStyle(.pink)
+
+ VStack(alignment: .leading, spacing: 4) {
+ Text("We'd love to hear from you!")
+ .font(.system(size: 18, weight: .semibold))
+ .foregroundStyle(theme.palette.primaryText)
+
+ Text("Your feedback helps us make FluidVoice even better")
+ .font(.system(size: 14))
+ .foregroundStyle(theme.palette.secondaryText)
+ }
+ }
+
+ Divider()
+ .padding(.vertical, 4)
+
+ HStack(spacing: 12) {
+ Image(systemName: "star.fill")
+ .font(.system(size: 24))
+ .foregroundStyle(.yellow)
+
+ VStack(alignment: .leading, spacing: 6) {
+ Text("Loving FluidVoice?")
+ .font(.system(size: 16, weight: .semibold))
+ .foregroundStyle(theme.palette.primaryText)
+
+ Text("Give us a star on GitHub! It helps others discover the project and motivates us to keep improving.")
+ .font(.system(size: 13))
+ .foregroundStyle(theme.palette.secondaryText)
+ .fixedSize(horizontal: false, vertical: true)
+ }
+
+ Spacer()
+
+ Link(destination: URL(string: "https://github.com/altic-dev/Fluid-oss")!) {
+ HStack(spacing: 8) {
+ Image(systemName: "star.fill")
+ Text("Star on GitHub")
+ .fontWeight(.semibold)
+ }
+ .font(.system(size: 14))
+ .foregroundStyle(.white)
+ .padding(.horizontal, 16)
+ .padding(.vertical, 10)
+ .background(
+ LinearGradient(
+ colors: [.purple, .blue],
+ startPoint: .leading,
+ endPoint: .trailing
+ )
+ )
+ .cornerRadius(8)
+ }
+ .buttonStyle(.plain)
+ .buttonHoverEffect()
+ }
+ }
+ .padding(20)
+ }
+
+ // Feedback Form
+ ThemedCard(style: .standard, hoverEffect: false) {
+ VStack(alignment: .leading, spacing: 16) {
+ VStack(alignment: .leading, spacing: 12) {
+ Text("Email")
+ .font(.headline)
+ .fontWeight(.semibold)
+
+ TextField("[email protected]", text: $feedbackEmail)
+ .textFieldStyle(.roundedBorder)
+ .font(.system(size: 14))
+
+ Text("Feedback")
+ .font(.headline)
+ .fontWeight(.semibold)
+ .padding(.top, 8)
+
+ TextEditor(text: $feedbackText)
+ .font(.system(size: 14))
+ .frame(height: 120)
+ .padding(12)
+ .background(
+ RoundedRectangle(cornerRadius: 8)
+ .fill(Color(nsColor: NSColor.textBackgroundColor))
+ .overlay(
+ RoundedRectangle(cornerRadius: 8)
+ .strokeBorder(Color(nsColor: NSColor.separatorColor), lineWidth: 1.5)
+ )
+ )
+ .scrollContentBackground(.hidden)
+ .overlay(
+ VStack {
+ if feedbackText.isEmpty {
+ Text("Share your thoughts, report bugs, or suggest features...")
+ .font(.subheadline)
+ .foregroundStyle(.secondary)
+ }
+ }
+ .allowsHitTesting(false)
+ )
+
+ // Debug logs option
+ Toggle("Include debug logs", isOn: $includeDebugLogs)
+ .toggleStyle(GlassToggleStyle())
+
+ // Send Button
+ HStack {
+ Spacer()
+
+ Button(action: {
+ Task {
+ await sendFeedback()
+ }
+ }) {
+ HStack(spacing: 8) {
+ if isSendingFeedback {
+ ProgressView()
+ .scaleEffect(0.8)
+ } else {
+ Image(systemName: "paperplane.fill")
+ }
+ Text(isSendingFeedback ? "Sending..." : "Send Feedback")
+ .fontWeight(.semibold)
+ }
+ .padding(.horizontal, 20)
+ .padding(.vertical, 10)
+ }
+ .buttonStyle(GlassButtonStyle())
+ .disabled(feedbackText.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ||
+ feedbackEmail.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ||
+ isSendingFeedback)
+ .buttonHoverEffect()
+ }
+ }
+ }
+ .padding(20)
+ }
+ .modifier(CardAppearAnimation(delay: 0.1, appear: $appear))
+ }
+ .padding(24)
+ }
+ .onAppear {
+ appear = true
+ }
+ .alert("Feedback Sent", isPresented: $showFeedbackConfirmation) {
+ Button("OK") { }
+ } message: {
+ Text("Thank you for helping us improve FluidVoice.")
+ }
+ }
+
+ // MARK: - Feedback Functions
+
+ private func sendFeedback() async {
+ guard !feedbackEmail.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty,
+ !feedbackText.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {
+ return
+ }
+
+ await MainActor.run {
+ isSendingFeedback = true
+ }
+
+ let feedbackData = createFeedbackData()
+ let success = await submitFeedback(data: feedbackData)
+
+ await MainActor.run {
+ isSendingFeedback = false
+ if success {
+ // Show confirmation and clear form
+ showFeedbackConfirmation = true
+ feedbackText = ""
+ feedbackEmail = ""
+ includeDebugLogs = false
+ }
+ }
+ }
+
+ private func createFeedbackData() -> [String: Any] {
+ var feedbackContent = feedbackText.trimmingCharacters(in: .whitespacesAndNewlines)
+
+ if includeDebugLogs {
+ feedbackContent += "\n\n--- Debug Information ---\n"
+ feedbackContent += "App Version: \(Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "Unknown")\n"
+ feedbackContent += "Build: \(Bundle.main.infoDictionary?["CFBundleVersion"] as? String ?? "Unknown")\n"
+ feedbackContent += "macOS Version: \(ProcessInfo.processInfo.operatingSystemVersionString)\n"
+ feedbackContent += "Date: \(Date().formatted())\n\n"
+
+ // Add recent log entries
+ let logFileURL = FileLogger.shared.currentLogFileURL()
+ if FileManager.default.fileExists(atPath: logFileURL.path) {
+ do {
+ let logContent = try String(contentsOf: logFileURL)
+ let lines = logContent.components(separatedBy: .newlines)
+ let recentLines = Array(lines.suffix(30)) // Last 30 lines
+ feedbackContent += "Recent Log Entries:\n"
+ feedbackContent += recentLines.joined(separator: "\n")
+ } catch {
+ feedbackContent += "Could not read log file: \(error.localizedDescription)\n"
+ }
+ }
+ }
+
+ return [
+ "email_id": feedbackEmail.trimmingCharacters(in: .whitespacesAndNewlines),
+ "feedback": feedbackContent
+ ]
+ }
+
+ private func submitFeedback(data: [String: Any]) async -> Bool {
+ guard let url = URL(string: "https://altic.dev/api/fluid/feedback") else {
+ DebugLogger.shared.error("Invalid feedback API URL", source: "FeedbackView")
+ return false
+ }
+
+ do {
+ var request = URLRequest(url: url)
+ request.httpMethod = "POST"
+ request.setValue("application/json", forHTTPHeaderField: "Content-Type")
+ request.httpBody = try JSONSerialization.data(withJSONObject: data)
+
+ let (_, response) = try await URLSession.shared.data(for: request)
+
+ if let httpResponse = response as? HTTPURLResponse {
+ let success = (200...299).contains(httpResponse.statusCode)
+ if success {
+ DebugLogger.shared.info("Feedback submitted successfully", source: "FeedbackView")
+ } else {
+ DebugLogger.shared.error("Feedback submission failed with status: \(httpResponse.statusCode)", source: "FeedbackView")
+ }
+ return success
+ }
+ return false
+ } catch {
+ DebugLogger.shared.error("Network error submitting feedback: \(error.localizedDescription)", source: "FeedbackView")
+ return false
+ }
+ }
+}
+
+#Preview {
+ FeedbackView()
+}
diff --git a/Sources/Fluid/UI/MouseTracker.swift b/Sources/Fluid/UI/MouseTracker.swift
index f12e2d77..411ab587 100644
--- a/Sources/Fluid/UI/MouseTracker.swift
+++ b/Sources/Fluid/UI/MouseTracker.swift
@@ -75,7 +75,7 @@ struct MouseTrackingModifier: ViewModifier {
let globalFrame = geometry.frame(in: .global)
tracker.updateWindowFrame(globalFrame)
}
- .onChange(of: geometry.frame(in: .global)) { newFrame in
+ .onChange(of: geometry.frame(in: .global)) { _, newFrame in
// Skip updates when view is scrolled off-screen (prevents invalid geometry)
guard newFrame.minY < NSScreen.main?.frame.height ?? 1000 else { return }
guard newFrame.maxY > 0 else { return }
diff --git a/Sources/Fluid/UI/RecordingView.swift b/Sources/Fluid/UI/RecordingView.swift
index f7b1afd4..f96b4fcd 100644
--- a/Sources/Fluid/UI/RecordingView.swift
+++ b/Sources/Fluid/UI/RecordingView.swift
@@ -9,7 +9,8 @@ import SwiftUI
import AVFoundation
struct RecordingView: View {
- @ObservedObject var asr: ASRService
+ @EnvironmentObject var appServices: AppServices
+ private var asr: ASRService { appServices.asr }
@Environment(\.theme) private var theme
@Binding var appear: Bool
diff --git a/Sources/Fluid/UI/SettingsView.swift b/Sources/Fluid/UI/SettingsView.swift
index 84edb084..ce8a0baa 100644
--- a/Sources/Fluid/UI/SettingsView.swift
+++ b/Sources/Fluid/UI/SettingsView.swift
@@ -10,7 +10,8 @@ import AVFoundation
import PromiseKit
struct SettingsView: View {
- @ObservedObject var asr: ASRService
+ @EnvironmentObject var appServices: AppServices
+ private var asr: ASRService { appServices.asr }
@Environment(\.theme) private var theme
@Binding var appear: Bool
@Binding var visualizerNoiseThreshold: Double
@@ -241,17 +242,6 @@ struct SettingsView: View {
.font(.subheadline.weight(.medium))
Spacer()
-
- if !hotkeyManagerInitialized && accessibilityEnabled {
- Button {
- DebugLogger.shared.debug("User requested app restart for accessibility changes", source: "SettingsView")
- restartApp()
- } label: {
- Label("Restart", systemImage: "arrow.clockwise.circle")
- }
- .buttonStyle(.bordered)
- .controlSize(.small)
- }
} else {
ProgressView()
.controlSize(.small)
@@ -342,7 +332,7 @@ struct SettingsView: View {
description: "The shortcut only records while you hold it down, giving you quick push-to-talk style control.",
isOn: $pressAndHoldModeEnabled
)
- .onChange(of: pressAndHoldModeEnabled) { newValue in
+ .onChange(of: pressAndHoldModeEnabled) { _, newValue in
SettingsStore.shared.pressAndHoldMode = newValue
hotkeyManager?.enablePressAndHoldMode(newValue)
}
@@ -354,7 +344,7 @@ struct SettingsView: View {
description: "Display transcription text in real-time in the overlay as you speak.",
isOn: $enableStreamingPreview
)
- .onChange(of: enableStreamingPreview) { newValue in
+ .onChange(of: enableStreamingPreview) { _, newValue in
SettingsStore.shared.enableStreamingPreview = newValue
}
@@ -365,7 +355,7 @@ struct SettingsView: View {
description: "Automatically copy transcribed text to clipboard as a backup.",
isOn: $copyToClipboard
)
- .onChange(of: copyToClipboard) { newValue in
+ .onChange(of: copyToClipboard) { _, newValue in
SettingsStore.shared.copyTranscriptionToClipboard = newValue
}
}
@@ -458,7 +448,7 @@ struct SettingsView: View {
}
.pickerStyle(.menu)
.frame(width: 240)
- .onChange(of: selectedInputUID) { newUID in
+ .onChange(of: selectedInputUID) { _, newUID in
SettingsStore.shared.preferredInputDeviceUID = newUID
_ = AudioDevice.setDefaultInputDevice(uid: newUID)
if asr.isRunning {
@@ -479,7 +469,7 @@ struct SettingsView: View {
}
.pickerStyle(.menu)
.frame(width: 240)
- .onChange(of: selectedOutputUID) { newUID in
+ .onChange(of: selectedOutputUID) { _, newUID in
SettingsStore.shared.preferredOutputDeviceUID = newUID
_ = AudioDevice.setDefaultOutputDevice(uid: newUID)
}
@@ -563,89 +553,6 @@ struct SettingsView: View {
}
.padding(16)
}
-
- // Transcription Engine Card
- ThemedCard(style: .standard) {
- VStack(alignment: .leading, spacing: 14) {
- Label("Transcription Engine", systemImage: "waveform.badge.mic")
- .font(.headline)
- .foregroundStyle(.primary)
-
- VStack(alignment: .leading, spacing: 12) {
- // Current provider info
- HStack(spacing: 8) {
- Circle()
- .fill(theme.palette.success)
- .frame(width: 8, height: 8)
- Text("Active: \(asr.activeProviderName)")
- .font(.subheadline)
- .foregroundStyle(.secondary)
-
- Spacer()
-
- // Only show architecture badge when NOT in Auto mode
- if SettingsStore.shared.selectedTranscriptionProvider != .auto {
- Text(CPUArchitecture.isAppleSilicon ? "Apple Silicon" : "Intel")
- .font(.caption)
- .padding(.horizontal, 8)
- .padding(.vertical, 4)
- .background(
- RoundedRectangle(cornerRadius: 5, style: .continuous)
- .fill(.quaternary)
- )
- }
- }
-
- // Provider picker
- HStack {
- VStack(alignment: .leading, spacing: 2) {
- Text("Engine")
- .font(.body)
- Text(SettingsStore.shared.selectedTranscriptionProvider.description)
- .font(.caption)
- .foregroundStyle(.secondary)
- }
-
- Spacer()
-
- Picker("", selection: Binding(
- get: { SettingsStore.shared.selectedTranscriptionProvider },
- set: { newValue in
- SettingsStore.shared.selectedTranscriptionProvider = newValue
- // Reset ASR to use new provider
- asr.resetTranscriptionProvider()
- }
- )) {
- ForEach(SettingsStore.TranscriptionProviderOption.allCases) { option in
- Text(option.displayName).tag(option)
- }
- }
- .pickerStyle(.menu)
- .frame(width: 240)
- }
-
- // Note for developers
- HStack(alignment: .top, spacing: 6) {
- Image(systemName: "info.circle.fill")
- .foregroundStyle(theme.palette.accent)
- .font(.caption)
- VStack(alignment: .leading, spacing: 2) {
- Text("For Development/Testing")
- .font(.caption.weight(.medium))
- Text("Use \"Whisper\" to test Intel Mac experience on Apple Silicon. FluidAudio provides best performance on M-series chips.")
- .font(.caption)
- .foregroundStyle(.secondary)
- }
- }
- .padding(10)
- .background(
- RoundedRectangle(cornerRadius: 8, style: .continuous)
- .fill(theme.palette.accent.opacity(0.1))
- )
- }
- }
- .padding(16)
- }
// Debug Settings Card
ThemedCard(style: .standard) {
@@ -679,13 +586,19 @@ struct SettingsView: View {
.padding(16)
}
.onAppear {
- refreshDevices()
- // CRITICAL FIX: Populate cached default device names after onAppear, not during view body evaluation.
- // This avoids the CoreAudio/SwiftUI AttributeGraph race condition that causes EXC_BAD_ACCESS.
- cachedDefaultInputName = AudioDevice.getDefaultInputDevice()?.name ?? ""
- cachedDefaultOutputName = AudioDevice.getDefaultOutputDevice()?.name ?? ""
+ Task { @MainActor in
+ // Ensure the shared audio startup gate is scheduled. Safe to call repeatedly.
+ await AudioStartupGate.shared.scheduleOpenAfterInitialUISettled()
+ await AudioStartupGate.shared.waitUntilOpen()
+
+ refreshDevices()
+ // CRITICAL FIX: Populate cached default device names after onAppear, not during view body evaluation.
+ // This avoids the CoreAudio/SwiftUI AttributeGraph race condition that causes EXC_BAD_ACCESS.
+ cachedDefaultInputName = AudioDevice.getDefaultInputDevice()?.name ?? ""
+ cachedDefaultOutputName = AudioDevice.getDefaultOutputDevice()?.name ?? ""
+ }
}
- .onChange(of: visualizerNoiseThreshold) { newValue in
+ .onChange(of: visualizerNoiseThreshold) { _, newValue in
SettingsStore.shared.visualizerNoiseThreshold = newValue
}
}
diff --git a/Sources/Fluid/UI/WelcomeView.swift b/Sources/Fluid/UI/WelcomeView.swift
index eca1ed43..c09c7bd0 100644
--- a/Sources/Fluid/UI/WelcomeView.swift
+++ b/Sources/Fluid/UI/WelcomeView.swift
@@ -10,7 +10,8 @@ import AppKit
import AVFoundation
struct WelcomeView: View {
- @ObservedObject var asr: ASRService
+ @EnvironmentObject var appServices: AppServices
+ private var asr: ASRService { appServices.asr }
@ObservedObject private var settings = SettingsStore.shared
@Binding var selectedSidebarItem: SidebarItem?
@Binding var playgroundUsed: Bool
@@ -60,16 +61,19 @@ struct WelcomeView: View {
VStack(alignment: .leading, spacing: 8) {
SetupStepView(
step: 1,
- title: asr.isAsrReady ? "Voice Model Ready" : "Download Voice Model",
+ // Consider model step complete if ready OR downloaded (even if not loaded)
+ title: (asr.isAsrReady || asr.modelsExistOnDisk) ? "Voice Model Ready" : "Download Voice Model",
description: asr.isAsrReady
? "Speech recognition model is loaded and ready"
- : "Download the AI model for offline voice transcription (~500MB)",
- status: asr.isAsrReady ? .completed : .pending,
+ : (asr.modelsExistOnDisk
+ ? "Model downloaded, will load when needed"
+ : "Download the AI model for offline voice transcription (~500MB)"),
+ status: (asr.isAsrReady || asr.modelsExistOnDisk) ? .completed : .pending,
action: {
selectedSidebarItem = .aiSettings
},
actionButtonTitle: "Go to AI Settings",
- showActionButton: !asr.isAsrReady
+ showActionButton: !(asr.isAsrReady || asr.modelsExistOnDisk)
)
SetupStepView(
@@ -382,7 +386,10 @@ struct WelcomeView: View {
// Text Area
VStack(alignment: .leading, spacing: 8) {
- TextEditor(text: $asr.finalText)
+ TextEditor(text: Binding(
+ get: { asr.finalText },
+ set: { asr.finalText = $0 }
+ ))
.font(.body)
.focused(isTranscriptionFocused)
.frame(height: 140)
@@ -457,6 +464,17 @@ struct WelcomeView: View {
}
.padding(16)
}
+ .onAppear {
+ // CRITICAL FIX: Refresh microphone and model status immediately on appear
+ // This prevents the Quick Setup from showing stale status before ASRService.initialize() runs
+ Task { @MainActor in
+ // Check microphone status without triggering the full initialize() delay
+ asr.micStatus = AVCaptureDevice.authorizationStatus(for: .audio)
+
+ // Check if models exist on disk
+ asr.checkIfModelsExist()
+ }
+ }
}
// MARK: - Helper Views
diff --git a/Sources/Fluid/Views/CommandModeView.swift b/Sources/Fluid/Views/CommandModeView.swift
index bd4af67d..7c047351 100644
--- a/Sources/Fluid/Views/CommandModeView.swift
+++ b/Sources/Fluid/Views/CommandModeView.swift
@@ -2,7 +2,8 @@ import SwiftUI
struct CommandModeView: View {
@ObservedObject var service: CommandModeService
- @ObservedObject var asr: ASRService
+ @EnvironmentObject var appServices: AppServices
+ private var asr: ASRService { appServices.asr }
@ObservedObject var settings = SettingsStore.shared
@EnvironmentObject var menuBarManager: MenuBarManager
var onClose: (() -> Void)?
@@ -50,12 +51,12 @@ struct CommandModeView: View {
// Re-enable notch output when leaving in-app UI
service.enableNotchOutput = true
}
- .onChange(of: asr.finalText) { newText in
+ .onChange(of: asr.finalText) { _, newText in
if !newText.isEmpty {
inputText = newText
}
}
- .onChange(of: settings.commandModeSelectedProviderID) { _ in
+ .onChange(of: settings.commandModeSelectedProviderID) { _, _ in
updateAvailableModels()
}
.onExitCommand {
@@ -295,16 +296,16 @@ struct CommandModeView: View {
}
.padding()
}
- .onChange(of: service.conversationHistory.count) { _ in
+ .onChange(of: service.conversationHistory.count) { _, _ in
scrollToBottom(proxy)
}
- .onChange(of: service.isProcessing) { isProcessing in
+ .onChange(of: service.isProcessing) { _, isProcessing in
// Scroll when processing starts, not on every streaming update
if isProcessing {
scrollToBottom(proxy)
}
}
- .onChange(of: service.currentStep) { _ in
+ .onChange(of: service.currentStep) { _, _ in
scrollToBottom(proxy)
}
// Removed: .onChange(of: service.streamingText) - causes scroll on every token, too expensive
@@ -453,7 +454,7 @@ struct CommandModeView: View {
}
}
.frame(width: 110)
- .onChange(of: settings.commandModeSelectedProviderID) { newValue in
+ .onChange(of: settings.commandModeSelectedProviderID) { _, newValue in
// Prevent selecting disabled Apple Intelligence
if newValue == "apple-intelligence-disabled" || newValue == "apple-intelligence" {
settings.commandModeSelectedProviderID = "openai"
diff --git a/Sources/Fluid/Views/NotchContentViews.swift b/Sources/Fluid/Views/NotchContentViews.swift
index 0d995b05..84ad25ff 100644
--- a/Sources/Fluid/Views/NotchContentViews.swift
+++ b/Sources/Fluid/Views/NotchContentViews.swift
@@ -347,12 +347,12 @@ struct NotchWaveformView: View {
.shadow(color: color.opacity(currentGlowIntensity * 0.5), radius: currentOuterGlowRadius, x: 0, y: 0)
}
}
- .onChange(of: data.audioLevel) { level in
+ .onChange(of: data.audioLevel) { _, level in
if !contentState.isProcessing {
updateBars(level: level)
}
}
- .onChange(of: contentState.isProcessing) { processing in
+ .onChange(of: contentState.isProcessing) { _, processing in
if processing {
setStaticProcessingBars()
startGlowAnimation()
@@ -752,13 +752,13 @@ struct NotchCommandOutputExpandedView: View {
// Always scroll to bottom when view appears
scrollToBottom(proxy, animated: false)
}
- .onChange(of: contentState.commandConversationHistory.count) { _ in
+ .onChange(of: contentState.commandConversationHistory.count) { _, _ in
scrollToBottom(proxy, animated: true)
}
- .onChange(of: contentState.commandStreamingText) { _ in
+ .onChange(of: contentState.commandStreamingText) { _, _ in
scrollToBottom(proxy, animated: true)
}
- .onChange(of: contentState.isCommandProcessing) { _ in
+ .onChange(of: contentState.isCommandProcessing) { _, _ in
// Scroll when processing state changes
scrollToBottom(proxy, animated: true)
}
@@ -922,7 +922,7 @@ struct ExpandedModeWaveformView: View {
.shadow(color: color.opacity(0.4), radius: 2, x: 0, y: 0)
}
}
- .onChange(of: contentState.expandedModeAudioLevel) { level in
+ .onChange(of: contentState.expandedModeAudioLevel) { _, level in
updateBars(level: level)
}
.onAppear {
diff --git a/Sources/Fluid/Views/RewriteModeView.swift b/Sources/Fluid/Views/RewriteModeView.swift
index 68f04b00..09246196 100644
--- a/Sources/Fluid/Views/RewriteModeView.swift
+++ b/Sources/Fluid/Views/RewriteModeView.swift
@@ -2,7 +2,8 @@ import SwiftUI
struct RewriteModeView: View {
@ObservedObject var service: RewriteModeService
- @ObservedObject var asr: ASRService
+ @EnvironmentObject var appServices: AppServices
+ private var asr: ASRService { appServices.asr }
@ObservedObject var settings = SettingsStore.shared
@EnvironmentObject var menuBarManager: MenuBarManager
var onClose: (() -> Void)?
@@ -163,7 +164,7 @@ struct RewriteModeView: View {
}
}
.frame(width: 110)
- .onChange(of: settings.rewriteModeSelectedProviderID) { newValue in
+ .onChange(of: settings.rewriteModeSelectedProviderID) { _, newValue in
// Prevent selecting disabled Apple Intelligence
if newValue == "apple-intelligence-disabled" {
settings.rewriteModeSelectedProviderID = "openai"
@@ -215,7 +216,7 @@ struct RewriteModeView: View {
.padding()
.background(Color(nsColor: .windowBackgroundColor))
}
- .onChange(of: asr.finalText) { newText in
+ .onChange(of: asr.finalText) { _, newText in
if !newText.isEmpty {
inputText = newText
}
diff --git a/Sources/Fluid/fluidApp.swift b/Sources/Fluid/fluidApp.swift
index beb779b8..bddd69f5 100644
--- a/Sources/Fluid/fluidApp.swift
+++ b/Sources/Fluid/fluidApp.swift
@@ -12,6 +12,7 @@ import ApplicationServices
@main
struct fluidApp: App {
@StateObject private var menuBarManager = MenuBarManager()
+ @StateObject private var appServices = AppServices.shared
@NSApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
@State private var theme = AppTheme.dark
@@ -19,6 +20,7 @@ struct fluidApp: App {
WindowGroup(id: "main") {
ContentView()
.environmentObject(menuBarManager)
+ .environmentObject(appServices)
.appTheme(theme)
.preferredColorScheme(.dark)
}