Accept keybinding collection aliases

Author: SqlRush

docs/cc-100-roadmap.md

@@ -162,6 +162,8 @@ M7 补充：keybinding config 和脚本 named-key 输入现在接受 `backtab`/`
 
 M7 补充：keybinding JSON loader 现在递归解包 `data`/`payload`/`settings`/`config`/`keyboard`/`keymap` 等外层 wrapper，嵌套 preference export 中的 `bindings`/`shortcuts` 不需要手工扁平化。
 
+M7 补充：keybinding JSON loader 现在接受 `keymap`/`keymaps`、`keyboardShortcuts`、`hotkeys`、`userKeybindings`、`customKeybindings` 等集合字段别名，并同时支持直接 object-map 和嵌套 `bindings` wrapper。
+
 M7 补充：interaction script 的 `keys` 字段现在支持 printable text chunk 和空格分隔 named-key sequence，例如 `ctrl-x ctrl-k`，减少官方脚本把连续输入拆成数组的改写成本。
 
 M7 补充：interaction script key input 现在接受 press-style aliases，包括 `press`、`keyPress`、`keypress`、`shortcutKey`、`presses`、`keyPresses` 和 `shortcuts`。
@@ -494,6 +496,8 @@ M7 补充：prompt history `LogEntry` 读取现在接受 `sessionID`/`session`/`
 
 本轮补充：keybinding JSON loader 现在递归解包 `data`/`payload`/`settings`/`config`/`keyboard`/`keymap` 等外层 wrapper，嵌套 preference export 中的 `bindings`/`shortcuts` 不需要手工扁平化。
 
+本轮补充：keybinding JSON loader 现在接受 `keymap`/`keymaps`、`keyboardShortcuts`、`hotkeys`、`userKeybindings`、`customKeybindings` 等集合字段别名，并同时支持直接 object-map 和嵌套 `bindings` wrapper。
+
 本轮补充：interaction script 的 `keys` 字段现在支持 printable text chunk 和空格分隔 named-key sequence，例如 `ctrl-x ctrl-k`，减少官方脚本把连续输入拆成数组的改写成本。
 
 本轮补充：interaction script key input 现在接受 press-style aliases，包括 `press`、`keyPress`、`keypress`、`shortcutKey`、`presses`、`keyPresses` 和 `shortcuts`。

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

@@ -268,6 +268,7 @@ test/parity/                 # golden tests against TS/official behavior
 - 本轮补充：keybinding config 和脚本 named-key 输入接受短修饰符别名，包括 `c-`/`m-`/`a-`/`opt-`/`s-` 以及 compact/camel 形式，可覆盖 control、meta、alt、option 和 shift key names。
 - 本轮补充：keybinding config 和脚本 named-key 输入现在接受 `backtab`/`back-tab`/`btab` 等 Shift-Tab terminfo/fixture 别名，并映射到既有 focus-previous key surface。
 - 本轮补充：keybinding JSON loader 现在递归解包 `data`/`payload`/`settings`/`config`/`keyboard`/`keymap` 等外层 wrapper，嵌套 preference export 中的 `bindings`/`shortcuts` 不需要手工扁平化。
+- 本轮补充：keybinding JSON loader 现在接受 `keymap`/`keymaps`、`keyboardShortcuts`、`hotkeys`、`userKeybindings`、`customKeybindings` 等集合字段别名，并同时支持直接 object-map 和嵌套 `bindings` wrapper。
 - 本轮补充：interaction script 的 `keys` 字段支持 printable text chunk 和空格分隔 named-key sequence，例如 `ctrl-x ctrl-k`，减少官方脚本把连续输入拆成数组的改写成本。
 - 本轮补充：interaction script key input 接受 press-style aliases，包括 `press`、`keyPress`、`keypress`、`shortcutKey`、`presses`、`keyPresses` 和 `shortcuts`。
 - 本轮补充：interaction script action/type/kind/name/operation 动作判别字段接受 compact/camel fixture aliases，包括 `typeText`、`inputText`、`insertText`、`keyPress`、`pressKey`、`keySequence`、`pasteText`、`pastedText`、`clipboardText`、`setStatus`、`statusLine`、`terminalSize` 和 `screenSize`。

docs/first-second-parity-audit.md

@@ -298,6 +298,7 @@ M7 progress now includes:
 - `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 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 accepts collection aliases such as `keymap`, `keymaps`, `keyboardShortcuts`, `hotkeys`, `userKeybindings`, and `customKeybindings`, including both direct object maps and nested `bindings` wrappers.
 - `internal/tui`: mouse parsing now accepts legacy X10/normal tracking `ESC[M...` press/release/wheel sequences in addition to SGR mouse events.
 - `internal/tui`: mouse parsing now accepts urxvt/xterm 1015 numeric mouse `CSI button;x;yM` sequences and normalizes button codes to the existing SGR/X10 mouse surface.
 - `internal/tui`: interaction scripts now accept structured `mouse`/`mouse_event` steps with expanded button aliases such as `buttonMask`/`btn`/`code`, coordinate aliases such as `mouseX`/`clientX`/`screenX`/`pageX`/`offsetX`/`viewportX` and Y/row/line variants, release aliases such as `mouseUp`/`isRelease`/`mouseRelease`/`releaseEvent`, and dispatch them through the normal screen event path.

internal/tui/keybinding_loader.go

@@ -42,7 +42,31 @@ func ParseKeyBindingSpecs(data []byte) ([]BindingSpec, error) {
 	return specs, nil
 }
 
-var keyBindingCollectionFields = []string{"bindings", "keybindings", "keyBindings", "keyboardBindings", "keybinding_specs", "keybindingSpecs", "shortcuts", "shortcutBindings"}
+var keyBindingCollectionFields = []string{
+	"bindings",
+	"keybindings",
+	"keyBindings",
+	"keyboardBindings",
+	"keyboardShortcuts",
+	"keyboard_shortcuts",
+	"keybinding_specs",
+	"keybindingSpecs",
+	"keymap",
+	"keyMap",
+	"keymaps",
+	"keyMaps",
+	"shortcuts",
+	"shortcutBindings",
+	"hotkeys",
+	"hotKeys",
+	"hot_keys",
+	"userKeybindings",
+	"userKeyBindings",
+	"user_keybindings",
+	"customKeybindings",
+	"customKeyBindings",
+	"custom_keybindings",
+}
 
 var keyBindingOuterWrapperFields = []string{"data", "payload", "body", "result", "response", "settings", "config", "configuration", "keyboard", "keymap", "preferences", "userPreferences"}
 
@@ -103,7 +127,11 @@ func parseKeyBindingSpecValue(name string, data json.RawMessage) ([]BindingSpec,
 		}
 		return specs, nil
 	case '{':
-		specs, err := parseKeyBindingMap(data)
+		specs, ok, err := parseKeyBindingWrapper(data)
+		if ok || err != nil {
+			return specs, err
+		}
+		specs, err = parseKeyBindingMap(data)
 		if err != nil {
 			return nil, fmt.Errorf("parse %s map: %w", name, err)
 		}

internal/tui/tui_test.go

@@ -1650,6 +1650,62 @@ func TestParseKeyBindingSpecsAcceptsNestedWrappers(t *testing.T) {
 	}
 }
 
+func TestParseKeyBindingSpecsAcceptsCollectionAliases(t *testing.T) {
+	specs, err := ParseKeyBindingSpecs([]byte(`{
+		"keymap": {
+			"ctrl-r": "pageDown",
+			"ctrl-x ctrl-k": false
+		}
+	}`))
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(specs) != 2 || specs[0].Key != "ctrl-r" || specs[0].Action != Action("pageDown") || specs[1].Key != "ctrl-x ctrl-k" || specs[1].Action != ActionNone {
+		t.Fatalf("keymap specs = %#v", specs)
+	}
+	keymap, err := KeymapFromSpecs(DefaultKeymap(), specs)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if action := keymap.Resolve(ParseKey("\x12")); action != ActionPageDown {
+		t.Fatalf("keymap ctrl-r action = %q", action)
+	}
+	if action := keymap.Resolve(ParseKey("\x18")); action != ActionNone {
+		t.Fatalf("keymap ctrl-x prefix action = %q", action)
+	}
+	if action := keymap.Resolve(ParseKey("\x0b")); action != ActionNone {
+		t.Fatalf("keymap ctrl-x ctrl-k action = %q", action)
+	}
+
+	specs, err = ParseKeyBindingSpecs([]byte(`{
+		"keymap": {
+			"bindings": [
+				{"shortcut": "shift-enter", "command": "insertNewline"}
+			]
+		}
+	}`))
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(specs) != 1 || specs[0].Key != "shift-enter" || specs[0].Action != Action("insertNewline") {
+		t.Fatalf("wrapped keymap specs = %#v", specs)
+	}
+
+	specs, err = ParseKeyBindingSpecs([]byte(`{
+		"preferences": {
+			"keyboardShortcuts": {
+				"ctrl-w": {"commandName": "deleteWordBackward"}
+			}
+		}
+	}`))
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(specs) != 1 || specs[0].Key != "ctrl-w" || specs[0].Action != Action("deleteWordBackward") {
+		t.Fatalf("keyboardShortcuts specs = %#v", specs)
+	}
+}
+
 func TestParseKeyBindingSpecsAcceptsArrayKeySequences(t *testing.T) {
 	specs, err := ParseKeyBindingSpecs([]byte(`[
 		{"keys": ["ctrl-x", "ctrl-k"], "command": "pageDown"},