Merge remote-tracking branch 'origin/main' into codex/sakana-payg

# Conflicts:
#	CHANGELOG.md

Author: steipete

.github/workflows/ci.yml

@@ -87,7 +87,7 @@ jobs:
     needs: changes
     if: ${{ needs.changes.outputs.macos-tests == 'true' }}
     runs-on: macos-15-intel
-    timeout-minutes: 45
+    timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:
@@ -119,7 +119,8 @@ jobs:
         run: ./Scripts/lint.sh lint-macos
 
       - name: Swift Test
-        timeout-minutes: 40
+        # Intel cold builds can spend ~26 minutes compiling the full test target before isolated suites start.
+        timeout-minutes: 50
         run: |
           CODEXBAR_TEST_GROUP_SIZE=1 \
             CODEXBAR_TEST_SUITE_TIMEOUT=120 \

CHANGELOG.md

@@ -4,13 +4,16 @@
 
 ### Added
 - Sakana AI: show best-effort pay-as-you-go credit balance and recent usage without delaying subscription quota refreshes. Thanks @ss251!
+- Kimi: show monthly subscription usage alongside weekly and five-hour limits with a short total budget for the optional membership request. Thanks @zhiyue!
 - Localization: add complete Russian coverage for the app and redesigned website. Thanks @Kirchberg!
 - Localization: add Galician app translations and language selection. Thanks @B1NAR10!
+- ClawRouter: add API-key tracking for monthly budget, spend, requests, tokens, and routed-provider usage.
 - Claude: show model-scoped weekly quota windows, including promotional Fable limits, from OAuth and web usage responses. Thanks @konon4!
 - Usage refresh: add an opt-in Adaptive cadence that polls every 2–30 minutes based on recent menu use, Low Power Mode, and thermal state. Thanks @hhh2210!
 - Codex: show a conservative 1.5× pace-headroom hint in menus and CLI output when usage is safely ahead of the reset curve. Thanks @astuteprogrammer!
 
 ### Changed
+- Repository: reject oversized tracked blobs and generated release/build artifacts during checks. Thanks @joeVenner!
 - Branding: replace the app and website icon with a usage-meter prompt mark that matches CodexBar's core UI.
 - Website: redesign codexbar.app around faster download, provider discovery, feature, CLI, and widget paths with responsive dark/light and localized layouts. Thanks @vyctorbrzezowski!
 - Architecture: accept a bounded opt-in adaptive refresh design with a deterministic 2–30-minute cadence and no behavioral telemetry. Thanks @hhh2210!
@@ -23,6 +26,7 @@
 ### Fixed
 - Gemini: resolve fnm from the active PATH, stop package-discovery helpers on deadline, and return after the first output line even when descendants keep stdout open.
 - Branding: replace the malformed Poe icon and use Poe's official purple consistently across the app, widget, and website. Thanks @garethpaul!
+- Claude: make the "Avoid Keychain prompts" setting use the no-prompt policy instead of the experimental `security` CLI reader. Thanks @gmkbenjamin!
 - Monthly quota pace: show reserve, deficit, and run-out estimates for OpenCode Go, Doubao, and Alibaba monthly reset windows using their calendar-cycle length. Thanks @Zihao-Qi and @joeVenner!
 - Localization: translate the Default Terminal setting across every supported app language. Thanks @Zihao-Qi!
 - Settings: recover collapsed sidebars and undersized saved window frames when reopening Settings. Thanks @ProspectOre!

README.md

@@ -9,7 +9,7 @@
 [![License: MIT](https://img.shields.io/badge/license-MIT-6e5aff?style=flat-square)](LICENSE)
 [![Site](https://img.shields.io/badge/site-codexbar.app-16d3b4?style=flat-square)](https://codexbar.app)
 
-<a href="https://codexbar.app"><img src="docs/social.png" alt="CodexBar — every AI coding limit in your menu bar. 56 providers." width="100%" /></a>
+<a href="https://codexbar.app"><img src="docs/social.png" alt="CodexBar — every AI coding limit in your menu bar. 57 providers." width="100%" /></a>
 
 Tiny macOS 14+ menu bar app that keeps **AI coding-provider limits visible** and shows when each window resets. Codex, OpenAI, Claude, Cursor, Gemini, Copilot, Grok, GroqCloud, ElevenLabs, Deepgram, z.ai, MiniMax, Kiro, Zed, Vertex AI, Augment, OpenRouter, LiteLLM, LLM Proxy, Codebuff, Command Code, AWS Bedrock, and many newer coding providers. One status item per provider, or Merge Icons mode with a provider switcher. No Dock icon, minimal UI, dynamic bar icons.
 
@@ -124,6 +124,7 @@ See [CLI configuration](docs/cli-configuration.md) for the full flow.
 - [Grok](docs/grok.md) — Grok CLI billing RPC plus grok.com browser-session fallback.
 - [GroqCloud](docs/groqcloud.md) — API key for Enterprise Prometheus request/token/cache-hit metrics.
 - [LLM Proxy](docs/llm-proxy.md) — API key + base URL for aggregate proxy quota stats and provider breakdowns.
+- [ClawRouter](docs/clawrouter.md) — API key for monthly budget, spend, requests, tokens, and routed-provider usage.
 - [LiteLLM](docs/litellm.md) — Virtual key + proxy URL for personal and team budget/spend tracking.
 - [Deepgram](docs/deepgram.md) — API key usage summaries across speech, agent, token, and TTS metrics.
 - [Poe](docs/poe.md) — API key for current point balance and recent points history.

Scripts/check_repository_size.sh

@@ -5,10 +5,16 @@ ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 MAX_BYTES=$((2 * 1024 * 1024))
 failures=0
 tracked_files=0
+declare -a blob_paths=()
+declare -a blob_ids=()
 
 cd "$ROOT_DIR"
 
-while IFS= read -r -d '' path; do
+while IFS= read -r -d '' entry; do
+  metadata=${entry%%$'\t'*}
+  path=${entry#*$'\t'}
+  read -r mode object stage <<<"$metadata"
+  [[ "$stage" == "0" ]] || continue
   tracked_files=$((tracked_files + 1))
 
   case "$path" in
@@ -19,14 +25,29 @@ while IFS= read -r -d '' path; do
       ;;
   esac
 
-  [[ -f "$path" && ! -L "$path" ]] || continue
-
-  size=$(wc -c < "$path")
-  if ((size > MAX_BYTES)); then
-    printf 'ERROR: tracked file exceeds %d bytes: %s (%d bytes)\n' "$MAX_BYTES" "$path" "$size" >&2
-    failures=$((failures + 1))
-  fi
-done < <(git ls-files -z)
+  # Submodule entries name commits rather than file blobs.
+  [[ "$mode" == "160000" ]] && continue
+  blob_paths+=("$path")
+  blob_ids+=("$object")
+done < <(git ls-files --stage -z)
+
+if ((${#blob_ids[@]} > 0)); then
+  index=0
+  while read -r object type size; do
+    path=${blob_paths[$index]}
+    if [[ "$type" != "blob" ]]; then
+      printf 'ERROR: tracked index entry is not a readable blob: %q (%s)\n' "$path" "$object" >&2
+      failures=$((failures + 1))
+      index=$((index + 1))
+      continue
+    fi
+    if ((size > MAX_BYTES)); then
+      printf 'ERROR: tracked file exceeds %d bytes: %q (%d bytes)\n' "$MAX_BYTES" "$path" "$size" >&2
+      failures=$((failures + 1))
+    fi
+    index=$((index + 1))
+  done < <(printf '%s\n' "${blob_ids[@]}" | git cat-file --batch-check='%(objectname) %(objecttype) %(objectsize)')
+fi
 
 if ((failures > 0)); then
   printf 'Repository size check failed with %d violation(s).\n' "$failures" >&2

Scripts/test_repository_size.sh

@@ -8,6 +8,9 @@ trap 'rm -rf "$TEMP_DIR"' EXIT
 mkdir -p "$TEMP_DIR/Scripts"
 cp "$ROOT_DIR/Scripts/check_repository_size.sh" "$TEMP_DIR/Scripts/"
 git -C "$TEMP_DIR" init --quiet
+empty_output=$("$TEMP_DIR/Scripts/check_repository_size.sh")
+grep -Fq 'repository size OK: 0 tracked files' <<<"$empty_output"
+
 printf 'small source file\n' > "$TEMP_DIR/source.txt"
 git -C "$TEMP_DIR" add source.txt Scripts/check_repository_size.sh
 
@@ -20,13 +23,33 @@ dd if=/dev/zero of="$TEMP_DIR/boundary.bin" bs=1024 count=2048 2>/dev/null
 git -C "$TEMP_DIR" add boundary.bin
 "$TEMP_DIR/Scripts/check_repository_size.sh" >/dev/null
 printf 'x' >> "$TEMP_DIR/boundary.bin"
+git -C "$TEMP_DIR" add boundary.bin
 if "$TEMP_DIR/Scripts/check_repository_size.sh" >"$TEMP_DIR/large.log" 2>&1; then
-  printf 'ERROR: oversized tracked file was accepted.\n' >&2
+  printf 'ERROR: staged blob one byte above the limit was accepted.\n' >&2
   exit 1
 fi
 grep -Fq 'tracked file exceeds 2097152 bytes: boundary.bin (2097153 bytes)' "$TEMP_DIR/large.log"
 
 git -C "$TEMP_DIR" rm --cached --force --quiet boundary.bin
+git -C "$TEMP_DIR" add untracked.bin
+printf 'working tree is now small\n' > "$TEMP_DIR/untracked.bin"
+if "$TEMP_DIR/Scripts/check_repository_size.sh" >"$TEMP_DIR/staged-large.log" 2>&1; then
+  printf 'ERROR: oversized staged blob was accepted after its working-tree file changed.\n' >&2
+  exit 1
+fi
+grep -Fq 'tracked file exceeds 2097152 bytes: untracked.bin (2098176 bytes)' "$TEMP_DIR/staged-large.log"
+
+git -C "$TEMP_DIR" rm --cached --force --quiet untracked.bin
+printf 'small staged blob\n' > "$TEMP_DIR/index-is-authoritative.bin"
+git -C "$TEMP_DIR" add index-is-authoritative.bin
+dd if=/dev/zero of="$TEMP_DIR/index-is-authoritative.bin" bs=1024 count=2049 2>/dev/null
+"$TEMP_DIR/Scripts/check_repository_size.sh" >/dev/null
+
+odd_path=$'odd\nname.txt'
+printf 'small source file\n' > "$TEMP_DIR/$odd_path"
+git -C "$TEMP_DIR" add "$odd_path"
+"$TEMP_DIR/Scripts/check_repository_size.sh" >/dev/null
+
 artifacts=(
   "CodexBar 2.app/Contents/MacOS/CodexBar"
   "CodexBar.dSYM/Contents/Info.plist"
@@ -47,7 +70,7 @@ for artifact in "${artifacts[@]}"; do
 done
 ln -s source.txt "$TEMP_DIR/CodexBar-latest.dmg"
 git -C "$TEMP_DIR" add -f CodexBar-latest.dmg
-
+rm "$TEMP_DIR/CodexBar.zip"
 if "$TEMP_DIR/Scripts/check_repository_size.sh" >"$TEMP_DIR/artifact.log" 2>&1; then
   printf 'ERROR: tracked release artifacts were accepted.\n' >&2
   exit 1

Sources/CodexBar/InlineUsageDashboardContent.swift

@@ -46,6 +46,25 @@ extension UsageMenuCardView.Model {
             return usage.displayLines
         }
 
+        if input.provider == .clawrouter,
+           let usage = input.snapshot?.clawRouterUsage
+        {
+            var notes = [
+                "\(UsageFormatter.tokenCountString(usage.requestCount)) \(L("requests")) · " +
+                    "\(UsageFormatter.tokenCountString(usage.totalTokens)) \(L("tokens"))",
+            ]
+            if usage.errorCount > 0 {
+                notes.append("\(usage.successCount) succeeded · \(usage.errorCount) failed")
+            }
+            if !usage.providers.isEmpty {
+                let mix = usage.providers.prefix(5)
+                    .map { "\($0.provider): \(UsageFormatter.tokenCountString($0.requestCount))" }
+                    .joined(separator: " · ")
+                notes.append("Routed providers: \(mix)")
+            }
+            return notes
+        }
+
         if input.provider == .minimax,
            input.showOptionalCreditsAndExtraUsage,
            let billing = input.snapshot?.minimaxUsage?.billingSummary

Sources/CodexBar/MenuCardView+Costs.swift

@@ -305,13 +305,26 @@ extension UsageMenuCardView.Model {
             return nil
         }
 
+        if provider == .clawrouter, cost.limit <= 0 {
+            let spend = UsageFormatter.currencyString(cost.used, currencyCode: cost.currencyCode)
+            return ProviderCostSection(
+                title: "ClawRouter spend",
+                percentUsed: nil,
+                spendLine: "\(L("This month")): \(spend)",
+                percentLine: nil)
+        }
+
         guard cost.limit > 0 else { return nil }
 
         let used: String
         let limit: String
         let title: String
 
-        if cost.currencyCode == "Quota" {
+        if provider == .clawrouter {
+            title = "Monthly budget"
+            used = UsageFormatter.currencyString(cost.used, currencyCode: cost.currencyCode)
+            limit = UsageFormatter.currencyString(cost.limit, currencyCode: cost.currencyCode)
+        } else if cost.currencyCode == "Quota" {
             title = L("Quota usage")
             used = String(format: "%.0f", cost.used)
             limit = String(format: "%.0f", cost.limit)

Sources/CodexBar/MenuDescriptor.swift

@@ -286,6 +286,18 @@ struct MenuDescriptor {
         if let openRouterUsage = snapshot.openRouterUsage {
             Self.appendOpenRouterUsageSummary(entries: &entries, usage: openRouterUsage)
         }
+        if let clawRouterUsage = snapshot.clawRouterUsage {
+            entries.append(.text(
+                "\(UsageFormatter.tokenCountString(clawRouterUsage.requestCount)) \(L("requests")) · " +
+                    "\(UsageFormatter.tokenCountString(clawRouterUsage.totalTokens)) \(L("tokens"))",
+                .secondary))
+            if !clawRouterUsage.providers.isEmpty {
+                let mix = clawRouterUsage.providers.prefix(5)
+                    .map { "\($0.provider): \(UsageFormatter.tokenCountString($0.requestCount))" }
+                    .joined(separator: " · ")
+                entries.append(.text("Routed providers: \(mix)", .secondary))
+            }
+        }
         if let poeUsage = snapshot.poeUsage, !poeUsage.daily.isEmpty {
             Self.appendPoeUsageSummary(entries: &entries, usage: poeUsage)
         }

Sources/CodexBar/Providers/Claude/ClaudeProviderImplementation.swift

@@ -67,7 +67,7 @@ struct ClaudeProviderImplementation: ProviderImplementation {
         let subtitle = if context.settings.debugDisableKeychainAccess {
             "Inactive while \"Disable Keychain access\" is enabled in Advanced."
         } else {
-            "Use /usr/bin/security to read Claude credentials and avoid CodexBar keychain prompts."
+            "Never allow Claude OAuth credential reads to show macOS Keychain prompts."
         }
 
         let promptFreeBinding = Binding(
@@ -141,8 +141,7 @@ struct ClaudeProviderImplementation: ProviderImplementation {
             if context.settings.debugDisableKeychainAccess {
                 return "Global Keychain access is disabled in Advanced, so this setting is currently inactive."
             }
-            return "Controls Claude OAuth Keychain prompts when the standard reader is active. Choosing " +
-                "\"Never prompt\" can make OAuth unavailable; use Web/CLI when needed."
+            return "Choosing \"Never prompt\" can make OAuth unavailable; use Web/CLI when needed."
         }
 
         return [
@@ -162,11 +161,11 @@ struct ClaudeProviderImplementation: ProviderImplementation {
             ProviderSettingsPickerDescriptor(
                 id: "claude-keychain-prompt-policy",
                 title: "Keychain prompt policy",
-                subtitle: "Applies only to the Security.framework OAuth keychain reader.",
+                subtitle: "Controls when Claude OAuth may ask macOS for Keychain access.",
                 dynamicSubtitle: keychainPromptPolicySubtitle,
                 binding: keychainPromptPolicyBinding,
                 options: keychainPromptPolicyOptions,
-                isVisible: { context.settings.claudeOAuthKeychainReadStrategy == .securityFramework },
+                isVisible: nil,
                 isEnabled: { !context.settings.debugDisableKeychainAccess },
                 onChange: nil),
             ProviderSettingsPickerDescriptor(

Sources/CodexBar/Providers/ClawRouter/ClawRouterProviderImplementation.swift

@@ -0,0 +1,48 @@
+import CodexBarCore
+import Foundation
+
+struct ClawRouterProviderImplementation: ProviderImplementation {
+    let id: UsageProvider = .clawrouter
+
+    @MainActor
+    func presentation(context _: ProviderPresentationContext) -> ProviderPresentation {
+        ProviderPresentation { _ in "api" }
+    }
+
+    @MainActor
+    func observeSettings(_ settings: SettingsStore) {
+        _ = settings.clawRouterAPIKey
+        _ = settings.clawRouterBaseURL
+    }
+
+    @MainActor
+    func isAvailable(context: ProviderAvailabilityContext) -> Bool {
+        ProviderTokenResolver.clawRouterToken(environment: context.environment) != nil
+    }
+
+    @MainActor
+    func settingsFields(context: ProviderSettingsContext) -> [ProviderSettingsFieldDescriptor] {
+        [
+            ProviderSettingsFieldDescriptor(
+                id: "clawrouter-api-key",
+                title: "API key",
+                subtitle: "Stored in the CodexBar config file. Reads monthly budget and routed usage from /v1/usage.",
+                kind: .secure,
+                placeholder: "ClawRouter key…",
+                binding: context.stringBinding(\.clawRouterAPIKey),
+                actions: [],
+                isVisible: nil,
+                onActivate: nil),
+            ProviderSettingsFieldDescriptor(
+                id: "clawrouter-base-url",
+                title: "Base URL",
+                subtitle: "Optional. Defaults to the hosted ClawRouter service.",
+                kind: .plain,
+                placeholder: ClawRouterSettingsReader.defaultBaseURL.absoluteString,
+                binding: context.stringBinding(\.clawRouterBaseURL),
+                actions: [],
+                isVisible: nil,
+                onActivate: nil),
+        ]
+    }
+}