Accept remote history event payload aliases

Author: SqlRush

docs/cc-100-roadmap.md

@@ -84,6 +84,8 @@ M6 补充：remote history event-list 现在接受 `value`/`values`/`resources`/
 
 M6 补充：remote history response parser 现在会解包 `payload`/`response`/`result`/`body` 等通用响应外壳，外壳内的 event list、pagination、links 会继续递归解析。
 
+M6 补充：remote history `SDKEvent` 本体现在接受 `eventType`/`event_type`/`role` 类型别名、`createdAt`/`created_at` 时间戳别名，以及 `payload`/`data`/`body`/`serializedMessage` message payload 别名；payload 只有 `role`/`content` 时也能 materialize 成 transcript message。
+
 M6 补充：remote history REST/link 风格分页现在接受 `links`/`_links` 的 `next`/`previous`/`prev`/`older` 字符串 URL 或 `{href,url,uri,link}` 对象，并从 `before_id`、`beforeId`、`cursor`、`pageCursor`、`previousCursor`、`prevCursor`、`beforeCursor`、`olderCursor`、`startCursor`、`endCursor` 等 query 参数提取下一页 before-id。
 
 M6 补充：remote history REST/link 风格分页现在也接受 RFC/JSON:API 风格的 `links` 数组，按 `rel`/`relation`/`name`/`type` 中的 `previous`/`prev`/`older`/`next` 选择续抓 URL，并从同一组 before/cursor query 参数提取 before-id。

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

@@ -200,6 +200,7 @@ test/parity/                 # golden tests against TS/official behavior
 - 本轮补充：remote history response parser 会递归解包 `data.session.events`、`data.projectSession.eventConnection`、`conversation`、`remoteHistory`、`_embedded` 等 GraphQL/session/HAL wrapper，继续复用 `nodes`/`edges[].node` 和 `pageInfo` pagination 解析。
 - 本轮补充：remote history event-list 接受 `value`/`values`/`resources`/`collection` 别名，connection edge 也接受 `resource`/`value` 作为 node payload，覆盖 OData/HAL/resource collection 风格响应。
 - 本轮补充：remote history response parser 会解包 `payload`/`response`/`result`/`body` 等通用响应外壳，外壳内的 event list、pagination、links 会继续递归解析。
+- 本轮补充：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。
 - 本轮补充：lightweight transcript metadata loader 在 `system`/`compact_boundary` 后清空旧 `marble-origami-commit`/`marble-origami-snapshot` 状态，和 full loader/官方 sessionStorage compact-boundary 语义一致。

docs/first-second-parity-audit.md

@@ -147,6 +147,7 @@ M6 progress now includes:
 - `internal/session`: remote-history parsing now also accepts `eventList`/`event_list`, `sessionEvents`/`session_events`, and connection aliases such as `connection`, `eventConnection`, and `sessionEventsConnection`.
 - `internal/session`: remote-history parsing now also accepts `value`, `values`, `resources`, and `collection` event-list aliases, plus `edges[].resource`/`edges[].value` node payload aliases.
 - `internal/session`: remote-history parsing now unwraps generic response envelopes such as `payload`, `response`, `result`, and `body` when they contain event lists and pagination fields.
+- `internal/contracts`/`internal/session`: remote-history event materialization now accepts `eventType`/`event_type`/`role` type aliases, `createdAt`/`created_at` timestamp aliases, and message payload aliases such as `payload`, `data`, `body`, and `serializedMessage`, including role/content-only payloads.
 - `internal/session`: remote-history pageInfo parsing now accepts previous/older pagination signals such as `hasPrevious`/`hasPreviousPage`, `hasOlder`/`more`, and before-id cursors such as `previousCursor`/`prevCursor`/`beforeCursor`/`olderCursor`.
 - `internal/session`: remote-history pagination bool parsing now accepts numeric and yes/no-style bool values in addition to JSON bools and true/false strings.
 - `internal/session`: remote-history pagination cursor/id parsing now accepts JSON numbers and preserves them as string cursors for page fields and `edges[].cursor`.

internal/contracts/session.go

@@ -1,6 +1,7 @@
 package contracts
 
 import (
+	"bytes"
 	"encoding/json"
 	"strings"
 )
@@ -142,26 +143,52 @@ func (e *SDKEvent) UnmarshalJSON(data []byte) error {
 	type SDKEventJSON SDKEvent
 	var aux struct {
 		*SDKEventJSON
-		EventIDSnake         ID  `json:"event_id"`
-		EventIDCamel         ID  `json:"eventId"`
-		SessionIDUpper       ID  `json:"sessionID"`
-		SessionUUID          ID  `json:"sessionUuid"`
-		SessionUUIDUpper     ID  `json:"sessionUUID"`
-		SessionUUIDSnake     ID  `json:"session_uuid"`
-		ParentUUIDUpper      *ID `json:"parentUUID"`
-		ParentID             *ID `json:"parentId"`
-		ParentIDUpper        *ID `json:"parentID"`
-		ParentIDSnake        *ID `json:"parent_id"`
-		ParentMessageID      *ID `json:"parentMessageId"`
-		ParentMessageIDUpper *ID `json:"parentMessageID"`
-		ParentMessageIDSnake *ID `json:"parent_message_id"`
+		EventTypeSnake         string          `json:"event_type"`
+		EventTypeCamel         string          `json:"eventType"`
+		Event                  string          `json:"event"`
+		Name                   string          `json:"name"`
+		Kind                   string          `json:"kind"`
+		Role                   string          `json:"role"`
+		MessageType            string          `json:"messageType"`
+		MessageTypeSnake       string          `json:"message_type"`
+		EventIDSnake           ID              `json:"event_id"`
+		EventIDCamel           ID              `json:"eventId"`
+		SessionIDUpper         ID              `json:"sessionID"`
+		SessionUUID            ID              `json:"sessionUuid"`
+		SessionUUIDUpper       ID              `json:"sessionUUID"`
+		SessionUUIDSnake       ID              `json:"session_uuid"`
+		ParentUUIDUpper        *ID             `json:"parentUUID"`
+		ParentID               *ID             `json:"parentId"`
+		ParentIDUpper          *ID             `json:"parentID"`
+		ParentIDSnake          *ID             `json:"parent_id"`
+		ParentMessageID        *ID             `json:"parentMessageId"`
+		ParentMessageIDUpper   *ID             `json:"parentMessageID"`
+		ParentMessageIDSnake   *ID             `json:"parent_message_id"`
+		CreatedAt              string          `json:"createdAt"`
+		CreatedAtSnake         string          `json:"created_at"`
+		Time                   string          `json:"time"`
+		Datetime               string          `json:"datetime"`
+		DateTime               string          `json:"dateTime"`
+		MessagePayload         json.RawMessage `json:"message_payload"`
+		MessagePayloadCamel    json.RawMessage `json:"messagePayload"`
+		SerializedMessage      json.RawMessage `json:"serialized_message"`
+		SerializedMessageCamel json.RawMessage `json:"serializedMessage"`
+		Payload                json.RawMessage `json:"payload"`
+		Data                   json.RawMessage `json:"data"`
+		Body                   json.RawMessage `json:"body"`
+		Record                 json.RawMessage `json:"record"`
+		Entry                  json.RawMessage `json:"entry"`
+		Item                   json.RawMessage `json:"item"`
 	}
 	base := SDKEventJSON{}
 	aux.SDKEventJSON = &base
 	if err := json.Unmarshal(data, &aux); err != nil {
 		return err
 	}
 	*e = SDKEvent(base)
+	if e.Type == "" {
+		e.Type = firstSDKEventType(aux.EventTypeSnake, aux.EventTypeCamel, aux.Event, aux.Name, aux.Kind, aux.MessageType, aux.MessageTypeSnake, aux.Role)
+	}
 	if e.ID == "" {
 		e.ID = aux.EventIDSnake
 	}
@@ -180,6 +207,9 @@ func (e *SDKEvent) UnmarshalJSON(data []byte) error {
 	if e.SessionID == "" {
 		e.SessionID = aux.SessionUUIDSnake
 	}
+	if e.Timestamp == "" {
+		e.Timestamp = firstSDKEventString(aux.CreatedAt, aux.CreatedAtSnake, aux.Time, aux.Datetime, aux.DateTime)
+	}
 	if e.ParentUUID == nil {
 		e.ParentUUID = firstSDKEventIDPtr(
 			aux.ParentUUIDUpper,
@@ -191,9 +221,55 @@ func (e *SDKEvent) UnmarshalJSON(data []byte) error {
 			aux.ParentMessageIDSnake,
 		)
 	}
+	if e.Message == nil {
+		e.Message = firstSDKEventMessage(e.Type,
+			aux.MessagePayload,
+			aux.MessagePayloadCamel,
+			aux.SerializedMessage,
+			aux.SerializedMessageCamel,
+			aux.Payload,
+			aux.Data,
+			aux.Body,
+			aux.Record,
+			aux.Entry,
+			aux.Item,
+		)
+	}
+	if e.Message == nil {
+		e.Message = sdkEventTopLevelMessage(data, e.Type)
+	}
 	return nil
 }
 
+func firstSDKEventType(values ...string) SDKEventType {
+	for _, value := range values {
+		switch strings.ToLower(strings.TrimSpace(value)) {
+		case string(SDKEventSystem):
+			return SDKEventSystem
+		case string(SDKEventAssistant):
+			return SDKEventAssistant
+		case string(SDKEventUser):
+			return SDKEventUser
+		case string(SDKEventResult):
+			return SDKEventResult
+		case string(SDKEventError):
+			return SDKEventError
+		case string(SDKEventStatus):
+			return SDKEventStatus
+		}
+	}
+	return ""
+}
+
+func firstSDKEventString(values ...string) string {
+	for _, value := range values {
+		if value != "" {
+			return value
+		}
+	}
+	return ""
+}
+
 func firstSDKEventIDPtr(values ...*ID) *ID {
 	for _, value := range values {
 		if value != nil && *value != "" {
@@ -203,3 +279,67 @@ func firstSDKEventIDPtr(values ...*ID) *ID {
 	}
 	return nil
 }
+
+func firstSDKEventMessage(eventType SDKEventType, values ...json.RawMessage) *Message {
+	for _, value := range values {
+		if message := sdkEventMessageFromRaw(value, eventType); message != nil {
+			return message
+		}
+	}
+	return nil
+}
+
+func sdkEventMessageFromRaw(raw json.RawMessage, eventType SDKEventType) *Message {
+	raw = bytes.TrimSpace(raw)
+	if len(raw) == 0 || bytes.Equal(raw, []byte("null")) {
+		return nil
+	}
+	var message Message
+	if err := json.Unmarshal(raw, &message); err == nil && sdkEventMessageHasData(message) {
+		if message.Type == "" {
+			message.Type = MessageType(eventType)
+		}
+		return &message
+	}
+	var fields map[string]json.RawMessage
+	if err := json.Unmarshal(raw, &fields); err != nil {
+		return nil
+	}
+	for _, name := range []string{"message", "serialized_message", "serializedMessage", "payload", "data", "body"} {
+		if nested := sdkEventMessageFromRaw(fields[name], eventType); nested != nil {
+			return nested
+		}
+	}
+	return nil
+}
+
+func sdkEventTopLevelMessage(data []byte, eventType SDKEventType) *Message {
+	var message Message
+	if err := json.Unmarshal(data, &message); err != nil || !sdkEventTopLevelMessageHasData(message) {
+		return nil
+	}
+	if message.Type == "" {
+		message.Type = MessageType(eventType)
+	}
+	return &message
+}
+
+func sdkEventMessageHasData(message Message) bool {
+	return message.Type != "" ||
+		message.ID != "" ||
+		message.UUID != "" ||
+		message.SessionID != "" ||
+		message.ParentUUID != nil ||
+		message.Timestamp != "" ||
+		len(message.Content) > 0 ||
+		message.Subtype != "" ||
+		message.Model != "" ||
+		message.Usage != nil
+}
+
+func sdkEventTopLevelMessageHasData(message Message) bool {
+	return len(message.Content) > 0 ||
+		message.Subtype != "" ||
+		message.Model != "" ||
+		message.Usage != nil
+}

internal/session/remote_history_test.go

@@ -1072,6 +1072,35 @@ 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":[{"type":"text","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","content":[{"type":"text","text":"hello"}]}}
+	]}`), &response); err != nil {
+		t.Fatal(err)
+	}
+	messages := RemoteHistoryTranscriptMessages(response.Events)
+	if len(messages) != 2 || messages[0].UUID != "evt_u1" || messages[1].UUID != "evt_a1" {
+		t.Fatalf("messages = %#v", messages)
+	}
+	if messages[0].Type != "user" || messages[0].SessionID != "s_payload" || messages[0].Timestamp != "2026-01-01T00:00:01Z" {
+		t.Fatalf("user payload aliases = %#v", messages[0])
+	}
+	if messages[0].Message == nil || messages[0].Message.Type != contracts.MessageUser || messages[0].Message.SessionID != "s_payload" {
+		t.Fatalf("user nested message = %#v", messages[0].Message)
+	}
+	if messages[1].Type != "assistant" || messages[1].SessionID != "s_payload" || messages[1].Timestamp != "2026-01-01T00:00:02Z" {
+		t.Fatalf("assistant payload aliases = %#v", messages[1])
+	}
+	if messages[1].ParentUUID == nil || *messages[1].ParentUUID != "evt_u1" {
+		t.Fatalf("assistant parent alias = %#v", messages[1].ParentUUID)
+	}
+	if messages[1].Message == nil || messages[1].Message.Type != contracts.MessageAssistant || messages[1].Message.ParentUUID == nil || *messages[1].Message.ParentUUID != "evt_u1" {
+		t.Fatalf("assistant nested message = %#v", messages[1].Message)
+	}
+}
+
 func TestRemoteHistoryTranscriptMessagesAcceptsNumericIDAliases(t *testing.T) {
 	var response sessionEventsResponse
 	if err := json.Unmarshal([]byte(`{"events":[{"type":"user","id":101,"sessionId":7,"timestamp":"2026-01-01T00:00:01Z","message":{"type":"user","content":[{"type":"text","text":"hi"}]}},{"type":"assistant","eventId":102,"sessionId":7,"parentMessageID":101,"timestamp":"2026-01-01T00:00:02Z","message":{"type":"assistant","content":[{"type":"text","text":"hello"}]}}]}`), &response); err != nil {