Port upstream 0.64.1: honor saved Kimi API region in CLI and serve fetch contexts

README.es-MX.md

@@ -102,7 +102,6 @@ Consulta el historial completo en [CHANGELOG.md](CHANGELOG.md).
 | Xiaomi MiMo | Cookies | Saldo, Plan de tokens |
 | Doubao | Clave API | Límites de solicitudes |
 | Command Code | Cookies | Créditos mensuales, Créditos comprados |
-| Crof | Clave API | Créditos, Cuota de solicitudes |
 | StepFun | Token Oasis | 5h, Semanal, Refresco de token |
 | Venice | Clave API | Saldo USD / DIEM |
 | OpenAI | Admin API / Clave API | Uso, Solicitudes, Costo con ámbito de proyecto, Saldo de créditos |

README.md

@@ -109,7 +109,6 @@ See the full history in [CHANGELOG.md](CHANGELOG.md).
 | Xiaomi MiMo | Cookies | Balance, Token Plan |
 | Doubao | API Key | Request Limits |
 | Command Code | Cookies | Monthly Credits, Purchased Credits |
-| Crof | API Key | Credits, Request Quota |
 | StepFun | Oasis Token | 5h, Weekly, Token refresh |
 | Venice | API Key | USD / DIEM Balance |
 | OpenAI | Admin API / API Key | Usage, Requests, Project-scoped cost, Credit Balance |

README.tr-TR.md

@@ -107,7 +107,6 @@ Tüm geçmişi [CHANGELOG.md](CHANGELOG.md) dosyasında görebilirsiniz.
 | Xiaomi MiMo | Çerezler | Bakiye, Token Planı |
 | Doubao | API Anahtarı | İstek Sınırları |
 | Command Code | Çerezler | Aylık Krediler, Satın Alınan Krediler |
-| Crof | API Anahtarı | Krediler, İstek Kotası |
 | StepFun | Oasis Tokenı | 5 saatlik, Haftalık, Token yenileme |
 | Venice | API Anahtarı | USD / DIEM Bakiyesi |
 | OpenAI | Yönetici API'si / API Anahtarı | Kullanım, İstekler, Proje kapsamlı maliyet, Kredi Bakiyesi |

README.zh-CN.md

@@ -14,7 +14,7 @@
 
 ## 功能特性
 
-- **56 个 AI 服务商** — Codex、Claude、Cursor、Factory、Gemini、Copilot、Antigravity、z.ai、MiniMax、Kiro、Vertex AI、Augment、OpenCode、Kimi、Kimi K2、Amp、Warp、Ollama、Azure OpenAI、T3 Chat、OpenRouter、JetBrains AI、Alibaba、Alibaba Token Plan、NanoGPT、Infini、Perplexity、Abacus AI、Mistral、OpenCode Go、Kilo、AWS Bedrock、Codebuff、DeepSeek、Windsurf、Manus、小米 MiMo、Doubao、Command Code、Crof、StepFun、Venice、OpenAI、Grok、ElevenLabs、Deepgram、Groq、LLM Proxy、Chutes、LiteLLM、Poe、Devin、Zed、CrossModel、Qoder、Sakana AI
+- **56 个 AI 服务商** — Codex、Claude、Cursor、Factory、Gemini、Copilot、Antigravity、z.ai、MiniMax、Kiro、Vertex AI、Augment、OpenCode、Kimi、Kimi K2、Amp、Warp、Ollama、Azure OpenAI、T3 Chat、OpenRouter、JetBrains AI、Alibaba、Alibaba Token Plan、NanoGPT、Infini、Perplexity、Abacus AI、Mistral、OpenCode Go、Kilo、AWS Bedrock、Codebuff、DeepSeek、Windsurf、Manus、小米 MiMo、Doubao、Command Code、StepFun、Venice、OpenAI、Grok、ElevenLabs、Deepgram、Groq、LLM Proxy、Chutes、LiteLLM、Poe、Devin、Zed、CrossModel、Qoder、Sakana AI
 - **系统托盘图标** — 动态双条进度显示会话与周用量
 - **Floating Bar** — 可选的置顶透明用量条，支持方向、透明度和点击穿透控制
 - **浏览器 Cookie 导入** — Chrome、Edge、Brave、Firefox（Windows DPAPI 解密）
@@ -217,7 +217,6 @@ codexbar cost  -p codex           # 本地成本（JSONL 日志）
 | 小米 MiMo | Cookies | 余额、Token 套餐 |
 | Doubao | API Key | 请求限制 |
 | Command Code | Cookies | 月度 Credits、已购 Credits |
-| Crof | API Key | Credits、请求配额 |
 | StepFun | Oasis Token | 5h、周用量 |
 | Venice | API Key | USD / DIEM 余额 |
 | OpenAI | Admin API / API Key | 用量、请求数、余额 |

README.zh-TW.md

@@ -14,7 +14,7 @@
 
 ## 功能特性
 
-- **56 個 AI 提供者** — Codex、Claude、Cursor、Factory、Gemini、Copilot、Antigravity、z.ai、MiniMax、Kiro、Vertex AI、Augment、OpenCode、Kimi、Kimi K2、Amp、Warp、Ollama、Azure OpenAI、T3 Chat、OpenRouter、JetBrains AI、Alibaba、Alibaba Token Plan、NanoGPT、Infini、Perplexity、Abacus AI、Mistral、OpenCode Go、Kilo、AWS Bedrock、Codebuff、DeepSeek、Windsurf、Manus、小米 MiMo、Doubao、Command Code、Crof、StepFun、Venice、OpenAI、Grok、ElevenLabs、Deepgram、Groq、LLM Proxy、Chutes、LiteLLM、Poe、Devin、Zed、CrossModel、Qoder、Sakana AI
+- **56 個 AI 提供者** — Codex、Claude、Cursor、Factory、Gemini、Copilot、Antigravity、z.ai、MiniMax、Kiro、Vertex AI、Augment、OpenCode、Kimi、Kimi K2、Amp、Warp、Ollama、Azure OpenAI、T3 Chat、OpenRouter、JetBrains AI、Alibaba、Alibaba Token Plan、NanoGPT、Infini、Perplexity、Abacus AI、Mistral、OpenCode Go、Kilo、AWS Bedrock、Codebuff、DeepSeek、Windsurf、Manus、小米 MiMo、Doubao、Command Code、StepFun、Venice、OpenAI、Grok、ElevenLabs、Deepgram、Groq、LLM Proxy、Chutes、LiteLLM、Poe、Devin、Zed、CrossModel、Qoder、Sakana AI
 - **系統系統匣圖示** — 動態雙條進度顯示會話與周用量
 - **Floating Bar** — 可選的置頂透明用量條，支援方向、透明度和點選穿透控制
 - **瀏覽器 Cookie 匯入** — Chrome、Edge、Brave、Firefox（Windows DPAPI 解密）
@@ -217,7 +217,6 @@ codexbar cost  -p codex           # 本機成本（JSONL 日誌）
 | 小米 MiMo | Cookies | 餘額、Token 套餐 |
 | Doubao | API Key | 請求限制 |
 | Command Code | Cookies | 月度 Credits、已購 Credits |
-| Crof | API Key | Credits、請求配額 |
 | StepFun | Oasis Token | 5h、周用量 |
 | Venice | API Key | USD / DIEM 餘額 |
 | OpenAI | Admin API / API Key | 用量、請求數、餘額 |

apps/desktop-tauri/src-tauri/src/commands/bridge.rs

@@ -661,6 +661,8 @@ pub struct SettingsSnapshot {
     predictive_pace_warning_enabled: bool,
     show_pace: bool,
     tray_icon_mode: &'static str,
+    stacked_tray_top_provider: Option<String>,
+    stacked_tray_bottom_provider: Option<String>,
     switcher_shows_icons: bool,
     menu_bar_shows_highest_usage: bool,
     menu_bar_shows_percent: bool,
@@ -783,6 +785,8 @@ impl From<Settings> for SettingsSnapshot {
             predictive_pace_warning_enabled: settings.predictive_pace_warning_enabled,
             show_pace: settings.show_pace,
             tray_icon_mode: tray_icon_mode_label(settings.tray_icon_mode),
+            stacked_tray_top_provider: settings.stacked_tray_top_provider,
+            stacked_tray_bottom_provider: settings.stacked_tray_bottom_provider,
             switcher_shows_icons: settings.switcher_shows_icons,
             menu_bar_shows_highest_usage: settings.menu_bar_shows_highest_usage,
             menu_bar_shows_percent: settings.menu_bar_shows_percent,
@@ -876,6 +880,7 @@ fn tray_icon_mode_label(mode: TrayIconMode) -> &'static str {
     match mode {
         TrayIconMode::Single => "single",
         TrayIconMode::PerProvider => "perProvider",
+        TrayIconMode::Stacked => "stacked",
     }
 }
 

apps/desktop-tauri/src-tauri/src/commands/mod.rs

@@ -104,6 +104,25 @@ fn canonical_provider_arg(provider_id: &str) -> Result<String, String> {
     Ok(parse_provider_arg(provider_id)?.cli_name().to_string())
 }
 
+fn provider_dashboard_url(id: ProviderId, settings: &Settings) -> Option<String> {
+    match id {
+        ProviderId::MiniMax => Some(
+            codexbar::providers::MiniMaxProvider::dashboard_url_for_region(Some(
+                settings.api_region(id),
+            )),
+        ),
+        ProviderId::Kimi => Some(
+            codexbar::providers::KimiRegion::from_settings(Some(settings.api_region(id)))
+                .console_url()
+                .to_string(),
+        ),
+        _ => instantiate_provider(id)
+            .metadata()
+            .dashboard_url
+            .map(str::to_string),
+    }
+}
+
 fn validate_single_line_secret(value: &str, field: &str, max_len: usize) -> Result<(), String> {
     let trimmed = value.trim();
     if trimmed.is_empty() {

apps/desktop-tauri/src-tauri/src/commands/provider_detail.rs

@@ -73,15 +73,7 @@ pub(crate) fn build_provider_detail(
     let provider = instantiate_provider(id);
     let metadata = provider.metadata();
     let resume_supported = auto_resume_supported(id);
-    let dashboard_url = if id == codexbar::core::ProviderId::MiniMax {
-        Some(
-            codexbar::providers::MiniMaxProvider::dashboard_url_for_region(Some(
-                settings.api_region(id),
-            )),
-        )
-    } else {
-        metadata.dashboard_url.map(|s| s.to_string())
-    };
+    let dashboard_url = provider_dashboard_url(id, &settings);
 
     let detail = ProviderDetail {
         id: id.cli_name().to_string(),

apps/desktop-tauri/src-tauri/src/commands/provider_refresh.rs

@@ -87,7 +87,7 @@ fn provider_cache_can_skip_refresh(
             .iter()
             .any(|snapshot| snapshot.provider_id == id.cli_name())
     });
-    if !force && crate::proof_harness::seed_usage_json_active() && cache_has_all {
+    if !force && state.provider_cache_seeded && cache_has_all {
         return true;
     }
     !force
@@ -125,6 +125,38 @@ pub(super) fn complete_provider_refresh(
 mod tests {
     use super::*;
 
+    #[test]
+    fn validated_seed_pins_only_complete_nonforced_cache() {
+        let mut state = AppState::new();
+        state.provider_cache.push(
+            crate::proof_harness::parse_seed_usage_snapshot(
+                r#"{"providerId":"codex","primary":{"usedPercent":25.0}}"#,
+            )
+            .unwrap(),
+        );
+        assert!(!provider_cache_can_skip_refresh(
+            &state,
+            false,
+            &[ProviderId::Codex]
+        ));
+        state.provider_cache_seeded = true;
+        assert!(provider_cache_can_skip_refresh(
+            &state,
+            false,
+            &[ProviderId::Codex]
+        ));
+        assert!(!provider_cache_can_skip_refresh(
+            &state,
+            true,
+            &[ProviderId::Codex]
+        ));
+        assert!(!provider_cache_can_skip_refresh(
+            &state,
+            false,
+            &[ProviderId::Codex, ProviderId::Claude]
+        ));
+    }
+
     #[test]
     fn stale_inputs_cannot_reserve_a_new_generation_after_invalidation() {
         let mut state = AppState::new();

apps/desktop-tauri/src-tauri/src/commands/provider_settings.rs

@@ -272,6 +272,7 @@ fn region_provider(provider_id: &str) -> Option<codexbar::core::ProviderId> {
         "alibabatokenplan" => ProviderId::AlibabaTokenPlan,
         "zai" => ProviderId::Zai,
         "minimax" => ProviderId::MiniMax,
+        "kimi" => ProviderId::Kimi,
         _ => return None,
     })
 }
@@ -284,6 +285,10 @@ pub(crate) fn provider_region_lookup(settings: &Settings, provider_id: &str) ->
             ))
             .settings_value()
             .to_string()
+        } else if id == codexbar::core::ProviderId::Kimi {
+            codexbar::providers::KimiRegion::from_settings(Some(settings.api_region(id)))
+                .settings_value()
+                .to_string()
         } else {
             settings.api_region(id).to_string()
         }
@@ -820,6 +825,14 @@ pub fn region_options_for(provider_id: &str) -> Vec<RegionOption> {
                     .to_string(),
             },
         ],
+        "kimi" => codexbar::providers::KimiRegion::ALL
+            .iter()
+            .copied()
+            .map(|region| RegionOption {
+                value: region.settings_value().to_string(),
+                label: region.display_name().to_string(),
+            })
+            .collect(),
         "alibabatokenplan" => codexbar::providers::AlibabaTokenPlanRegion::ALL
             .iter()
             .copied()

apps/desktop-tauri/src-tauri/src/commands/settings.rs

@@ -26,6 +26,8 @@ pub struct SettingsUpdate {
     pub predictive_pace_warning_enabled: Option<bool>,
     pub show_pace: Option<bool>,
     pub tray_icon_mode: Option<String>,
+    pub stacked_tray_top_provider: Option<String>,
+    pub stacked_tray_bottom_provider: Option<String>,
     pub switcher_shows_icons: Option<bool>,
     pub menu_bar_shows_highest_usage: Option<bool>,
     pub menu_bar_shows_percent: Option<bool>,
@@ -121,6 +123,8 @@ impl SettingsUpdate {
 
     fn refreshes_tray_presentation(&self) -> bool {
         self.tray_icon_mode.is_some()
+            || self.stacked_tray_top_provider.is_some()
+            || self.stacked_tray_bottom_provider.is_some()
             || self.switcher_shows_icons.is_some()
             || self.menu_bar_shows_highest_usage.is_some()
             || self.menu_bar_shows_percent.is_some()
@@ -190,6 +194,12 @@ impl SettingsUpdate {
         {
             settings.tray_icon_mode = mode;
         }
+        if let Some(provider) = self.stacked_tray_top_provider.clone() {
+            settings.stacked_tray_top_provider = normalize_optional_provider_id(provider);
+        }
+        if let Some(provider) = self.stacked_tray_bottom_provider.clone() {
+            settings.stacked_tray_bottom_provider = normalize_optional_provider_id(provider);
+        }
         if let Some(v) = self.provider_metrics.clone() {
             apply_provider_metrics(settings, v);
         }
@@ -482,10 +492,16 @@ fn parse_tray_icon_mode(s: &str) -> Option<TrayIconMode> {
     match s {
         "single" => Some(TrayIconMode::Single),
         "perProvider" => Some(TrayIconMode::PerProvider),
+        "stacked" => Some(TrayIconMode::Stacked),
         _ => None,
     }
 }
 
+fn normalize_optional_provider_id(value: String) -> Option<String> {
+    let value = value.trim();
+    (!value.is_empty()).then(|| value.to_string())
+}
+
 fn parse_update_channel(s: &str) -> Option<UpdateChannel> {
     match s {
         "stable" => Some(UpdateChannel::Stable),
@@ -700,6 +716,36 @@ mod tests {
             }
             .refreshes_tray_presentation()
         );
+        assert!(
+            SettingsUpdate {
+                stacked_tray_top_provider: Some("claude".to_string()),
+                ..Default::default()
+            }
+            .refreshes_tray_presentation()
+        );
+    }
+
+    #[test]
+    fn stacked_tray_update_accepts_mode_and_clears_automatic_provider() {
+        let mut settings = Settings {
+            stacked_tray_top_provider: Some("codex".to_string()),
+            ..Settings::default()
+        };
+
+        SettingsUpdate {
+            tray_icon_mode: Some("stacked".to_string()),
+            stacked_tray_top_provider: Some(String::new()),
+            stacked_tray_bottom_provider: Some("claude".to_string()),
+            ..Default::default()
+        }
+        .apply_provider_settings(&mut settings);
+
+        assert_eq!(settings.tray_icon_mode, TrayIconMode::Stacked);
+        assert_eq!(settings.stacked_tray_top_provider, None);
+        assert_eq!(
+            settings.stacked_tray_bottom_provider.as_deref(),
+            Some("claude")
+        );
     }
 
     #[test]

apps/desktop-tauri/src-tauri/src/commands/system.rs

@@ -205,36 +205,9 @@ pub fn quit_app(app: tauri::AppHandle) {
 }
 
 fn dashboard_url_for_provider(provider_id: &str) -> Option<String> {
-    if provider_id == ProviderId::MiniMax.cli_name() {
-        let settings = Settings::load();
-        return Some(
-            codexbar::providers::MiniMaxProvider::dashboard_url_for_region(Some(
-                settings.api_region(ProviderId::MiniMax),
-            )),
-        );
-    }
-
-    // OpenRouter's Usage Dashboard is the Activity page. Resolve it from the
-    // provider metadata before the legacy API-key catalog entry, which still
-    // points at the credits settings page.
-    if provider_id == ProviderId::OpenRouter.cli_name() {
-        return instantiate_provider(ProviderId::OpenRouter)
-            .metadata()
-            .dashboard_url
-            .map(|s| s.to_string());
-    }
-
-    if let Some(url) = codexbar::settings::get_api_key_providers()
-        .into_iter()
-        .find(|p| p.id.cli_name() == provider_id)
-        .and_then(|p| p.dashboard_url.map(|s| s.to_string()))
-    {
-        return Some(url);
-    }
-
     let id = ProviderId::from_cli_name(provider_id)?;
-    let provider = instantiate_provider(id);
-    provider.metadata().dashboard_url.map(|s| s.to_string())
+    let settings = Settings::load();
+    provider_dashboard_url(id, &settings)
 }
 
 fn status_page_url_for_provider(provider_id: &str) -> Option<String> {