Report API error request IDs in print events

Author: SqlRush

cmd/claude/main.go

@@ -2156,6 +2156,7 @@ type printJSONResult struct {
 	Error           string                   `json:"error,omitempty"`
 	ErrorType       string                   `json:"error_type,omitempty"`
 	StatusCode      int                      `json:"status_code,omitempty"`
+	RequestID       string                   `json:"request_id,omitempty"`
 	Message         *contracts.Message       `json:"message,omitempty"`
 	StopReason      string                   `json:"stop_reason,omitempty"`
 	Model           string                   `json:"model,omitempty"`
@@ -2199,6 +2200,7 @@ type printStreamEvent struct {
 	Error           string                   `json:"error,omitempty"`
 	ErrorType       string                   `json:"error_type,omitempty"`
 	StatusCode      int                      `json:"status_code,omitempty"`
+	RequestID       string                   `json:"request_id,omitempty"`
 	IsError         bool                     `json:"is_error,omitempty"`
 	DurationMS      *int64                   `json:"duration_ms,omitempty"`
 	DurationAPI     *int64                   `json:"duration_api_ms,omitempty"`
@@ -2467,21 +2469,21 @@ func writePrintStreamEvent(encoder *json.Encoder, event conversation.Event) erro
 	}
 	if event.Error != nil {
 		out.Error = event.Error.Error()
-		out.ErrorType, out.StatusCode = printAPIErrorMetadata(event.Error)
+		out.ErrorType, out.StatusCode, out.RequestID = printAPIErrorMetadata(event.Error)
 	}
 	return encoder.Encode(out)
 }
 
-func printAPIErrorMetadata(err error) (string, int) {
+func printAPIErrorMetadata(err error) (string, int, string) {
 	var apiErr anthropic.APIError
 	if errors.As(err, &apiErr) {
-		return apiErr.Type, apiErr.StatusCode
+		return apiErr.Type, apiErr.StatusCode, apiErr.RequestID
 	}
 	var apiErrPtr *anthropic.APIError
 	if errors.As(err, &apiErrPtr) && apiErrPtr != nil {
-		return apiErrPtr.Type, apiErrPtr.StatusCode
+		return apiErrPtr.Type, apiErrPtr.StatusCode, apiErrPtr.RequestID
 	}
-	return "", 0
+	return "", 0, ""
 }
 
 func printStreamRetryFrom(retry *conversation.RetryInfo) *printStreamRetry {
@@ -2588,7 +2590,7 @@ func writePrintError(stdout io.Writer, runner conversation.Runner, err error, ou
 
 func writePrintJSONError(stdout io.Writer, runner conversation.Runner, err error, duration time.Duration, apiDuration time.Duration, modelsAttempted []string) error {
 	encoder := json.NewEncoder(stdout)
-	errorType, statusCode := printAPIErrorMetadata(err)
+	errorType, statusCode, requestID := printAPIErrorMetadata(err)
 	envelope := printJSONResult{
 		Type:            "result",
 		Subtype:         "error",
@@ -2600,6 +2602,7 @@ func writePrintJSONError(stdout io.Writer, runner conversation.Runner, err error
 		Error:           err.Error(),
 		ErrorType:       errorType,
 		StatusCode:      statusCode,
+		RequestID:       requestID,
 	}
 	applyPrintJSONRuntime(&envelope, runner)
 	return encoder.Encode(envelope)
@@ -2609,14 +2612,15 @@ func writePrintStreamError(stdout io.Writer, runner conversation.Runner, err err
 	encoder := json.NewEncoder(stdout)
 	durationMS := durationMillis(duration)
 	durationAPI := durationMillis(apiDuration)
-	errorType, statusCode := printAPIErrorMetadata(err)
+	errorType, statusCode, requestID := printAPIErrorMetadata(err)
 	envelope := printStreamEvent{
 		Type:            "error",
 		SessionID:       runner.SessionID,
 		ModelsAttempted: append([]string(nil), modelsAttempted...),
 		Error:           err.Error(),
 		ErrorType:       errorType,
 		StatusCode:      statusCode,
+		RequestID:       requestID,
 		IsError:         true,
 		DurationMS:      &durationMS,
 		DurationAPI:     &durationAPI,

cmd/claude/main_test.go

@@ -2242,6 +2242,7 @@ func TestWritePrintStreamEventRetryIncludesAPIErrorMetadata(t *testing.T) {
 		Model: "sonnet",
 		Error: fmt.Errorf("request failed: %w", anthropic.APIError{
 			StatusCode: http.StatusTooManyRequests,
+			RequestID:  "req_retry_1",
 			Type:       "rate_limit_error",
 			Message:    "try later",
 		}),
@@ -2260,7 +2261,7 @@ func TestWritePrintStreamEventRetryIncludesAPIErrorMetadata(t *testing.T) {
 	if err := json.Unmarshal(stdout.Bytes(), &event); err != nil {
 		t.Fatalf("invalid json %q: %v", stdout.String(), err)
 	}
-	if event["type"] != "retry" || event["error_type"] != "rate_limit_error" || event["status_code"] != float64(http.StatusTooManyRequests) {
+	if event["type"] != "retry" || event["error_type"] != "rate_limit_error" || event["status_code"] != float64(http.StatusTooManyRequests) || event["request_id"] != "req_retry_1" {
 		t.Fatalf("event = %#v", event)
 	}
 }
@@ -2347,6 +2348,7 @@ func TestWritePrintJSONErrorIncludesAPIErrorMetadata(t *testing.T) {
 	var stdout bytes.Buffer
 	err := writePrintJSONError(&stdout, conversation.Runner{SessionID: "sess_error"}, anthropic.APIError{
 		StatusCode: http.StatusServiceUnavailable,
+		RequestID:  "req_json_1",
 		Type:       "overloaded_error",
 		Message:    "temporarily overloaded",
 	}, time.Millisecond, 2*time.Millisecond, []string{"sonnet"})
@@ -2357,7 +2359,7 @@ func TestWritePrintJSONErrorIncludesAPIErrorMetadata(t *testing.T) {
 	if err := json.Unmarshal(stdout.Bytes(), &payload); err != nil {
 		t.Fatalf("invalid json stdout %q: %v", stdout.String(), err)
 	}
-	if payload["type"] != "result" || payload["subtype"] != "error" || payload["error_type"] != "overloaded_error" || payload["status_code"] != float64(http.StatusServiceUnavailable) {
+	if payload["type"] != "result" || payload["subtype"] != "error" || payload["error_type"] != "overloaded_error" || payload["status_code"] != float64(http.StatusServiceUnavailable) || payload["request_id"] != "req_json_1" {
 		t.Fatalf("payload = %#v", payload)
 	}
 }
@@ -2385,6 +2387,7 @@ func TestWritePrintStreamErrorIncludesAPIErrorMetadata(t *testing.T) {
 	var stdout bytes.Buffer
 	err := writePrintStreamError(&stdout, conversation.Runner{SessionID: "sess_error"}, anthropic.APIError{
 		StatusCode: http.StatusUnauthorized,
+		RequestID:  "req_stream_1",
 		Type:       "authentication_error",
 		Message:    "invalid api key",
 	}, time.Millisecond, 2*time.Millisecond, []string{"sonnet"})
@@ -2395,7 +2398,7 @@ func TestWritePrintStreamErrorIncludesAPIErrorMetadata(t *testing.T) {
 	if err := json.Unmarshal(stdout.Bytes(), &event); err != nil {
 		t.Fatalf("invalid json stdout %q: %v", stdout.String(), err)
 	}
-	if event["type"] != "error" || event["is_error"] != true || event["error_type"] != "authentication_error" || event["status_code"] != float64(http.StatusUnauthorized) {
+	if event["type"] != "error" || event["is_error"] != true || event["error_type"] != "authentication_error" || event["status_code"] != float64(http.StatusUnauthorized) || event["request_id"] != "req_stream_1" {
 		t.Fatalf("event = %#v", event)
 	}
 }

docs/cc-100-roadmap.md

@@ -1540,7 +1540,7 @@ M7 补充：terminal input parser 和 configurable keybinding name parser 现在
 
 本轮补充：CLI JSON/NDJSON final result 和 structured error envelope 现在暴露 `models_attempted`，保留本轮请求实际尝试过的模型顺序；配合 retry breadcrumb，headless/SDK 调用方可以在成功或失败结果里审计 fallback 路径。
 
-本轮补充：CLI JSON/NDJSON structured error 和 stream-json retry/error 事件现在会在底层错误为 Anthropic API error 时暴露 `error_type` 与 `status_code`，让 headless/SDK 调用方可以机器判定 rate limit、auth failure、overload 和 5xx fallback，而不必解析自然语言错误字符串。
+本轮补充：CLI JSON/NDJSON structured error 和 stream-json retry/error 事件现在会在底层错误为 Anthropic API error 时暴露 `error_type`、`status_code` 和 `request_id`，让 headless/SDK 调用方可以机器判定 rate limit、auth failure、overload 和 5xx fallback，并把错误关联到 provider 请求日志，而不必解析自然语言错误字符串。
 
 本轮补充：CLI headless runner 在 Anthropic client 初始化阶段失败时会保留已构造的 runner 元数据，因此缺凭证等 late setup error 的 JSON/NDJSON structured error result 也能输出 `cwd`、`session_id` 和 settings-derived runtime context。
 

docs/first-second-parity-audit.md

@@ -85,7 +85,7 @@ Anthropic API 和 conversation：
 - OAuth support now includes production OAuth config, scope parsing, Claude.ai scope detection, auth URL construction, PKCE verifier/challenge, state generation, and expiry checks.
 - Session/history support now includes CC-compatible prompt history references, pasted text/image placeholder parsing, paste-cache hashing and retrieval, `history.jsonl` append/load, current-session-first up-arrow ordering, ctrl+r-style deduped timestamped history, `CLAUDE_CODE_SKIP_PROMPT_HISTORY`, remote session event pagination helpers, lenient transcript loading, legacy progress parent-bridge recovery, compact-boundary pruning, snip removal/relink replay, metadata entry collection, leaf UUID calculation, conversation-chain reconstruction, orphaned parallel tool-result recovery, content-replacement record loading/reconstruction, tombstone metadata delete/relink replay, and tombstone-style transcript message removal with a size guard.
 - Anthropic API layer now covers streaming accumulation, usage update/accumulation semantics, non-streaming max token cap, thinking-budget adjustment, retry/backoff with `Retry-After` and `x-should-retry`, context-overflow `max_tokens` retry adjustment, beta-header dedupe, custom request headers, basic prompt cache breakpoint/cache-reference/cache-edits placement, prompt dump JSONL capture for init/new user messages/non-streaming responses/stream chunks, and CC-compatible USD cost calculation for known Claude models including cache read/write, web search requests, and Opus 4.6 fast-tier pricing.
-- Tool runtime now includes concurrency partitioning, ordered concurrent execution, interrupt behavior/defaults, max result size metadata, oversized result persistence, pre/post/permission-denied/permission-request hook dispatch, settings and local-plugin command-backed/HTTP hook execution for synchronous tool and conversation lifecycle hooks, hook-driven input updates/blocking/permission-request allow-deny, prompt/compact context injection, executor hook phase progress events, lifecycle progress events, retry/fallback model breadcrumbs, final-result/structured-error model attempt lists, structured API error status/type fields, headless stream-json progress events, snake_case token warning NDJSON payloads, lightweight compact NDJSON metadata, and pre-call cancellation checks.
+- Tool runtime now includes concurrency partitioning, ordered concurrent execution, interrupt behavior/defaults, max result size metadata, oversized result persistence, pre/post/permission-denied/permission-request hook dispatch, settings and local-plugin command-backed/HTTP hook execution for synchronous tool and conversation lifecycle hooks, hook-driven input updates/blocking/permission-request allow-deny, prompt/compact context injection, executor hook phase progress events, lifecycle progress events, retry/fallback model breadcrumbs, final-result/structured-error model attempt lists, structured API error status/type/request-id fields, headless stream-json progress events, snake_case token warning NDJSON payloads, lightweight compact NDJSON metadata, and pre-call cancellation checks.
 - Conversation runner can now use streaming clients, aggregate stream events into assistant messages, run tool calls through the orchestrator, preserve transcript append behavior, and apply CC-style per-message aggregate tool-result budget replacement before API requests with persisted replacement records for resume.
 
 ## Still Missing For 100% Compatibility