[WRONG BRANCH] release: promote dev de315e76ad to main as 2.87.0

app/Sources/MenuBarCore/ProxyModels.swift

@@ -163,6 +163,7 @@ public struct UsageAccountRow: Decodable, Equatable, Sendable {
 }
 
 public struct QuotaWindow: Decodable, Equatable, Sendable {
+    public let modelId: String?
     public let label: String?
     public let percent: Double?
     public let resetAt: Double?
@@ -188,6 +189,7 @@ public struct QuotaReport: Decodable, Equatable, Sendable {
 
 /// A provider-agnostic view of quota, since the window key differs per provider.
 public struct NormalizedQuota: Equatable, Sendable {
+    public let modelId: String?
     public let provider: String
     public let providerLabel: String
     public let percent: Double?
@@ -219,10 +221,10 @@ public extension QuotaReport {
         let name = label ?? provider
         var windows: [NormalizedQuota] = []
 
-        func append(_ percent: Double?, _ windowLabel: String, _ resetAt: Double?) {
+        func append(_ percent: Double?, _ windowLabel: String, _ resetAt: Double?, _ modelId: String? = nil) {
             guard percent != nil || resetAt != nil else { return }
             windows.append(NormalizedQuota(
-                provider: provider, providerLabel: name, percent: percent,
+                modelId: modelId, provider: provider, providerLabel: name, percent: percent,
                 windowLabel: windowLabel, resetAt: Self.date(from: resetAt)
             ))
         }
@@ -232,15 +234,16 @@ public extension QuotaReport {
         append(quota?.monthlyPercent, "month", quota?.monthlyResetAt)
 
         for window in quota?.customWindows ?? [] {
-            append(window.percent, window.label ?? "window", window.resetAt)
+            append(window.percent, window.label ?? "window", window.resetAt, window.modelId)
         }
 
         return windows
     }
 
     /// The single window that best represents current pressure, for the compact row.
     ///
-    /// Selection is **highest reported usage**, not longest horizon. Every window can
+    /// Diagnostic model rows are retained in details and excluded here. Selection is
+    /// **highest reported usage**, not longest horizon. Every aggregate window can
     /// stop work: a provider at 99% of a five-hour limit and 10% of its monthly limit is
     /// blocked right now, and showing the monthly 10% would paint that row green while
     /// the user cannot make a request. Ties break toward the longer horizon, since that
@@ -250,7 +253,7 @@ public extension QuotaReport {
     /// em dash rather than a misleading zero.
     func normalized() -> NormalizedQuota {
         let name = label ?? provider
-        let windows = normalizedWindows()
+        let windows = normalizedWindows().filter { $0.modelId == nil }
 
         // Longer horizons rank higher only as a tie-breaker.
         func horizonRank(_ label: String) -> Int {
@@ -271,7 +274,7 @@ public extension QuotaReport {
         } ?? windows.first
 
         return preferred ?? NormalizedQuota(
-            provider: provider, providerLabel: name, percent: nil,
+            modelId: nil, provider: provider, providerLabel: name, percent: nil,
             windowLabel: "—", resetAt: nil
         )
     }

app/Sources/MenuBarCoreTests/ModelDecodingSuite.swift

@@ -230,6 +230,23 @@ enum ModelDecodingSuite {
             t.equal(report.normalized().percent, 12)
         }
 
+        t.test("quotas: model diagnostics stay detailed and cannot become compact pressure") {
+            let json = """
+            {"provider":"google-antigravity","quota":{"customWindows":[
+             {"label":"aux","modelId":"aux","percent":100},
+             {"label":"Gem","percent":20}]}}
+            """
+            let report = try decode(QuotaReport.self, json)
+            t.equal(report.normalized().percent, 20)
+            t.equal(report.normalized().windowLabel, "Gem")
+            t.equal(report.normalizedWindows().count, 2)
+            t.equal(report.quota?.customWindows?.first?.modelId, "aux")
+            t.equal(report.normalizedWindows().first?.modelId, "aux")
+            let onlyModel = try decode(QuotaReport.self,
+                #"{"provider":"p","quota":{"customWindows":[{"label":"aux","modelId":"aux","percent":100}]}}"#)
+            t.isNil(onlyModel.normalized().percent, "model-only compact percent")
+        }
+
         t.test("quotas: an absent quota normalizes to a nil percent") {
             let normalized = try decode(QuotaReport.self, #"{"provider":"p","label":"P"}"#).normalized()
             t.isNil(normalized.percent, "percent")

desktop/src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "opencodex-desktop"
-version = "2.86.0"
+version = "2.87.0"
 description = "OpenCodex desktop shell"
 authors = ["OpenCodex contributors"]
 license = "MIT"

desktop/src-tauri/src/claim.rs

@@ -163,7 +163,12 @@ pub async fn run(app: &AppHandle, argv: Vec<String>, deadline: Instant) -> Claim
             return ClaimResult::Failed(format!("the bundled CLI could not be started ({error})"))
         }
     };
-    match timeout_at(deadline, command.output()).await {
+    match timeout_at(
+        deadline,
+        crate::process_spawn::with_spawn_async(command.output()),
+    )
+    .await
+    {
         Ok(Ok(output)) => read(output.status.code(), &output.stdout, &output.stderr),
         Ok(Err(error)) => {
             ClaimResult::Failed(format!("the bundled CLI could not be run ({error})"))

desktop/src-tauri/src/cli_command.rs

@@ -454,18 +454,20 @@ mod tests {
     }
     fn selected_observation_case(case: &str) {
         let t = Temp::new();
-        let result = std::process::Command::new(std::env::current_exe().unwrap())
-            .args([
-                "--exact",
-                "cli_command::tests::selected_observation_child",
-                "--nocapture",
-            ])
-            .env("OCX_CLI_OBSERVATION_TEST", case)
-            .env("HOME", &t.0)
-            .env("ZDOTDIR", &t.0)
-            .env("XDG_CONFIG_HOME", t.0.join(".config"))
-            .output()
-            .unwrap();
+        let result = crate::process_spawn::with_spawn(|| {
+            std::process::Command::new(std::env::current_exe().unwrap())
+                .args([
+                    "--exact",
+                    "cli_command::tests::selected_observation_child",
+                    "--nocapture",
+                ])
+                .env("OCX_CLI_OBSERVATION_TEST", case)
+                .env("HOME", &t.0)
+                .env("ZDOTDIR", &t.0)
+                .env("XDG_CONFIG_HOME", t.0.join(".config"))
+                .output()
+        })
+        .unwrap();
         assert!(result.status.success(), "selected-observation-failed");
         assert!(
             String::from_utf8_lossy(&result.stdout).contains("1 passed"),
@@ -578,16 +580,18 @@ mod tests {
         }
     }
     fn disabled_selector_case(action: &str) {
-        let result = std::process::Command::new(std::env::current_exe().unwrap())
-            .args([
-                "--exact",
-                "cli_command::tests::disabled_selector_child",
-                "--nocapture",
-            ])
-            .env("OCX_CLI_SELECTOR_TEST", action)
-            .env("ZDOTDIR", "/invalid:zdotdir")
-            .output()
-            .unwrap();
+        let result = crate::process_spawn::with_spawn(|| {
+            std::process::Command::new(std::env::current_exe().unwrap())
+                .args([
+                    "--exact",
+                    "cli_command::tests::disabled_selector_child",
+                    "--nocapture",
+                ])
+                .env("OCX_CLI_SELECTOR_TEST", action)
+                .env("ZDOTDIR", "/invalid:zdotdir")
+                .output()
+        })
+        .unwrap();
         assert!(result.status.success(), "disabled-selector-failed");
         assert!(
             String::from_utf8_lossy(&result.stdout).contains("1 passed"),

desktop/src-tauri/src/cli_command_posix.rs

@@ -673,6 +673,7 @@ pub fn remove_plan(store: &Store, current: &Record) -> Result<(Record, Vec<Chang
 #[cfg(all(test, unix))]
 mod tests {
     use super::*;
+    use crate::process_spawn::with_spawn;
     use record::tests::{bundle, Temp};
     #[cfg(target_os = "macos")]
     fn stable_bundle_fixture() -> Temp {
@@ -701,13 +702,13 @@ mod tests {
             command.arg("-N");
         }
         assert!(
-            command
+            with_spawn(|| command
                 .arg(path)
                 .stdout(std::process::Stdio::null())
                 .stderr(std::process::Stdio::null())
-                .status()
-                .unwrap()
-                .success(),
+                .status())
+            .unwrap()
+            .success(),
             "acl-command-failed"
         );
     }
@@ -969,7 +970,7 @@ mod tests {
             if let Some(path) = path {
                 command.env("PATH", path);
             }
-            let output = command.output().unwrap();
+            let output = with_spawn(|| command.output()).unwrap();
             assert!(output.status.success());
             assert_eq!(String::from_utf8(output.stdout).unwrap(), expected);
         }
@@ -988,14 +989,16 @@ mod tests {
             0o700,
         )
         .unwrap();
-        let out = std::process::Command::new(&shim)
-            .env_clear()
-            .env("ANTHROPIC_AUTH_TOKEN", "dummy")
-            .env("ANTHROPIC_API_KEY", "")
-            .env("OCX_NODE_LAUNCH_CONTEXT", "untrusted")
-            .arg("status")
-            .output()
-            .unwrap();
+        let out = with_spawn(|| {
+            std::process::Command::new(&shim)
+                .env_clear()
+                .env("ANTHROPIC_AUTH_TOKEN", "dummy")
+                .env("ANTHROPIC_API_KEY", "")
+                .env("OCX_NODE_LAUNCH_CONTEXT", "untrusted")
+                .arg("status")
+                .output()
+        })
+        .unwrap();
         assert!(out.status.success());
         let text = String::from_utf8(out.stdout).unwrap();
         let lines: Vec<_> = text.lines().collect();
@@ -1011,9 +1014,7 @@ mod tests {
         assert!(!text.contains("dummy"));
         fs::remove_file(cli).unwrap();
         assert_eq!(
-            std::process::Command::new(&shim)
-                .env_clear()
-                .output()
+            with_spawn(|| std::process::Command::new(&shim).env_clear().output())
                 .unwrap()
                 .status
                 .code(),
@@ -1035,13 +1036,18 @@ mod tests {
                 .replace("-N32", "-N1"),
         ] {
             record::atomic(&t.0.join("cli"), None, inspect, 0o700).unwrap();
-            fs::write(&shim, rendered).unwrap();
-            let out = std::process::Command::new(&shim)
-                .env_clear()
-                .env("OCX_NODE_LAUNCH_CONTEXT", "inherited")
-                .arg("status")
-                .output()
-                .unwrap();
+            {
+                let _writer = crate::process_spawn::executable_write();
+                fs::write(&shim, rendered).unwrap();
+            }
+            let out = with_spawn(|| {
+                std::process::Command::new(&shim)
+                    .env_clear()
+                    .env("OCX_NODE_LAUNCH_CONTEXT", "inherited")
+                    .arg("status")
+                    .output()
+            })
+            .unwrap();
             assert!(out.status.success());
             assert_eq!(out.stdout, b"\nstatus\n");
             fs::remove_file(t.0.join("cli")).unwrap();
@@ -1197,15 +1203,17 @@ mod tests {
                 // System rc files may print to stdout (Ubuntu's /etc/bash.bashrc sudo hint), so only
                 // the marked result lines count; a failed lookup or CLI run still fails the shell, and
                 // the end marker makes any extra CLI output line fail the comparison.
-                let output = command
-                    .args([
-                        "-i",
-                        "-c",
-                        "p=$(command -v ocx) || exit 11; o=$(ocx hello) || exit 12; \
+                let output = with_spawn(|| {
+                    command
+                        .args([
+                            "-i",
+                            "-c",
+                            "p=$(command -v ocx) || exit 11; o=$(ocx hello) || exit 12; \
                          printf 'OCX-PATH:%s\\nOCX-OUT:%s:OCX-END\\n' \"$p\" \"$o\"",
-                    ])
-                    .output()
-                    .expect("cannot start real shell");
+                        ])
+                        .output()
+                })
+                .expect("cannot start real shell");
                 assert!(output.status.success(), "{shell}: command failed");
                 let stdout = String::from_utf8(output.stdout).expect("shell stdout is not UTF-8");
                 let marked = |tag: &str| {