Unwrap keybinding scalar fields

Author: SqlRush

docs/first-second-parity-audit.md

@@ -425,6 +425,7 @@ M7 progress now includes:
 - `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`, 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 also recursively unwraps direct key/action scalar fields, so `key`, `keys`, `shortcut`, `action`, `command`, and `commandName` can carry `{value}`, JSON:API/resource, or GraphQL node-style wrapper payloads while preserving wrapped `false` unbinds.
 - `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

@@ -349,23 +349,13 @@ func bindingKeyField(fields map[string]json.RawMessage, names ...string) (string
 			continue
 		}
 		data = bytes.TrimSpace(data)
-		if len(data) == 0 || bytes.Equal(data, []byte("null")) {
-			return "", true, nil
+		key, ok, err := bindingKeyValue(data, 0)
+		if err != nil {
+			return "", false, fmt.Errorf("%s: %w", name, err)
 		}
-		if data[0] == '"' {
-			var key string
-			if err := json.Unmarshal(data, &key); err != nil {
-				return "", false, fmt.Errorf("%s: %w", name, err)
-			}
+		if ok {
 			return key, true, nil
 		}
-		if data[0] == '[' {
-			var keys []string
-			if err := json.Unmarshal(data, &keys); err != nil {
-				return "", false, fmt.Errorf("%s: %w", name, err)
-			}
-			return strings.Join(keys, " "), true, nil
-		}
 		return "", false, fmt.Errorf("%s must be a string, string array, or null", name)
 	}
 	return "", false, nil
@@ -378,24 +368,138 @@ func bindingActionField(fields map[string]json.RawMessage, names ...string) (Act
 			continue
 		}
 		data = bytes.TrimSpace(data)
-		if len(data) == 0 || bytes.Equal(data, []byte("null")) {
-			return ActionNone, true, nil
+		action, ok, err := bindingActionValue(data, 0)
+		if err != nil {
+			return "", false, fmt.Errorf("%s: %w", name, err)
 		}
-		if data[0] == '"' {
-			var action Action
-			if err := json.Unmarshal(data, &action); err != nil {
-				return "", false, fmt.Errorf("%s: %w", name, err)
-			}
+		if ok {
 			return action, true, nil
 		}
+		return "", false, fmt.Errorf("%s must be an action string, null, or false", name)
+	}
+	return "", false, nil
+}
+
+func bindingKeyValue(data json.RawMessage, depth int) (string, bool, error) {
+	data = bytes.TrimSpace(data)
+	if len(data) == 0 || bytes.Equal(data, []byte("null")) {
+		return "", true, nil
+	}
+	switch data[0] {
+	case '"':
+		var key string
+		if err := json.Unmarshal(data, &key); err != nil {
+			return "", false, err
+		}
+		return key, true, nil
+	case '[':
+		var items []json.RawMessage
+		if err := json.Unmarshal(data, &items); err != nil {
+			return "", false, err
+		}
+		keys := make([]string, 0, len(items))
+		for _, item := range items {
+			key, ok, err := bindingKeyValue(item, depth+1)
+			if err != nil {
+				return "", false, err
+			}
+			if !ok {
+				return "", false, fmt.Errorf("array entries must be strings or wrapped strings")
+			}
+			if key != "" {
+				keys = append(keys, key)
+			}
+		}
+		return strings.Join(keys, " "), true, nil
+	case '{':
+		return bindingWrappedKeyValue(data, depth)
+	default:
+		return "", false, nil
+	}
+}
+
+func bindingActionValue(data json.RawMessage, depth int) (Action, bool, error) {
+	data = bytes.TrimSpace(data)
+	if len(data) == 0 || bytes.Equal(data, []byte("null")) {
+		return ActionNone, true, nil
+	}
+	switch data[0] {
+	case '"':
+		var action Action
+		if err := json.Unmarshal(data, &action); err != nil {
+			return "", false, err
+		}
+		return action, true, nil
+	case '{':
+		return bindingWrappedActionValue(data, depth)
+	default:
 		var enabled bool
 		if err := json.Unmarshal(data, &enabled); err == nil {
 			if !enabled {
 				return ActionNone, true, nil
 			}
-			return "", false, fmt.Errorf("%s boolean true must use an action name", name)
+			return "", false, fmt.Errorf("boolean true must use an action name")
+		}
+		return "", false, nil
+	}
+}
+
+func bindingWrappedKeyValue(data json.RawMessage, depth int) (string, bool, error) {
+	if depth >= 8 {
+		return "", false, nil
+	}
+	var fields map[string]json.RawMessage
+	if err := json.Unmarshal(data, &fields); err != nil {
+		return "", false, err
+	}
+	if key, ok, err := bindingKeyField(fields, bindingKeyValueFields()...); ok || err != nil {
+		return key, ok, err
+	}
+	for _, name := range bindingScalarWrapperFields() {
+		raw, ok := fields[name]
+		if !ok {
+			continue
+		}
+		key, ok, err := bindingKeyValue(raw, depth+1)
+		if ok || err != nil {
+			return key, ok, err
+		}
+	}
+	return "", false, nil
+}
+
+func bindingWrappedActionValue(data json.RawMessage, depth int) (Action, bool, error) {
+	if depth >= 8 {
+		return "", false, nil
+	}
+	var fields map[string]json.RawMessage
+	if err := json.Unmarshal(data, &fields); err != nil {
+		return "", false, err
+	}
+	if action, ok, err := bindingActionField(fields, bindingActionValueFields()...); ok || err != nil {
+		return action, ok, err
+	}
+	for _, name := range bindingScalarWrapperFields() {
+		raw, ok := fields[name]
+		if !ok {
+			continue
+		}
+		action, ok, err := bindingActionValue(raw, depth+1)
+		if ok || err != nil {
+			return action, ok, err
 		}
-		return "", false, fmt.Errorf("%s must be an action string, null, or false", name)
 	}
 	return "", false, nil
 }
+
+func bindingKeyValueFields() []string {
+	return []string{"value", "key", "keys", "key_sequence", "keySequence", "shortcut", "shortcut_key", "shortcutKey", "shortcut_keys", "shortcutKeys", "sequence", "accelerator", "accelerators", "keystroke", "keyStroke", "hotkey", "hotKey", "key_combo", "keyCombo", "chord", "keyChord"}
+}
+
+func bindingActionValueFields() []string {
+	return []string{"value", "action", "command", "action_name", "actionName", "command_name", "commandName", "command_id", "commandId"}
+}
+
+func bindingScalarWrapperFields() []string {
+	return []string{"payload", "data", "body", "result", "response", "output", "resource", "attributes", "properties", "attrs", "node", "edge", "record", "entry", "item"}
+}

internal/tui/tui_test.go

@@ -1855,6 +1855,50 @@ func TestParseKeyBindingSpecsAcceptsNestedWrappers(t *testing.T) {
 	}
 }
 
+func TestParseKeyBindingSpecsAcceptsWrappedScalarFields(t *testing.T) {
+	specs, err := ParseKeyBindingSpecs([]byte(`{
+		"bindings": [
+			{
+				"key": {"payload": {"value": "ctrl-r"}},
+				"action": {"data": {"commandName": "editor.action.deleteWordLeft"}}
+			},
+			{
+				"keys": [{"value": "ctrl-x"}, {"resource": {"attributes": {"value": "ctrl-k"}}}],
+				"command": {"node": {"value": false}}
+			},
+			{
+				"shortcut": {"resource": {"attributes": {"shortcutKey": "shiftEnter"}}},
+				"commandName": {"resource": {"attributes": {"value": "insertNewline"}}}
+			}
+		]
+	}`))
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(specs) != 3 || specs[0].Key != "ctrl-r" || specs[0].Action != Action("editor.action.deleteWordLeft") || specs[1].Key != "ctrl-x ctrl-k" || specs[1].Action != ActionNone || specs[2].Key != "shiftEnter" || specs[2].Action != Action("insertNewline") {
+		t.Fatalf("specs = %#v", specs)
+	}
+	keymap, err := KeymapFromSpecs(DefaultKeymap(), specs)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if action := keymap.Resolve(ParseKey("\x12")); action != ActionDeleteWordBack {
+		t.Fatalf("wrapped ctrl-r action = %q", action)
+	}
+	if action := keymap.Resolve(ParseKey("\x18")); action != ActionNone {
+		t.Fatalf("wrapped ctrl-x prefix action = %q", action)
+	}
+	if action := keymap.Resolve(ParseKey("\x0b")); action != ActionNone {
+		t.Fatalf("wrapped ctrl-x ctrl-k action = %q", action)
+	}
+	if action := keymap.Resolve(ParseKey("\x0b")); action != ActionDeleteToEnd {
+		t.Fatalf("wrapped ctrl-k after pending action = %q", action)
+	}
+	if action := keymap.Resolve(ParseKey("\x1b[13;2u")); action != ActionInsertNewline {
+		t.Fatalf("wrapped shift-enter action = %q", action)
+	}
+}
+
 func TestParseKeyBindingSpecsAcceptsProviderResponseWrappers(t *testing.T) {
 	specArray := []map[string]any{
 		{"key": "ctrl-r", "action": "pageDown"},