Merge pull request #334 from altic-dev/B/hotkey-activation-modes

Add hotkey activation modes

Author: altic-dev

Sources/Fluid/Analytics/AnalyticsService.swift

@@ -89,6 +89,7 @@ final class AnalyticsService {
             "ai_processing_enabled": anyDictationShortcutUsesAI,
             "streaming_preview_enabled": settings.enableStreamingPreview,
             "press_and_hold_mode": settings.pressAndHoldMode,
+            "hotkey_activation_mode": settings.hotkeyMode.rawValue,
             "copy_to_clipboard_enabled": settings.copyTranscriptionToClipboard,
         ]
 

Sources/Fluid/ContentView.swift

@@ -169,7 +169,7 @@ struct ContentView: View {
     @State private var openAIBaseURL: String = ModelRepository.shared.defaultBaseURL(for: "openai")
 
     @State private var enableDebugLogs: Bool = SettingsStore.shared.enableDebugLogs
-    @State private var pressAndHoldModeEnabled: Bool = SettingsStore.shared.pressAndHoldMode
+    @State private var hotkeyMode: HotkeyActivationMode = SettingsStore.shared.hotkeyMode
     @State private var enableStreamingPreview: Bool = SettingsStore.shared.enableStreamingPreview
     @State private var copyToClipboard: Bool = SettingsStore.shared.copyTranscriptionToClipboard
 
@@ -1258,7 +1258,7 @@ struct ContentView: View {
             commandModeShortcutEnabled: self.$isCommandModeShortcutEnabled,
             rewriteShortcutEnabled: self.$isRewriteModeShortcutEnabled,
             hotkeyManagerInitialized: self.$hotkeyManagerInitialized,
-            pressAndHoldModeEnabled: self.$pressAndHoldModeEnabled,
+            hotkeyMode: self.$hotkeyMode,
             enableStreamingPreview: self.$enableStreamingPreview,
             copyToClipboard: self.$copyToClipboard,
             hotkeyManager: self.hotkeyManager,
@@ -1561,9 +1561,9 @@ struct ContentView: View {
             derivedBaseURL = ModelRepository.shared.defaultBaseURL(for: currentSelectedProviderID)
             derivedSelectedModel = storedSelectedModelByProvider[currentSelectedProviderID] ?? ModelRepository.shared.defaultModels(for: currentSelectedProviderID).first ?? ""
         } else {
-            // Unknown provider - fallback to OpenAI
+            // Unknown provider - fail closed instead of silently sending to OpenAI.
             derivedCurrentProvider = currentSelectedProviderID
-            derivedBaseURL = ModelRepository.shared.defaultBaseURL(for: "openai")
+            derivedBaseURL = ""
             derivedSelectedModel = storedSelectedModelByProvider[currentSelectedProviderID] ?? ""
         }
 
@@ -2683,7 +2683,7 @@ struct ContentView: View {
 
         self.hotkeyManagerInitialized = self.hotkeyManager?.validateEventTapHealth() ?? false
 
-        self.hotkeyManager?.enablePressAndHoldMode(self.pressAndHoldModeEnabled)
+        self.hotkeyManager?.setHotkeyMode(self.hotkeyMode)
 
         // Set cancel callback for Escape key handling (closes mode views, resets recording state)
         // Returns true if it handled something (so GlobalHotkeyManager knows to consume the event)
@@ -3128,7 +3128,7 @@ private extension ContentView {
         self.selectedInputUID = AudioDevice.getDefaultInputDevice()?.uid ?? ""
         self.selectedOutputUID = SettingsStore.shared.preferredOutputDeviceUID ?? ""
         self.enableDebugLogs = SettingsStore.shared.enableDebugLogs
-        self.pressAndHoldModeEnabled = SettingsStore.shared.pressAndHoldMode
+        self.hotkeyMode = SettingsStore.shared.hotkeyMode
         self.enableStreamingPreview = SettingsStore.shared.enableStreamingPreview
         self.copyToClipboard = SettingsStore.shared.copyTranscriptionToClipboard
         self.launchAtStartup = SettingsStore.shared.launchAtStartup

Sources/Fluid/Persistence/BackupService.swift

@@ -42,6 +42,7 @@ struct SettingsBackupPayload: Codable, Equatable {
     let enableDebugLogs: Bool
     let shareAnonymousAnalytics: Bool
     let pressAndHoldMode: Bool
+    let hotkeyMode: HotkeyActivationMode?
     let enableStreamingPreview: Bool
     let enableAIStreaming: Bool
     let copyTranscriptionToClipboard: Bool

Sources/Fluid/Persistence/HotkeyActivationMode.swift

@@ -0,0 +1,23 @@
+import Foundation
+
+enum HotkeyActivationMode: String, Codable, CaseIterable, Identifiable {
+    case toggle, hold, automatic
+
+    var id: String { self.rawValue }
+
+    var displayName: String {
+        switch self {
+        case .toggle: return "Toggle"
+        case .hold: return "Hold"
+        case .automatic: return "Automatic (Both)"
+        }
+    }
+
+    var description: String {
+        switch self {
+        case .toggle: return "Tap once to start, tap again to stop."
+        case .hold: return "Record only while the shortcut is held."
+        case .automatic: return "Tap to toggle, hold for push-to-talk."
+        }
+    }
+}

Sources/Fluid/Persistence/SettingsStore.swift

@@ -1275,9 +1275,11 @@ final class SettingsStore: ObservableObject {
         }
     }
 
-    var pressAndHoldMode: Bool {
-        get { self.defaults.bool(forKey: Keys.pressAndHoldMode) }
-        set { self.defaults.set(newValue, forKey: Keys.pressAndHoldMode) }
+    var pressAndHoldMode: Bool { get { self.defaults.object(forKey: Keys.hotkeyMode) != nil ? self.hotkeyMode == .hold : self.defaults.bool(forKey: Keys.pressAndHoldMode) } set { self.hotkeyMode = newValue ? .hold : .toggle } }
+
+    var hotkeyMode: HotkeyActivationMode {
+        get { self.defaults.string(forKey: Keys.hotkeyMode).flatMap(HotkeyActivationMode.init(rawValue:)) ?? (self.defaults.bool(forKey: Keys.pressAndHoldMode) ? .hold : .toggle) }
+        set { objectWillChange.send(); self.defaults.set(newValue.rawValue, forKey: Keys.hotkeyMode); self.defaults.set(newValue == .hold, forKey: Keys.pressAndHoldMode) }
     }
 
     var enableStreamingPreview: Bool {
@@ -2262,6 +2264,7 @@ final class SettingsStore: ObservableObject {
             enableDebugLogs: self.enableDebugLogs,
             shareAnonymousAnalytics: self.shareAnonymousAnalytics,
             pressAndHoldMode: self.pressAndHoldMode,
+            hotkeyMode: self.hotkeyMode,
             enableStreamingPreview: self.enableStreamingPreview,
             enableAIStreaming: self.enableAIStreaming,
             copyTranscriptionToClipboard: self.copyTranscriptionToClipboard,
@@ -2333,7 +2336,7 @@ final class SettingsStore: ObservableObject {
         self.betaReleasesEnabled = payload.betaReleasesEnabled
         self.enableDebugLogs = payload.enableDebugLogs
         self.shareAnonymousAnalytics = payload.shareAnonymousAnalytics
-        self.pressAndHoldMode = payload.pressAndHoldMode
+        self.hotkeyMode = payload.hotkeyMode ?? (payload.pressAndHoldMode ? .hold : .toggle)
         self.enableStreamingPreview = payload.enableStreamingPreview
         self.enableAIStreaming = payload.enableAIStreaming
         self.copyTranscriptionToClipboard = payload.copyTranscriptionToClipboard
@@ -3618,6 +3621,7 @@ private extension SettingsStore {
         static let transcriptionSoundVolume = "TranscriptionSoundVolume"
         static let transcriptionSoundIndependentVolume = "TranscriptionSoundIndependentVolume"
         static let pressAndHoldMode = "PressAndHoldMode"
+        static let hotkeyMode = "HotkeyMode"
         static let enableStreamingPreview = "EnableStreamingPreview"
         static let enableAIStreaming = "EnableAIStreaming"
         static let copyTranscriptionToClipboard = "CopyTranscriptionToClipboard"

Sources/Fluid/Services/CommandModeService.swift

@@ -486,6 +486,7 @@ final class CommandModeService: ObservableObject {
 
         } catch {
             let errorMsg = "Error: \(error.localizedDescription)"
+            DebugLogger.shared.error("Command mode failed: \(error.localizedDescription)", source: "CommandModeService")
             self.conversationHistory.append(Message(
                 role: .assistant,
                 content: errorMsg,
@@ -717,7 +718,7 @@ final class CommandModeService: ObservableObject {
         } else if ModelRepository.shared.isBuiltIn(providerID) {
             baseURL = ModelRepository.shared.defaultBaseURL(for: providerID)
         } else {
-            baseURL = ModelRepository.shared.defaultBaseURL(for: "openai")
+            baseURL = ""
         }
 
         // Build conversation with agentic system prompt

Sources/Fluid/Services/DictationAIPostProcessingGate.swift

@@ -50,8 +50,8 @@ enum DictationAIPostProcessingGate {
         if ModelRepository.shared.isBuiltIn(providerID) {
             return ModelRepository.shared.defaultBaseURL(for: providerID)
         }
-        // Unknown provider - fallback to OpenAI
-        return ModelRepository.shared.defaultBaseURL(for: "openai")
+        // Unknown provider: fail closed instead of silently treating it as OpenAI.
+        return ""
     }
 
     static func providerKey(for providerID: String) -> String {