Skip to content

Fix recording shortcuts dropping out during Secure Input #965

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
levi wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix recording shortcuts dropping out during Secure Input #965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99cd9a5
Keep recording hotkeys working during Secure Input
levi Sep 11, 2026
222b8a1
Handle hotkey ownership conflicts and interrupted automatic presses
levi Sep 11, 2026
d2f755d
Recover held hotkeys across sleep and session transitions
levi Sep 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Fluid.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
7C5AF14C2F15041600DE21B0 /* MediaRemoteAdapter in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 7C5AF14A2F15041600DE21B0 /* MediaRemoteAdapter */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
7C9A71022F58B00000FB7CAF /* TranscribeCpp in Frameworks */ = {isa = PBXBuildFile; productRef = 7C9A71012F58B00000FB7CAF /* TranscribeCpp */; };
7C91B0012F42AA0100C0DEF0 /* HotkeyShortcutTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C91B0022F42AA0100C0DEF0 /* HotkeyShortcutTests.swift */; };
A872F1000000000000000001 /* RegisteredHotkeysTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A872F1000000000000000002 /* RegisteredHotkeysTests.swift */; };
C0DE89000000000000000002 /* SettingsNavigationStateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0DE89000000000000000001 /* SettingsNavigationStateTests.swift */; };
7CDB0A2D2F3C4D5600FB7CAD /* DictationE2ETests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CDB0A292F3C4D5600FB7CAD /* DictationE2ETests.swift */; };
B52000000000000000000002 /* PrivateAIDictationTokenBudgetTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B52000000000000000000001 /* PrivateAIDictationTokenBudgetTests.swift */; };
Expand Down Expand Up @@ -80,6 +81,7 @@
CACEC0010000000000000001 /* KeychainServiceCacheTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeychainServiceCacheTests.swift; sourceTree = "<group>"; };
7C078D8F2E3B339200FB7CAC /* FluidVoice Debug.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "FluidVoice Debug.app"; sourceTree = BUILT_PRODUCTS_DIR; };
7C91B0022F42AA0100C0DEF0 /* HotkeyShortcutTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HotkeyShortcutTests.swift; sourceTree = "<group>"; };
A872F1000000000000000002 /* RegisteredHotkeysTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegisteredHotkeysTests.swift; sourceTree = "<group>"; };
C0DE89000000000000000001 /* SettingsNavigationStateTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsNavigationStateTests.swift; sourceTree = "<group>"; };
7CDB0A202F3C4D5600FB7CAD /* FluidDictationIntegrationTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FluidDictationIntegrationTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
7CDB0A292F3C4D5600FB7CAD /* DictationE2ETests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DictationE2ETests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -159,6 +161,7 @@
7CDB0A292F3C4D5600FB7CAD /* DictationE2ETests.swift */,
CD1C7A0000000000000000B1 /* CustomDictionaryManualEntryTests.swift */,
7C91B0022F42AA0100C0DEF0 /* HotkeyShortcutTests.swift */,
A872F1000000000000000002 /* RegisteredHotkeysTests.swift */,
C0DE89000000000000000001 /* SettingsNavigationStateTests.swift */,
343B29013F4441D6A797D12D /* LLMClientRequestBodyTests.swift */,
980330F3CE464336ADCE3E23 /* TemperatureSupportTests.swift */,
Expand Down Expand Up @@ -336,6 +339,7 @@
B52000000000000000000002 /* PrivateAIDictationTokenBudgetTests.swift in Sources */,
CD1C7A0000000000000000B2 /* CustomDictionaryManualEntryTests.swift in Sources */,
7C91B0012F42AA0100C0DEF0 /* HotkeyShortcutTests.swift in Sources */,
A872F1000000000000000001 /* RegisteredHotkeysTests.swift in Sources */,
C0DE89000000000000000002 /* SettingsNavigationStateTests.swift in Sources */,
86CAA2D4EF18433096185602 /* LLMClientRequestBodyTests.swift in Sources */,
272BFB5CB271489892CAE50C /* TemperatureSupportTests.swift in Sources */,
Expand Down
2 changes: 1 addition & 1 deletion Sources/Fluid/ContentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ struct ContentView: View {
SettingsStore.shared.selectedProviderID = newValue
}
.onChange(of: self.activeShortcutRecordingTarget) { _, _ in
self.hotkeyManager?.resetModifierOnlyShortcutTracking()
self.hotkeyManager?.shortcutCaptureDidChange()
}
.onChange(of: self.commandModeHotkeyShortcut) { _, newValue in
SettingsStore.shared.commandModeHotkeyShortcut = newValue
Expand Down
126 changes: 112 additions & 14 deletions Sources/Fluid/Services/GlobalHotkeyManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import AppKit
import Carbon
import Foundation

nonisolated enum HotkeyHoldModeType: Hashable {
Expand Down Expand Up @@ -444,8 +445,10 @@ final class GlobalHotkeyManager: NSObject {
}
}

private func clearAutomaticPressTracking() {
self.cancelPendingReleaseStops()
private func clearAutomaticPressTracking(cancelPendingStops: Bool = true) {
if cancelPendingStops {
self.cancelPendingReleaseStops()
}
self.state.withLock {
self.state.holdModeStartTriggeredTypes.removeAll()
self.state.automaticPressStartTimes.removeAll()
Expand All @@ -464,6 +467,20 @@ final class GlobalHotkeyManager: NSObject {
private var retryDelay: TimeInterval = 0.5
private var healthCheckInterval: TimeInterval = 30.0
private var activeShortcutLogScheduled = false
private var secureInputWasEnabled: Bool?
private lazy var registeredHotkeys: RegisteredHotkeys = {
let hotkeys = RegisteredHotkeys(driver: CarbonHotkeyDriver())
hotkeys.onEvent = { [weak self] shortcut, down in
self?.handleRegisteredHotkey(shortcut, down: down)
}
hotkeys.onFailure = { shortcut, status in
DebugLogger.shared.warning(
"System hotkey registration failed for \(shortcut.displayString) (OSStatus \(status)); using event tap, which may be blocked by Secure Input",
source: "GlobalHotkeyManager"
)
}
return hotkeys
}()

init(
asrService: ASRService,
Expand Down Expand Up @@ -539,6 +556,7 @@ final class GlobalHotkeyManager: NSObject {
}

func updatePrimaryShortcuts(_ newShortcuts: [HotkeyShortcut]) {
self.registeredHotkeys.releaseAll()
self.primaryShortcuts = newShortcuts
DebugLogger.shared.info("Updated transcription hotkeys", source: "GlobalHotkeyManager")
self.refreshMouseShortcutTapIfNeeded()
Expand All @@ -553,6 +571,7 @@ final class GlobalHotkeyManager: NSObject {
}

func updateCommandModeShortcut(_ newShortcut: HotkeyShortcut?) {
self.registeredHotkeys.releaseAll()
self.commandModeShortcut = newShortcut
DebugLogger.shared.info("Updated command mode hotkey", source: "GlobalHotkeyManager")
self.scheduleActiveShortcutLog(reason: "shortcuts updated")
Expand All @@ -563,12 +582,14 @@ final class GlobalHotkeyManager: NSObject {
}

func updateRewriteModeShortcut(_ newShortcut: HotkeyShortcut) {
self.registeredHotkeys.releaseAll()
self.rewriteModeShortcut = newShortcut
DebugLogger.shared.info("Updated rewrite mode hotkey", source: "GlobalHotkeyManager")
self.scheduleActiveShortcutLog(reason: "shortcuts updated")
}

func updateCommandModeShortcutEnabled(_ enabled: Bool) {
self.registeredHotkeys.releaseAll()
self.commandModeShortcutEnabled = enabled
if !enabled {
self.isCommandModeKeyPressed = false
Expand All @@ -581,6 +602,7 @@ final class GlobalHotkeyManager: NSObject {
}

func updateRewriteModeShortcutEnabled(_ enabled: Bool) {
self.registeredHotkeys.releaseAll()
self.rewriteModeShortcutEnabled = enabled
if !enabled {
self.isRewriteKeyPressed = false
Expand All @@ -597,12 +619,14 @@ final class GlobalHotkeyManager: NSObject {
}

func updatePromptModeShortcut(_ newShortcut: HotkeyShortcut) {
self.registeredHotkeys.releaseAll()
self.promptModeShortcut = newShortcut
DebugLogger.shared.info("Updated prompt mode hotkey", source: "GlobalHotkeyManager")
self.scheduleActiveShortcutLog(reason: "shortcuts updated")
}

func updatePromptModeShortcutEnabled(_ enabled: Bool) {
self.registeredHotkeys.releaseAll()
self.promptModeShortcutEnabled = enabled
if !enabled {
self.isPromptModeKeyPressed = false
Expand All @@ -615,6 +639,7 @@ final class GlobalHotkeyManager: NSObject {
}

func updatePromptShortcutAssignments(_ assignments: [(selection: SettingsStore.DictationPromptSelection, shortcut: HotkeyShortcut)]) {
self.registeredHotkeys.releaseAll()
self.promptShortcutAssignments = assignments
DebugLogger.shared.info("Updated prompt shortcut assignments", source: "GlobalHotkeyManager")
self.scheduleActiveShortcutLog(reason: "shortcuts updated")
Expand Down Expand Up @@ -656,8 +681,10 @@ final class GlobalHotkeyManager: NSObject {

@discardableResult
private func setupGlobalHotkey() -> Bool {
self.refreshRegisteredHotkeys()
self.logSecureInputState()
self.finishInterruptedMouseShortcutPress(reason: "hotkey tap reinitialized")
self.cleanupEventTap()
self.cleanupEventTap(preserveRegisteredPress: self.registeredHotkeys.hasPressedShortcut)

if !AXIsProcessTrusted() {
DebugLogger.shared.debug("Accessibility permissions not granted", source: "GlobalHotkeyManager")
Expand All @@ -669,11 +696,11 @@ final class GlobalHotkeyManager: NSObject {
place: .headInsertEventTap,
options: .defaultTap,
eventsOfInterest: Self.keyboardEventMask(),
callback: { proxy, type, event, refcon -> Unmanaged<CGEvent>? in
callback: { _, type, event, refcon -> Unmanaged<CGEvent>? in
guard let refcon = refcon else { return Unmanaged.passUnretained(event) }
let manager = Unmanaged<GlobalHotkeyManager>.fromOpaque(refcon)
.takeUnretainedValue()
return manager.handleKeyEvent(proxy: proxy, type: type, event: event)
return manager.handleKeyEvent(type: type, event: event)
},
userInfo: Unmanaged.passUnretained(self).toOpaque()
)
Expand Down Expand Up @@ -704,11 +731,13 @@ final class GlobalHotkeyManager: NSObject {
return true
}

private nonisolated func cleanupEventTap() {
private nonisolated func cleanupEventTap(preserveRegisteredPress: Bool = false) {
Self.tearDown(tap: self.eventTap, source: self.runLoopSource)
self.eventTap = nil
self.runLoopSource = nil
self.clearPrimaryShortcutPressState()
if !preserveRegisteredPress {
self.clearPrimaryShortcutPressState()
}
self.cleanupMouseTaps()
}

Expand Down Expand Up @@ -795,6 +824,7 @@ final class GlobalHotkeyManager: NSObject {
Task { @MainActor [weak self] in
guard let self else { return }
self.activeShortcutLogScheduled = false
self.refreshRegisteredHotkeys()
self.logActiveShortcuts(reason: reason)
}
}
Expand Down Expand Up @@ -1143,7 +1173,7 @@ final class GlobalHotkeyManager: NSObject {
)
}

private func handleKeyEvent(proxy: CGEventTapProxy, type: CGEventType, event: CGEvent) -> Unmanaged<CGEvent>? {
private func handleKeyEvent(type: CGEventType, event: CGEvent, registered: Bool = false) -> Unmanaged<CGEvent>? {
if let tapRecoveryResult = self.handleTapDisableEvent(type: type, event: event) {
return tapRecoveryResult
}
Expand All @@ -1152,14 +1182,26 @@ final class GlobalHotkeyManager: NSObject {
return Unmanaged.passUnretained(event)
}

if self.isShortcutCaptureActiveProvider?() ?? false {
if self.isShortcutCaptureActiveProvider?() ?? false, !(registered && type == .keyUp) {
self.resetModifierOnlyShortcutTracking()
return Unmanaged.passUnretained(event)
}

let keyCode = UInt16(event.getIntegerValueField(.keyboardEventKeycode))
let eventModifiers = Self.modifierFlags(from: event.flags)

if !registered, type == .keyDown || type == .keyUp,
self.registeredHotkeys.shouldBypassEventTap(
keyCode: keyCode, modifiers: eventModifiers, down: type == .keyDown
)
{
if type == .keyDown {
self.markOtherInputDuringModifierOnly()
}
// Carbon must receive this event; consuming it here defeats registration.
return Unmanaged.passUnretained(event)
}

switch type {
case .keyDown:
self.markOtherInputDuringModifierOnly()
Expand Down Expand Up @@ -1534,7 +1576,9 @@ final class GlobalHotkeyManager: NSObject {

let reason = (type == .tapDisabledByTimeout) ? "timeout" : "user input"
DebugLogger.shared.warning("Event tap disabled by \(reason) — attempting immediate re-enable", source: "GlobalHotkeyManager")
self.resetModifierOnlyShortcutTracking(reason: .tapDisabled)
if !self.registeredHotkeys.hasPressedShortcut {
self.resetModifierOnlyShortcutTracking(reason: .tapDisabled)
}

if let tap = self.eventTap {
CGEvent.tapEnable(tap: tap, enable: true)
Expand Down Expand Up @@ -1608,7 +1652,7 @@ final class GlobalHotkeyManager: NSObject {
let press = self.finishAutomaticPress(for: type)
let duration = String(format: "%.2f", press.duration)

if press.duration < self.automaticTapThresholdSeconds {
if !self.registeredHotkeys.isInterruptingPress, press.duration < self.automaticTapThresholdSeconds {
if press.wasTargetActive {
DebugLogger.shared.info("\(label) tap (\(duration)s) - stopping", source: "GlobalHotkeyManager")
self.stopRecordingIfNeeded()
Expand Down Expand Up @@ -1874,7 +1918,10 @@ final class GlobalHotkeyManager: NSObject {
}
}

func resetModifierOnlyShortcutTracking(reason: ModifierTrackingResetReason = .shortcutCapture) {
func resetModifierOnlyShortcutTracking(
reason: ModifierTrackingResetReason = .shortcutCapture,
preservePendingReleaseStops: Bool = false
) {
let shouldStopActiveHold = self.hotkeyMode != .toggle
&& self.asrService.isRunning
&& (self.isKeyPressed || self.isPromptModeKeyPressed || self.isCommandModeKeyPressed || self.isRewriteKeyPressed || self.isPromptAssignmentKeyPressed)
Expand All @@ -1884,7 +1931,7 @@ final class GlobalHotkeyManager: NSObject {
self.activeModifierOnlyType = nil
self.otherKeyPressedDuringModifier = false
self.modifierPressStartTime = nil
self.clearAutomaticPressTracking()
self.clearAutomaticPressTracking(cancelPendingStops: !preservePendingReleaseStops)
self.isKeyPressed = false
self.isPromptModeKeyPressed = false
self.isCommandModeKeyPressed = false
Expand Down Expand Up @@ -2368,10 +2415,11 @@ final class GlobalHotkeyManager: NSObject {

func reinitialize() {
DebugLogger.shared.info("Manual reinitialization requested", source: "GlobalHotkeyManager")
self.registeredHotkeys.releaseAll(interrupted: true)

self.initializationTask?.cancel()
self.healthCheckTask?.cancel()
self.resetModifierOnlyShortcutTracking(reason: .reinitialize)
self.resetModifierOnlyShortcutTracking(reason: .reinitialize, preservePendingReleaseStops: true)
self.isInitialized = false
self.initializeWithDelay()
}
Expand All @@ -2391,6 +2439,7 @@ final class GlobalHotkeyManager: NSObject {

await MainActor.run { [weak self] in
guard let self else { return }
self.logSecureInputState()
if !self.validateEventTapHealth() {
DebugLogger.shared.warning("Health check failed, attempting to recover", source: "GlobalHotkeyManager")

Expand All @@ -2415,3 +2464,52 @@ final class GlobalHotkeyManager: NSObject {
cleanupEventTap()
}
}

/// Registration is separate from event-tap health: an enabled tap can still be
/// unable to receive keys while another process holds Secure Event Input.
extension GlobalHotkeyManager {
private func refreshRegisteredHotkeys() {
guard !(self.isShortcutCaptureActiveProvider?() ?? false) else {
self.registeredHotkeys.update(shortcuts: [])
return
}
var shortcuts = self.primaryShortcuts + self.promptShortcutAssignments.map(\.shortcut)
if self.promptModeShortcutEnabled {
shortcuts.append(self.promptModeShortcut)
}
if self.commandModeShortcutEnabled, let shortcut = self.commandModeShortcut {
shortcuts.append(shortcut)
}
if self.rewriteModeShortcutEnabled {
shortcuts.append(self.rewriteModeShortcut)
}
// Cancel and paste keep their context-sensitive event-tap behavior: unlike
// recording triggers, they must not unconditionally claim a global chord.
self.registeredHotkeys.update(shortcuts: shortcuts)
}

func shortcutCaptureDidChange() {
self.registeredHotkeys.releaseAll(interrupted: true)
self.resetModifierOnlyShortcutTracking(preservePendingReleaseStops: true)
self.refreshRegisteredHotkeys()
}

private func handleRegisteredHotkey(_ shortcut: HotkeyShortcut, down: Bool) {
guard !down || !Self.currentSessionIsLocked() else { return }
// Construct an input for the existing routing/state machine. Never post it
// into the system event stream or synthesize a keystroke in another app.
guard let event = CGEvent(keyboardEventSource: nil, virtualKey: shortcut.keyCode, keyDown: down) else { return }
event.flags = CGEventFlags(rawValue: UInt64(shortcut.relevantModifierFlags.rawValue))
_ = self.handleKeyEvent(type: down ? .keyDown : .keyUp, event: event, registered: true)
}

private func logSecureInputState() {
let enabled = IsSecureEventInputEnabled()
guard self.secureInputWasEnabled != enabled else { return }
self.secureInputWasEnabled = enabled
DebugLogger.shared.info(
"Secure Input \(enabled ? "enabled: event-tap shortcuts may be unavailable; registered hotkeys remain registered" : "disabled")",
source: "GlobalHotkeyManager"
)
}
}
Loading
Loading