on 3276b6b help sign in
CLAUDE.md+18−58
since splitsnapshots
unifiedsplit
@@ -1,68 +1,28 @@
1# UsageMenubar
1# UsageMenubar
2
2
3## Architecture
3## Architecture
4−macOS menu bar app (SwiftUI, macOS 14+) showing three LLM providers with equal
4+macOS menu bar app (SwiftUI, macOS 14+) showing Hyper (Charm) credit balance, plus
5−visual treatment:
6−- **Hyper** (Charm) — credit balance
7−- **Claude Code** — Pro/Max usage limits (5-hour, 7-day, 7-day Opus)
5+Claude Code's Pro/Max usage limits when the CLI is signed in on the machine.
8−- **z.ai Coding Plan** — usage limits (5-hour, weekly)
9−
10−Each configured provider gets the same popover treatment: a 26pt subhero headline
11−number, bars under every window, a sparkline of recent history, a trend arrow,
12−click-to-copy on the headline, and threshold-crossing notifications.
13−
14- `UsageMenubarApp.swift` — @main App, NSStatusBar, timer, sleep/wake, popover
6- `UsageMenubarApp.swift` — @main App, NSStatusBar, timer, sleep/wake, popover
15−- `ViewModel.swift` — Observable state: balance, Claude usage, z.ai usage, refresh, notifications, per-provider history
7+- `ViewModel.swift` — Observable state: balance, Claude usage, refresh, notifications, history
16−- `MenuView.swift` — SwiftUI popover view (3 equal provider sections, settings)
8+- `MenuView.swift` — SwiftUI popover view (balance, sparkline, Claude limits, settings)
17- `CreditsChecker.swift` — API client for `GET https://hyper.charm.land/v1/credits`
9- `CreditsChecker.swift` — API client for `GET https://hyper.charm.land/v1/credits`
18−- `ClaudeUsageClient.swift` — read-only Claude OAuth client + models for `GET https://api.anthropic.com/api/oauth/usage`
10+- `ClaudeUsageClient.swift` — Claude OAuth client + models for `GET https://api.anthropic.com/api/oauth/usage`
19−- `ZaiUsageClient.swift` — API client for z.ai coding plan usage (`GET https://api.z.ai/api/monitor/usage/quota/limit` + `GET https://api.z.ai/api/biz/subscription/list`)
20−- `KeychainHelper.swift` — Keychain wrapper (KeychainStore + KeychainHelper + ZaiKeychainHelper)
11+- `KeychainHelper.swift` — Keychain wrapper (KeychainStore + KeychainHelper)
21- `VersionFormatter.swift` — Version string formatting
12- `VersionFormatter.swift` — Version string formatting
22
13
23−The status bar title shows `⚡{balance}` (Hyper), `⁕{percent}%` (Claude 5-hour),
14+The status bar title stays `⚡{balance}` (Hyper only); Claude usage lives in the popover.
24−`⁕{percent}%` (Claude 7-day), `Z{percent}%` (z.ai 5-hour), and `Z{percent}%`
25−(z.ai weekly) — each omitted when absent or at 0%, and entirely absent when the
26−service is not configured (no API key or no credentials). An unconfigured service
27−produces no placeholder in the menu bar. The three fetches are independent —
28−`ViewModel.refresh()` runs them with `async let`, and any can fail or be
15+The two fetches are independent — `ViewModel.refresh()` runs them with `async let`, and
29−unconfigured without touching the others.
16+either can fail or be unconfigured without touching the other.
30−
31−## Equal provider treatment
32−All three providers share the same visual structure in the popover:
33−1. Section header with icon + plan label
34−2. Headline number (26pt subheroFont) with emoji, color-coded, click-to-copy, trend arrow
35−3. Reset countdown text (Claude/z.ai windows only — Hyper has no windows)
36−4. Bars under EVERY window (5-hour, 7-day, weekly — all get bars)
37−5. Sparkline (each provider tracks its own history via `MetricPoint` arrays)
38−6. Error row if applicable
39−
40−Notifications fire on threshold crossings:
41−- Hyper: balance drops below 10 credits
42−- Claude: 5-hour % crosses above 90%
43−- z.ai: 5-hour % crosses above 90%
44−
45−If a provider isn't configured, its section simply doesn't appear — no placeholder,
46−no error. This is already the case for Claude and z.ai; Hyper now behaves the same
47−way (gated on `hyperConfigured`).
48
17
49−## Claude credentials (strictly read-only)
18+## Claude credentials (read-only, with one exception)
50`ClaudeUsageClient` reads the credentials **Claude Code owns**: its `Claude Code-credentials`
19`ClaudeUsageClient` reads the credentials **Claude Code owns**: its `Claude Code-credentials`
51Keychain item (via `/usr/bin/security`), falling back to `~/.claude/.credentials.json`.
20Keychain item (via `/usr/bin/security`), falling back to `~/.claude/.credentials.json`.
52−- **Never write them. Never refresh the token.** `ClaudeCredentialStoring` has no `save`,
21+- Never modify them, except the token refresh, which writes back a rotated token to
53− and that is load-bearing, not an oversight. The app reads the current access token and
22+ whichever source it was read from, preserving fields we don't model (patched raw JSON).
54− spends it as-is.
55−- Why: the token endpoint **rotates the refresh token**, and the CLI refreshes on its own
23+- The refresh endpoint **rotates the refresh token** — refreshing twice with the same one
56− schedule. An app that also refreshed would race it — whoever went second would present a
24+ signs the user out of their own CLI. Hence the client is an `actor` and dedups
57− refresh token the server had already retired, signing the user out of their own terminal.
25+ concurrent refreshes onto one in-flight, cancellation-immune `Task`.
58− This app *did* do that, and it was the top bug. Do not reintroduce it, however tempting a
59− "just refresh it for the user" convenience looks.
60−- A spent or revoked token (401/403) is therefore terminal, not retried: it surfaces as
61− `.invalidCredentials`, whose message tells the user to run `claude`. The CLI mints a new
62− token; the next fetch (every 1–5 min, credentials re-read each time) picks it up for free.
63−- Consequently `ClaudeOAuthCredentials` models neither `refreshToken` nor `expiresAt` —
64− nothing here has any business knowing them.
65−- Retries still apply to *transport* failures (timeouts, 5xx, 429). That's not auth.
66- Missing credentials are **not an error** — the popover just omits the section.
26- Missing credentials are **not an error** — the popover just omits the section.
67- **The app cannot be sandboxed**: spawning `security` and reading `~/.claude` require it
27- **The app cannot be sandboxed**: spawning `security` and reading `~/.claude` require it
68 to be off. Distribution is ad-hoc signed via Homebrew, not the App Store.
28 to be off. Distribution is ad-hoc signed via Homebrew, not the App Store.
@@ -75,9 +35,9 @@ Keychain item (via `/usr/bin/security`), falling back to `~/.claude/.credentials
75- Swift 5.9, macOS 14.0 deployment target
35- Swift 5.9, macOS 14.0 deployment target
76
36
77## Conventions
37## Conventions
78−- Clean minimal UI — subhero numbers, generous spacing, restrained color, no chrome
38+- Clean minimal UI — big hero number, generous spacing, restrained color, no chrome
79- No card-heavy/multi-material/gradient-rich designs
39- No card-heavy/multi-material/gradient-rich designs
80−- Rounded font family at one scale (subhero/section/control/caption/footnote)
40+- Rounded font family at one scale (hero/subhero/section/control/caption/footnote)
81- Monospaced digits for numbers that change
41- Monospaced digits for numbers that change
82- Tests use StubURLProtocol for network mocking, FakeKeychain for keychain mocking,
42- Tests use StubURLProtocol for network mocking, FakeKeychain for keychain mocking,
83 FakeClaudeCredentialStore for Claude credentials — never touch the real ones in a test
43 FakeClaudeCredentialStore for Claude credentials — never touch the real ones in a test
@@ -85,4 +45,4 @@ Keychain item (via `/usr/bin/security`), falling back to `~/.claude/.credentials
85
45
86## VCS
46## VCS
87- jj colocated with git
47- jj colocated with git
88−- Push directly to master — no PRs for this repo
48+- Push directly to master — no PRs for this repo
README.md+50−66
@@ -1,36 +1,27 @@
1<p align="center">
1<p align="center">
2− <img src="UsageMenubar/Assets.xcassets/AppIcon.appiconset/icon-1024.png" width="128" height="128" alt="Usage Menubar app icon">
2+ <img src="UsageMenubar/Assets.xcassets/AppIcon.appiconset/AppIcon-1024.png" width="128" height="128" alt="Usage Menubar app icon">
3</p>
3</p>
4
4
5# UsageMenubar
5# UsageMenubar
6
6
7−A macOS menu bar application that displays usage limits and credit balances for multiple LLM services: [Hyper (Charm)](https://hyper.charm.land), [Claude Code](https://claude.com/claude-code), and [z.ai](https://z.ai) Coding Plans. Each service is independent — configure the ones you use, ignore the ones you don't.
7+A macOS menu bar application that displays your [Hyper (Charm)](https://hyper.charm.land) credit balance — and, if you use the Claude Code CLI, your Claude subscription limits alongside it.
8
8
9## Features
9## Features
10
10
11−- ⚡ **Hyper credits** — balance from `hyper.charm.land`, with sparkline trend, click-to-copy, and low-balance notifications
11+- ⚡ **Menu bar display** — shows `⚡{balance}` (e.g. `⚡42`) right in your menu bar
12−- ⁕ **Claude Code limits** — Pro/Max 5-hour and 7-day usage windows, with countdown to next reset. No setup: if you've signed in with the Claude Code CLI, it just appears
12+- 🤖 **Claude Code limits** — your Pro/Max 5-hour and 7-day usage windows in the popover, with the percentage used and a countdown to the next reset. No setup: if you have signed in with the Claude Code CLI, it just appears. If you haven't, the section doesn't
13−- Z **z.ai Coding Plan** — 5-hour and weekly token quota percentages, with reset countdowns. Enter your API key in settings
14−- 🔄 **Auto-refresh** — configurable interval (1m / 5m / 15m / 30m), plus refresh on wake from sleep
13+- 🔄 **Auto-refresh** — fetches your balance on a configurable interval (1m / 5m / 15m / 30m), and again on wake from sleep
14+- 📊 **Balance sparkline** — a subtle mini-chart in the popover shows your balance trend over recent fetches
15+- 📋 **Click-to-copy** — click the balance number in the popover to copy it to the clipboard
15−- 🖱️ **Right-click menu** — quick access to Refresh and Quit
16+- 🖱️ **Right-click menu** — right-click the menu bar icon for quick access to Refresh, Open hyper.charm.land, and Quit
17+- 🔔 **Low-balance notifications** — alerts you when your balance drops below 10 credits, including on the very first fetch if you are already below the threshold
16−- 🔒 **Keychain storage** — API keys stored securely in macOS Keychain
18+- 🔒 **Keychain storage** — your API key is stored securely in macOS Keychain
19+- 🎨 **Color-coded balance** — green (≥100), yellow (10–99), red (<10)
20+- 🔐 **Secure input** — API key field is masked
17- 🚀 **Launch at login** — optional, using `SMAppService`
21- 🚀 **Launch at login** — optional, using `SMAppService`
22+- 🔑 **Get key link** — quick link to [hyper.charm.land](https://hyper.charm.land) right next to the API key field
18- 🫥 **Agent app** — no dock icon, no main window; lives entirely in the menu bar
23- 🫥 **Agent app** — no dock icon, no main window; lives entirely in the menu bar
19
24
20−## Menu bar
21−
22−Each service shows an emoji-prefixed segment when configured and above 0%:
23−
24−| Service | Emoji | Example |
25−|---------|-------|---------|
26−| Hyper balance | ⚡ | `⚡42` |
27−| Claude 5-hour | ⁕ | `⁕62%` |
28−| Claude 7-day | ⁕ | `⁕8%` |
29−| z.ai 5-hour | Z | `Z12%` |
30−| z.ai weekly | Z | `Z3%` |
31−
32−Unconfigured services don't appear at all — no placeholder, no icon.
33−
34## Installation
25## Installation
35
26
36### Homebrew (recommended)
27### Homebrew (recommended)
@@ -51,47 +42,37 @@ brew install --cask ilyakooo0/tap/usage-menubar
511. Go to the [Releases page](https://github.com/ilyakooo0/usage-menubar/releases)
421. Go to the [Releases page](https://github.com/ilyakooo0/usage-menubar/releases)
522. Download the latest `UsageMenubar-*.zip`
432. Download the latest `UsageMenubar-*.zip`
533. Unzip and move `UsageMenubar.app` to `/Applications`
443. Unzip and move `UsageMenubar.app` to `/Applications`
54−4. Launch the app — it will appear in your menu bar
45+4. Launch the app — it will appear in your menu bar as ⚡
55
46
56> **Note:** Releases are **ad-hoc signed** — the CI build applies `codesign -s -` to the app, which gives it a stable code identity but is *not* an Apple Developer ID signature. macOS will still warn you on first launch: right-click the app → **Open**, or allow it in **System Settings → Privacy & Security**. Removing that prompt entirely requires a paid Developer ID certificate and notarization.
47> **Note:** Releases are **ad-hoc signed** — the CI build applies `codesign -s -` to the app, which gives it a stable code identity but is *not* an Apple Developer ID signature. macOS will still warn you on first launch: right-click the app → **Open**, or allow it in **System Settings → Privacy & Security**. Removing that prompt entirely requires a paid Developer ID certificate and notarization.
57
48
58−## Setup
49+### Set your API key
59−
60−Click the menu bar icon to open the popover. Each service is configured independently:
61
50
62−### Hyper credits
51+1. Click the ⚡ icon in your menu bar
52+2. Enter your Hyper API key (starts with `sk-...`) in the **API Key** field
53+3. Click **Save**
54+4. Your balance will appear immediately
63
55
64−1. Enter your Hyper API key (starts with `sk-...`) in the **Hyper API Key** field
56+You can get your API key from [hyper.charm.land](https://hyper.charm.land).
65−2. Click **Save**
66−3. Your balance appears immediately
67
57
68−Get your key from [hyper.charm.land](https://hyper.charm.land).
58+### Claude Code limits (optional, no setup)
69
59
70−### Claude Code limits (no setup)
60+If you use the [Claude Code CLI](https://claude.com/claude-code), the popover also shows how much of your Pro/Max plan you have used: the limit currently in effect as a headline percentage, the 5-hour and 7-day windows underneath, and how long until the next reset.
71
61
72−If you use the [Claude Code CLI](https://claude.com/claude-code), the popover shows how much of your Pro/Max plan you have used: the 5-hour and 7-day windows, and how long until the next reset.
62+There is nothing to configure. The app reads the OAuth credentials Claude Code already stores when you run `claude` and sign in — first from its login-Keychain item, then from `~/.claude/.credentials.json` if the Keychain has nothing. If neither exists, the Claude section simply doesn't appear; it is not treated as an error, and the Hyper balance is unaffected.
73
63
74−There is nothing to configure. The app reads the OAuth credentials Claude Code already stores when you run `claude` and sign in — first from its login-Keychain item, then from `~/.claude/.credentials.json` if the Keychain has nothing. If neither exists, the Claude section doesn't appear.
64+Two things worth knowing:
75
65
76- **macOS will ask once.** Those credentials belong to Claude Code, not to this app, so the first read prompts you to allow access to the `Claude Code-credentials` Keychain item. Choose **Always Allow** and you won't be asked again.
66- **macOS will ask once.** Those credentials belong to Claude Code, not to this app, so the first read prompts you to allow access to the `Claude Code-credentials` Keychain item. Choose **Always Allow** and you won't be asked again.
77−- **The credentials are strictly read-only.** The app reads the access token Claude Code stored and spends it as-is. It never refreshes it, and never writes those credentials back — that is the CLI's job alone. If the token has expired, the Claude section says so and asks you to run `claude`.
67+- **The credentials are read-only, with one exception.** When the access token has expired, the app refreshes it against Anthropic's token endpoint and writes the result back to wherever it read it from — exactly as Claude Code itself would. Nothing else about them is ever modified, and the fields the app doesn't model are preserved verbatim, so your CLI session keeps working.
78−
79−### z.ai Coding Plan
80−
81−1. Enter your z.ai API key in the **z.ai API Key** field
82−2. Click **Save**
83−3. Your 5-hour and weekly quota percentages appear immediately
84−
85−Get your key from [z.ai/manage-apikey](https://z.ai/manage-apikey/coding-plan/personal/my-plan).
86
68
87## Settings
69## Settings
88
70
89−Everything is configured from the popover — click the menu bar icon.
71+Everything is configured from the popover — click the ⚡ icon in the menu bar.
90
72
91| Setting | Where | Notes |
73| Setting | Where | Notes |
92| ------------------- | ------------------------------ | ------------------------------------------------------------------------------------ |
74| ------------------- | ------------------------------ | ------------------------------------------------------------------------------------ |
93−| **Hyper API key** | **Hyper API Key** field → **Save** | Stored in the macOS Keychain. Clearing the field and saving deletes the stored key. |
75+| **API key** | **API Key** field → **Save** | Stored in the macOS Keychain. Clearing the field and saving deletes the stored key. |
94−| **z.ai API key** | **z.ai API Key** field → **Save** | Stored separately from the Hyper key. |
95| **Launch at login** | **Launch at Login** toggle | Registers the app with `SMAppService`. |
76| **Launch at login** | **Launch at Login** toggle | Registers the app with `SMAppService`. |
96| **Notifications** | System permission prompt | macOS asks on first launch (only if not already decided). Required for low-balance alerts. |
77| **Notifications** | System permission prompt | macOS asks on first launch (only if not already decided). Required for low-balance alerts. |
97| **Refresh now** | **Refresh** button | Forces an immediate fetch, on top of the automatic refresh. |
78| **Refresh now** | **Refresh** button | Forces an immediate fetch, on top of the automatic refresh. |
@@ -157,21 +138,18 @@ usage-menubar/
157├── project.yml # xcodegen project definition
138├── project.yml # xcodegen project definition
158├── UsageMenubar/
139├── UsageMenubar/
159│ ├── UsageMenubarApp.swift # @main App, NSStatusBar, timer, sleep/wake
140│ ├── UsageMenubarApp.swift # @main App, NSStatusBar, timer, sleep/wake
160−│ ├── ViewModel.swift # Observable state: balance, Claude usage, z.ai usage, refresh
141+│ ├── ViewModel.swift # Observable state: balance, Claude usage, refresh, notifications
161│ ├── MenuView.swift # SwiftUI popover view
142│ ├── MenuView.swift # SwiftUI popover view
162−│ ├── CreditsChecker.swift # Hyper API client (GET /v1/credits)
143+│ ├── CreditsChecker.swift # API client (GET /v1/credits)
163│ ├── ClaudeUsageClient.swift # Claude OAuth client (GET /api/oauth/usage) + models
144│ ├── ClaudeUsageClient.swift # Claude OAuth client (GET /api/oauth/usage) + models
164−│ ├── ZaiUsageClient.swift # z.ai API client (GET /monitor/usage/quota/limit)
165−│ ├── KeychainHelper.swift # Keychain wrapper (Hyper + z.ai keys)
145+│ ├── KeychainHelper.swift # Keychain wrapper for API key
166│ ├── VersionFormatter.swift # YYYY.MM.DD.HHHH formatting
146│ ├── VersionFormatter.swift # YYYY.MM.DD.HHHH formatting
167│ ├── Info.plist # LSUIElement=true (agent app)
147│ ├── Info.plist # LSUIElement=true (agent app)
168−│ ├── UsageMenubar.entitlements # Network client; deliberately not sandboxed
148+│ ├── UsageMenubar.entitlements # Network client; deliberately not sandboxed
169│ └── Assets.xcassets/ # App icon, accent color
149│ └── Assets.xcassets/ # App icon, accent color
170├── UsageMenubarTests/
150├── UsageMenubarTests/
171−│ ├── CreditsCheckerTests.swift # Hyper API, retry, keychain, StubURLProtocol
151+│ ├── CreditsCheckerTests.swift # API, retry, fractional balance, keychain tests
172−│ ├── ClaudeUsageClientTests.swift # Usage decoding, read-only credential store, retry
152+│ ├── ClaudeUsageClientTests.swift # Usage decoding, token refresh, retry, credential store
173−│ ├── ZaiUsageClientTests.swift # z.ai API, retry, decoding
174−│ ├── StatusBarTextTests.swift # Menu bar title formatting
175│ └── VersionFormatterTests.swift # Version formatting tests
153│ └── VersionFormatterTests.swift # Version formatting tests
176├── .github/workflows/
154├── .github/workflows/
177│ └── release.yml # Build + release on push to master
155│ └── release.yml # Build + release on push to master
@@ -182,18 +160,24 @@ usage-menubar/
182
160
183## How it works
161## How it works
184
162
185−1. **Menu bar item**: The app creates an `NSStatusItem` with a variable-length button. Left-click toggles the popover; right-click opens a context menu (Refresh, Quit).
163+1. **Menu bar item**: The app creates an `NSStatusItem` with a variable-length button showing `⚡{balance}` or `⚡?`. Left-click toggles the popover; right-click opens a context menu (Refresh, Open hyper.charm.land, Quit).
186−2. **Popover**: Clicking the menu bar item shows an `NSPopover` containing a SwiftUI `MenuView` with each configured service's data and the settings.
164+2. **Popover**: Clicking the menu bar item shows an `NSPopover` containing a SwiftUI `MenuView` with the balance, sparkline, API key field, and settings.
187−3. **Independent fetches**: `ViewModel.refresh()` runs the Hyper, Claude, and z.ai requests concurrently with `async let`. Any can fail, stall, or be unconfigured without affecting the others.
188−4. **Hyper API client**: `CreditsChecker` performs `GET https://hyper.charm.land/v1/credits` with `Authorization: Bearer <key>`, retries transient failures with exponential backoff, and decodes `{"balance": <int>}`.
165+3. **API client**: `CreditsChecker` performs `GET https://hyper.charm.land/v1/credits` with `Authorization: Bearer <key>`, retries transient failures (5xx, timeouts) with exponential backoff, and decodes `{"balance": <int>}` (tolerating fractional values by rounding).
189−5. **Claude usage**: `ClaudeUsageClient` reads Claude Code's OAuth credentials (its `Claude Code-credentials` Keychain item via `/usr/bin/security`, falling back to `~/.claude/.credentials.json`) and fetches `GET https://api.anthropic.com/api/oauth/usage`. It is strictly read-only — it never refreshes the token and never writes credentials back. Missing credentials are reported as "not configured" rather than as an error, and the popover hides the section.
190−6. **z.ai usage**: `ZaiUsageClient` fetches `GET https://api.z.ai/api/monitor/usage/quota/limit` and `GET https://api.z.ai/api/biz/subscription/list` concurrently with an API key the user enters in settings. Same retry pattern as the other clients.
191−7. **Keychain**: API keys are stored/retrieved via `KeychainHelper` using the macOS Security framework. Hyper and z.ai keys are stored separately.
166+4. **Keychain**: The API key is stored/retrieved via `KeychainHelper` using the macOS Security framework. `save()` returns a `Bool` indicating success.
192−8. **Timer**: A `Timer` fires at the user-selected interval (1m / 5m / 15m / 30m, default 5m); the app also refreshes on wake from sleep.
167+5. **Timer**: A `Timer` fires at the user-selected interval (1m / 5m / 15m / 30m, default 5m) to refresh the balance; the app also refreshes on wake from sleep. Changing the interval in the popover restarts the timer immediately.
168+6. **State**: `ViewModel` owns the balance, loading/error state, balance history (for the sparkline), refresh task (cancellable to prevent races), and the refresh interval, and is shared between the menu bar item and the popover.
193−9. **Notifications**: When the Hyper balance crosses below 10 credits — or is already below 10 on the first successful fetch — `ViewModel` posts a local `UNUserNotification`. Permission is requested only once.
169+7. **Notifications**: When the balance crosses below 10 credits — or is already below 10 on the first successful fetch — `ViewModel` posts a local `UNUserNotification`. Permission is requested only once.
194−10. **Agent app**: `LSUIElement=true` in `Info.plist` makes the app a background agent — no dock icon, no main window.
170+8. **Agent app**: `LSUIElement=true` in `Info.plist` makes the app a background agent — no dock icon, no main window.
171+9. **Claude usage**: `ClaudeUsageClient` reads Claude Code's OAuth credentials (its `Claude Code-credentials` Keychain item via `/usr/bin/security`, falling back to `~/.claude/.credentials.json`), refreshes the access token when it has expired, and fetches `GET https://api.anthropic.com/api/oauth/usage` with `Authorization: Bearer …` and `anthropic-beta: oauth-2025-04-20`. It is an actor so that overlapping refreshes (timer, manual click, wake) join a single in-flight token exchange — the endpoint rotates the refresh token, and rotating it twice would sign Claude Code out. Missing credentials are reported as "not configured" rather than as an error, and the popover hides the section.
172+10. **Independent fetches**: `ViewModel.refresh()` runs the Hyper and Claude requests concurrently with `async let`. Neither can fail, stall, or be unconfigured in a way that affects the other.
19511. **No sandbox**: Reading credentials that belong to another app means spawning `/usr/bin/security` and reading a file in the user's home directory, neither of which the App Sandbox permits. The app is distributed ad-hoc signed via Homebrew rather than through the App Store, where the sandbox would be mandatory.
17311. **No sandbox**: Reading credentials that belong to another app means spawning `/usr/bin/security` and reading a file in the user's home directory, neither of which the App Sandbox permits. The app is distributed ad-hoc signed via Homebrew rather than through the App Store, where the sandbox would be mandatory.
196
174
175+## Credits
176+
177+- **Author**: Ilya Koo ([@ilyakooo0](https://github.com/ilyakooo0))
178+- **API**: [Hyper by Charm](https://hyper.charm.land)
179+- **Built with**: Swift 5.9, SwiftUI, macOS 14+
180+
197## License
181## License
198
182
199−MIT — see [LICENSE](LICENSE).
183+MIT — see [LICENSE](LICENSE).
UsageMenubar/ClaudeUsageClient.swift+307−56
@@ -154,32 +154,45 @@ private enum ISO8601 {
154
154
155// MARK: - Credentials
155// MARK: - Credentials
156
156
157−/// The subset of Claude Code's OAuth blob this app reads. The key names are Claude
157+/// The OAuth credentials the Claude Code CLI owns. The key names are Claude Code's,
158−/// Code's, not ours — and reading is *all* we do with them.
158+/// not ours — this is its blob, and we only ever read it and rotate its tokens.
159−///
160−/// Deliberately models neither `refreshToken` nor `expiresAt`. Both existed only to
161−/// serve a token refresh, and refreshing is precisely what this app must never do: the
162−/// token endpoint rotates the refresh token, so an app refreshing behind the CLI's back
163−/// leaves the CLI holding a token the server has already retired — signing the user out
164−/// of their own terminal. Not modelling the fields is the cheapest way to keep it that
165−/// way. Every field Claude Code stores that isn't named here is simply ignored.
166−struct ClaudeOAuthCredentials: Decodable, Equatable {
159+struct ClaudeOAuthCredentials: Codable, Equatable {
167− let claudeAiOauth: OAuthToken
160+ var claudeAiOauth: OAuthToken
168−
161+
169− struct OAuthToken: Decodable, Equatable {
162+ struct OAuthToken: Codable, Equatable {
170− let accessToken: String
163+ var accessToken: String
164+ var refreshToken: String
165+ /// Epoch milliseconds.
166+ var expiresAt: Int64
171− let scopes: [String]?
167+ var scopes: [String]?
172 /// `"pro"`, `"max"`, `"team"`, …
168 /// `"pro"`, `"max"`, `"team"`, …
173− let subscriptionType: String?
169+ var subscriptionType: String?
174− let rateLimitTier: String?
170+ var rateLimitTier: String?
175 }
171 }
176}
172}
177
173
174+/// Where credentials were read from, so a rotated token is written back to the same
175+/// place. Writing to the other one would leave Claude Code holding a refresh token
176+/// the server has already retired — i.e. would sign the user out of their own CLI.
177+enum ClaudeCredentialSource: Equatable {
178+ case keychain(account: String)
179+ case file(URL)
180+}
181+
182+/// Credentials together with where they came from.
183+struct StoredClaudeCredentials: Equatable {
184+ var credentials: ClaudeOAuthCredentials
185+ var source: ClaudeCredentialSource
186+}
187+
178−/// Reads the credentials Claude Code owns. Read-only by design — there is no `save`,
188+/// Reads — and, after a token refresh, writes back — the credentials Claude Code owns.
179−/// because the CLI is the only thing allowed to rotate these tokens.
180/// Injectable so tests never go near the real Keychain or the real credentials file.
189/// Injectable so tests never go near the real Keychain or the real credentials file.
181protocol ClaudeCredentialStoring {
190protocol ClaudeCredentialStoring {
182− func load() -> ClaudeOAuthCredentials?
191+ func load() -> StoredClaudeCredentials?
192+
193+ /// Best effort: failing to persist a refreshed token is not worth failing the
194+ /// fetch over, and the next launch will simply refresh again.
195+ func save(_ stored: StoredClaudeCredentials)
183}
196}
184
197
185/// The real store: Claude Code's login-Keychain item, falling back to
198/// The real store: Claude Code's login-Keychain item, falling back to
@@ -210,14 +223,101 @@ struct ClaudeCodeCredentialStore: ClaudeCredentialStoring {
210 self.credentialsFile = credentialsFile
223 self.credentialsFile = credentialsFile
211 }
224 }
212
225
213− func load() -> ClaudeOAuthCredentials? {
226+ func load() -> StoredClaudeCredentials? {
214 if let json = Self.runSecurity(["find-generic-password", "-s", keychainService, "-w"]),
227 if let json = Self.runSecurity(["find-generic-password", "-s", keychainService, "-w"]),
215 let credentials = Self.decode(Data(json.utf8)) {
228 let credentials = Self.decode(Data(json.utf8)) {
229+ return StoredClaudeCredentials(
216− return credentials
230+ credentials: credentials,
231+ source: .keychain(account: keychainAccount())
232+ )
233+ }
234+
235+ guard let data = try? Data(contentsOf: credentialsFile),
236+ let credentials = Self.decode(data) else { return nil }
237+
238+ return StoredClaudeCredentials(credentials: credentials, source: .file(credentialsFile))
239+ }
240+
241+ func save(_ stored: StoredClaudeCredentials) {
242+ guard let json = rotatedJSON(for: stored) else { return }
243+
244+ switch stored.source {
245+ case .keychain(let account):
246+ _ = Self.runSecurity([
247+ "add-generic-password",
248+ "-U", // update the existing item rather than adding a second one
249+ "-s", keychainService,
250+ "-a", account,
251+ "-w", json,
252+ ])
253+
254+ case .file(let url):
255+ guard let data = json.data(using: .utf8) else { return }
256+ try? data.write(to: url, options: .atomic)
257+ // An atomic write replaces the file, so the 0600 mode has to be reapplied.
258+ try? FileManager.default.setAttributes(
259+ [.posixPermissions: 0o600],
260+ ofItemAtPath: url.path
261+ )
262+ }
263+ }
264+
265+ /// The stored blob with only the three token fields rotated.
266+ ///
267+ /// Patches the raw JSON rather than re-encoding `ClaudeOAuthCredentials`, because
268+ /// a round-trip through our own type would silently drop any field Anthropic adds
269+ /// to the blob that we don't model — and this is the file the user's CLI logs in
270+ /// with. Re-encoding is the fallback for when the raw blob can't be read back.
271+ private func rotatedJSON(for stored: StoredClaudeCredentials) -> String? {
272+ let token = stored.credentials.claudeAiOauth
273+
274+ if let raw = rawJSON(from: stored.source),
275+ let parsed = try? JSONSerialization.jsonObject(with: raw),
276+ var object = parsed as? [String: Any],
277+ var oauth = object["claudeAiOauth"] as? [String: Any] {
278+ oauth["accessToken"] = token.accessToken
279+ oauth["refreshToken"] = token.refreshToken
280+ oauth["expiresAt"] = token.expiresAt
281+ object["claudeAiOauth"] = oauth
282+
283+ if let patched = try? JSONSerialization.data(withJSONObject: object),
284+ let json = String(data: patched, encoding: .utf8) {
285+ return json
286+ }
287+ }
288+
289+ guard let encoded = try? JSONEncoder().encode(stored.credentials) else { return nil }
290+ return String(data: encoded, encoding: .utf8)
291+ }
292+
293+ private func rawJSON(from source: ClaudeCredentialSource) -> Data? {
294+ switch source {
295+ case .keychain:
296+ return Self.runSecurity(["find-generic-password", "-s", keychainService, "-w"])
297+ .map { Data($0.utf8) }
298+ case .file(let url):
299+ return try? Data(contentsOf: url)
300+ }
301+ }
302+
303+ /// The account on Claude Code's Keychain item, so a write-back updates that item
304+ /// instead of adding a second one under a different account.
305+ private func keychainAccount() -> String {
306+ guard let output = Self.runSecurity(["find-generic-password", "-s", keychainService]) else {
307+ return NSUserName()
308+ }
309+
310+ // The attribute dump spells the account as: "acct"<blob>="someone"
311+ for line in output.split(separator: "\n") {
312+ let trimmed = line.trimmingCharacters(in: .whitespaces)
313+ guard trimmed.hasPrefix("\"acct\""),
314+ let range = trimmed.range(of: #"="[^"]+"#, options: .regularExpression)
315+ else { continue }
316+ // The match starts at `="` and stops before the closing quote.
317+ return String(trimmed[range].dropFirst(2))
217 }
318 }
218
319
219− guard let data = try? Data(contentsOf: credentialsFile) else { return nil }
320+ return NSUserName()
220− return Self.decode(data)
221 }
321 }
222
322
223 private static func decode(_ data: Data) -> ClaudeOAuthCredentials? {
323 private static func decode(_ data: Data) -> ClaudeOAuthCredentials? {
@@ -263,11 +363,8 @@ enum ClaudeUsageError: LocalizedError, Equatable {
263 /// Claude Code has never signed in here. Not an error the user needs to see — the
363 /// Claude Code has never signed in here. Not an error the user needs to see — the
264 /// popover just leaves the section out.
364 /// popover just leaves the section out.
265 case noCredentials
365 case noCredentials
266−
267− /// The token the CLI last stored has expired or been revoked. The app cannot fix
268− /// this itself — only the CLI may mint a new one — so the message sends the user
269− /// there.
270 case invalidCredentials
366 case invalidCredentials
367+ case tokenRefreshFailed
271 case requestFailed(String)
368 case requestFailed(String)
272 case decodingFailed(String)
369 case decodingFailed(String)
273
370
@@ -277,6 +374,8 @@ enum ClaudeUsageError: LocalizedError, Equatable {
277 return "No Claude Code credentials found. Run `claude` in a terminal to sign in."
374 return "No Claude Code credentials found. Run `claude` in a terminal to sign in."
278 case .invalidCredentials:
375 case .invalidCredentials:
279 return "Claude sign-in expired. Run `claude` in a terminal to sign in again."
376 return "Claude sign-in expired. Run `claude` in a terminal to sign in again."
377+ case .tokenRefreshFailed:
378+ return "Could not refresh Claude credentials. Run `claude` in a terminal to sign in again."
280 case .requestFailed(let message):
379 case .requestFailed(let message):
281 return "Claude request failed: \(message)"
380 return "Claude request failed: \(message)"
282 case .decodingFailed(let message):
381 case .decodingFailed(let message):
@@ -300,30 +399,33 @@ protocol ClaudeUsageChecking {
300
399
301// MARK: - Client
400// MARK: - Client
302
401
303−/// Client for Claude Code's subscription usage API, authenticating with whatever OAuth
402+/// Client for Claude Code's subscription usage API, authenticating with the OAuth
304−/// access token the CLI has most recently stored on this machine.
403+/// credentials the CLI already stores on this machine.
305−///
306−/// **A passenger, never a driver.** It reads the CLI's token and spends it as-is. It
307−/// never refreshes: the token endpoint *rotates* the refresh token, and the CLI refreshes
308−/// on its own schedule, so an app that also refreshed would race it — whichever of the two
309−/// went second would present a refresh token the server had already retired, and the user
310−/// would find themselves signed out of their own terminal. That bug is not worth a usage
311−/// readout. When the token is spent, we say so and point at `claude`.
312−///
313−/// Credentials are re-read on every fetch (the app polls every 1–5 minutes), so a token
314−/// the CLI refreshes is picked up on the next tick without the app lifting a finger.
315///
404///
316−/// Still an actor: it holds no mutable state now that the refresh is gone, but the
405+/// An actor rather than a plain client, because the refresh path mutates state the
406+/// user's CLI depends on: the token endpoint rotates the refresh token, so two
407+/// concurrent refreshes would leave one of them holding a token the server has
317−/// overlapping fetches (timer, manual click, wake) share one instance, and an actor keeps
408+/// already retired. Overlapping fetches (timer, manual click, wake) instead join a
318−/// that sharing trivially safe.
409+/// single in-flight refresh.
319actor ClaudeUsageClient: ClaudeUsageChecking {
410actor ClaudeUsageClient: ClaudeUsageChecking {
320 static let usageEndpoint = URL(string: "https://api.anthropic.com/api/oauth/usage")!
411 static let usageEndpoint = URL(string: "https://api.anthropic.com/api/oauth/usage")!
412+ static let tokenEndpoint = URL(string: "https://platform.claude.com/v1/oauth/token")!
321
413
414+ /// Claude Code's public OAuth client id, and the scopes it signs in with.
415+ static let clientID = "9d1c250a-e61b-44d9-88ed-5944d1962f5e"
416+ static let scope = "user:inference user:profile user:sessions:claude_code"
417+
322− /// Cloudflare fronts the API and answers 403 `browser_signature_banned` to anything
418+ /// Cloudflare fronts the token endpoint and answers 403 `browser_signature_banned`
323− /// without a browser User-Agent.
419+ /// to anything without a browser User-Agent.
324 static let userAgent = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 "
420 static let userAgent = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 "
325 + "(KHTML, like Gecko) Chrome/126.0 Safari/537.36"
421 + "(KHTML, like Gecko) Chrome/126.0 Safari/537.36"
326
422
423+ /// Refresh this far ahead of the stated expiry rather than racing it.
424+ static let expiryBuffer: TimeInterval = 60
425+
426+ /// Used when the token endpoint omits `expires_in`.
427+ static let defaultTokenLifetime: TimeInterval = 8 * 60 * 60
428+
327 /// Retries *after* the initial attempt, so at most 3 requests per call.
429 /// Retries *after* the initial attempt, so at most 3 requests per call.
328 static let maxRetries = 2
430 static let maxRetries = 2
329
431
@@ -350,17 +452,24 @@ actor ClaudeUsageClient: ClaudeUsageChecking {
350 private let session: URLSession
452 private let session: URLSession
351 private let store: ClaudeCredentialStoring
453 private let store: ClaudeCredentialStoring
352 private let retryBaseDelay: Duration
454 private let retryBaseDelay: Duration
455+ private let now: @Sendable () -> Date
456+
457+ /// The refresh currently in flight, if any. See `refreshCredentials(from:)`.
458+ private var inFlightRefresh: Task<StoredClaudeCredentials, Error>?
353
459
354 /// - Parameters:
460 /// - Parameters:
355 /// - retryBaseDelay: Delay before the first retry; doubles on each subsequent
461 /// - retryBaseDelay: Delay before the first retry; doubles on each subsequent
356 /// one (2s, then 4s). Injectable so tests need not wait in real time.
462 /// one (2s, then 4s). Injectable so tests need not wait in real time.
463+ /// - now: The current instant. Injectable so tests can drive token expiry.
357 init(
464 init(
358 session: URLSession? = nil,
465 session: URLSession? = nil,
359 store: ClaudeCredentialStoring = ClaudeCodeCredentialStore(),
466 store: ClaudeCredentialStoring = ClaudeCodeCredentialStore(),
360− retryBaseDelay: Duration = .seconds(2)
467+ retryBaseDelay: Duration = .seconds(2),
468+ now: @escaping @Sendable () -> Date = { Date() }
361 ) {
469 ) {
362 self.store = store
470 self.store = store
363 self.retryBaseDelay = retryBaseDelay
471 self.retryBaseDelay = retryBaseDelay
472+ self.now = now
364 if let session {
473 if let session {
365 self.session = session
474 self.session = session
366 } else {
475 } else {
@@ -371,26 +480,43 @@ actor ClaudeUsageClient: ClaudeUsageChecking {
371 }
480 }
372 }
481 }
373
482
374− /// Fetches current usage with the CLI's current access token, exactly as stored.
483+ /// Fetches current usage, refreshing the OAuth token first if it has expired.
375− ///
376− /// The token is not checked for expiry and not refreshed on rejection — see the type
377− /// comment. A spent token surfaces as `.invalidCredentials`, which asks the user to
378− /// run `claude`; doing so has the CLI mint a fresh token, which the next fetch picks
379− /// up on its own.
380 ///
484 ///
381 /// - Throws: `ClaudeUsageError`. `.noCredentials` means Claude Code was never
485 /// - Throws: `ClaudeUsageError`. `.noCredentials` means Claude Code was never
382 /// signed in here, which callers should treat as "nothing to show" rather than
486 /// signed in here, which callers should treat as "nothing to show" rather than
383 /// as a failure.
487 /// as a failure.
384 func fetchUsage() async throws -> ClaudeUsageReport {
488 func fetchUsage() async throws -> ClaudeUsageReport {
385− guard let credentials = store.load() else { throw ClaudeUsageError.noCredentials }
489+ guard let stored = store.load() else { throw ClaudeUsageError.noCredentials }
386
490
387− let token = credentials.claudeAiOauth
491+ var current = stored
388− let usage = try await requestUsage(token: token.accessToken)
492+ var didRefresh = false
389− return ClaudeUsageReport(usage: usage, subscriptionType: token.subscriptionType)
493+ if isExpired(stored.credentials) {
494+ current = try await refreshCredentials(from: stored)
495+ didRefresh = true
496+ }
497+
498+ do {
499+ return try await report(with: current)
500+ } catch ClaudeUsageError.invalidCredentials where !didRefresh {
501+ // A token can be revoked server-side well before its stated expiry, so a
502+ // rejection is worth one refresh and one retry.
503+ guard let refreshed = try? await refreshCredentials(from: current) else {
504+ // A failed refresh (Cloudflare, a retired refresh token) says less
505+ // than the rejection that sent us here, so surface that instead.
506+ throw ClaudeUsageError.invalidCredentials
507+ }
508+ return try await report(with: refreshed)
509+ }
390 }
510 }
391
511
392 // MARK: - Usage Request
512 // MARK: - Usage Request
393
513
514+ private func report(with stored: StoredClaudeCredentials) async throws -> ClaudeUsageReport {
515+ let token = stored.credentials.claudeAiOauth
516+ let usage = try await requestUsage(token: token.accessToken)
517+ return ClaudeUsageReport(usage: usage, subscriptionType: token.subscriptionType)
518+ }
519+
394 private func requestUsage(token: String) async throws -> ClaudeUsage {
520 private func requestUsage(token: String) async throws -> ClaudeUsage {
395 var request = URLRequest(url: Self.usageEndpoint, cachePolicy: .reloadIgnoringLocalCacheData)
521 var request = URLRequest(url: Self.usageEndpoint, cachePolicy: .reloadIgnoringLocalCacheData)
396 request.httpMethod = "GET"
522 request.httpMethod = "GET"
@@ -408,6 +534,101 @@ actor ClaudeUsageClient: ClaudeUsageChecking {
408 }
534 }
409 }
535 }
410
536
537+ // MARK: - Token Refresh
538+
539+ /// Exchanges the refresh token for a fresh access token and persists the result.
540+ ///
541+ /// Callers join whatever refresh is already running rather than starting a second
542+ /// one, and the exchange itself runs in an unstructured task so that a cancelled
543+ /// caller — the view model cancels the previous refresh whenever a new one starts
544+ /// — can never abandon a rotation half-done, with the new refresh token neither
545+ /// used nor written back.
546+ private func refreshCredentials(from stored: StoredClaudeCredentials) async throws -> StoredClaudeCredentials {
547+ if let existing = inFlightRefresh {
548+ return try await existing.value
549+ }
550+
551+ let task = Task { () throws -> StoredClaudeCredentials in
552+ let response = try await self.requestTokenRefresh(
553+ refreshToken: stored.credentials.claudeAiOauth.refreshToken
554+ )
555+
556+ var refreshed = stored
557+ refreshed.credentials.claudeAiOauth.accessToken = response.accessToken
558+ if let rotated = response.refreshToken {
559+ refreshed.credentials.claudeAiOauth.refreshToken = rotated
560+ }
561+ let lifetime = response.expiresIn.map(TimeInterval.init) ?? Self.defaultTokenLifetime
562+ refreshed.credentials.claudeAiOauth.expiresAt =
563+ Int64((self.now().timeIntervalSince1970 + lifetime) * 1000)
564+
565+ self.store.save(refreshed)
566+ return refreshed
567+ }
568+ // Only the task's creator ever clears the slot, so a joiner resuming late can
569+ // never wipe out a refresh that started after it.
570+ inFlightRefresh = task
571+
572+ do {
573+ let refreshed = try await task.value
574+ inFlightRefresh = nil
575+ return refreshed
576+ } catch {
577+ inFlightRefresh = nil
578+ throw error
579+ }
580+ }
581+
582+ /// Posts the refresh grant as JSON, then — for token endpoints that reject a JSON
583+ /// body — retries the same exchange form-encoded before giving up.
584+ private func requestTokenRefresh(refreshToken: String) async throws -> TokenRefreshResponse {
585+ let parameters = [
586+ "grant_type": "refresh_token",
587+ "refresh_token": refreshToken,
588+ "client_id": Self.clientID,
589+ "scope": Self.scope,
590+ ]
591+
592+ if let response = await tokenRefreshAttempt(parameters: parameters, formEncoded: false) {
593+ return response
594+ }
595+ if let response = await tokenRefreshAttempt(parameters: parameters, formEncoded: true) {
596+ return response
597+ }
598+ throw ClaudeUsageError.tokenRefreshFailed
599+ }
600+
601+ /// One refresh exchange in one encoding. Returns `nil` rather than throwing, so the
602+ /// caller can fall through to the other encoding.
603+ private func tokenRefreshAttempt(
604+ parameters: [String: String],
605+ formEncoded: Bool
606+ ) async -> TokenRefreshResponse? {
607+ var request = URLRequest(url: Self.tokenEndpoint)
608+ request.httpMethod = "POST"
609+ request.setValue(Self.userAgent, forHTTPHeaderField: "User-Agent")
610+ request.setValue("application/json", forHTTPHeaderField: "Accept")
611+
612+ if formEncoded {
613+ request.setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type")
614+ request.httpBody = Self.formURLEncoded(parameters).data(using: .utf8)
615+ } else {
616+ request.setValue("application/json", forHTTPHeaderField: "Content-Type")
617+ request.httpBody = try? JSONSerialization.data(withJSONObject: parameters)
618+ }
619+
620+ guard let data = try? await send(request) else { return nil }
621+ return try? JSONDecoder().decode(TokenRefreshResponse.self, from: data)
622+ }
623+
624+ /// Whether the access token is spent, or close enough that using it would be a race.
625+ private func isExpired(_ credentials: ClaudeOAuthCredentials) -> Bool {
626+ let expiry = Date(
627+ timeIntervalSince1970: TimeInterval(credentials.claudeAiOauth.expiresAt) / 1000
628+ )
629+ return expiry.timeIntervalSince(now()) <= Self.expiryBuffer
630+ }
631+
411 // MARK: - Transport
632 // MARK: - Transport
412
633
413 /// Sends a request, retrying transient failures with exponential backoff.
634 /// Sends a request, retrying transient failures with exponential backoff.
@@ -468,9 +689,39 @@ actor ClaudeUsageClient: ClaudeUsageChecking {
468 }
689 }
469 }
690 }
470
691
692+ /// Encodes parameters as an `application/x-www-form-urlencoded` body. Percent-encodes
693+ /// against RFC 3986's unreserved set, so the spaces and colons in the scope don't
694+ /// travel raw.
695+ private static func formURLEncoded(_ parameters: [String: String]) -> String {
696+ var allowed = CharacterSet.alphanumerics
697+ allowed.insert(charactersIn: "-._~")
698+
699+ return parameters.map { key, value in
700+ let encodedKey = key.addingPercentEncoding(withAllowedCharacters: allowed) ?? key
701+ let encodedValue = value.addingPercentEncoding(withAllowedCharacters: allowed) ?? value
702+ return "\(encodedKey)=\(encodedValue)"
703+ }
704+ .joined(separator: "&")
705+ }
706+
471 /// A failed attempt, carrying the error to surface plus whether retrying is worthwhile.
707 /// A failed attempt, carrying the error to surface plus whether retrying is worthwhile.
472 private struct AttemptFailure: Error {
708 private struct AttemptFailure: Error {
473 let underlying: ClaudeUsageError
709 let underlying: ClaudeUsageError
474 let isRetryable: Bool
710 let isRetryable: Bool
475 }
711 }
476}
712}
713+
714+/// The token endpoint's answer to a refresh grant.
715+struct TokenRefreshResponse: Decodable, Equatable {
716+ let accessToken: String
717+ let refreshToken: String?
718+
719+ /// Seconds. Omitted by some deployments, in which case the caller assumes a default.
720+ let expiresIn: Int?
721+
722+ private enum CodingKeys: String, CodingKey {
723+ case accessToken = "access_token"
724+ case refreshToken = "refresh_token"
725+ case expiresIn = "expires_in"
726+ }
727+}
UsageMenubar/Info.plist+1−1
@@ -7,7 +7,7 @@
7 <key>CFBundleDisplayName</key>
7 <key>CFBundleDisplayName</key>
8 <string>Usage Menubar</string>
8 <string>Usage Menubar</string>
9 <key>CFBundleIdentifier</key>
9 <key>CFBundleIdentifier</key>
10− <string>soy.iko.usage-menubar</string>
10+ <string>com.ilyakooo0.usage-menubar</string>
11 <key>CFBundleVersion</key>
11 <key>CFBundleVersion</key>
12 <string>1</string>
12 <string>1</string>
13 <key>CFBundleShortVersionString</key>
13 <key>CFBundleShortVersionString</key>
UsageMenubar/KeychainHelper.swift+1−29
@@ -82,7 +82,7 @@ struct KeychainStore {
82
82
83/// Simple wrapper around the macOS Keychain for storing the Hyper API key.
83/// Simple wrapper around the macOS Keychain for storing the Hyper API key.
84enum KeychainHelper {
84enum KeychainHelper {
85− private static let service = "soy.iko.usage-menubar"
85+ private static let service = "com.ilyakooo0.usage-menubar"
86 private static let account = "hyper-api-key"
86 private static let account = "hyper-api-key"
87
87
88 private static let store = KeychainStore(service: service, account: account)
88 private static let store = KeychainStore(service: service, account: account)
@@ -106,31 +106,3 @@ enum KeychainHelper {
106 store.delete()
106 store.delete()
107 }
107 }
108}
108}
109−
110−/// Wrapper around the macOS Keychain for storing the z.ai API key.
111−///
112−/// Uses the same keychain service as the Hyper key but a different account, so the
113−/// two keys coexist without clobbering each other.
114−enum ZaiKeychainHelper {
115− private static let service = "soy.iko.usage-menubar"
116− private static let account = "zai-api-key"
117−
118− private static let store = KeychainStore(service: service, account: account)
119−
120− /// Saves the given z.ai API key to the Keychain, overwriting any existing entry.
121− @discardableResult
122− static func save(_ key: String) -> Bool {
123− store.save(key)
124− }
125−
126− /// Retrieves the stored z.ai API key, or `nil` if none exists.
127− static func load() -> String? {
128− store.load()
129− }
130−
131− /// Deletes the stored z.ai API key if it exists.
132− @discardableResult
133− static func delete() -> Bool {
134− store.delete()
135− }
136−}
UsageMenubar/MenuView.swift+159−349
@@ -4,15 +4,20 @@ import SwiftUI
4struct MenuView: View {
4struct MenuView: View {
5 @ObservedObject var viewModel: ViewModel
5 @ObservedObject var viewModel: ViewModel
6
6
7+ /// Dims the balance while the pointer is over it, hinting that it is clickable.
8+ @State private var isHoveringBalance = false
9+
7 private static let websiteURL = URL(string: "https://hyper.charm.land")!
10 private static let websiteURL = URL(string: "https://hyper.charm.land")!
8− private static let zaiKeyURL = URL(string: "https://z.ai/manage-apikey/coding-plan/personal/my-plan")!
9
11
10 // MARK: - Type Scale
12 // MARK: - Type Scale
11
13
12− /// One rounded family, sized so that every provider's headline number reads at the
14+ /// One rounded family, sized so that the balance is the only large element and
13− /// same weight. With three providers in the popover, the 26pt subhero is the right
15+ /// everything else steps down from it — nothing competes with it for attention.
14− /// scale — a 46pt hero would make the popover too tall. Monospaced digits keep
16+ /// The Claude percentage is the one exception, and it is deliberately set well
17+ /// below the balance so it reads as the second thing on the page, not the first.
15− /// numbers from jittering as their digits change.
18+ /// Monospaced digits keep numbers from jittering as their digits change.
19+ private static let heroFont = Font.system(size: 46, weight: .semibold, design: .rounded)
20+ .monospacedDigit()
16 private static let subheroFont = Font.system(size: 26, weight: .semibold, design: .rounded)
21 private static let subheroFont = Font.system(size: 26, weight: .semibold, design: .rounded)
17 .monospacedDigit()
22 .monospacedDigit()
18 private static let sectionFont = Font.system(size: 12, weight: .semibold, design: .rounded)
23 private static let sectionFont = Font.system(size: 12, weight: .semibold, design: .rounded)
@@ -22,17 +27,11 @@ struct MenuView: View {
22
27
23 var body: some View {
28 var body: some View {
24 VStack(alignment: .leading, spacing: 18) {
29 VStack(alignment: .leading, spacing: 18) {
25− if viewModel.hyperConfigured {
26− hyper
30+ hyper
27− }
28 if showsClaude {
31 if showsClaude {
29 serviceBreak
32 serviceBreak
30 claude
33 claude
31 }
34 }
32− if showsZai {
33− serviceBreak
34− zai
35− }
36 hairline
35 hairline
37 settings
36 settings
38 hairline
37 hairline
@@ -47,18 +46,12 @@ struct MenuView: View {
47 .background(Color(nsColor: .windowBackgroundColor))
46 .background(Color(nsColor: .windowBackgroundColor))
48 .animation(.easeInOut(duration: 0.2), value: viewModel.savedConfirmation)
47 .animation(.easeInOut(duration: 0.2), value: viewModel.savedConfirmation)
49 .animation(.easeInOut(duration: 0.2), value: viewModel.copiedConfirmation)
48 .animation(.easeInOut(duration: 0.2), value: viewModel.copiedConfirmation)
50− .animation(.easeInOut(duration: 0.2), value: viewModel.copiedClaudeConfirmation)
51− .animation(.easeInOut(duration: 0.2), value: viewModel.copiedZaiConfirmation)
52 .animation(.easeInOut(duration: 0.2), value: viewModel.errorMessage)
49 .animation(.easeInOut(duration: 0.2), value: viewModel.errorMessage)
53 .animation(.easeInOut(duration: 0.25), value: viewModel.balance)
50 .animation(.easeInOut(duration: 0.25), value: viewModel.balance)
54 .animation(.easeInOut(duration: 0.25), value: viewModel.isLoading)
51 .animation(.easeInOut(duration: 0.25), value: viewModel.isLoading)
55− .animation(.easeInOut(duration: 0.3), value: viewModel.balanceSparklineValues.count)
52+ .animation(.easeInOut(duration: 0.3), value: historyValues.count)
56− .animation(.easeInOut(duration: 0.3), value: viewModel.claudeSparklineValues.count)
57− .animation(.easeInOut(duration: 0.3), value: viewModel.zaiSparklineValues.count)
58 .animation(.easeInOut(duration: 0.25), value: viewModel.claudeUsage)
53 .animation(.easeInOut(duration: 0.25), value: viewModel.claudeUsage)
59 .animation(.easeInOut(duration: 0.2), value: viewModel.claudeError)
54 .animation(.easeInOut(duration: 0.2), value: viewModel.claudeError)
60− .animation(.easeInOut(duration: 0.25), value: viewModel.zaiUsage)
61− .animation(.easeInOut(duration: 0.2), value: viewModel.zaiError)
62 }
55 }
63
56
64 /// A section rule light enough to read as a pause rather than a border.
57 /// A section rule light enough to read as a pause rather than a border.
@@ -66,14 +59,15 @@ struct MenuView: View {
66 Divider().opacity(0.3)
59 Divider().opacity(0.3)
67 }
60 }
68
61
69− /// The rule between services. Wider than the others on purpose: the providers are
62+ /// The rule between the two services. Wider than the others on purpose: Hyper and
70− /// unrelated accounts, and the gap should say so before the headers do.
63+ /// Claude are two unrelated accounts, and the gap should say so before the headers do.
71 private var serviceBreak: some View {
64 private var serviceBreak: some View {
72 hairline.padding(.vertical, 5)
65 hairline.padding(.vertical, 5)
73 }
66 }
74
67
75 /// A section header: an icon and a title, sized to match the "API Key" header below
68 /// A section header: an icon and a title, sized to match the "API Key" header below
76− /// so the popover reads as three equal sections rather than a hero with appendages.
69+ /// so the popover reads as three sections rather than a hero with two appendices.
70+ /// The icon is what tells the two services apart at a glance.
77 private func sectionHeader(_ title: String, systemImage: String) -> some View {
71 private func sectionHeader(_ title: String, systemImage: String) -> some View {
78 HStack(spacing: 5) {
72 HStack(spacing: 5) {
79 Image(systemName: systemImage)
73 Image(systemName: systemImage)
@@ -84,62 +78,113 @@ struct MenuView: View {
84 }
78 }
85 }
79 }
86
80
87− /// A reusable headline number row: the provider's main metric at subhero scale,
81+ // MARK: - Hyper
88− /// with emoji, color, trend arrow, and click-to-copy. The `caption` doubles as the
89− /// copy-confirmation slot so the layout doesn't shift.
90− private func headlineNumber(
91− text: String,
92− color: Color,
93− trend: MetricTrend,
94− copiedConfirmation: Bool,
95− captionText: String,
96− copyAction: @escaping () -> Void
97− ) -> some View {
98− VStack(spacing: 6) {
99− Button(action: copyAction) {
100− HStack(alignment: .firstTextBaseline, spacing: 6) {
101− Text(text)
102− .font(Self.subheroFont)
103− .foregroundColor(color)
104− .contentTransition(.opacity)
105
82
106− if let symbol = trend.symbolName {
83+ /// The Hyper section: its header, then the balance as the popover's hero.
107− Image(systemName: symbol)
84+ private var hyper: some View {
108− .font(.system(size: 12, weight: .semibold))
85+ VStack(alignment: .leading, spacing: 12) {
86+ sectionHeader("Hyper Credits", systemImage: "bolt.fill")
87+
88+ hero
89+ }
90+ }
91+
92+ private var hero: some View {
93+ VStack(spacing: 8) {
94+ if viewModel.isLoading && viewModel.balance == nil {
95+ PulsingBolt()
96+ .transition(.opacity)
97+ } else if viewModel.balance == nil {
98+ VStack(spacing: 6) {
99+ Text("⚡?")
100+ .font(Self.heroFont)
109− .foregroundColor(.secondary)
101+ .foregroundColor(.secondary)
102+
103+ Text("Enter your API key below")
104+ .font(Self.captionFont)
105+ .foregroundColor(.secondary)
106+ }
110− .transition(.opacity)
107+ .transition(.opacity)
111− }
108+ } else {
109+ VStack(spacing: 6) {
110+ balanceNumber
111+ caption
112+ sparkline
112 }
113 }
113− .contentShape(Rectangle())
114+ .transition(.opacity)
115+ }
116+
117+ if let lastUpdatedText = viewModel.lastUpdatedText {
118+ Text(lastUpdatedText)
119+ .font(Self.footnoteFont)
120+ .foregroundColor(.secondary)
121+ .transition(.opacity)
122+ }
123+
124+ if let error = viewModel.errorMessage {
125+ errorRow(error)
126+ .transition(.opacity)
114 }
127 }
115− .buttonStyle(.plain)
128+ }
116− .help("Click to copy")
129+ .frame(maxWidth: .infinity)
117−
130+ }
118− // Caption doubles as copy confirmation so the layout doesn't shift.
131+
119− Group {
132+ /// The balance itself. Clicking it copies the raw number to the clipboard.
120− if copiedConfirmation {
133+ private var balanceNumber: some View {
121− Text("✓ Copied")
134+ Button(action: { viewModel.copyBalanceToClipboard() }) {
122− .foregroundColor(.green)
135+ HStack(alignment: .firstTextBaseline, spacing: 6) {
123− } else {
136+ Text(viewModel.formattedBalance)
124− Text(captionText)
137+ .font(Self.heroFont)
138+ .foregroundColor(viewModel.balanceColor)
139+ .contentTransition(.opacity)
140+
141+ if let symbol = viewModel.balanceTrend.symbolName {
142+ Image(systemName: symbol)
143+ .font(.system(size: 12, weight: .semibold))
125 .foregroundColor(.secondary)
144 .foregroundColor(.secondary)
145+ .transition(.opacity)
126 }
146 }
127 }
147 }
128− .font(Self.captionFont)
148+ // Without this the hover area is only the glyphs themselves.
149+ .contentShape(Rectangle())
129 }
150 }
151+ .buttonStyle(.plain)
152+ .disabled(viewModel.balance == nil)
153+ .help("Click to copy")
154+ .opacity(isHoveringBalance && viewModel.balance != nil ? 0.65 : 1)
155+ .onHover { isHoveringBalance = $0 }
156+ .animation(.easeInOut(duration: 0.12), value: isHoveringBalance)
157+ }
158+
159+ /// Doubles as the copy confirmation so the layout doesn't shift.
160+ private var caption: some View {
161+ Group {
162+ if viewModel.copiedConfirmation {
163+ Text("✓ Copied")
164+ .foregroundColor(.green)
165+ } else {
166+ Text("credits")
167+ .foregroundColor(.secondary)
168+ }
169+ }
170+ .font(Self.captionFont)
130 }
171 }
131
172
132− /// A sparkline shown when there are at least 2 history points.
133 @ViewBuilder
173 @ViewBuilder
134− private func sparkline(values: [Int], color: Color) -> some View {
174+ private var sparkline: some View {
135− if values.count >= 2 {
175+ if historyValues.count >= 2 {
136− Sparkline(values: values, color: color)
176+ Sparkline(values: historyValues, color: viewModel.balanceColor)
137 .frame(height: 26)
177 .frame(height: 26)
138 .padding(.top, 4)
178 .padding(.top, 4)
139 .transition(.opacity)
179 .transition(.opacity)
140 }
180 }
141 }
181 }
142
182
183+ /// The sparkline's data. Key paths can't index tuple elements, so this stays a closure.
184+ private var historyValues: [Int] {
185+ viewModel.balanceHistory.map { $0.balance }
186+ }
187+
143 /// Errors read as a quiet inline notice rather than loose red text: an icon, the
188 /// Errors read as a quiet inline notice rather than loose red text: an icon, the
144 /// message, and a tinted rounded background with no border.
189 /// message, and a tinted rounded background with no border.
145 private func errorRow(_ message: String) -> some View {
190 private func errorRow(_ message: String) -> some View {
@@ -164,56 +209,6 @@ struct MenuView: View {
164 .padding(.top, 2)
209 .padding(.top, 2)
165 }
210 }
166
211
167− // MARK: - Hyper
168−
169− /// Whether there is anything to say about Hyper. Nothing at all when Hyper isn't
170− /// configured — the section doesn't appear, same as Claude and z.ai.
171− private var showsHyper: Bool {
172− viewModel.hyperConfigured
173− }
174−
175− /// The Hyper section: header, balance as a subhero number, caption, sparkline.
176− private var hyper: some View {
177− VStack(alignment: .leading, spacing: 12) {
178− sectionHeader("Hyper Credits", systemImage: "bolt.fill")
179−
180− if viewModel.isLoading && viewModel.balance == nil {
181− Text("…")
182− .font(Self.subheroFont)
183− .foregroundColor(.secondary)
184− } else if let balance = viewModel.balance {
185− VStack(spacing: 8) {
186− headlineNumber(
187− text: "⚡ \(viewModel.formattedBalance)",
188− color: viewModel.balanceColor,
189− trend: viewModel.balanceTrend,
190− copiedConfirmation: viewModel.copiedConfirmation,
191− captionText: "credits",
192− copyAction: { viewModel.copyBalanceToClipboard() }
193− )
194−
195− sparkline(
196− values: viewModel.balanceSparklineValues,
197− color: viewModel.balanceColor
198− )
199− }
200− .transition(.opacity)
201− }
202−
203− if let lastUpdatedText = viewModel.lastUpdatedText {
204− Text(lastUpdatedText)
205− .font(Self.footnoteFont)
206− .foregroundColor(.secondary)
207− .transition(.opacity)
208− }
209−
210− if let error = viewModel.errorMessage {
211− errorRow(error)
212− .transition(.opacity)
213− }
214− }
215− }
216−
217 // MARK: - Claude
212 // MARK: - Claude
218
213
219 /// Whether there is anything to say about Claude. Nothing at all when Claude Code
214 /// Whether there is anything to say about Claude. Nothing at all when Claude Code
@@ -225,8 +220,8 @@ struct MenuView: View {
225 return false
220 return false
226 }
221 }
227
222
228− /// Claude Code's plan limits. Same visual structure as Hyper and z.ai: a subhero
223+ /// Claude Code's plan limits. The percentage leads, as the balance does above it,
229− /// headline number, bars under every window, a sparkline, and error row.
224+ /// with the individual windows underneath as quiet supporting detail.
230 private var claude: some View {
225 private var claude: some View {
231 VStack(alignment: .leading, spacing: 12) {
226 VStack(alignment: .leading, spacing: 12) {
232 HStack(spacing: 8) {
227 HStack(spacing: 8) {
@@ -253,31 +248,23 @@ struct MenuView: View {
253
248
254 private func usageDetail(_ usage: ClaudeUsage) -> some View {
249 private func usageDetail(_ usage: ClaudeUsage) -> some View {
255 VStack(alignment: .leading, spacing: 12) {
250 VStack(alignment: .leading, spacing: 12) {
256− // The 5-hour window leads as the headline number.
251+ // The 5-hour window leads as the hero number, since it's the one
252+ // most likely to bind and the one shown in the menu bar title.
257 if let fiveHour = usage.fiveHour {
253 if let fiveHour = usage.fiveHour {
258 let percent = Int(fiveHour.utilization.rounded())
254 let percent = Int(fiveHour.utilization.rounded())
259− VStack(spacing: 8) {
260− HStack(alignment: .firstTextBaseline, spacing: 8) {
255+ HStack(alignment: .firstTextBaseline, spacing: 8) {
261− headlineNumber(
262− text: "⁕ \\(percent)%",
256+ Text("🕐 \(percent)%")
257+ .font(Self.subheroFont)
263− color: Self.usageColor(percent),
258+ .foregroundColor(Self.usageColor(percent))
264− trend: viewModel.claudeTrend,
259+ .contentTransition(.opacity)
265− copiedConfirmation: viewModel.copiedClaudeConfirmation,
266− captionText: "5-hour usage",
267− copyAction: { viewModel.copyClaudePercentToClipboard() }
268− )
269
260
270− Spacer(minLength: 0)
261+ Spacer(minLength: 0)
271
262
272− if let resets = fiveHour.resetsInFormatted {
263+ if let resets = fiveHour.resetsInFormatted {
273− Text("resets in \(resets)")
264+ Text("resets in \(resets)")
274− .font(Self.footnoteFont)
265+ .font(Self.footnoteFont)
275− .foregroundColor(.secondary)
266+ .foregroundColor(.secondary)
276− }
277 }
267 }
278−
279− // Bar under the 5-hour window too, same as 7-day windows below.
280− UsageBar(percent: percent, color: Self.usageColor(percent))
281 }
268 }
282 }
269 }
283
270
@@ -291,12 +278,6 @@ struct MenuView: View {
291 window("7-day Opus", opus)
278 window("7-day Opus", opus)
292 }
279 }
293 }
280 }
294−
295− // Sparkline for the Claude 5-hour % history.
296− sparkline(
297− values: viewModel.claudeSparklineValues,
298− color: Self.usageColor(claudeFiveHourPercent ?? 0)
299− )
300 }
281 }
301 }
282 }
302
283
@@ -322,11 +303,6 @@ struct MenuView: View {
322 }
303 }
323 }
304 }
324
305
325− /// The current Claude 5-hour percentage, or 0 if absent. Used for sparkline color.
326− private var claudeFiveHourPercent: Int? {
327− viewModel.claudeFiveHourPercent
328− }
329−
330 /// The balance colors read the other way round here, because for a limit more is
306 /// The balance colors read the other way round here, because for a limit more is
331 /// worse: green with room to spare, yellow closing in, red nearly spent.
307 /// worse: green with room to spare, yellow closing in, red nearly spent.
332 private static func usageColor(_ percent: Int) -> Color {
308 private static func usageColor(_ percent: Int) -> Color {
@@ -335,176 +311,6 @@ struct MenuView: View {
335 return .green
311 return .green
336 }
312 }
337
313
338− // MARK: - z.ai
339−
340− /// Whether there is anything to say about z.ai. Nothing at all when no API key has
341− /// been entered — the section doesn't appear, and no error is shown for a service
342− /// the user may simply not use.
343− private var showsZai: Bool {
344− if viewModel.zaiError != nil { return true }
345− if let usage = viewModel.zaiUsage { return !usage.isEmpty }
346− return false
347− }
348−
349− /// z.ai Coding Plan's quota limits. Same visual structure as Hyper and Claude:
350− /// a subhero headline number, bars under every window, a sparkline, and error row.
351− private var zai: some View {
352− VStack(alignment: .leading, spacing: 12) {
353− HStack(spacing: 8) {
354− sectionHeader("z.ai Coding", systemImage: "bolt.horizontal")
355−
356− Spacer(minLength: 0)
357−
358− if let plan = viewModel.zaiPlanLabel {
359− Text(plan)
360− .font(Self.captionFont)
361− .foregroundColor(.secondary)
362− }
363− }
364−
365− if let usage = viewModel.zaiUsage, !usage.isEmpty {
366− zaiUsageDetail(usage)
367− }
368−
369− if let error = viewModel.zaiError {
370− errorRow(error)
371− }
372− }
373− }
374−
375− private func zaiUsageDetail(_ usage: ZaiUsageReport) -> some View {
376− VStack(alignment: .leading, spacing: 12) {
377− // The 5-hour window leads as the headline number.
378− if let fiveHour = usage.fiveHourPercent {
379− VStack(spacing: 8) {
380− HStack(alignment: .firstTextBaseline, spacing: 8) {
381− headlineNumber(
382− text: "Z \\(fiveHour)%",
383− color: Self.usageColor(fiveHour),
384− trend: viewModel.zaiTrend,
385− copiedConfirmation: viewModel.copiedZaiConfirmation,
386− captionText: "5-hour usage",
387− copyAction: { viewModel.copyZaiPercentToClipboard() }
388− )
389−
390− Spacer(minLength: 0)
391−
392− if let resets = usage.fiveHourResetsAt {
393− Text("resets in \(Self.zaiResetsIn(from: resets))")
394− .font(Self.footnoteFont)
395− .foregroundColor(.secondary)
396− }
397− }
398−
399− // Bar under the 5-hour window too.
400− UsageBar(percent: fiveHour, color: Self.usageColor(fiveHour))
401− }
402− }
403−
404− VStack(alignment: .leading, spacing: 9) {
405− if let weekly = usage.weeklyPercent {
406− zaiWindow("Weekly", percent: weekly, resetsAt: usage.weeklyResetsAt)
407− }
408− }
409−
410− // Peak hours notice.
411− zaiPeakHours
412−
413− // Sparkline for the z.ai 5-hour % history, with an orange tint
414− // when currently in peak hours.
415− if viewModel.zaiSparklineValues.count >= 2 {
416− Sparkline(
417− values: viewModel.zaiSparklineValues,
418− color: Self.usageColor(zaiFiveHourPercent ?? 0)
419− )
420− .frame(height: 26)
421− .padding(.top, 4)
422− .transition(.opacity)
423− .background(
424− ViewModel.zaiInPeakHours
425− ? RoundedRectangle(cornerRadius: 4, style: .continuous)
426− .fill(Color.orange.opacity(0.08))
427− : nil
428− )
429− }
430− }
431− }
432−
433− /// The current z.ai 5-hour percentage, or 0 if absent. Used for sparkline color.
434− private var zaiFiveHourPercent: Int? {
435− viewModel.zaiFiveHourPercent
436− }
437−
438− /// One window row for z.ai: label, percentage, and a hairline bar.
439− private func zaiWindow(_ label: String, percent: Int, resetsAt: Date?) -> some View {
440− VStack(alignment: .leading, spacing: 5) {
441− HStack(spacing: 6) {
442− Text(label)
443− .font(Self.captionFont)
444− .foregroundColor(.secondary)
445−
446− Spacer(minLength: 0)
447−
448− Text("\(percent)%")
449− .font(Self.captionFont.monospacedDigit())
450− .foregroundColor(Self.usageColor(percent))
451− }
452−
453− UsageBar(percent: percent, color: Self.usageColor(percent))
454− }
455− }
456−
457− /// z.ai peak hours: 14:00–18:00 CST (UTC+8), i.e. 06:00–10:00 UTC.
458− /// Limits are most likely to bind during this window. Displayed in the
459− /// user's local timezone so they know when to expect slowdowns.
460− private var zaiPeakHours: some View {
461− let inPeak = ViewModel.zaiInPeakHours
462−
463− return HStack(spacing: 6) {
464− Circle()
465− .fill(inPeak ? Color.orange : Color.secondary.opacity(0.4))
466− .frame(width: 6, height: 6)
467−
468− Text(inPeak ? "Peak hours now" : "Peak \(Self.zaiPeakHoursLocal)")
469− .font(Self.footnoteFont)
470− .foregroundColor(inPeak ? .orange : .secondary)
471− }
472− }
473−
474− /// z.ai peak hours converted to the user's local timezone, e.g. "09:00–13:00".
475− private static var zaiPeakHoursLocal: String {
476− let formatter = DateFormatter()
477− formatter.timeZone = TimeZone.current
478− formatter.dateFormat = "HH:mm"
479−
480− var utc = DateComponents()
481− utc.timeZone = TimeZone(identifier: "UTC")
482− utc.hour = 6
483− var calendar = Calendar(identifier: .gregorian)
484− calendar.timeZone = TimeZone(identifier: "UTC")!
485− let start = calendar.date(from: utc)!
486−
487− utc.hour = 10
488− let end = calendar.date(from: utc)!
489−
490− return "\(formatter.string(from: start))–\(formatter.string(from: end))"
491− }
492−
493− /// Formats the time until a z.ai window resets, e.g. "3h 20m".
494− private static func zaiResetsIn(from date: Date) -> String {
495− let interval = date.timeIntervalSince(Date())
496− guard interval > 0 else { return "soon" }
497−
498− let seconds = Int(interval.rounded())
499− let days = seconds / 86_400
500− let hours = (seconds % 86_400) / 3_600
501− let minutes = (seconds % 3_600) / 60
502−
503− if days > 0 { return "\(days)d \(hours)h" }
504− if hours > 0 { return "\(hours)h \(minutes)m" }
505− return "\(minutes)m"
506− }
507−
508 // MARK: - Settings
314 // MARK: - Settings
509
315
510 private var settings: some View {
316 private var settings: some View {
@@ -540,37 +346,6 @@ struct MenuView: View {
540 .controlSize(.small)
346 .controlSize(.small)
541 }
347 }
542
348
543− VStack(alignment: .leading, spacing: 8) {
544− HStack(spacing: 8) {
545− sectionHeader("z.ai API Key", systemImage: "bolt.horizontal")
546−
547− Spacer(minLength: 0)
548−
549− // The confirmation takes the link's place rather than adding a row
550− // of its own, so saving never resizes the popover.
551− if viewModel.savedConfirmation {
552− Text("✓ Saved")
553− .font(Self.captionFont)
554− .foregroundColor(.green)
555− .transition(.opacity)
556− } else {
557− Link("Get key →", destination: Self.zaiKeyURL)
558− .font(Self.captionFont)
559− .transition(.opacity)
560− }
561− }
562−
563− HStack(spacing: 8) {
564− SecureField("your z.ai key", text: $viewModel.zaiAPIKeyInput)
565− .textFieldStyle(.roundedBorder)
566−
567− Button("Save") {
568− viewModel.saveZaiAPIKey()
569− }
570− }
571− .controlSize(.small)
572− }
573−
574 HStack {
349 HStack {
575 Text("Refresh every")
350 Text("Refresh every")
576
351
@@ -611,7 +386,42 @@ struct MenuView: View {
611 .keyboardShortcut("q")
386 .keyboardShortcut("q")
612 }
387 }
613 .controlSize(.small)
388 .controlSize(.small)
389+
390+ Link("hyper.charm.land", destination: Self.websiteURL)
391+ .font(Self.footnoteFont)
392+ .foregroundColor(.secondary)
393+ .opacity(0.7)
394+ .frame(maxWidth: .infinity, alignment: .center)
395+ }
396+ }
397+}
398+
399+// MARK: - Loading
400+
401+/// The loading state, before there has ever been a balance to show. Reuses the ⚡ from
402+/// the menu bar title rather than a generic spinner, so the two read as the same app.
403+private struct PulsingBolt: View {
404+ @State private var isPulsing = false
405+
406+ var body: some View {
407+ VStack(spacing: 6) {
408+ Text("⚡")
409+ .font(.system(size: 34))
410+ .opacity(isPulsing ? 0.35 : 1)
411+ .scaleEffect(isPulsing ? 0.94 : 1)
412+ .animation(
413+ .easeInOut(duration: 0.9).repeatForever(autoreverses: true),
414+ value: isPulsing
415+ )
416+ // Roughly the height of the balance it stands in for, so the hero
417+ // doesn't jump when the first fetch lands.
418+ .frame(height: 56)
419+
420+ Text("Loading…")
421+ .font(.system(size: 11, weight: .medium, design: .rounded))
422+ .foregroundColor(.secondary)
614 }
423 }
424+ .onAppear { isPulsing = true }
615 }
425 }
616}
426}
617
427
@@ -645,8 +455,8 @@ private struct UsageBar: View {
645
455
646// MARK: - Sparkline
456// MARK: - Sparkline
647
457
648−/// A minimal line chart of recent values: no axes, no labels, no grid. The stroke
458+/// A minimal line chart of recent balances: no axes, no labels, no grid. The stroke
649−/// takes the metric's color so the trend reads as part of the number above it, with a
459+/// takes the balance's color so the trend reads as part of the number above it, with a
650/// faint fade underneath for weight and a dot marking the latest point.
460/// faint fade underneath for weight and a dot marking the latest point.
651///
461///
652/// Points are spaced evenly by index rather than by timestamp, which keeps the shape
462/// Points are spaced evenly by index rather than by timestamp, which keeps the shape
@@ -738,4 +548,4 @@ struct Sparkline: View {
738 path.closeSubpath()
548 path.closeSubpath()
739 }
549 }
740 }
550 }
741−}
551+}
UsageMenubar/UsageMenubarApp.swift+7−25
@@ -35,7 +35,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
35
35
36 if let button = statusItem.button {
36 if let button = statusItem.button {
37 button.image = nil
37 button.image = nil
38− button.title = "…"
38+ button.title = "⚡?"
39 button.target = self
39 button.target = self
40 button.action = #selector(statusItemClicked(_:))
40 button.action = #selector(statusItemClicked(_:))
41 button.sendAction(on: [.leftMouseUp, .rightMouseUp])
41 button.sendAction(on: [.leftMouseUp, .rightMouseUp])
@@ -46,9 +46,8 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
46 popover.behavior = .transient
46 popover.behavior = .transient
47 popover.contentViewController = NSHostingController(rootView: MenuView(viewModel: viewModel))
47 popover.contentViewController = NSHostingController(rootView: MenuView(viewModel: viewModel))
48
48
49− // Observe published changes (balance + isLoading + hyperConfigured +
49+ // Observe published changes (balance + isLoading + Claude usage) to update the
50− // Claude usage + z.ai usage) to update the menu bar title. CombineLatest
51− // fires when any of them changes.
50+ // menu bar title. CombineLatest fires when any of them changes.
52 //
51 //
53 // The title is built from the values the publisher hands us, not by reading the
52 // The title is built from the values the publisher hands us, not by reading the
54 // view model back: `@Published` emits in `willSet`, so the property still holds
53 // view model back: `@Published` emits in `willSet`, so the property still holds
@@ -57,40 +56,23 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
57 // Delivery is hopped through `DispatchQueue.main` rather than `RunLoop.main`,
56 // Delivery is hopped through `DispatchQueue.main` rather than `RunLoop.main`,
58 // whose Combine scheduler only runs in the default run loop mode — the title
57 // whose Combine scheduler only runs in the default run loop mode — the title
59 // would freeze while a menu or a scroll was tracking.
58 // would freeze while a menu or a scroll was tracking.
60− // Combine has CombineLatest4 but not 5, so nest: outer combines
61− // balance + isLoading + hyperConfigured with an inner that merges
62− // claudeUsage + zaiUsage. The inner Just(()) is a dummy third stream
63− // to satisfy CombineLatest3 — it fires once and never again, so the
64− // inner effectively republishes claudeUsage and zaiUsage changes.
65− statusTextCancellable = Publishers.CombineLatest4(
59+ statusTextCancellable = Publishers.CombineLatest3(
66 viewModel.$balance,
60 viewModel.$balance,
67 viewModel.$isLoading,
61 viewModel.$isLoading,
68− viewModel.$hyperConfigured,
69− Publishers.CombineLatest3(
70− viewModel.$claudeUsage,
62+ viewModel.$claudeUsage
71− viewModel.$zaiUsage,
72− Just<Void>(())
73− )
74 )
63 )
75− .map { balance, isLoading, hyperConfigured, claudeAndZai in
64+ .map { balance, isLoading, claudeUsage in
76− let (claudeUsage, zaiUsage, _) = claudeAndZai
77 let fiveHour = claudeUsage?.fiveHour
65 let fiveHour = claudeUsage?.fiveHour
78 .map { Int($0.utilization.rounded()) }
66 .map { Int($0.utilization.rounded()) }
79 let sevenDay = claudeUsage?.sevenDay
67 let sevenDay = claudeUsage?.sevenDay
80 .map { Int($0.utilization.rounded()) }
68 .map { Int($0.utilization.rounded()) }
81 ?? claudeUsage?.sevenDayOpus
69 ?? claudeUsage?.sevenDayOpus
82 .map { Int($0.utilization.rounded()) }
70 .map { Int($0.utilization.rounded()) }
83− let zaiFiveHour = zaiUsage?.fiveHourPercent
84− let zaiWeekly = zaiUsage?.weeklyPercent
85 return ViewModel.statusBarText(
71 return ViewModel.statusBarText(
86 balance: balance,
72 balance: balance,
87 isLoading: isLoading,
73 isLoading: isLoading,
88− hyperConfigured: hyperConfigured,
89 claudeFiveHourPercent: fiveHour,
74 claudeFiveHourPercent: fiveHour,
90− claudeSevenDayPercent: sevenDay,
75+ claudeSevenDayPercent: sevenDay
91− zaiFiveHourPercent: zaiFiveHour,
92− zaiWeeklyPercent: zaiWeekly,
93− zaiInPeakHours: ViewModel.zaiInPeakHours
94 )
76 )
95 }
77 }
96 .removeDuplicates()
78 .removeDuplicates()
UsageMenubar/ViewModel.swift+48−388
@@ -7,11 +7,11 @@ import UserNotifications
7/// Posted when the user changes the refresh interval, so the app delegate can
7/// Posted when the user changes the refresh interval, so the app delegate can
8/// restart its timer with the new period.
8/// restart its timer with the new period.
9extension Notification.Name {
9extension Notification.Name {
10− static let refreshIntervalDidChange = Notification.Name("soy.iko.usage-menubar.refreshIntervalDidChange")
10+ static let refreshIntervalDidChange = Notification.Name("com.ilyakooo0.usage-menubar.refreshIntervalDidChange")
11}
11}
12
12
13−/// The direction a metric has moved over the most recent history points.
13+/// The direction the balance has moved over the most recent history points.
14−enum MetricTrend {
14+enum BalanceTrend {
15 case increasing
15 case increasing
16 case decreasing
16 case decreasing
17 case stable
17 case stable
@@ -29,11 +29,10 @@ enum MetricTrend {
29 }
29 }
30}
30}
31
31
32−/// A single metric observation — used for Hyper balance, Claude 5-hour %,
32+/// A single balance observation.
33−/// and z.ai 5-hour % alike.
34−struct MetricPoint: Equatable {
33+struct BalancePoint: Equatable {
35 let date: Date
34 let date: Date
36− let value: Int
35+ let balance: Int
37}
36}
38
37
39/// How often the balance is refreshed. Lives outside `ViewModel` so the view and
38/// How often the balance is refreshed. Lives outside `ViewModel` so the view and
@@ -81,24 +80,6 @@ final class ViewModel: ObservableObject {
81 /// The Claude plan the credentials belong to — `"pro"`, `"max"`, …
80 /// The Claude plan the credentials belong to — `"pro"`, `"max"`, …
82 @Published var claudePlan: String?
81 @Published var claudePlan: String?
83
82
84− /// z.ai Coding Plan usage. `nil` when no z.ai API key has been entered, in which
85− /// case the popover leaves the section out entirely.
86− @Published var zaiUsage: ZaiUsageReport?
87−
88− /// A human-readable error message from the z.ai fetch. Independent of
89− /// `errorMessage` and `claudeError`: the three services fail separately.
90− @Published var zaiError: String?
91−
92− /// The z.ai API key draft bound to the text field. Two-way bound to the
93− /// `SecureField`, so it changes on every keystroke — never fetch with it, use
94− /// `activeZaiAPIKey`.
95− @Published var zaiAPIKeyInput: String = ""
96−
97− /// Whether Hyper is configured — i.e. there is an API key in the Keychain.
98− /// Drives whether the `⚡` segment appears in the menu bar at all: an
99− /// unconfigured service should not take up space in the title.
100− @Published private(set) var hyperConfigured = false
101−
102 /// The API key draft bound to the text field. Two-way bound to the `SecureField`,
83 /// The API key draft bound to the text field. Two-way bound to the `SecureField`,
103 /// so it changes on every keystroke — never fetch with it, use `activeAPIKey`.
84 /// so it changes on every keystroke — never fetch with it, use `activeAPIKey`.
104 @Published var apiKeyInput: String = ""
85 @Published var apiKeyInput: String = ""
@@ -112,20 +93,8 @@ final class ViewModel: ObservableObject {
112 /// Brief "✓ Copied" confirmation shown after copying the balance.
93 /// Brief "✓ Copied" confirmation shown after copying the balance.
113 @Published var copiedConfirmation: Bool = false
94 @Published var copiedConfirmation: Bool = false
114
95
115− /// Brief "✓ Copied" confirmation shown after copying the Claude percentage.
116− @Published var copiedClaudeConfirmation: Bool = false
117−
118− /// Brief "✓ Copied" confirmation shown after copying the z.ai percentage.
119− @Published var copiedZaiConfirmation: Bool = false
120−
121 /// Successful balance observations from the last 24 hours, oldest first.
96 /// Successful balance observations from the last 24 hours, oldest first.
122− @Published private(set) var history: [MetricPoint] = []
97+ @Published private(set) var history: [BalancePoint] = []
123−
124− /// Successful Claude 5-hour % observations from the last 24 hours, oldest first.
125− @Published private(set) var claudeHistory: [MetricPoint] = []
126−
127− /// Successful z.ai 5-hour % observations from the last 24 hours, oldest first.
128− @Published private(set) var zaiHistory: [MetricPoint] = []
129
98
130 /// How often the balance is refreshed, in minutes. Persisted to `UserDefaults`;
99 /// How often the balance is refreshed, in minutes. Persisted to `UserDefaults`;
131 /// changing it posts `.refreshIntervalDidChange` so the app delegate can
100 /// changing it posts `.refreshIntervalDidChange` so the app delegate can
@@ -156,13 +125,8 @@ final class ViewModel: ObservableObject {
156 /// last-updated time and history out from under the user.
125 /// last-updated time and history out from under the user.
157 private var activeAPIKey: String
126 private var activeAPIKey: String
158
127
159− /// The z.ai key requests actually go out with: what is in the Keychain, not what
160− /// is currently in the text field. Same rationale as `activeAPIKey`.
161− private var activeZaiAPIKey: String
162−
163 private let checker: CreditsChecking
128 private let checker: CreditsChecking
164 private let claudeChecker: ClaudeUsageChecking
129 private let claudeChecker: ClaudeUsageChecking
165− private let zaiChecker: ZaiUsageChecking
166 private let defaults: UserDefaults
130 private let defaults: UserDefaults
167
131
168 /// The currently in-flight refresh task, if any. Used to cancel
132 /// The currently in-flight refresh task, if any. Used to cancel
@@ -176,12 +140,6 @@ final class ViewModel: ObservableObject {
176 /// Resets `savedConfirmation`; same rationale as `copiedResetTask`.
140 /// Resets `savedConfirmation`; same rationale as `copiedResetTask`.
177 private var savedResetTask: Task<Void, Never>?
141 private var savedResetTask: Task<Void, Never>?
178
142
179− /// Resets `copiedClaudeConfirmation`; same rationale as `copiedResetTask`.
180− private var copiedClaudeResetTask: Task<Void, Never>?
181−
182− /// Resets `copiedZaiConfirmation`; same rationale as `copiedResetTask`.
183− private var copiedZaiResetTask: Task<Void, Never>?
184−
185 // MARK: - History Configuration
143 // MARK: - History Configuration
186
144
187 /// 24 hours at the shortest (1 minute) interval would overflow this, so the
145 /// 24 hours at the shortest (1 minute) interval would overflow this, so the
@@ -189,26 +147,17 @@ final class ViewModel: ObservableObject {
189 private static let maxHistoryEntries = 300
147 private static let maxHistoryEntries = 300
190 private static let historyWindow: TimeInterval = 24 * 60 * 60
148 private static let historyWindow: TimeInterval = 24 * 60 * 60
191
149
192− /// The threshold above which a usage percentage triggers a notification.
193− private static let highUsageThreshold = 90
194−
195 init(
150 init(
196 checker: CreditsChecking = CreditsChecker(),
151 checker: CreditsChecking = CreditsChecker(),
197 claudeChecker: ClaudeUsageChecking = ClaudeUsageClient(),
152 claudeChecker: ClaudeUsageChecking = ClaudeUsageClient(),
198− zaiChecker: ZaiUsageChecking = ZaiUsageClient(),
199 defaults: UserDefaults = .standard
153 defaults: UserDefaults = .standard
200 ) {
154 ) {
201 self.checker = checker
155 self.checker = checker
202 self.claudeChecker = claudeChecker
156 self.claudeChecker = claudeChecker
203− self.zaiChecker = zaiChecker
204 self.defaults = defaults
157 self.defaults = defaults
205 let storedKey = KeychainHelper.load() ?? ""
158 let storedKey = KeychainHelper.load() ?? ""
206 apiKeyInput = storedKey
159 apiKeyInput = storedKey
207 activeAPIKey = storedKey
160 activeAPIKey = storedKey
208− hyperConfigured = !storedKey.isEmpty
209− let storedZaiKey = ZaiKeychainHelper.load() ?? ""
210− zaiAPIKeyInput = storedZaiKey
211− activeZaiAPIKey = storedZaiKey
212 // Assigning in init doesn't fire didSet, so this load doesn't re-post
161 // Assigning in init doesn't fire didSet, so this load doesn't re-post
213 // the change notification or write back to defaults.
162 // the change notification or write back to defaults.
214 refreshIntervalMinutes = RefreshInterval.stored(in: defaults)
163 refreshIntervalMinutes = RefreshInterval.stored(in: defaults)
@@ -237,13 +186,11 @@ final class ViewModel: ObservableObject {
237 balanceFormatter.string(from: NSNumber(value: value)) ?? "\(value)"
186 balanceFormatter.string(from: NSNumber(value: value)) ?? "\(value)"
238 }
187 }
239
188
240− /// The text to show in the menu bar. Each configured provider contributes a
189+ /// The text to show in the menu bar: `⚡{balance}` followed by Claude usage
241− /// segment prefixed with a provider emoji; segments are separated by ` · `
190+ /// windows, each prefixed with an emoji so they are distinguishable at a glance:
242− /// (middle dot). Within a segment, windows are listed as bare percentages
191+ /// 🕐 for the 5-hour window, 📅 for the 7-day window. Windows that are absent or
243− /// separated by spaces. An unconfigured service produces no segment.
192+ /// at 0% are omitted; with neither, the bolt stands in alone: `⚡…` while the
244− /// When z.ai is in peak hours, a 🔶 marker is appended to the z.ai segment.
193+ /// first fetch is in flight, `⚡?` once it has come back empty-handed.
245− ///
246− /// Example: `⚡42 · ⁕62% 8% · Z12% 3%🔶`
247 ///
194 ///
248 /// Takes its values as parameters rather than reading the properties: `@Published`
195 /// Takes its values as parameters rather than reading the properties: `@Published`
249 /// publishes in `willSet`, so a Combine subscriber that called back into the view
196 /// publishes in `willSet`, so a Combine subscriber that called back into the view
@@ -251,54 +198,23 @@ final class ViewModel: ObservableObject {
251 static func statusBarText(
198 static func statusBarText(
252 balance: Int?,
199 balance: Int?,
253 isLoading: Bool,
200 isLoading: Bool,
254− hyperConfigured: Bool,
255 claudeFiveHourPercent: Int?,
201 claudeFiveHourPercent: Int?,
256− claudeSevenDayPercent: Int?,
202+ claudeSevenDayPercent: Int?
257− zaiFiveHourPercent: Int?,
258− zaiWeeklyPercent: Int?,
259− zaiInPeakHours: Bool
260 ) -> String {
203 ) -> String {
261− var segments: [String] = []
204+ var parts: [String] = []
262−
263− // Hyper
264− if hyperConfigured, let balance = balance {
205+ if let balance = balance {
265− segments.append("⚡\(formatBalance(balance))")
206+ parts.append("⚡\(formatBalance(balance))")
266− }
267−
268− // Claude — provider emoji + bare percentages
269− var claudeWindows: [String] = []
270− if let fiveHour = claudeFiveHourPercent {
271− claudeWindows.append("\(fiveHour)%")
272− }
273− if let sevenDay = claudeSevenDayPercent {
274− claudeWindows.append("\(sevenDay)%")
275 }
207 }
276− if !claudeWindows.isEmpty {
208+ if let fiveHour = claudeFiveHourPercent, fiveHour > 0 {
277− segments.append("⁕" + claudeWindows.joined(separator: " "))
209+ parts.append("🕐\(fiveHour)%")
278 }
210 }
279−
211+ if let sevenDay = claudeSevenDayPercent, sevenDay > 0 {
280− // z.ai — provider emoji + bare percentages
212+ parts.append("📅\(sevenDay)%")
281− var zaiWindows: [String] = []
282− if let zaiFiveHour = zaiFiveHourPercent {
283− zaiWindows.append("\(zaiFiveHour)%")
284− }
285− if let zaiWeekly = zaiWeeklyPercent {
286− zaiWindows.append("\(zaiWeekly)%")
287 }
213 }
288− if !zaiWindows.isEmpty {
289− var segment = "Z" + zaiWindows.joined(separator: " ")
290− if zaiInPeakHours {
291− segment += "🔶"
292− }
293− segments.append(segment)
294− }
295−
296− if segments.isEmpty {
214+ if parts.isEmpty {
297− // No service is configured or has anything to show. While loading,
298− // show an ellipsis; otherwise the title is empty.
299− return isLoading ? "…" : ""
215+ return isLoading ? "⚡…" : "⚡?"
300 }
216 }
301− return segments.joined(separator: " · ")
217+ return parts.joined(separator: " · ")
302 }
218 }
303
219
304 /// The text to show in the menu bar for the current state.
220 /// The text to show in the menu bar for the current state.
@@ -306,21 +222,11 @@ final class ViewModel: ObservableObject {
306 Self.statusBarText(
222 Self.statusBarText(
307 balance: balance,
223 balance: balance,
308 isLoading: isLoading,
224 isLoading: isLoading,
309− hyperConfigured: hyperConfigured,
310 claudeFiveHourPercent: claudeFiveHourPercent,
225 claudeFiveHourPercent: claudeFiveHourPercent,
311− claudeSevenDayPercent: claudeSevenDayPercent,
226+ claudeSevenDayPercent: claudeSevenDayPercent
312− zaiFiveHourPercent: zaiFiveHourPercent,
313− zaiWeeklyPercent: zaiWeeklyPercent,
314− zaiInPeakHours: Self.zaiInPeakHours
315 )
227 )
316 }
228 }
317
229
318− /// Whether z.ai is currently in peak hours (06:00–10:00 UTC).
319− static var zaiInPeakHours: Bool {
320− let hour = Calendar(identifier: .gregorian).component(.hour, from: Date())
321− return hour >= 6 && hour < 10
322− }
323−
324 /// The formatted balance string for display in the popover.
230 /// The formatted balance string for display in the popover.
325 var formattedBalance: String {
231 var formattedBalance: String {
326 guard let balance = balance else { return "?" }
232 guard let balance = balance else { return "?" }
@@ -341,88 +247,51 @@ final class ViewModel: ObservableObject {
341 return "Updated \(Self.relativeFormatter.localizedString(for: lastUpdated, relativeTo: Date()))"
247 return "Updated \(Self.relativeFormatter.localizedString(for: lastUpdated, relativeTo: Date()))"
342 }
248 }
343
249
344− // MARK: - History (Hyper)
250+ // MARK: - History
345
251
346− /// The last 24 hours of successful balance fetches, oldest first.
252+ /// The last 24 hours of successful fetches, oldest first.
347 var balanceHistory: [(date: Date, balance: Int)] {
253 var balanceHistory: [(date: Date, balance: Int)] {
348− history.map { (date: $0.date, balance: $0.value) }
254+ history.map { (date: $0.date, balance: $0.balance) }
349 }
255 }
350
256
351 /// The direction of travel across the most recent handful of observations.
257 /// The direction of travel across the most recent handful of observations.
352 /// `.unknown` until there are at least two points to compare.
258 /// `.unknown` until there are at least two points to compare.
353− var balanceTrend: MetricTrend {
259+ var balanceTrend: BalanceTrend {
354− metricTrend(history)
355− }
356−
357− /// The sparkline's data for the Hyper balance.
358− var balanceSparklineValues: [Int] {
359− history.map { $0.value }
360− }
361−
362− // MARK: - History (Claude)
363−
364− /// The last 24 hours of successful Claude 5-hour % fetches, oldest first.
365− var claudeSparklineValues: [Int] {
366− claudeHistory.map { $0.value }
367− }
368−
369− /// The direction of travel for the Claude 5-hour %.
370− var claudeTrend: MetricTrend {
371− metricTrend(claudeHistory)
372− }
373−
374− // MARK: - History (z.ai)
375−
376− /// The last 24 hours of successful z.ai 5-hour % fetches, oldest first.
377− var zaiSparklineValues: [Int] {
378− zaiHistory.map { $0.value }
379− }
380−
381− /// The direction of travel for the z.ai 5-hour %.
382− var zaiTrend: MetricTrend {
383− metricTrend(zaiHistory)
384− }
385−
386− // MARK: - History Helpers
387−
388− /// Computes the trend from a generic history array.
389− private func metricTrend(_ points: [MetricPoint]) -> MetricTrend {
390− guard points.count >= 2 else { return .unknown }
260+ guard history.count >= 2 else { return .unknown }
391− let recent = points.suffix(5)
261+ let recent = history.suffix(5)
392 guard let first = recent.first, let last = recent.last else { return .unknown }
262 guard let first = recent.first, let last = recent.last else { return .unknown }
393− if last.value > first.value { return .increasing }
263+ if last.balance > first.balance { return .increasing }
394− if last.value < first.value { return .decreasing }
264+ if last.balance < first.balance { return .decreasing }
395 return .stable
265 return .stable
396 }
266 }
397
267
398 /// Appends an observation and drops anything older than 24 hours or beyond the cap.
268 /// Appends an observation and drops anything older than 24 hours or beyond the cap.
399− private func recordMetric(_ value: Int, into array: inout [MetricPoint], at date: Date) {
269+ private func recordHistory(balance: Int, at date: Date) {
400− array.append(MetricPoint(date: date, value: value))
270+ history.append(BalancePoint(date: date, balance: balance))
401
271
402 let cutoff = date.addingTimeInterval(-Self.historyWindow)
272 let cutoff = date.addingTimeInterval(-Self.historyWindow)
403− array.removeAll { $0.date < cutoff }
273+ history.removeAll { $0.date < cutoff }
404
274
405− if array.count > Self.maxHistoryEntries {
275+ if history.count > Self.maxHistoryEntries {
406− array.removeFirst(array.count - Self.maxHistoryEntries)
276+ history.removeFirst(history.count - Self.maxHistoryEntries)
407 }
277 }
408 }
278 }
409
279
410 // MARK: - Refresh
280 // MARK: - Refresh
411
281
412− /// Refreshes the Hyper balance, the Claude usage, and the z.ai usage, all at once.
282+ /// Refreshes the Hyper balance and the Claude usage, both at once.
413 ///
283 ///
414− /// The three are independent: any can fail, or not be configured at all, without
284+ /// The two are independent: either can fail, or not be configured at all, without
415− /// touching the others. Cancels any previously in-flight refresh to prevent races.
285+ /// touching the other. Cancels any previously in-flight refresh to prevent races.
416 func refresh() {
286 func refresh() {
417 refreshTask?.cancel()
287 refreshTask?.cancel()
418
288
419 // Deliberately the saved key rather than `apiKeyInput`: see `activeAPIKey`.
289 // Deliberately the saved key rather than `apiKeyInput`: see `activeAPIKey`.
420 let key = activeAPIKey
290 let key = activeAPIKey
421− let zaiKey = activeZaiAPIKey
422 if key.isEmpty {
291 if key.isEmpty {
423 // Nothing to fetch, and nothing worth keeping: the balance, its history and
292 // Nothing to fetch, and nothing worth keeping: the balance, its history and
424− // any error all belonged to a key that is no longer there. Claude and z.ai
293+ // any error all belonged to a key that is no longer there. Claude is left
425− // are left alone — they don't depend on the Hyper key.
294+ // alone — it doesn't depend on the Hyper key.
426 balance = nil
295 balance = nil
427 errorMessage = nil
296 errorMessage = nil
428 lastUpdated = nil
297 lastUpdated = nil
@@ -433,25 +302,22 @@ final class ViewModel: ObservableObject {
433 // Check cancellation before setting isLoading — a previous
302 // Check cancellation before setting isLoading — a previous
434 // refresh() may have cancelled us and already set isLoading = false.
303 // refresh() may have cancelled us and already set isLoading = false.
435 guard !Task.isCancelled else { return }
304 guard !Task.isCancelled else { return }
436− // Loading state covers all fetches: the popover's loading view depends
305+ // Loading state covers both fetches: the popover's loading view depends
437− // on it, and Claude/z.ai usage is fetched even when there's no Hyper key.
306+ // on it, and Claude usage is fetched even when there's no Hyper key.
438 isLoading = true
307 isLoading = true
439 // Don't clear the errors here — keep showing the last one
308 // Don't clear the errors here — keep showing the last one
440 // until we have a successful result.
309 // until we have a successful result.
441
310
442− // All three requests go out at once; none waits on the others.
311+ // Both requests go out at once; neither waits on the other.
443 async let balanceOutcome = fetchBalance(key: key)
312 async let balanceOutcome = fetchBalance(key: key)
444 async let claudeOutcome = fetchClaudeUsage()
313 async let claudeOutcome = fetchClaudeUsage()
445− async let zaiOutcome = fetchZaiUsage(key: zaiKey)
446
314
447 let balanceResult = await balanceOutcome
315 let balanceResult = await balanceOutcome
448 let claudeResult = await claudeOutcome
316 let claudeResult = await claudeOutcome
449− let zaiResult = await zaiOutcome
450 guard !Task.isCancelled else { return }
317 guard !Task.isCancelled else { return }
451
318
452 applyBalance(balanceResult)
319 applyBalance(balanceResult)
453 applyClaude(claudeResult)
320 applyClaude(claudeResult)
454− applyZai(zaiResult)
455 isLoading = false
321 isLoading = false
456 }
322 }
457 }
323 }
@@ -478,7 +344,7 @@ final class ViewModel: ObservableObject {
478 errorMessage = nil
344 errorMessage = nil
479 let now = Date()
345 let now = Date()
480 lastUpdated = now
346 lastUpdated = now
481− recordMetric(newBalance, into: &history, at: now)
347+ recordHistory(balance: newBalance, at: now)
482
348
483 // Low-balance notification: on threshold crossing (≥10 → <10)
349 // Low-balance notification: on threshold crossing (≥10 → <10)
484 // OR on first successful fetch if already below threshold.
350 // OR on first successful fetch if already below threshold.
@@ -523,30 +389,12 @@ final class ViewModel: ObservableObject {
523 claudeUsage = nil
389 claudeUsage = nil
524 claudePlan = nil
390 claudePlan = nil
525 claudeError = nil
391 claudeError = nil
526− claudeHistory.removeAll()
527
392
528 case .usage(let report):
393 case .usage(let report):
529− // Capture the previous 5-hour % for threshold-crossing notification.
530− let previousPercent = claudeFiveHourPercent
531 claudeUsage = report.usage
394 claudeUsage = report.usage
532 claudePlan = report.subscriptionType
395 claudePlan = report.subscriptionType
533 claudeError = nil
396 claudeError = nil
534
397
535− // Record history and fire high-usage notification based on the 5-hour %.
536− if let percent = claudeFiveHourPercent {
537− let now = Date()
538− recordMetric(percent, into: &claudeHistory, at: now)
539−
540− // High-usage notification: on threshold crossing (<90 → ≥90)
541− // OR on first successful fetch if already above threshold.
542− if let previous = previousPercent, previous < Self.highUsageThreshold,
543− percent >= Self.highUsageThreshold {
544− sendHighUsageNotification(provider: "Claude Code", percent: percent)
545− } else if previousPercent == nil, percent >= Self.highUsageThreshold {
546− sendHighUsageNotification(provider: "Claude Code", percent: percent)
547− }
548− }
549−
550 case .failure(let message):
398 case .failure(let message):
551 // As with the balance: keep the last good numbers on screen and say what
399 // As with the balance: keep the last good numbers on screen and say what
552 // went wrong, rather than blanking the section on a transient failure.
400 // went wrong, rather than blanking the section on a transient failure.
@@ -588,88 +436,6 @@ final class ViewModel: ObservableObject {
588 }
436 }
589 }
437 }
590
438
591− // MARK: - z.ai Usage
592−
593− /// What a z.ai fetch produced. Missing API key is deliberately not a failure:
594− /// plenty of people don't use z.ai, and an error telling them so would be noise.
595− private enum ZaiOutcome {
596− case notConfigured
597− case usage(ZaiUsageReport)
598− case failure(String)
599− }
600−
601− private func fetchZaiUsage(key: String) async -> ZaiOutcome {
602− guard !key.isEmpty else { return .notConfigured }
603− do {
604− return .usage(try await zaiChecker.fetchUsage(apiKey: key))
605− } catch ZaiUsageError.noAPIKey {
606− return .notConfigured
607− } catch {
608− return .failure(error.localizedDescription)
609− }
610− }
611−
612− private func applyZai(_ outcome: ZaiOutcome) {
613− switch outcome {
614− case .notConfigured:
615− zaiUsage = nil
616− zaiError = nil
617− zaiHistory.removeAll()
618−
619− case .usage(let report):
620− // Capture the previous 5-hour % for threshold-crossing notification.
621− let previousPercent = zaiFiveHourPercent
622− zaiUsage = report
623− zaiError = nil
624−
625− // Record history and fire high-usage notification based on the 5-hour %.
626− if let percent = zaiFiveHourPercent {
627− let now = Date()
628− recordMetric(percent, into: &zaiHistory, at: now)
629−
630− // High-usage notification: on threshold crossing (<90 → ≥90)
631− // OR on first successful fetch if already above threshold.
632− if let previous = previousPercent, previous < Self.highUsageThreshold,
633− percent >= Self.highUsageThreshold {
634− sendHighUsageNotification(provider: "z.ai Coding", percent: percent)
635− } else if previousPercent == nil, percent >= Self.highUsageThreshold {
636− sendHighUsageNotification(provider: "z.ai Coding", percent: percent)
637− }
638− }
639−
640− case .failure(let message):
641− // As with the balance and Claude: keep the last good numbers on screen
642− // and say what went wrong, rather than blanking the section on a
643− // transient failure.
644− zaiError = message
645− }
646− }
647−
648− /// The 5-hour window percentage for the menu bar title, or `nil` when absent.
649− var zaiFiveHourPercent: Int? {
650− zaiUsage?.fiveHourPercent
651− }
652−
653− /// The weekly window percentage for the popover, or `nil` when absent.
654− var zaiWeeklyPercent: Int? {
655− zaiUsage?.weeklyPercent
656− }
657−
658− /// Display label for the z.ai plan, e.g. "Lite", "Pro", or "Max".
659− /// Falls back to the raw `planLevel` string if it doesn't match a known tier.
660− var zaiPlanLabel: String? {
661− guard let level = zaiUsage?.planLevel?.trimmingCharacters(in: .whitespacesAndNewlines),
662− !level.isEmpty else { return nil }
663−
664− // The subscription endpoint returns a product name like "GLM Coding Max";
665− // extract the tier from it. The quota endpoint returns just the tier.
666− let lowered = level.lowercased()
667− if lowered.contains("max") { return "Max" }
668− if lowered.contains("pro") { return "Pro" }
669− if lowered.contains("lite") { return "Lite" }
670− return level.capitalized
671− }
672−
673 // MARK: - Clipboard
439 // MARK: - Clipboard
674
440
675 /// Copies the current balance to the clipboard as plain digits (no grouping
441 /// Copies the current balance to the clipboard as plain digits (no grouping
@@ -690,41 +456,7 @@ final class ViewModel: ObservableObject {
690 }
456 }
691 }
457 }
692
458
693− /// Copies the current Claude 5-hour percentage to the clipboard.
459+ // MARK: - Low Balance Notification
694− func copyClaudePercentToClipboard() {
695− guard let percent = claudeFiveHourPercent else { return }
696−
697− let pasteboard = NSPasteboard.general
698− pasteboard.clearContents()
699− pasteboard.setString("\(percent)%", forType: .string)
700−
701− copiedClaudeConfirmation = true
702− copiedClaudeResetTask?.cancel()
703− copiedClaudeResetTask = Task { @MainActor in
704− try? await Task.sleep(nanoseconds: 1_500_000_000)
705− guard !Task.isCancelled else { return }
706− copiedClaudeConfirmation = false
707− }
708− }
709−
710− /// Copies the current z.ai 5-hour percentage to the clipboard.
711− func copyZaiPercentToClipboard() {
712− guard let percent = zaiFiveHourPercent else { return }
713−
714− let pasteboard = NSPasteboard.general
715− pasteboard.clearContents()
716− pasteboard.setString("\(percent)%", forType: .string)
717−
718− copiedZaiConfirmation = true
719− copiedZaiResetTask?.cancel()
720− copiedZaiResetTask = Task { @MainActor in
721− try? await Task.sleep(nanoseconds: 1_500_000_000)
722− guard !Task.isCancelled else { return }
723− copiedZaiConfirmation = false
724− }
725− }
726−
727− // MARK: - Notifications
728
460
729 private func sendLowBalanceNotification(balance: Int) {
461 private func sendLowBalanceNotification(balance: Int) {
730 // Build the body here, on the main actor. `getNotificationSettings` calls back on
462 // Build the body here, on the main actor. `getNotificationSettings` calls back on
@@ -753,29 +485,6 @@ final class ViewModel: ObservableObject {
753 }
485 }
754 }
486 }
755
487
756− /// Sends a notification when a usage percentage crosses the high-usage threshold.
757− private func sendHighUsageNotification(provider: String, percent: Int) {
758− let body = "\(provider) 5-hour usage at \(percent)% — approaching limit"
759−
760− let center = UNUserNotificationCenter.current()
761− center.getNotificationSettings { settings in
762− guard settings.authorizationStatus == .authorized || settings.authorizationStatus == .provisional else {
763− return
764− }
765− let content = UNMutableNotificationContent()
766− content.title = "High Usage Menubar"
767− content.body = body
768− content.sound = .default
769−
770− let request = UNNotificationRequest(
771− identifier: "high-usage-alert-\(provider)-\(UUID().uuidString)",
772− content: content,
773− trigger: nil
774− )
775− center.add(request)
776− }
777− }
778−
779 // MARK: - API Key
488 // MARK: - API Key
780
489
781 /// Saves the current `apiKeyInput` to the Keychain and triggers a refresh.
490 /// Saves the current `apiKeyInput` to the Keychain and triggers a refresh.
@@ -790,7 +499,6 @@ final class ViewModel: ObservableObject {
790 }
499 }
791 apiKeyInput = ""
500 apiKeyInput = ""
792 activeAPIKey = ""
501 activeAPIKey = ""
793− hyperConfigured = false
794 // refresh() with an empty key clears balance, error, history, and
502 // refresh() with an empty key clears balance, error, history, and
795 // cancels any in-flight task from the previous key.
503 // cancels any in-flight task from the previous key.
796 refresh()
504 refresh()
@@ -814,7 +522,6 @@ final class ViewModel: ObservableObject {
814 // Show the trimmed key that was actually stored.
522 // Show the trimmed key that was actually stored.
815 apiKeyInput = key
523 apiKeyInput = key
816 activeAPIKey = key
524 activeAPIKey = key
817− hyperConfigured = true
818 refresh()
525 refresh()
819 }
526 }
820
527
@@ -830,53 +537,6 @@ final class ViewModel: ObservableObject {
830 }
537 }
831 }
538 }
832
539
833− // MARK: - z.ai API Key
834−
835− /// Saves the current `zaiAPIKeyInput` to the Keychain and triggers a refresh.
836− /// Shows "✓ Saved" on success, or an error message if the keychain rejected the key.
837− func saveZaiAPIKey() {
838− let key = zaiAPIKeyInput.trimmingCharacters(in: .whitespacesAndNewlines)
839− if key.isEmpty {
840− let deleted = ZaiKeychainHelper.delete()
841− guard deleted else {
842− zaiError = "Could not delete z.ai API key from Keychain. It may be locked."
843− return
844− }
845− zaiAPIKeyInput = ""
846− activeZaiAPIKey = ""
847− // refresh() with an empty key clears zai usage and error, and
848− // cancels any in-flight task from the previous key.
849− refresh()
850− } else {
851− let saved = ZaiKeychainHelper.save(key)
852− guard saved else {
853− zaiError = "Could not save z.ai API key to Keychain. It may be locked."
854− return
855− }
856− // A different key is a different account, so everything derived from the
857− // old one has to go.
858− if key != activeZaiAPIKey {
859− zaiUsage = nil
860− zaiError = nil
861− zaiHistory.removeAll()
862− }
863− // Show the trimmed key that was actually stored.
864− zaiAPIKeyInput = key
865− activeZaiAPIKey = key
866− refresh()
867− }
868−
869− // Reuse the same "✓ Saved" confirmation — the user sees one per save action,
870− // regardless of which key it was for.
871− savedConfirmation = true
872− savedResetTask?.cancel()
873− savedResetTask = Task { @MainActor in
874− try? await Task.sleep(nanoseconds: 2_000_000_000)
875− guard !Task.isCancelled else { return }
876− savedConfirmation = false
877− }
878− }
879−
880 // MARK: - Launch at Login
540 // MARK: - Launch at Login
881
541
882 func updateLaunchAtLogin(_ enabled: Bool) {
542 func updateLaunchAtLogin(_ enabled: Bool) {
@@ -896,4 +556,4 @@ final class ViewModel: ObservableObject {
896 isInitializingLaunchAtLogin = false
556 isInitializingLaunchAtLogin = false
897 }
557 }
898 }
558 }
899−}
559+}
UsageMenubar/ZaiUsageClient.swiftdeleted−388
@@ -1,388 +0,0 @@
1−import Foundation
2−
3−// MARK: - Usage
4−
5−/// Usage data from z.ai's coding plan API — two endpoints that together give the
6−/// plan level, the 5-hour token quota, and the weekly token quota.
7−///
8−/// Every field in the report is optional. The quota endpoint may return fewer limits
9−/// than expected, and the subscription endpoint may return an empty list, so an
10−/// unrecognized shape degrades to "nothing to show" rather than failing the decode.
11−struct ZaiUsageReport: Equatable {
12− /// Percent of the 5-hour token window consumed, 0–100.
13− let fiveHourPercent: Int?
14− /// Percent of the weekly token window consumed, 0–100.
15− let weeklyPercent: Int?
16− /// When the 5-hour window resets, or `nil` when not provided.
17− let fiveHourResetsAt: Date?
18− /// When the weekly window resets, or `nil` when not provided.
19− let weeklyResetsAt: Date?
20− /// The plan tier from the quota response: `"lite"`, `"pro"`, `"max"`.
21− let planLevel: String?
22−
23− /// Whether there is anything at all to render. A report with all-nil fields reads
24− /// as a section header over nothing, which looks like a bug.
25− var isEmpty: Bool {
26− fiveHourPercent == nil && weeklyPercent == nil && planLevel == nil
27− }
28−}
29−
30−// MARK: - API Response Models
31−
32−/// Response from `GET https://api.z.ai/api/monitor/usage/quota/limit`.
33−struct ZaiQuotaResponse: Decodable, Equatable {
34− let code: Int
35− let msg: String?
36− let data: ZaiQuotaData?
37− let success: Bool
38−
39− private enum CodingKeys: String, CodingKey {
40− case code, msg, data, success
41− }
42−
43− init(from decoder: Decoder) throws {
44− let container = try decoder.container(keyedBy: CodingKeys.self)
45− code = try container.decodeIfPresent(Int.self, forKey: .code) ?? 0
46− msg = try container.decodeIfPresent(String.self, forKey: .msg)
47− data = try container.decodeIfPresent(ZaiQuotaData.self, forKey: .data)
48− success = try container.decodeIfPresent(Bool.self, forKey: .success) ?? false
49− }
50−}
51−
52−struct ZaiQuotaData: Decodable, Equatable {
53− let limits: [ZaiLimit]?
54− let level: String?
55−
56− private enum CodingKeys: String, CodingKey {
57− case limits, level
58− }
59−
60− init(from decoder: Decoder) throws {
61− let container = try decoder.container(keyedBy: CodingKeys.self)
62− limits = try container.decodeIfPresent([ZaiLimit].self, forKey: .limits)
63− level = try container.decodeIfPresent(String.self, forKey: .level)
64− }
65−}
66−
67−/// One limit entry from the quota response.
68−///
69−/// `unit` identifies the window: 3 = 5-hour, 6 = weekly, 5 = monthly tools.
70−/// `type` is `"TOKENS_LIMIT"` for token quotas or `"TIME_LIMIT"` for tool-call quotas.
71−struct ZaiLimit: Decodable, Equatable {
72− let type: String
73− let unit: Int
74− let percentage: Int
75− /// Epoch milliseconds, or `nil` when nothing has been used.
76− let nextResetTime: Int64?
77−
78− private enum CodingKeys: String, CodingKey {
79− case type, unit, percentage, nextResetTime
80− }
81−
82− init(from decoder: Decoder) throws {
83− let container = try decoder.container(keyedBy: CodingKeys.self)
84− type = try container.decodeIfPresent(String.self, forKey: .type) ?? ""
85− unit = try container.decodeIfPresent(Int.self, forKey: .unit) ?? 0
86− // Decoded as Double and rounded: the field is documented as an integer, but
87− // a fractional value would throw and take the whole payload down with it.
88− let rawPercent = try container.decodeIfPresent(Double.self, forKey: .percentage) ?? 0
89− percentage = Int(rawPercent.rounded())
90− nextResetTime = try container.decodeIfPresent(Int64.self, forKey: .nextResetTime)
91− }
92−
93− init(type: String, unit: Int, percentage: Int, nextResetTime: Int64? = nil) {
94− self.type = type
95− self.unit = unit
96− self.percentage = percentage
97− self.nextResetTime = nextResetTime
98− }
99−}
100−
101−/// Response from `GET https://api.z.ai/api/biz/subscription/list`.
102−struct ZaiSubscriptionResponse: Decodable, Equatable {
103− let code: Int
104− let data: [ZaiSubscription]?
105− let success: Bool
106−
107− private enum CodingKeys: String, CodingKey {
108− case code, data, success
109− }
110−
111− init(from decoder: Decoder) throws {
112− let container = try decoder.container(keyedBy: CodingKeys.self)
113− code = try container.decodeIfPresent(Int.self, forKey: .code) ?? 0
114− data = try container.decodeIfPresent([ZaiSubscription].self, forKey: .data)
115− success = try container.decodeIfPresent(Bool.self, forKey: .success) ?? false
116− }
117−}
118−
119−struct ZaiSubscription: Decodable, Equatable {
120− let productName: String?
121− let status: String?
122−
123− private enum CodingKeys: String, CodingKey {
124− case productName, status
125− }
126−
127− init(from decoder: Decoder) throws {
128− let container = try decoder.container(keyedBy: CodingKeys.self)
129− productName = try container.decodeIfPresent(String.self, forKey: .productName)
130− status = try container.decodeIfPresent(String.self, forKey: .status)
131− }
132−
133− init(productName: String? = nil, status: String? = nil) {
134− self.productName = productName
135− self.status = status
136− }
137−}
138−
139−// MARK: - Errors
140−
141−/// Errors that can occur while fetching z.ai usage.
142−enum ZaiUsageError: LocalizedError, Equatable {
143− /// No API key has been entered. Not an error the user needs to see — the popover
144− /// just leaves the section out, same as missing Claude credentials.
145− case noAPIKey
146−
147− /// The API key was rejected by z.ai.
148− case invalidAPIKey
149− case requestFailed(String)
150− case decodingFailed(String)
151−
152− var errorDescription: String? {
153− switch self {
154− case .noAPIKey:
155− return nil
156− case .invalidAPIKey:
157− return "z.ai API key is invalid. Check your key at z.ai/manage-apikey/coding-plan/personal/my-plan"
158− case .requestFailed(let message):
159− return "z.ai request failed: \(message)"
160− case .decodingFailed(let message):
161− return "Failed to decode z.ai usage: \(message)"
162− }
163− }
164−}
165−
166−// MARK: - Protocol
167−
168−/// Protocol abstraction for fetching z.ai usage, enabling test injection.
169−protocol ZaiUsageChecking {
170− func fetchUsage(apiKey: String) async throws -> ZaiUsageReport
171−}
172−
173−// MARK: - Client
174−
175−/// Client for z.ai's coding plan usage API, authenticating with an API key the user
176−/// enters in settings (stored in Keychain, separate from the Hyper key).
177−///
178−/// Fetches the quota/limit and subscription endpoints concurrently to get both usage
179−/// percentages and the plan tier in one round-trip. Retries transient failures with
180−/// exponential backoff, same pattern as `CreditsChecker` and `ClaudeUsageClient`.
181−actor ZaiUsageClient: ZaiUsageChecking {
182− static let baseURL = URL(string: "https://api.z.ai/api")!
183− static let quotaEndpoint = URL(string: "https://api.z.ai/api/monitor/usage/quota/limit")!
184− static let subscriptionEndpoint = URL(string: "https://api.z.ai/api/biz/subscription/list")!
185−
186− /// Retries *after* the initial attempt, so at most 3 requests per call.
187− static let maxRetries = 2
188−
189− /// URL error codes worth retrying: the request never reached a server that had an
190− /// opinion about it, so the same request may well succeed a moment later.
191− private static let retryableURLErrorCodes: Set<URLError.Code> = [
192− .timedOut,
193− .cannotConnectToHost,
194− .cannotFindHost,
195− .dnsLookupFailed,
196− .networkConnectionLost,
197− .notConnectedToInternet,
198− .resourceUnavailable,
199− .badServerResponse,
200− ]
201−
202− /// Client-error status codes that are nonetheless worth retrying: both are the
203− /// server telling us to come back later, not that the request itself is wrong.
204− private static let retryableStatusCodes: Set<Int> = [
205− 408, // Request Timeout
206− 429, // Too Many Requests
207− ]
208−
209− private let session: URLSession
210− private let retryBaseDelay: Duration
211−
212− /// - Parameters:
213− /// - retryBaseDelay: Delay before the first retry; doubles on each subsequent
214− /// one (2s, then 4s). Injectable so tests need not wait in real time.
215− init(
216− session: URLSession? = nil,
217− retryBaseDelay: Duration = .seconds(2)
218− ) {
219− self.retryBaseDelay = retryBaseDelay
220− if let session {
221− self.session = session
222− } else {
223− let config = URLSessionConfiguration.default
224− config.timeoutIntervalForRequest = 10
225− config.timeoutIntervalForResource = 15
226− self.session = URLSession(configuration: config)
227− }
228− }
229−
230− /// Fetches current usage with the given API key.
231− ///
232− /// The quota and subscription endpoints are fetched concurrently; neither waits on
233− /// the other. The subscription endpoint is best-effort — if it fails, the plan
234−/// level from the quota response (`data.level`) is used instead.
235− ///
236− /// - Throws: `ZaiUsageError`. `.noAPIKey` means no key was provided, which callers
237− /// should treat as "nothing to show" rather than as a failure.
238− func fetchUsage(apiKey: String) async throws -> ZaiUsageReport {
239− guard !apiKey.isEmpty else { throw ZaiUsageError.noAPIKey }
240−
241− async let quotaOutcome = fetchQuota(apiKey: apiKey)
242− async let subscriptionOutcome = fetchSubscription(apiKey: apiKey)
243−
244− let quota = try await quotaOutcome
245− let subscription = try? await subscriptionOutcome
246−
247− // Extract percentages from the limits array.
248− var fiveHourPercent: Int?
249− var weeklyPercent: Int?
250− var fiveHourResetsAt: Date?
251− var weeklyResetsAt: Date?
252−
253− for limit in quota?.limits ?? [] {
254− switch limit.unit {
255− case 3: // 5-hour window
256− fiveHourPercent = limit.percentage
257− fiveHourResetsAt = limit.nextResetTime.map { Date(timeIntervalSince1970: TimeInterval($0) / 1000) }
258− case 6: // weekly window
259− weeklyPercent = limit.percentage
260− weeklyResetsAt = limit.nextResetTime.map { Date(timeIntervalSince1970: TimeInterval($0) / 1000) }
261− default:
262− break
263− }
264− }
265−
266− // Plan level: prefer the product name from the subscription, fall back to the
267− // quota response's `level` field.
268− var planLevel: String? = quota?.level
269− if let sub = subscription?.data?.first(where: { $0.status == "VALID" }),
270− let name = sub.productName {
271− planLevel = name
272− }
273−
274− return ZaiUsageReport(
275− fiveHourPercent: fiveHourPercent,
276− weeklyPercent: weeklyPercent,
277− fiveHourResetsAt: fiveHourResetsAt,
278− weeklyResetsAt: weeklyResetsAt,
279− planLevel: planLevel
280− )
281− }
282−
283− // MARK: - Quota Request
284−
285− private func fetchQuota(apiKey: String) async throws -> ZaiQuotaData? {
286− var request = URLRequest(url: Self.quotaEndpoint, cachePolicy: .reloadIgnoringLocalCacheData)
287− request.httpMethod = "GET"
288− request.setValue("Bearer \(apiKey)", forHTTPHeaderField: "Authorization")
289− request.setValue("application/json", forHTTPHeaderField: "Accept")
290−
291− let data = try await send(request)
292−
293− do {
294− let response = try JSONDecoder().decode(ZaiQuotaResponse.self, from: data)
295− guard response.success else {
296− throw ZaiUsageError.requestFailed(response.msg ?? "Unknown error")
297− }
298− return response.data
299− } catch let error as ZaiUsageError {
300− throw error
301− } catch {
302− throw ZaiUsageError.decodingFailed(error.localizedDescription)
303− }
304− }
305−
306− // MARK: - Subscription Request
307−
308− private func fetchSubscription(apiKey: String) async throws -> ZaiSubscriptionResponse {
309− var request = URLRequest(url: Self.subscriptionEndpoint, cachePolicy: .reloadIgnoringLocalCacheData)
310− request.httpMethod = "GET"
311− request.setValue("Bearer \(apiKey)", forHTTPHeaderField: "Authorization")
312− request.setValue("application/json", forHTTPHeaderField: "Accept")
313−
314− let data = try await send(request)
315−
316− do {
317− return try JSONDecoder().decode(ZaiSubscriptionResponse.self, from: data)
318− } catch {
319− throw ZaiUsageError.decodingFailed(error.localizedDescription)
320− }
321− }
322−
323− // MARK: - Transport
324−
325− /// Sends a request, retrying transient failures with exponential backoff.
326− private func send(_ request: URLRequest) async throws -> Data {
327− var attempt = 0
328−
329− while true {
330− do {
331− return try await performAttempt(request)
332− } catch let failure as AttemptFailure {
333− guard failure.isRetryable, attempt < Self.maxRetries else {
334− throw failure.underlying
335− }
336− try await Task.sleep(for: retryBaseDelay * (1 << attempt))
337− attempt += 1
338− }
339− }
340− }
341−
342− /// Performs a single request, tagging the failure with whether a retry could
343− /// plausibly help.
344− private func performAttempt(_ request: URLRequest) async throws -> Data {
345− let data: Data
346− let response: URLResponse
347− do {
348− (data, response) = try await session.data(for: request)
349− } catch let urlError as URLError {
350− throw AttemptFailure(
351− underlying: .requestFailed(urlError.localizedDescription),
352− isRetryable: Self.retryableURLErrorCodes.contains(urlError.code)
353− )
354− } catch {
355− throw AttemptFailure(
356− underlying: .requestFailed(error.localizedDescription),
357− isRetryable: false
358− )
359− }
360−
361− guard let httpResponse = response as? HTTPURLResponse else {
362− throw AttemptFailure(underlying: .requestFailed("Invalid response type"), isRetryable: false)
363− }
364−
365− switch httpResponse.statusCode {
366− case 200...299:
367− return data
368− case 401:
369− throw AttemptFailure(underlying: .invalidAPIKey, isRetryable: false)
370− case 500...599:
371− throw AttemptFailure(
372− underlying: .requestFailed("HTTP \(httpResponse.statusCode)"),
373− isRetryable: true
374− )
375− default:
376− throw AttemptFailure(
377− underlying: .requestFailed("HTTP \(httpResponse.statusCode)"),
378− isRetryable: Self.retryableStatusCodes.contains(httpResponse.statusCode)
379− )
380− }
381− }
382−
383− /// A failed attempt, carrying the error to surface plus whether retrying is worthwhile.
384− private struct AttemptFailure: Error {
385− let underlying: ZaiUsageError
386− let isRetryable: Bool
387− }
388−}
UsageMenubarTests/ClaudeUsageClientTests.swift+272−77
@@ -2,8 +2,8 @@ import XCTest
2import Foundation
2import Foundation
3@testable import UsageMenubar
3@testable import UsageMenubar
4
4
5−/// The instant the countdown tests reckon from, so "3h 20m" is a fact rather than a race
5+/// The instant every test pretends it is. Injected into the client, so token expiry is
6−/// against the wall clock.
6+/// a decision the test makes rather than a race against the wall clock.
7private let fixedNow = Date(timeIntervalSince1970: 1_700_000_000)
7private let fixedNow = Date(timeIntervalSince1970: 1_700_000_000)
8
8
9final class ClaudeUsageClientTests: XCTestCase {
9final class ClaudeUsageClientTests: XCTestCase {
@@ -33,17 +33,22 @@ final class ClaudeUsageClientTests: XCTestCase {
33 return ClaudeUsageClient(
33 return ClaudeUsageClient(
34 session: URLSession(configuration: config),
34 session: URLSession(configuration: config),
35 store: store,
35 store: store,
36− retryBaseDelay: retryBaseDelay
36+ retryBaseDelay: retryBaseDelay,
37+ now: { fixedNow }
37 )
38 )
38 }
39 }
39
40
40 private func credentials(
41 private func credentials(
41 accessToken: String = "access-1",
42 accessToken: String = "access-1",
43+ refreshToken: String = "refresh-1",
44+ expiresAt: Date = fixedNow.addingTimeInterval(3600),
42 subscriptionType: String? = "max"
45 subscriptionType: String? = "max"
43 ) -> ClaudeOAuthCredentials {
46 ) -> ClaudeOAuthCredentials {
44 ClaudeOAuthCredentials(
47 ClaudeOAuthCredentials(
45 claudeAiOauth: .init(
48 claudeAiOauth: .init(
46 accessToken: accessToken,
49 accessToken: accessToken,
50+ refreshToken: refreshToken,
51+ expiresAt: Int64(expiresAt.timeIntervalSince1970 * 1000),
47 scopes: ["user:inference"],
52 scopes: ["user:inference"],
48 subscriptionType: subscriptionType,
53 subscriptionType: subscriptionType,
49 rateLimitTier: nil
54 rateLimitTier: nil
@@ -51,6 +56,11 @@ final class ClaudeUsageClientTests: XCTestCase {
51 )
56 )
52 }
57 }
53
58
59+ /// Credentials whose access token is already spent, so a fetch has to refresh first.
60+ private func expiredCredentials() -> ClaudeOAuthCredentials {
61+ credentials(expiresAt: fixedNow.addingTimeInterval(-1))
62+ }
63+
54 private func usageJSON(fiveHour: Int = 68, sevenDay: Int = 41) -> Data {
64 private func usageJSON(fiveHour: Int = 68, sevenDay: Int = 41) -> Data {
55 Data("""
65 Data("""
56 {
66 {
@@ -60,6 +70,21 @@ final class ClaudeUsageClientTests: XCTestCase {
60 """.utf8)
70 """.utf8)
61 }
71 }
62
72
73+ private func tokenJSON(
74+ accessToken: String = "access-2",
75+ refreshToken: String? = "refresh-2",
76+ expiresIn: Int? = 3600
77+ ) -> Data {
78+ var fields = [#""access_token": "\#(accessToken)""#]
79+ if let refreshToken { fields.append(#""refresh_token": "\#(refreshToken)""#) }
80+ if let expiresIn { fields.append(#""expires_in": \#(expiresIn)"#) }
81+ return Data("{\(fields.joined(separator: ", "))}".utf8)
82+ }
83+
84+ private func requests(to url: URL) -> [URLRequest] {
85+ StubURLProtocol.recordedRequests.filter { $0.url == url }
86+ }
87+
63 // MARK: - Usage decoding
88 // MARK: - Usage decoding
64
89
65 func testDecodesUsagePayload() throws {
90 func testDecodesUsagePayload() throws {
@@ -231,44 +256,193 @@ final class ClaudeUsageClientTests: XCTestCase {
231 XCTAssertEqual(StubURLProtocol.requestCount, 0)
256 XCTAssertEqual(StubURLProtocol.requestCount, 0)
232 }
257 }
233
258
234− func testTheStoredTokenIsSpentExactlyAsItIs() async throws {
259+ func testValidTokenIsUsedWithoutRefreshing() async throws {
235 let store = FakeClaudeCredentialStore(credentials: credentials())
260 let store = FakeClaudeCredentialStore(credentials: credentials())
236 StubURLProtocol.enqueue(.status(200, usageJSON()))
261 StubURLProtocol.enqueue(.status(200, usageJSON()))
237
262
238 _ = try await makeClient(store: store).fetchUsage()
263 _ = try await makeClient(store: store).fetchUsage()
239
264
240− // One request, to the usage endpoint. No token endpoint, no grant, no rotation:
241− // refreshing behind the CLI's back is what signed the user out to begin with.
242 XCTAssertEqual(StubURLProtocol.requestCount, 1)
265 XCTAssertEqual(StubURLProtocol.requestCount, 1)
243− XCTAssertEqual(StubURLProtocol.recordedRequests[0].url, ClaudeUsageClient.usageEndpoint)
266+ XCTAssertTrue(requests(to: ClaudeUsageClient.tokenEndpoint).isEmpty)
244− XCTAssertEqual(StubURLProtocol.recordedRequests[0].httpMethod, "GET")
267+ XCTAssertTrue(store.savedCredentials.isEmpty, "Nothing was rotated, so nothing to write back")
245 }
268 }
246
269
247− func testCredentialsAreReReadOnEveryFetch() async throws {
270+ // MARK: - Token refresh
248− // The CLI refreshes on its own schedule and we never do, so the only way to see
249− // a new token is to go back to the store each time. Caching one would strand the
250− // app on a token the CLI has long since replaced.
251− let store = FakeClaudeCredentialStore(credentials: credentials(accessToken: "access-1"))
252− StubURLProtocol.enqueue(.status(200, usageJSON()), .status(200, usageJSON()))
253
271
272+ func testExpiredTokenIsRefreshedBeforeTheUsageRequest() async throws {
273+ let store = FakeClaudeCredentialStore(credentials: expiredCredentials())
274+ StubURLProtocol.enqueue(
275+ .status(200, tokenJSON(accessToken: "access-2")),
276+ .status(200, usageJSON())
277+ )
278+
254− let client = makeClient(store: store)
279+ let report = try await makeClient(store: store).fetchUsage()
255− _ = try await client.fetchUsage()
280+
281+ XCTAssertEqual(report.usage.fiveHour?.utilization, 68)
282+ XCTAssertEqual(StubURLProtocol.requestCount, 2)
283+
284+ let recorded = StubURLProtocol.recordedRequests
285+ XCTAssertEqual(recorded[0].url, ClaudeUsageClient.tokenEndpoint)
286+ XCTAssertEqual(recorded[0].httpMethod, "POST")
287+ XCTAssertEqual(recorded[1].url, ClaudeUsageClient.usageEndpoint)
288+ XCTAssertEqual(
289+ recorded[1].value(forHTTPHeaderField: "Authorization"),
290+ "Bearer access-2",
291+ "The usage request has to carry the refreshed token, not the spent one"
292+ )
293+ }
294+
295+ func testRefreshRotatesAndPersistsTheCredentials() async throws {
296+ let store = FakeClaudeCredentialStore(credentials: expiredCredentials())
297+ StubURLProtocol.enqueue(
298+ .status(200, tokenJSON(accessToken: "access-2", refreshToken: "refresh-2", expiresIn: 3600)),
299+ .status(200, usageJSON())
300+ )
301+
302+ _ = try await makeClient(store: store).fetchUsage()
303+
304+ let saved = try XCTUnwrap(store.savedCredentials.last)
305+ let token = saved.credentials.claudeAiOauth
306+ XCTAssertEqual(token.accessToken, "access-2")
307+ XCTAssertEqual(
308+ token.refreshToken,
309+ "refresh-2",
310+ "The server rotated the refresh token; failing to store it would sign Claude Code out"
311+ )
312+ XCTAssertEqual(token.expiresAt, Int64((fixedNow.timeIntervalSince1970 + 3600) * 1000))
313+ XCTAssertEqual(saved.source, .keychain(account: "tester"), "Written back where it was read from")
314+ }
315+
316+ func testRefreshKeepsTheOldRefreshTokenWhenTheServerDoesNotRotateIt() async throws {
317+ let store = FakeClaudeCredentialStore(credentials: expiredCredentials())
318+ StubURLProtocol.enqueue(
319+ .status(200, tokenJSON(accessToken: "access-2", refreshToken: nil)),
320+ .status(200, usageJSON())
321+ )
322+
323+ _ = try await makeClient(store: store).fetchUsage()
324+
325+ let saved = try XCTUnwrap(store.savedCredentials.last)
326+ XCTAssertEqual(saved.credentials.claudeAiOauth.refreshToken, "refresh-1")
327+ }
328+
329+ func testRefreshWithoutExpiresInAssumesEightHours() async throws {
330+ let store = FakeClaudeCredentialStore(credentials: expiredCredentials())
331+ StubURLProtocol.enqueue(
332+ .status(200, tokenJSON(accessToken: "access-2", expiresIn: nil)),
333+ .status(200, usageJSON())
334+ )
335+
336+ _ = try await makeClient(store: store).fetchUsage()
337+
338+ let saved = try XCTUnwrap(store.savedCredentials.last)
339+ XCTAssertEqual(
340+ saved.credentials.claudeAiOauth.expiresAt,
341+ Int64((fixedNow.timeIntervalSince1970 + 8 * 3600) * 1000)
342+ )
343+ }
344+
345+ func testRefreshSendsTheGrant() async throws {
346+ let store = FakeClaudeCredentialStore(credentials: expiredCredentials())
347+ StubURLProtocol.enqueue(.status(200, tokenJSON()), .status(200, usageJSON()))
348+
349+ _ = try await makeClient(store: store).fetchUsage()
256
350
257− store.replace(with: credentials(accessToken: "access-2"))
351+ let body = try XCTUnwrap(StubURLProtocol.recordedBodies.first ?? nil)
258− _ = try await client.fetchUsage()
352+ let grant = try XCTUnwrap(try JSONSerialization.jsonObject(with: body) as? [String: String])
353+ XCTAssertEqual(grant["grant_type"], "refresh_token")
354+ XCTAssertEqual(grant["refresh_token"], "refresh-1")
355+ XCTAssertEqual(grant["client_id"], ClaudeUsageClient.clientID)
356+ XCTAssertEqual(grant["scope"], ClaudeUsageClient.scope)
357+ }
259
358
260− XCTAssertEqual(store.loadCount, 2)
359+ func testRefreshFallsBackToFormEncoding() async throws {
360+ let store = FakeClaudeCredentialStore(credentials: expiredCredentials())
361+ StubURLProtocol.enqueue(
362+ .status(400, Data()), // the JSON body is rejected
363+ .status(200, tokenJSON(accessToken: "access-2")),
364+ .status(200, usageJSON())
365+ )
366+
367+ _ = try await makeClient(store: store).fetchUsage()
368+
369+ XCTAssertEqual(StubURLProtocol.requestCount, 3)
261− let sent = StubURLProtocol.recordedRequests.map { $0.value(forHTTPHeaderField: "Authorization") }
370+ let contentTypes = StubURLProtocol.recordedRequests.prefix(2).map {
262− XCTAssertEqual(sent, ["Bearer access-1", "Bearer access-2"])
371+ $0.value(forHTTPHeaderField: "Content-Type")
372+ }
373+ XCTAssertEqual(contentTypes, ["application/json", "application/x-www-form-urlencoded"])
374+
375+ let form = try XCTUnwrap(StubURLProtocol.recordedBodies[1].flatMap { String(data: $0, encoding: .utf8) })
376+ XCTAssertTrue(form.contains("grant_type=refresh_token"), "Got: \(form)")
377+ XCTAssertTrue(form.contains("refresh_token=refresh-1"), "Got: \(form)")
378+ XCTAssertTrue(
379+ form.contains("user%3Ainference"),
380+ "The colons in the scope have to be percent-encoded, not sent raw. Got: \(form)"
381+ )
382+ }
383+
384+ func testRefreshFailureThrowsTokenRefreshFailed() async {
385+ let store = FakeClaudeCredentialStore(credentials: expiredCredentials())
386+ StubURLProtocol.enqueue(.status(400, Data())) // repeats, so both encodings fail
387+
388+ do {
389+ _ = try await makeClient(store: store).fetchUsage()
390+ XCTFail("Expected tokenRefreshFailed error")
391+ } catch ClaudeUsageError.tokenRefreshFailed {
392+ // expected
393+ } catch {
394+ XCTFail("Unexpected error: \(error)")
395+ }
396+
397+ // Both encodings tried, and no usage request made with a token we never got.
398+ XCTAssertEqual(StubURLProtocol.requestCount, 2)
399+ XCTAssertTrue(requests(to: ClaudeUsageClient.usageEndpoint).isEmpty)
400+ }
401+
402+ func testConcurrentFetchesShareASingleRefresh() async throws {
403+ // Two refreshes at once would each spend the refresh token, and whichever
404+ // finished second would be left holding one the server had already retired.
405+ let store = FakeClaudeCredentialStore(credentials: expiredCredentials())
406+ StubURLProtocol.enqueue(.status(200, tokenJSON()), .status(200, usageJSON()))
407+
408+ let client = makeClient(store: store)
409+ async let first = client.fetchUsage()
410+ async let second = client.fetchUsage()
411+ _ = try await (first, second)
412+
413+ XCTAssertEqual(requests(to: ClaudeUsageClient.tokenEndpoint).count, 1)
414+ XCTAssertEqual(requests(to: ClaudeUsageClient.usageEndpoint).count, 2)
415+ XCTAssertEqual(store.savedCredentials.count, 1)
263 }
416 }
264
417
265 // MARK: - Rejected tokens
418 // MARK: - Rejected tokens
266
419
267− func testRejectedTokenSurfacesInvalidCredentialsWithoutRefreshing() async {
420+ func testRejectedTokenIsRefreshedOnceThenRetried() async throws {
268− // A spent or revoked token is the user's to fix by running `claude`. The app
421+ // A token can be revoked server-side well before its stated expiry.
269− // attempting the refresh itself is the bug this whole client is shaped around.
270 let store = FakeClaudeCredentialStore(credentials: credentials())
422 let store = FakeClaudeCredentialStore(credentials: credentials())
271− StubURLProtocol.enqueue(.status(401, Data()))
423+ StubURLProtocol.enqueue(
424+ .status(401, Data()),
425+ .status(200, tokenJSON(accessToken: "access-2")),
426+ .status(200, usageJSON())
427+ )
428+
429+ let report = try await makeClient(store: store).fetchUsage()
430+
431+ XCTAssertEqual(report.usage.fiveHour?.utilization, 68)
432+ XCTAssertEqual(StubURLProtocol.requestCount, 3)
433+ XCTAssertEqual(
434+ StubURLProtocol.recordedRequests[2].value(forHTTPHeaderField: "Authorization"),
435+ "Bearer access-2"
436+ )
437+ }
438+
439+ func testRepeatedRejectionSurfacesInvalidCredentials() async {
440+ let store = FakeClaudeCredentialStore(credentials: credentials())
441+ StubURLProtocol.enqueue(
442+ .status(401, Data()),
443+ .status(200, tokenJSON(accessToken: "access-2")),
444+ .status(401, Data())
445+ )
272
446
273 do {
447 do {
274 _ = try await makeClient(store: store).fetchUsage()
448 _ = try await makeClient(store: store).fetchUsage()
@@ -279,16 +453,16 @@ final class ClaudeUsageClientTests: XCTestCase {
279 XCTFail("Unexpected error: \(error)")
453 XCTFail("Unexpected error: \(error)")
280 }
454 }
281
455
282− XCTAssertEqual(
456+ // One refresh, and no attempt at a second: it plainly isn't the token.
283− StubURLProtocol.requestCount,
457+ XCTAssertEqual(StubURLProtocol.requestCount, 3)
284− 1,
458+ XCTAssertEqual(requests(to: ClaudeUsageClient.tokenEndpoint).count, 1)
285− "A 401 must end the fetch — no refresh, and no retry of the request either"
286− )
287 }
459 }
288
460
289− func testForbiddenIsTreatedAsARejectedToken() async {
461+ func testFailedRefreshAfterRejectionSurfacesTheRejection() async {
462+ // "Couldn't refresh" says less than "the server rejected your token", and both
463+ // point at the same fix, so the rejection is the more useful of the two.
290 let store = FakeClaudeCredentialStore(credentials: credentials())
464 let store = FakeClaudeCredentialStore(credentials: credentials())
291− StubURLProtocol.enqueue(.status(403, Data()))
465+ StubURLProtocol.enqueue(.status(401, Data()), .status(403, Data()))
292
466
293 do {
467 do {
294 _ = try await makeClient(store: store).fetchUsage()
468 _ = try await makeClient(store: store).fetchUsage()
@@ -298,15 +472,20 @@ final class ClaudeUsageClientTests: XCTestCase {
298 } catch {
472 } catch {
299 XCTFail("Unexpected error: \(error)")
473 XCTFail("Unexpected error: \(error)")
300 }
474 }
301−
302− XCTAssertEqual(StubURLProtocol.requestCount, 1)
303 }
475 }
304
476
305− func testTheInvalidCredentialsMessagePointsAtTheCLI() {
477+ func testForbiddenIsTreatedAsARejectedToken() async {
306− // The app can't mint a token, so the only useful thing it can say is where one
478+ let store = FakeClaudeCredentialStore(credentials: credentials())
307− // comes from.
479+ StubURLProtocol.enqueue(.status(403, Data()))
480+
481+ do {
482+ _ = try await makeClient(store: store).fetchUsage()
483+ XCTFail("Expected invalidCredentials error")
308− let message = ClaudeUsageError.invalidCredentials.errorDescription
484+ } catch ClaudeUsageError.invalidCredentials {
309− XCTAssertEqual(message, "Claude sign-in expired. Run `claude` in a terminal to sign in again.")
485+ // expected
486+ } catch {
487+ XCTFail("Unexpected error: \(error)")
488+ }
310 }
489 }
311
490
312 // MARK: - Retries
491 // MARK: - Retries
@@ -427,8 +606,7 @@ final class ClaudeCodeCredentialStoreTests: XCTestCase {
427
606
428 private var directory: URL!
607 private var directory: URL!
429
608
430− /// A credentials blob as Claude Code actually writes it: the two token fields we no
609+ /// A credentials blob carrying two fields we deliberately don't model.
431− /// longer model, and two more we never did.
432 private let credentialsJSON = """
610 private let credentialsJSON = """
433 {
611 {
434 "claudeAiOauth": {
612 "claudeAiOauth": {
@@ -473,11 +651,12 @@ final class ClaudeCodeCredentialStoreTests: XCTestCase {
473 func testReadsCredentialsFromTheFileWhenTheKeychainHasNothing() throws {
651 func testReadsCredentialsFromTheFileWhenTheKeychainHasNothing() throws {
474 let file = try writeCredentialsFile()
652 let file = try writeCredentialsFile()
475
653
476− let credentials = try XCTUnwrap(makeStore(file: file).load())
654+ let stored = try XCTUnwrap(makeStore(file: file).load())
477
655
478− XCTAssertEqual(credentials.claudeAiOauth.accessToken, "access-1")
656+ XCTAssertEqual(stored.credentials.claudeAiOauth.accessToken, "access-1")
657+ XCTAssertEqual(stored.credentials.claudeAiOauth.refreshToken, "refresh-1")
479− XCTAssertEqual(credentials.claudeAiOauth.subscriptionType, "max")
658+ XCTAssertEqual(stored.credentials.claudeAiOauth.subscriptionType, "max")
480− XCTAssertEqual(credentials.claudeAiOauth.scopes, ["user:inference", "user:profile"])
659+ XCTAssertEqual(stored.source, .file(file))
481 }
660 }
482
661
483 func testReturnsNilWhenThereIsNeitherAKeychainItemNorAFile() {
662 func testReturnsNilWhenThereIsNeitherAKeychainItemNorAFile() {
@@ -493,65 +672,81 @@ final class ClaudeCodeCredentialStoreTests: XCTestCase {
493 XCTAssertNil(makeStore(file: file).load())
672 XCTAssertNil(makeStore(file: file).load())
494 }
673 }
495
674
496− func testABlobWithoutTheFieldsWeDroppedStillLoads() throws {
675+ func testWriteBackRotatesTheTokensAndKeepsEverythingElse() throws {
497− // `refreshToken` and `expiresAt` are no longer modelled, so their absence must
676+ let file = try writeCredentialsFile()
498− // not fail the decode — nor must their presence, above.
677+ let store = makeStore(file: file)
499− let file = directory.appendingPathComponent(".credentials.json")
500− try Data(#"{"claudeAiOauth": {"accessToken": "access-1"}}"#.utf8).write(to: file)
501
678
502− let credentials = try XCTUnwrap(makeStore(file: file).load())
679+ var stored = try XCTUnwrap(store.load())
680+ stored.credentials.claudeAiOauth.accessToken = "access-2"
681+ stored.credentials.claudeAiOauth.refreshToken = "refresh-2"
682+ stored.credentials.claudeAiOauth.expiresAt = 4_100_000_000_000
683+ store.save(stored)
503
684
504− XCTAssertEqual(credentials.claudeAiOauth.accessToken, "access-1")
685+ let written = try XCTUnwrap(
505− XCTAssertNil(credentials.claudeAiOauth.subscriptionType)
686+ try JSONSerialization.jsonObject(with: Data(contentsOf: file)) as? [String: Any]
687+ )
688+ let oauth = try XCTUnwrap(written["claudeAiOauth"] as? [String: Any])
689+
690+ XCTAssertEqual(oauth["accessToken"] as? String, "access-2")
691+ XCTAssertEqual(oauth["refreshToken"] as? String, "refresh-2")
692+ XCTAssertEqual((oauth["expiresAt"] as? NSNumber)?.int64Value, 4_100_000_000_000)
693+
694+ // This is the file the user's CLI signs in with. Round-tripping it through our
695+ // own type would drop the fields we don't model, so the write patches the raw
696+ // JSON instead — and these two have to survive it.
697+ XCTAssertEqual(oauth["somethingWeDoNotModel"] as? String, "keep me")
698+ XCTAssertEqual(written["anotherTopLevelKey"] as? String, "keep me too")
699+ XCTAssertEqual(oauth["subscriptionType"] as? String, "max")
506 }
700 }
507
701
508− func testLoadingLeavesTheCredentialsFileByteForByteUntouched() throws {
702+ func testWriteBackLeavesTheFileReadableOnlyByItsOwner() throws {
509− // The regression guard for the bug this store was built around: the app used to
510− // write a rotated token back here, racing the CLI's own refresh and signing the
511− // user out of their terminal. It must now be a reader and nothing else.
512 let file = try writeCredentialsFile()
703 let file = try writeCredentialsFile()
513− let before = try Data(contentsOf: file)
704+ let store = makeStore(file: file)
514
705
515− _ = makeStore(file: file).load()
706+ let stored = try XCTUnwrap(store.load())
707+ store.save(stored)
516
708
517− XCTAssertEqual(try Data(contentsOf: file), before)
709+ let attributes = try FileManager.default.attributesOfItem(atPath: file.path)
710+ XCTAssertEqual(
711+ (attributes[.posixPermissions] as? NSNumber)?.int16Value,
712+ 0o600,
713+ "An atomic write replaces the file, so the mode has to be reapplied"
714+ )
518 }
715 }
519}
716}
520
717
521// MARK: - Fake credential store
718// MARK: - Fake credential store
522
719
523/// An in-memory `ClaudeCredentialStoring`. Never goes near the Keychain or the disk.
720/// An in-memory `ClaudeCredentialStoring`. Never goes near the Keychain or the disk.
524−///
525−/// It cannot write, because the protocol no longer can: the CLI is the only thing that
526−/// may rotate these tokens. `replace(with:)` is the test standing in for the CLI having
527−/// done exactly that behind the app's back.
528final class FakeClaudeCredentialStore: ClaudeCredentialStoring {
721final class FakeClaudeCredentialStore: ClaudeCredentialStoring {
529 private let lock = NSLock()
722 private let lock = NSLock()
530− private var current: ClaudeOAuthCredentials?
723+ private var current: StoredClaudeCredentials?
531− private var loads = 0
724+ private var writes: [StoredClaudeCredentials] = []
532
725
726+ init(
533− init(credentials: ClaudeOAuthCredentials?) {
727+ credentials: ClaudeOAuthCredentials?,
728+ source: ClaudeCredentialSource = .keychain(account: "tester")
729+ ) {
534− current = credentials
730+ current = credentials.map { StoredClaudeCredentials(credentials: $0, source: source) }
535 }
731 }
536
732
537− /// How many times the client has gone back to the store — it should be once per fetch.
733+ /// Every write-back the client has made, oldest first.
538− var loadCount: Int {
734+ var savedCredentials: [StoredClaudeCredentials] {
539 lock.lock()
735 lock.lock()
540 defer { lock.unlock() }
736 defer { lock.unlock() }
541− return loads
737+ return writes
542 }
738 }
543
739
544− /// Stands in for the CLI refreshing its own token between two fetches.
740+ func load() -> StoredClaudeCredentials? {
545− func replace(with credentials: ClaudeOAuthCredentials?) {
546 lock.lock()
741 lock.lock()
547 defer { lock.unlock() }
742 defer { lock.unlock() }
548− current = credentials
743+ return current
549 }
744 }
550
745
551− func load() -> ClaudeOAuthCredentials? {
746+ func save(_ stored: StoredClaudeCredentials) {
552 lock.lock()
747 lock.lock()
553 defer { lock.unlock() }
748 defer { lock.unlock() }
554− loads += 1
749+ current = stored
555− return current
750+ writes.append(stored)
556 }
751 }
557}
752}
UsageMenubarTests/CreditsCheckerTests.swift−19
@@ -519,22 +519,10 @@ final class StubURLProtocol: URLProtocol {
519 Self.outcomes.append(contentsOf: outcomes)
519 Self.outcomes.append(contentsOf: outcomes)
520 }
520 }
521
521
522− /// Queues an outcome for a specific URL path. URL-matched outcomes are consumed
523− /// before the FIFO queue, so concurrent requests to different endpoints each get
524− /// the right response regardless of arrival order.
525− static func enqueue(_ outcome: Outcome, forURLPath path: String) {
526− lock.lock()
527− defer { lock.unlock() }
528− urlMatchedOutcomes[path] = outcome
529− }
530−
531− private static var urlMatchedOutcomes: [String: Outcome] = [:]
532−
533 static func reset() {
522 static func reset() {
534 lock.lock()
523 lock.lock()
535 defer { lock.unlock() }
524 defer { lock.unlock() }
536 outcomes = []
525 outcomes = []
537− urlMatchedOutcomes = [:]
538 lastOutcome = nil
526 lastOutcome = nil
539 requests = []
527 requests = []
540 bodies = []
528 bodies = []
@@ -560,19 +548,12 @@ final class StubURLProtocol: URLProtocol {
560 }
548 }
561
549
562 /// Records the request and pops the outcome that should answer it.
550 /// Records the request and pops the outcome that should answer it.
563− /// URL-matched outcomes take priority over the FIFO queue, so concurrent
564− /// requests to different endpoints each get the right response.
565 private static func nextOutcome(for request: URLRequest) -> Outcome {
551 private static func nextOutcome(for request: URLRequest) -> Outcome {
566 lock.lock()
552 lock.lock()
567 defer { lock.unlock() }
553 defer { lock.unlock() }
568 requests.append(request)
554 requests.append(request)
569 bodies.append(drainBody(from: request))
555 bodies.append(drainBody(from: request))
570
556
571− if let path = request.url?.path,
572− let matched = urlMatchedOutcomes[path] {
573− return matched
574− }
575−
576 if !outcomes.isEmpty {
557 if !outcomes.isEmpty {
577 lastOutcome = outcomes.removeFirst()
558 lastOutcome = outcomes.removeFirst()
578 }
559 }
UsageMenubarTests/StatusBarTextTests.swift+24−244
@@ -13,21 +13,15 @@ final class StatusBarTextTests: XCTestCase {
13 func testBothServices() {
13 func testBothServices() {
14 let title = ViewModel.statusBarText(
14 let title = ViewModel.statusBarText(
15 balance: 42, isLoading: false,
15 balance: 42, isLoading: false,
16− hyperConfigured: true,
17− claudeFiveHourPercent: 62, claudeSevenDayPercent: 8,
16+ claudeFiveHourPercent: 62, claudeSevenDayPercent: 8
18− zaiFiveHourPercent: nil, zaiWeeklyPercent: nil,
19− zaiInPeakHours: false
20 )
17 )
21− XCTAssertEqual(title, "⚡42 · \u{2055}62% 8%")
18+ XCTAssertEqual(title, "⚡42 · 🕐62% · 📅8%")
22 }
19 }
23
20
24 func testHyperOnly() {
21 func testHyperOnly() {
25 let title = ViewModel.statusBarText(
22 let title = ViewModel.statusBarText(
26 balance: 42, isLoading: false,
23 balance: 42, isLoading: false,
27− hyperConfigured: true,
28− claudeFiveHourPercent: nil, claudeSevenDayPercent: nil,
24+ claudeFiveHourPercent: nil, claudeSevenDayPercent: nil
29− zaiFiveHourPercent: nil, zaiWeeklyPercent: nil,
30− zaiInPeakHours: false
31 )
25 )
32 XCTAssertEqual(title, "⚡42")
26 XCTAssertEqual(title, "⚡42")
33 }
27 }
@@ -35,290 +29,76 @@ final class StatusBarTextTests: XCTestCase {
35 func testClaudeOnly() {
29 func testClaudeOnly() {
36 let title = ViewModel.statusBarText(
30 let title = ViewModel.statusBarText(
37 balance: nil, isLoading: false,
31 balance: nil, isLoading: false,
38− hyperConfigured: false,
39− claudeFiveHourPercent: 62, claudeSevenDayPercent: 8,
32+ claudeFiveHourPercent: 62, claudeSevenDayPercent: 8
40− zaiFiveHourPercent: nil, zaiWeeklyPercent: nil,
41− zaiInPeakHours: false
42 )
33 )
43− XCTAssertEqual(title, "\u{2055}62% 8%")
34+ XCTAssertEqual(title, "🕐62% · 📅8%")
44 }
35 }
45
36
46 func testLoadingWithNothingToShow() {
37 func testLoadingWithNothingToShow() {
47 let title = ViewModel.statusBarText(
38 let title = ViewModel.statusBarText(
48 balance: nil, isLoading: true,
39 balance: nil, isLoading: true,
49− hyperConfigured: false,
50− claudeFiveHourPercent: nil, claudeSevenDayPercent: nil,
40+ claudeFiveHourPercent: nil, claudeSevenDayPercent: nil
51− zaiFiveHourPercent: nil, zaiWeeklyPercent: nil,
52− zaiInPeakHours: false
53 )
41 )
54− XCTAssertEqual(title, "…")
42+ XCTAssertEqual(title, "⚡…")
55 }
43 }
56
44
57 func testNothingToShow() {
45 func testNothingToShow() {
58 let title = ViewModel.statusBarText(
46 let title = ViewModel.statusBarText(
59 balance: nil, isLoading: false,
47 balance: nil, isLoading: false,
60− hyperConfigured: false,
61− claudeFiveHourPercent: nil, claudeSevenDayPercent: nil,
48+ claudeFiveHourPercent: nil, claudeSevenDayPercent: nil
62− zaiFiveHourPercent: nil, zaiWeeklyPercent: nil,
63− zaiInPeakHours: false
64 )
49 )
65− XCTAssertEqual(title, "")
50+ XCTAssertEqual(title, "⚡?")
66 }
51 }
67
52
68 /// The placeholders only stand in for an *empty* title. Someone who runs Claude Code
53 /// The placeholders only stand in for an *empty* title. Someone who runs Claude Code
69− /// without a Hyper key refreshes every few minutes, and a title that fell back to `…`
54+ /// without a Hyper key refreshes every few minutes, and a title that fell back to `⚡…`
70 /// each time would blink their percentage away and back.
55 /// each time would blink their percentage away and back.
71 func testLoadingKeepsAClaudePercentOnScreen() {
56 func testLoadingKeepsAClaudePercentOnScreen() {
72 let title = ViewModel.statusBarText(
57 let title = ViewModel.statusBarText(
73 balance: nil, isLoading: true,
58 balance: nil, isLoading: true,
74− hyperConfigured: false,
75− claudeFiveHourPercent: 62, claudeSevenDayPercent: nil,
59+ claudeFiveHourPercent: 62, claudeSevenDayPercent: nil
76− zaiFiveHourPercent: nil, zaiWeeklyPercent: nil,
77− zaiInPeakHours: false
78 )
60 )
79− XCTAssertEqual(title, "\u{2055}62%")
61+ XCTAssertEqual(title, "🕐62%")
80 }
62 }
81
63
82 func testLoadingKeepsAStaleBalanceOnScreen() {
64 func testLoadingKeepsAStaleBalanceOnScreen() {
83 let title = ViewModel.statusBarText(
65 let title = ViewModel.statusBarText(
84 balance: 42, isLoading: true,
66 balance: 42, isLoading: true,
85− hyperConfigured: true,
86− claudeFiveHourPercent: 62, claudeSevenDayPercent: 8,
67+ claudeFiveHourPercent: 62, claudeSevenDayPercent: 8
87− zaiFiveHourPercent: nil, zaiWeeklyPercent: nil,
88− zaiInPeakHours: false
89 )
68 )
90− XCTAssertEqual(title, "⚡42 · \u{2055}62% 8%")
69+ XCTAssertEqual(title, "⚡42 · 🕐62% · 📅8%")
91 }
70 }
92
71
93− func testZeroPercentIsShown() {
72+ func testZeroPercentIsShownRatherThanOmitted() {
94 let title = ViewModel.statusBarText(
73 let title = ViewModel.statusBarText(
95 balance: 42, isLoading: false,
74 balance: 42, isLoading: false,
96− hyperConfigured: true,
97− claudeFiveHourPercent: 0, claudeSevenDayPercent: 8,
75+ claudeFiveHourPercent: 0, claudeSevenDayPercent: 8
98− zaiFiveHourPercent: nil, zaiWeeklyPercent: nil,
99− zaiInPeakHours: false
100 )
76 )
101− XCTAssertEqual(title, "⚡42 · \u{2055}0% 8%")
77+ XCTAssertEqual(title, "⚡42 · 📅8%")
102 }
78 }
103
79
104 func testBothClaudeWindowsZero() {
80 func testBothClaudeWindowsZero() {
105 let title = ViewModel.statusBarText(
81 let title = ViewModel.statusBarText(
106 balance: 42, isLoading: false,
82 balance: 42, isLoading: false,
107− hyperConfigured: true,
108− claudeFiveHourPercent: 0, claudeSevenDayPercent: 0,
83+ claudeFiveHourPercent: 0, claudeSevenDayPercent: 0
109− zaiFiveHourPercent: nil, zaiWeeklyPercent: nil,
110− zaiInPeakHours: false
111 )
84 )
112− XCTAssertEqual(title, "⚡42 · \u{2055}0% 0%")
85+ XCTAssertEqual(title, "⚡42")
113 }
86 }
114
87
115 func testFiveHourOnly() {
88 func testFiveHourOnly() {
116 let title = ViewModel.statusBarText(
89 let title = ViewModel.statusBarText(
117 balance: nil, isLoading: false,
90 balance: nil, isLoading: false,
118− hyperConfigured: false,
119− claudeFiveHourPercent: 62, claudeSevenDayPercent: nil,
91+ claudeFiveHourPercent: 62, claudeSevenDayPercent: nil
120− zaiFiveHourPercent: nil, zaiWeeklyPercent: nil,
121− zaiInPeakHours: false
122 )
92 )
123− XCTAssertEqual(title, "\u{2055}62%")
93+ XCTAssertEqual(title, "🕐62%")
124 }
94 }
125
95
126 func testSevenDayOnly() {
96 func testSevenDayOnly() {
127 let title = ViewModel.statusBarText(
97 let title = ViewModel.statusBarText(
128 balance: nil, isLoading: false,
98 balance: nil, isLoading: false,
129− hyperConfigured: false,
130− claudeFiveHourPercent: nil, claudeSevenDayPercent: 8,
99+ claudeFiveHourPercent: nil, claudeSevenDayPercent: 8
131− zaiFiveHourPercent: nil, zaiWeeklyPercent: nil,
132− zaiInPeakHours: false
133− )
134− XCTAssertEqual(title, "\u{2055}8%")
135− }
136−
137− // MARK: - Hyper not configured
138−
139− func testHyperNotConfiguredHidesBoltEvenWithBalance() {
140− // balance is non-nil but Hyper is not configured — should not appear.
141− // This can happen briefly during the transition when a key is deleted.
142− let title = ViewModel.statusBarText(
143− balance: 42, isLoading: false,
144− hyperConfigured: false,
145− claudeFiveHourPercent: nil, claudeSevenDayPercent: nil,
146− zaiFiveHourPercent: nil, zaiWeeklyPercent: nil,
147− zaiInPeakHours: false
148− )
149− XCTAssertEqual(title, "")
150− }
151−
152− func testHyperNotConfiguredLoadingShowsJustDots() {
153− let title = ViewModel.statusBarText(
154− balance: nil, isLoading: true,
155− hyperConfigured: false,
156− claudeFiveHourPercent: nil, claudeSevenDayPercent: nil,
157− zaiFiveHourPercent: nil, zaiWeeklyPercent: nil,
158− zaiInPeakHours: false
159− )
160− XCTAssertEqual(title, "…")
161− }
162−
163− func testHyperNotConfiguredButClaudeStillShows() {
164− let title = ViewModel.statusBarText(
165− balance: nil, isLoading: false,
166− hyperConfigured: false,
167− claudeFiveHourPercent: 62, claudeSevenDayPercent: 8,
168− zaiFiveHourPercent: nil, zaiWeeklyPercent: nil,
169− zaiInPeakHours: false
170− )
171− XCTAssertEqual(title, "\u{2055}62% 8%")
172− }
173−
174− // MARK: - z.ai in Title
175−
176− func testZaiOnly() {
177− let title = ViewModel.statusBarText(
178− balance: nil, isLoading: false,
179− hyperConfigured: false,
180− claudeFiveHourPercent: nil, claudeSevenDayPercent: nil,
181− zaiFiveHourPercent: 12, zaiWeeklyPercent: nil,
182− zaiInPeakHours: false
183− )
184− XCTAssertEqual(title, "\u{005A}12%")
185− }
186−
187− func testZaiWithHyper() {
188− let title = ViewModel.statusBarText(
189− balance: 42, isLoading: false,
190− hyperConfigured: true,
191− claudeFiveHourPercent: nil, claudeSevenDayPercent: nil,
192− zaiFiveHourPercent: 12, zaiWeeklyPercent: nil,
193− zaiInPeakHours: false
194− )
195− XCTAssertEqual(title, "⚡42 · \u{005A}12%")
196− }
197−
198− func testZaiWithClaude() {
199− let title = ViewModel.statusBarText(
200− balance: nil, isLoading: false,
201− hyperConfigured: false,
202− claudeFiveHourPercent: 62, claudeSevenDayPercent: 8,
203− zaiFiveHourPercent: 12, zaiWeeklyPercent: nil,
204− zaiInPeakHours: false
205− )
206− XCTAssertEqual(title, "\u{2055}62% 8% · \u{005A}12%")
207− }
208−
209− func testAllThreeServices() {
210− let title = ViewModel.statusBarText(
211− balance: 42, isLoading: false,
212− hyperConfigured: true,
213− claudeFiveHourPercent: 62, claudeSevenDayPercent: 8,
214− zaiFiveHourPercent: 12, zaiWeeklyPercent: 3,
215− zaiInPeakHours: false
216− )
217− XCTAssertEqual(title, "⚡42 · \u{2055}62% 8% · \u{005A}12% 3%")
218− }
219−
220− func testZaiZeroIsShown() {
221− let title = ViewModel.statusBarText(
222− balance: 42, isLoading: false,
223− hyperConfigured: true,
224− claudeFiveHourPercent: nil, claudeSevenDayPercent: nil,
225− zaiFiveHourPercent: 0, zaiWeeklyPercent: 0,
226− zaiInPeakHours: false
227− )
228− XCTAssertEqual(title, "⚡42 · \u{005A}0% 0%")
229− }
230−
231− func testLoadingKeepsZaiPercentOnScreen() {
232− let title = ViewModel.statusBarText(
233− balance: nil, isLoading: true,
234− hyperConfigured: false,
235− claudeFiveHourPercent: nil, claudeSevenDayPercent: nil,
236− zaiFiveHourPercent: 12, zaiWeeklyPercent: nil,
237− zaiInPeakHours: false
238− )
239− XCTAssertEqual(title, "\u{005A}12%")
240− }
241−
242− // MARK: - z.ai Weekly
243−
244− func testZaiWeeklyOnly() {
245− let title = ViewModel.statusBarText(
246− balance: nil, isLoading: false,
247− hyperConfigured: false,
248− claudeFiveHourPercent: nil, claudeSevenDayPercent: nil,
249− zaiFiveHourPercent: nil, zaiWeeklyPercent: 3,
250− zaiInPeakHours: false
251− )
252− XCTAssertEqual(title, "\u{005A}3%")
253− }
254−
255− func testZaiWeeklyWithFiveHour() {
256− let title = ViewModel.statusBarText(
257− balance: nil, isLoading: false,
258− hyperConfigured: false,
259− claudeFiveHourPercent: nil, claudeSevenDayPercent: nil,
260− zaiFiveHourPercent: 12, zaiWeeklyPercent: 3,
261− zaiInPeakHours: false
262− )
263− XCTAssertEqual(title, "\u{005A}12% 3%")
264− }
265−
266− func testZaiWeeklyZeroIsShown() {
267− let title = ViewModel.statusBarText(
268− balance: nil, isLoading: false,
269− hyperConfigured: false,
270− claudeFiveHourPercent: nil, claudeSevenDayPercent: nil,
271− zaiFiveHourPercent: 12, zaiWeeklyPercent: 0,
272− zaiInPeakHours: false
273− )
274− XCTAssertEqual(title, "\u{005A}12% 0%")
275− }
276−
277− func testLoadingKeepsZaiWeeklyOnScreen() {
278− let title = ViewModel.statusBarText(
279− balance: nil, isLoading: true,
280− hyperConfigured: false,
281− claudeFiveHourPercent: nil, claudeSevenDayPercent: nil,
282− zaiFiveHourPercent: nil, zaiWeeklyPercent: 3,
283− zaiInPeakHours: false
284− )
285− XCTAssertEqual(title, "\u{005A}3%")
286− }
287−
288− // MARK: - z.ai Peak Hours
289−
290− func testPeakHoursAddsDiamondToZaiSegment() {
291− let title = ViewModel.statusBarText(
292− balance: 42, isLoading: false,
293− hyperConfigured: true,
294− claudeFiveHourPercent: 62, claudeSevenDayPercent: 8,
295− zaiFiveHourPercent: 12, zaiWeeklyPercent: 3,
296− zaiInPeakHours: true
297− )
298− XCTAssertEqual(title, "⚡42 · \u{2055}62% 8% · \u{005A}12% 3%\u{1F536}")
299− }
300−
301− func testPeakHoursWithZaiOnly() {
302− let title = ViewModel.statusBarText(
303− balance: nil, isLoading: false,
304− hyperConfigured: false,
305− claudeFiveHourPercent: nil, claudeSevenDayPercent: nil,
306− zaiFiveHourPercent: 12, zaiWeeklyPercent: nil,
307− zaiInPeakHours: true
308− )
309− XCTAssertEqual(title, "\u{005A}12%\u{1F536}")
310− }
311−
312− func testPeakHoursIgnoredWhenZaiNotConfigured() {
313− let title = ViewModel.statusBarText(
314− balance: 42, isLoading: false,
315− hyperConfigured: true,
316− claudeFiveHourPercent: 62, claudeSevenDayPercent: 8,
317− zaiFiveHourPercent: nil, zaiWeeklyPercent: nil,
318− zaiInPeakHours: true
319 )
100 )
320− // No z.ai segment, so peak marker has nothing to attach to.
321− XCTAssertEqual(title, "⚡42 · \u{2055}62% 8%")
101+ XCTAssertEqual(title, "📅8%")
322 }
102 }
323
103
324 // MARK: - Claude Window Percentages
104 // MARK: - Claude Window Percentages
@@ -375,4 +155,4 @@ final class StatusBarTextTests: XCTestCase {
375 XCTAssertNil(vm.claudeFiveHourPercent)
155 XCTAssertNil(vm.claudeFiveHourPercent)
376 XCTAssertNil(vm.claudeSevenDayPercent)
156 XCTAssertNil(vm.claudeSevenDayPercent)
377 }
157 }
378−}
158+}
UsageMenubarTests/ZaiUsageClientTests.swiftdeleted−237
@@ -1,237 +0,0 @@
1−import XCTest
2−@testable import UsageMenubar
3−
4−@MainActor
5−final class ZaiUsageClientTests: XCTestCase {
6−
7− override func setUp() {
8− super.setUp()
9− StubURLProtocol.reset()
10− }
11−
12− override func tearDown() {
13− StubURLProtocol.reset()
14− super.tearDown()
15− }
16−
17− /// A client whose requests are served by `StubURLProtocol`, with a backoff short
18− /// enough that the retry tests run in milliseconds rather than seconds.
19− private func makeStubbedClient(retryBaseDelay: Duration = .milliseconds(1)) -> ZaiUsageClient {
20− let config = URLSessionConfiguration.ephemeral
21− config.protocolClasses = [StubURLProtocol.self]
22− return ZaiUsageClient(session: URLSession(configuration: config), retryBaseDelay: retryBaseDelay)
23− }
24−
25− /// Enqueues quota and subscription responses matched to their URL paths, so the
26− /// order of arrival doesn't matter — each endpoint gets its own response.
27− private func enqueueQuotaAndSubscription(
28− quotaStatus: Int = 200,
29− quotaJSON: Data,
30− subscriptionStatus: Int = 200,
31− subscriptionJSON: Data
32− ) {
33− StubURLProtocol.enqueue(.status(quotaStatus, quotaJSON), forURLPath: "/api/monitor/usage/quota/limit")
34− StubURLProtocol.enqueue(.status(subscriptionStatus, subscriptionJSON), forURLPath: "/api/biz/subscription/list")
35− }
36−
37− // MARK: - Decoding
38−
39− func testDecodeQuotaResponse() throws {
40− let json = """
41− {"code":200,"msg":"Operation successful","success":true,"data":{"limits":[
42− {"type":"TOKENS_LIMIT","unit":3,"percentage":12,"nextResetTime":1784278018952},
43− {"type":"TOKENS_LIMIT","unit":6,"percentage":3,"nextResetTime":1784286332993}
44− ],"level":"max"}}
45− """.data(using: .utf8)!
46− let response = try JSONDecoder().decode(ZaiQuotaResponse.self, from: json)
47− XCTAssertTrue(response.success)
48− XCTAssertEqual(response.code, 200)
49− XCTAssertEqual(response.data?.level, "max")
50− XCTAssertEqual(response.data?.limits?.count, 2)
51− XCTAssertEqual(response.data?.limits?.first?.percentage, 12)
52− XCTAssertEqual(response.data?.limits?.first?.unit, 3)
53− }
54−
55− func testDecodeQuotaResponseWithFractionalPercentage() throws {
56− let json = """
57− {"code":200,"success":true,"data":{"limits":[
58− {"type":"TOKENS_LIMIT","unit":3,"percentage":12.6,"nextResetTime":1784278018952}
59− ],"level":"pro"}}
60− """.data(using: .utf8)!
61− let response = try JSONDecoder().decode(ZaiQuotaResponse.self, from: json)
62− XCTAssertEqual(response.data?.limits?.first?.percentage, 13)
63− }
64−
65− func testDecodeQuotaResponseWithMissingFields() throws {
66− let json = """
67− {"code":200,"success":true,"data":{"limits":[],"level":null}}
68− """.data(using: .utf8)!
69− let response = try JSONDecoder().decode(ZaiQuotaResponse.self, from: json)
70− XCTAssertEqual(response.data?.limits?.count, 0)
71− XCTAssertNil(response.data?.level)
72− }
73−
74− func testDecodeSubscriptionResponse() throws {
75− let json = """
76− {"code":200,"data":[{"productName":"GLM Coding Max","status":"VALID"}],"success":true}
77− """.data(using: .utf8)!
78− let response = try JSONDecoder().decode(ZaiSubscriptionResponse.self, from: json)
79− XCTAssertEqual(response.data?.first?.productName, "GLM Coding Max")
80− XCTAssertEqual(response.data?.first?.status, "VALID")
81− }
82−
83− func testDecodeEmptySubscriptionResponse() throws {
84− let json = """
85− {"code":200,"data":[],"success":true}
86− """.data(using: .utf8)!
87− let response = try JSONDecoder().decode(ZaiSubscriptionResponse.self, from: json)
88− XCTAssertEqual(response.data?.count, 0)
89− }
90−
91− // MARK: - Fetch
92−
93− func testFetchUsageSuccess() async throws {
94− let quotaJSON = """
95− {"code":200,"msg":"Operation successful","success":true,"data":{"limits":[
96− {"type":"TOKENS_LIMIT","unit":3,"percentage":12,"nextResetTime":1784278018952},
97− {"type":"TOKENS_LIMIT","unit":6,"percentage":3,"nextResetTime":1784286332993}
98− ],"level":"max"}}
99− """.data(using: .utf8)!
100− let subscriptionJSON = """
101− {"code":200,"data":[{"productName":"GLM Coding Max","status":"VALID"}],"success":true}
102− """.data(using: .utf8)!
103−
104− enqueueQuotaAndSubscription(quotaJSON: quotaJSON, subscriptionJSON: subscriptionJSON)
105−
106− let client = makeStubbedClient()
107− let report = try await client.fetchUsage(apiKey: "test-key")
108−
109− XCTAssertEqual(report.fiveHourPercent, 12)
110− XCTAssertEqual(report.weeklyPercent, 3)
111− XCTAssertNotNil(report.fiveHourResetsAt)
112− XCTAssertNotNil(report.weeklyResetsAt)
113− }
114−
115− func testFetchUsageNoKey() async {
116− let client = makeStubbedClient()
117− do {
118− _ = try await client.fetchUsage(apiKey: "")
119− XCTFail("Expected noAPIKey error")
120− } catch ZaiUsageError.noAPIKey {
121− // Expected
122− } catch {
123− XCTFail("Unexpected error: \(error)")
124− }
125−
126− XCTAssertEqual(StubURLProtocol.requestCount, 0)
127− }
128−
129− func testFetchUsageInvalidKey() async {
130− let errorJSON = """
131− {"code":401,"msg":"token expired or incorrect","success":false}
132− """.data(using: .utf8)!
133− StubURLProtocol.enqueue(.status(401, errorJSON), forURLPath: "/api/monitor/usage/quota/limit")
134− StubURLProtocol.enqueue(.status(401, errorJSON), forURLPath: "/api/biz/subscription/list")
135−
136− let client = makeStubbedClient()
137− do {
138− _ = try await client.fetchUsage(apiKey: "bad-key")
139− XCTFail("Expected invalidAPIKey error")
140− } catch ZaiUsageError.invalidAPIKey {
141− // Expected
142− } catch {
143− XCTFail("Unexpected error: \(error)")
144− }
145− }
146−
147− // MARK: - Retry
148−
149− func testRetriesOnServerErrorThenSucceeds() async throws {
150− let quotaJSON = """
151− {"code":200,"success":true,"data":{"limits":[
152− {"type":"TOKENS_LIMIT","unit":3,"percentage":12}
153− ],"level":"max"}}
154− """.data(using: .utf8)!
155− let subscriptionJSON = """
156− {"code":200,"data":[],"success":true}
157− """.data(using: .utf8)!
158−
159− // Subscription succeeds on first try. Quota fails with 500, then succeeds.
160− StubURLProtocol.enqueue(.status(200, subscriptionJSON), forURLPath: "/api/biz/subscription/list")
161− StubURLProtocol.enqueue(.status(500, Data()), forURLPath: "/api/monitor/usage/quota/limit")
162− StubURLProtocol.enqueue(.status(200, quotaJSON), forURLPath: "/api/monitor/usage/quota/limit")
163−
164− let client = makeStubbedClient()
165− let report = try await client.fetchUsage(apiKey: "test-key")
166− XCTAssertEqual(report.fiveHourPercent, 12)
167− }
168−
169− func testRetriesOnRateLimitThenSucceeds() async throws {
170− let quotaJSON = """
171− {"code":200,"success":true,"data":{"limits":[
172− {"type":"TOKENS_LIMIT","unit":3,"percentage":12}
173− ],"level":"max"}}
174− """.data(using: .utf8)!
175− let subscriptionJSON = """
176− {"code":200,"data":[],"success":true}
177− """.data(using: .utf8)!
178−
179− StubURLProtocol.enqueue(.status(200, subscriptionJSON), forURLPath: "/api/biz/subscription/list")
180− StubURLProtocol.enqueue(.status(429, Data()), forURLPath: "/api/monitor/usage/quota/limit")
181− StubURLProtocol.enqueue(.status(200, quotaJSON), forURLPath: "/api/monitor/usage/quota/limit")
182−
183− let client = makeStubbedClient()
184− let report = try await client.fetchUsage(apiKey: "test-key")
185− XCTAssertEqual(report.fiveHourPercent, 12)
186− }
187−
188− func testDoesNotRetryOn401() async {
189− let errorJSON = """
190− {"code":401,"msg":"token expired or incorrect","success":false}
191− """.data(using: .utf8)!
192− StubURLProtocol.enqueue(.status(401, errorJSON), forURLPath: "/api/monitor/usage/quota/limit")
193− StubURLProtocol.enqueue(.status(401, errorJSON), forURLPath: "/api/biz/subscription/list")
194−
195− let client = makeStubbedClient()
196− do {
197− _ = try await client.fetchUsage(apiKey: "bad-key")
198− XCTFail("Expected invalidAPIKey error")
199− } catch ZaiUsageError.invalidAPIKey {
200− // Expected — should not retry
201− } catch {
202− XCTFail("Unexpected error: \(error)")
203− }
204− }
205−
206− // MARK: - ZaiUsageReport
207−
208− func testEmptyReportIsEmpty() {
209− let report = ZaiUsageReport(
210− fiveHourPercent: nil,
211− weeklyPercent: nil,
212− fiveHourResetsAt: nil,
213− weeklyResetsAt: nil,
214− planLevel: nil
215− )
216− XCTAssertTrue(report.isEmpty)
217− }
218−
219− func testNonEmptyReportIsNotEmpty() {
220− let report = ZaiUsageReport(
221− fiveHourPercent: 12,
222− weeklyPercent: nil,
223− fiveHourResetsAt: nil,
224− weeklyResetsAt: nil,
225− planLevel: nil
226− )
227− XCTAssertFalse(report.isEmpty)
228− }
229−
230− // MARK: - Protocol conformance
231−
232− func testZaiUsageClientConformsToProtocol() {
233− let checker: ZaiUsageChecking = ZaiUsageClient()
234− // If this compiles, ZaiUsageClient conforms to ZaiUsageChecking.
235− XCTAssertNotNil(checker)
236− }
237−}
project.yml+4−4
@@ -6,7 +6,7 @@ name: UsageMenubar
6options:
6options:
7 # Reverse-DNS prefix xcodegen uses when it needs to synthesize a bundle id.
7 # Reverse-DNS prefix xcodegen uses when it needs to synthesize a bundle id.
8 # The app target pins its own id explicitly below, so this is just a default.
8 # The app target pins its own id explicitly below, so this is just a default.
9− bundleIdPrefix: soy.iko
9+ bundleIdPrefix: com.ilyakooo0
10 # Oldest macOS we support. SMAppService (launch at login) requires 13.0+;
10 # Oldest macOS we support. SMAppService (launch at login) requires 13.0+;
11 # we target 14.0 (Sonoma). Keep in sync with MACOSX_DEPLOYMENT_TARGET below.
11 # we target 14.0 (Sonoma). Keep in sync with MACOSX_DEPLOYMENT_TARGET below.
12 deploymentTarget:
12 deploymentTarget:
@@ -47,7 +47,7 @@ targets:
47 properties:
47 properties:
48 CFBundleName: UsageMenubar
48 CFBundleName: UsageMenubar
49 CFBundleDisplayName: Usage Menubar
49 CFBundleDisplayName: Usage Menubar
50− CFBundleIdentifier: soy.iko.usage-menubar
50+ CFBundleIdentifier: com.ilyakooo0.usage-menubar
51 # Overwritten by CI — see the note on MARKETING_VERSION above.
51 # Overwritten by CI — see the note on MARKETING_VERSION above.
52 CFBundleVersion: "1"
52 CFBundleVersion: "1"
53 CFBundleShortVersionString: "1.0.0"
53 CFBundleShortVersionString: "1.0.0"
@@ -57,7 +57,7 @@ targets:
57 NSHighResolutionCapable: true
57 NSHighResolutionCapable: true
58 settings:
58 settings:
59 base:
59 base:
60− PRODUCT_BUNDLE_IDENTIFIER: soy.iko.usage-menubar
60+ PRODUCT_BUNDLE_IDENTIFIER: com.ilyakooo0.usage-menubar
61 PRODUCT_NAME: UsageMenubar
61 PRODUCT_NAME: UsageMenubar
62 INFOPLIST_FILE: UsageMenubar/Info.plist
62 INFOPLIST_FILE: UsageMenubar/Info.plist
63 # Grants the outgoing-network-connection entitlement needed to reach
63 # Grants the outgoing-network-connection entitlement needed to reach
@@ -84,7 +84,7 @@ targets:
84 - target: UsageMenubar
84 - target: UsageMenubar
85 settings:
85 settings:
86 base:
86 base:
87− PRODUCT_BUNDLE_IDENTIFIER: soy.iko.usage-menubar.tests
87+ PRODUCT_BUNDLE_IDENTIFIER: com.ilyakooo0.usage-menubar.tests
88 PRODUCT_NAME: UsageMenubarTests
88 PRODUCT_NAME: UsageMenubarTests
89 BUNDLE_LOADER: "$(TEST_HOST)"
89 BUNDLE_LOADER: "$(TEST_HOST)"
90 TEST_HOST: "$(BUILT_PRODUCTS_DIR)/UsageMenubar.app/Contents/MacOS/UsageMenubar"
90 TEST_HOST: "$(BUILT_PRODUCTS_DIR)/UsageMenubar.app/Contents/MacOS/UsageMenubar"