Accept remote history event payload aliases

Author: SqlRush

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

@@ -282,6 +282,7 @@ test/parity/                 # golden tests against TS/official behavior
 - 本轮补充：remote history `SDKEvent` 解码接受 `eventID`、`messageId`/`messageID`/`message_id` 和 `messageUuid`/`messageUUID`/`message_uuid` 作为事件 ID aliases；只有 `uuid` 时也会作为 event ID fallback，materialize transcript 时能稳定生成 message UUID 与 parent chain（覆盖测试：`TestRemoteHistoryTranscriptMessagesAcceptsEventMessageIDAliases`）。
 - 本轮补充：remote history `SDKEvent` timestamp 解码接受 `created`/`createdTime`/`created_time`、`date_time`、`eventTime`/`event_time`、`occurredAt`/`occurred_at` 等相邻字段，并容忍 `timestamp`/`createdAt` 等时间字段为 JSON number，materialize transcript 时继续填充 record 与嵌套 message timestamp（覆盖测试：`TestSDKEventUnmarshalAcceptsTimestampAliases`、`TestRemoteHistoryTranscriptMessagesAcceptsEventTimestampAliases`）。
 - 本轮补充：remote history `SDKEvent.message` 现在接受顶层字符串和 content-block 数组形态，会先包装成 message content 再解码，避免 provider 把 assistant/user event message 直接写成 `"message":"text"` 或 `message:[...]` 时 JSON 解码失败（覆盖测试：`TestSDKEventUnmarshalAcceptsScalarMessagePayload`、`TestRemoteHistoryTranscriptMessagesAcceptsScalarEventMessagePayload`）。
+- 本轮补充：remote history `SDKEvent` 的 status/error/result 内容字段现在接受 `statusMessage`/`progress_message`、`errorMessage`/`failure_reason`、`resultText`/`outputText`/`completionText` 以及 result object aliases `output`/`response`/`value`/`completion`，仅在对应 canonical event type 下补值，避免和 assistant/user message payload 混淆（覆盖测试：`TestSDKEventUnmarshalAcceptsStatusErrorResultAliases`、`TestRemoteHistoryEventsAcceptStatusErrorResultAliases`）。
 - 本轮补充：memory 层补齐官方 `memoryAge`/freshness note 语义，`ReadDocumentsWithOptions` 可为超过 1 天的 memory 文档前缀 system-reminder，提示模型把 memory 当作 point-in-time observation 并核对当前代码。
 - 本轮补充：Read tool 在 metadata 提供 auto-memory 目录时，会为读取旧 auto-memory 文件的 tool result 前缀 freshness system-reminder，和官方 FileReadTool 的 memory freshness prefix 对齐。
 - 本轮补充：memory 层补齐官方 `relevant_memories` attachment 基础，包含 stable memory header、system-reminder 渲染、surfaced path/byte 扫描、按 200 行/4096 bytes 读取并附截断提示的 surfacing reader、mark-after-filter 的 duplicate memory attachment 过滤、最后非 meta user prompt/单词 prompt/60KB session cap 的 prefetch gating、多目录结果排除 read-state/surfaced 后取前 5 个候选的选择逻辑，以及 recent successful tools 窗口收集并排除 pending/failed/同名失败工具。

docs/first-second-parity-audit.md

@@ -230,6 +230,7 @@ M6 progress now includes:
 - `internal/contracts`/`internal/session`: remote-history `SDKEvent` decoding now accepts event/message ID aliases such as `eventID`, `messageId`/`messageID`/`message_id`, and `messageUuid`/`messageUUID`/`message_uuid`, using them as transcript UUID fallbacks during materialization (`TestRemoteHistoryTranscriptMessagesAcceptsEventMessageIDAliases`).
 - `internal/contracts`/`internal/session`: remote-history `SDKEvent` timestamp decoding now accepts adjacent aliases such as `created`, `createdTime`/`created_time`, `date_time`, `eventTime`/`event_time`, and `occurredAt`/`occurred_at`, and tolerates JSON number timestamp fields before transcript materialization (`TestSDKEventUnmarshalAcceptsTimestampAliases`, `TestRemoteHistoryTranscriptMessagesAcceptsEventTimestampAliases`).
 - `internal/contracts`/`internal/session`: remote-history `SDKEvent.message` now accepts top-level string and content-block array payloads, wrapping them as message content before event decoding so provider-shaped assistant/user events still materialize into transcript messages (`TestSDKEventUnmarshalAcceptsScalarMessagePayload`, `TestRemoteHistoryTranscriptMessagesAcceptsScalarEventMessagePayload`).
+- `internal/contracts`/`internal/session`: remote-history `SDKEvent` status/error/result payloads now accept adjacent field aliases such as `statusMessage`, `progress_message`, `errorMessage`, `failure_reason`, `resultText`, `outputText`, and result object aliases including `output`, `response`, `value`, and `completion`, scoped to the matching canonical event type (`TestSDKEventUnmarshalAcceptsStatusErrorResultAliases`, `TestRemoteHistoryEventsAcceptStatusErrorResultAliases`).
 - `internal/contracts`/`internal/session`: remote-history `SDKEvent` type canonicalization now also accepts adjacent stream/provider aliases such as `assistant_delta`, `humanMessage`, `finalResult`, `response.completed`, `failureEvent`, and `statusMessage`, keeping transcript materialization stable across SDK event spellings.
 - `internal/memory`: memory age/freshness helpers now match official stale-memory guidance, and document loading can prefix old memory files with a system-reminder that they are point-in-time observations.
 - `internal/memory`: relevant-memory attachment primitives now match the official `relevant_memories` shape for stable headers, system-reminder rendering, surfaced path/byte scanning, 200-line/4096-byte surfacing reads with truncation notices, mark-after-filter duplicate attachment handling, last-non-meta-user/single-word/session-byte-cap prefetch gating, top-5 candidate filtering after read-state/surfaced de-dup, and recent successful tools collection excluding pending/failed/same-name-failed tools.

internal/contracts/messages_test.go

@@ -2,6 +2,7 @@ package contracts
 
 import (
 	"encoding/json"
+	"reflect"
 	"testing"
 )
 
@@ -250,6 +251,53 @@ func TestSDKEventUnmarshalAcceptsScalarMessagePayload(t *testing.T) {
 	}
 }
 
+func TestSDKEventUnmarshalAcceptsStatusErrorResultAliases(t *testing.T) {
+	for name, tc := range map[string]struct {
+		raw        string
+		wantStatus string
+		wantError  string
+		wantResult any
+	}{
+		"status message": {
+			raw:        `{"type":"status","statusMessage":"queued"}`,
+			wantStatus: "queued",
+		},
+		"progress message": {
+			raw:        `{"eventType":"progress","progress_message":"working"}`,
+			wantStatus: "working",
+		},
+		"error message": {
+			raw:       `{"type":"error","errorMessage":"boom"}`,
+			wantError: "boom",
+		},
+		"failure reason": {
+			raw:       `{"eventType":"failureEvent","failure_reason":"denied"}`,
+			wantError: "denied",
+		},
+		"result text": {
+			raw:        `{"type":"result","outputText":"done"}`,
+			wantResult: "done",
+		},
+		"result object": {
+			raw:        `{"eventType":"finalResult","response":{"ok":true}}`,
+			wantResult: map[string]any{"ok": true},
+		},
+	} {
+		t.Run(name, func(t *testing.T) {
+			var event SDKEvent
+			if err := json.Unmarshal([]byte(tc.raw), &event); err != nil {
+				t.Fatal(err)
+			}
+			if event.Status != tc.wantStatus || event.Error != tc.wantError {
+				t.Fatalf("event = %#v", event)
+			}
+			if tc.wantResult != nil && !reflect.DeepEqual(event.Result, tc.wantResult) {
+				t.Fatalf("result = %#v, want %#v", event.Result, tc.wantResult)
+			}
+		})
+	}
+}
+
 func TestContentBlockUnmarshalAcceptsTextAliases(t *testing.T) {
 	for name, raw := range map[string]string{
 		"body":         `{"type":"text","body":"from body"}`,

internal/contracts/session.go

@@ -185,6 +185,31 @@ func (e *SDKEvent) UnmarshalJSON(data []byte) error {
 		EventTimeSnake         string          `json:"event_time"`
 		OccurredAt             string          `json:"occurredAt"`
 		OccurredAtSnake        string          `json:"occurred_at"`
+		StatusMessage          string          `json:"statusMessage"`
+		StatusMessageSnake     string          `json:"status_message"`
+		StatusText             string          `json:"statusText"`
+		StatusTextSnake        string          `json:"status_text"`
+		State                  string          `json:"state"`
+		Phase                  string          `json:"phase"`
+		ProgressMessage        string          `json:"progressMessage"`
+		ProgressMessageSnake   string          `json:"progress_message"`
+		ErrorMessage           string          `json:"errorMessage"`
+		ErrorMessageSnake      string          `json:"error_message"`
+		ErrorText              string          `json:"errorText"`
+		ErrorTextSnake         string          `json:"error_text"`
+		FailureReason          string          `json:"failureReason"`
+		FailureReasonSnake     string          `json:"failure_reason"`
+		Reason                 string          `json:"reason"`
+		ResultText             string          `json:"resultText"`
+		ResultTextSnake        string          `json:"result_text"`
+		OutputText             string          `json:"outputText"`
+		OutputTextSnake        string          `json:"output_text"`
+		CompletionText         string          `json:"completionText"`
+		CompletionTextSnake    string          `json:"completion_text"`
+		Output                 json.RawMessage `json:"output"`
+		Response               json.RawMessage `json:"response"`
+		Value                  json.RawMessage `json:"value"`
+		Completion             json.RawMessage `json:"completion"`
 		MessagePayload         json.RawMessage `json:"message_payload"`
 		MessagePayloadCamel    json.RawMessage `json:"messagePayload"`
 		SerializedMessage      json.RawMessage `json:"serialized_message"`
@@ -260,6 +285,36 @@ func (e *SDKEvent) UnmarshalJSON(data []byte) error {
 			aux.ParentMessageIDSnake,
 		)
 	}
+	if e.Type == SDKEventStatus && e.Status == "" {
+		e.Status = firstSDKEventString(
+			aux.StatusMessage,
+			aux.StatusMessageSnake,
+			aux.StatusText,
+			aux.StatusTextSnake,
+			aux.ProgressMessage,
+			aux.ProgressMessageSnake,
+			aux.State,
+			aux.Phase,
+		)
+	}
+	if e.Type == SDKEventError && e.Error == "" {
+		e.Error = firstSDKEventString(
+			aux.ErrorMessage,
+			aux.ErrorMessageSnake,
+			aux.ErrorText,
+			aux.ErrorTextSnake,
+			aux.FailureReason,
+			aux.FailureReasonSnake,
+			aux.Reason,
+		)
+	}
+	if e.Type == SDKEventResult && e.Result == nil {
+		if result := firstSDKEventString(aux.ResultText, aux.ResultTextSnake, aux.OutputText, aux.OutputTextSnake, aux.CompletionText, aux.CompletionTextSnake); result != "" {
+			e.Result = result
+		} else {
+			e.Result = firstSDKEventRawAny(aux.Output, aux.Response, aux.Value, aux.Completion)
+		}
+	}
 	if e.Message == nil {
 		e.Message = firstSDKEventMessage(e.Type,
 			aux.MessagePayload,
@@ -394,6 +449,20 @@ func firstSDKEventString(values ...string) string {
 	return ""
 }
 
+func firstSDKEventRawAny(values ...json.RawMessage) any {
+	for _, value := range values {
+		value = bytes.TrimSpace(value)
+		if len(value) == 0 || bytes.Equal(value, []byte("null")) {
+			continue
+		}
+		var out any
+		if err := json.Unmarshal(value, &out); err == nil {
+			return out
+		}
+	}
+	return nil
+}
+
 func firstSDKEventID(values ...ID) ID {
 	for _, value := range values {
 		if value != "" {

internal/session/remote_history_test.go

@@ -2025,6 +2025,23 @@ func TestRemoteHistoryTranscriptMessagesAcceptsEventTypeAliases(t *testing.T) {
 	}
 }
 
+func TestRemoteHistoryEventsAcceptStatusErrorResultAliases(t *testing.T) {
+	var response sessionEventsResponse
+	if err := json.Unmarshal([]byte(`{"events":[
+		{"type":"status","eventId":"evt_status_alias","sessionID":"s_alias","statusMessage":"queued"},
+		{"type":"error","eventId":"evt_error_alias","sessionID":"s_alias","errorMessage":"boom"},
+		{"type":"result","eventId":"evt_result_alias","sessionID":"s_alias","outputText":"done"}
+	]}`), &response); err != nil {
+		t.Fatal(err)
+	}
+	if len(response.Events) != 3 {
+		t.Fatalf("events = %#v", response.Events)
+	}
+	if response.Events[0].Status != "queued" || response.Events[1].Error != "boom" || response.Events[2].Result != "done" {
+		t.Fatalf("event aliases = %#v", response.Events)
+	}
+}
+
 func TestRemoteHistoryTranscriptMessagesAcceptsNestedEventPayloadWrappers(t *testing.T) {
 	var response sessionEventsResponse
 	if err := json.Unmarshal([]byte(`{"events":[