Accept string task 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`、`ExpectEvent(s)`、`ExpectDialog`、`ExpectDialogResult(s)`、`ExpectPrompt`、`ExpectVim`、`ExpectScreen`、`ExpectViewport`、`ExpectReverseSearch`、`ExpectTasks` 等 Go 默认字段名可直接接受 JSON:API/GraphQL-style wrapper，task status/expectation 的 ID/title/state/detail/progress、event expectation 的 Type/Value/DialogID、dialog expectation 的 Active/ActionCount/FocusedIndex、dialog-result expectation 的 ID/Found/Stale、prompt expectation 的 Cursor/PastedContentCount/NextPastedID/Empty、pasted-content expectation 的 ID/MediaType/Filename/ContentContains、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 的 UpperCamel step 字段现在也复用 raw/wrapper 解析；`UpsertTask`、`CancelAllTasks`、`OpenTasksDialog`、`ExpectEvent(s)`、`ExpectDialog`、`ExpectDialogResult(s)`、`ExpectPrompt`、`ExpectVim`、`ExpectScreen`、`ExpectViewport`、`ExpectReverseSearch`、`ExpectTasks` 等 Go 默认字段名可直接接受 JSON:API/GraphQL-style wrapper，task status/expectation 的 ID/title/state/detail/progress、tasks expectation 的 Count/StateCounts、event expectation 的 Type/Value/DialogID、dialog expectation 的 Active/ActionCount/FocusedIndex、dialog-result expectation 的 ID/Found/Stale、prompt expectation 的 Cursor/PastedContentCount/NextPastedID/Empty、pasted-content expectation 的 ID/MediaType/Filename/ContentContains、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`、`ExpectEvent(s)`、`ExpectDialog`、`ExpectDialogResult(s)`、`ExpectPrompt`、`ExpectVim`、`ExpectScreen`、`ExpectViewport`、`ExpectReverseSearch`、`ExpectTasks` 等 Go 默认字段名可直接接受 JSON:API/GraphQL-style wrapper，task status/expectation 的 ID/title/state/detail/progress、event expectation 的 Type/Value/DialogID、dialog expectation 的 Active/ActionCount/FocusedIndex、dialog-result expectation 的 ID/Found/Stale、prompt expectation 的 Cursor/PastedContentCount/NextPastedID/Empty、pasted-content expectation 的 ID/MediaType/Filename/ContentContains、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 的 UpperCamel step 字段现在也进入 raw/wrapper 解析路径；`UpsertTask`、`CancelAllTasks`、`OpenTasksDialog`、`ExpectEvent(s)`、`ExpectDialog`、`ExpectDialogResult(s)`、`ExpectPrompt`、`ExpectVim`、`ExpectScreen`、`ExpectViewport`、`ExpectReverseSearch`、`ExpectTasks` 等 Go 默认字段名可直接接受 JSON:API/GraphQL-style wrapper，task status/expectation 的 ID/title/state/detail/progress、tasks expectation 的 Count/StateCounts、event expectation 的 Type/Value/DialogID、dialog expectation 的 Active/ActionCount/FocusedIndex、dialog-result expectation 的 ID/Found/Stale、prompt expectation 的 Cursor/PastedContentCount/NextPastedID/Empty、pasted-content expectation 的 ID/MediaType/Filename/ContentContains、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

@@ -4312,6 +4312,28 @@ func intMapJSONField(fields map[string]json.RawMessage, names ...string) map[str
 		if err := json.Unmarshal(raw, &value); err == nil {
 			return value
 		}
+		var rawValues map[string]json.RawMessage
+		if err := json.Unmarshal(raw, &rawValues); err != nil {
+			continue
+		}
+		value = make(map[string]int, len(rawValues))
+		for key, rawValue := range rawValues {
+			var intValue int
+			if err := json.Unmarshal(rawValue, &intValue); err == nil {
+				value[key] = intValue
+				continue
+			}
+			var stringValue string
+			if err := json.Unmarshal(rawValue, &stringValue); err != nil {
+				return nil
+			}
+			parsed, err := strconv.Atoi(strings.TrimSpace(stringValue))
+			if err != nil {
+				return nil
+			}
+			value[key] = parsed
+		}
+		return value
 	}
 	return nil
 }
@@ -4752,36 +4774,49 @@ func (expect *VimExpectation) UnmarshalJSON(data []byte) error {
 }
 
 func (expect *TasksExpectation) UnmarshalJSON(data []byte) error {
-	data = normalizeObjectFieldsToArray(data, "contains")
+	data = normalizeObjectFieldsToArray(data, "Contains", "contains")
 	type alias TasksExpectation
 	var raw alias
-	if err := json.Unmarshal(data, &raw); err != nil {
+	if err := json.Unmarshal(stripJSONAliasFields(data,
+		"Count",
+		"count",
+		"TaskCount",
+		"task_count",
+		"taskCount",
+		"Total",
+		"total",
+		"Size",
+		"size",
+		"Length",
+		"length",
+		"StateCounts",
+		"state_counts",
+		"stateCounts",
+		"StatusCounts",
+		"status_counts",
+		"statusCounts",
+		"Counts",
+		"counts",
+		"CountsByState",
+		"counts_by_state",
+		"countsByState",
+		"ByState",
+		"by_state",
+		"byState",
+	), &raw); err != nil {
 		return err
 	}
 	*expect = TasksExpectation(raw)
 
-	var fields struct {
-		StateCounts      map[string]int `json:"state_counts"`
-		StateCountsCamel map[string]int `json:"stateCounts"`
-	}
-	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.Count == nil {
-		expect.Count = intPtrJSONField(fieldMap, "task_count", "taskCount", "total", "size", "length")
-	}
-	if fields.StateCounts != nil {
-		expect.StateCounts = fields.StateCounts
-	}
-	if fields.StateCountsCamel != nil {
-		expect.StateCounts = fields.StateCountsCamel
+		expect.Count = intPtrJSONField(fieldMap, "Count", "count", "TaskCount", "task_count", "taskCount", "Total", "total", "Size", "size", "Length", "length")
 	}
 	if len(expect.StateCounts) == 0 {
-		expect.StateCounts = intMapJSONField(fieldMap, "status_counts", "statusCounts", "counts", "counts_by_state", "countsByState", "by_state", "byState")
+		expect.StateCounts = intMapJSONField(fieldMap, "StateCounts", "state_counts", "stateCounts", "StatusCounts", "status_counts", "statusCounts", "Counts", "counts", "CountsByState", "counts_by_state", "countsByState", "ByState", "by_state", "byState")
 	}
 	return nil
 }

internal/tui/tui_test.go

@@ -7157,9 +7157,9 @@ func TestRunDialogRuntimeScriptAcceptsWrappedTaskExpectationAliasFields(t *testi
 			"expectTasks": {
 				"resource": {
 					"attributes": {
-						"taskCount": 1,
-						"statusCounts": {"running": 1},
-						"contains": {"taskId": "task_1", "taskTitle": "Build", "status": "running", "statusText": "go test", "progressPercent": 40}
+						"Count": "1",
+						"StateCounts": {"running": "1"},
+						"Contains": {"ID": "task_1", "Title": "Build", "State": "running", "Detail": "go test", "Progress": "40"}
 					}
 				}
 			}
@@ -7171,9 +7171,9 @@ func TestRunDialogRuntimeScriptAcceptsWrappedTaskExpectationAliasFields(t *testi
 				"edge": {
 					"node": {
 						"attrs": {
-							"total": 1,
-							"countsByState": {"cancelled": 1},
-							"contains": {"id": "task_1", "state": "cancelled", "detail": "stopped"}
+							"Count": "1",
+							"StateCounts": {"cancelled": "1"},
+							"Contains": {"ID": "task_1", "State": "cancelled", "Detail": "stopped"}
 						}
 					}
 				}
@@ -7184,7 +7184,7 @@ func TestRunDialogRuntimeScriptAcceptsWrappedTaskExpectationAliasFields(t *testi
 			"expectTasks": {
 				"resource": {
 					"attributes": {
-						"taskCount": 0
+						"Count": "0"
 					}
 				}
 			}