Accept numeric content block tool IDs

Author: SqlRush

docs/cc-100-roadmap.md

@@ -34,6 +34,8 @@
 
 M6 补充：transcript resume 的嵌套 content block 现在接受 `toolUseId`/`toolUseID`、`isError`、`cacheControl`、`cacheReference` 字段别名，并保留 cache edit 的 `cacheReference`。
 
+M6 补充：transcript resume 的 nested content block `id`/`tool_use_id`/`toolUseId` 现在接受 JSON number，并保留为字符串 tool-use ID。
+
 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。

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

@@ -196,6 +196,7 @@ test/parity/                 # golden tests against TS/official behavior
 - 本轮补充：contract `ID` JSON 读取现在接受 JSON number/null，remote history event/message/session/parent ID alias 可继承数字 ID 兼容面并在 transcript materialization 中保留为字符串。
 - 本轮补充：remote history response parser 会递归解包 `data.session.events`、`data.projectSession.eventConnection`、`conversation`、`remoteHistory` 等 GraphQL/session wrapper，继续复用 `nodes`/`edges[].node` 和 `pageInfo` pagination 解析。
 - 本轮补充：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 语义一致。
 - 本轮补充：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

@@ -129,7 +129,7 @@ M6 progress now includes:
 - `internal/session`: project session listing and pagination, prompt-history lock/buffered flush/field aliases, lightweight transcript index/title/text-preview inference, line-offset transcript indexing/window/byte-budget-window/parent-chain/resume/tail/byte-budget-tail loading, AI-title/last-prompt/task/agent/PR/worktree transcript metadata loading and type/field aliases, transcript message/session UUID field aliases, tombstone metadata loading with target/session/reason aliases and delete/relink replay, agent-scoped content replacement metadata/record field-alias loading, session-scoped metadata reappend including AI-title/last-prompt/task-summary, streaming transcript search snippets for resume/search UI, official `subagents/agent-*.jsonl` transcript layout with legacy sidechain listing, agent metadata sidecar read/write/field aliases, sidechain runtime start/append/finish/cancel/fail summary bridging plus parent-chain append/finish, sidechain manager orchestration for spawn/append/finish/cancel/fail/list/resume, sidechain state/list/resume support with content-field aliases, sidechain resume context construction, sidechain conversation and agent-scoped content-replacement reconstruction, transcript tail/window loading and byte-budget tail loading for bounded-memory resume/UI paths, lightweight transcript metadata loading, remote-history token refresh retry, page-field/event-list/records/entries/last-id/cursor/event-id/has-next aliases plus wrapped-data/links/paging/bare-array responses, before_id resume, fallback field fill, and duplicate-aware parent linking during transcript materialization.
 - `internal/session`: transcript full loader and line-offset index now accept top-level record UUID aliases such as `messageUuid`, `messageUUID`, `message_id`, `messageId`, and `id`, plus parent message UUID/ID aliases for progress bridge and indexed resume paths.
 - `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`: 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 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/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

@@ -40,19 +40,44 @@ type ContentBlock struct {
 }
 
 func (b *ContentBlock) UnmarshalJSON(data []byte) error {
-	type contentBlockJSON ContentBlock
-	var base contentBlockJSON
-	if err := json.Unmarshal(data, &base); err != nil {
+	var aux struct {
+		Type           ContentBlockType `json:"type"`
+		Text           string           `json:"text"`
+		Source         any              `json:"source"`
+		ID             ID               `json:"id"`
+		Name           string           `json:"name"`
+		Input          json.RawMessage  `json:"input"`
+		Content        any              `json:"content"`
+		IsError        bool             `json:"is_error"`
+		ToolUseID      ID               `json:"tool_use_id"`
+		CacheControl   *CacheControl    `json:"cache_control"`
+		CacheReference string           `json:"cache_reference"`
+		Edits          []CacheEdit      `json:"edits"`
+	}
+	if err := json.Unmarshal(data, &aux); err != nil {
 		return err
 	}
-	*b = ContentBlock(base)
+	*b = ContentBlock{
+		Type:           aux.Type,
+		Text:           aux.Text,
+		Source:         aux.Source,
+		ID:             string(aux.ID),
+		Name:           aux.Name,
+		Input:          aux.Input,
+		Content:        aux.Content,
+		IsError:        aux.IsError,
+		ToolUseID:      string(aux.ToolUseID),
+		CacheControl:   aux.CacheControl,
+		CacheReference: aux.CacheReference,
+		Edits:          aux.Edits,
+	}
 
 	fields := map[string]json.RawMessage{}
 	if err := json.Unmarshal(data, &fields); err != nil {
 		return err
 	}
 	if b.ToolUseID == "" {
-		b.ToolUseID = stringJSONField(fields, "toolUseId", "toolUseID")
+		b.ToolUseID = idJSONField(fields, "toolUseId", "toolUseID")
 	}
 	if _, hasCanonical := fields["is_error"]; !hasCanonical {
 		if value, ok := boolJSONField(fields, "isError"); ok {
@@ -117,6 +142,20 @@ func stringJSONField(fields map[string]json.RawMessage, names ...string) string
 	return ""
 }
 
+func idJSONField(fields map[string]json.RawMessage, names ...string) string {
+	for _, name := range names {
+		raw, ok := fields[name]
+		if !ok {
+			continue
+		}
+		var value ID
+		if err := json.Unmarshal(raw, &value); err == nil {
+			return string(value)
+		}
+	}
+	return ""
+}
+
 func boolJSONField(fields map[string]json.RawMessage, names ...string) (bool, bool) {
 	for _, name := range names {
 		raw, ok := fields[name]

internal/session/transcript_test.go

@@ -513,8 +513,8 @@ func TestBuildResumeConversationConvertsTranscriptChain(t *testing.T) {
 
 func TestBuildResumeConversationAcceptsContentBlockFieldAliases(t *testing.T) {
 	path := writeTranscript(t, []string{
-		`{"type":"assistant","uuid":"a1","sessionId":"s1","timestamp":"2026-01-01T00:00:01Z","message":{"type":"assistant","content":[{"type":"tool_use","id":"toolu_1","name":"Read","cacheControl":{"type":"ephemeral","ttl":"5m"}},{"type":"cache_edits","cacheReference":"cache_ref_1","edits":[{"type":"clear","cacheReference":"cache_ref_0"}]}]}}`,
-		`{"type":"user","uuid":"tr1","sessionId":"s1","parentUuid":"a1","timestamp":"2026-01-01T00:00:02Z","content":[{"type":"tool_result","toolUseId":"toolu_1","isError":true,"content":"denied"}]}`,
+		`{"type":"assistant","uuid":"a1","sessionId":"s1","timestamp":"2026-01-01T00:00:01Z","message":{"type":"assistant","content":[{"type":"tool_use","id":9001,"name":"Read","cacheControl":{"type":"ephemeral","ttl":"5m"}},{"type":"cache_edits","cacheReference":"cache_ref_1","edits":[{"type":"clear","cacheReference":"cache_ref_0"}]}]}}`,
+		`{"type":"user","uuid":"tr1","sessionId":"s1","parentUuid":"a1","timestamp":"2026-01-01T00:00:02Z","content":[{"type":"tool_result","toolUseId":9001,"isError":true,"content":"denied"}]}`,
 	})
 	resume, err := BuildResumeConversation(path, "tr1")
 	if err != nil {
@@ -530,14 +530,17 @@ func TestBuildResumeConversationAcceptsContentBlockFieldAliases(t *testing.T) {
 	if len(assistant.Content) != 2 {
 		t.Fatalf("assistant content = %#v", assistant.Content)
 	}
+	if assistant.Content[0].ID != "9001" {
+		t.Fatalf("numeric tool use id = %#v", assistant.Content[0])
+	}
 	if assistant.Content[0].CacheControl == nil || assistant.Content[0].CacheControl.Type != "ephemeral" || assistant.Content[0].CacheControl.TTL != "5m" {
 		t.Fatalf("cacheControl alias = %#v", assistant.Content[0].CacheControl)
 	}
 	if assistant.Content[1].CacheReference != "cache_ref_1" || len(assistant.Content[1].Edits) != 1 || assistant.Content[1].Edits[0].CacheReference != "cache_ref_0" {
 		t.Fatalf("cacheReference aliases = %#v", assistant.Content[1])
 	}
 	user := resume.Messages[1]
-	if len(user.Content) != 1 || user.Content[0].ToolUseID != "toolu_1" || !user.Content[0].IsError {
+	if len(user.Content) != 1 || user.Content[0].ToolUseID != "9001" || !user.Content[0].IsError {
 		t.Fatalf("tool result aliases = %#v", user.Content)
 	}
 }