Accept string dialog payloads

Author: SqlRush

docs/cc-100-roadmap.md

@@ -642,7 +642,7 @@ M7 补充：prompt history `LogEntry` 读取现在接受 `sessionID`/`session`/`
 
 本轮补充：interaction script 的 direct single message 字段现在也复用 raw message parser；`message`/`Message` 可递归解包 `resource.attributes`、`edge.node.attrs`，并在数组形态下回退为多条 message 追加，避免单条消息 wrapper 被基础解码成空消息。
 
-本轮补充：interaction script 的 direct dialog 字段现在改为 raw payload 解析；`dialog`/`Dialog` 可递归解包 `resource.attributes`、`edge.node.attrs` 和单元素数组，`showDialog` action payload 也复用同一解析路径，避免 wrapper-only dialog 被解码成空弹窗。
+本轮补充：interaction script 的 direct dialog 字段现在改为 raw payload 解析；`dialog`/`Dialog` 可递归解包 `resource.attributes`、`edge.node.attrs` 和单元素数组，`showDialog` action payload 也复用同一解析路径，dialog payload 的 `ID`/`Focused` 可接受数字和数字字符串，避免 wrapper-only 或 Go 默认字段名 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。
 

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

@@ -330,7 +330,7 @@ test/parity/                 # golden tests against TS/official behavior
 - 本轮补充：interaction script 的 direct mouse 字段现在改为 raw payload 解析；`mouse`/`mouse_event`/`mouseEvent` singular 字段可接受单元素数组并递归解包 `resource.attributes`、`edge.node.attrs` 等 wrapper，避免录制脚本把鼠标事件包成 API payload 时提前失败。
 - 本轮补充：interaction script 的 direct message list 字段现在改为 raw payload 解析；`messages`/`appendMessages`/`transcriptMessages` 可递归解包 `resource.attributes`、`data[]`、`edge.node.attrs` 等 API/GraphQL wrapper，并保留 image paste id 等 message metadata。
 - 本轮补充：interaction script 的 direct single message 字段现在也复用 raw message parser；`message`/`Message` 可递归解包 `resource.attributes`、`edge.node.attrs`，并在数组形态下回退为多条 message 追加，避免单条消息 wrapper 被基础解码成空消息。
-- 本轮补充：interaction script 的 direct dialog 字段现在改为 raw payload 解析；`dialog`/`Dialog` 可递归解包 `resource.attributes`、`edge.node.attrs` 和单元素数组，`showDialog` action payload 也复用同一解析路径，避免 wrapper-only dialog 被解码成空弹窗。
+- 本轮补充：interaction script 的 direct dialog 字段现在改为 raw payload 解析；`dialog`/`Dialog` 可递归解包 `resource.attributes`、`edge.node.attrs` 和单元素数组，`showDialog` action payload 也复用同一解析路径，dialog payload 的 `ID`/`Focused` 可接受数字和数字字符串，避免 wrapper-only 或 Go 默认字段名 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、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。

internal/tui/script_aliases.go

@@ -4108,15 +4108,92 @@ func (expect *DialogExpectation) UnmarshalJSON(data []byte) error {
 
 func (dialog *Dialog) UnmarshalJSON(data []byte) error {
 	data = normalizeStringFieldsToArray(data,
-		"actions",
 		"Actions",
+		"actions",
+		"Options",
 		"options",
+		"Choices",
 		"choices",
+		"Buttons",
 		"buttons",
 	)
 	type alias Dialog
 	var raw alias
-	if err := json.Unmarshal(data, &raw); err != nil {
+	if err := json.Unmarshal(stripJSONAliasFields(data,
+		"ID",
+		"id",
+		"DialogID",
+		"dialog_id",
+		"dialogId",
+		"dialogID",
+		"PermissionID",
+		"permission_id",
+		"permissionId",
+		"permissionID",
+		"RequestID",
+		"request_id",
+		"requestId",
+		"requestID",
+		"ToolUseID",
+		"tool_use_id",
+		"toolUseId",
+		"toolUseID",
+		"OperationID",
+		"operation_id",
+		"operationId",
+		"operationID",
+		"Kind",
+		"kind",
+		"DialogKind",
+		"dialog_kind",
+		"dialogKind",
+		"DialogType",
+		"dialog_type",
+		"dialogType",
+		"Title",
+		"title",
+		"Heading",
+		"heading",
+		"Header",
+		"header",
+		"Label",
+		"label",
+		"Name",
+		"name",
+		"Body",
+		"body",
+		"Content",
+		"content",
+		"Text",
+		"text",
+		"Message",
+		"message",
+		"Description",
+		"description",
+		"Actions",
+		"actions",
+		"Options",
+		"options",
+		"Choices",
+		"choices",
+		"Buttons",
+		"buttons",
+		"Focused",
+		"focused",
+		"FocusedIndex",
+		"focused_index",
+		"focusedIndex",
+		"FocusIndex",
+		"focus_index",
+		"focusIndex",
+		"SelectedIndex",
+		"selected_index",
+		"selectedIndex",
+		"Focus",
+		"focus",
+		"Selected",
+		"selected",
+	), &raw); err != nil {
 		return err
 	}
 	*dialog = Dialog(raw)
@@ -4125,26 +4202,26 @@ func (dialog *Dialog) UnmarshalJSON(data []byte) error {
 	if err := json.Unmarshal(data, &fields); err != nil {
 		return err
 	}
+	if dialog.ID == "" {
+		dialog.ID = scalarStringJSONField(fields, "ID", "id", "DialogID", "dialog_id", "dialogId", "dialogID", "PermissionID", "permission_id", "permissionId", "permissionID", "RequestID", "request_id", "requestId", "requestID", "ToolUseID", "tool_use_id", "toolUseId", "toolUseID", "OperationID", "operation_id", "operationId", "operationID")
+	}
+	if dialog.Kind == "" {
+		if dialogKind := stringJSONField(fields, "Kind", "kind", "DialogKind", "dialog_kind", "dialogKind", "DialogType", "dialog_type", "dialogType"); dialogKind != "" {
+			dialog.Kind = DialogKind(dialogKind)
+		}
+	}
 	if dialog.Title == "" {
-		dialog.Title = stringJSONField(fields, "heading", "header", "label", "name")
+		dialog.Title = stringJSONField(fields, "Title", "title", "Heading", "heading", "Header", "header", "Label", "label", "Name", "name")
 	}
 	if dialog.Body == "" {
-		dialog.Body = stringJSONField(fields, "content", "text", "message", "description")
+		dialog.Body = stringJSONField(fields, "Body", "body", "Content", "content", "Text", "text", "Message", "message", "Description", "description")
 	}
 	if len(dialog.Actions) == 0 {
-		dialog.Actions = stringListJSONField(fields, "options", "choices", "buttons")
+		dialog.Actions = stringListJSONField(fields, "Actions", "actions", "Options", "options", "Choices", "choices", "Buttons", "buttons")
 	}
-	if focused := intPtrJSONField(fields, "focused_index", "focusedIndex", "selected_index", "selectedIndex", "focus", "selected"); focused != nil {
+	if focused := intPtrJSONField(fields, "Focused", "focused", "FocusedIndex", "focused_index", "focusedIndex", "FocusIndex", "focus_index", "focusIndex", "SelectedIndex", "selected_index", "selectedIndex", "Focus", "focus", "Selected", "selected"); focused != nil {
 		dialog.Focused = *focused
 	}
-	if dialog.ID == "" {
-		dialog.ID = scalarStringJSONField(fields, "dialog_id", "dialogId", "dialogID", "permission_id", "permissionId", "permissionID", "request_id", "requestId", "requestID", "tool_use_id", "toolUseId", "toolUseID", "operation_id", "operationId", "operationID")
-	}
-	if dialog.Kind == "" {
-		if dialogKind := stringJSONField(fields, "dialog_kind", "dialogKind"); dialogKind != "" {
-			dialog.Kind = DialogKind(dialogKind)
-		}
-	}
 	return nil
 }
 

internal/tui/tui_test.go

@@ -7000,28 +7000,28 @@ func TestRunInteractionScriptAcceptsWrappedDialogStepFields(t *testing.T) {
 				"resource": {
 					"type": "dialog",
 					"attributes": {
-						"dialogId": "wrapped_direct",
-						"dialogKind": "permission",
-						"heading": "Wrapped Direct",
-						"content": "Choose direct.",
-						"options": ["Proceed", "Cancel"],
-						"focusedIndex": 0
+						"ID": 123,
+						"Kind": "permission",
+						"Title": "Wrapped Direct",
+						"Body": "Choose direct.",
+						"Actions": "Proceed",
+						"Focused": "0"
 					}
 				}
 			},
 			"expectDialog": {
 				"visible": true,
-				"dialogId": "wrapped_direct",
+				"dialogId": "123",
 				"dialogKind": "permission",
 				"heading": "Wrapped Direct",
 				"content": "Choose direct.",
-				"actions": ["Proceed", "Cancel"],
+				"actions": "Proceed",
 				"focusedIndex": 0
 			}
 		},
 		{
 			"key": "enter",
-			"expectEvent": {"type": "dialog_action", "value": "Proceed", "dialogId": "wrapped_direct", "dialogKind": "permission"}
+			"expectEvent": {"type": "dialog_action", "value": "Proceed", "dialogId": "123", "dialogKind": "permission"}
 		},
 		{
 			"dialog": [
@@ -7050,7 +7050,7 @@ func TestRunInteractionScriptAcceptsWrappedDialogStepFields(t *testing.T) {
 		t.Fatal(err)
 	}
 	if len(steps) != 4 ||
-		steps[0].Dialog == nil || steps[0].Dialog.ID != "wrapped_direct" || steps[0].Dialog.Title != "Wrapped Direct" || len(steps[0].Dialog.Actions) != 2 ||
+		steps[0].Dialog == nil || steps[0].Dialog.ID != "123" || steps[0].Dialog.Title != "Wrapped Direct" || len(steps[0].Dialog.Actions) != 1 ||
 		steps[2].Dialog == nil || steps[2].Dialog.ID != "wrapped_array" || steps[2].Dialog.Title != "Wrapped Array" || len(steps[2].Dialog.Actions) != 1 {
 		t.Fatalf("steps = %#v", steps)
 	}
@@ -7060,7 +7060,7 @@ func TestRunInteractionScriptAcceptsWrappedDialogStepFields(t *testing.T) {
 		t.Fatal(err)
 	}
 	if len(result.Events) != 2 ||
-		result.Events[0].DialogID != "wrapped_direct" || result.Events[0].Value != "Proceed" ||
+		result.Events[0].DialogID != "123" || result.Events[0].Value != "Proceed" ||
 		result.Events[1].DialogID != "wrapped_array" || result.Events[1].Value != "Approve" {
 		t.Fatalf("events = %#v", result.Events)
 	}