Skip to content

fix: preserve takeover live state during provider refresh #1912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
congmucc wants to merge 4 commits into
base: main
Choose a base branch
from
+5,022 −1,849
Open

fix: preserve takeover live state during provider refresh #1912

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1469e5d
fix: rebuild takeover live configs from current provider
congmucc Apr 5, 2026
863aef8
fix: preserve takeover live state during provider refresh
congmucc Apr 7, 2026
cf55525
chore: clear clippy warnings in takeover refresh
congmucc Apr 7, 2026
1c62fe2
fix: tolerate malformed previous common config snippet
congmucc Apr 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 7 additions & 17 deletions src-tauri/src/commands/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,23 +212,7 @@ pub async fn set_claude_common_config_snippet(
snippet: String,
state: tauri::State<'_, crate::store::AppState>,
) -> Result<(), String> {
let is_cleared = snippet.trim().is_empty();

if !snippet.trim().is_empty() {
serde_json::from_str::<serde_json::Value>(&snippet).map_err(invalid_json_format_error)?;
}

let value = if is_cleared { None } else { Some(snippet) };

state
.db
.set_config_snippet("claude", value)
.map_err(|e| e.to_string())?;
state
.db
.set_config_snippet_cleared("claude", is_cleared)
.map_err(|e| e.to_string())?;
Ok(())
set_common_config_snippet("claude".to_string(), snippet, state).await
}

#[tauri::command]
Expand Down Expand Up @@ -285,8 +269,14 @@ pub async fn set_common_config_snippet(
if matches!(app_type.as_str(), "claude" | "codex" | "gemini") {
let app = AppType::from_str(&app_type).map_err(|e| e.to_string())?;
crate::services::provider::ProviderService::sync_current_provider_for_app(
state.inner(),
app.clone(),
)
.map_err(|e| e.to_string())?;
crate::services::provider::ProviderService::sync_current_common_config_for_app(
state.inner(),
app,
old_snippet.as_deref(),
)
.map_err(|e| e.to_string())?;
}
Expand Down
Loading