Accept numeric content replacement IDs

Author: SqlRush

docs/cc-100-roadmap.md

@@ -56,6 +56,8 @@ M6 补充：tag、agent-name、agent-color、agent-setting 和 mode metadata 现
 
 M6 补充：content-replacement metadata 现在接受 `records`/`contentReplacements` 等 record wrapper，以及 record 内 `type`/`content`/`hash` 等字段别名，full loader、metadata loader 和 transcript index 的 replacement 恢复保持一致。
 
+M6 补充：content-replacement metadata 的 `agentId`、record `toolUseId` 和 `blockId` 现在也接受 JSON number，并在 full/lightweight loader 中保留为字符串 ID。
+
 M6 补充：remote history GraphQL/connection 分页现在接受 `hasPrevious`/`hasPreviousPage`、`hasOlder`/`more` 继续分页标记，以及 `previousCursor`/`prevCursor`/`beforeCursor`/`olderCursor` 等 before-id cursor 别名，避免只返回第一页历史。
 
 M6 补充：remote history pagination bool 字段现在除 JSON bool 和 `true`/`false` 字符串外，也接受 `1`/`0`、`yes`/`no`、`on`/`off` 等数值/字符串布尔形态，避免 wrapper/pageInfo 中的非严格布尔值中断分页。

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

@@ -200,6 +200,7 @@ test/parity/                 # golden tests against TS/official behavior
 - 本轮补充：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 并保留为字符串。
 - 本轮补充：context-collapse commit metadata 的 collapse/summary/archived ID 字段现在也走 metadata ID helper，支持 JSON number ID 并保持 full/lightweight loader 一致。
+- 本轮补充：content-replacement metadata 的 `agentId`、record `toolUseId` 和 `blockId` 现在也接受 JSON number，并在 full/lightweight loader 中保留为字符串 ID。
 - 本轮补充：context-collapse snapshot metadata 接受 `isArmed`/`enabled` bool 别名、`spawnTokens`/`tokenCount` 计数字段别名，以及 `stagedMessages`/`items` staged payload wrapper，full loader 和 metadata loader 保持一致。
 - 本轮补充：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。

docs/first-second-parity-audit.md

@@ -163,6 +163,7 @@ M6 progress now includes:
 - `internal/session`: transcript metadata loading now accepts `sessionID` and `session` as session-scoped ID aliases and tolerates numeric strings for counters such as `prNumber`, `timeSavedMs`, and `lastSpawnTokens`.
 - `internal/session`: transcript metadata ID helpers now reuse contract `ID` JSON decoding so metadata IDs such as `messageID` and `sessionID` can be JSON numbers preserved as strings.
 - `internal/session`: context-collapse commit metadata now routes collapse, summary, and archived ID fields through metadata ID decoding so JSON number IDs are preserved in full and lightweight metadata loaders.
+- `internal/session`: content-replacement metadata now preserves JSON number agent, tool-use, and block IDs as strings in full and lightweight metadata loaders.
 - `internal/session`: context-collapse snapshot metadata now accepts alternate armed, token-count, and staged payload field names in both full and lightweight metadata loaders.
 - `internal/session` and `internal/contracts`: transcript records and nested contract messages now accept top-level `sessionID` as a session id alias, preserving it through `LoadTranscript`, `LoadTranscriptIndex`, and indexed resume (`TestLoadTranscriptAcceptsSessionIDUpperAlias`).
 - `internal/contracts`/`internal/session`: remote-history `SDKEvent` decoding now accepts top-level `sessionID` as an event session id alias and preserves it during transcript materialization (`TestRemoteHistoryTranscriptMessagesAcceptsSessionIDUpperAlias`).

internal/session/transcript_aliases.go

@@ -312,46 +312,36 @@ func (m *SnipMetadata) UnmarshalJSON(data []byte) error {
 }
 
 func (r *ContentReplacementRecord) UnmarshalJSON(data []byte) error {
-	type ContentReplacementRecordJSON ContentReplacementRecord
 	var aux struct {
-		*ContentReplacementRecordJSON
-		KindType                 string `json:"type"`
-		KindReplacementCamel     string `json:"replacementKind"`
-		KindReplacementSnake     string `json:"replacement_kind"`
-		ToolUseIDUpper           string `json:"toolUseID"`
-		ToolUseIDSnake           string `json:"tool_use_id"`
-		BlockIDUpper             string `json:"blockID"`
-		BlockIDSnake             string `json:"block_id"`
-		ReplacementContent       string `json:"content"`
-		ReplacementText          string `json:"text"`
-		ReplacementValue         string `json:"value"`
-		ReplacementOutput        string `json:"output"`
-		OriginalHashSnake        string `json:"original_hash"`
-		OriginalHashShort        string `json:"hash"`
-		OriginalContentHashCamel string `json:"originalContentHash"`
-		OriginalContentHashSnake string `json:"original_content_hash"`
-	}
-	base := ContentReplacementRecordJSON{}
-	aux.ContentReplacementRecordJSON = &base
+		KindType                 string       `json:"type"`
+		Kind                     string       `json:"kind"`
+		KindReplacementCamel     string       `json:"replacementKind"`
+		KindReplacementSnake     string       `json:"replacement_kind"`
+		ToolUseID                contracts.ID `json:"toolUseId"`
+		ToolUseIDUpper           contracts.ID `json:"toolUseID"`
+		ToolUseIDSnake           contracts.ID `json:"tool_use_id"`
+		BlockID                  contracts.ID `json:"blockId"`
+		BlockIDUpper             contracts.ID `json:"blockID"`
+		BlockIDSnake             contracts.ID `json:"block_id"`
+		Replacement              string       `json:"replacement"`
+		ReplacementContent       string       `json:"content"`
+		ReplacementText          string       `json:"text"`
+		ReplacementValue         string       `json:"value"`
+		ReplacementOutput        string       `json:"output"`
+		OriginalHash             string       `json:"originalHash"`
+		OriginalHashSnake        string       `json:"original_hash"`
+		OriginalHashShort        string       `json:"hash"`
+		OriginalContentHashCamel string       `json:"originalContentHash"`
+		OriginalContentHashSnake string       `json:"original_content_hash"`
+	}
 	if err := json.Unmarshal(data, &aux); err != nil {
 		return err
 	}
-	*r = ContentReplacementRecord(base)
-	if r.Kind == "" {
-		r.Kind = firstNonEmptyString(aux.KindType, aux.KindReplacementCamel, aux.KindReplacementSnake)
-	}
-	if r.ToolUseID == "" {
-		r.ToolUseID = firstNonEmptyString(aux.ToolUseIDUpper, aux.ToolUseIDSnake)
-	}
-	if r.BlockID == "" {
-		r.BlockID = firstNonEmptyString(aux.BlockIDUpper, aux.BlockIDSnake)
-	}
-	if r.Replacement == "" {
-		r.Replacement = firstNonEmptyString(aux.ReplacementContent, aux.ReplacementText, aux.ReplacementValue, aux.ReplacementOutput)
-	}
-	if r.OriginalHash == "" {
-		r.OriginalHash = firstNonEmptyString(aux.OriginalHashSnake, aux.OriginalHashShort, aux.OriginalContentHashCamel, aux.OriginalContentHashSnake)
-	}
+	r.Kind = firstNonEmptyString(aux.Kind, aux.KindType, aux.KindReplacementCamel, aux.KindReplacementSnake)
+	r.ToolUseID = firstNonEmptyString(string(aux.ToolUseID), string(aux.ToolUseIDUpper), string(aux.ToolUseIDSnake))
+	r.BlockID = firstNonEmptyString(string(aux.BlockID), string(aux.BlockIDUpper), string(aux.BlockIDSnake))
+	r.Replacement = firstNonEmptyString(aux.Replacement, aux.ReplacementContent, aux.ReplacementText, aux.ReplacementValue, aux.ReplacementOutput)
+	r.OriginalHash = firstNonEmptyString(aux.OriginalHash, aux.OriginalHashSnake, aux.OriginalHashShort, aux.OriginalContentHashCamel, aux.OriginalContentHashSnake)
 	return nil
 }
 

internal/session/transcript_metadata_fields.go

@@ -224,23 +224,32 @@ func parseSnapshotMessageID(line []byte) contracts.ID {
 }
 
 func parseContentReplacementMetadata(line []byte) (ContentReplacementEntry, bool) {
-	var entry ContentReplacementEntry
-	if err := json.Unmarshal(line, &entry); err != nil {
-		return ContentReplacementEntry{}, false
-	}
 	fields, err := parseTranscriptMetadataFields(line)
 	if err != nil {
 		return ContentReplacementEntry{}, false
 	}
+	var aux struct {
+		Type         string          `json:"type"`
+		SessionID    contracts.ID    `json:"sessionId"`
+		Replacements json.RawMessage `json:"replacements"`
+	}
+	if err := json.Unmarshal(line, &aux); err != nil {
+		return ContentReplacementEntry{}, false
+	}
+	entry := ContentReplacementEntry{
+		Type:         aux.Type,
+		SessionID:    aux.SessionID,
+		Replacements: parseContentReplacementRecords(aux.Replacements),
+	}
 	if entry.SessionID == "" {
 		entry.SessionID = fields.sessionIDValue()
 	}
 	if entry.AgentID == "" {
-		entry.AgentID = fields.stringValue(
-			"agentID", "agent_id", "agent",
+		entry.AgentID = string(fields.idValue(
+			"agentId", "agentID", "agent_id", "agent",
 			"sidechainId", "sidechainID", "sidechain_id",
 			"subagentId", "subagentID", "subagent_id",
-		)
+		))
 	}
 	if len(entry.Replacements) == 0 {
 		entry.Replacements = parseContentReplacementRecords(fields.rawValue(

internal/session/transcript_test.go

@@ -643,6 +643,7 @@ func TestLoadTranscriptCollectsMetadataEntries(t *testing.T) {
 		`{"type":"content-replacement","sessionId":"s1","agentId":"agent_1","replacements":[{"toolUseId":"toolu_2","replacement":"agent stub"}]}`,
 		`{"type":"content_replacement","session_id":"s3","agent_id":"agent_2","replacements":[{"tool_use_id":"toolu_4","block_id":"block_4","original_hash":"hash_4","replacement":"snake agent stub"}]}`,
 		`{"type":"content-replacement","sessionId":"s1","agentID":"agent_3","replacements":[{"toolUseID":"toolu_5","blockID":"block_5","originalHash":"hash_5","replacement":"upper agent stub"}]}`,
+		`{"type":"content-replacement","sessionId":"s10","agentId":7001,"replacements":[{"toolUseId":7002,"blockId":7003,"replacement":"numeric agent stub"}]}`,
 		`{"type":"content-replacement","sessionID":"s9","records":{"type":"tool-result","toolUseID":"toolu_9","blockID":"block_9","hash":"hash_9","content":"record alias stub"}}`,
 		`{"type":"marble_origami_commit","session_id":"s3","collapse_id":"c1","summary_uuid":"sum1","summary_content":"collapsed","summary":"short","first_archived_uuid":"u1","last_archived_uuid":"a1"}`,
 		`{"type":"marble-origami-commit","sessionID":"s4","collapseID":"c2","summaryID":"sum2","content":"upper collapsed","firstArchivedID":"u2","lastArchivedID":"a2"}`,
@@ -714,6 +715,9 @@ func TestLoadTranscriptCollectsMetadataEntries(t *testing.T) {
 	if got := transcript.ContentReplacements["agent_3"]; len(got) != 1 || got[0].ToolUseID != "toolu_5" || got[0].BlockID != "block_5" || got[0].Replacement != "upper agent stub" {
 		t.Fatalf("upper agent content replacements = %#v", got)
 	}
+	if got := transcript.ContentReplacements["7001"]; len(got) != 1 || got[0].ToolUseID != "7002" || got[0].BlockID != "7003" || got[0].Replacement != "numeric agent stub" {
+		t.Fatalf("numeric agent content replacements = %#v", got)
+	}
 	if got := transcript.ContentReplacements["s9"]; len(got) != 1 || got[0].Kind != "tool-result" || got[0].ToolUseID != "toolu_9" || got[0].BlockID != "block_9" || got[0].OriginalHash != "hash_9" || got[0].Replacement != "record alias stub" {
 		t.Fatalf("record alias content replacements = %#v", got)
 	}
@@ -787,6 +791,9 @@ func TestLoadTranscriptCollectsMetadataEntries(t *testing.T) {
 	if got := metadata.ContentReplacements["agent_3"]; len(got) != 1 || got[0].ToolUseID != "toolu_5" || got[0].BlockID != "block_5" || got[0].Replacement != "upper agent stub" {
 		t.Fatalf("metadata upper agent replacements = %#v", got)
 	}
+	if got := metadata.ContentReplacements["7001"]; len(got) != 1 || got[0].ToolUseID != "7002" || got[0].BlockID != "7003" || got[0].Replacement != "numeric agent stub" {
+		t.Fatalf("metadata numeric agent replacements = %#v", got)
+	}
 	if got := metadata.ContentReplacements["s9"]; len(got) != 1 || got[0].Kind != "tool-result" || got[0].ToolUseID != "toolu_9" || got[0].BlockID != "block_9" || got[0].OriginalHash != "hash_9" || got[0].Replacement != "record alias stub" {
 		t.Fatalf("metadata record alias replacements = %#v", got)
 	}