Accept wrapped expectation bool fields

Author: SqlRush

docs/cc-100-roadmap.md

@@ -602,6 +602,8 @@ M7 补充：prompt history `LogEntry` 读取现在接受 `sessionID`/`session`/`
 
 本轮补充：interaction script 的 direct focus bool alias 字段现在也递归解包 wrapper；`focus`、`focused`、`focusIn`、`focusOut`、`blur`/`blurred` 可从 wrapped `enabled`、`value`、`selected` 等字段恢复焦点事件控制，避免 direct field fixture 在 bool decode 阶段失败。
 
+本轮补充：interaction script 的 direct expectation bool alias 字段现在也递归解包 wrapper；`expectNoEvent`、`expectNoDialogResult(s)`、`expectFocused` 可从 wrapped `value`/`enabled`/`selected` 恢复断言控制，避免 direct expectation fixture 在 bool decode 阶段失败。
+
 本轮补充：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

@@ -312,6 +312,7 @@ test/parity/                 # golden tests against TS/official behavior
 - 本轮补充：interaction script resize/terminalSize/screenSize action payload 现在递归解包 `value`/`payload`/`data`/`resource`/`attributes`/`properties`/`attrs`/`edge.node` 等 wrapper，官方/API fixture 可把 columns/rows 放在 JSON:API 或 GraphQL envelope 内。
 - 本轮补充：interaction script 的 direct resize 数字 alias 字段现在也递归解包 wrapper；`resizeWidth`/`resizeHeight`、`screenWidth`/`screenHeight` 和 terminal width/height 相邻别名可从 wrapped `value`、`columns`、`rows` 中恢复尺寸。
 - 本轮补充：interaction script 的 direct focus bool alias 字段现在也递归解包 wrapper；`focus`、`focused`、`focusIn`、`focusOut`、`blur`/`blurred` 可从 wrapped `enabled`、`value`、`selected` 等字段恢复焦点事件控制。
+- 本轮补充：interaction script 的 direct expectation bool alias 字段现在也递归解包 wrapper；`expectNoEvent`、`expectNoDialogResult(s)`、`expectFocused` 可从 wrapped `value`/`enabled`/`selected` 恢复断言控制。
 - 本轮补充：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

@@ -292,6 +292,7 @@ M7 progress now includes:
 - `internal/tui`: direct scripted string alias fields such as `text`, `pasteText`, `setStatus`, and `snapshotName` now accept JSON:API/GraphQL-style wrapper objects without failing strong scalar decoding.
 - `internal/tui`: direct scripted resize aliases such as `resizeWidth`/`resizeHeight` and `screenWidth`/`screenHeight` now recursively unwrap numeric JSON:API/GraphQL-style wrapper objects.
 - `internal/tui`: direct scripted focus aliases such as `focus`, `focused`, `focusIn`, `focusOut`, and `blurred` now recursively unwrap boolean JSON:API/GraphQL-style wrapper objects.
+- `internal/tui`: direct scripted expectation bool aliases such as `expectNoEvent`, `expectNoDialogResult(s)`, and `expectFocused` 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

@@ -457,8 +457,8 @@ func (step *ScriptStep) UnmarshalJSON(data []byte) error {
 		ExpectEventCamel          *ScreenEvent              `json:"expectEvent"`
 		ExpectEvents              []ScreenEvent             `json:"expect_events"`
 		ExpectEventsCamel         []ScreenEvent             `json:"expectEvents"`
-		ExpectNoEvent             *bool                     `json:"expect_no_event"`
-		ExpectNoEventCamel        *bool                     `json:"expectNoEvent"`
+		ExpectNoEvent             *json.RawMessage          `json:"expect_no_event"`
+		ExpectNoEventCamel        *json.RawMessage          `json:"expectNoEvent"`
 		ExpectEventCount          *int                      `json:"expect_event_count"`
 		ExpectEventCountCamel     *int                      `json:"expectEventCount"`
 		ExpectTotalEventCount     *int                      `json:"expect_total_event_count"`
@@ -467,9 +467,9 @@ func (step *ScriptStep) UnmarshalJSON(data []byte) error {
 		ExpectDialogResultCamel   *DialogResultExpectation  `json:"expectDialogResult"`
 		ExpectDialogResults       []DialogResultExpectation `json:"expect_dialog_results"`
 		ExpectDialogResultsCamel  []DialogResultExpectation `json:"expectDialogResults"`
-		ExpectNoDialogResult      *bool                     `json:"expect_no_dialog_result"`
-		ExpectNoDialogResultCamel *bool                     `json:"expectNoDialogResult"`
-		ExpectNoDialogResults     *bool                     `json:"expect_no_dialog_results"`
+		ExpectNoDialogResult      *json.RawMessage          `json:"expect_no_dialog_result"`
+		ExpectNoDialogResultCamel *json.RawMessage          `json:"expectNoDialogResult"`
+		ExpectNoDialogResults     *json.RawMessage          `json:"expect_no_dialog_results"`
 		ExpectDialogResultCount   *int                      `json:"expect_dialog_result_count"`
 		ExpectDialogCountCamel    *int                      `json:"expectDialogResultCount"`
 		ExpectTotalDialogCount    *int                      `json:"expect_total_dialog_result_count"`
@@ -488,8 +488,8 @@ func (step *ScriptStep) UnmarshalJSON(data []byte) error {
 		ExpectViewportCamel       *ViewportExpectation      `json:"expectViewport"`
 		ExpectScreen              *ScreenExpectation        `json:"expect_screen"`
 		ExpectScreenCamel         *ScreenExpectation        `json:"expectScreen"`
-		ExpectFocused             *bool                     `json:"expect_focused"`
-		ExpectFocusedCamel        *bool                     `json:"expectFocused"`
+		ExpectFocused             *json.RawMessage          `json:"expect_focused"`
+		ExpectFocusedCamel        *json.RawMessage          `json:"expectFocused"`
 		ExpectStatusContains      *stringList               `json:"expect_status_contains"`
 		ExpectStatusContainsCamel *stringList               `json:"expectStatusContains"`
 		ExpectStatusNotContains   *stringList               `json:"expect_status_not_contains"`
@@ -841,11 +841,8 @@ func (step *ScriptStep) UnmarshalJSON(data []byte) error {
 	if fields.ExpectEventsCamel != nil {
 		step.ExpectEvents = fields.ExpectEventsCamel
 	}
-	if fields.ExpectNoEvent != nil {
-		step.ExpectNoEvent = *fields.ExpectNoEvent
-	}
-	if fields.ExpectNoEventCamel != nil {
-		step.ExpectNoEvent = *fields.ExpectNoEventCamel
+	if value, ok := scriptRuntimeMutationBoolField(fieldMap, "expect_no_event", "expectNoEvent"); ok {
+		step.ExpectNoEvent = value
 	}
 	if fields.ExpectEventCount != nil {
 		step.ExpectEventCount = fields.ExpectEventCount
@@ -871,14 +868,8 @@ func (step *ScriptStep) UnmarshalJSON(data []byte) error {
 	if fields.ExpectDialogResultsCamel != nil {
 		step.ExpectDialogResults = fields.ExpectDialogResultsCamel
 	}
-	if fields.ExpectNoDialogResult != nil {
-		step.ExpectNoDialogResult = *fields.ExpectNoDialogResult
-	}
-	if fields.ExpectNoDialogResultCamel != nil {
-		step.ExpectNoDialogResult = *fields.ExpectNoDialogResultCamel
-	}
-	if fields.ExpectNoDialogResults != nil {
-		step.ExpectNoDialogResult = *fields.ExpectNoDialogResults
+	if value, ok := scriptRuntimeMutationBoolField(fieldMap, "expect_no_dialog_result", "expectNoDialogResult", "expect_no_dialog_results"); ok {
+		step.ExpectNoDialogResult = value
 	}
 	if fields.ExpectDialogResultCount != nil {
 		step.ExpectDialogResultCount = fields.ExpectDialogResultCount
@@ -934,11 +925,9 @@ func (step *ScriptStep) UnmarshalJSON(data []byte) error {
 	if fields.ExpectScreenCamel != nil {
 		step.ExpectScreen = fields.ExpectScreenCamel
 	}
-	if fields.ExpectFocused != nil {
-		step.ExpectFocused = fields.ExpectFocused
-	}
-	if fields.ExpectFocusedCamel != nil {
-		step.ExpectFocused = fields.ExpectFocusedCamel
+	if value, ok := scriptRuntimeMutationBoolField(fieldMap, "expect_focused", "expectFocused"); ok {
+		focused := value
+		step.ExpectFocused = &focused
 	}
 	if fields.ExpectStatusContains != nil {
 		step.ExpectStatusContains = stringListValue(fields.ExpectStatusContains)
@@ -2329,6 +2318,17 @@ func stripScriptStepRawScalarAliasFields(data []byte) []byte {
 		"ResizeHeight",
 		"resizeHeight",
 		"resize_height",
+		"ExpectNoEvent",
+		"expectNoEvent",
+		"expect_no_event",
+		"ExpectNoDialogResult",
+		"expectNoDialogResult",
+		"expect_no_dialog_result",
+		"ExpectNoDialogResults",
+		"expect_no_dialog_results",
+		"ExpectFocused",
+		"expectFocused",
+		"expect_focused",
 	} {
 		raw, ok := fields[name]
 		if !ok {

internal/tui/tui_test.go

@@ -5921,6 +5921,73 @@ func TestRunInteractionScriptAcceptsWrappedFocusAliasFields(t *testing.T) {
 	}
 }
 
+func TestRunInteractionScriptAcceptsWrappedExpectationBoolAliasFields(t *testing.T) {
+	steps, err := ParseInteractionScript([]byte(`[
+		{
+			"expectNoEvent": {
+				"resource": {
+					"attributes": {
+						"value": true
+					}
+				}
+			},
+			"expectNoDialogResult": {
+				"edge": {
+					"node": {
+						"attrs": {
+							"enabled": true
+						}
+					}
+				}
+			}
+		},
+		{
+			"focus": false,
+			"expectEvent": {"type": "focus_out"},
+			"expectFocused": {
+				"resource": {
+					"attributes": {
+						"value": false
+					}
+				}
+			}
+		},
+		{
+			"focus": true,
+			"expectEvent": {"type": "focus_in"},
+			"expectNoDialogResults": {
+				"resource": {
+					"attributes": {
+						"selected": true
+					}
+				}
+			},
+			"expectFocused": {
+				"edge": {
+					"node": {
+						"attrs": {
+							"selected": true
+						}
+					}
+				}
+			}
+		}
+	]`))
+	if err != nil {
+		t.Fatal(err)
+	}
+	screen := NewREPLScreen(40, 8, nil)
+	result, err := RunInteractionScriptChecked(&screen, steps)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(result.Events) != 2 ||
+		result.Events[0].Type != ScreenEventFocusOut ||
+		result.Events[1].Type != ScreenEventFocusIn {
+		t.Fatalf("events = %#v", result.Events)
+	}
+}
+
 func TestRunInteractionScriptAcceptsWrappedMouseAndImageActionPayloads(t *testing.T) {
 	steps, err := ParseInteractionScript([]byte(`[
 		{