fix(codexbar): update antigravity reporting

CodexBar 0.32.5 falls through to the Antigravity OAuth path on Linux, which fails unless Antigravity.app or ANTIGRAVITY_OAUTH_CLIENT_ID/SECRET is available. CodexBar 0.40.0 supports the current agy CLI source and returns real Antigravity quota windows.

The Waybar wrapper forces antigravity to source=cli so it does not reuse the old ~/.gemini/oauth_creds.json bridge. That bridge can produce stale remote OAuth behavior or placeholder 0/0 quota output instead of the local agy quota summary.

A freshly started agy server can answer before RetrieveUserQuotaSummary is ready. The placeholder shape has no extraRateWindows and both primary/secondary usedPercent at 0, so the wrapper waits and retries twice before accepting it. This keeps the workaround documented for a later upstream patch.

Author: khaneliman

packages/codexbar-cli/package.nix

@@ -15,22 +15,24 @@
 }:
 
 let
+  version = "0.40.0";
+
   sources = {
     x86_64-linux = {
-      url = "https://github.com/steipete/CodexBar/releases/download/v0.32.5/CodexBarCLI-v0.32.5-linux-x86_64.tar.gz";
-      hash = "sha256-oFO+QfaqqWeBe8swpplw7VYphcCnj9t6CA+9422Wv2I=";
+      url = "https://github.com/steipete/CodexBar/releases/download/v${version}/CodexBarCLI-v${version}-linux-x86_64.tar.gz";
+      hash = "sha256-QI6eSz3LhkQHR6ootmrPfTincIrg8u/0vOpwgw8CjCk=";
     };
     aarch64-linux = {
-      url = "https://github.com/steipete/CodexBar/releases/download/v0.32.5/CodexBarCLI-v0.32.5-linux-aarch64.tar.gz";
-      hash = "sha256-6wtwbr+pR9YZM00N2zId+UjA6qMn0c+ls9cw6vkS7Ak=";
+      url = "https://github.com/steipete/CodexBar/releases/download/v${version}/CodexBarCLI-v${version}-linux-aarch64.tar.gz";
+      hash = "sha256-gZi/3fYbgzv5I0EZWPulxXmMTFppsCiiavvdZmRTRjg=";
     };
     aarch64-darwin = {
-      url = "https://github.com/steipete/CodexBar/releases/download/v0.32.5/CodexBarCLI-v0.32.5-macos-arm64.tar.gz";
-      hash = "sha256-4zN1x1tgwXc9w0ayFtiDLsudlDG50dtGbQRjwJg89kQ=";
+      url = "https://github.com/steipete/CodexBar/releases/download/v${version}/CodexBarCLI-v${version}-macos-arm64.tar.gz";
+      hash = "sha256-GEU1Nh+890//oocNHKw5Ew7GPi/SrKc/041SE7vUwl8=";
     };
     x86_64-darwin = {
-      url = "https://github.com/steipete/CodexBar/releases/download/v0.32.5/CodexBarCLI-v0.32.5-macos-x86_64.tar.gz";
-      hash = "sha256-JEZ9GmRpPUvucXLXQDec6cIa4UFFoT0+1d7q5HRJbpw=";
+      url = "https://github.com/steipete/CodexBar/releases/download/v${version}/CodexBarCLI-v${version}-macos-x86_64.tar.gz";
+      hash = "sha256-a/mab/Dge//4Wgo51SHOdNMZ/JqTdJy2HfXuqHrhwyU=";
     };
   };
 
@@ -40,7 +42,7 @@ let
 in
 stdenv.mkDerivation {
   pname = "codexbar-cli";
-  version = "0.32.5";
+  inherit version;
 
   src = fetchzip (source // { stripRoot = false; });
 

packages/codexbar-waybar/package.nix

@@ -24,6 +24,8 @@
 }:
 
 let
+  iconSearch = "ICONS_DIR = Path(\n    os.environ.get(\"XDG_DATA_HOME\", str(Path.home() / \".local/share\"))\n) / \"codexbar-waybar\" / \"icons\"";
+  iconReplacement = "ICONS_DIR = Path(os.environ.get(\n    \"CODEXBAR_ICONS_DIR\",\n    str(Path(os.environ.get(\"XDG_DATA_HOME\", str(Path.home() / \".local/share\"))) / \"codexbar-waybar\" / \"icons\"),\n))";
   pythonEnv = python3.withPackages (
     pythonPackages: with pythonPackages; [
       pycairo
@@ -46,13 +48,31 @@ stdenvNoCC.mkDerivation {
   nativeBuildInputs = [ makeWrapper ];
 
   postPatch = ''
-        substituteInPlace codexbar-popup.py \
-          --replace-fail 'ICONS_DIR = Path(
-        os.environ.get("XDG_DATA_HOME", str(Path.home() / ".local/share"))
-    ) / "codexbar-waybar" / "icons"' 'ICONS_DIR = Path(os.environ.get(
-        "CODEXBAR_ICONS_DIR",
-        str(Path(os.environ.get("XDG_DATA_HOME", str(Path.home() / ".local/share"))) / "codexbar-waybar" / "icons"),
-    ))'
+    substituteInPlace codexbar-popup.py \
+      --replace-fail ${lib.escapeShellArg iconSearch} ${lib.escapeShellArg iconReplacement}
+
+    substituteInPlace codexbar.sh \
+          --replace-fail '    [claude]=oauth' '    [claude]=oauth
+        [antigravity]=cli' \
+          --replace-fail '    echo "$body"
+    }' '    # A freshly started agy server can answer before RetrieveUserQuotaSummary is
+        # ready. CodexBar then falls back to placeholder model quotas (0/0, no
+        # extraRateWindows), which makes Waybar look healthy while hiding weekly
+        # Antigravity usage. Give the CLI source two readiness retries.
+        if [[ "$p" == "antigravity" ]]; then
+            for _ in 1 2; do
+                if echo "$body" | jq -e "type == \"array\" and (.[0].error // null) == null and (.[0].usage.extraRateWindows // null) == null and ((.[0].usage.primary.usedPercent // 0) == 0) and ((.[0].usage.secondary.usedPercent // 0) == 0)" >/dev/null 2>&1; then
+                    sleep "''${CODEXBAR_ANTIGRAVITY_RETRY_DELAY:-5}"
+                    body="$(fetch_one "$p" "$primary")"
+                else
+                    break
+                fi
+            done
+        fi
+
+        echo "$body"
+    }'
+
   '';
 
   installPhase = ''