Accept wrapped single expectation fields

Author: SqlRush

docs/cc-100-roadmap.md

@@ -610,6 +610,8 @@ M7 补充：prompt history `LogEntry` 读取现在接受 `sessionID`/`session`/`
 
 本轮补充：interaction script 的 direct expectation collection alias 字段现在也递归解包 wrapper；`expectEvents`、`expectDialogResults` 可从 wrapped `events`/`results`/`items`/`nodes` 中恢复结构化断言列表，避免 wrapper collection fixture 被当成空对象断言。
 
+本轮补充：interaction script 的 direct single expectation alias 字段现在也递归解包 wrapper；`expectEvent`、`expectDialogResult` 可从 wrapped `event`/`result`/`expected` 中恢复结构化单项断言，避免 wrapper fixture 被当成空 expectation。
+
 本轮补充：interaction script action/type/kind/name/operation 动作判别字段现在也接受 compact/camel event/media aliases，包括 `focusIn`、`focusOut`、`mouseEvent`、`pasteImage` 和 `imagePaste`。
 
 本轮补充：interaction script 的 mouseEvent/pasteImage action payload 现在递归解包 JSON:API/GraphQL-style `resource`/`attributes`/`properties`/`attrs`/`edge.node` wrapper，wrapped mouse 坐标/按钮和 image filename/media/content 可直接驱动 dialog click 与 image paste。

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

@@ -316,6 +316,7 @@ test/parity/                 # golden tests against TS/official behavior
 - 本轮补充：interaction script 的 direct expectation count alias 字段现在也递归解包 wrapper；`expectEventCount`、`expectTotalEventCount`、`expectDialogResultCount`、`expectTotalDialogResultCount` 可从 wrapped `value`/`count`/`total` 恢复计数断言。
 - 本轮补充：interaction script 的 direct expectation string-list alias 字段现在也递归解包 wrapper；`expectStatusContains`/`NotContains` 和 `expectSnapshotContains`/`NotContains` 可从 wrapped `value`/`values`/`contains`/`items` 恢复断言列表。
 - 本轮补充：interaction script 的 direct expectation collection alias 字段现在也递归解包 wrapper；`expectEvents`、`expectDialogResults` 可从 wrapped `events`/`results`/`items`/`nodes` 中恢复结构化断言列表。
+- 本轮补充：interaction script 的 direct single expectation alias 字段现在也递归解包 wrapper；`expectEvent`、`expectDialogResult` 可从 wrapped `event`/`result`/`expected` 中恢复结构化单项断言。
 - 本轮补充：interaction script action/type/kind/name/operation 动作判别字段继续接受 compact/camel event/media aliases，包括 `focusIn`、`focusOut`、`mouseEvent`、`pasteImage` 和 `imagePaste`。
 - 本轮补充：interaction script mouseEvent/pasteImage action payload 现在递归解包 JSON:API/GraphQL-style `resource`/`attributes`/`properties`/`attrs`/`edge.node` wrapper，wrapped mouse 坐标/按钮和 image filename/media/content 可直接驱动 dialog click 与 image paste。
 - 本轮补充：interaction script action/type/kind/name/operation 动作判别字段也可驱动 runtime/dialog mutation，支持 `requestPermission`、`taskStatus`、`showTasks`、`cancelTasks`、`removeTask` 和 `showDialog` 等动作，并从 `value`/`payload`/`data`/`body` 载荷解析对象、ID 或取消原因。

docs/first-second-parity-audit.md

@@ -296,6 +296,7 @@ M7 progress now includes:
 - `internal/tui`: direct scripted expectation count aliases such as `expectEventCount`, `expectTotalEventCount`, `expectDialogResultCount`, and `expectTotalDialogResultCount` now recursively unwrap numeric JSON:API/GraphQL-style wrapper objects.
 - `internal/tui`: direct scripted expectation string-list aliases such as `expectStatusContains`, `expectStatusNotContains`, `expectSnapshotContains`, and `expectSnapshotNotContains` now recursively unwrap JSON:API/GraphQL-style wrapper objects.
 - `internal/tui`: direct scripted expectation collection aliases such as `expectEvents` and `expectDialogResults` now recursively unwrap JSON:API/GraphQL-style wrapper objects.
+- `internal/tui`: direct scripted single expectation aliases such as `expectEvent` and `expectDialogResult` now recursively unwrap JSON:API/GraphQL-style wrapper objects.
 - `internal/tui`: terminal key parsing now accepts CSI-u/kitty keyboard protocol sequences for existing ctrl/alt editing keys, shift-enter, shift-tab, and printable shift-only runes.
 - `internal/tui`: terminal CSI-u/kitty keyboard parsing now also accepts colon-suffixed alternate codepoint and modifier event-type fields such as `CSI 97:65;5:1u`.
 - `internal/tui`: terminal CSI-u/kitty keyboard parsing now also accepts base/unmodified sequences such as `CSI 97u` and `CSI 13;1u`, mapping printable runes plus Enter, Tab, Esc, and Backspace instead of treating ordinary extended-key reports as unknown.

internal/tui/script_aliases.go

@@ -835,6 +835,21 @@ func (step *ScriptStep) UnmarshalJSON(data []byte) error {
 	if fields.ExpectEventCamel != nil {
 		step.ExpectEvent = fields.ExpectEventCamel
 	}
+	if events := scriptNamedEventListField(fieldMap,
+		[]string{"expect_event", "expectEvent"},
+		"event",
+		"expected_event",
+		"expectedEvent",
+		"expected",
+		"items",
+		"entries",
+		"nodes",
+		"results",
+		"value",
+	); len(events) > 0 {
+		event := events[0]
+		step.ExpectEvent = &event
+	}
 	if events := scriptNamedEventListField(fieldMap,
 		[]string{"expect_events", "expectEvents"},
 		"events",
@@ -880,6 +895,22 @@ func (step *ScriptStep) UnmarshalJSON(data []byte) error {
 	if fields.ExpectDialogResultCamel != nil {
 		step.ExpectDialogResult = fields.ExpectDialogResultCamel
 	}
+	if results := scriptNamedDialogResultListField(fieldMap,
+		[]string{"expect_dialog_result", "expectDialogResult"},
+		"dialog_result",
+		"dialogResult",
+		"result",
+		"expected_result",
+		"expectedResult",
+		"expected",
+		"items",
+		"entries",
+		"nodes",
+		"value",
+	); len(results) > 0 {
+		result := results[0]
+		step.ExpectDialogResult = &result
+	}
 	if results := scriptNamedDialogResultListField(fieldMap,
 		[]string{"expect_dialog_results", "expectDialogResults"},
 		"dialog_results",

internal/tui/tui_test.go

@@ -7085,6 +7085,65 @@ func TestRunInteractionScriptAcceptsWrappedExpectationCollectionAliasFields(t *t
 	}
 }
 
+func TestRunInteractionScriptAcceptsWrappedSingleExpectationAliasFields(t *testing.T) {
+	steps, err := ParseInteractionScript([]byte(`[
+		{"input": "go", "expectPrompt": {"text": "go"}},
+		{
+			"key": "enter",
+			"expectEvent": {
+				"resource": {
+					"attributes": {
+						"event": {"type": "prompt_submitted", "value": "go"}
+					}
+				}
+			}
+		}
+	]`))
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(steps) != 2 || steps[1].ExpectEvent == nil ||
+		steps[1].ExpectEvent.Type != ScreenEventPromptSubmitted ||
+		steps[1].ExpectEvent.Value != "go" {
+		t.Fatalf("expect event = %#v", steps[1].ExpectEvent)
+	}
+	screen := NewREPLScreen(30, 6, nil)
+	if _, err := RunInteractionScriptChecked(&screen, steps); err != nil {
+		t.Fatal(err)
+	}
+
+	dialogSteps, err := ParseInteractionScript([]byte(`[
+		{"request_permission": {"id": "perm_1", "tool_name": "Bash"}},
+		{
+			"key": "enter",
+			"expectDialogResult": {
+				"edge": {
+					"node": {
+						"attrs": {
+							"result": {"id": "perm_1", "status": "allowed", "found": true}
+						}
+					}
+				}
+			}
+		}
+	]`))
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(dialogSteps) != 2 || dialogSteps[1].ExpectDialogResult == nil ||
+		dialogSteps[1].ExpectDialogResult.ID != "perm_1" ||
+		dialogSteps[1].ExpectDialogResult.Status != DialogResultAllowed ||
+		dialogSteps[1].ExpectDialogResult.Found == nil ||
+		!*dialogSteps[1].ExpectDialogResult.Found {
+		t.Fatalf("expect dialog result = %#v", dialogSteps[1].ExpectDialogResult)
+	}
+	dialogScreen := NewREPLScreen(40, 8, nil)
+	runtime := NewDialogRuntime()
+	if _, err := RunDialogRuntimeScriptChecked(&dialogScreen, runtime, "ready", dialogSteps); err != nil {
+		t.Fatal(err)
+	}
+}
+
 func TestRunInteractionScriptAcceptsExpectationWrappers(t *testing.T) {
 	steps, err := ParseInteractionScript([]byte(`[
 		{