🐞 Correctly treat right/left modifiers for trigger-bypassed keybinds

Author: mrkai77

Loop/Core/Observers/KeybindTrigger.swift

@@ -152,8 +152,10 @@ final class KeybindTrigger {
     private func performKeybind(keyCode: CGKeyCode, type: CGEventType, isARepeat: Bool, flags: CGEventFlags, isLoopOpen: Bool) -> PerformKeybindResult {
         let flagKeys = sideDependentTriggerKey ? flags.keyCodes : flags.keyCodes.baseModifiers
         let allPressedKeys: Set<CGKeyCode> = pressedKeys.union(flagKeys)
+
         let actionKeys: Set<CGKeyCode> = Set(allPressedKeys.subtracting(triggerKey).map(\.baseModifier))
         let containsTrigger = allPressedKeys.isSuperset(of: triggerKey)
+        let allPressedKeysBaseModifiers: Set<CGKeyCode> = Set(allPressedKeys.map(\.baseModifier))
 
         if isLoopOpen {
             if pressedKeys.contains(.kVK_Escape) {
@@ -172,19 +174,10 @@ final class KeybindTrigger {
         }
 
         if type != .keyUp { // keyDown for flagsChanged
-            if let bypassedAction = windowActionCache.bypassedActionsByKeybind[allPressedKeys] {
-                if !isARepeat || bypassedAction.canRepeat {
-                    openLoop(startingAction: bypassedAction, overrideExistingTriggerDelayTimerAction: true)
-                }
-
-                return checkIfLoopOpen() ? .consume : .opening
-            }
-
             if containsTrigger {
                 // Try an match directly with the action keys first, then fallback to just the key code.
                 // This prevents failures when the user is tapping the keys in rapid succession.
-                let match = windowActionCache.actionsByKeybind[actionKeys]
-                    ?? windowActionCache.actionsByKeybind[[keyCode]]
+                let match = windowActionCache.actionsByKeybind[actionKeys] ?? windowActionCache.actionsByKeybind[[keyCode]]
 
                 if let action = match {
                     if !isARepeat || action.canRepeat {
@@ -204,6 +197,12 @@ final class KeybindTrigger {
                     )
                     return .opening
                 }
+            } else if let bypassedAction = windowActionCache.bypassedActionsByKeybind[allPressedKeysBaseModifiers] {
+                if !isARepeat || bypassedAction.canRepeat {
+                    openLoop(startingAction: bypassedAction, overrideExistingTriggerDelayTimerAction: true)
+                }
+
+                return checkIfLoopOpen() ? .consume : .opening
             } else {
                 if allPressedKeys.isEmpty {
                     doubleClickTimer.handleKeyUp()

Loop/Settings Window/Settings/Keybinds/Keybind Recorder/Keycorder.swift

@@ -138,7 +138,10 @@ struct Keycorder: View {
         let currentKeys = selectionKeybind + [event.keyCode]
             .map { $0.baseKey(flags: event.modifierFlags) }
 
-        var flags = CGEventFlags(cocoaFlags: event.modifierFlags)
+        var flags = CGEventFlags(
+            cocoaFlags: event.modifierFlags
+                .intersection(.deviceIndependentFlagsMask) // Prevents right/left dependence
+        )
 
         if event.keyCode.isFnSpecialKey {
             flags.remove(.maskSecondaryFn)
@@ -193,26 +196,12 @@ struct Keycorder: View {
         }
 
         // Validate keybind requirements when in bypass mode
-        if bypassTriggerKey == true {
-            let normalizedKeys = selectionKeybind.map(\.baseModifier)
-            let modifierKeys = normalizedKeys.filter(\.isModifier)
-            let nonModifierKeys = normalizedKeys.filter { !$0.isModifier }
-
-            // Check: at least one modifier key
-            if modifierKeys.isEmpty {
-                errorMessage = "Please include at least one modifier key."
-                shake()
-                shouldError = true
-                return false
-            }
-
-            // Check: at least one non-modifier key
-            else if nonModifierKeys.isEmpty {
-                errorMessage = "Please include at least one non-modifier key."
-                shake()
-                shouldError = true
-                return false
-            }
+        if bypassTriggerKey == true,
+           selectionKeybind.filter(\.isModifier).isEmpty {
+            errorMessage = "Please include at least one modifier key."
+            shake()
+            shouldError = true
+            return false
         }
 
         let effectiveSelection = bypassTriggerKey == true