Accept keybinding accelerator aliases

Author: SqlRush

docs/claude-code-go-rewrite-plan.md

@@ -354,7 +354,7 @@ test/parity/                 # golden tests against TS/official behavior
 - 本轮补充：keybinding JSON loader 现在也递归解包 JSON:API/resource-style `resource`/`attributes`/`properties`/`attrs` wrapper，API/preferences envelope 内的 `keybindings`/`keymap` 可直接加载。
 - 本轮补充：keybinding JSON loader 现在把 `data`/`payload`/`body`/`result`/`response`、`resources`、`included`、`collection`/`list`/`children`/`values`、`nodes` 和 `items` 下的数组视为 binding list，数组元素也可直接使用 JSON:API/resource-style `resource`/`node`/`attributes`/`properties` wrapper。
 - 本轮补充：keybinding JSON loader 现在也接受 GraphQL connection 风格的 `edges` binding list，binding item 可用 `edges[].node` 或 `edge.node` wrapper，外层可递归解包 `viewer`/`node`/`*Connection` wrapper。
-- 本轮补充：keybinding JSON loader 现在接受 `keymap`/`keymaps`、`keyboardShortcuts`、`hotkeys`、`userKeybindings`、`customKeybindings` 等集合字段别名，并同时支持直接 object-map 和嵌套 `bindings` wrapper。
+- 本轮补充：keybinding JSON loader 现在接受 `keymap`/`keymaps`、`keyboardShortcuts`、`hotkeys`、`userKeybindings`、`customKeybindings` 等集合字段别名，并同时支持直接 object-map 和嵌套 `bindings` wrapper；单条 binding 的 key 字段也接受 `accelerator`、`keystroke`、`hotKey`、`keyCombo` 和 `keyChord` aliases。
 - 本轮补充：keybinding JSON loader 现在也接受 provider-style `choices`/`outputs`/`candidates`/`generations` response wrapper，可从 `message.content`、content-block array 和 `content.parts[].text` 里恢复 binding array 或 object map。
 - 本轮补充：interaction script 的 per-step keybinding mutation 复用同一套 collection alias、object-map 和 resource wrapper 解析，脚本步骤可直接使用 `keymap`、`keyboardShortcuts`、`hotkeys`、`keyboard`、`preferences` 或 `keybindingConfig` 临时改键位。
 - 本轮补充：interaction script 的 `keys` 字段支持 printable text chunk 和空格分隔 named-key sequence，例如 `ctrl-x ctrl-k`，减少官方脚本把连续输入拆成数组的改写成本。

docs/first-second-parity-audit.md

@@ -401,7 +401,7 @@ M7 progress now includes:
 - `internal/tui`: REPL message restore can now rebuild prompt text and image pasted contents from user-message content blocks, `imagePasteIds`, and pasted-content metadata.
 - `internal/tui`: Ctrl-S prompt stash now preserves and restores prompt text, cursor position, and pasted-content metadata.
 - `internal/tui`: prompt submitted events now retain display text and pasted-content metadata, so downstream runtime code can build text/image content-block messages instead of receiving only the expanded prompt string.
-- `internal/tui`: keybinding JSON loading now accepts wrapper object maps, `shortcuts`/`shortcutBindings`, object action fields such as `commandName`/`commandId`, string-array key sequences/chords, and `null`/`false` unbind entries.
+- `internal/tui`: keybinding JSON loading now accepts wrapper object maps, `shortcuts`/`shortcutBindings`, object action fields such as `commandName`/`commandId`, key fields such as `accelerator`/`keystroke`/`hotKey`/`keyCombo`/`keyChord`, string-array key sequences/chords, and `null`/`false` unbind entries.
 - `internal/tui`: keybinding JSON loading now recurses through outer wrappers such as `data`, `payload`, `settings`, `config`, `keyboard`, and `keymap`, so nested official or third-party preference exports can expose `bindings`/`shortcuts` without manual flattening.
 - `internal/tui`: keybinding JSON loading now also recurses through JSON:API/resource-style `resource`, `attributes`, `properties`, and `attrs` wrappers so API/preference envelopes can expose `keybindings` or `keymap` without manual flattening.
 - `internal/tui`: keybinding JSON loading now accepts API/GraphQL collection arrays under `data`, `payload`, `body`, `result`, `response`, `resources`, `included`, `collection`, `list`, `children`, `values`, `nodes`, and `items`, with resource-style binding items unwrapped before parsing.

internal/tui/keybinding_loader.go

@@ -278,7 +278,7 @@ func (spec *BindingSpec) UnmarshalJSON(data []byte) error {
 	}
 	*spec = BindingSpec{}
 
-	key, ok, err := bindingKeyField(fields, "Key", "key", "keys", "key_sequence", "keySequence", "shortcut", "shortcut_key", "shortcutKey", "sequence")
+	key, ok, err := bindingKeyField(fields, "Key", "key", "keys", "key_sequence", "keySequence", "shortcut", "shortcut_key", "shortcutKey", "shortcut_keys", "shortcutKeys", "sequence", "accelerator", "accelerators", "keystroke", "keyStroke", "hotkey", "hotKey", "key_combo", "keyCombo", "chord", "keyChord")
 	if err != nil {
 		return err
 	}
@@ -332,7 +332,7 @@ func unwrapBindingSpecJSON(data []byte) []byte {
 
 func bindingSpecJSONHasDirectFields(fields map[string]json.RawMessage) bool {
 	for _, name := range []string{
-		"Key", "key", "keys", "key_sequence", "keySequence", "shortcut", "shortcut_key", "shortcutKey", "sequence",
+		"Key", "key", "keys", "key_sequence", "keySequence", "shortcut", "shortcut_key", "shortcutKey", "shortcut_keys", "shortcutKeys", "sequence", "accelerator", "accelerators", "keystroke", "keyStroke", "hotkey", "hotKey", "key_combo", "keyCombo", "chord", "keyChord",
 		"Action", "action", "command", "action_name", "actionName", "command_name", "commandName", "command_id", "commandId",
 	} {
 		if raw, ok := fields[name]; ok && len(bytes.TrimSpace(raw)) > 0 && !bytes.Equal(bytes.TrimSpace(raw), []byte("null")) {

internal/tui/tui_test.go

@@ -1635,7 +1635,10 @@ func TestParseKeyBindingSpecsAcceptsJSONShapes(t *testing.T) {
 		"shortcuts": {
 			"ctrl-[": false,
 			"shift-enter": {"command_id": "insert-newline"},
-			"ctrl-w": {"shortcutKey": "ctrl-w", "actionName": "deleteWordBackward"}
+			"ctrl-w": {"shortcutKey": "ctrl-w", "actionName": "deleteWordBackward"},
+			"ctrl-q": {"accelerator": "ctrl-q", "actionName": "pageUp"},
+			"ctrl-v": {"keystroke": "ctrl-v", "actionName": "pageDown"},
+			"ctrl-z": {"hotKey": "ctrl-z", "actionName": "redraw"}
 		}
 	}`))
 	if err != nil {
@@ -1654,6 +1657,15 @@ func TestParseKeyBindingSpecsAcceptsJSONShapes(t *testing.T) {
 	if action := keymap.Resolve(ParseKey("\x17")); action != ActionDeleteWordBack {
 		t.Fatalf("shortcutKey override action = %q", action)
 	}
+	if action := keymap.Resolve(ParseKey("\x11")); action != ActionPageUp {
+		t.Fatalf("accelerator override action = %q", action)
+	}
+	if action := keymap.Resolve(ParseKey("\x16")); action != ActionPageDown {
+		t.Fatalf("keystroke override action = %q", action)
+	}
+	if action := keymap.Resolve(ParseKey("\x1a")); action != ActionRedraw {
+		t.Fatalf("hotKey override action = %q", action)
+	}
 }
 
 func TestParseKeyBindingSpecsAcceptsNestedWrappers(t *testing.T) {