Accept script message paste aliases

Author: SqlRush

docs/cc-100-roadmap.md

@@ -128,7 +128,7 @@ M7 补充：keybinding config 的 page navigation key name 现在接受 `pgup`/`
 
 M7 补充：interaction script 的 `message` step 现在接受 chat/transcript 风格的 `type`/`speaker` role 别名和 `content`/`body`/`message` text 别名；`image` step 接受 `fileName`/`file_name`/`name`、`mimeType`/`mime_type`/`contentType` 和 `data`/`base64` 内容别名；permission request step 接受 request/permission/tool-use ID、path、description 和 action 字段别名，并允许 `actions` 使用单字符串；`expectPrompt` 接受 `value`/`input`/`content`/`message`、`expandedText`/`fullText`、`cursorIndex`/`cursorPosition`、`isEmpty`/`blank` 等字段别名，且 `pastedContents` 断言接受 `pastedId`/`pastedContentId`、`kind`/`pastedType`、`value`/`data`/`base64`、`contentType`/`mimeType`、`fileName`/`name` 和 `contains` 等字段别名；`expectVim` 接受 `vimEnabled`/`isEnabled`、`vimMode`/`modeName`/`currentMode`、`vimRegister`/`registerValue`/`yankRegister`、`registerLinewise`/`linewise` 等字段别名；`expectTasks` 接受 `taskCount`/`total`/`size`/`length` 和 `statusCounts`/`countsByState` 等字段别名；`expectScreen`/`expectViewport` 接受 `columns`/`rows`、`screenWidth`/`screenHeight`、`scrollOffset`/`viewportOffset`、`visibleRows`/`lineCount` 等字段别名；`expectReverseSearch` 接受 `isActive`/`visible`/`open`、`search`/`term`/`pattern`、`cursorIndex`、`currentResult`、`matchCount`/`matches`、`noMatches` 等字段别名；`expectDialog` 可断言 body contains/not-contains、actions/action contains/not-contains、action count 和 focused action，runtime-aware scripts 会在步骤间保留 dialog focused action，且接受 `isActive`/`visible`、`dialogId`/`dialogID`、`dialogKind`、`heading`/`header`、`content`/`text`/`message` 等字段别名；`expectEvent`/`expectDialogResult` 接受 `eventType`/`event`/`name`、`payload`/`text`/`message`、`dialogId`/`dialogID`/`dialogKind`、`actionValue`/`resultStatus`/`exists`/`isStale` 等字段别名。
 
-M7 补充：interaction script 现在接受 `messages`、`append_messages`/`appendMessages`、`transcript_messages`/`transcriptMessages` 批量消息注入字段，且这些字段既可用单个对象也可用对象数组，消息对象沿用 chat/transcript role/text 别名。
+M7 补充：interaction script 现在接受 `messages`、`append_messages`/`appendMessages`、`transcript_messages`/`transcriptMessages` 批量消息注入字段，且这些字段既可用单个对象也可用对象数组，消息对象沿用 chat/transcript role/text 别名；message 注入也接受 `pastedContent`/`attachments` 粘贴内容别名、单数 `imagePasteId` 图片引用别名，以及 pasted-content 的 `kind`/`value`/`data` 内容字段别名。
 
 M7 补充：interaction script 的 direct `dialog` step 现在接受 `dialogId`/`dialogID`、`dialogKind`、`heading`/`header`、`content`/`text`/`message`、`options`/`choices`/`buttons` 和 `focusedIndex`/`selectedIndex` 等字段别名，并允许 actions/options 使用单字符串。
 

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

@@ -306,7 +306,7 @@ test/parity/                 # golden tests against TS/official behavior
 - 本轮补充：interaction script 的 `message` step 接受 `type`/`speaker` role 别名和 `content`/`body`/`message` text 别名；`image` step 接受 `fileName`/`file_name`/`name`、`mimeType`/`mime_type`/`contentType` 和 `data`/`base64` 内容别名；permission request step 接受 request/permission/tool-use ID、path、description 和 action 字段别名，并允许 `actions` 使用单字符串；`expectPrompt` 接受 `value`/`input`/`content`/`message`、`expandedText`/`fullText`、`cursorIndex`/`cursorPosition`、`isEmpty`/`blank` 等字段别名，且 `pastedContents` 断言接受 `pastedId`/`pastedContentId`、`kind`/`pastedType`、`value`/`data`/`base64`、`contentType`/`mimeType`、`fileName`/`name` 和 `contains` 等字段别名；`expectVim` 接受 `vimEnabled`/`isEnabled`、`vimMode`/`modeName`/`currentMode`、`vimRegister`/`registerValue`/`yankRegister`、`registerLinewise`/`linewise` 等字段别名；`expectTasks` 接受 `taskCount`/`total`/`size`/`length` 和 `statusCounts`/`countsByState` 等字段别名；`expectScreen`/`expectViewport` 接受 `columns`/`rows`、`screenWidth`/`screenHeight`、`scrollOffset`/`viewportOffset`、`visibleRows`/`lineCount` 等字段别名；`expectReverseSearch` 接受 `isActive`/`visible`/`open`、`search`/`term`/`pattern`、`cursorIndex`、`currentResult`、`matchCount`/`matches`、`noMatches` 等字段别名；`expectDialog` 可断言 body contains/not-contains、actions/action contains/not-contains、action count 和 focused action，runtime-aware scripts 会在步骤间保留 dialog focused action，且接受 `isActive`/`visible`、`dialogId`/`dialogID`、`dialogKind`、`heading`/`header`、`content`/`text`/`message` 等字段别名；`expectEvent`/`expectDialogResult` 接受 `eventType`/`event`/`name`、`payload`/`text`/`message`、`dialogId`/`dialogID`/`dialogKind`、`actionValue`/`resultStatus`/`exists`/`isStale` 等字段别名。
 - 本轮补充：interaction script step 接受 `resize`/`terminalSize`/`screenSize` 对象或 `[width,height]` 数组、顶层 `columns`/`rows` resize 别名、`focus`/`focused`/`blur`/`focusIn`/`focusOut` focus event 别名、`snapshot`/`snapshotId`/`snapshotLabel` capture 名称别名，以及 runtime-aware mutation 别名如 `permission`/`permissionRequest`、`task`/`taskStatus`、`removeTask`/`deleteTask`、`cancelPermission`、`cancelTasks`/`cancelReason`、`openTasks`/`showTasks`。
 - 本轮补充：interaction script step 可通过 `status`/`setStatus`/`statusLine`/`baseStatus` 设置状态行；runtime-aware scripts 会把它作为 base status，并继续叠加 permission/task 计数，方便复用带 status line 的 ANSI/interaction fixture。
-- 本轮补充：interaction script 批量消息注入接受 `messages`、`append_messages`/`appendMessages`、`transcript_messages`/`transcriptMessages` 字段，且这些字段可用单对象或对象数组，复用 chat/transcript role/text 别名。
+- 本轮补充：interaction script 批量消息注入接受 `messages`、`append_messages`/`appendMessages`、`transcript_messages`/`transcriptMessages` 字段，且这些字段可用单对象或对象数组，复用 chat/transcript role/text 别名；message 注入也接受 `pastedContent`/`attachments` 粘贴内容别名、单数 `imagePasteId` 图片引用别名，以及 pasted-content 的 `kind`/`value`/`data` 内容字段别名。
 - 本轮补充：interaction script direct `dialog` step 接受 `dialogId`/`dialogKind`、`heading`/`header`、`content`/`text`/`message`、`options`/`choices`/`buttons`、`focusedIndex`/`selectedIndex` 等字段别名，且 actions/options 可用单字符串。
 - 本轮补充：interaction script loader 接受 `scriptSteps`/`script_steps`、`interactionSteps`/`interaction_steps` wrapper 字段，并支持一层 `scenario`/`test`/`case`/`fixture`/`interaction` 嵌套对象。
 - 本轮补充：ANSI snapshot corpus 比对支持 `.ansi` only baseline fallback，strict stale-baseline 检查同时覆盖 `.txt` 和 `.ansi`。

docs/first-second-parity-audit.md

@@ -275,7 +275,7 @@ M7 progress now includes:
 - `internal/tui`: prompt pasted-content expectations now accept a single `pastedContents` object as well as an array.
 - `internal/tui`: interaction script task expectations now accept a single `contains` object as well as an array for expected task matches.
 - `internal/tui`: interaction script message steps now accept chat/transcript-style `type`/`speaker` role aliases and `content`/`body`/`message` text aliases.
-- `internal/tui`: interaction script message injection now accepts `messages`, `append_messages`/`appendMessages`, and `transcript_messages`/`transcriptMessages` object or object-array aliases.
+- `internal/tui`: interaction script message injection now accepts `messages`, `append_messages`/`appendMessages`, and `transcript_messages`/`transcriptMessages` object or object-array aliases, plus pasted-content attachment aliases such as `pastedContent`, `attachments`, single `imagePasteId`, and `kind`/`value`/`data` pasted-content fields.
 - `internal/tui`: interaction script image steps now accept filename aliases such as `fileName`/`file_name`/`name`, media-type aliases such as `mimeType`/`mime_type`/`contentType`, and content aliases such as `data`/`base64`.
 - `internal/tui`: interaction script direct dialog steps now accept ID, kind, title/body, action-list, and focused-index aliases aligned with dialog expectations.
 - `internal/tui`: interaction script permission request steps now accept request/permission/tool-use ID aliases, path aliases, description aliases, action-list aliases, and single-string `actions`.

internal/session/history_aliases.go

@@ -48,6 +48,12 @@ func (c *PastedContent) UnmarshalJSON(data []byte) error {
 	type PastedContentJSON PastedContent
 	var aux struct {
 		*PastedContentJSON
+		Kind             string `json:"kind"`
+		PastedType       string `json:"pastedType"`
+		PastedTypeSnake  string `json:"pasted_type"`
+		Value            string `json:"value"`
+		Data             string `json:"data"`
+		Base64           string `json:"base64"`
 		MediaTypeSnake   string `json:"media_type"`
 		MimeType         string `json:"mimeType"`
 		MimeTypeSnake    string `json:"mime_type"`
@@ -67,6 +73,12 @@ func (c *PastedContent) UnmarshalJSON(data []byte) error {
 		return err
 	}
 	*c = PastedContent(base)
+	if c.Type == "" {
+		c.Type = firstHistoryString(aux.Kind, aux.PastedType, aux.PastedTypeSnake)
+	}
+	if c.Content == "" {
+		c.Content = firstHistoryString(aux.Value, aux.Data, aux.Base64)
+	}
 	if c.MediaType == "" {
 		c.MediaType = firstHistoryString(aux.MediaTypeSnake, aux.MimeType, aux.MimeTypeSnake, aux.ContentType, aux.ContentTypeSnake)
 	}

internal/session/history_test.go

@@ -153,12 +153,12 @@ func TestLoadPromptHistoryAcceptsFieldAliases(t *testing.T) {
 
 func TestHistoryEntryAcceptsPastedContentFieldAliases(t *testing.T) {
 	var entry HistoryEntry
-	err := json.Unmarshal([]byte(`{"display":"restore [Image #1]","pasted_contents":{"1":{"id":1,"type":"image","mimeType":"image/png","name":"chart.png","path":"/tmp/chart.png","dimensions":{"width":4000,"height":2000}}}}`), &entry)
+	err := json.Unmarshal([]byte(`{"display":"restore [Image #1]","pasted_contents":{"1":{"id":1,"kind":"image","base64":"AAAA","mimeType":"image/png","name":"chart.png","path":"/tmp/chart.png","dimensions":{"width":4000,"height":2000}}}}`), &entry)
 	if err != nil {
 		t.Fatal(err)
 	}
 	got := entry.PastedContents[1]
-	if got.Type != PastedContentImage || got.MediaType != "image/png" || got.Filename != "chart.png" || got.SourcePath != "/tmp/chart.png" || got.Dimensions == nil || got.Dimensions.OriginalHeight != 2000 {
+	if got.Type != PastedContentImage || got.Content != "AAAA" || got.MediaType != "image/png" || got.Filename != "chart.png" || got.SourcePath != "/tmp/chart.png" || got.Dimensions == nil || got.Dimensions.OriginalHeight != 2000 {
 		t.Fatalf("pasted content aliases = %#v", got)
 	}
 }

internal/tui/script_aliases.go

@@ -1199,19 +1199,41 @@ func (message *Message) UnmarshalJSON(data []byte) error {
 	if len(message.ImagePasteIDs) == 0 {
 		message.ImagePasteIDs = intListJSONField(
 			fields,
+			"imagePasteId",
+			"imagePasteID",
+			"image_paste_id",
 			"imagePasteIds",
 			"imagePasteIDs",
 			"image_paste_ids",
+			"imageId",
+			"imageID",
+			"image_id",
 			"imageIds",
 			"imageIDs",
 			"image_ids",
+			"pastedImageId",
+			"pastedImageID",
+			"pasted_image_id",
 			"pastedImageIds",
 			"pastedImageIDs",
 			"pasted_image_ids",
 		)
 	}
 	if len(message.PastedContents) == 0 {
-		message.PastedContents = pastedContentsJSONField(fields, "pastedContents", "pasted_contents", "pastes", "pasteContents", "paste_contents")
+		message.PastedContents = pastedContentsJSONField(
+			fields,
+			"pastedContents",
+			"pasted_contents",
+			"pastedContent",
+			"pasted_content",
+			"pastes",
+			"pasteContents",
+			"paste_contents",
+			"pasteContent",
+			"paste_content",
+			"attachments",
+			"attachment",
+		)
 	}
 	return nil
 }

internal/tui/tui_test.go

@@ -4675,6 +4675,7 @@ func TestRunInteractionScriptAcceptsMessageListAliases(t *testing.T) {
 			"transcript_messages": [
 				{"role": "tool", "text": "tool output"},
 				{"role": "user", "text": "image history", "imagePasteIds": [9]},
+				{"role": "user", "text": "single image history", "imagePasteId": 10},
 				{
 					"role": "user",
 					"content": [
@@ -4683,11 +4684,20 @@ func TestRunInteractionScriptAcceptsMessageListAliases(t *testing.T) {
 					],
 					"imagePasteIds": [11],
 					"pasted_contents": {"12": {"id": 12, "type": "text", "content": "memo"}}
+				},
+				{
+					"role": "user",
+					"text": "attached [Pasted text #13] [Image #14]",
+					"attachments": [
+						{"id": 13, "kind": "text", "value": "attached memo"},
+						{"id": 14, "pastedType": "image", "data": "BBBB", "contentType": "image/png", "fileName": "attached.png"}
+					],
+					"pastedImageId": 14
 				}
 			],
 			"snapshot": "transcript",
 			"expectSnapshotContains": "tool: tool output",
-			"expectPrompt": {"nextPastedID": 13}
+			"expectPrompt": {"nextPastedID": 15}
 		}
 	]`))
 	if err != nil {
@@ -4701,15 +4711,21 @@ func TestRunInteractionScriptAcceptsMessageListAliases(t *testing.T) {
 	if len(result.Snapshots) != 3 {
 		t.Fatalf("snapshots = %#v", result.Snapshots)
 	}
-	if len(screen.Messages) != 6 {
+	if len(screen.Messages) != 8 {
 		t.Fatalf("messages = %#v", screen.Messages)
 	}
 	if got := screen.Messages[4].ImagePasteIDs; len(got) != 1 || got[0] != 9 {
 		t.Fatalf("image paste ids = %#v", got)
 	}
-	if got := screen.Messages[5]; len(got.ContentBlocks) != 2 || got.ImagePasteIDs[0] != 11 || got.PastedContents[12].Content != "memo" {
+	if got := screen.Messages[5].ImagePasteIDs; len(got) != 1 || got[0] != 10 {
+		t.Fatalf("single image paste id = %#v", got)
+	}
+	if got := screen.Messages[6]; len(got.ContentBlocks) != 2 || got.ImagePasteIDs[0] != 11 || got.PastedContents[12].Content != "memo" {
 		t.Fatalf("content block message = %#v", got)
 	}
+	if got := screen.Messages[7]; len(got.ImagePasteIDs) != 1 || got.ImagePasteIDs[0] != 14 || got.PastedContents[13].Content != "attached memo" || got.PastedContents[14].Filename != "attached.png" {
+		t.Fatalf("attachment message = %#v", got)
+	}
 }
 
 func TestRunInteractionScriptAcceptsInputFieldAliases(t *testing.T) {