Report attempted models in print results

Author: SqlRush

cmd/claude/main.go

@@ -2137,31 +2137,32 @@ func firstNonEmpty(values ...string) string {
 }
 
 type printJSONResult struct {
-	Type           string                   `json:"type"`
-	Subtype        string                   `json:"subtype"`
-	IsError        bool                     `json:"is_error"`
-	DurationMS     int64                    `json:"duration_ms"`
-	DurationAPI    int64                    `json:"duration_api_ms"`
-	NumTurns       int                      `json:"num_turns,omitempty"`
-	TotalCost      float64                  `json:"total_cost_usd,omitempty"`
-	SessionID      contracts.ID             `json:"session_id,omitempty"`
-	CWD            string                   `json:"cwd,omitempty"`
-	PermissionMode string                   `json:"permission_mode,omitempty"`
-	APIKeySource   string                   `json:"api_key_source,omitempty"`
-	Betas          []string                 `json:"betas,omitempty"`
-	FastMode       bool                     `json:"fast_mode,omitempty"`
-	OutputStyle    string                   `json:"output_style,omitempty"`
-	OutputStyles   []string                 `json:"available_output_styles,omitempty"`
-	Result         string                   `json:"result"`
-	Error          string                   `json:"error,omitempty"`
-	Message        *contracts.Message       `json:"message,omitempty"`
-	StopReason     string                   `json:"stop_reason,omitempty"`
-	Model          string                   `json:"model,omitempty"`
-	Usage          *contracts.Usage         `json:"usage,omitempty"`
-	ToolResults    []contracts.ToolResult   `json:"tool_results,omitempty"`
-	Cleared        bool                     `json:"cleared,omitempty"`
-	Compacted      bool                     `json:"compacted,omitempty"`
-	Compact        *session.CompactMetadata `json:"compact,omitempty"`
+	Type            string                   `json:"type"`
+	Subtype         string                   `json:"subtype"`
+	IsError         bool                     `json:"is_error"`
+	DurationMS      int64                    `json:"duration_ms"`
+	DurationAPI     int64                    `json:"duration_api_ms"`
+	NumTurns        int                      `json:"num_turns,omitempty"`
+	TotalCost       float64                  `json:"total_cost_usd,omitempty"`
+	SessionID       contracts.ID             `json:"session_id,omitempty"`
+	CWD             string                   `json:"cwd,omitempty"`
+	PermissionMode  string                   `json:"permission_mode,omitempty"`
+	APIKeySource    string                   `json:"api_key_source,omitempty"`
+	Betas           []string                 `json:"betas,omitempty"`
+	FastMode        bool                     `json:"fast_mode,omitempty"`
+	OutputStyle     string                   `json:"output_style,omitempty"`
+	OutputStyles    []string                 `json:"available_output_styles,omitempty"`
+	Result          string                   `json:"result"`
+	Error           string                   `json:"error,omitempty"`
+	Message         *contracts.Message       `json:"message,omitempty"`
+	StopReason      string                   `json:"stop_reason,omitempty"`
+	Model           string                   `json:"model,omitempty"`
+	ModelsAttempted []string                 `json:"models_attempted,omitempty"`
+	Usage           *contracts.Usage         `json:"usage,omitempty"`
+	ToolResults     []contracts.ToolResult   `json:"tool_results,omitempty"`
+	Cleared         bool                     `json:"cleared,omitempty"`
+	Compacted       bool                     `json:"compacted,omitempty"`
+	Compact         *session.CompactMetadata `json:"compact,omitempty"`
 }
 
 type printStreamEvent struct {
@@ -2622,22 +2623,23 @@ func writePrintJSONResult(stdout io.Writer, runner conversation.Runner, result c
 		model = strings.TrimSpace(runner.Model)
 	}
 	envelope := printJSONResult{
-		Type:        "result",
-		Subtype:     "success",
-		IsError:     false,
-		DurationMS:  durationMillis(duration),
-		DurationAPI: durationMillis(result.APIDuration),
-		NumTurns:    resultNumTurns(result),
-		TotalCost:   usageCostUSD(usage),
-		SessionID:   sessionID,
-		Result:      text,
-		Message:     messagePtr,
-		StopReason:  result.StopReason,
-		Model:       model,
-		Usage:       usage,
-		ToolResults: result.ToolResults,
-		Cleared:     result.Cleared,
-		Compacted:   result.Compacted,
+		Type:            "result",
+		Subtype:         "success",
+		IsError:         false,
+		DurationMS:      durationMillis(duration),
+		DurationAPI:     durationMillis(result.APIDuration),
+		NumTurns:        resultNumTurns(result),
+		TotalCost:       usageCostUSD(usage),
+		SessionID:       sessionID,
+		Result:          text,
+		Message:         messagePtr,
+		StopReason:      result.StopReason,
+		Model:           model,
+		ModelsAttempted: append([]string(nil), result.ModelsAttempt...),
+		Usage:           usage,
+		ToolResults:     result.ToolResults,
+		Cleared:         result.Cleared,
+		Compacted:       result.Compacted,
 	}
 	applyPrintJSONRuntime(&envelope, runner)
 	if result.Compact != nil {

cmd/claude/main_test.go

@@ -2273,6 +2273,25 @@ func TestResultNumTurnsCountsAssistantMessages(t *testing.T) {
 	}
 }
 
+func TestWritePrintJSONResultIncludesModelsAttempted(t *testing.T) {
+	result := conversation.Result{
+		Assistant:     messages.AssistantText("fallback ok", "haiku", nil),
+		ModelsAttempt: []string{"sonnet", "haiku"},
+	}
+	var stdout bytes.Buffer
+	if err := writePrintJSONResult(&stdout, conversation.Runner{Model: "sonnet"}, result, "fallback ok", 10); err != nil {
+		t.Fatal(err)
+	}
+	var payload map[string]any
+	if err := json.Unmarshal(stdout.Bytes(), &payload); err != nil {
+		t.Fatalf("invalid json stdout %q: %v", stdout.String(), err)
+	}
+	attempts, ok := payload["models_attempted"].([]any)
+	if !ok || len(attempts) != 2 || attempts[0] != "sonnet" || attempts[1] != "haiku" {
+		t.Fatalf("models_attempted = %#v", payload["models_attempted"])
+	}
+}
+
 func TestWritePrintJSONResultIncludesCompactMetadata(t *testing.T) {
 	plan := compactpkg.BuildPlan(
 		[]contracts.Message{messages.UserText("old")},

docs/cc-100-roadmap.md

@@ -1538,6 +1538,8 @@ M7 补充：terminal input parser 和 configurable keybinding name parser 现在
 
 本轮补充：模型 fallback retry 事件现在携带可消费 breadcrumb：conversation event、telemetry 和 `--output-format stream-json` 都会暴露 attempt/max_attempts、failed_model、next_model 和 fallback 标记，便于 SDK/headless 调用方展示模型切换原因和下一跳。
 
+本轮补充：CLI JSON/NDJSON final result envelope 现在暴露 `models_attempted`，保留本轮请求实际尝试过的模型顺序；配合 retry breadcrumb，headless/SDK 调用方可以在最终结果里审计 fallback 路径。
+
 本轮补充：CLI headless runner 在 Anthropic client 初始化阶段失败时会保留已构造的 runner 元数据，因此缺凭证等 late setup error 的 JSON/NDJSON structured error result 也能输出 `cwd`、`session_id` 和 settings-derived runtime context。
 
 当前状态：已新增 `internal/mcp` 配置地基，覆盖 transport 归一化、stdio/url server signature、CCR proxy URL 解包、plugin MCP server 去重、allowed/denied MCP policy 的基础判定和过滤、MCP server config 环境变量展开、server scope/merge 基础、`.mcp.json` schema 解析/校验基础、项目目录链 `.mcp.json` 加载/合并、settings `mcpServers` scope 解析和 user/project/local 手工配置合并过滤、settings/.mcp.json/policy 到多 server toolset 的高层装配入口基础、conversation runner 对 configured MCP toolsets 的自动合并/执行基础、settings 文件到 runner `MCPConfig` 的 loader 接线入口及默认 MCP OAuth provider 注入、CLI bootstrap 到 runner MCP config skeleton 接线基础、MCP tool result 归一化/错误标记/result meta/content aliases/content-item aliases/大输出落盘基础、`mcp__server__tool` 名称归一化/解析 helper、MCP remote tool discovery/call 到 Go tool registry 的基础适配、MCP tool input/output schema 解析和传播、MCP tools/resources/prompts list pagination 和 cursor alias、MCP resource read content aliases 和 subscribe 调用/工具入口、MCP prompt get message aliases、MCP resource list/read/subscribe helper tool 基础、MCP prompt list/get helper tool 基础、resource/prompt helper 输入 trim 校验、MCP utility/prompt/resource client 输入 trim/校验、MCP JSON-RPC protocol client initialize/initialized lifecycle、ping 和 session-expired 判定/reset/reinitialize/retry 基础、client roots/list capability、roots/list_changed notification、cancelled/progress notification 和 CWD root 注入基础、stdio newline JSON-RPC transport/process launch 和 context cancellation 基础、HTTP JSON-RPC transport 基础、HTTP event-stream response parsing、byte limit 和 inbound request response POST 基础、`mcp-session-id` header 复用和 DELETE close 基础、传统 SSE endpoint discovery byte limit + POST + async response stream 和 stream inbound request response POST 基础、WebSocket JSON-RPC transport 和 context cancellation 基础、stdio/HTTP/SSE/WS JSON-RPC notification 捕获/handler 和 notification event 归一化/结构化 handler adapter surface 基础、stdio/WS inbound server request handler 与 elicitation/create 默认 cancel/自定义 handler、elicitation request/response alias surface 和结构化 handler adapter 基础、static authToken/OAuth beta transport header 基础、HTTP/SSE/WS dynamic auth header provider 基础、通用 OAuth refresh-token provider 基础、OAuth credential file store 和 refresh 持久化基础、MCP OAuth server file-backed access-token provider 注入基础、MCP HTTP/SSE/WS 401 reactive authorization refresh 基础、stdio/HTTP/SSE/WS protocol client 到 server toolset 的装配基础、多 server toolset 聚合和统一 close 基础、MCP tool annotations read-only/destructive hint 解析，以及 `cmd/claude-mcp` stdio 内置工具 server 初版（initialize、initialized lifecycle guard、ping、tools/list annotations 和 outputSchema、tools/call、resources/prompts 空列表与 not-found 响应、resources/subscribe 兼容 not-found 响应、JSON-RPC id 保留、batch request、invalid request 错误、client cancellation notification 基础、read-only 默认权限、`--allow-mutating-tools`）。完整 CLI/TUI 交互主循环与 runner 执行接线、完整 SSE/WS lifecycle hardening、HTTP streaming lifecycle hardening、stdio lifecycle hardening、完整 OAuth 授权/secure storage、完整 channel notification/elicitation surface 和完整内置 MCP server parity 仍未完成。

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, 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 model attempt lists, 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