Skip to content

feat(tui): add failover controls #155

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

Merged
unive3sal merged 1 commit into from
May 6, 2026
Merged

feat(tui): add failover controls #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 27 additions & 0 deletions .github/workflows/rust-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,30 @@ jobs:
- name: Check formatting
working-directory: src-tauri
run: cargo fmt --check

failover-e2e:
name: failover E2E test
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup Rust
uses: dtolnay/rust-toolchain@master
with:
toolchain: 1.91.1

- name: Setup Rust cache
uses: Swatinem/rust-cache@v2
with:
workspaces: src-tauri
key: failover-e2e

- name: Run failover E2E test
working-directory: src-tauri
run: |
sandbox_home="$(mktemp -d)"
export HOME="$sandbox_home"
export USERPROFILE="$sandbox_home"
export CC_SWITCH_CONFIG_DIR="$sandbox_home/.cc-switch"
cargo test --test proxy_claude_forwarder_alignment proxy_claude_auto_failover_uses_activated_queue_providers -- --exact --nocapture
16 changes: 16 additions & 0 deletions src-tauri/src/app_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -883,6 +883,7 @@ mod tests {
_lock: crate::test_support::TestHomeSettingsLock,
original_home: Option<OsString>,
original_userprofile: Option<OsString>,
original_config_dir: Option<OsString>,
}

impl TempHome {
Expand All @@ -891,9 +892,11 @@ mod tests {
let lock = crate::test_support::lock_test_home_and_settings();
let original_home = env::var_os("HOME");
let original_userprofile = env::var_os("USERPROFILE");
let original_config_dir = env::var_os("CC_SWITCH_CONFIG_DIR");

env::set_var("HOME", dir.path());
env::set_var("USERPROFILE", dir.path());
env::set_var("CC_SWITCH_CONFIG_DIR", dir.path().join(".cc-switch"));
crate::test_support::set_test_home_override(Some(dir.path()));
crate::settings::reload_test_settings();

Expand All @@ -902,6 +905,7 @@ mod tests {
_lock: lock,
original_home,
original_userprofile,
original_config_dir,
}
}
}
Expand All @@ -918,6 +922,11 @@ mod tests {
None => env::remove_var("USERPROFILE"),
}

match &self.original_config_dir {
Some(value) => env::set_var("CC_SWITCH_CONFIG_DIR", value),
None => env::remove_var("CC_SWITCH_CONFIG_DIR"),
}

crate::test_support::set_test_home_override(
self.original_home.as_deref().map(Path::new),
);
Expand All @@ -936,14 +945,21 @@ mod tests {
fn seed_stale_test_home_with_gemini_override(home: &std::path::Path) {
let stale_gemini_dir = home.join("custom-gemini");
let _lock = crate::test_support::lock_test_home_and_settings();
let original_config_dir = env::var_os("CC_SWITCH_CONFIG_DIR");

env::set_var("CC_SWITCH_CONFIG_DIR", home.join(".cc-switch"));
crate::test_support::set_test_home_override(Some(home));
crate::settings::reload_test_settings();

let mut settings = crate::settings::AppSettings::default();
settings.gemini_config_dir = Some(stale_gemini_dir.to_string_lossy().into_owned());
settings.save().expect("save stale settings");
crate::settings::reload_test_settings();

match original_config_dir {
Some(value) => env::set_var("CC_SWITCH_CONFIG_DIR", value),
None => env::remove_var("CC_SWITCH_CONFIG_DIR"),
}
}

#[test]
Expand Down
8 changes: 6 additions & 2 deletions src-tauri/src/cli/tui/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ mod tests;
mod types;

pub(crate) use app_state::{
Action, App, ConfigItem, LocalProxySettingsItem, ProxyVisualTransition, SettingsItem,
WebDavConfigItem, PROXY_HERO_TRANSITION_TICKS,
Action, App, ConfigItem, LocalProxySettingsItem, MoveDirection, ProxyVisualTransition,
SettingsItem, WebDavConfigItem, PROXY_HERO_TRANSITION_TICKS,
};
pub use editor_state::{EditorKind, EditorMode, EditorState, EditorSubmit};
pub(crate) use helpers::*;
Expand All @@ -42,6 +42,10 @@ pub use types::{
TextSubmit, TextViewAction, TextViewState, Toast, ToastKind,
};

pub(crate) fn supports_failover_controls(app_type: &AppType) -> bool {
matches!(app_type, AppType::Claude | AppType::Codex | AppType::Gemini)
}

const PROVIDER_NOTES_MAX_CHARS: usize = 120;

#[cfg(unix)]
Expand Down
22 changes: 21 additions & 1 deletion src-tauri/src/cli/tui/app/app_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,14 @@ pub enum Action {
ProviderStreamCheck {
id: String,
},
ProviderSetFailoverQueue {
id: String,
enabled: bool,
},
ProviderMoveFailoverQueue {
id: String,
direction: MoveDirection,
},
ProviderQuotaRefresh {
id: String,
},
Expand Down Expand Up @@ -175,6 +183,10 @@ pub enum Action {
SetProxyListenPort {
port: u16,
},
SetProxyAutoFailover {
app_type: AppType,
enabled: bool,
},
SetOpenClawConfigDir {
path: Option<String>,
},
Expand Down Expand Up @@ -364,15 +376,23 @@ impl SettingsItem {
pub enum LocalProxySettingsItem {
ListenAddress,
ListenPort,
AutoFailover,
}

impl LocalProxySettingsItem {
pub const ALL: [LocalProxySettingsItem; 2] = [
pub const ALL: [LocalProxySettingsItem; 3] = [
LocalProxySettingsItem::ListenAddress,
LocalProxySettingsItem::ListenPort,
LocalProxySettingsItem::AutoFailover,
];
}

#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum MoveDirection {
Up,
Down,
}

#[derive(Debug, Clone)]
pub enum WebDavConfigItem {
Settings,
Expand Down
71 changes: 42 additions & 29 deletions src-tauri/src/cli/tui/app/content_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,39 +767,52 @@ impl App {
self.settings_proxy_idx = (self.settings_proxy_idx + 1).min(items_len - 1);
Action::None
}
KeyCode::Enter => {
if data.proxy.running {
self.push_toast(
texts::tui_toast_proxy_settings_stop_before_edit(),
ToastKind::Info,
);
return Action::None;
KeyCode::Enter => match LocalProxySettingsItem::ALL.get(self.settings_proxy_idx) {
Some(LocalProxySettingsItem::AutoFailover) => {
if !supports_failover_controls(&self.app_type) {
return Action::None;
}
Action::SetProxyAutoFailover {
app_type: self.app_type.clone(),
enabled: !data.proxy.auto_failover_enabled,
}
}

match LocalProxySettingsItem::ALL.get(self.settings_proxy_idx) {
Some(LocalProxySettingsItem::ListenAddress) => {
self.overlay = Overlay::TextInput(TextInputState {
title: texts::tui_settings_proxy_title().to_string(),
prompt: texts::tui_settings_proxy_listen_address_prompt().to_string(),
buffer: data.proxy.configured_listen_address.clone(),
submit: TextSubmit::SettingsProxyListenAddress,
secret: false,
});
Action::None
Some(LocalProxySettingsItem::ListenAddress) => {
if data.proxy.running {
self.push_toast(
texts::tui_toast_proxy_settings_stop_before_edit(),
ToastKind::Info,
);
return Action::None;
}
Some(LocalProxySettingsItem::ListenPort) => {
self.overlay = Overlay::TextInput(TextInputState {
title: texts::tui_settings_proxy_title().to_string(),
prompt: texts::tui_settings_proxy_listen_port_prompt().to_string(),
buffer: data.proxy.configured_listen_port.to_string(),
submit: TextSubmit::SettingsProxyListenPort,
secret: false,
});
Action::None
self.overlay = Overlay::TextInput(TextInputState {
title: texts::tui_settings_proxy_title().to_string(),
prompt: texts::tui_settings_proxy_listen_address_prompt().to_string(),
buffer: data.proxy.configured_listen_address.clone(),
submit: TextSubmit::SettingsProxyListenAddress,
secret: false,
});
Action::None
}
Some(LocalProxySettingsItem::ListenPort) => {
if data.proxy.running {
self.push_toast(
texts::tui_toast_proxy_settings_stop_before_edit(),
ToastKind::Info,
);
return Action::None;
}
None => Action::None,
self.overlay = Overlay::TextInput(TextInputState {
title: texts::tui_settings_proxy_title().to_string(),
prompt: texts::tui_settings_proxy_listen_port_prompt().to_string(),
buffer: data.proxy.configured_listen_port.to_string(),
submit: TextSubmit::SettingsProxyListenPort,
secret: false,
});
Action::None
}
}
None => Action::None,
},
_ => Action::None,
}
}
Expand Down
Loading
Loading