Accept provider remote history pages

Author: SqlRush

docs/cc-100-roadmap.md

@@ -120,6 +120,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 response parser 现在也接受 provider-style `choices`/`outputs`/`candidates`/`generations` wrapper，可从 `message.content`、content-block array 和 `content.parts[].text` 中恢复 event page JSON，并保留 pagination 继续驱动 `before_id` 续抓。
+
 M6 补充：remote history response parser 现在接受 JSON:API `included` collection，会过滤非事件资源，并递归解包 `resource`/`attributes`/`properties` 后用外层 resource id 作为事件 ID fallback。
 
 M6 补充：remote history `data`/`payload`/`response`/`result`/`body` 等 event-list 字段现在也接受单个 SDK event 对象，避免非数组单事件页被当作普通 wrapper 后丢失。
@@ -526,6 +528,8 @@ M7 补充：prompt history `LogEntry` 读取现在接受 `sessionID`/`session`/`
 
 本轮补充：compact runner 的 summary 响应现在也接受 provider-style `choices`/`outputs`/`candidates`/`generations` wrapper，可在构建 compact plan 前从 `message.content`、content-block array 和 `content.parts[].text` 中恢复 visible summary text。
 
+本轮补充：remote history response parser 现在也接受 provider-style `choices`/`outputs`/`candidates`/`generations` wrapper，可从 `message.content`、content-block array 和 `content.parts[].text` 中恢复 event page JSON，并保留 pagination 继续驱动 `before_id` 续抓。
+
 本轮补充：microcompact disk cache loader 现在读取 Go 默认、camelCase、snake_case 和相邻实现常见字段别名/包装形态，包括 `result`/`data`/`cache`/`value` wrapper、`content`/`text` summary、`cacheKey`/`key`/`hash` digest、cache-hit 别名、计数字段别名/数字字符串、RFC3339/Unix 秒/Unix 毫秒时间字段，以及 `createdAt` + `ttlSeconds`/`ttlMs`/`expiresIn`/`maxAge` 等相对 TTL 推导，提升 cached microcompact 文件在不同实现/版本间的恢复率。
 
 本轮补充：microcompact disk cache loader 现在也接受 `cacheEntry`/`cache_entry`、`micro_compact`/`micro_compact_result` wrapper，以及 `summaryMarkdown`/`resultSummary`/`compressedText`、`cacheDigest`/`digestHash`/`fingerprint`、`summarizedCount`/`retainedCount`、`formatVersion` 和 `ttlMilliseconds`/`expiresInMilliseconds`/`maxAgeMilliseconds` 等相邻实现字段别名。

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

@@ -214,6 +214,7 @@ test/parity/                 # golden tests against TS/official behavior
 - 本轮补充：remote history 在 JSON:API `relationships.events.data` 只有 resource identifier 时，会继续使用 top-level `included` 中的真实事件 resource，避免把 `{type,id}` 标识符误当作空事件遮蔽完整 payload。
 - 本轮补充：remote history response parser 现在也接受 JSON:API `included` collection，会过滤非事件资源，并递归解包 `resource`/`attributes`/`properties` 后保留外层 resource id 作为事件 ID fallback。
 - 本轮补充：remote history response parser 会解包 `payload`/`response`/`result`/`body` 等通用响应外壳，外壳内的 event list、pagination、links 会继续递归解析。
+- 本轮补充：remote history response parser 现在也接受 provider-style `choices`/`outputs`/`candidates`/`generations` wrapper，可从 `message.content`、content-block array 和 `content.parts[].text` 中恢复 event page JSON，并保留 pagination 继续驱动 `before_id` 续抓。
 - 本轮补充：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。

docs/first-second-parity-audit.md

@@ -143,6 +143,7 @@ M6 progress now includes:
 - `internal/memory`: session-memory recall and relevant-memory model selectors now recurse through GraphQL/JSON:API selection wrappers such as `data`, `payload`, `body`, `resource`, `attributes`, `properties`, `attrs`, `viewer`, `edge`, `node`, `nodes`, and `edges`, preserving model-ranked session IDs and memory paths from API-shaped responses.
 - `internal/memory`: session-memory recall and relevant-memory model selectors now also unwrap provider-style `choices`, `outputs`, `candidates`, and `generations` responses, recovering JSON selection payloads from nested `message.content`, content-block arrays, and `content.parts[].text`.
 - `internal/memory`: model-backed memory fact extraction now also unwraps provider-style `choices`, `outputs`, `candidates`, and `generations` responses, recovering JSON facts payloads from nested `message.content`, content-block arrays, and `content.parts[].text`.
+- `internal/session`: remote-history response parsing now also unwraps provider-style `choices`, `outputs`, `candidates`, and `generations` responses, recovering event page JSON plus pagination from nested `message.content`, content-block arrays, and `content.parts[].text`.
 - `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/keyed-event-map 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`: indexed resume chains now distinguish budget-truncated parents from genuinely missing parents, exposing both markers while preserving bounded transcript reads.

internal/session/remote_history.go

@@ -219,6 +219,15 @@ func (r *sessionEventsResponse) mergeJSON(data []byte) error {
 			r.Included = events
 		}
 	}
+	if responseEventList(*r) == nil {
+		if text, ok := remoteHistoryProviderResponseText(raw); ok {
+			var nested sessionEventsResponse
+			if err := nested.mergeJSON([]byte(text)); err != nil {
+				return fmt.Errorf("remote history provider response: %w", err)
+			}
+			r.mergeFrom(nested)
+		}
+	}
 	return nil
 }
 
@@ -1015,6 +1024,101 @@ func remoteHistoryRelTokens(raw map[string]json.RawMessage) []string {
 	return tokens
 }
 
+func remoteHistoryProviderResponseText(raw map[string]json.RawMessage) (string, bool) {
+	for _, name := range []string{
+		"choice",
+		"choices",
+		"output",
+		"outputs",
+		"candidate",
+		"candidates",
+		"generation",
+		"generations",
+		"completion",
+		"completions",
+		"response",
+		"responses",
+		"result",
+		"results",
+	} {
+		value, ok := raw[name]
+		if !ok {
+			continue
+		}
+		if text, ok := remoteHistoryProviderTextFromRaw(value, 0, false); ok {
+			return text, true
+		}
+	}
+	return "", false
+}
+
+func remoteHistoryProviderTextFromRaw(raw json.RawMessage, depth int, allowScalar bool) (string, bool) {
+	raw = bytes.TrimSpace(raw)
+	if len(raw) == 0 || bytes.Equal(raw, []byte("null")) || depth > 8 {
+		return "", false
+	}
+	var text string
+	if err := json.Unmarshal(raw, &text); err == nil {
+		text = strings.TrimSpace(text)
+		if allowScalar && remoteHistoryProviderTextLooksJSON(text) {
+			return text, true
+		}
+		return "", false
+	}
+	if raw[0] == '[' {
+		var items []json.RawMessage
+		if err := json.Unmarshal(raw, &items); err != nil {
+			return "", false
+		}
+		parts := make([]string, 0, len(items))
+		for _, item := range items {
+			part, ok := remoteHistoryProviderTextFromRaw(item, depth+1, false)
+			if ok {
+				parts = append(parts, part)
+			}
+		}
+		if len(parts) == 0 {
+			return "", false
+		}
+		text = strings.Join(parts, "\n")
+		if remoteHistoryProviderTextLooksJSON(text) {
+			return text, true
+		}
+		return "", false
+	}
+	if raw[0] != '{' {
+		return "", false
+	}
+	fields := map[string]json.RawMessage{}
+	if err := json.Unmarshal(raw, &fields); err != nil {
+		return "", false
+	}
+	for _, name := range []string{"text", "content", "value", "output"} {
+		value, ok := fields[name]
+		if !ok {
+			continue
+		}
+		if text, ok := remoteHistoryProviderTextFromRaw(value, depth+1, true); ok {
+			return text, true
+		}
+	}
+	for _, name := range []string{"message", "delta", "part", "parts", "candidate", "choice", "generation", "result", "response"} {
+		value, ok := fields[name]
+		if !ok {
+			continue
+		}
+		if text, ok := remoteHistoryProviderTextFromRaw(value, depth+1, false); ok {
+			return text, true
+		}
+	}
+	return "", false
+}
+
+func remoteHistoryProviderTextLooksJSON(text string) bool {
+	text = strings.TrimSpace(text)
+	return strings.HasPrefix(text, "{") || strings.HasPrefix(text, "[")
+}
+
 func jsonNumberString(data []byte) (string, bool) {
 	decoder := json.NewDecoder(bytes.NewReader(data))
 	decoder.UseNumber()

internal/session/remote_history_test.go

@@ -528,6 +528,75 @@ func TestFetchRemoteHistoryAcceptsGraphQLViewerAndNodeWrappers(t *testing.T) {
 	}
 }
 
+func TestFetchRemoteHistoryAcceptsProviderResponseWrappers(t *testing.T) {
+	providerWrapper := func(t *testing.T, field string, page map[string]any) []byte {
+		t.Helper()
+		pageData, err := json.Marshal(page)
+		if err != nil {
+			t.Fatal(err)
+		}
+		var wrapper map[string]any
+		switch field {
+		case "choices":
+			wrapper = map[string]any{
+				"choices": []any{map[string]any{
+					"message": map[string]any{"content": string(pageData)},
+				}},
+			}
+		case "candidates":
+			wrapper = map[string]any{
+				"candidates": []any{map[string]any{
+					"content": map[string]any{
+						"parts": []any{map[string]any{"text": string(pageData)}},
+					},
+				}},
+			}
+		default:
+			t.Fatalf("unknown provider field %q", field)
+		}
+		data, err := json.Marshal(wrapper)
+		if err != nil {
+			t.Fatal(err)
+		}
+		return data
+	}
+
+	var seen []url.Values
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		seen = append(seen, r.URL.Query())
+		w.Header().Set("Content-Type", "application/json")
+		switch r.URL.Query().Get("before_id") {
+		case "":
+			_, _ = w.Write(providerWrapper(t, "choices", map[string]any{
+				"events":  []any{map[string]any{"type": "status", "event_id": "evt_provider", "session_id": "s", "status": "latest"}},
+				"hasMore": true,
+			}))
+		case "evt_provider":
+			_, _ = w.Write(providerWrapper(t, "candidates", map[string]any{
+				"items": []any{map[string]any{"type": "status", "eventId": "evt_candidate", "sessionId": "s", "status": "older"}},
+			}))
+		default:
+			t.Fatalf("unexpected before_id = %q", r.URL.Query().Get("before_id"))
+		}
+	}))
+	defer server.Close()
+
+	authCtx := NewRemoteHistoryAuthContext("s", "token", "", auth.OAuthConfig{BaseAPIURL: server.URL})
+	events, err := FetchRemoteHistory(context.Background(), server.Client(), authCtx, RemoteHistoryFetchOptions{Limit: 2})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !events.Complete || events.Pages != 2 || events.NextBeforeID != "" {
+		t.Fatalf("events = %#v", events)
+	}
+	if len(events.Events) != 2 || events.Events[0].ID != "evt_provider" || events.Events[0].Status != "latest" || events.Events[1].ID != "evt_candidate" || events.Events[1].Status != "older" {
+		t.Fatalf("event order = %#v", events.Events)
+	}
+	if len(seen) != 2 || seen[1].Get("before_id") != "evt_provider" {
+		t.Fatalf("queries = %#v", seen)
+	}
+}
+
 func TestFetchRemoteHistoryAcceptsLinkURLCursors(t *testing.T) {
 	var seen []url.Values
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {