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
Add configurable cancel recording shortcut
altic-dev2d7f9907834e
diff --git a/Sources/Fluid/ContentView.swift b/Sources/Fluid/ContentView.swiftindex f0dac998..bb07c735 100644--- a/Sources/Fluid/ContentView.swift+++ b/Sources/Fluid/ContentView.swift@@ -79,6 +79,7 @@ struct ContentView: View {@State private var promptModeHotkeyShortcut: HotkeyShortcut = SettingsStore.shared.promptModeHotkeyShortcut@State private var commandModeHotkeyShortcut: HotkeyShortcut = SettingsStore.shared.commandModeHotkeyShortcut@State private var rewriteModeHotkeyShortcut: HotkeyShortcut = SettingsStore.shared.rewriteModeHotkeyShortcut+ @State private var cancelRecordingHotkeyShortcut: HotkeyShortcut = SettingsStore.shared.cancelRecordingHotkeyShortcut@State private var isPromptModeShortcutEnabled: Bool = SettingsStore.shared.promptModeShortcutEnabled@State private var isCommandModeShortcutEnabled: Bool = SettingsStore.shared.commandModeShortcutEnabled@State private var aiSettingsExpanded: Bool = true@@ -91,6 +92,7 @@ struct ContentView: View {@State private var isRecordingPromptModeShortcut = false@State private var isRecordingCommandModeShortcut = false@State private var isRecordingRewriteShortcut = false+ @State private var isRecordingCancelShortcut = false@State private var pendingModifierFlags: NSEvent.ModifierFlags = []@State private var pendingModifierKeyCode: UInt16?@State private var pendingModifierOnly = false@@ -365,61 +367,36 @@ struct ContentView: View {NSEvent.addLocalMonitorForEvents(matching: [.keyDown, .flagsChanged]) { event inlet eventModifiers = event.modifierFlags.intersection([.function, .command, .option, .control, .shift])- let shortcutModifiers = self.hotkeyShortcut.modifierFlags.intersection([.function, .command, .option, .control, .shift])-- let isRecordingAnyShortcut = self.isRecordingShortcut || self.isRecordingPromptModeShortcut || self.isRecordingCommandModeShortcut || self.isRecordingRewriteShortcut+ let isRecordingAnyShortcut = self.isRecordingShortcut ||+ self.isRecordingPromptModeShortcut ||+ self.isRecordingCommandModeShortcut ||+ self.isRecordingRewriteShortcut ||+ self.isRecordingCancelShortcutif event.type == .keyDown {- if event.keyCode == self.hotkeyShortcut.keyCode && eventModifiers == shortcutModifiers {+ if self.hotkeyShortcut.matches(keyCode: event.keyCode, modifiers: eventModifiers) {DebugLogger.shared.debug("NSEvent monitor: Global hotkey matched on keyDown, passing event through (GlobalHotkeyManager handles)", source: "ContentView")return event}guard isRecordingAnyShortcut else {- if event.keyCode == 53 {- // Escape pressed - handle cancellation- var handled = false-- // Close expanded command notch if visible (highest priority)- if NotchOverlayManager.shared.isCommandOutputExpanded {- DebugLogger.shared- .debug(- "NSEvent monitor: Escape pressed, closing expanded command notch",- source: "ContentView"- )- NotchOverlayManager.shared.hideExpandedCommandOutput()- handled = true- }-- if self.asr.isRunning {- DebugLogger.shared.debug("NSEvent monitor: Escape pressed, cancelling ASR recording", source: "ContentView")- Task { await self.asr.stopWithoutTranscription() }- handled = true- }-- // Close mode views if active- if self.selectedSidebarItem == .commandMode || self.selectedSidebarItem == .rewriteMode {- DebugLogger.shared.debug("NSEvent monitor: Escape pressed, closing mode view", source: "ContentView")- let isOnboarded = self.asr.isAsrReady || self.asr.modelsExistOnDisk- self.selectedSidebarItem = isOnboarded ? .preferences : .welcome- handled = true- }-- if handled {- return nil // Suppress beep- }+ if self.cancelRecordingHotkeyShortcut.matches(keyCode: event.keyCode, modifiers: eventModifiers),+ self.handleCancelShortcut()+ {+ return nil}self.resetPendingShortcutState()return event}let keyCode = event.keyCode- if keyCode == 53 {+ if keyCode == 53 && !self.isRecordingCancelShortcut {DebugLogger.shared.debug("NSEvent monitor: Escape pressed, cancelling shortcut recording", source: "ContentView")self.isRecordingShortcut = falseself.isRecordingPromptModeShortcut = falseself.isRecordingCommandModeShortcut = falseself.isRecordingRewriteShortcut = false+ self.isRecordingCancelShortcut = falseself.resetPendingShortcutState()return nil}@@ -433,6 +410,10 @@ struct ContentView: View {SettingsStore.shared.rewriteModeHotkeyShortcut = newShortcutself.hotkeyManager?.updateRewriteModeShortcut(newShortcut)self.isRecordingRewriteShortcut = false+ } else if self.isRecordingCancelShortcut {+ self.cancelRecordingHotkeyShortcut = newShortcut+ SettingsStore.shared.cancelRecordingHotkeyShortcut = newShortcut+ self.isRecordingCancelShortcut = false} else if self.isRecordingPromptModeShortcut {self.promptModeHotkeyShortcut = newShortcutSettingsStore.shared.promptModeHotkeyShortcut = newShortcut@@ -476,6 +457,10 @@ struct ContentView: View {SettingsStore.shared.rewriteModeHotkeyShortcut = newShortcutself.hotkeyManager?.updateRewriteModeShortcut(newShortcut)self.isRecordingRewriteShortcut = false+ } else if self.isRecordingCancelShortcut {+ self.cancelRecordingHotkeyShortcut = newShortcut+ SettingsStore.shared.cancelRecordingHotkeyShortcut = newShortcut+ self.isRecordingCancelShortcut = false} else if self.isRecordingPromptModeShortcut {self.promptModeHotkeyShortcut = newShortcutSettingsStore.shared.promptModeHotkeyShortcut = newShortcut@@ -1142,6 +1127,8 @@ struct ContentView: View {isRecordingCommandModeShortcut: self.$isRecordingCommandModeShortcut,rewriteShortcut: self.$rewriteModeHotkeyShortcut,isRecordingRewriteShortcut: self.$isRecordingRewriteShortcut,+ cancelRecordingShortcut: self.$cancelRecordingHotkeyShortcut,+ isRecordingCancelShortcut: self.$isRecordingCancelShortcut,commandModeShortcutEnabled: self.$isCommandModeShortcutEnabled,rewriteShortcutEnabled: self.$isRewriteModeShortcutEnabled,hotkeyManagerInitialized: self.$hotkeyManagerInitialized,@@ -2415,6 +2402,9 @@ struct ContentView: View {NotchContentState.shared.onOpenPreferencesRequested = {self.menuBarManager.openPreferencesFromUI()}+ NotchContentState.shared.onCancelRequested = {+ _ = self.handleCancelShortcut()+ }NotchContentState.shared.onPromptModeProfileChangeRequested = { profile inif let p = profile {self.promptModeOverrideText = SettingsStore.combineBasePrompt(@@ -2627,6 +2617,39 @@ struct ContentView: View {}}+ @discardableResult+ private func handleCancelShortcut() -> Bool {+ var handled = false++ if NotchOverlayManager.shared.isCommandOutputExpanded {+ DebugLogger.shared.debug("Cancel shortcut: closing expanded command notch", source: "ContentView")+ NotchOverlayManager.shared.hideExpandedCommandOutput()+ NotchOverlayManager.shared.onCommandOutputDismiss?()+ handled = true+ }++ if self.asr.isRunning {+ DebugLogger.shared.debug("Cancel shortcut: cancelling ASR recording", source: "ContentView")+ Task { await self.asr.stopWithoutTranscription() }+ handled = true+ }++ if NotchOverlayManager.shared.isBottomOverlayVisible || NotchOverlayManager.shared.isOverlayVisible {+ DebugLogger.shared.debug("Cancel shortcut: hiding recording overlay", source: "ContentView")+ NotchOverlayManager.shared.hide()+ handled = true+ }++ if self.selectedSidebarItem == .commandMode || self.selectedSidebarItem == .rewriteMode {+ DebugLogger.shared.debug("Cancel shortcut: closing mode view", source: "ContentView")+ let isOnboarded = self.asr.isAsrReady || self.asr.modelsExistOnDisk+ self.selectedSidebarItem = isOnboarded ? .preferences : .welcome+ handled = true+ }++ return handled+ }+// MARK: - Model Management Helpersprivate func isCustomModel(_ model: String) -> Bool {diff --git a/Sources/Fluid/Models/HotkeyShortcut.swift b/Sources/Fluid/Models/HotkeyShortcut.swiftindex 861968a9..92130f9d 100644--- a/Sources/Fluid/Models/HotkeyShortcut.swift+++ b/Sources/Fluid/Models/HotkeyShortcut.swift@@ -99,6 +99,16 @@ struct HotkeyShortcut: Codable, Equatable {}extension HotkeyShortcut {+ private static let relevantModifierMask: NSEvent.ModifierFlags = [.function, .command, .option, .control, .shift]++ var relevantModifierFlags: NSEvent.ModifierFlags {+ self.modifierFlags.intersection(Self.relevantModifierMask)+ }++ func matches(keyCode: UInt16, modifiers: NSEvent.ModifierFlags) -> Bool {+ keyCode == self.keyCode && modifiers.intersection(Self.relevantModifierMask) == self.relevantModifierFlags+ }+init(from decoder: Decoder) throws {let c = try decoder.container(keyedBy: CodingKeys.self)self.keyCode = try c.decode(UInt16.self, forKey: .keyCode)diff --git a/Sources/Fluid/Persistence/SettingsStore.swift b/Sources/Fluid/Persistence/SettingsStore.swiftindex 9ae6a400..441f4ba2 100644--- a/Sources/Fluid/Persistence/SettingsStore.swift+++ b/Sources/Fluid/Persistence/SettingsStore.swift@@ -1721,6 +1721,23 @@ final class SettingsStore: ObservableObject {}}+ var cancelRecordingHotkeyShortcut: HotkeyShortcut {+ get {+ if let data = defaults.data(forKey: Keys.cancelRecordingHotkeyShortcut),+ let shortcut = try? JSONDecoder().decode(HotkeyShortcut.self, from: data)+ {+ return shortcut+ }+ return HotkeyShortcut(keyCode: 53, modifierFlags: [])+ }+ set {+ objectWillChange.send()+ if let data = try? JSONEncoder().encode(newValue) {+ self.defaults.set(data, forKey: Keys.cancelRecordingHotkeyShortcut)+ }+ }+ }+var commandModeConfirmBeforeExecute: Bool {get {// Default to true (safer - ask before running commands)@@ -3226,6 +3243,7 @@ private extension SettingsStore {static let commandModeSelectedProviderID = "CommandModeSelectedProviderID"static let commandModeHotkeyShortcut = "CommandModeHotkeyShortcut"static let commandModeConfirmBeforeExecute = "CommandModeConfirmBeforeExecute"+ static let cancelRecordingHotkeyShortcut = "CancelRecordingHotkeyShortcut"static let commandModeLinkedToGlobal = "CommandModeLinkedToGlobal"static let commandModeShortcutEnabled = "CommandModeShortcutEnabled"diff --git a/Sources/Fluid/Services/GlobalHotkeyManager.swift b/Sources/Fluid/Services/GlobalHotkeyManager.swiftindex dc17af3f..d64277ca 100644--- a/Sources/Fluid/Services/GlobalHotkeyManager.swift+++ b/Sources/Fluid/Services/GlobalHotkeyManager.swift@@ -382,12 +382,12 @@ final class GlobalHotkeyManager: NSObject {await PostTranscriptionEditTracker.shared.handleKeyDown(keyCode: keyCode, modifiers: eventModifiers)}- // Check Escape key first (keyCode 53) - cancels recording and closes mode views- if keyCode == 53, eventModifiers.isEmpty {+ // Check the configured cancel shortcut first.+ if SettingsStore.shared.cancelRecordingHotkeyShortcut.matches(keyCode: keyCode, modifiers: eventModifiers) {var handled = falseif self.asrService.isRunning {- DebugLogger.shared.info("Escape pressed - cancelling recording", source: "GlobalHotkeyManager")+ DebugLogger.shared.info("Cancel shortcut pressed - cancelling recording", source: "GlobalHotkeyManager")Task { @MainActor inawait self.asrService.stopWithoutTranscription()}@@ -396,7 +396,7 @@ final class GlobalHotkeyManager: NSObject {// Trigger cancel callback to close mode views / reset stateif let callback = cancelCallback, callback() {- DebugLogger.shared.info("Escape pressed - cancel callback handled", source: "GlobalHotkeyManager")+ DebugLogger.shared.info("Cancel shortcut pressed - cancel callback handled", source: "GlobalHotkeyManager")handled = true}diff --git a/Sources/Fluid/Services/NotchOverlayManager.swift b/Sources/Fluid/Services/NotchOverlayManager.swiftindex 68dabe99..939cf5f1 100644--- a/Sources/Fluid/Services/NotchOverlayManager.swift+++ b/Sources/Fluid/Services/NotchOverlayManager.swift@@ -54,6 +54,7 @@ final class NotchOverlayManager {/// Track if bottom overlay is visibleprivate(set) var isBottomOverlayVisible: Bool = false+ var isOverlayVisible: Bool { self.state == .visible }// Callbacks for command output interactionvar onCommandOutputDismiss: (() -> Void)?@@ -73,7 +74,7 @@ final class NotchOverlayManager {/// Track pending retry task for cancellationprivate var pendingRetryTask: Task<Void, Never>?- // Escape key monitors for dismissing notch+ // Cancel shortcut monitors for dismissing notch / overlayprivate var globalEscapeMonitor: Any?private var localEscapeMonitor: Any?@@ -90,38 +91,25 @@ final class NotchOverlayManager {}}- /// Setup escape key monitors - both global (other apps) and local (our app)+ /// Setup cancel shortcut monitors - both global (other apps) and local (our app)private func setupEscapeKeyMonitors() {let escapeHandler: (NSEvent) -> NSEvent? = { [weak self] event in- guard event.keyCode == 53 else { return event } // Escape key+ guard SettingsStore.shared.cancelRecordingHotkeyShortcut.matches(+ keyCode: event.keyCode,+ modifiers: event.modifierFlags+ ) else { return event }Task { @MainActor in- guard let self = self else { return }-- // If expanded command output is showing, hide it- if self.isCommandOutputExpanded {- self.hideExpandedCommandOutput()- self.onCommandOutputDismiss?()- }- // Hide bottom overlay if visible- else if self.isBottomOverlayVisible {- self.hide()- }- // Hide regular notch if visible- else if self.state == .visible {- self.hide()- }+ guard self != nil else { return }+ NotchContentState.shared.onCancelRequested?()}return nil // Consume the event}- // Global monitor - catches escape when OTHER apps have focus+ // Global monitor - catches the cancel shortcut when OTHER apps have focusself.globalEscapeMonitor = NSEvent.addGlobalMonitorForEvents(matching: .keyDown) { event in_ = escapeHandler(event)}-- // Local monitor - catches escape when OUR app/notch has focus- self.localEscapeMonitor = NSEvent.addLocalMonitorForEvents(matching: .keyDown, handler: escapeHandler)}func show(audioLevelPublisher: AnyPublisher<CGFloat, Never>, mode: OverlayMode) {diff --git a/Sources/Fluid/UI/SettingsView.swift b/Sources/Fluid/UI/SettingsView.swiftindex 5bed0e57..752b8cfb 100644--- a/Sources/Fluid/UI/SettingsView.swift+++ b/Sources/Fluid/UI/SettingsView.swift@@ -33,6 +33,8 @@ struct SettingsView: View {@Binding var isRecordingCommandModeShortcut: Bool@Binding var rewriteShortcut: HotkeyShortcut@Binding var isRecordingRewriteShortcut: Bool+ @Binding var cancelRecordingShortcut: HotkeyShortcut+ @Binding var isRecordingCancelShortcut: Bool@Binding var commandModeShortcutEnabled: Bool@Binding var rewriteShortcutEnabled: Bool@Binding var hotkeyManagerInitialized: Bool@@ -520,7 +522,7 @@ struct SettingsView: View {Spacer()if self.accessibilityEnabled {- if self.isRecordingShortcut || self.isRecordingCommandModeShortcut || self.isRecordingRewriteShortcut {+ if self.isRecordingShortcut || self.isRecordingCommandModeShortcut || self.isRecordingRewriteShortcut || self.isRecordingCancelShortcut {Text("Recording…").font(.caption.weight(.semibold)).foregroundStyle(.orange)@@ -543,7 +545,7 @@ struct SettingsView: View {if self.accessibilityEnabled {VStack(alignment: .leading, spacing: 12) {- if self.isRecordingShortcut || self.isRecordingCommandModeShortcut || self.isRecordingRewriteShortcut {+ if self.isRecordingShortcut || self.isRecordingCommandModeShortcut || self.isRecordingRewriteShortcut || self.isRecordingCancelShortcut {HStack(spacing: 8) {Image(systemName: "hand.point.up.left.fill").foregroundStyle(.orange)@@ -659,6 +661,20 @@ struct SettingsView: View {self.isRecordingRewriteShortcut = true})+ Divider().opacity(0.2).padding(.vertical, 4)++ self.shortcutRow(+ icon: "xmark.circle.fill",+ iconColor: .secondary,+ title: "Cancel Recording",+ description: "Cancel the current recording or dismiss the active recording overlay",+ shortcut: self.cancelRecordingShortcut,+ isRecording: self.isRecordingCancelShortcut,+ onChangePressed: {+ DebugLogger.shared.debug("Starting to record new cancel shortcut", source: "SettingsView")+ self.isRecordingCancelShortcut = true+ }+ )}.padding(12).background(diff --git a/Sources/Fluid/Views/NotchContentViews.swift b/Sources/Fluid/Views/NotchContentViews.swiftindex 0a14b847..bba198f1 100644--- a/Sources/Fluid/Views/NotchContentViews.swift+++ b/Sources/Fluid/Views/NotchContentViews.swift@@ -143,6 +143,8 @@ class NotchContentState: ObservableObject {var onUndoLastAIRequested: (() -> Void)?/// Called when the user requests opening Preferences.var onOpenPreferencesRequested: (() -> Void)?+ /// Called when the user requests cancelling the current recording or overlay session.+ var onCancelRequested: (() -> Void)?/// Set recording state (for waveform visibility in expanded view)func setRecordingInExpandedMode(_ recording: Bool) {