Accept message text content aliases

Author: SqlRush

docs/cc-100-roadmap.md

@@ -36,7 +36,7 @@ M6 补充：transcript resume 的嵌套 content block 现在接受 `toolUseId`/`
 
 M6 补充：transcript resume 的 nested content block `id`/`tool_use_id`/`toolUseId` 现在接受 JSON number，并保留为字符串 tool-use ID。
 
-M6 补充：嵌套 contract message 的 `content` 现在接受字符串和单个 content-block 对象；字符串会归一为 text block，并接受 `role`/`messageType` 作为 message type 别名，提升 transcript/remote history payload 恢复率。
+M6 补充：嵌套 contract message 的 `content` 现在接受字符串、单个 content-block 对象，以及混合字符串/content-block 数组；字符串会归一为 text block，并接受 `text`/`body`/`message`/`value`/`output` 正文字段和 `role`/`messageType` 类型别名，提升 transcript/remote history payload 恢复率。
 
 M6 补充：嵌套 contract message 现在接受 `parentUUID`、`parentId`/`parentID`/`parent_id`、`parentMessageId`/`parentMessageID`/`parent_message_id` 和 parent-message UUID 别名，transcript/remote history payload 自带 parent alias 时不会丢失嵌套 parent。
 

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

@@ -203,7 +203,7 @@ test/parity/                 # golden tests against TS/official behavior
 - 本轮补充：remote history `SDKEvent` 本体接受 `eventType`/`event_type`/`role` 类型别名、`createdAt`/`created_at` 时间戳别名，以及 `payload`/`data`/`body`/`serializedMessage` message payload 别名；payload 只有 `role`/`content` 时也能 materialize 成 transcript message。
 - 本轮补充：transcript resume 的嵌套 content block 接受 `toolUseId`/`toolUseID`、`isError`、`cacheControl`、`cacheReference` 字段别名，并保留 cache edit 的 `cacheReference`。
 - 本轮补充：transcript resume 的 nested content block `id`/`tool_use_id`/`toolUseId` 现在接受 JSON number，并保留为字符串 tool-use ID。
-- 本轮补充：嵌套 contract message 的 `content` 接受字符串和单个 content-block 对象；字符串会归一为 text block，并接受 `role`/`messageType` 作为 message type 别名，提升 transcript/remote history payload 恢复率。
+- 本轮补充：嵌套 contract message 的 `content` 接受字符串、单个 content-block 对象，以及混合字符串/content-block 数组；字符串会归一为 text block，并接受 `text`/`body`/`message`/`value`/`output` 正文字段和 `role`/`messageType` 类型别名，提升 transcript/remote history payload 恢复率。
 - 本轮补充：lightweight transcript metadata loader 在 `system`/`compact_boundary` 后清空旧 `marble-origami-commit`/`marble-origami-snapshot` 状态，和 full loader/官方 sessionStorage compact-boundary 语义一致。
 - 本轮补充：transcript metadata loader 接受 `sessionID`/`session` 作为 session-scoped metadata ID 别名，并容忍 `prNumber`、`timeSavedMs`、`lastSpawnTokens` 等计数字段使用数字字符串。
 - 本轮补充：transcript metadata ID helper 现在复用 contract `ID` JSON 解码，`messageID`/`sessionID` 等 metadata ID 字段可接受 JSON number 并保留为字符串。

docs/first-second-parity-audit.md

@@ -131,7 +131,7 @@ M6 progress now includes:
 - `internal/session`: indexed resume chains now distinguish budget-truncated parents from genuinely missing parents, exposing both markers while preserving bounded transcript reads.
 - `internal/session`: transcript full loader and line-offset index now accept entry type aliases such as `role`, `entry_type`, and `messageType`, plus `createdAt`/`created_at` timestamp aliases.
 - `internal/contracts`/`internal/session`: transcript resume now accepts nested content block aliases for `toolUseId`/`toolUseID`, `isError`, `cacheControl`, `cacheReference`, and cache edit `cacheReference`; tool-use content block IDs also accept JSON numbers and preserve them as strings.
-- `internal/contracts`/`internal/session`: nested contract message `content` now accepts string text and single content-block objects, normalizing string content into text blocks and accepting `role`/`messageType` as message type aliases.
+- `internal/contracts`/`internal/session`: nested contract message content now accepts string text, single content-block objects, and mixed string/content-block arrays; string content is normalized into text blocks, while `text`/`body`/`message`/`value`/`output` body aliases and `role`/`messageType` type aliases are preserved.
 - `internal/contracts`/`internal/session`: nested contract messages now accept parent aliases such as `parentUUID`, `parentId`/`parentID`/`parent_id`, `parentMessageId`/`parentMessageID`/`parent_message_id`, and parent-message UUID aliases, preserving payload-supplied parents in transcript and remote-history resume paths.
 - `internal/contracts`/`internal/session`: nested contract messages now accept `messageId`/`messageID`/`message_id` and `messageUuid`/`messageUUID`/`message_uuid` as their own ID/UUID aliases, and primary `id` accepts JSON numbers, preserving payload-supplied nested message IDs in indexed resume output.
 - `internal/contracts`/`internal/session`: the base `SessionEntry` JSONL loader now accepts role/type, message ID/UUID, parent ID/UUID, and session ID/UUID aliases so older entry files keep type, parent, and session metadata when loaded through `session.Load`.

internal/contracts/messages.go

@@ -216,6 +216,11 @@ func (m *Message) UnmarshalJSON(data []byte) error {
 		IsMeta                 bool            `json:"isMeta"`
 		Timestamp              string          `json:"timestamp"`
 		Content                json.RawMessage `json:"content"`
+		Text                   json.RawMessage `json:"text"`
+		Body                   json.RawMessage `json:"body"`
+		MessageText            json.RawMessage `json:"message"`
+		Value                  json.RawMessage `json:"value"`
+		Output                 json.RawMessage `json:"output"`
 		Subtype                string          `json:"subtype"`
 		Model                  string          `json:"model"`
 		Usage                  *Usage          `json:"usage"`
@@ -251,6 +256,9 @@ func (m *Message) UnmarshalJSON(data []byte) error {
 	if err != nil {
 		return err
 	}
+	if len(content) == 0 && isEmptyJSONRaw(aux.Content) {
+		content = textContentBlocksFromRaw(aux.Text, aux.Body, aux.MessageText, aux.Value, aux.Output)
+	}
 	*m = Message{
 		ID:         string(aux.ID),
 		Type:       aux.Type,
@@ -319,7 +327,7 @@ func (m *Message) UnmarshalJSON(data []byte) error {
 
 func contentBlocksFromRaw(raw json.RawMessage) ([]ContentBlock, error) {
 	raw = bytes.TrimSpace(raw)
-	if len(raw) == 0 || bytes.Equal(raw, []byte("null")) {
+	if isEmptyJSONRaw(raw) {
 		return nil, nil
 	}
 	switch raw[0] {
@@ -335,6 +343,20 @@ func contentBlocksFromRaw(raw json.RawMessage) ([]ContentBlock, error) {
 			return nil, err
 		}
 		return []ContentBlock{block}, nil
+	case '[':
+		var items []json.RawMessage
+		if err := json.Unmarshal(raw, &items); err != nil {
+			return nil, err
+		}
+		blocks := make([]ContentBlock, 0, len(items))
+		for _, item := range items {
+			next, err := contentBlocksFromRaw(item)
+			if err != nil {
+				return nil, err
+			}
+			blocks = append(blocks, next...)
+		}
+		return blocks, nil
 	default:
 		var blocks []ContentBlock
 		if err := json.Unmarshal(raw, &blocks); err != nil {
@@ -344,6 +366,25 @@ func contentBlocksFromRaw(raw json.RawMessage) ([]ContentBlock, error) {
 	}
 }
 
+func textContentBlocksFromRaw(values ...json.RawMessage) []ContentBlock {
+	for _, value := range values {
+		value = bytes.TrimSpace(value)
+		if isEmptyJSONRaw(value) || value[0] != '"' {
+			continue
+		}
+		var text string
+		if err := json.Unmarshal(value, &text); err == nil {
+			return []ContentBlock{NewTextBlock(text)}
+		}
+	}
+	return nil
+}
+
+func isEmptyJSONRaw(raw json.RawMessage) bool {
+	raw = bytes.TrimSpace(raw)
+	return len(raw) == 0 || bytes.Equal(raw, []byte("null"))
+}
+
 func firstMessageType(values ...string) MessageType {
 	for _, value := range values {
 		switch MessageType(strings.ToLower(strings.TrimSpace(value))) {

internal/contracts/messages_test.go

@@ -30,3 +30,36 @@ func TestMessageUnmarshalAcceptsSingleContentBlock(t *testing.T) {
 		t.Fatalf("content = %#v", message.Content)
 	}
 }
+
+func TestMessageUnmarshalAcceptsMixedStringContentArray(t *testing.T) {
+	var message Message
+	if err := json.Unmarshal([]byte(`{"type":"assistant","content":["hello",{"type":"text","text":" world"}]}`), &message); err != nil {
+		t.Fatal(err)
+	}
+	if len(message.Content) != 2 ||
+		message.Content[0].Type != ContentText || message.Content[0].Text != "hello" ||
+		message.Content[1].Type != ContentText || message.Content[1].Text != " world" {
+		t.Fatalf("content = %#v", message.Content)
+	}
+}
+
+func TestMessageUnmarshalAcceptsTextBodyAliases(t *testing.T) {
+	for name, raw := range map[string]string{
+		"text":    `{"role":"assistant","text":"from text"}`,
+		"body":    `{"role":"assistant","body":"from body"}`,
+		"message": `{"role":"assistant","message":"from message"}`,
+		"value":   `{"role":"assistant","value":"from value"}`,
+		"output":  `{"role":"assistant","output":"from output"}`,
+		"null":    `{"role":"assistant","content":null,"text":"from null fallback"}`,
+	} {
+		t.Run(name, func(t *testing.T) {
+			var message Message
+			if err := json.Unmarshal([]byte(raw), &message); err != nil {
+				t.Fatal(err)
+			}
+			if message.Type != MessageAssistant || len(message.Content) != 1 || message.Content[0].Text == "" {
+				t.Fatalf("message = %#v", message)
+			}
+		})
+	}
+}

internal/session/remote_history_test.go

@@ -1075,8 +1075,8 @@ func TestRemoteHistoryTranscriptMessagesAcceptsParentIDAliases(t *testing.T) {
 func TestRemoteHistoryTranscriptMessagesAcceptsEventPayloadAliases(t *testing.T) {
 	var response sessionEventsResponse
 	if err := json.Unmarshal([]byte(`{"events":[
-		{"eventType":"user","eventId":"evt_u1","sessionID":"s_payload","createdAt":"2026-01-01T00:00:01Z","payload":{"role":"user","content":"hi"}},
-		{"event_type":"assistant","event_id":"evt_a1","session_id":"s_payload","parentMessageId":"evt_u1","created_at":"2026-01-01T00:00:02Z","body":{"role":"assistant","content":"hello"}}
+		{"eventType":"user","eventId":"evt_u1","sessionID":"s_payload","createdAt":"2026-01-01T00:00:01Z","payload":{"role":"user","text":"hi"}},
+		{"event_type":"assistant","event_id":"evt_a1","session_id":"s_payload","parentMessageId":"evt_u1","created_at":"2026-01-01T00:00:02Z","body":{"role":"assistant","message":"hello"}}
 	]}`), &response); err != nil {
 		t.Fatal(err)
 	}