Accept string vim expectations

Author: SqlRush

docs/cc-100-roadmap.md

@@ -606,7 +606,7 @@ M7 补充：prompt history `LogEntry` 读取现在接受 `sessionID`/`session`/`
 
 本轮补充：interaction script 的 direct expectation count alias 字段现在也递归解包 wrapper；`expectEventCount`、`expectTotalEventCount`、`expectDialogResultCount`、`expectTotalDialogResultCount` 可从 wrapped `value`/`count`/`total` 恢复计数断言，避免 direct expectation fixture 在 int decode 阶段失败。
 
-本轮补充：interaction script 的 UpperCamel step 字段现在也复用 raw/wrapper 解析；`UpsertTask`、`CancelAllTasks`、`OpenTasksDialog`、`ExpectPrompt`、`ExpectScreen`、`ExpectViewport`、`ExpectReverseSearch`、`ExpectTasks` 等 Go 默认字段名可直接接受 JSON:API/GraphQL-style wrapper，task status/expectation 的 ID/title/state/detail/progress、prompt expectation 的 Cursor/PastedContentCount/NextPastedID/Empty、screen expectation 的 Width/Height、viewport expectation 的 Offset/VisibleLineCount 和 reverse-search expectation 的 Cursor/ResultCount/NoResults 改为 raw-first 解码并继续接受数字字符串/非严格 bool。
+本轮补充：interaction script 的 UpperCamel step 字段现在也复用 raw/wrapper 解析；`UpsertTask`、`CancelAllTasks`、`OpenTasksDialog`、`ExpectPrompt`、`ExpectVim`、`ExpectScreen`、`ExpectViewport`、`ExpectReverseSearch`、`ExpectTasks` 等 Go 默认字段名可直接接受 JSON:API/GraphQL-style wrapper，task status/expectation 的 ID/title/state/detail/progress、prompt expectation 的 Cursor/PastedContentCount/NextPastedID/Empty、vim expectation 的 Enabled/Mode/Register/RegisterLinewise、screen expectation 的 Width/Height、viewport expectation 的 Offset/VisibleLineCount 和 reverse-search expectation 的 Cursor/ResultCount/NoResults 改为 raw-first 解码并继续接受数字字符串/非严格 bool。
 
 本轮补充：interaction script 的 direct expectation string-list alias 字段现在也递归解包 wrapper；`expectStatusContains`/`NotContains` 和 `expectSnapshotContains`/`NotContains` 可从 wrapped `value`/`values`/`contains`/`items` 恢复断言列表，避免 direct expectation fixture 在 list decode 阶段失败。
 

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

@@ -333,7 +333,7 @@ test/parity/                 # golden tests against TS/official behavior
 - 本轮补充：interaction script 的 direct dialog 字段现在改为 raw payload 解析；`dialog`/`Dialog` 可递归解包 `resource.attributes`、`edge.node.attrs` 和单元素数组，`showDialog` action payload 也复用同一解析路径，避免 wrapper-only dialog 被解码成空弹窗。
 - 本轮补充：interaction script 的 direct image 字段现在改为 raw payload 解析；`image`/`Image` 可复用 pasteImage action 的 wrapper 解析，递归解包 `resource.attributes`、`edge.node.attrs` 和单元素数组，保留 filename/media/content/source-path 后再生成 prompt pasted-image。
 - 本轮补充：interaction script 的 direct keybinding mutation 字段现在改为 raw-only 解析；`keybindings`/`key_bindings`/`keyBindings`/`keybindingSpecs`/`Keybindings` 不再先走 `[]BindingSpec` 基础解码，统一复用 keybinding loader 的 object-map、resource wrapper 和 edge/node collection parser。
-- 本轮补充：interaction script 的 UpperCamel step 字段现在也进入 raw/wrapper 解析路径；`UpsertTask`、`CancelAllTasks`、`OpenTasksDialog`、`ExpectPrompt`、`ExpectScreen`、`ExpectViewport`、`ExpectReverseSearch`、`ExpectTasks` 等 Go 默认字段名可直接接受 JSON:API/GraphQL-style wrapper，task status/expectation 的 ID/title/state/detail/progress、prompt expectation 的 Cursor/PastedContentCount/NextPastedID/Empty、screen expectation 的 Width/Height、viewport expectation 的 Offset/VisibleLineCount 和 reverse-search expectation 的 Cursor/ResultCount/NoResults 改为 raw-first 解码并继续接受数字字符串/非严格 bool。
+- 本轮补充：interaction script 的 UpperCamel step 字段现在也进入 raw/wrapper 解析路径；`UpsertTask`、`CancelAllTasks`、`OpenTasksDialog`、`ExpectPrompt`、`ExpectVim`、`ExpectScreen`、`ExpectViewport`、`ExpectReverseSearch`、`ExpectTasks` 等 Go 默认字段名可直接接受 JSON:API/GraphQL-style wrapper，task status/expectation 的 ID/title/state/detail/progress、prompt expectation 的 Cursor/PastedContentCount/NextPastedID/Empty、vim expectation 的 Enabled/Mode/Register/RegisterLinewise、screen expectation 的 Width/Height、viewport expectation 的 Offset/VisibleLineCount 和 reverse-search expectation 的 Cursor/ResultCount/NoResults 改为 raw-first 解码并继续接受数字字符串/非严格 bool。
 - 本轮补充：terminal CSI-u/kitty keyboard parser 接受 `codepoint:alternate` 和 `modifier:event-type` 冒号字段，按主 codepoint/modifier 解析 ctrl/alt/shift/rune 键，覆盖 kitty progressive keyboard protocol 的常见变体。
 - 本轮补充：terminal CSI-u/kitty keyboard parser 接受无 modifier 字段或 modifier `1` 的 base key 序列，覆盖 printable rune、Enter、Tab、Esc 和 Backspace，避免 extended-key 模式下普通键序列被解析成 unknown。
 - 本轮补充：terminal input parser 接受 xterm modified arrow 序列（如 `CSI 1;2D`、`CSI 1;6C`、`CSI 1;7D`），把 shift-arrow 降级为方向键、alt-arrow 映射到 word-motion key、ctrl/ctrl+alt-arrow 映射到 ctrl word-motion key，避免 extended navigation 序列落入 unknown。

internal/tui/script_aliases.go

@@ -4427,57 +4427,96 @@ func (expect *VimExpectation) UnmarshalJSON(data []byte) error {
 	data = normalizeBoolFields(data,
 		"Enabled",
 		"enabled",
+		"VimEnabled",
 		"vim_enabled",
 		"vimEnabled",
+		"IsEnabled",
 		"is_enabled",
 		"isEnabled",
+		"Active",
 		"active",
 		"RegisterLinewise",
 		"register_linewise",
 		"registerLinewise",
+		"Linewise",
 		"linewise",
+		"IsLinewise",
 		"is_linewise",
 		"isLinewise",
+		"RegisterLineWise",
 		"register_line_wise",
 		"registerLineWise",
 	)
 	type alias VimExpectation
 	var raw alias
-	if err := json.Unmarshal(data, &raw); err != nil {
+	if err := json.Unmarshal(stripJSONAliasFields(data,
+		"Enabled",
+		"enabled",
+		"VimEnabled",
+		"vim_enabled",
+		"vimEnabled",
+		"IsEnabled",
+		"is_enabled",
+		"isEnabled",
+		"Active",
+		"active",
+		"Mode",
+		"mode",
+		"VimMode",
+		"vim_mode",
+		"vimMode",
+		"ModeName",
+		"mode_name",
+		"modeName",
+		"CurrentMode",
+		"current_mode",
+		"currentMode",
+		"State",
+		"state",
+		"Register",
+		"register",
+		"VimRegister",
+		"vim_register",
+		"vimRegister",
+		"RegisterValue",
+		"register_value",
+		"registerValue",
+		"YankRegister",
+		"yank_register",
+		"yankRegister",
+		"RegisterLinewise",
+		"register_linewise",
+		"registerLinewise",
+		"Linewise",
+		"linewise",
+		"IsLinewise",
+		"is_linewise",
+		"isLinewise",
+		"RegisterLineWise",
+		"register_line_wise",
+		"registerLineWise",
+	), &raw); err != nil {
 		return err
 	}
 	*expect = VimExpectation(raw)
 
-	var fields struct {
-		RegisterLinewise      *bool `json:"register_linewise"`
-		RegisterLinewiseCamel *bool `json:"registerLinewise"`
-	}
-	if err := json.Unmarshal(data, &fields); err != nil {
-		return err
-	}
 	fieldMap := map[string]json.RawMessage{}
 	if err := json.Unmarshal(data, &fieldMap); err != nil {
 		return err
 	}
 	if expect.Enabled == nil {
-		expect.Enabled = boolPtrJSONField(fieldMap, "vim_enabled", "vimEnabled", "is_enabled", "isEnabled", "enabled", "active")
+		expect.Enabled = boolPtrJSONField(fieldMap, "Enabled", "enabled", "VimEnabled", "vim_enabled", "vimEnabled", "IsEnabled", "is_enabled", "isEnabled", "Active", "active")
 	}
 	if expect.Mode == "" {
-		if mode := stringJSONField(fieldMap, "vim_mode", "vimMode", "mode_name", "modeName", "current_mode", "currentMode", "state"); mode != "" {
+		if mode := stringJSONField(fieldMap, "Mode", "mode", "VimMode", "vim_mode", "vimMode", "ModeName", "mode_name", "modeName", "CurrentMode", "current_mode", "currentMode", "State", "state"); mode != "" {
 			expect.Mode = VimMode(mode)
 		}
 	}
 	if expect.Register == "" {
-		expect.Register = stringJSONField(fieldMap, "vim_register", "vimRegister", "register_value", "registerValue", "yank_register", "yankRegister")
-	}
-	if fields.RegisterLinewise != nil {
-		expect.RegisterLinewise = fields.RegisterLinewise
-	}
-	if fields.RegisterLinewiseCamel != nil {
-		expect.RegisterLinewise = fields.RegisterLinewiseCamel
+		expect.Register = stringJSONField(fieldMap, "Register", "register", "VimRegister", "vim_register", "vimRegister", "RegisterValue", "register_value", "registerValue", "YankRegister", "yank_register", "yankRegister")
 	}
 	if expect.RegisterLinewise == nil {
-		expect.RegisterLinewise = boolPtrJSONField(fieldMap, "linewise", "is_linewise", "isLinewise", "register_line_wise", "registerLineWise")
+		expect.RegisterLinewise = boolPtrJSONField(fieldMap, "RegisterLinewise", "register_linewise", "registerLinewise", "Linewise", "linewise", "IsLinewise", "is_linewise", "isLinewise", "RegisterLineWise", "register_line_wise", "registerLineWise")
 	}
 	return nil
 }

internal/tui/tui_test.go

@@ -8659,8 +8659,8 @@ func TestRunInteractionScriptAcceptsWrappedVimExpectationAliasFields(t *testing.
 			"expectVim": {
 				"resource": {
 					"attributes": {
-						"vimEnabled": true,
-						"modeName": "insert"
+						"Enabled": "true",
+						"ModeName": "insert"
 					}
 				}
 			}
@@ -8671,10 +8671,10 @@ func TestRunInteractionScriptAcceptsWrappedVimExpectationAliasFields(t *testing.
 				"edge": {
 					"node": {
 						"attrs": {
-							"isEnabled": true,
-							"currentMode": "normal",
-							"vimRegister": "a",
-							"linewise": false
+							"Enabled": "true",
+							"CurrentMode": "normal",
+							"VimRegister": "a",
+							"Linewise": "false"
 						}
 					}
 				}