fix(claude-code): defensive coding improvements for model switching by codefromthecrypt · Pull Request #7131 · block/goose

codefromthecrypt · 2026-02-10T23:02:40Z

Summary

A series of polishing mentioned in #7120 for Claude Code model list support.

Type of Change

Bug fix
Refactor / Code quality

AI Assistance

This PR was created or reviewed with AI assistance

Testing

re-ran the integration test

$ RUST_LOG=debug GOOSE_CLAUDE_CODE_DEBUG=1 cargo test -p goose --test providers -- test_claude_code_provider --nocapture
    Blocking waiting for file lock on build directory
   Compiling goose v1.23.0 (/Users/codefromthecrypt/oss/goose-goosed/crates/goose)
    Finished `test` profile [unoptimized + debuginfo] target(s) in 1m 15s
     Running tests/providers.rs (target/debug/deps/providers-83a00f385f05bffd)

running 1 test
=== claude-code::model_listing ===
[crates/goose/tests/providers.rs:315:9] &models = [
    "default",
    "sonnet",
    "haiku",
]
===================
=== CLAUDE CODE PROVIDER DEBUG ===
Command: "/opt/homebrew/bin/claude"
Original system prompt length: 28 chars
Filtered system prompt length: 28 chars
Filtered system prompt: You are a helpful assistant.
================================
set_model: default resolved to claude-opus-4-6
=== claude-code::basic_response === Hello! 👋 How can I help you today?
=== CLAUDE CODE PROVIDER DEBUG ===
Command: "/opt/homebrew/bin/claude"
Original system prompt length: 28 chars
Filtered system prompt length: 28 chars
Filtered system prompt: You are a helpful assistant.
================================
set_model: sonnet resolved to claude-sonnet-4-5-20250929
=== claude-code::model_switch (default -> sonnet) === Hello! 👋 How can I help you today?
test test_claude_code_provider ... ok

test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 15 filtered out; finished in 6.19s


============== Providers ==============
✅ claude-code
=======================================

Related Issues

Relates to #7120

Replace unwrap() with proper error propagation on serde serialization, match request_id in control_response handling, reap child process with kill().await, and use safe indexing in tests. Signed-off-by: Adrian Cole <adrian@tetrate.io>

michaelneale · 2026-02-10T23:03:48Z

crates/goose/src/providers/claude_code.rs

                    }
                    if let Ok(parsed) = serde_json::from_str::<Value>(trimmed) {
                        if parsed.get("type").and_then(|t| t.as_str()) == Some("control_response") {
+                            // Skip responses that don't match our request_id


seems non slop comment by why do we need to skip? just curious

yeah this is responding to copilot comment, lemme dig deeper it might have been slop

michaelneale · 2026-02-10T23:04:30Z

crates/goose/src/providers/claude_code.rs

        }

-        let _ = child.start_kill();
+        let _ = child.kill().await;


makes sense, I wonder if we should name this to claude_code_cli just in case oauth comes back one day? (as would be different code?)

Copilot

Pull request overview

This PR applies defensive coding improvements to the claude-code provider following the model switching feature added in #7120. The changes focus on replacing panic-prone operations with proper error handling and adding request ID validation.

Changes:

Replaced direct array indexing with .first() to prevent panics on empty vectors
Changed unwrap() to proper error handling for JSON serialization operations
Added request ID filtering to skip mismatched control responses
Changed synchronous start_kill() to async kill().await in appropriate context

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File	Description
crates/goose/tests/providers.rs	Removed redundant comments and changed array indexing to `.first()` for defensive null checking
crates/goose/src/providers/claude_code.rs	Added proper error handling for JSON serialization, request ID validation, and improved process cleanup

* origin/main: (107 commits) feat: Allow overriding default bat themes using environment variables (#7140) Make the system prompt smaller (#6991) Pre release script (#7145) Spelling (#7137) feat(mcp): upgrade rmcp to 0.15.0 and advertise MCP Apps UI extension capability (#6927) fix: ensure assistant messages with tool_calls include content field (#7076) fix(canonical): handle gcp_vertex_ai model mapping correctly (#6836) Group dependencies in root Cargo.toml (#6948) refactor: updated elevenLabs API module and `remove button` UX (#6781) fix: we were missing content from langfuse traces (#7135) docs: update username in authors.yml (#7132) fix extension selector syncing issues (#7133) fix(acp): per-session Agent for model isolation and load_session restore (#7115) fix(claude-code): defensive coding improvements for model switching (#7131) feat(claude-code): dynamic model listing and mid-session model switching (#7120) Inline worklet source (#7128) [docs] One shot prompting is dead - Blog Post (#7113) fix: correct spelling of Debbie O'Brien's name in authors.yml (#7127) docs: GCP Vertex AI org policy filtering & update OnboardingProviderSetup component (#7125) feat: replace subagent and skills with unified summon extension (#6964) ... # Conflicts: # Cargo.lock # Cargo.toml

* upstream/main: (109 commits) [docs] Skills Marketplace UI Improvements (block#7158) More no-window flags (block#7122) feat: Allow overriding default bat themes using environment variables (block#7140) Make the system prompt smaller (block#6991) Pre release script (block#7145) Spelling (block#7137) feat(mcp): upgrade rmcp to 0.15.0 and advertise MCP Apps UI extension capability (block#6927) fix: ensure assistant messages with tool_calls include content field (block#7076) fix(canonical): handle gcp_vertex_ai model mapping correctly (block#6836) Group dependencies in root Cargo.toml (block#6948) refactor: updated elevenLabs API module and `remove button` UX (block#6781) fix: we were missing content from langfuse traces (block#7135) docs: update username in authors.yml (block#7132) fix extension selector syncing issues (block#7133) fix(acp): per-session Agent for model isolation and load_session restore (block#7115) fix(claude-code): defensive coding improvements for model switching (block#7131) feat(claude-code): dynamic model listing and mid-session model switching (block#7120) Inline worklet source (block#7128) [docs] One shot prompting is dead - Blog Post (block#7113) fix: correct spelling of Debbie O'Brien's name in authors.yml (block#7127) ...

…lock#7131) Signed-off-by: Adrian Cole <adrian@tetrate.io>

Copilot AI review requested due to automatic review settings February 10, 2026 23:02

codefromthecrypt enabled auto-merge February 10, 2026 23:03

Copilot started reviewing on behalf of codefromthecrypt February 10, 2026 23:03 View session

michaelneale reviewed Feb 10, 2026

View reviewed changes

Copilot AI reviewed Feb 10, 2026

View reviewed changes

michaelneale approved these changes Feb 10, 2026

View reviewed changes

codefromthecrypt added this pull request to the merge queue Feb 10, 2026

Merged via the queue into main with commit dc50b7b Feb 10, 2026
23 of 24 checks passed

codefromthecrypt deleted the claude-model-tidy branch February 10, 2026 23:21

Tyler-Hardin pushed a commit to Tyler-Hardin/goose that referenced this pull request Feb 11, 2026

fix(claude-code): defensive coding improvements for model switching (b…

ada27cf

…lock#7131) Signed-off-by: Adrian Cole <adrian@tetrate.io>

Tyler-Hardin pushed a commit to Tyler-Hardin/goose that referenced this pull request Feb 11, 2026

fix(claude-code): defensive coding improvements for model switching (b…

6379f9f

…lock#7131) Signed-off-by: Adrian Cole <adrian@tetrate.io>

Tyler-Hardin pushed a commit to Tyler-Hardin/goose that referenced this pull request Feb 11, 2026

fix(claude-code): defensive coding improvements for model switching (b…

4962aaf

…lock#7131) Signed-off-by: Adrian Cole <adrian@tetrate.io>

github-actions bot mentioned this pull request Feb 12, 2026

chore(release): release version 1.24.0 (minor) #7102

Open

BrewTestBot mentioned this pull request Feb 12, 2026

block-goose-cli 1.24.0 Homebrew/homebrew-core#267289

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(claude-code): defensive coding improvements for model switching#7131

fix(claude-code): defensive coding improvements for model switching#7131
codefromthecrypt merged 1 commit intomainfrom
claude-model-tidy

codefromthecrypt commented Feb 10, 2026

Uh oh!

michaelneale Feb 10, 2026

Uh oh!

codefromthecrypt Feb 10, 2026

Uh oh!

michaelneale Feb 10, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

codefromthecrypt commented Feb 10, 2026

Summary

Type of Change

AI Assistance

Testing

Related Issues

Uh oh!

michaelneale Feb 10, 2026

Choose a reason for hiding this comment

Uh oh!

codefromthecrypt Feb 10, 2026

Choose a reason for hiding this comment

Uh oh!

michaelneale Feb 10, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants