Accept collapse snapshot metadata aliases

Author: SqlRush

docs/cc-100-roadmap.md

@@ -312,6 +312,8 @@ M7 补充：prompt history `LogEntry` 读取现在接受 `sessionID`/`session`/`
 
 本轮补充：transcript metadata loader 现在接受 `sessionID` 和 `session` 作为 session-scoped metadata ID 别名，并容忍 `prNumber`、`timeSavedMs`、`lastSpawnTokens` 等计数字段使用数字字符串。
 
+本轮补充：context-collapse snapshot metadata 接受 `isArmed`/`enabled` bool 别名、`spawnTokens`/`tokenCount` 计数字段别名，以及 `stagedMessages`/`items` staged payload wrapper，full loader 和 metadata loader 保持一致。
+
 本轮补充：transcript message 和嵌套 contract message 现在接受 `sessionID` 顶层别名，`LoadTranscript`、`LoadTranscriptIndex` 和 indexed resume 会保留该 session id（覆盖测试：`TestLoadTranscriptAcceptsSessionIDUpperAlias`）。
 
 本轮补充：remote history `SDKEvent` 解码现在也接受 `sessionID` 作为事件 session id 别名，materialize 成 transcript message 时会同步填充 record 和嵌套 message 的 session id（覆盖测试：`TestRemoteHistoryTranscriptMessagesAcceptsSessionIDUpperAlias`）。

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

@@ -195,6 +195,7 @@ test/parity/                 # golden tests against TS/official behavior
 - 本轮补充：transcript resume 的嵌套 content block 接受 `toolUseId`/`toolUseID`、`isError`、`cacheControl`、`cacheReference` 字段别名，并保留 cache edit 的 `cacheReference`。
 - 本轮补充：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` 等计数字段使用数字字符串。
+- 本轮补充：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。
 - 本轮补充：嵌套 contract message 接受 `messageId`/`messageID`/`message_id` 和 `messageUuid`/`messageUUID`/`message_uuid` 作为自身 ID/UUID 别名，indexed resume 会保留 payload 自带的 nested message id。

docs/first-second-parity-audit.md

@@ -158,6 +158,7 @@ M6 progress now includes:
 - `internal/session`: transcript message loading now preserves structured SerializedMessage metadata such as `userType`, `entrypoint`, `version`, and `slug`, including common alias spellings.
 - `internal/session`: lightweight transcript metadata loading now clears stale context-collapse commit/snapshot state after compact-boundary messages, matching the full loader and official sessionStorage restore semantics.
 - `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`: 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/contracts`/`internal/session`: remote-history `SDKEvent` decoding now accepts parent aliases such as `parentUUID`, `parentId`/`parentID`/`parent_id`, and `parentMessageId`/`parentMessageID`/`parent_message_id`, preserving parent chains during transcript materialization (`TestRemoteHistoryTranscriptMessagesAcceptsParentIDAliases`).

internal/session/transcript_metadata_fields.go

@@ -62,6 +62,33 @@ func (f transcriptMetadataFields) intValue(keys ...string) int {
 	return 0
 }
 
+func (f transcriptMetadataFields) boolValue(keys ...string) (bool, bool) {
+	for _, key := range keys {
+		raw, ok := f[key]
+		if !ok || isNullJSON(raw) {
+			continue
+		}
+		var value bool
+		if err := json.Unmarshal(raw, &value); err == nil {
+			return value, true
+		}
+		var text string
+		if err := json.Unmarshal(raw, &text); err == nil {
+			switch strings.ToLower(strings.TrimSpace(text)) {
+			case "1", "t", "true", "yes", "y", "on":
+				return true, true
+			case "0", "f", "false", "no", "n", "off":
+				return false, true
+			}
+		}
+		var number int
+		if err := json.Unmarshal(raw, &number); err == nil {
+			return number != 0, true
+		}
+	}
+	return false, false
+}
+
 func (f transcriptMetadataFields) rawValue(keys ...string) json.RawMessage {
 	for _, key := range keys {
 		raw, ok := f[key]
@@ -73,6 +100,22 @@ func (f transcriptMetadataFields) rawValue(keys ...string) json.RawMessage {
 	return nil
 }
 
+func (f transcriptMetadataFields) arrayValue(keys ...string) []any {
+	raw := f.rawValue(keys...)
+	if len(raw) == 0 {
+		return nil
+	}
+	var values []any
+	if err := json.Unmarshal(raw, &values); err == nil {
+		return values
+	}
+	var value any
+	if err := json.Unmarshal(raw, &value); err != nil || value == nil {
+		return nil
+	}
+	return []any{value}
+}
+
 func isNullJSON(raw json.RawMessage) bool {
 	return len(bytes.TrimSpace(raw)) == 0 || bytes.Equal(bytes.TrimSpace(raw), []byte("null"))
 }
@@ -318,7 +361,15 @@ func parseContextCollapseSnapshotMetadata(line []byte) (ContextCollapseSnapshotE
 		entry.SessionID = fields.sessionIDValue()
 	}
 	if entry.LastSpawnTokens == 0 {
-		entry.LastSpawnTokens = fields.intValue("lastSpawnTokens", "last_spawn_tokens")
+		entry.LastSpawnTokens = fields.intValue("lastSpawnTokens", "last_spawn_tokens", "spawnTokens", "spawn_tokens", "tokenCount", "token_count")
+	}
+	if !entry.Armed {
+		if armed, ok := fields.boolValue("armed", "isArmed", "is_armed", "enabled", "ready"); ok {
+			entry.Armed = armed
+		}
+	}
+	if len(entry.Staged) == 0 {
+		entry.Staged = fields.arrayValue("staged", "stagedMessages", "staged_messages", "pending", "entries", "items")
 	}
 	return entry, true
 }

internal/session/transcript_test.go

@@ -822,7 +822,7 @@ func TestLoadTranscriptMetadataAcceptsSessionIDAndNumericStrings(t *testing.T) {
 	path := writeTranscript(t, []string{
 		`{"type":"pr-link","sessionID":"s4","prNumber":"44","prUrl":"https://github.com/o/r/pull/44","prRepository":"o/r"}`,
 		`{"type":"speculation-accept","createdAt":"2026-01-01T00:00:05Z","timeSavedMs":"5600"}`,
-		`{"type":"marble-origami-snapshot","sessionID":"s4","armed":true,"lastSpawnTokens":"96"}`,
+		`{"type":"marble-origami-snapshot","sessionID":"s4","isArmed":"true","spawnTokens":"96","items":[{"uuid":"pending_1"}]}`,
 	})
 	transcript, err := LoadTranscript(path)
 	if err != nil {
@@ -834,15 +834,15 @@ func TestLoadTranscriptMetadataAcceptsSessionIDAndNumericStrings(t *testing.T) {
 	if len(transcript.SpeculationAccepts) != 1 || transcript.SpeculationAccepts[0].TimeSavedMS != 5600 || transcript.SpeculationAccepts[0].Timestamp != "2026-01-01T00:00:05Z" {
 		t.Fatalf("transcript speculation = %#v", transcript.SpeculationAccepts)
 	}
-	if transcript.ContextCollapseSnapshot == nil || transcript.ContextCollapseSnapshot.SessionID != "s4" || transcript.ContextCollapseSnapshot.LastSpawnTokens != 96 {
+	if transcript.ContextCollapseSnapshot == nil || transcript.ContextCollapseSnapshot.SessionID != "s4" || !transcript.ContextCollapseSnapshot.Armed || transcript.ContextCollapseSnapshot.LastSpawnTokens != 96 || len(transcript.ContextCollapseSnapshot.Staged) != 1 {
 		t.Fatalf("transcript snapshot = %#v", transcript.ContextCollapseSnapshot)
 	}
 
 	metadata, err := LoadTranscriptMetadata(path)
 	if err != nil {
 		t.Fatal(err)
 	}
-	if metadata.PRLinks["s4"].PRNumber != 44 || metadata.ContextCollapseSnapshot == nil || metadata.ContextCollapseSnapshot.LastSpawnTokens != 96 {
+	if metadata.PRLinks["s4"].PRNumber != 44 || metadata.ContextCollapseSnapshot == nil || !metadata.ContextCollapseSnapshot.Armed || metadata.ContextCollapseSnapshot.LastSpawnTokens != 96 || len(metadata.ContextCollapseSnapshot.Staged) != 1 {
 		t.Fatalf("metadata = %#v snapshot=%#v", metadata.PRLinks, metadata.ContextCollapseSnapshot)
 	}
 	if len(metadata.SpeculationAccepts) != 1 || metadata.SpeculationAccepts[0].TimeSavedMS != 5600 {