Normalize scripted screen event aliases

Author: SqlRush

docs/first-second-parity-audit.md

@@ -285,6 +285,7 @@ M7 progress now includes:
 - `internal/tui`: interaction script paste payloads now accept DOM `clipboardData`/`dataTransfer` objects and recover pasted text from `text/plain`, `plainText`, and `items[].text` fields for ClipboardEvent recording fixtures.
 - `internal/tui`: interaction script resize payloads now accept DOM/window size aliases such as `innerWidth`/`innerHeight`, `clientWidth`/`clientHeight`, `offsetWidth`/`offsetHeight`, plus ResizeObserver-style `contentRect` and `target` wrappers.
 - `internal/tui`: interaction script resize payloads now accept ResizeObserver `contentBoxSize`/`borderBoxSize` array entries using `inlineSize`/`blockSize`, covering modern browser box-size event shapes.
+- `internal/tui`: interaction script event expectations now normalize camel/dash/provider-style event names such as `promptSubmitted`, `dialogAction`, `messageSubmitted`, and `focusOut` to canonical screen event types, and accept value aliases such as `eventPayload`, `eventValue`, `actionValue`, and `result`.
 - `internal/tui`: task runtime now canonicalizes state aliases such as `active`/`inProgress`/`in_progress`, `success`/`done`/`completedSuccessfully`, `error`/`failedWithError`, and `canceled`/`cancelledByUser` before status-line summaries, task dialogs, ordering, cancellation, and scripted task expectations.
 - `internal/tui`: scripted task runtime payloads and task expectations now accept adjacent fields such as `taskID`, `jobId`, `runId`, `label`, `displayName`/`displayTitle`, `operationName`/`commandName`, `phase`/`taskState`/`jobStatus`/`resultState`, `message`/`currentStep`/`statusMessage`/`outputText`/`resultText`, `percent`/`percentage`/`pct`/`completionPercent`, and numeric/string task IDs or progress values.
 - `internal/tui`: scripted task runtime payloads, task expectations, and remove-task mutations now also share adjacent task ID aliases such as `operationId`, `requestId`, `threadId`, `workflowId`, and `toolUseId`, so recorded runtime actions can address tasks through operation/request-style IDs.

internal/tui/script_aliases.go

@@ -4616,10 +4616,30 @@ func (event *ScreenEvent) UnmarshalJSON(data []byte) error {
 		"event",
 		"Name",
 		"name",
+		"EventName",
+		"event_name",
+		"eventName",
 		"Value",
 		"value",
+		"EventValue",
+		"event_value",
+		"eventValue",
 		"Payload",
 		"payload",
+		"EventPayload",
+		"event_payload",
+		"eventPayload",
+		"ActionValue",
+		"action_value",
+		"actionValue",
+		"Result",
+		"result",
+		"Selection",
+		"selection",
+		"Input",
+		"input",
+		"Prompt",
+		"prompt",
 		"Text",
 		"text",
 		"Message",
@@ -4665,12 +4685,27 @@ func (event *ScreenEvent) UnmarshalJSON(data []byte) error {
 		return err
 	}
 	if event.Type == "" {
-		if eventType := stringJSONField(fields, "Type", "type", "EventType", "event_type", "eventType", "Event", "event", "Name", "name"); eventType != "" {
-			event.Type = ScreenEventType(eventType)
+		if eventType := stringJSONField(fields, "Type", "type", "EventType", "event_type", "eventType", "Event", "event", "Name", "name", "EventName", "event_name", "eventName"); eventType != "" {
+			event.Type = normalizeScreenEventType(eventType)
 		}
 	}
+	if event.Type != "" {
+		event.Type = normalizeScreenEventType(string(event.Type))
+	}
 	if event.Value == "" {
-		event.Value = scalarStringJSONField(fields, "Value", "value", "Payload", "payload", "Text", "text", "Message", "message", "Data", "data")
+		event.Value = scalarStringJSONField(fields,
+			"Value", "value",
+			"EventValue", "event_value", "eventValue",
+			"Payload", "payload", "EventPayload", "event_payload", "eventPayload",
+			"ActionValue", "action_value", "actionValue",
+			"Result", "result",
+			"Selection", "selection",
+			"Input", "input",
+			"Prompt", "prompt",
+			"Text", "text",
+			"Message", "message",
+			"Data", "data",
+		)
 	}
 	if event.Display == "" {
 		event.Display = scalarStringJSONField(fields, "Display", "display")
@@ -4686,6 +4721,50 @@ func (event *ScreenEvent) UnmarshalJSON(data []byte) error {
 	return nil
 }
 
+func normalizeScreenEventType(raw string) ScreenEventType {
+	name := normalizeActionName(raw)
+	switch name {
+	case "", "none", "no_event", "noop", "no_op":
+		return ScreenEventNone
+	case "prompt_submitted", "prompt_submit", "submit_prompt", "submit", "submitted", "message_submitted", "input_submitted":
+		return ScreenEventPromptSubmitted
+	case "dialog_action", "dialog_action_selected", "dialog_selected", "dialog_submit", "dialog_button", "dialog_button_clicked", "action_selected", "action_clicked":
+		return ScreenEventDialogAction
+	case "cancelled", "canceled", "cancel", "prompt_cancelled", "prompt_canceled", "dismissed", "escape":
+		return ScreenEventCancelled
+	case "interrupted", "interrupt", "stop", "stopped", "stop_generation", "cancel_generation":
+		return ScreenEventInterrupted
+	case "exit_pending", "pending_exit", "confirm_exit":
+		return ScreenEventExitPending
+	case "exit", "quit", "closed":
+		return ScreenEventExit
+	case "redraw", "clear", "clear_screen", "refresh", "refresh_screen":
+		return ScreenEventRedraw
+	case "toggle_transcript", "transcript_toggled", "show_transcript":
+		return ScreenEventToggleTranscript
+	case "toggle_todos", "toggle_todo", "toggle_tasks", "tasks_toggled":
+		return ScreenEventToggleTodos
+	case "external_editor", "open_editor", "editor_opened":
+		return ScreenEventExternalEditor
+	case "stash_prompt", "prompt_stashed", "stash":
+		return ScreenEventStashPrompt
+	case "kill_agents", "agents_killed", "cancel_agents":
+		return ScreenEventKillAgents
+	case "reverse_search", "history_search", "search_history":
+		return ScreenEventReverseSearch
+	case "reverse_search_selected", "history_search_selected", "search_selected":
+		return ScreenEventReverseSelected
+	case "focus_in", "focus", "focused":
+		return ScreenEventFocusIn
+	case "focus_out", "blur", "blurred":
+		return ScreenEventFocusOut
+	case "viewport_selected", "viewport_selection", "selection", "selected":
+		return ScreenEventViewportSelected
+	default:
+		return ScreenEventType(raw)
+	}
+}
+
 func (expect *DialogResultExpectation) UnmarshalJSON(data []byte) error {
 	data = normalizeBoolFields(data,
 		"Found",

internal/tui/tui_test.go

@@ -9964,6 +9964,95 @@ func TestRunDialogRuntimeScriptAcceptsEventAndResultAliases(t *testing.T) {
 	}
 }
 
+func TestRunInteractionScriptNormalizesScreenEventAliases(t *testing.T) {
+	steps, err := ParseInteractionScript([]byte(`[
+		{
+			"text": "go",
+			"key": "enter",
+			"expectEvent": {
+				"eventName": "promptSubmitted",
+				"eventPayload": "go"
+			}
+		},
+		{
+			"text": "again",
+			"key": "enter",
+			"expectEvents": [
+				{
+					"eventType": "messageSubmitted",
+					"eventValue": "again"
+				}
+			]
+		},
+		{
+			"focusOut": true,
+			"expectEvent": {
+				"event": "focusOut"
+			},
+			"expectFocused": false
+		}
+	]`))
+	if err != nil {
+		t.Fatal(err)
+	}
+	screen := NewREPLScreen(42, 8, nil)
+	result, err := RunInteractionScriptChecked(&screen, steps)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(result.Events) != 3 ||
+		result.Events[0].Type != ScreenEventPromptSubmitted || result.Events[0].Value != "go" ||
+		result.Events[1].Type != ScreenEventPromptSubmitted || result.Events[1].Value != "again" ||
+		result.Events[2].Type != ScreenEventFocusOut {
+		t.Fatalf("events = %#v", result.Events)
+	}
+}
+
+func TestRunDialogRuntimeScriptNormalizesDialogEventAliases(t *testing.T) {
+	steps, err := ParseInteractionScript([]byte(`[
+		{
+			"requestPermission": {"requestID": "perm_event", "tool": "Bash", "actions": "Approve"},
+			"expectDialog": {"active": true, "permissionID": "perm_event", "dialogKind": "permission"}
+		},
+		{
+			"key": "enter",
+			"expectEvent": {
+				"resource": {
+					"attributes": {
+						"eventName": "dialogAction",
+						"actionValue": "Approve",
+						"permissionID": "perm_event",
+						"dialogKind": "permission"
+					}
+				}
+			},
+			"expectDialogResult": {
+				"eventName": "dialogAction",
+				"actionValue": "Approve",
+				"permissionID": "perm_event",
+				"dialogKind": "permission",
+				"result": "allowed",
+				"found": true
+			}
+		}
+	]`))
+	if err != nil {
+		t.Fatal(err)
+	}
+	screen := NewREPLScreen(42, 8, nil)
+	runtime := NewDialogRuntime()
+	result, err := RunDialogRuntimeScriptChecked(&screen, runtime, "ready", steps)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(result.Events) != 1 || result.Events[0].Type != ScreenEventDialogAction || result.Events[0].Value != "Approve" || result.Events[0].DialogID != "perm_event" {
+		t.Fatalf("events = %#v", result.Events)
+	}
+	if len(result.DialogResults) != 1 || result.DialogResults[0].Status != DialogResultAllowed {
+		t.Fatalf("dialog results = %#v", result.DialogResults)
+	}
+}
+
 func TestRunDialogRuntimeScriptChecksDialogResultCounts(t *testing.T) {
 	steps, err := ParseInteractionScript([]byte(`[
 		{