Integrate the 0.60.4–0.70.0 port as v0.70.0 (release/v0.70.0)

CHANGELOG.md

@@ -13,9 +13,16 @@ menu-bar layout.
 - Grok: Settings and tray **Add account** flow matching Codex/Claude — isolated `grok login --oauth`, save current CLI login, switch, and remove without logging out the active session.
 - Replicate: cookie-authenticated monthly spend and optional prepaid credit balance from the billing page, with user and organization account isolation.
 - DeepSeek: show reported per-model spend in the provider details while preserving the billing currency, reporting period, zero values, and incomplete-total safeguards.
+- CLI: show provider-supplied history in usage text with its source period, known zero, and cost provenance (reported, estimated, or includes estimates), plus input-plus-output token totals for OpenRouter Activity.
 
 ### Fixed
+- Antigravity: a set but unusable `ANTIGRAVITY_CLI_PATH` (empty, missing, or not a file) now turns off automatic `agy` discovery instead of falling back to another CLI that could start an interactive login during a background refresh; a running desktop app still answers first, offline history is still shown, and unsetting the variable restores discovery.
+- Kimi: when the Kimi Code CLI credential is stale or rejected and web auth has no token to try, direct the user to run `kimi` or add a Kimi Code API key in Settings, keeping the web fallback and leaving CLI-owned credentials read-only. A rejected web token still reports the web error, and a Kimi Code API 403 reports a permission or quota denial instead of a sign-in problem.
+- Kimi Code: while the monthly membership pool is exhausted, show the shorter Code windows as “Blocked by monthly limit” without their own usage bar, reset, or pace forecast, keeping the raw usage in the CLI, tray icon, and float bar; the block lifts at the pool's reset even before the next refresh.
+- Kimi Code: accept ratio-pool Code API responses that report only some windows, keep an unreported weekly quota absent instead of showing 0%, and show the monthly Total usage reported by the Code API without browser authentication.
 - Claude: when Hide Personal Info is enabled, keep saved account rows distinguishable with stable localized `Account N` labels and matching redacted tooltips.
+- Codex: a fork of a fork whose parent has no token snapshot before the child forked now inherits the whole chain's cumulative counter origin instead of staying unresolved; ancestor chains deeper than 64 stay unresolved, and the Codex cost cache is rebuilt once (cache schema 5).
+- Codex: a fork larger than the per-refresh scan budget continues where the last refresh stopped instead of restarting from the top and never finishing, and a finished fork that grows is no longer billed for usage it inherited from its parent.
 
 ---
 

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,9 +109,8 @@ 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 |
+| Venice | API Key / Web session | USD / DIEM Balance, Bundled credits (web session expires in about 60 s) |
 | OpenAI | Admin API / API Key | Usage, Requests, Project-scoped cost, Credit Balance |
 | Grok | Cookies / auth.json | Billing |
 | Helmcode (also NaN Builders) | Browser cookies / manual Cookie header | Per-model token quotas, reset windows, Helmcode prepaid 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/auto_resume.rs

@@ -6,24 +6,19 @@
 
 use codexbar::agent_sessions::{
     AgentSession, AgentSessionProvider, AgentSessionSource, AgentSessionState,
-    LocalAgentSessionScanner, SessionFocusResult,
+    LocalAgentSessionScanner,
 };
 use codexbar::core::{ProviderId, TokenAccountStore};
 use codexbar::settings::Settings;
 use std::collections::HashMap;
 use std::path::{Path, PathBuf};
-use std::process::Command;
 use std::sync::Mutex;
 
 use crate::commands::{ProviderUsageSnapshot, RateWindowSnapshot};
 use crate::state::AppState;
 use tauri::Manager;
 
 const MAX_SESSION_ID_LEN: usize = 256;
-#[cfg(windows)]
-const CREATE_NEW_CONSOLE: u32 = 0x0000_0010;
-#[cfg(windows)]
-const CREATE_NEW_PROCESS_GROUP: u32 = 0x0000_0200;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 enum QuotaSlot {
@@ -633,19 +628,22 @@ async fn resume_captured_session(
     }
     if let Some(session) = matching_session(&target, &result.sessions) {
         // A live process already owns this exact session. Reopening it would
-        // create a duplicate terminal, so focus the existing window instead.
+        // create a duplicate terminal, so point the user at the existing
+        // window instead. This runs after a background refresh, not a user
+        // action: flash the window's taskbar button rather than restoring and
+        // activating it over the app the user is working in.
         if session.pid.is_some() {
             if !resume_attempt_is_still_valid(app, &target, operation, account_identity) {
                 clear_provider_if_resume_owner(app, target.provider, operation);
                 return;
             }
-            let focus_result = codexbar::agent_sessions::focus_session(session);
-            let succeeded = matches!(focus_result, SessionFocusResult::Focused);
+            let attention = codexbar::agent_sessions::request_session_attention(session);
+            let succeeded = attention.is_ok();
             tracing::info!(
                 provider = target.provider.cli_name(),
-                focus_result = ?focus_result,
+                attention = ?attention,
                 succeeded,
-                "captured CLI session is already running; attempting to focus it"
+                "captured CLI session is already running; flashing its window"
             );
             finish_resume_attempt(app, &target, operation, succeeded);
             return;
@@ -804,14 +802,15 @@ fn launch_resume(target: &ResumeTarget) -> Result<(), String> {
     .ok_or_else(|| format!("{} CLI was not found", target.provider.display_name()))?;
 
     let command = build_resume_command(target, executable)?;
-    let mut process = Command::new(&command.program);
-    process.args(&command.args).current_dir(&command.cwd);
-    #[cfg(windows)]
-    {
-        use std::os::windows::process::CommandExt;
-        process.creation_flags(CREATE_NEW_CONSOLE | CREATE_NEW_PROCESS_GROUP);
-    }
-    process.spawn().map(|_| ()).map_err(|error| {
+    // This runs after a background refresh, not a user action: the console
+    // starts minimized and inactive, so it waits on the taskbar instead of
+    // taking focus from the app the user is working in.
+    codexbar::host::console_launch::spawn_minimized_console(
+        &command.program,
+        &command.args,
+        &command.cwd,
+    )
+    .map_err(|error| {
         format!(
             "failed to launch {} CLI: {error}",
             target.provider.display_name()
@@ -835,40 +834,16 @@ fn build_resume_command(
         _ => return Err("provider does not support auto-resume".to_string()),
     };
 
-    #[cfg(windows)]
-    if executable
-        .extension()
-        .and_then(|extension| extension.to_str())
-        .is_some_and(|extension| matches!(extension.to_ascii_lowercase().as_str(), "cmd" | "bat"))
-    {
-        let command_line = std::iter::once(quote_cmd_arg(&executable.to_string_lossy()))
-            .chain(cli_args.iter().map(|arg| quote_cmd_arg(arg)))
-            .collect::<Vec<_>>()
-            .join(" ");
-        return Ok(ResumeCommand {
-            program: PathBuf::from("cmd.exe"),
-            args: vec![
-                "/d".to_string(),
-                "/s".to_string(),
-                "/c".to_string(),
-                command_line,
-            ],
-            cwd: target.cwd.clone(),
-        });
-    }
-
+    // Batch shims such as npm's `claude.cmd` stay the program here;
+    // `spawn_minimized_console` runs them through cmd.exe with quoting cmd.exe
+    // parses.
     Ok(ResumeCommand {
         program: executable,
         args: cli_args,
         cwd: target.cwd.clone(),
     })
 }
 
-#[cfg(windows)]
-fn quote_cmd_arg(value: &str) -> String {
-    format!("\"{}\"", value.replace('"', "\\\""))
-}
-
 #[cfg(test)]
 #[path = "auto_resume_tests.rs"]
 mod auto_resume_tests;

apps/desktop-tauri/src-tauri/src/auto_resume_tests.rs

@@ -42,6 +42,7 @@ mod tests {
             reserve_description: None,
             reserve_will_last_to_reset: false,
             reserve_eta_seconds: None,
+            monthly_limit_block: None,
         }
     }
 
@@ -86,22 +87,24 @@ mod tests {
         );
     }
 
-    #[cfg(windows)]
     #[test]
-    fn cmd_wrapper_preserves_exact_resume_arguments() {
+    fn batch_shims_keep_exact_resume_arguments() {
+        // cmd.exe wrapping for `.cmd` shims happens at launch, in
+        // `codexbar::host::console_launch`, which tests its own quoting.
         let command = build_resume_command(
             &target(ProviderId::Claude),
             PathBuf::from(r"C:\Program Files\Claude\claude.cmd"),
         )
         .unwrap();
 
-        assert_eq!(command.program, PathBuf::from("cmd.exe"));
-        assert_eq!(&command.args[..3], ["/d", "/s", "/c"]);
         assert_eq!(
-            command.args[3],
-            r#""C:\Program Files\Claude\claude.cmd" "--resume" "12345678-1234-1234-1234-123456789abc""#
+            command.program,
+            PathBuf::from(r"C:\Program Files\Claude\claude.cmd")
+        );
+        assert_eq!(
+            command.args,
+            ["--resume", "12345678-1234-1234-1234-123456789abc"]
         );
-        assert!(!command.args[3].contains("prompt"));
     }
 
     #[test]