Accept scripted expectation wrappers

Author: SqlRush

docs/cc-100-roadmap.md

@@ -514,6 +514,8 @@ M7 补充：prompt history `LogEntry` 读取现在接受 `sessionID`/`session`/`
 
 本轮补充：scripted interaction 的布尔字段现在接受非严格 bool payload，包括 `"true"`/`"false"`、`yes`/`no`、`on`/`off` 和数字 `1`/`0`；覆盖 mouse release、dialog visible/result、prompt empty、vim state、reverse-search，以及 focus/cancel/openTasks/expectNoEvent/expectFocused 等顶层 step 控制字段，减少官方/外部交互脚本 fixture 因 bool 表示差异失败的情况。
 
+本轮补充：scripted interaction step 现在接受 `expect`/`expected`/`assertions`/`checks`/`verify`/`then`/`after` 等 expectation wrapper object，可把嵌套的 prompt/event/dialog/snapshot/screen/task/vim/viewport 断言映射到已有 `expect*` 字段。
+
 本轮补充：keybinding config、keymap 解析和 interaction script named-key 输入接受 `ctrl-h`/`ctrl-i`/`ctrl-j`/`ctrl-m`、`ctrl-[`、`ctrl-?`、对应 `control-*` 以及 compact/camel 形式；terminal parser 支持 CSI-u/kitty keyboard protocol 的 ctrl/alt/shift-enter/shift-tab 序列；image hint parser 支持 OSC ST terminator 和 base64 `name=` filename；keybinding JSON loader 支持 wrapper object-map、`shortcuts`、object action 字段、string-array key sequence/chord 和 `null`/`false` unbind；mouse parser 支持 legacy X10/normal tracking 序列；interaction script 支持结构化 mouse/mouse_event 步骤，button 接受 `buttonMask`/`button_mask`/`btn`/`code`/`mask`，坐标接受 `mouseX`/`mouse_x`/`clientX`/`screenX`/`pageX`/`offsetX`/`viewportX` 和对应 Y/row/line 别名，release 接受 `mouseUp`/`isRelease`/`mouseRelease`/`releaseEvent` 等字段别名；interaction script 还支持字符串 `keys` 和 `input`/`input_text`/`keys_text`/`raw_key`/`paste_text` 字段别名，并允许 status/snapshot/viewport/pasted-content contains 断言使用单字符串或字符串数组，`keybindings`、`expectEvents`、`expectDialogResults`、`expectPrompt.pastedContents` 和 `expectTasks.contains` 使用单对象或对象数组。
 
 本轮补充：keybinding config 和脚本 named-key 输入现在接受短修饰符别名，包括 `c-`/`m-`/`a-`/`opt-`/`s-` 以及 compact/camel 形式，可覆盖 control、meta、alt、option 和 shift key names。

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

@@ -271,6 +271,7 @@ test/parity/                 # golden tests against TS/official behavior
 - 本轮补充：permission runtime 会把 `Reject`/`deny`/`decline`/`disallow`/`no` 等 permission action 归一为 denied 结果，把 `Cancel`/`abort` 归一为 cancelled 结果，并让 scripted dialog-result status 断言接受 `rejected`/`approved` 等状态别名。
 - 本轮补充：scripted permission payload、dialog expectation、event、cancel-permission 和 dialog-result expectation 现在接受 `permissionID`、`requestID`、`toolUseID`、`operationID`、`operation`、`commandName`、`resourcePath`、`body`、`reasonText`、`allowedActions`、`buttons` 等相邻字段，并支持数字 request ID。
 - 本轮补充：scripted interaction 的布尔字段现在接受非严格 bool payload，包括 `"true"`/`"false"`、`yes`/`no`、`on`/`off` 和数字 `1`/`0`；覆盖 mouse release、dialog visible/result、prompt empty、vim state、reverse-search，以及 focus/cancel/openTasks/expectNoEvent/expectFocused 等顶层 step 控制字段。
+- 本轮补充：scripted interaction step 现在接受 `expect`/`expected`/`assertions`/`checks`/`verify`/`then`/`after` 等 expectation wrapper object，可把嵌套的 prompt/event/dialog/snapshot/screen/task/vim/viewport 断言映射到已有 `expect*` 字段。
 - 本轮补充：keybinding config、keymap 解析和 interaction script named-key 输入接受 `ctrl-h`/`ctrl-i`/`ctrl-j`/`ctrl-m`、`ctrl-[`、`ctrl-?`、对应 `control-*` 以及 compact/camel 形式；terminal parser 支持 CSI-u/kitty keyboard protocol 的 ctrl/alt/shift-enter/shift-tab 序列；image hint parser 支持 OSC ST terminator 和 base64 `name=` filename；keybinding JSON loader 支持 wrapper object-map、`shortcuts`、object action 字段、string-array key sequence/chord 和 `null`/`false` unbind；mouse parser 支持 legacy X10/normal tracking 序列；interaction script 支持结构化 mouse/mouse_event 步骤，button 接受 `buttonMask`/`button_mask`/`btn`/`code`/`mask`，坐标接受 `mouseX`/`mouse_x`/`clientX`/`screenX`/`pageX`/`offsetX`/`viewportX` 和对应 Y/row/line 别名，release 接受 `mouseUp`/`isRelease`/`mouseRelease`/`releaseEvent` 等字段别名；interaction script 还支持字符串 `keys` 和 `input`/`input_text`/`keys_text`/`raw_key`/`paste_text` 字段别名，并允许 status/snapshot/viewport/pasted-content contains 断言使用单字符串或字符串数组，`keybindings`、`expectEvents`、`expectDialogResults`、`expectPrompt.pastedContents` 和 `expectTasks.contains` 使用单对象或对象数组。
 - 本轮补充：keybinding config 的 page navigation key name 现在接受 `pgup`/`pg-up`/`prior` 和 `pgdn`/`pg-down`/`next`，覆盖常见终端键名/配置别名。
 - 本轮补充：keybinding config 和脚本 named-key 输入接受 DOM-style arrow key aliases，包括 `arrowLeft`/`arrowRight`/`arrowUp`/`arrowDown` 以及 ctrl/alt/meta/option arrow variants。

docs/first-second-parity-audit.md

@@ -210,6 +210,7 @@ M7 progress now includes:
 - `internal/tui`: permission runtime now treats action aliases such as `Reject`, `deny`, `decline`, `disallow`, and `no` as denied results, `Cancel`/`abort` as cancelled results, and keeps allowed aliases canonical for scripted dialog-result status checks.
 - `internal/tui`: scripted permission payloads, dialog expectations, events, cancellation, and dialog-result expectations now accept adjacent ID and field aliases such as `permissionID`, `requestID`, `toolUseID`, `operationID`, `operation`, `commandName`, `resourcePath`, `body`, `reasonText`, `allowedActions`, `buttons`, and numeric request IDs.
 - `internal/tui`: scripted interaction boolean aliases now accept non-strict bool payloads (`"true"`/`"false"`, `yes`/`no`, `on`/`off`, and numeric `1`/`0`) for mouse release, dialog visibility/result checks, prompt empty checks, vim state checks, reverse-search checks, and top-level step controls such as focus, cancellation, task dialog open, and negative event assertions.
+- `internal/tui`: scripted interaction steps now accept expectation wrapper objects such as `expect`, `expected`, `assertions`, `checks`, `verify`, `then`, and `after`, mapping nested prompt/event/dialog/snapshot/screen/task/vim/viewport assertions onto the existing `expect*` fields.
 - `internal/tui`: interaction scripts can now set status/baseStatus via `status`, `setStatus`, `statusLine`, or `baseStatus`, and runtime-aware scripts retain that base while layering permission/task status counts.
 - `internal/tui`: terminal lifecycle can now manage extended-key reporting with Kitty keyboard protocol plus xterm modifyOtherKeys, including disable ordering and pop-before-push reassertion to avoid Kitty stack leaks.
 - `internal/tui`: renderer and ANSI snapshots now have an opt-in DEC 2026 synchronized-output wrapper for official BSU/ESU frame fixtures without changing default rendering.

internal/tui/script_aliases.go

@@ -268,6 +268,7 @@ func isBindingSpecObject(data json.RawMessage) bool {
 
 func (step *ScriptStep) UnmarshalJSON(data []byte) error {
 	data = unwrapScriptStepJSON(data)
+	data = mergeScriptStepExpectationJSON(data)
 	rawStepData := data
 	data = normalizeScriptStepJSON(data)
 	type alias ScriptStep
@@ -930,6 +931,125 @@ func (step *ScriptStep) UnmarshalJSON(data []byte) error {
 	return nil
 }
 
+func mergeScriptStepExpectationJSON(data []byte) []byte {
+	var fields map[string]json.RawMessage
+	if err := json.Unmarshal(data, &fields); err != nil {
+		return data
+	}
+	changed := false
+	for _, name := range []string{
+		"expect",
+		"expected",
+		"expectation",
+		"expectations",
+		"assert",
+		"asserts",
+		"assertion",
+		"assertions",
+		"check",
+		"checks",
+		"verify",
+		"verification",
+		"then",
+		"after",
+	} {
+		raw, ok := fields[name]
+		if !ok {
+			continue
+		}
+		raw = bytes.TrimSpace(raw)
+		if len(raw) == 0 || bytes.Equal(raw, []byte("null")) || raw[0] != '{' {
+			continue
+		}
+		nested := map[string]json.RawMessage{}
+		if err := json.Unmarshal(raw, &nested); err != nil {
+			continue
+		}
+		if mergeScriptStepExpectationFields(fields, nested) {
+			changed = true
+		}
+	}
+	if !changed {
+		return data
+	}
+	merged, err := json.Marshal(fields)
+	if err != nil {
+		return data
+	}
+	return merged
+}
+
+func mergeScriptStepExpectationFields(fields map[string]json.RawMessage, nested map[string]json.RawMessage) bool {
+	changed := false
+	for name, raw := range nested {
+		if target := scriptStepExpectationTargetField(name); target != "" {
+			if _, exists := fields[target]; !exists {
+				fields[target] = raw
+				changed = true
+			}
+			continue
+		}
+		if strings.HasPrefix(name, "expect") || strings.HasPrefix(name, "Expect") {
+			if _, exists := fields[name]; !exists {
+				fields[name] = raw
+				changed = true
+			}
+		}
+	}
+	return changed
+}
+
+func scriptStepExpectationTargetField(name string) string {
+	switch canonicalScriptStepAction(name) {
+	case "event":
+		return "expectEvent"
+	case "events":
+		return "expectEvents"
+	case "noevent", "no-event":
+		return "expectNoEvent"
+	case "eventcount", "event-count":
+		return "expectEventCount"
+	case "totaleventcount", "total-event-count":
+		return "expectTotalEventCount"
+	case "dialog":
+		return "expectDialog"
+	case "dialogresult", "dialog-result":
+		return "expectDialogResult"
+	case "dialogresults", "dialog-results":
+		return "expectDialogResults"
+	case "nodialogresult", "no-dialog-result", "nodialogresults", "no-dialog-results":
+		return "expectNoDialogResult"
+	case "dialogresultcount", "dialog-result-count":
+		return "expectDialogResultCount"
+	case "totaldialogresultcount", "total-dialog-result-count":
+		return "expectTotalDialogResultCount"
+	case "prompt", "input":
+		return "expectPrompt"
+	case "vim":
+		return "expectVim"
+	case "tasks":
+		return "expectTasks"
+	case "reversesearch", "reverse-search":
+		return "expectReverseSearch"
+	case "viewport":
+		return "expectViewport"
+	case "screen", "terminal":
+		return "expectScreen"
+	case "focused", "focus":
+		return "expectFocused"
+	case "statuscontains", "status-contains":
+		return "expectStatusContains"
+	case "statusnotcontains", "status-not-contains":
+		return "expectStatusNotContains"
+	case "snapshotcontains", "snapshot-contains":
+		return "expectSnapshotContains"
+	case "snapshotnotcontains", "snapshot-not-contains":
+		return "expectSnapshotNotContains"
+	default:
+		return ""
+	}
+}
+
 func unwrapScriptStepJSON(data []byte) []byte {
 	var fields map[string]json.RawMessage
 	if err := json.Unmarshal(data, &fields); err != nil {

internal/tui/tui_test.go

@@ -6059,6 +6059,48 @@ func TestRunInteractionScriptAcceptsEventFieldAliases(t *testing.T) {
 	}
 }
 
+func TestRunInteractionScriptAcceptsExpectationWrappers(t *testing.T) {
+	steps, err := ParseInteractionScript([]byte(`[
+		{
+			"action": "typeText",
+			"value": "go",
+			"expect": {
+				"prompt": {"text": "go"},
+				"noEvent": "true"
+			}
+		},
+		{
+			"type": "press",
+			"value": "enter",
+			"assertions": {
+				"event": {"type": "prompt_submitted", "value": "go"},
+				"eventCount": 1,
+				"totalEventCount": 1,
+				"prompt": {"empty": "yes"}
+			}
+		},
+		{
+			"message": {"role": "assistant", "text": "ready"},
+			"snapshot": "ready-state",
+			"checks": {
+				"snapshotContains": "assistant: ready",
+				"screen": {"columns": 30, "rows": 6}
+			}
+		}
+	]`))
+	if err != nil {
+		t.Fatal(err)
+	}
+	screen := NewREPLScreen(30, 6, nil)
+	result, err := RunInteractionScriptChecked(&screen, steps)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(result.Events) != 1 || result.Events[0].Type != ScreenEventPromptSubmitted || len(result.Snapshots) != 1 || result.Snapshots[0].Name != "ready-state" {
+		t.Fatalf("result = %#v", result)
+	}
+}
+
 func TestRunDialogRuntimeScriptAcceptsEventAndResultAliases(t *testing.T) {
 	steps, err := ParseInteractionScript([]byte(`[
 		{