fix: EventModifierFlagsをKeyEventCore.ModifierFlagに統一し、CustomTextFieldのEscapeキー処理を復元

- EventModifierFlags を削除し、既存の KeyEventCore.ModifierFlag を使用するよう統一
- KeyEventCore.ModifierFlag に Codable 準拠を追加
- PR #277 で追加された CustomTextField の onCancel/Escape キー処理を復元

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: nyanko3141592

Core/Sources/Core/Configs/KeyboardShortcut.swift

@@ -3,9 +3,9 @@ import Foundation
 /// キーボードショートカットを表す構造体
 public struct KeyboardShortcut: Codable, Equatable, Hashable, Sendable {
     public var key: String
-    public var modifiers: EventModifierFlags
+    public var modifiers: KeyEventCore.ModifierFlag
 
-    public init(key: String, modifiers: EventModifierFlags) {
+    public init(key: String, modifiers: KeyEventCore.ModifierFlag) {
         self.key = key
         self.modifiers = modifiers
     }
@@ -37,21 +37,3 @@ public struct KeyboardShortcut: Codable, Equatable, Hashable, Sendable {
         return result
     }
 }
-
-/// ModifierFlagsをCodable/Sendableにするためのラッパー（rawValueベース）
-public struct EventModifierFlags: Codable, Equatable, Hashable, Sendable {
-    public var rawValue: UInt
-
-    public init(rawValue: UInt) {
-        self.rawValue = rawValue
-    }
-
-    public static let control = EventModifierFlags(rawValue: 1 << 18)  // NSEvent.ModifierFlags.control.rawValue
-    public static let option = EventModifierFlags(rawValue: 1 << 19)   // NSEvent.ModifierFlags.option.rawValue
-    public static let shift = EventModifierFlags(rawValue: 1 << 17)    // NSEvent.ModifierFlags.shift.rawValue
-    public static let command = EventModifierFlags(rawValue: 1 << 20)  // NSEvent.ModifierFlags.command.rawValue
-
-    public func contains(_ other: EventModifierFlags) -> Bool {
-        (rawValue & other.rawValue) == other.rawValue
-    }
-}

Core/Sources/Core/InputUtils/KeyEventCore.swift

@@ -1,5 +1,5 @@
 public struct KeyEventCore: Sendable, Equatable {
-    public struct ModifierFlag: OptionSet, Sendable, Hashable {
+    public struct ModifierFlag: OptionSet, Codable, Sendable, Hashable {
         public let rawValue: Int
 
         public init(rawValue: Int) {

azooKeyMac/Configs/KeyboardShortcut.swift

@@ -1,15 +1,39 @@
 import Cocoa
 import Core
 
-/// NSEvent.ModifierFlagsとの相互変換
-extension EventModifierFlags {
+/// NSEvent.ModifierFlagsとKeyEventCore.ModifierFlagの相互変換
+extension KeyEventCore.ModifierFlag {
     public init(from nsModifiers: NSEvent.ModifierFlags) {
-        // サポートするモディファイア（control, option, shift, command）のみを抽出
-        let supportedMask: NSEvent.ModifierFlags = [.control, .option, .shift, .command]
-        self.init(rawValue: nsModifiers.intersection(supportedMask).rawValue)
+        var flags: KeyEventCore.ModifierFlag = []
+        if nsModifiers.contains(.control) {
+            flags.insert(.control)
+        }
+        if nsModifiers.contains(.option) {
+            flags.insert(.option)
+        }
+        if nsModifiers.contains(.shift) {
+            flags.insert(.shift)
+        }
+        if nsModifiers.contains(.command) {
+            flags.insert(.command)
+        }
+        self = flags
     }
 
     public var nsModifierFlags: NSEvent.ModifierFlags {
-        NSEvent.ModifierFlags(rawValue: rawValue)
+        var flags: NSEvent.ModifierFlags = []
+        if contains(.control) {
+            flags.insert(.control)
+        }
+        if contains(.option) {
+            flags.insert(.option)
+        }
+        if contains(.shift) {
+            flags.insert(.shift)
+        }
+        if contains(.command) {
+            flags.insert(.command)
+        }
+        return flags
     }
 }

azooKeyMac/InputController/azooKeyMacInputController.swift

@@ -79,24 +79,19 @@ class azooKeyMacInputController: IMKInputController, NSMenuItemValidation { // s
         }
 
         let key = characters.lowercased()
-
-        // 必要な修飾キーのみをマスクして取得
-        let relevantModifiers: NSEvent.ModifierFlags = [.control, .option, .shift, .command]
-        let eventModifiers = event.modifierFlags.intersection(relevantModifiers)
+        let eventModifiers = KeyEventCore.ModifierFlag(from: event.modifierFlags)
 
         // 修飾キーがない場合は早期リターン（通常の入力）
         if eventModifiers.isEmpty {
             return nil
         }
 
         // キャッシュからショートカット付きのピン留めプロンプトを検索
-        let pinnedWithShortcuts = self.pinnedPromptsCache.filter { $0.shortcut != nil }
-        if let matched = pinnedWithShortcuts.first(where: { item in
+        if let matched = self.pinnedPromptsCache.first(where: { item in
             guard let itemShortcut = item.shortcut else {
                 return false
             }
-            let shortcutModifiers = itemShortcut.modifiers.nsModifierFlags.intersection(relevantModifiers)
-            return itemShortcut.key == key && eventModifiers == shortcutModifiers
+            return itemShortcut.key == key && itemShortcut.modifiers == eventModifiers
         }) {
             return matched.prompt
         }

azooKeyMac/Windows/KeyboardShortcutRecorder.swift

@@ -101,7 +101,7 @@ class ShortcutRecorderView: NSView {
         }
 
         let key = characters.lowercased()
-        let modifiers = EventModifierFlags(from: event.modifierFlags)
+        let modifiers = KeyEventCore.ModifierFlag(from: event.modifierFlags)
 
         guard modifiers.contains(.control) ||
                 modifiers.contains(.option) ||

azooKeyMac/Windows/PromptInput/CustomTextField.swift

@@ -9,6 +9,7 @@ struct CustomTextField: NSViewRepresentable {
     var onSubmit: () -> Void
     var onDownArrow: () -> Void
     var onUpArrow: () -> Void
+    var onCancel: () -> Void
 
     func makeNSView(context: Context) -> NSTextField {
         let textField = KeyHandlingTextField()
@@ -28,6 +29,7 @@ struct CustomTextField: NSViewRepresentable {
         textField.onDownArrow = onDownArrow
         textField.onUpArrow = onUpArrow
         textField.onSubmit = onSubmit
+        textField.onCancel = onCancel
 
         return textField
     }
@@ -40,6 +42,7 @@ struct CustomTextField: NSViewRepresentable {
             keyTextField.onDownArrow = onDownArrow
             keyTextField.onUpArrow = onUpArrow
             keyTextField.onSubmit = onSubmit
+            keyTextField.onCancel = onCancel
         }
 
         // Handle focus changes
@@ -65,6 +68,14 @@ struct CustomTextField: NSViewRepresentable {
             parent.onSubmit()
         }
 
+        func control(_ control: NSControl, textView: NSTextView, doCommandBy commandSelector: Selector) -> Bool {
+            if commandSelector == #selector(NSResponder.cancelOperation(_:)) {
+                parent.onCancel()
+                return true
+            }
+            return false
+        }
+
         func controlTextDidChange(_ obj: Notification) {
             if let textField = obj.object as? NSTextField {
                 parent.text = textField.stringValue
@@ -85,6 +96,7 @@ private final class KeyHandlingTextField: NSTextField {
     var onDownArrow: (() -> Void)?
     var onUpArrow: (() -> Void)?
     var onSubmit: (() -> Void)?
+    var onCancel: (() -> Void)?
 
     override func awakeFromNib() {
         super.awakeFromNib()
@@ -121,6 +133,9 @@ private final class KeyHandlingTextField: NSTextField {
         case 36: // Return key
             onSubmit?()
             return
+        case 53: // Escape key
+            onCancel?()
+            return
         default:
             super.keyDown(with: event)
         }

azooKeyMac/Windows/PromptInput/PromptInputView.swift

@@ -120,6 +120,9 @@ struct PromptInputView: View {
                 onUpArrow: {
                     // Handle up arrow for history navigation
                     navigateHistory(direction: .up)
+                },
+                onCancel: {
+                    onCancel()
                 }
             )
             .onChange(of: isTextFieldFocused) { isFocused in