Accept nested message id aliases

Author: SqlRush

docs/cc-100-roadmap.md

@@ -36,6 +36,8 @@ M6 补充：transcript resume 的嵌套 content block 现在接受 `toolUseId`/`
 
 M6 补充：嵌套 contract message 现在接受 `parentUUID`、`parentId`/`parentID`/`parent_id`、`parentMessageId`/`parentMessageID`/`parent_message_id` 和 parent-message UUID 别名，transcript/remote history payload 自带 parent alias 时不会丢失嵌套 parent。
 
+M6 补充：嵌套 contract message 现在接受 `messageId`/`messageID`/`message_id` 和 `messageUuid`/`messageUUID`/`message_uuid` 作为自身 ID/UUID 别名，indexed resume 会保留 payload 自带的 nested message id。
+
 M6 补充：remote history GraphQL/connection 分页现在接受 `hasPrevious`/`hasPreviousPage`、`hasOlder`/`more` 继续分页标记，以及 `previousCursor`/`prevCursor`/`beforeCursor`/`olderCursor` 等 before-id cursor 别名，避免只返回第一页历史。
 
 M6 补充：remote history response parser 现在会递归解包 `data.session.events`、`data.projectSession.eventConnection`、`conversation`、`remoteHistory` 等 GraphQL/session wrapper，继续复用 `nodes`/`edges[].node` 和 `pageInfo` pagination 解析。

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

@@ -197,6 +197,7 @@ test/parity/                 # golden tests against TS/official behavior
 - 本轮补充：transcript metadata loader 接受 `sessionID`/`session` 作为 session-scoped metadata ID 别名，并容忍 `prNumber`、`timeSavedMs`、`lastSpawnTokens` 等计数字段使用数字字符串。
 - 本轮补充：transcript message 和嵌套 contract message 接受顶层 `sessionID` 作为 session id 别名，`LoadTranscript`、`LoadTranscriptIndex` 和 indexed resume 会保留该 session id（覆盖测试：`TestLoadTranscriptAcceptsSessionIDUpperAlias`）。
 - 本轮补充：嵌套 contract message 接受 `parentUUID`、`parentId`/`parentID`/`parent_id`、`parentMessageId`/`parentMessageID`/`parent_message_id` 和 parent-message UUID 别名，transcript/remote history payload 自带 parent alias 时不会丢失嵌套 parent。
+- 本轮补充：嵌套 contract message 接受 `messageId`/`messageID`/`message_id` 和 `messageUuid`/`messageUUID`/`message_uuid` 作为自身 ID/UUID 别名，indexed resume 会保留 payload 自带的 nested message id。
 - 本轮补充：remote history `SDKEvent` 解码接受顶层 `sessionID` 作为事件 session id 别名，materialize transcript 时会填充 record 与嵌套 message 的 session id（覆盖测试：`TestRemoteHistoryTranscriptMessagesAcceptsSessionIDUpperAlias`）。
 - 本轮补充：remote history `SDKEvent` 解码接受 `parentUUID`、`parentId`/`parentID`/`parent_id`、`parentMessageId`/`parentMessageID`/`parent_message_id` parent aliases，materialize transcript 时会保留 parent chain（覆盖测试：`TestRemoteHistoryTranscriptMessagesAcceptsParentIDAliases`）。
 - 本轮补充：memory 层补齐官方 `memoryAge`/freshness note 语义，`ReadDocumentsWithOptions` 可为超过 1 天的 memory 文档前缀 system-reminder，提示模型把 memory 当作 point-in-time observation 并核对当前代码。

docs/first-second-parity-audit.md

@@ -131,6 +131,7 @@ M6 progress now includes:
 - `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`.
 - `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, preserving payload-supplied nested message IDs in indexed resume output.
 - `internal/session`: remote-history parsing now also accepts connection-style `history`/`messages` wrappers with `nodes`/`edges[].node` event lists and `pageInfo`/`page_info` `hasNextPage`/`endCursor`/`startCursor` pagination aliases.
 - `internal/session`: remote-history connection edges now use `edges[].cursor` as the event cursor when the nested node lacks an event ID, preserving pagination even when pageInfo omits a cursor.
 - `internal/session`: remote-history parsing now also accepts `eventList`/`event_list`, `sessionEvents`/`session_events`, and connection aliases such as `connection`, `eventConnection`, and `sessionEventsConnection`.

internal/contracts/messages.go

@@ -164,6 +164,12 @@ func (m *Message) UnmarshalJSON(data []byte) error {
 	type MessageJSON Message
 	var aux struct {
 		*MessageJSON
+		MessageID              ID    `json:"messageId"`
+		MessageIDUpper         ID    `json:"messageID"`
+		MessageIDSnake         ID    `json:"message_id"`
+		MessageUUID            ID    `json:"messageUuid"`
+		MessageUUIDUpper       ID    `json:"messageUUID"`
+		MessageUUIDSnake       ID    `json:"message_uuid"`
 		ParentUUIDUpper        *ID   `json:"parentUUID"`
 		ParentUUIDSnake        *ID   `json:"parent_uuid"`
 		ParentID               *ID   `json:"parentId"`
@@ -188,6 +194,19 @@ func (m *Message) UnmarshalJSON(data []byte) error {
 		return err
 	}
 	*m = Message(base)
+	if m.ID == "" {
+		m.ID = string(firstMessageID(aux.MessageID, aux.MessageIDUpper, aux.MessageIDSnake))
+	}
+	if m.UUID == "" {
+		m.UUID = firstMessageID(
+			aux.MessageUUID,
+			aux.MessageUUIDUpper,
+			aux.MessageUUIDSnake,
+			aux.MessageID,
+			aux.MessageIDUpper,
+			aux.MessageIDSnake,
+		)
+	}
 	if m.ParentUUID == nil {
 		m.ParentUUID = firstMessageIDPtr(
 			aux.ParentUUIDUpper,
@@ -224,6 +243,15 @@ func (m *Message) UnmarshalJSON(data []byte) error {
 	return nil
 }
 
+func firstMessageID(values ...ID) ID {
+	for _, value := range values {
+		if value != "" {
+			return value
+		}
+	}
+	return ""
+}
+
 func firstMessageIDPtr(values ...*ID) *ID {
 	for _, value := range values {
 		if value != nil && *value != "" {

internal/session/transcript_test.go

@@ -157,9 +157,9 @@ func TestLoadTranscriptAcceptsSerializedMessageMetadata(t *testing.T) {
 
 func TestLoadTranscriptAcceptsMessageUUIDFieldAliases(t *testing.T) {
 	path := writeTranscript(t, []string{
-		`{"type":"user","messageUuid":"u1","session_id":"sess_1","timestamp":"2026-01-01T00:00:00Z","message":{"type":"user","session_id":"sess_1","content":[{"type":"text","text":"hi"}]}}`,
+		`{"type":"user","messageUuid":"u1","session_id":"sess_1","timestamp":"2026-01-01T00:00:00Z","message":{"type":"user","messageId":"nested_u1","session_id":"sess_1","content":[{"type":"text","text":"hi"}]}}`,
 		`{"type":"progress","messageId":"p1","parentMessageUuid":"u1"}`,
-		`{"type":"assistant","message_id":"a1","parentMessageID":"p1","session_id":"sess_1","timestamp":"2026-01-01T00:00:01Z","message":{"type":"assistant","session_id":"sess_1","content":[{"type":"text","text":"done"}]}}`,
+		`{"type":"assistant","message_id":"a1","parentMessageID":"p1","session_id":"sess_1","timestamp":"2026-01-01T00:00:01Z","message":{"type":"assistant","messageUUID":"nested_a1","session_id":"sess_1","content":[{"type":"text","text":"done"}]}}`,
 	})
 
 	transcript, err := LoadTranscript(path)
@@ -170,6 +170,12 @@ func TestLoadTranscriptAcceptsMessageUUIDFieldAliases(t *testing.T) {
 	if assistant == nil || assistant.ParentUUID == nil || *assistant.ParentUUID != "u1" {
 		t.Fatalf("aliased assistant parent = %#v", assistant)
 	}
+	if user := transcript.Messages["u1"]; user == nil || user.Message == nil || user.Message.ID != "nested_u1" || user.Message.UUID != "nested_u1" {
+		t.Fatalf("aliased nested user id = %#v", user)
+	}
+	if assistant.Message == nil || assistant.Message.UUID != "nested_a1" {
+		t.Fatalf("aliased nested assistant id = %#v", assistant.Message)
+	}
 	chain := transcript.BuildConversationChain("a1")
 	if got := chainIDs(chain); strings.Join(got, ",") != "u1,a1" {
 		t.Fatalf("aliased uuid chain = %#v", got)
@@ -186,7 +192,7 @@ func TestLoadTranscriptAcceptsMessageUUIDFieldAliases(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if !resume.Found || strings.Join(chainIDs(resume.Chain), ",") != "u1,a1" || resume.Messages[1].UUID != "a1" {
+	if !resume.Found || strings.Join(chainIDs(resume.Chain), ",") != "u1,a1" || resume.Messages[0].UUID != "nested_u1" || resume.Messages[1].UUID != "nested_a1" {
 		t.Fatalf("aliased uuid indexed resume = %#v chain=%#v", resume, chainIDs(resume.Chain))
 	}
 }