Skip to content

fix(claude): avoid false live conflicts on provider switch#289

Merged
unive3sal merged 1 commit into
SaladDay:mainfrom
hutiefang76:codex/cc-switch-cli-287-live-conflict
Jun 22, 2026
Merged

fix(claude): avoid false live conflicts on provider switch#289
unive3sal merged 1 commit into
SaladDay:mainfrom
hutiefang76:codex/cc-switch-cli-287-live-conflict

Conversation

@hutiefang76

Copy link
Copy Markdown
Contributor

Summary

  • Avoid reporting normal Claude provider changes as live configuration conflicts during switch preview.
  • Keep the previous provider snapshot as the merge base before backfilling live settings, then use that base when preparing Claude settings.json.
  • Add regression coverage for both the expected switch case and a real local override that should still report a conflict.

Fixes #287

Tests

  • cargo fmt --manifest-path src-tauri/Cargo.toml -- --check
  • git diff --check
  • cargo test --manifest-path src-tauri/Cargo.toml preview_switch_live_conflicts -- --nocapture
  • cargo test --manifest-path src-tauri/Cargo.toml provider_switch -- --nocapture

@unive3sal unive3sal left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@unive3sal unive3sal merged commit 9ee51d4 into SaladDay:main Jun 22, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

切换供应商提示 Live configuration conflicts

2 participants