diff --git a/docs-site/src/content/docs/fr/reference/cli/agents.md b/docs-site/src/content/docs/fr/reference/cli/agents.md
index 91db38efea..a6d5454f84 100644
--- a/docs-site/src/content/docs/fr/reference/cli/agents.md
+++ b/docs-site/src/content/docs/fr/reference/cli/agents.md
@@ -90,7 +90,7 @@ Inspectez les requêtes de proxy, l’utilisation, le stockage, la mémoire et l
 | Alias ​​| Ressource équivalente |
 | --- | --- |
 | `ocx logs [filters] [--follow] [--json\|--jsonl]` | `ocx observe logs` |
-| `ocx usage [--range <today\|1d\|7d\|30d\|all>] [--surface <all\|codex\|claude\|grok>] [--provider <name>] [--model <id>] [--json]` | `ocx observe usage` |
+| `ocx usage [--range <today\|yesterday\|1d\|7d\|30d\|all>] [--since <time>] [--until <time>] [--surface <all\|codex\|claude\|grok>] [--provider <name>] [--model <id>] [--offline] [--format <table\|markdown\|json>] [--json]` | `ocx observe usage` |
 | `ocx storage [--json]` | `ocx observe storage` |
 | `ocx memory [--json]` | `ocx observe memory` |
 
diff --git a/docs-site/src/content/docs/ja/reference/cli/agents.md b/docs-site/src/content/docs/ja/reference/cli/agents.md
index ae395ed8e3..f024f4c470 100644
--- a/docs-site/src/content/docs/ja/reference/cli/agents.md
+++ b/docs-site/src/content/docs/ja/reference/cli/agents.md
@@ -61,7 +61,7 @@ ocx route combo set reliable --targets ark/model-a:2,openai/gpt-5.5
 |別名 |同等のリソース |
 | --- | --- |
 | `ocx logs [filters] [--follow] [--json|--jsonl]` | `ocx observe logs` |
-| `ocx usage [--range <today|1d|7d|30d|all>] [--surface <all|codex|claude|grok>] [--provider <name>] [--model <id>] [--json]` | `ocx observe usage` |
+| `ocx usage [--range <today|yesterday|1d|7d|30d|all>] [--since <time>] [--until <time>] [--surface <all|codex|claude|grok>] [--provider <name>] [--model <id>] [--offline] [--format <table|markdown|json>] [--json]` | `ocx observe usage` |
 | `ocx storage [--json]` | `ocx observe storage` |
 | `ocx memory [--json]` | `ocx observe memory` |
 
diff --git a/docs-site/src/content/docs/ko/reference/cli/agents.md b/docs-site/src/content/docs/ko/reference/cli/agents.md
index e2b77cf713..015f15a8ec 100644
--- a/docs-site/src/content/docs/ko/reference/cli/agents.md
+++ b/docs-site/src/content/docs/ko/reference/cli/agents.md
@@ -65,7 +65,7 @@ ocx route combo set reliable --targets ark/model-a:2,openai/gpt-5.5
 | 별칭 | 대응 리소스 |
 | --- | --- |
 | `ocx logs [filters] [--follow] [--json|--jsonl]` | `ocx observe logs` |
-| `ocx usage [--range <today|1d|7d|30d|all>] [--surface <all|codex|claude|grok>] [--provider <name>] [--model <id>] [--json]` | `ocx observe usage` |
+| `ocx usage [--range <today|yesterday|1d|7d|30d|all>] [--since <time>] [--until <time>] [--surface <all|codex|claude|grok>] [--provider <name>] [--model <id>] [--offline] [--format <table|markdown|json>] [--json]` | `ocx observe usage` |
 | `ocx storage [--json]` | `ocx observe storage` |
 | `ocx memory [--json]` | `ocx observe memory` |
 
diff --git a/docs-site/src/content/docs/reference/cli/agents.md b/docs-site/src/content/docs/reference/cli/agents.md
index f6b2e56e00..22899d671f 100644
--- a/docs-site/src/content/docs/reference/cli/agents.md
+++ b/docs-site/src/content/docs/reference/cli/agents.md
@@ -111,7 +111,7 @@ Inspect proxy requests, usage, storage, memory, and debug data. The direct alias
 | Alias | Equivalent resource |
 | --- | --- |
 | `ocx logs [filters] [--follow] [--json|--jsonl]` | `ocx observe logs` |
-| `ocx usage [--range <today|1d|7d|30d|all>] [--surface <all|codex|claude|grok>] [--provider <name>] [--model <id>] [--json]` | `ocx observe usage` |
+| `ocx usage [--range <today|yesterday|1d|7d|30d|all>] [--since <time>] [--until <time>] [--surface <all|codex|claude|grok>] [--provider <name>] [--model <id>] [--offline] [--format <table|markdown|json>] [--json]` | `ocx observe usage` |
 | `ocx storage [--json]` | `ocx observe storage` |
 | `ocx memory [--json]` | `ocx observe memory` |
 
@@ -119,11 +119,18 @@ Inspect proxy requests, usage, storage, memory, and debug data. The direct alias
 ocx observe usage --range 30d --json
 ```
 
-`--range today` (alias `1d`) reports the current local day. `--provider` and
+`--range today` (alias `1d`) reports the current local day, and `--range yesterday`
+reports the previous local day. `--since` and `--until` accept ISO-like local date/time
+values, epoch timestamps, or relative expressions such as `yesterday 09:17` and
+`today 04:23`. `--provider` and
 `--model` narrow the report to one upstream target — distinct from
 `--surface`, which selects the calling client (Codex, Claude Code, Grok)
 rather than the provider serving the request.
 
+`--offline` reads the bounded local usage ledger when the proxy is unavailable. It preserves
+time, surface, provider, and model filters. `--format markdown` emits a copy-ready report;
+`--format json` is equivalent to `--json`.
+
 The default view prints request, token and estimated-cost totals plus
 per-provider and per-model breakdowns. Costs are API list-price equivalents,
 not a billing receipt: subscription plans and provider credits are billed
@@ -132,6 +139,7 @@ separately, and requests with no matching price row are counted as
 
 ```bash
 ocx usage --range today --provider xai
+ocx usage --since "yesterday 09:17" --until "today 04:23" --format markdown
 ```
 
 ### `ocx debug <provider|usage|injection|claude> <on|off|status|reset|logs [-f]>`
diff --git a/docs-site/src/content/docs/reference/management-api.md b/docs-site/src/content/docs/reference/management-api.md
index bef307c3d5..67e7b0fe4b 100644
--- a/docs-site/src/content/docs/reference/management-api.md
+++ b/docs-site/src/content/docs/reference/management-api.md
@@ -124,7 +124,7 @@ See [Combos](/guides/combos/) for target strategies, cooldowns, aliases, and rou
 | `GET /api/debug/usage-logs` | Read bounded usage-debug entries | — |
 | `GET /api/debug/injection-logs` | Read bounded guidance-injection debug entries | — |
 | `GET /api/claude/inbound-debug` | Read Claude inbound debug state and entries | — |
-| `GET /api/usage` | Summarize usage by range and client surface; Codex responses also include an `accounts` breakdown keyed by stable non-PII log labels | Returns an `error: "read_failed"` summary if storage cannot be read |
+| `GET /api/usage` | Summarize usage by preset range or inclusive `since`/`until` bounds and client surface; Codex responses also include an `accounts` breakdown keyed by stable non-PII log labels | 400 invalid time bound/order; returns an `error: "read_failed"` summary if storage cannot be read |
 | `GET /api/storage` | Scan Codex storage usage by bucket | Returns an `error: "scan_failed"` payload on scan failure |
 | `POST /api/storage/cleanup/preview` | Preview archived-session cleanup and return a binding digest | 400 `invalid_json` or `invalid_percent` |
 | `POST /api/storage/cleanup` | Quarantine or permanently remove the previewed archived set | 400 invalid input; 409 stale/busy/referenced state; 500 filesystem/database failure |
@@ -143,6 +143,12 @@ re-estimated from the pricing active when the summary is read. This is an API-eq
 not a subscription charge. New main-pool requests use the reserved `main` label; legacy bare
 `openai` rows remain in an ambiguous bucket instead of being reassigned from current configuration.
 
+Custom windows use `since` and/or `until`, for example
+`GET /api/usage?range=all&since=2026-08-29T09:17:00&until=2026-08-30T04:23:00`.
+Both bounds are inclusive and interpreted in the server's local time when no offset is supplied.
+Malformed bounds return `invalid_since` or `invalid_until`; reversed bounds return
+`invalid_time_range`. Custom summaries are never stored in the preset-range cache.
+
 :::caution
 Storage cleanup endpoints can move or permanently remove archived session data. Always preview
 first and submit the returned digest. Prefer quarantine when recovery may be needed.
diff --git a/docs-site/src/content/docs/ru/reference/cli/agents.md b/docs-site/src/content/docs/ru/reference/cli/agents.md
index 6f09a90d04..29e6c966a8 100644
--- a/docs-site/src/content/docs/ru/reference/cli/agents.md
+++ b/docs-site/src/content/docs/ru/reference/cli/agents.md
@@ -71,7 +71,7 @@ ocx route combo set reliable --targets ark/model-a:2,openai/gpt-5.5
 | Алиас | Эквивалентный ресурс |
 | --- | --- |
 | `ocx logs [filters] [--follow] [--json|--jsonl]` | `ocx observe logs` |
-| `ocx usage [--range <today|1d|7d|30d|all>] [--surface <all|codex|claude|grok>] [--provider <name>] [--model <id>] [--json]` | `ocx observe usage` |
+| `ocx usage [--range <today|yesterday|1d|7d|30d|all>] [--since <time>] [--until <time>] [--surface <all|codex|claude|grok>] [--provider <name>] [--model <id>] [--offline] [--format <table|markdown|json>] [--json]` | `ocx observe usage` |
 | `ocx storage [--json]` | `ocx observe storage` |
 | `ocx memory [--json]` | `ocx observe memory` |
 
diff --git a/docs-site/src/content/docs/tr/reference/cli/agents.md b/docs-site/src/content/docs/tr/reference/cli/agents.md
index 42f8b9bffc..97d8161dd5 100644
--- a/docs-site/src/content/docs/tr/reference/cli/agents.md
+++ b/docs-site/src/content/docs/tr/reference/cli/agents.md
@@ -103,7 +103,7 @@ verilerini inceleyin. Doğrudan takma adlar şunlardır:
 | Takma ad | Eşdeğer kaynak |
 | --- | --- |
 | `ocx logs [filtreler] [--follow] [--json\|--jsonl]` | `ocx observe logs` |
-| `ocx usage [--range <today\|1d\|7d\|30d\|all>] [--surface <all\|codex\|claude\|grok>] [--provider <name>] [--model <id>] [--json]` | `ocx observe usage` |
+| `ocx usage [--range <today\|yesterday\|1d\|7d\|30d\|all>] [--since <time>] [--until <time>] [--surface <all\|codex\|claude\|grok>] [--provider <name>] [--model <id>] [--offline] [--format <table\|markdown\|json>] [--json]` | `ocx observe usage` |
 | `ocx storage [--json]` | `ocx observe storage` |
 | `ocx memory [--json]` | `ocx observe memory` |
 
diff --git a/docs-site/src/content/docs/zh-cn/reference/cli/agents.md b/docs-site/src/content/docs/zh-cn/reference/cli/agents.md
index e535215eed..f0337b377a 100644
--- a/docs-site/src/content/docs/zh-cn/reference/cli/agents.md
+++ b/docs-site/src/content/docs/zh-cn/reference/cli/agents.md
@@ -67,7 +67,7 @@ API key，且绝不会回退到 native alias。启用这组兼容选项前，请
 | 别名 | 对应资源 |
 | --- | --- |
 | `ocx logs [filters] [--follow] [--json|--jsonl]` | `ocx observe logs` |
-| `ocx usage [--range <today|1d|7d|30d|all>] [--surface <all|codex|claude|grok>] [--provider <name>] [--model <id>] [--json]` | `ocx observe usage` |
+| `ocx usage [--range <today|yesterday|1d|7d|30d|all>] [--since <time>] [--until <time>] [--surface <all|codex|claude|grok>] [--provider <name>] [--model <id>] [--offline] [--format <table|markdown|json>] [--json]` | `ocx observe usage` |
 | `ocx storage [--json]` | `ocx observe storage` |
 | `ocx memory [--json]` | `ocx observe memory` |
 
diff --git a/docs-site/src/content/docs/zh-tw/reference/cli/agents.md b/docs-site/src/content/docs/zh-tw/reference/cli/agents.md
index e8e7955d67..f4177daad3 100644
--- a/docs-site/src/content/docs/zh-tw/reference/cli/agents.md
+++ b/docs-site/src/content/docs/zh-tw/reference/cli/agents.md
@@ -62,7 +62,7 @@ ocx route combo set reliable --targets ark/model-a:2,openai/gpt-5.5
 | 別名 | 等效資源 |
 | --- | --- |
 | `ocx logs [filters] [--follow] [--json|--jsonl]` | `ocx observe logs` |
-| `ocx usage [--range <today|1d|7d|30d|all>] [--surface <all|codex|claude|grok>] [--provider <name>] [--model <id>] [--json]` | `ocx observe usage` |
+| `ocx usage [--range <today|yesterday|1d|7d|30d|all>] [--since <time>] [--until <time>] [--surface <all|codex|claude|grok>] [--provider <name>] [--model <id>] [--offline] [--format <table|markdown|json>] [--json]` | `ocx observe usage` |
 | `ocx storage [--json]` | `ocx observe storage` |
 | `ocx memory [--json]` | `ocx observe memory` |
 
diff --git a/gui/src/i18n/de.ts b/gui/src/i18n/de.ts
index d2f1830a1e..212f10d615 100644
--- a/gui/src/i18n/de.ts
+++ b/gui/src/i18n/de.ts
@@ -794,6 +794,15 @@ export const de: Record<TKey, string> = {
   "usage.range.available": "Verfügbarer Verlauf",
   "usage.historyTruncated": "Die Summen beziehen sich nur auf den verfügbaren Verlauf, da ältere Nutzungsdaten nicht geladen wurden.",
   "usage.historyTruncatedWindow": "Die geladenen Zeilen haben Anfragestartzeiten zwischen {start} und {end}. Frühere Dateieinträge wurden durch das Leselimit ausgelassen, daher kann jeder gewählte Zeitraum unvollständig sein.",
+  "usage.range.today": "Heute",
+  "usage.range.yesterday": "Gestern",
+  "usage.range.custom": "Benutzerdefiniert...",
+  "usage.custom.since": "Von",
+  "usage.custom.until": "Bis",
+  "usage.custom.apply": "Anwenden",
+  "usage.custom.cancel": "Abbrechen",
+  "usage.custom.title": "Benutzerdefinierter Zeitraum",
+  "usage.custom.quick": "Schnellauswahl",
   "usage.range.30d": "30d",
   "usage.range.7d": "7d",
   "usage.card.requests": "Anfragen",
diff --git a/gui/src/i18n/en.ts b/gui/src/i18n/en.ts
index 2d4c55b139..240e3a9564 100644
--- a/gui/src/i18n/en.ts
+++ b/gui/src/i18n/en.ts
@@ -831,6 +831,15 @@ export const en = {
   "usage.range.available": "Available history",
   "usage.historyTruncated": "Totals cover available history only because older usage was not loaded.",
   "usage.historyTruncatedWindow": "Loaded rows have request start times ranging from {start} to {end}. Earlier file entries were omitted by the read limit, so any selected range may be incomplete.",
+  "usage.range.today": "Today",
+  "usage.range.yesterday": "Yesterday",
+  "usage.range.custom": "Custom...",
+  "usage.custom.since": "Since",
+  "usage.custom.until": "Until",
+  "usage.custom.apply": "Apply",
+  "usage.custom.cancel": "Cancel",
+  "usage.custom.title": "Custom time range",
+  "usage.custom.quick": "Quick date",
   "usage.range.30d": "30d",
   "usage.range.7d": "7d",
   "usage.card.requests": "Requests",
diff --git a/gui/src/i18n/fr.ts b/gui/src/i18n/fr.ts
index 99d64ee4e3..595d634ac6 100644
--- a/gui/src/i18n/fr.ts
+++ b/gui/src/i18n/fr.ts
@@ -808,6 +808,15 @@ export const fr: Record<TKey, string> = {
   "usage.range.available": "Historique disponible",
   "usage.historyTruncated": "Les totaux couvrent uniquement l’historique disponible, car les données d’utilisation plus anciennes n’ont pas été chargées.",
   "usage.historyTruncatedWindow": "Les heures de début des requêtes dans les lignes chargées vont de {start} à {end}. Les entrées antérieures du fichier ont été omises en raison de la limite de lecture ; toute période sélectionnée peut donc être incomplète.",
+  "usage.range.today": "Aujourd'hui",
+  "usage.range.yesterday": "Hier",
+  "usage.range.custom": "Personnalisé...",
+  "usage.custom.since": "Début",
+  "usage.custom.until": "Fin",
+  "usage.custom.apply": "Appliquer",
+  "usage.custom.cancel": "Annuler",
+  "usage.custom.title": "Période personnalisée",
+  "usage.custom.quick": "Date rapide",
   "usage.range.30d": "30 j",
   "usage.range.7d": "7 j",
   "usage.card.requests": "Requêtes",
diff --git a/gui/src/i18n/ja.ts b/gui/src/i18n/ja.ts
index 4788f0ef80..2c1a9dcb92 100644
--- a/gui/src/i18n/ja.ts
+++ b/gui/src/i18n/ja.ts
@@ -774,6 +774,15 @@ export const ja: Record<TKey, string> = {
   "usage.range.available": "利用可能な履歴",
   "usage.historyTruncated": "古い利用履歴が読み込まれていないため、合計は利用可能な履歴のみを対象とします。",
   "usage.historyTruncatedWindow": "読み込まれた行のリクエスト開始時刻は {start} から {end} の範囲です。読み取り上限によりファイル前方の記録が除外されているため、選択した期間は不完全な場合があります。",
+  "usage.range.today": "今日",
+  "usage.range.yesterday": "昨日",
+  "usage.range.custom": "カスタム...",
+  "usage.custom.since": "開始",
+  "usage.custom.until": "終了",
+  "usage.custom.apply": "適用",
+  "usage.custom.cancel": "キャンセル",
+  "usage.custom.title": "カスタム期間",
+  "usage.custom.quick": "クイック日付",
   "usage.range.30d": "30日",
   "usage.range.7d": "7日",
   "usage.card.requests": "リクエスト",
diff --git a/gui/src/i18n/ko.ts b/gui/src/i18n/ko.ts
index 33c4452c14..1e48b03e35 100644
--- a/gui/src/i18n/ko.ts
+++ b/gui/src/i18n/ko.ts
@@ -816,6 +816,15 @@ export const ko: Record<TKey, string> = {
   "usage.range.available": "사용 가능한 기록",
   "usage.historyTruncated": "이전 사용 기록을 불러오지 않아 합계는 사용 가능한 기록만 포함합니다.",
   "usage.historyTruncatedWindow": "불러온 기록의 요청 시작 시각은 {start}부터 {end} 사이입니다. 읽기 한도 때문에 파일 앞부분의 기록이 빠졌으므로 선택한 기간이 완전하지 않을 수 있습니다.",
+  "usage.range.today": "오늘",
+  "usage.range.yesterday": "어제",
+  "usage.range.custom": "사용자 지정...",
+  "usage.custom.since": "시작",
+  "usage.custom.until": "종료",
+  "usage.custom.apply": "적용",
+  "usage.custom.cancel": "취소",
+  "usage.custom.title": "사용자 지정 기간",
+  "usage.custom.quick": "빠른 날짜",
   "usage.range.30d": "30일",
   "usage.range.7d": "7일",
   "usage.card.requests": "요청",
diff --git a/gui/src/i18n/ru.ts b/gui/src/i18n/ru.ts
index 08bf01b65b..91f5816438 100644
--- a/gui/src/i18n/ru.ts
+++ b/gui/src/i18n/ru.ts
@@ -815,6 +815,15 @@ export const ru: Record<TKey, string> = {
   "usage.range.available": "Доступная история",
   "usage.historyTruncated": "Итоги охватывают только доступную историю, поскольку старые данные не загружены.",
   "usage.historyTruncatedWindow": "У загруженных записей время начала запроса находится в диапазоне от {start} до {end}. Более ранние записи файла пропущены из-за лимита чтения, поэтому выбранный период может быть неполным.",
+  "usage.range.today": "Сегодня",
+  "usage.range.yesterday": "Вчера",
+  "usage.range.custom": "Настроить...",
+  "usage.custom.since": "Начало",
+  "usage.custom.until": "Конец",
+  "usage.custom.apply": "Применить",
+  "usage.custom.cancel": "Отмена",
+  "usage.custom.title": "Пользовательский период",
+  "usage.custom.quick": "Быстрая дата",
   "usage.range.30d": "30 дн.",
   "usage.range.7d": "7 дн.",
   "usage.card.requests": "Запросы",
diff --git a/gui/src/i18n/tr.ts b/gui/src/i18n/tr.ts
index a7e001271b..3f78e75af6 100644
--- a/gui/src/i18n/tr.ts
+++ b/gui/src/i18n/tr.ts
@@ -822,6 +822,15 @@ export const tr: Record<TKey, string> = {
   "usage.range.available": "Mevcut geçmiş",
   "usage.historyTruncated": "Toplamlar yalnızca mevcut geçmişi kapsar.",
   "usage.historyTruncatedWindow": "Yüklenen satırların istek başlangıç zamanları {start} ile {end} arasındadır. Dosyanın önceki kayıtları okuma sınırı nedeniyle atlandı, bu yüzden seçilen aralık eksik olabilir.",
+  "usage.range.today": "Bugün",
+  "usage.range.yesterday": "Dün",
+  "usage.range.custom": "Özel...",
+  "usage.custom.since": "Başlangıç",
+  "usage.custom.until": "Bitiş",
+  "usage.custom.apply": "Uygula",
+  "usage.custom.cancel": "İptal",
+  "usage.custom.title": "Özel zaman aralığı",
+  "usage.custom.quick": "Hızlı tarih",
   "usage.range.30d": "30 gün",
   "usage.range.7d": "7 gün",
   "usage.card.requests": "İstekler",
diff --git a/gui/src/i18n/zh-TW.ts b/gui/src/i18n/zh-TW.ts
index c2eb37f8d2..b03346253f 100644
--- a/gui/src/i18n/zh-TW.ts
+++ b/gui/src/i18n/zh-TW.ts
@@ -641,6 +641,15 @@ export const zhTW: Record<TKey, string> = {
   "usage.empty": "尚無用量紀錄。透過代理傳送請求後將在此顯示。",
   "usage.loadError": "無法載入用量資料。",
   "usage.range.all": "全部",
+  "usage.range.today": "今天",
+  "usage.range.yesterday": "昨天",
+  "usage.range.custom": "自訂...",
+  "usage.custom.since": "起始時間",
+  "usage.custom.until": "截止時間",
+  "usage.custom.apply": "篩選",
+  "usage.custom.cancel": "取消",
+  "usage.custom.title": "自訂時間範圍",
+  "usage.custom.quick": "快速日期",
   "usage.range.30d": "30 天",
   "usage.range.7d": "7 天",
   "usage.card.requests": "請求數",
diff --git a/gui/src/i18n/zh.ts b/gui/src/i18n/zh.ts
index bc36d0f752..704dd0b3af 100644
--- a/gui/src/i18n/zh.ts
+++ b/gui/src/i18n/zh.ts
@@ -809,6 +809,15 @@ export const zh: Record<TKey, string> = {
   "usage.range.available": "可用历史",
   "usage.historyTruncated": "由于未加载较早的使用记录，合计仅涵盖可用历史。",
   "usage.historyTruncatedWindow": "已加载记录的请求开始时间介于 {start} 到 {end} 之间。受读取上限限制，文件较前的条目已被省略，所选时间范围可能不完整。",
+  "usage.range.today": "今天",
+  "usage.range.yesterday": "昨天",
+  "usage.range.custom": "自定义...",
+  "usage.custom.since": "起始时间",
+  "usage.custom.until": "截止时间",
+  "usage.custom.apply": "筛选",
+  "usage.custom.cancel": "取消",
+  "usage.custom.title": "自定义时间范围",
+  "usage.custom.quick": "快捷日期",
   "usage.range.30d": "30 天",
   "usage.range.7d": "7 天",
   "usage.card.requests": "请求数",
diff --git a/gui/src/pages/Usage.tsx b/gui/src/pages/Usage.tsx
index 18cf77b4f8..1208732bf7 100644
--- a/gui/src/pages/Usage.tsx
+++ b/gui/src/pages/Usage.tsx
@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useMemo, useRef, useState, type ReactNode } from "react";
-import { useI18n, type TFn, type Locale } from "../i18n/shared";
+import { useI18n, type TFn, type TKey, type Locale } from "../i18n/shared";
 import { formatProviderDisplayName } from "../provider-icons";
 import { formatTokens } from "../format-tokens";
 import { formatEstimatedUsdValue as formatUsdEstimate } from "../intl-formatters";
@@ -10,10 +10,22 @@ import { useDataSurface } from "../data-surface";
 import { DataSurfaceSkeleton } from "../components/data-surface";
 import { SectionTabs } from "../components/section-tabs";
 import { sectionAnchorId } from "../section-anchors";
+import { quickUsageRangeBounds, type QuickUsagePreset } from "../usage-time-range";
 
-type Range = "all" | "30d" | "7d";
+type Range = "all" | "30d" | "7d" | "today" | "yesterday" | "custom";
 type UsageSurface = "all" | "codex" | "claude" | "grok";
 
+const RANGE_LABEL_KEYS: Record<"7d" | "30d" | "custom", TKey> = {
+  "7d": "usage.range.7d",
+  "30d": "usage.range.30d",
+  custom: "usage.range.custom",
+};
+
+const QUICK_RANGE_LABEL_KEYS: Record<QuickUsagePreset, TKey> = {
+  today: "usage.range.today",
+  yesterday: "usage.range.yesterday",
+};
+
 interface UsageSummaryTotals {
   requests: number;
   measuredRequests: number;
@@ -209,63 +221,194 @@ function buildHeatmap(days: UsageDay[]): { weeks: HeatmapCell[][]; months: { lab
 function UsageFilters({
   surface,
   range,
+  customSince,
+  customUntil,
   onSurface,
   onRange,
+  onApplyCustom,
   t,
 }: {
   surface: UsageSurface;
   range: Range;
+  customSince: string;
+  customUntil: string;
   onSurface: (surface: UsageSurface) => void;
   onRange: (range: Range) => void;
+  onApplyCustom: (since: string, until: string) => void;
   t: TFn;
 }) {
+  const [customOpen, setCustomOpen] = useState(false);
+  const [quickRange, setQuickRange] = useState<QuickUsagePreset | null>(null);
+  const [sinceVal, setSinceVal] = useState(customSince);
+  const [untilVal, setUntilVal] = useState(customUntil);
+  const triggerRef = useRef<HTMLButtonElement | null>(null);
+  const popoverRef = useRef<HTMLDivElement | null>(null);
+  const quickTodayRef = useRef<HTMLButtonElement | null>(null);
+  const closeCustom = useCallback(() => setCustomOpen(false), []);
+
+  useEffect(() => {
+    if (!customOpen) return;
+    const onPointerDown = (event: MouseEvent) => {
+      const target = event.target as Node;
+      if (popoverRef.current?.contains(target) || triggerRef.current?.contains(target)) return;
+      closeCustom();
+    };
+    const onKeyDown = (event: KeyboardEvent) => {
+      if (event.key !== "Escape") return;
+      event.preventDefault();
+      closeCustom();
+      triggerRef.current?.focus();
+    };
+    document.addEventListener("mousedown", onPointerDown);
+    document.addEventListener("keydown", onKeyDown);
+    return () => {
+      document.removeEventListener("mousedown", onPointerDown);
+      document.removeEventListener("keydown", onKeyDown);
+    };
+  }, [closeCustom, customOpen]);
+
+  useEffect(() => {
+    if (customOpen) quickTodayRef.current?.focus();
+  }, [customOpen]);
+
   return (
-    <div className="usage-filters">
-      <div className="usage-segmented" role="group" aria-label={t("logs.filter.surface.label")}>
-        {(["all", "codex", "claude", "grok"] as UsageSurface[]).map(choice => {
-          const label = t(`logs.filter.surface.${choice}`);
-          return (
-            <button
-              key={choice}
-              type="button"
-              className={`usage-segmented-btn usage-source-btn${surface === choice ? " active" : ""}`}
-              aria-label={label}
-              aria-pressed={surface === choice}
-              onClick={() => onSurface(choice)}
-            >
-              {choice === "codex" && (
-                <img className="usage-source-mark" src="/provider-icons/openai.svg" alt="" aria-hidden="true" />
-              )}
-              {choice === "claude" && (
-                <img className="usage-source-mark" src="/provider-icons/claude-color.svg" alt="" aria-hidden="true" />
-              )}
-              {choice === "grok" && (
-                <img className="usage-source-mark usage-source-mark--mono" src="/provider-icons/grok.svg" alt="" aria-hidden="true" />
-              )}
-              <span className={choice === "all" ? "usage-source-label" : "usage-source-label usage-source-label-collapsible"}>
+    <div className="usage-filters-wrap">
+      <div className="usage-filters">
+        <div className="usage-segmented" role="group" aria-label={t("logs.filter.surface.label")}>
+          {(["all", "codex", "claude", "grok"] as UsageSurface[]).map(choice => {
+            const label = t(`logs.filter.surface.${choice}`);
+            return (
+              <button
+                key={choice}
+                type="button"
+                className={`usage-segmented-btn usage-source-btn${surface === choice ? " active" : ""}`}
+                aria-label={label}
+                aria-pressed={surface === choice}
+                onClick={() => onSurface(choice)}
+              >
+                {choice === "codex" && (
+                  <img className="usage-source-mark" src="/provider-icons/openai.svg" alt="" aria-hidden="true" />
+                )}
+                {choice === "claude" && (
+                  <img className="usage-source-mark" src="/provider-icons/claude-color.svg" alt="" aria-hidden="true" />
+                )}
+                {choice === "grok" && (
+                  <img className="usage-source-mark usage-source-mark--mono" src="/provider-icons/grok.svg" alt="" aria-hidden="true" />
+                )}
+                <span className={choice === "all" ? "usage-source-label" : "usage-source-label usage-source-label-collapsible"}>
+                  {label}
+                </span>
+              </button>
+            );
+          })}
+        </div>
+        <div className="usage-segmented" role="group" aria-label={t("usage.title")}>
+          {(["7d", "30d", "all", "custom"] as const).map(choice => {
+            const label = choice === "all" ? t("usage.range.available") : t(RANGE_LABEL_KEYS[choice]);
+            return (
+              <button
+                ref={choice === "custom" ? triggerRef : undefined}
+                key={choice}
+                type="button"
+                className={`usage-segmented-btn${range === choice ? " active" : ""}`}
+                aria-label={label}
+                aria-pressed={range === choice}
+                aria-haspopup={choice === "custom" ? "dialog" : undefined}
+                aria-expanded={choice === "custom" ? customOpen : undefined}
+                onClick={() => {
+                  if (choice === "custom") setCustomOpen(open => !open);
+                  else {
+                    closeCustom();
+                    onRange(choice);
+                  }
+                }}
+              >
                 {label}
-              </span>
-            </button>
-          );
-        })}
+              </button>
+            );
+          })}
+        </div>
       </div>
-      <div className="usage-segmented" role="group" aria-label={t("usage.title")}>
-        {(["all", "30d", "7d"] as Range[]).map(choice => {
-          const label = choice === "all" ? t("usage.range.available") : t(`usage.range.${choice}`);
-          return (
+      {customOpen && (
+        <div
+          ref={popoverRef}
+          className="usage-custom-popover"
+          role="dialog"
+          aria-modal="false"
+          aria-label={t("usage.custom.title")}
+        >
+          <div className="usage-custom-popover-title">{t("usage.custom.title")}</div>
+          <div className="usage-custom-grid">
+            <div className="usage-custom-field-quick">
+              <span className="usage-custom-field-label">{t("usage.custom.quick")}</span>
+              <div className="usage-custom-quick-buttons" role="group" aria-label={t("usage.custom.quick")}>
+                {(["today", "yesterday"] as QuickUsagePreset[]).map(option => (
+                  <button
+                    ref={option === "today" ? quickTodayRef : undefined}
+                    key={option}
+                    type="button"
+                    className={`usage-custom-quick-btn${quickRange === option ? " active" : ""}`}
+                    aria-pressed={quickRange === option}
+                    onClick={() => {
+                      setQuickRange(option);
+                      const bounds = quickUsageRangeBounds(option);
+                      setSinceVal(bounds.since);
+                      setUntilVal(bounds.until);
+                    }}
+                  >
+                    {t(QUICK_RANGE_LABEL_KEYS[option])}
+                  </button>
+                ))}
+              </div>
+            </div>
+            <label className="usage-custom-field" htmlFor="usage-custom-since">
+              <span>{t("usage.custom.since")}</span>
+              <input
+                id="usage-custom-since"
+                type="datetime-local"
+                step={60}
+                className="input"
+                value={sinceVal}
+                onInput={event => {
+                  setQuickRange(null);
+                  setSinceVal(event.currentTarget.value);
+                }}
+              />
+            </label>
+            <label className="usage-custom-field" htmlFor="usage-custom-until">
+              <span>{t("usage.custom.until")}</span>
+              <input
+                id="usage-custom-until"
+                type="datetime-local"
+                step={60}
+                className="input"
+                value={untilVal}
+                onInput={event => {
+                  setQuickRange(null);
+                  setUntilVal(event.currentTarget.value);
+                }}
+              />
+            </label>
+          </div>
+          <div className="usage-custom-actions">
+            <button type="button" className="btn btn-ghost btn-sm" onClick={closeCustom}>
+              {t("usage.custom.cancel")}
+            </button>
             <button
-              key={choice}
               type="button"
-              className={`usage-segmented-btn${range === choice ? " active" : ""}`}
-              aria-label={label}
-              aria-pressed={range === choice}
-              onClick={() => onRange(choice)}
+              className="btn btn-primary btn-sm"
+              disabled={!sinceVal.trim() && !untilVal.trim()}
+              onClick={() => {
+                onRange("custom");
+                onApplyCustom(sinceVal, untilVal);
+                closeCustom();
+              }}
             >
-              {label}
+              {t("usage.custom.apply")}
             </button>
-          );
-        })}
-      </div>
+          </div>
+        </div>
+      )}
     </div>
   );
 }
@@ -739,17 +882,17 @@ function UsageWorkspaceBody({
 /** Held usage payloads so provider/surface tab switches skip a cold ~5s refetch. */
 const usageMemoryCache = new Map<string, UsageResponse>();
 
-function usageCacheKey(apiBase: string, range: Range, surface: UsageSurface): string {
-  return `ocx.usage.v1:${apiBase}:${range}:${surface}`;
+function usageCacheKey(apiBase: string, range: Range, surface: UsageSurface, since = "", until = ""): string {
+  return `ocx.usage.v1:${apiBase}:${range}:${surface}:${since}:${until}`;
 }
 
-function readHeldUsage(apiBase: string, range: Range, surface: UsageSurface): UsageResponse | null {
-  const key = usageCacheKey(apiBase, range, surface);
+function readHeldUsage(apiBase: string, range: Range, surface: UsageSurface, since = "", until = ""): UsageResponse | null {
+  const key = usageCacheKey(apiBase, range, surface, since, until);
   return usageMemoryCache.get(key) ?? readSessionListCache<UsageResponse>(key);
 }
 
-function writeHeldUsage(apiBase: string, range: Range, surface: UsageSurface, value: UsageResponse) {
-  const key = usageCacheKey(apiBase, range, surface);
+function writeHeldUsage(apiBase: string, range: Range, surface: UsageSurface, value: UsageResponse, since = "", until = "") {
+  const key = usageCacheKey(apiBase, range, surface, since, until);
   usageMemoryCache.set(key, value);
   writeSessionListCache(key, value);
 }
@@ -759,22 +902,29 @@ export default function Usage({ apiBase }: { apiBase: string }) {
   const [range, setRange] = useState<Range>("30d");
   const [surface, setSurface] = useState<UsageSurface>("all");
   const [modelQuery, setModelQuery] = useState("");
+  const [customSince, setCustomSince] = useState("");
+  const [customUntil, setCustomUntil] = useState("");
 
   const loadUsage = useCallback(async (signal: AbortSignal): Promise<UsageResponse> => {
-    const response = await fetch(`${apiBase}/api/usage?range=${range}&surface=${surface}`, { signal });
+    let url = `${apiBase}/api/usage?range=${range === "custom" ? "all" : range}&surface=${surface}`;
+    if (range === "custom") {
+      if (customSince) url += `&since=${encodeURIComponent(customSince)}`;
+      if (customUntil) url += `&until=${encodeURIComponent(customUntil)}`;
+    }
+    const response = await fetch(url, { signal });
     if (!response.ok) throw new Error(`${response.status} ${response.statusText}`.trim());
     const next = await response.json() as UsageResponse;
-    writeHeldUsage(apiBase, range, surface, next);
+    writeHeldUsage(apiBase, range, surface, next, customSince, customUntil);
     return next;
-  }, [apiBase, range, surface]);
+  }, [apiBase, range, surface, customSince, customUntil]);
 
-  const resourceKey = usageCacheKey(apiBase, range, surface);
-  const cached = readHeldUsage(apiBase, range, surface);
+  const resourceKey = usageCacheKey(apiBase, range, surface, customSince, customUntil);
+  const cached = readHeldUsage(apiBase, range, surface, customSince, customUntil);
   // Range and surface identify different reports, so the key changes with both. That prevents
   // a force-loading dependency revalidation from ever showing a previous report as this one.
   const resource = useDataSurface<UsageResponse>(
     resourceKey,
-    [apiBase, range, surface],
+    [apiBase, range, surface, customSince, customUntil],
     loadUsage,
     { isEmpty: () => false, initialData: cached ?? undefined },
   );
@@ -805,7 +955,19 @@ export default function Usage({ apiBase }: { apiBase: string }) {
     <>
       <div className="page-head usage-head">
         <h2 id="usage-page-title">{t("usage.title")}</h2>
-        <UsageFilters surface={surface} range={range} onSurface={setSurface} onRange={setRange} t={t} />
+        <UsageFilters
+          surface={surface}
+          range={range}
+          customSince={customSince}
+          customUntil={customUntil}
+          onSurface={setSurface}
+          onRange={setRange}
+          onApplyCustom={(s, u) => {
+            setCustomSince(s);
+            setCustomUntil(u);
+          }}
+          t={t}
+        />
       </div>
       <p className="page-sub">{t("usage.subtitle")}</p>
 
diff --git a/gui/src/styles.css b/gui/src/styles.css
index 0ef2053fac..5f6bbe8bfc 100644
--- a/gui/src/styles.css
+++ b/gui/src/styles.css
@@ -2259,11 +2259,44 @@ button.prov-account-row.active { cursor: default; }
 .usage-cards .stat-value { font-size: var(--text-title); font-weight: var(--weight-semibold); margin-top: 4px; }
 /* Top-align with Storage: centering against the taller filter chips dropped the "Usage" title. */
 .usage-head { flex-wrap: wrap; align-items: flex-start; }
+.usage-filters-wrap { position: relative; }
 .usage-filters { display: flex; align-items: center; justify-content: flex-end; gap: 8px; flex-wrap: wrap; }
 .usage-segmented { display: inline-flex; border: 1px solid var(--border); border-radius: var(--radius-pill); padding: 2px; gap: 2px; background: var(--surface); }
 .usage-segmented-btn { display: inline-flex; align-items: center; justify-content: center; gap: 6px; border: none; background: transparent; color: var(--muted); padding: 4px 12px; border-radius: var(--radius-pill); cursor: pointer; font: inherit; white-space: nowrap; }
 .usage-segmented-btn.active { background: var(--raised); color: var(--text); font-weight: var(--weight-semibold); }
 .usage-source-mark { width: var(--icon-sm); height: var(--icon-sm); flex: 0 0 auto; object-fit: contain; }
+.usage-custom-popover {
+  position: absolute;
+  top: calc(100% + 10px);
+  right: 0;
+  z-index: 60;
+  width: min(520px, calc(100vw - 40px));
+  padding: 14px;
+  background: var(--surface);
+  border: 1px solid var(--border);
+  border-radius: var(--radius-lg);
+  box-shadow: var(--shadow);
+}
+.usage-custom-popover-title { margin-bottom: 10px; font-weight: var(--weight-semibold); color: var(--text); }
+.usage-custom-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 10px; }
+.usage-custom-field { display: grid; gap: 5px; color: var(--muted); font-size: var(--text-caption); }
+.usage-custom-field-quick { display: grid; grid-column: 1 / -1; gap: 6px; }
+.usage-custom-field-label { color: var(--muted); font-size: var(--text-caption); }
+.usage-custom-quick-buttons { display: flex; gap: 8px; }
+.usage-custom-quick-btn {
+  min-width: 72px;
+  padding: 6px 14px;
+  border: 1px solid var(--border);
+  border-radius: var(--radius-pill);
+  background: var(--raised);
+  color: var(--muted);
+  cursor: pointer;
+  font: inherit;
+}
+.usage-custom-quick-btn:hover { color: var(--text); border-color: var(--muted); }
+.usage-custom-quick-btn.active { color: var(--text); background: var(--surface); border-color: var(--text); font-weight: var(--weight-semibold); }
+.usage-custom-field .input { width: 100%; min-width: 0; }
+.usage-custom-actions { display: flex; justify-content: flex-end; gap: 8px; margin-top: 12px; }
 /* Only monochrome source marks (Grok) are inverted for dark themes. Brand-colored
    marks (Claude, Codex/OpenAI) must keep their brand color; inverting shifts the hue. */
 :root[data-theme="dark"] .usage-source-mark--mono { filter: invert(1); }
@@ -2274,6 +2307,9 @@ button.prov-account-row.active { cursor: default; }
 
 @media (max-width: 760px) {
   .usage-segmented-btn { min-height: var(--control-touch); }
+  .usage-custom-popover { width: min(360px, calc(100vw - 24px)); }
+  .usage-custom-grid { grid-template-columns: minmax(0, 1fr); }
+  .usage-custom-field-quick { grid-column: auto; }
   .openai-mode-row { align-items: stretch; flex-direction: column; gap: 6px; }
   .openai-mode-control { width: 100%; }
   .openai-mode-control .usage-segmented-btn { flex: 1 1 0; min-width: 0; }
diff --git a/gui/src/usage-time-range.ts b/gui/src/usage-time-range.ts
new file mode 100644
index 0000000000..9d3f1223f6
--- /dev/null
+++ b/gui/src/usage-time-range.ts
@@ -0,0 +1,20 @@
+export type QuickUsagePreset = "today" | "yesterday";
+
+function localDateTimeValue(date: Date, endOfDay: boolean): string {
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, "0");
+  const day = String(date.getDate()).padStart(2, "0");
+  return `${year}-${month}-${day}T${endOfDay ? "23:59" : "00:00"}`;
+}
+
+export function quickUsageRangeBounds(
+  range: QuickUsagePreset,
+  now = new Date(),
+): { since: string; until: string } {
+  const date = new Date(now);
+  if (range === "yesterday") date.setDate(date.getDate() - 1);
+  return {
+    since: localDateTimeValue(date, false),
+    until: localDateTimeValue(date, true),
+  };
+}
diff --git a/gui/tests/usage-layout.test.ts b/gui/tests/usage-layout.test.ts
index d77388b153..6e2501ce6b 100644
--- a/gui/tests/usage-layout.test.ts
+++ b/gui/tests/usage-layout.test.ts
@@ -254,3 +254,17 @@ test("Usage source marks keep brand colors and invert only the monochrome Grok m
   expect(css).toContain(':root:not([data-theme="light"]) .usage-source-mark--mono { filter: invert(1); }');
   expect(css).not.toContain(':root:not([data-theme="light"]) .usage-source-mark { filter: invert(1); }');
 });
+
+test("Usage custom range is an anchored floating popover, not an in-flow panel", async () => {
+  const page = await Bun.file(new URL("../src/pages/Usage.tsx", import.meta.url)).text();
+  const css = await Bun.file(new URL("../src/styles.css", import.meta.url)).text();
+
+  expect(page).toContain('className="usage-custom-popover"');
+  expect(page).toContain('role="dialog"');
+  expect(page).toContain('className={`usage-custom-quick-btn');
+  expect(page).not.toContain('id="usage-custom-quick"');
+  expect(css).toMatch(/\.usage-filters-wrap\s*\{[^}]*position:\s*relative/s);
+  expect(css).toMatch(/\.usage-custom-popover\s*\{[^}]*position:\s*absolute/s);
+  expect(css).toMatch(/\.usage-custom-popover\s*\{[^}]*z-index:/s);
+  expect(css).toMatch(/\.usage-custom-quick-btn\s*\{[^}]*border-radius:\s*var\(--radius-pill\)/s);
+});
diff --git a/gui/tests/usage-time-filter.test.tsx b/gui/tests/usage-time-filter.test.tsx
new file mode 100644
index 0000000000..71bc0d118f
--- /dev/null
+++ b/gui/tests/usage-time-filter.test.tsx
@@ -0,0 +1,119 @@
+import { afterEach, beforeEach, expect, test } from "bun:test";
+import { Window } from "happy-dom";
+import { act } from "react";
+import type { Root } from "react-dom/client";
+import { clearClientResourceStoresForTests } from "../src/client-resource";
+import { LanguageProvider } from "../src/i18n/provider";
+import Usage from "../src/pages/Usage";
+
+const globals = ["document", "window", "navigator", "localStorage", "IS_REACT_ACT_ENVIRONMENT"] as const;
+let previousGlobals: Record<(typeof globals)[number], unknown>;
+let testWindow: Window;
+const originalFetch = globalThis.fetch;
+
+const usagePayload = {
+  range: "30d", surface: "all", since: null, generatedAt: 1,
+  summary: {
+    requests: 0, measuredRequests: 0, reportedRequests: 0, unreportedRequests: 0,
+    unsupportedRequests: 0, estimatedRequests: 0, inputTokens: 0, outputTokens: 0,
+    cachedInputTokens: 0, reasoningOutputTokens: 0, totalTokens: 0, coverageRatio: 1,
+  },
+  days: [], models: [], providers: [], historyTruncated: false,
+  truncatedPrefixBytes: 0, entriesTruncated: false, entriesDropped: 0,
+};
+
+beforeEach(() => {
+  previousGlobals = Object.fromEntries(globals.map(key => [key, Reflect.get(globalThis, key)])) as typeof previousGlobals;
+  clearClientResourceStoresForTests();
+  testWindow = new Window({ url: "http://localhost/" });
+  Object.defineProperties(globalThis, {
+    document: { configurable: true, value: testWindow.document },
+    window: { configurable: true, value: testWindow },
+    navigator: { configurable: true, value: testWindow.navigator },
+    localStorage: { configurable: true, value: testWindow.localStorage },
+  });
+  (globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true;
+});
+
+afterEach(() => {
+  globalThis.fetch = originalFetch;
+  clearClientResourceStoresForTests();
+  testWindow.close();
+  for (const key of globals) Object.defineProperty(globalThis, key, { configurable: true, value: previousGlobals[key] });
+});
+
+async function waitFor(predicate: () => boolean, timeoutMs = 1000): Promise<void> {
+  const started = Date.now();
+  while (!predicate()) {
+    if (Date.now() - started > timeoutMs) throw new Error("waitFor timed out");
+    await act(async () => { await new Promise<void>(resolve => testWindow.setTimeout(resolve, 10)); });
+  }
+}
+
+function localDateInputValue(date: Date, endOfDay: boolean): string {
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, "0");
+  const day = String(date.getDate()).padStart(2, "0");
+  return `${year}-${month}-${day}T${endOfDay ? "23:59" : "00:00"}`;
+}
+
+test("usage keeps quick days inside a floating custom picker and applies them once", async () => {
+  const urls: string[] = [];
+  globalThis.fetch = (async input => {
+    urls.push(String(input));
+    return Response.json(usagePayload);
+  }) as typeof fetch;
+
+  const { createRoot } = await import("react-dom/client");
+  const container = document.createElement("div");
+  document.body.append(container);
+  let root!: Root;
+  await act(async () => {
+    root = createRoot(container);
+    root.render(<LanguageProvider><Usage apiBase="http://usage.test" /></LanguageProvider>);
+  });
+  await waitFor(() => urls.length === 1);
+
+  const buttons = () => Array.from(container.querySelectorAll<HTMLButtonElement>("button"));
+  expect(buttons().some(button => button.textContent?.trim() === "Today")).toBe(false);
+  expect(buttons().some(button => button.textContent?.trim() === "Yesterday")).toBe(false);
+  expect(buttons().some(button => button.textContent?.trim() === "7d")).toBe(true);
+  expect(buttons().some(button => button.textContent?.trim() === "30d")).toBe(true);
+
+  const custom = buttons().find(button => button.textContent?.trim() === "Custom...");
+  expect(custom).toBeTruthy();
+  await act(async () => { custom!.click(); });
+  const countAfterOpen = urls.length;
+  const popover = container.querySelector<HTMLElement>('.usage-custom-popover[role="dialog"]');
+  expect(popover).toBeTruthy();
+  expect(popover!.querySelector("select")).toBeNull();
+  const todayButton = Array.from(popover!.querySelectorAll<HTMLButtonElement>(".usage-custom-quick-btn"))
+    .find(button => button.textContent?.trim() === "Today");
+  const yesterdayButton = Array.from(popover!.querySelectorAll<HTMLButtonElement>(".usage-custom-quick-btn"))
+    .find(button => button.textContent?.trim() === "Yesterday");
+  expect(todayButton).toBeTruthy();
+  expect(yesterdayButton).toBeTruthy();
+
+  const today = new Date();
+  await act(async () => { todayButton!.click(); });
+  expect(urls).toHaveLength(countAfterOpen);
+  expect(todayButton!.getAttribute("aria-pressed")).toBe("true");
+  expect(yesterdayButton!.getAttribute("aria-pressed")).toBe("false");
+
+  const inputs = Array.from(popover!.querySelectorAll<HTMLInputElement>('input[type="datetime-local"]'));
+  expect(inputs).toHaveLength(2);
+  expect(inputs[0]!.value).toBe(localDateInputValue(today, false));
+  expect(inputs[1]!.value).toBe(localDateInputValue(today, true));
+  const apply = buttons().find(button => button.textContent?.trim() === "Apply");
+  expect(apply).toBeTruthy();
+  expect(apply!.disabled).toBe(false);
+  await act(async () => { apply!.click(); });
+  await waitFor(() => urls.length === countAfterOpen + 1);
+  const applied = new URL(urls.at(-1)!);
+  expect(applied.searchParams.get("since")).toBe(localDateInputValue(today, false));
+  expect(applied.searchParams.get("until")).toBe(localDateInputValue(today, true));
+  expect(container.querySelector(".usage-custom-popover")).toBeNull();
+
+  await act(async () => { root.unmount(); });
+  container.remove();
+});
diff --git a/skills/ocx/references/01_management_surface.md b/skills/ocx/references/01_management_surface.md
index 3a5a2ad989..e6f87172c1 100644
--- a/skills/ocx/references/01_management_surface.md
+++ b/skills/ocx/references/01_management_surface.md
@@ -99,9 +99,13 @@ Token and estimated-cost report over a time range.
 
 | Flag | Value | Meaning |
 |---|---|---|
-| `--range` | string | today | 1d | 7d | 30d | all |
+| `--range` | string | today | yesterday | 1d | 7d | 30d | all |
+| `--since` | string | Inclusive custom start date/time bound. |
+| `--until` | string | Inclusive custom end date/time bound. |
 | `--provider` | string | Restrict to one provider. |
 | `--model` | string | Restrict to one model id. |
+| `--offline` | boolean | Read the bounded local usage ledger without a running proxy. |
+| `--format` | string | table | markdown | json |
 | `--json` | boolean | Emit the usage report as JSON. |
 
 JSON mode: `payload`.
diff --git a/src/cli/capabilities.ts b/src/cli/capabilities.ts
index 76b85e0690..af5a3cb0f7 100644
--- a/src/cli/capabilities.ts
+++ b/src/cli/capabilities.ts
@@ -147,10 +147,14 @@ export const CAPABILITIES: readonly Capability[] = [
     summary: "Token and estimated-cost report over a time range.",
     routes: [{ method: "GET", path: "/api/usage" }],
     flags: [
-      { name: "--range", value: "string", summary: "today | 1d | 7d | 30d | all" },
-      { name: "--provider", value: "string", summary: "Restrict to one provider." },
-      { name: "--model", value: "string", summary: "Restrict to one model id." },
-      { name: "--json", value: "boolean", summary: "Emit the usage report as JSON." },
+        { name: "--range", value: "string", summary: "today | yesterday | 1d | 7d | 30d | all" },
+        { name: "--since", value: "string", summary: "Inclusive custom start date/time bound." },
+        { name: "--until", value: "string", summary: "Inclusive custom end date/time bound." },
+        { name: "--provider", value: "string", summary: "Restrict to one provider." },
+        { name: "--model", value: "string", summary: "Restrict to one model id." },
+        { name: "--offline", value: "boolean", summary: "Read the bounded local usage ledger without a running proxy." },
+        { name: "--format", value: "string", summary: "table | markdown | json" },
+        { name: "--json", value: "boolean", summary: "Emit the usage report as JSON." },
     ],
     mutates: false,
     json: "payload",
diff --git a/src/cli/observe.ts b/src/cli/observe.ts
index e89eea0de3..b82da6158d 100644
--- a/src/cli/observe.ts
+++ b/src/cli/observe.ts
@@ -1,5 +1,6 @@
 import {
   CliUsageError,
+  RuntimeApiError,
   printData,
   rejectArgs,
   runCliAction,
@@ -10,7 +11,9 @@ import {
   takeOption,
   type RuntimeApiDeps,
 } from "./runtime-api";
-import { formatUsageReport } from "./usage-report";
+import { formatUsageReport, formatUsageMarkdownReport } from "./usage-report";
+import { summarizeUsageFromLogFile } from "../usage/summary";
+import { parseTimeBoundary } from "../usage/time-range";
 import { USAGE_RANGES, USAGE_SURFACES } from "../usage/summary";
 
 const USAGE = `Usage:
@@ -19,8 +22,9 @@ const USAGE = `Usage:
   ocx logs explain <request-id> [--json]
   ocx logs rebuild-index
   ocx logs index-status
-  ocx observe usage [--range <today|1d|7d|30d|all>] [--surface <all|codex|claude|grok>]
-      [--provider <name>] [--model <id>] [--json]
+  ocx observe usage [--range <today|yesterday|1d|7d|30d|all>] [--since <time>] [--until <time>]
+      [--surface <all|codex|claude|grok>] [--provider <name>] [--model <id>]
+      [--offline] [--format <table|markdown|json>] [--json]
   ocx observe storage [codex-logs [status|protect|unprotect|repair|compact] [--mode <compat|quiet>]] [--json]
   ocx observe memory [--json]
   ocx observe debug [--json]
@@ -140,25 +144,65 @@ async function indexStatus(argv: string[], deps: RuntimeApiDeps): Promise<void>
 async function usage(argv: string[], deps: RuntimeApiDeps): Promise<void> {
   const args = [...argv];
   const wantsJson = takeFlag(args, "--json");
-  const range = takeOption(args, "--range") ?? "30d";
+  const wantsOffline = takeFlag(args, "--offline");
+  const formatOpt = takeOption(args, "--format") || (wantsJson ? "json" : "table");
+  const sinceOpt = takeOption(args, "--since");
+  const untilOpt = takeOption(args, "--until");
+  const range = takeOption(args, "--range") || (sinceOpt || untilOpt ? "custom" : "30d");
   const surface = takeOption(args, "--surface") ?? "all";
   const provider = takeOption(args, "--provider");
   const model = takeOption(args, "--model");
+  const now = Date.now();
+  const parsedSince = parseTimeBoundary(sinceOpt, now, false);
+  const parsedUntil = parseTimeBoundary(untilOpt, now, true);
+  if (sinceOpt !== undefined && parsedSince === null) throw new CliUsageError("--since must be a valid date/time", USAGE);
+  if (untilOpt !== undefined && parsedUntil === null) throw new CliUsageError("--until must be a valid date/time", USAGE);
+  if (parsedSince !== null && parsedUntil !== null && parsedSince > parsedUntil) {
+    throw new CliUsageError("--since must not be later than --until", USAGE);
+  }
+  if (!["table", "markdown", "json"].includes(formatOpt)) {
+    throw new CliUsageError("--format must be table, markdown, or json", USAGE);
+  }
   // `1d` is accepted here as well as server-side so the CLI does not reject an
   // alias the API would have understood.
-  const ranges = [...USAGE_RANGES, "1d"];
-  if (!ranges.includes(range)) throw new CliUsageError(`--range must be one of ${USAGE_RANGES.join(", ")} (1d aliases today)`, USAGE);
+  const ranges = [...USAGE_RANGES, "1d", "custom"];
+  if (!ranges.includes(range as any) && !sinceOpt && !untilOpt) {
+    throw new CliUsageError(`--range must be one of ${USAGE_RANGES.join(", ")} (1d aliases today)`, USAGE);
+  }
   if (!USAGE_SURFACES.includes(surface as (typeof USAGE_SURFACES)[number])) {
     throw new CliUsageError(`--surface must be one of ${USAGE_SURFACES.join(", ")}`, USAGE);
   }
   rejectArgs(args, USAGE);
-  const result = await runtimeRequest(`/api/usage${query({ range, surface, provider, model })}`, {}, deps);
-  // Built only when it will be printed: JavaScript evaluates arguments before
-  // the call, so passing formatUsageReport(...) inline would run the human
-  // renderer during --json and let its assumptions affect a path that is meant
-  // to bypass it entirely.
-  if (wantsJson) printData(result, true);
-  else printData(result, false, formatUsageReport(result as Parameters<typeof formatUsageReport>[0]));
+  let result: unknown;
+  let isOffline = wantsOffline;
+  if (!wantsOffline) {
+    try {
+      const qp: Record<string, string | undefined> = { range, surface, provider, model };
+      if (sinceOpt) qp.since = sinceOpt;
+      if (untilOpt) qp.until = untilOpt;
+      result = await runtimeRequest(`/api/usage${query(qp)}`, {}, deps);
+    } catch (error) {
+      if (error instanceof RuntimeApiError && error.status === 503) isOffline = true;
+      else throw error;
+    }
+  }
+  if (isOffline) {
+    result = await summarizeUsageFromLogFile({
+      range: range === "custom" ? "all" : (range as any),
+      since: sinceOpt,
+      until: untilOpt,
+      surface: surface as any,
+      provider,
+      model,
+    });
+  }
+  if (formatOpt === "json" || wantsJson) {
+    printData(result, true);
+  } else if (formatOpt === "markdown") {
+    printData(result, false, formatUsageMarkdownReport(result as any));
+  } else {
+    printData(result, false, formatUsageReport(result as any));
+  }
 }
 
 async function simple(path: string, argv: string[], deps: RuntimeApiDeps): Promise<void> {
diff --git a/src/cli/usage-report.ts b/src/cli/usage-report.ts
index e9f92f442d..3cd7971b2e 100644
--- a/src/cli/usage-report.ts
+++ b/src/cli/usage-report.ts
@@ -22,8 +22,10 @@ interface CostRow {
 
 interface UsageReportInput {
   range?: string;
+  rangeLabel?: string;
   surface?: string;
   since?: number | null;
+  until?: number | null;
   summary?: {
     requests?: number;
     totalTokens?: number;
@@ -182,3 +184,27 @@ export function formatUsageReport(data: UsageReportInput): string[] {
   lines.push("Not a billing receipt. Subscription usage or provider credits may apply instead.");
   return lines;
 }
+
+export function formatUsageMarkdownReport(data: UsageReportInput): string[] {
+  const summary = data.summary ?? {};
+  const label = data.rangeLabel || data.range || "custom";
+  const lines = [
+    "### OpenCodex Usage Report (" + label + ")",
+    "",
+    "- **Requests**: " + count(summary.requests),
+    "- **Total Tokens**: " + count(summary.totalTokens),
+    "  - Input Tokens: " + count(summary.inputTokens) + " (Cached: " + count(summary.cachedInputTokens) + ")",
+    "  - Output Tokens: " + count(summary.outputTokens),
+    "- **Estimated API Cost**: " + usd(summary.estimatedCostUsd),
+    ""
+  ];
+  const models = (data.models ?? []).filter(r => r.requests > 0);
+  if (models.length > 0) {
+    lines.push("| Model | Provider | Requests | Total Tokens | Est. Cost |");
+    lines.push("| :--- | :--- | :--- | :--- | :--- |");
+    for (const r of models) {
+      lines.push("| " + (r.model || "-") + " | " + r.provider + " | " + count(r.requests) + " | " + count(r.totalTokens) + " | " + usd(r.estimatedCostUsd) + " |");
+    }
+  }
+  return lines;
+}
diff --git a/src/server/management/logs-usage-routes.ts b/src/server/management/logs-usage-routes.ts
index 97dd327208..a03d28841a 100644
--- a/src/server/management/logs-usage-routes.ts
+++ b/src/server/management/logs-usage-routes.ts
@@ -54,6 +54,7 @@ import {
 } from "../../usage/log";
 import { getUsageDebugLogEntries } from "../../usage/debug";
 import { USAGE_RANGES, USAGE_SURFACES, parseRange, parseUsageSurface, projectUsageSummary, rangeWindow, summarizeUsage, type UsageRange, type UsageSummary, type UsageSurface } from "../../usage/summary";
+import { parseTimeBoundary, resolveTimeRange } from "../../usage/time-range";
 import { stripCodexRuntimeProviderFields } from "../../codex/auth-context";
 import { getProviderRegistryEntry } from "../../providers/registry";
 import { getDebugLogEntries } from "../../lib/debug-log-buffer";
@@ -193,8 +194,22 @@ export async function handleLogsUsageRoutes(ctx: ManagementContext): Promise<Res
   }
 
   if (url.pathname === "/api/usage" && req.method === "GET") {
+    const sinceInput = url.searchParams.get("since");
+    const untilInput = url.searchParams.get("until");
+    const customWindowRequested = sinceInput !== null || untilInput !== null;
+    const now = Date.now();
+    const customSince = parseTimeBoundary(sinceInput, now, false);
+    const customUntil = parseTimeBoundary(untilInput, now, true);
+    if (sinceInput !== null && customSince === null) return jsonResponse({ error: "invalid_since" }, 400);
+    if (untilInput !== null && customUntil === null) return jsonResponse({ error: "invalid_until" }, 400);
+    if (customSince !== null && customUntil !== null && customSince > customUntil) {
+      return jsonResponse({ error: "invalid_time_range" }, 400);
+    }
     const range = parseRange(url.searchParams.get("range"));
     const surface = parseUsageSurface(url.searchParams.get("surface"));
+    const rangeLabel = customWindowRequested
+      ? resolveTimeRange({ since: sinceInput, until: untilInput, now }).rangeLabel
+      : range;
     // Applied to the OUTGOING payload only. A filtered summary must never reach
     // the cache or the warm loop below: the key is `range:surface`, so a
     // filtered entry stored under it would be served to the next unfiltered
@@ -206,7 +221,6 @@ export async function handleLogsUsageRoutes(ctx: ManagementContext): Promise<Res
     const project = <T extends UsageSummary>(summary: T, entries?: PersistedUsageEntry[]) =>
       projectUsageSummary(summary, filter, entries);
     const filterRequested = Boolean(filter.provider ?? filter.model);
-    const now = Date.now();
     try {
       const cacheKey = `${range}:${surface}`;
       const effectiveReadLimit = config.managementUsageMaxReadBytes ?? 64 * 1024 * 1024;
@@ -221,6 +235,7 @@ export async function handleLogsUsageRoutes(ctx: ManagementContext): Promise<Res
         // re-summarisation replaced. The unfiltered cache stays warm either
         // way; only the filtered caller pays for the read.
         && !filterRequested
+        && !customWindowRequested
         && cached.identityKey === identityKey
         && cached.maxReadBytes === effectiveReadLimit
         && cached.overlayVersion === userCostOverlayVersion()
@@ -229,7 +244,7 @@ export async function handleLogsUsageRoutes(ctx: ManagementContext): Promise<Res
         && observedSize >= cached.lastSeenSize) {
         return jsonResponse(refreshedUsageSummary(cached.summary, range, now));
       }
-      if (cached && !filterRequested) discardUsageSummaryCacheEntry(cacheKey);
+      if (cached && !filterRequested && !customWindowRequested) discardUsageSummaryCacheEntry(cacheKey);
       // Capture the overlay version BEFORE reading/computing: the cache entry
       // must be stamped with the version the summary was priced under. Reading
       // it again at stamp time could cache an old-price summary as current,
@@ -240,7 +255,7 @@ export async function handleLogsUsageRoutes(ctx: ManagementContext): Promise<Res
       const revisionReadAt = Date.now();
       const window = snapshotWindow(snapshot.entries);
       const summary = {
-        ...summarizeUsage(snapshot.entries, range, now, surface),
+        ...summarizeUsage(snapshot.entries, range, now, surface, customSince, customUntil, rangeLabel),
         historyTruncated: snapshot.truncatedPrefixBytes > 0 || snapshot.entriesTruncated,
         truncatedPrefixBytes: snapshot.truncatedPrefixBytes,
         entriesTruncated: snapshot.entriesTruncated,
@@ -267,7 +282,7 @@ export async function handleLogsUsageRoutes(ctx: ManagementContext): Promise<Res
       const surfaces: readonly UsageSurface[] = USAGE_SURFACES;
       for (const nextRange of ranges) {
         for (const nextSurface of surfaces) {
-          const nextSummary = nextRange === range && nextSurface === surface ? summary : {
+          const nextSummary = !customWindowRequested && nextRange === range && nextSurface === surface ? summary : {
             ...summarizeUsage(snapshot.entries, nextRange, now, nextSurface),
             historyTruncated: summary.historyTruncated,
             truncatedPrefixBytes: summary.truncatedPrefixBytes,
diff --git a/src/usage/summary.ts b/src/usage/summary.ts
index cc3161aa16..2a8c116612 100644
--- a/src/usage/summary.ts
+++ b/src/usage/summary.ts
@@ -1,8 +1,10 @@
 import { baseProviderLabel } from "../providers/label";
 import { canonicalAntigravityUsageModel } from "../providers/antigravity-models";
 import { usageDisplayTotalTokens } from "./totals";
-import { isCodexUsageAccountLogLabel, type PersistedUsageEntry, type UsageStatus } from "./log";
+import { isCodexUsageAccountLogLabel, readUsageSnapshotForManagement, type PersistedUsageEntry, type UsageStatus } from "./log";
 import { type AttemptCostEstimate, type CostEstimate, estimateAttemptCost, estimateRequestCost, serviceTierContext, type ServiceTierContext } from "./cost";
+import { resolveTimeRange } from "./time-range";
+import { readFileSync } from "node:fs";
 
 /**
  * Canonical range members. The warm-up loop in the management usage route
@@ -11,7 +13,7 @@ import { type AttemptCostEstimate, type CostEstimate, estimateAttemptCost, estim
  * range added to the union but forgotten in the loop was never warmed and
  * never invalidated alongside its siblings.
  */
-export const USAGE_RANGES = ["today", "7d", "30d", "all"] as const;
+export const USAGE_RANGES = ["today", "yesterday", "7d", "30d", "all"] as const;
 export type UsageRange = typeof USAGE_RANGES[number];
 export const USAGE_SURFACES = ["all", "codex", "claude", "grok"] as const;
 export type UsageSurface = typeof USAGE_SURFACES[number];
@@ -136,8 +138,10 @@ export interface UsageAccount {
 
 export interface UsageSummary {
   range: UsageRange;
+  rangeLabel?: string;
   surface: UsageSurface;
   since: number | null;
+  until?: number | null;
   generatedAt: number;
   summary: UsageSummaryTotals;
   days: UsageDay[];
@@ -250,7 +254,7 @@ export function parseRange(input: string | null | undefined): UsageRange {
   // member would need its own cache slot, its own grid arm and its own test
   // matrix for no user-visible gain.
   if (input === "today" || input === "1d") return "today";
-  if (input === "7d" || input === "30d" || input === "all") return input;
+  if (input === "yesterday" || input === "7d" || input === "30d" || input === "all") return input;
   return "30d";
 }
 
@@ -265,23 +269,29 @@ function startOfLocalDay(ts: number): number {
   return d.getTime();
 }
 
-export function rangeWindow(range: UsageRange, now: number): { since: number | null; days: number } {
-  // Handled before the others because the fallthrough below is the `all`
-  // window: a range that reaches it is silently reported as all-time history,
-  // which for a cost surface is a plausible-looking wrong answer rather than a
-  // visible failure.
-  if (range === "today") return { since: startOfLocalDay(now), days: 1 };
-  if (range === "7d") {
-    const start = new Date(startOfLocalDay(now));
-    start.setDate(start.getDate() - 6);
-    return { since: start.getTime(), days: 7 };
+function localCalendarDayCount(since: number, until: number): number {
+  const cursor = new Date(startOfLocalDay(since));
+  const end = startOfLocalDay(until);
+  let days = 1;
+  while (cursor.getTime() < end) {
+    cursor.setDate(cursor.getDate() + 1);
+    days += 1;
   }
-  if (range === "30d") {
-    const start = new Date(startOfLocalDay(now));
-    start.setDate(start.getDate() - 29);
-    return { since: start.getTime(), days: 30 };
-  }
-  return { since: null, days: 0 };
+  return days;
+}
+
+export function rangeWindow(range: UsageRange, now: number, customSince?: number | null, customUntil?: number | null): { since: number | null; until: number | null; days: number } {
+  const { since, until } = resolveTimeRange({
+    range,
+    since: customSince,
+    until: customUntil,
+    now,
+  });
+  return {
+    since,
+    until,
+    days: since === null ? 0 : localCalendarDayCount(since, until ?? now),
+  };
 }
 
 function localDateKey(ts: number): string {
@@ -504,9 +514,11 @@ function addEstimatedCost(
   totals.estimatedCostUsd += costInfo.costTotal;
 }
 
-function buildDayGrid(range: UsageRange, since: number | null, now: number, entries: PersistedUsageEntry[], costMap: Map<PersistedUsageEntry, EntryCostInfo>): UsageDay[] {
-  const window = rangeWindow(range, now);
-  const days = range === "all" ? dayCountForAllRange(entries, now) : window.days;
+function buildDayGrid(range: UsageRange, since: number | null, until: number | null, now: number, entries: PersistedUsageEntry[], costMap: Map<PersistedUsageEntry, EntryCostInfo>): UsageDay[] {
+  const gridEnd = until ?? now;
+  const days = since !== null
+    ? localCalendarDayCount(since, gridEnd)
+    : (range === "all" ? dayCountForAllRange(entries, gridEnd) : rangeWindow(range, now).days);
   const grid = new Map<string, UsageDay>();
   // Per-day model breakdown accumulator, keyed by day then provider/model, so the 7d bar chart can
   // render a per-model stacked bar with a hover tooltip without a second pass over the entries.
@@ -552,7 +564,7 @@ function buildDayGrid(range: UsageRange, since: number | null, now: number, entr
     }
     m.totalTokens += usageDisplayTotalTokens(attribution.usage, attribution.totalTokens) ?? 0;
   };
-  const startOfToday = startOfLocalDay(now);
+  const startOfToday = startOfLocalDay(gridEnd);
   for (let i = days - 1; i >= 0; i--) {
     const d = new Date(startOfToday);
     d.setDate(d.getDate() - i);
@@ -1087,10 +1099,14 @@ export function summarizeUsage(
   range: UsageRange,
   now: number,
   surface: UsageSurface = "all",
+  customSince?: number | null,
+  customUntil?: number | null,
+  rangeLabel?: string,
 ): UsageSummary {
-  const { since } = rangeWindow(range, now);
+  const { since, until } = rangeWindow(range, now, customSince, customUntil);
   const filteredEntries = entries.filter(entry => {
     if (since !== null && entry.timestamp < since) return false;
+    if (until !== null && entry.timestamp > until) return false;
     if (surface === "claude") return entry.surface === "claude" || entry.surface === "claude-desktop";
     if (surface === "grok") return entry.surface === "grok";
     // Codex = the historical unlabelled bucket. Before the grok tag existed every
@@ -1113,11 +1129,13 @@ export function summarizeUsage(
   finalizeCoverage(totals);
   return {
     range,
+    rangeLabel: rangeLabel ?? range,
     surface,
     since,
+    until,
     generatedAt: now,
     summary: totals,
-    days: buildDayGrid(range, since, now, filteredEntries, costMap),
+    days: buildDayGrid(range, since, until, now, filteredEntries, costMap),
     models: buildModels(filteredEntries, totals.totalTokens, costMap),
     providers: buildProviders(filteredEntries, totals.totalTokens, costMap),
     accounts: buildAccounts(filteredEntries, costMap),
@@ -1184,7 +1202,18 @@ export function projectUsageSummary<T extends UsageSummary>(
     filtered.push({ ...withoutParentUsage, attempts, ...projectedComboUsage(attempts) });
   }
 
-  const projected = summarizeUsage(filtered, summary.range, summary.generatedAt, summary.surface);
+  const projected = summarizeUsage(
+    filtered,
+    summary.range,
+    summary.generatedAt,
+    summary.surface,
+    summary.since,
+    summary.until,
+    summary.rangeLabel,
+  );
+  // matched reflects usage inside the requested WINDOW, not anywhere in the
+  // log: summarizeUsage applies the range and surface predicates, and the CLI
+  // uses this flag to decide between a table and "no usage recorded".
   const matched = projected.summary.requests > 0;
   const models = projected.models.filter(row => matches(row.provider, row.model));
   const retainedProviders = new Set(models.map(row => row.provider));
@@ -1198,3 +1227,47 @@ export function projectUsageSummary<T extends UsageSummary>(
     filter: { provider, model, matched, comboOverlap },
   };
 }
+
+
+export async function summarizeUsageFromLogFile(options: {
+  filePath?: string;
+  range?: UsageRange;
+  since?: string | number | null;
+  until?: string | number | null;
+  surface?: UsageSurface;
+  provider?: string | null;
+  model?: string | null;
+  now?: number;
+}): Promise<UsageSummary & { filter?: UsageFilterEcho }> {
+  const now = options.now ?? Date.now();
+  const resolved = resolveTimeRange({
+    range: options.range,
+    since: options.since,
+    until: options.until,
+    now,
+  });
+
+  let entries: PersistedUsageEntry[];
+  if (options.filePath) {
+    const content = readFileSync(options.filePath, "utf-8");
+    entries = [];
+    for (const line of content.split(/\r?\n/)) {
+      const trimmed = line.trim();
+      if (!trimmed) continue;
+      try { entries.push(JSON.parse(trimmed)); } catch { /* malformed rows are skipped like the canonical reader */ }
+    }
+  } else {
+    entries = (await readUsageSnapshotForManagement()).entries;
+  }
+
+  const summary = summarizeUsage(
+    entries,
+    options.range ?? "30d",
+    now,
+    options.surface ?? "all",
+    resolved.since,
+    resolved.until,
+    resolved.rangeLabel,
+  );
+  return projectUsageSummary(summary, { provider: options.provider, model: options.model }, entries);
+}
diff --git a/src/usage/time-range.ts b/src/usage/time-range.ts
new file mode 100644
index 0000000000..d56d4194a9
--- /dev/null
+++ b/src/usage/time-range.ts
@@ -0,0 +1,200 @@
+/**
+ * Flexible time parsing and range window resolution for OpenCodex usage analytics.
+ */
+
+export interface TimeRangeResolution {
+  since: number | null;
+  until: number | null;
+  rangeLabel: string;
+  isCustom: boolean;
+}
+
+const RELATIVE_TIME_RE = /^(\d+)\s*(m|min|minute|minutes|h|hr|hour|hours|d|day|days|w|week|weeks)\s*(?:ago)?$/i;
+const TIME_OF_DAY_RE = /^(\d{1,2}):(\d{2})(?::(\d{2}))?$/;
+const DATE_TIME_TO_MINUTE_RE = /^\d{4}-\d{2}-\d{2}[ T]\d{1,2}:\d{2}$/;
+
+function clockFields(match: RegExpMatchArray, isEndOfWindow: boolean): [number, number, number, number] | null {
+  const hour = Number(match[1]);
+  const minute = Number(match[2]);
+  const second = match[3] === undefined ? (isEndOfWindow ? 59 : 0) : Number(match[3]);
+  if (hour > 23 || minute > 59 || second > 59) return null;
+  return [hour, minute, second, isEndOfWindow ? 999 : 0];
+}
+
+function startOfLocalDay(ts: number, dayOffset = 0): number {
+  const d = new Date(ts);
+  d.setHours(0, 0, 0, 0);
+  if (dayOffset !== 0) d.setDate(d.getDate() + dayOffset);
+  return d.getTime();
+}
+
+function endOfLocalDay(ts: number, dayOffset = 0): number {
+  const d = new Date(ts);
+  d.setHours(23, 59, 59, 999);
+  if (dayOffset !== 0) d.setDate(d.getDate() + dayOffset);
+  return d.getTime();
+}
+
+/**
+ * Parse a date/time string, timestamp, or natural language expression into epoch milliseconds.
+ */
+export function parseTimeBoundary(input: string | number | null | undefined, now = Date.now(), isEndOfWindow = false): number | null {
+  if (input === null || input === undefined) return null;
+  if (typeof input === "number") {
+    if (!Number.isFinite(input)) return null;
+    // Detect 10-digit seconds timestamp
+    return input < 1e11 ? input * 1000 : input;
+  }
+
+  const raw = String(input).trim();
+  if (!raw) return null;
+
+  // Check pure numeric timestamp
+  if (/^\d{10,13}$/.test(raw)) {
+    const num = Number(raw);
+    return raw.length <= 10 ? num * 1000 : num;
+  }
+
+  const lower = raw.toLowerCase();
+  if (lower === "now") return now;
+
+  // "today" or "today 14:30"
+  if (lower === "today" || lower.startsWith("today ")) {
+    const base = startOfLocalDay(now, 0);
+    const rest = raw.slice(5).trim();
+    if (!rest) return isEndOfWindow ? endOfLocalDay(now, 0) : base;
+    const match = rest.match(TIME_OF_DAY_RE);
+    if (match) {
+      const fields = clockFields(match, isEndOfWindow);
+      if (!fields) return null;
+      const d = new Date(base);
+      d.setHours(...fields);
+      return d.getTime();
+    }
+  }
+
+  // "yesterday" or "yesterday 09:17"
+  if (lower === "yesterday" || lower.startsWith("yesterday ")) {
+    const base = startOfLocalDay(now, -1);
+    const rest = raw.slice(9).trim();
+    if (!rest) return isEndOfWindow ? endOfLocalDay(now, -1) : base;
+    const match = rest.match(TIME_OF_DAY_RE);
+    if (match) {
+      const fields = clockFields(match, isEndOfWindow);
+      if (!fields) return null;
+      const d = new Date(base);
+      d.setHours(...fields);
+      return d.getTime();
+    }
+  }
+
+  // Relative duration like "2h ago", "3d", "30m"
+  const relMatch = lower.match(RELATIVE_TIME_RE);
+  if (relMatch) {
+    const count = Number(relMatch[1]);
+    const unit = relMatch[2].toLowerCase();
+    let multiplier = 1000;
+    if (unit.startsWith("m")) multiplier = 60 * 1000;
+    else if (unit.startsWith("h")) multiplier = 3600 * 1000;
+    else if (unit.startsWith("d")) multiplier = 86400 * 1000;
+    else if (unit.startsWith("w")) multiplier = 7 * 86400 * 1000;
+    return now - count * multiplier;
+  }
+
+  // Date string with space, e.g. "2026-08-29 09:17:00" -> convert space to T for ISO parsing
+  let normalized = raw;
+  if (/^\d{4}-\d{2}-\d{2}\s+\d{1,2}:\d{2}/.test(raw)) {
+    normalized = raw.replace(/\s+/, "T");
+  }
+
+  const parsed = Date.parse(normalized);
+  if (!Number.isNaN(parsed)) {
+    // If input was date-only like "2026-08-29" and isEndOfWindow is true, extend to end of day
+    if (/^\d{4}-\d{2}-\d{2}$/.test(raw) && isEndOfWindow) {
+      return endOfLocalDay(parsed, 0);
+    }
+    if (DATE_TIME_TO_MINUTE_RE.test(raw) && isEndOfWindow) {
+      const inclusiveMinute = new Date(parsed);
+      inclusiveMinute.setSeconds(59, 999);
+      return inclusiveMinute.getTime();
+    }
+    return parsed;
+  }
+
+  return null;
+}
+
+/**
+ * Resolve window bounds from canonical range and/or custom since/until flags.
+ */
+export function resolveTimeRange(options: {
+  range?: string | null;
+  since?: string | number | null;
+  until?: string | number | null;
+  now?: number;
+}): TimeRangeResolution {
+  const now = options.now ?? Date.now();
+  const customSince = parseTimeBoundary(options.since, now, false);
+  const customUntil = parseTimeBoundary(options.until, now, true);
+
+  if (customSince !== null || customUntil !== null) {
+    const sinceStr = typeof options.since === "string" ? options.since : (customSince ? new Date(customSince).toISOString().replace("T", " ").slice(0, 19) : "*");
+    const untilStr = typeof options.until === "string" ? options.until : (customUntil ? new Date(customUntil).toISOString().replace("T", " ").slice(0, 19) : "*");
+    return {
+      since: customSince,
+      until: customUntil,
+      rangeLabel: `${sinceStr} ~ ${untilStr}`,
+      isCustom: true,
+    };
+  }
+
+  const range = (options.range ?? "30d").toLowerCase();
+  if (range === "today" || range === "1d") {
+    return {
+      since: startOfLocalDay(now, 0),
+      until: null,
+      rangeLabel: "today",
+      isCustom: false,
+    };
+  }
+  if (range === "yesterday") {
+    return {
+      since: startOfLocalDay(now, -1),
+      until: endOfLocalDay(now, -1),
+      rangeLabel: "yesterday",
+      isCustom: false,
+    };
+  }
+  if (range === "7d") {
+    return {
+      since: startOfLocalDay(now, -6),
+      until: null,
+      rangeLabel: "7d",
+      isCustom: false,
+    };
+  }
+  if (range === "30d") {
+    return {
+      since: startOfLocalDay(now, -29),
+      until: null,
+      rangeLabel: "30d",
+      isCustom: false,
+    };
+  }
+  if (range === "all") {
+    return {
+      since: null,
+      until: null,
+      rangeLabel: "all",
+      isCustom: false,
+    };
+  }
+
+  // Fallback to 30d
+  return {
+    since: startOfLocalDay(now, -29),
+    until: null,
+    rangeLabel: "30d",
+    isCustom: false,
+  };
+}
diff --git a/tests/api-usage.test.ts b/tests/api-usage.test.ts
index 781412a331..bd1045f131 100644
--- a/tests/api-usage.test.ts
+++ b/tests/api-usage.test.ts
@@ -513,6 +513,83 @@ describe("GET /api/usage", () => {
     }
   });
 
+  test("yesterday narrows the window to the previous local day", async () => {
+    const now = Date.now();
+    writeFixture(now);
+    const server = startServer(0);
+    try {
+      const body = await fetch(new URL("/api/usage?range=yesterday", server.url)).then(res => res.json());
+      expect(body.range).toBe("yesterday");
+      expect(body.since).not.toBeNull();
+      expect(body.until).not.toBeNull();
+      expect(body.summary.requests).toBe(2);
+      expect(body.days).toHaveLength(1);
+    } finally {
+      await server.stop(true);
+    }
+  });
+
+  test("custom since/until bounds are applied and echoed", async () => {
+    const now = Date.now();
+    writeFixture(now);
+    const since = now - 2 * 86_400_000;
+    const until = now - 12 * 60 * 60_000;
+    const server = startServer(0);
+    try {
+      const url = new URL("/api/usage?range=all", server.url);
+      url.searchParams.set("since", String(since));
+      url.searchParams.set("until", String(until));
+      const body = await fetch(url).then(res => res.json());
+      expect(body.since).toBe(since);
+      expect(body.until).toBe(until);
+      expect(body.summary.requests).toBe(2);
+    } finally {
+      await server.stop(true);
+    }
+  });
+
+  test("custom bounds compose with provider filters without polluting preset caches", async () => {
+    const now = Date.now();
+    writeFixture(now);
+    const since = now - 2 * 86_400_000;
+    const server = startServer(0);
+    try {
+      const custom = new URL("/api/usage?range=all&provider=openai", server.url);
+      custom.searchParams.set("since", String(since));
+      const filtered = await fetch(custom).then(res => res.json());
+      expect(filtered.summary.requests).toBe(1);
+      expect(filtered.summary.totalTokens).toBe(15);
+      expect(filtered.models).toHaveLength(1);
+      expect(filtered.filter).toMatchObject({ provider: "openai", matched: true });
+
+      const preset = await fetch(new URL("/api/usage?range=all", server.url)).then(res => res.json());
+      expect(preset.summary.requests).toBe(3);
+      expect(preset.summary.totalTokens).toBe(165);
+    } finally {
+      await server.stop(true);
+    }
+  });
+
+  test("invalid custom bounds fail closed", async () => {
+    writeFixture(Date.now());
+    const server = startServer(0);
+    try {
+      const malformed = await fetch(new URL("/api/usage?range=all&since=not-a-time", server.url));
+      expect(malformed.status).toBe(400);
+      expect(await malformed.json()).toMatchObject({ error: "invalid_since" });
+
+      const invalidClock = await fetch(new URL("/api/usage?range=all&since=today%2023:99", server.url));
+      expect(invalidClock.status).toBe(400);
+      expect(await invalidClock.json()).toMatchObject({ error: "invalid_since" });
+
+      const reversed = await fetch(new URL("/api/usage?range=all&since=2000&until=1000", server.url));
+      expect(reversed.status).toBe(400);
+      expect(await reversed.json()).toMatchObject({ error: "invalid_time_range" });
+    } finally {
+      await server.stop(true);
+    }
+  });
+
   test("1d is an alias for today, not a separate range", async () => {
     writeFixture(Date.now());
     const server = startServer(0);
diff --git a/tests/cli-usage-report.test.ts b/tests/cli-usage-report.test.ts
index 92933843aa..2d58ba696a 100644
--- a/tests/cli-usage-report.test.ts
+++ b/tests/cli-usage-report.test.ts
@@ -159,6 +159,32 @@ describe("ocx usage command", () => {
     expect(new URL(urls[0]!).searchParams.get("range")).toBe("1d");
   });
 
+  test("forwards custom since and until bounds", async () => {
+    const { code, urls } = await run([
+      "usage", "--since", "2026-08-29 09:17", "--until", "2026-08-30 04:23",
+    ], payload());
+    expect(code).toBe(0);
+    const url = new URL(urls[0]!);
+    expect(url.searchParams.get("since")).toBe("2026-08-29 09:17");
+    expect(url.searchParams.get("until")).toBe("2026-08-30 04:23");
+  });
+
+  test("does not hide a non-503 management error behind offline fallback", async () => {
+    const errors: string[] = [];
+    const originalError = console.error;
+    console.error = (...args: unknown[]) => { errors.push(args.map(String).join(" ")); };
+    try {
+      const code = await handleObserveCommand(["usage"], {
+        baseUrl: "http://cli.test",
+        fetchImpl: async () => Response.json({ error: "invalid_since" }, { status: 400 }),
+      });
+      expect(code).toBe(1);
+      expect(errors.join("\n")).toContain("invalid_since");
+    } finally {
+      console.error = originalError;
+    }
+  });
+
   test("rejects an unknown range and names today as valid", async () => {
     const errors: string[] = [];
     const originalError = console.error;
diff --git a/tests/usage-summary.test.ts b/tests/usage-summary.test.ts
index 0b83e071fe..9a93b413ea 100644
--- a/tests/usage-summary.test.ts
+++ b/tests/usage-summary.test.ts
@@ -226,7 +226,7 @@ import { projectUsageSummary } from "../src/usage/summary";
 
 describe("canonical range and surface constants", () => {
   test("the exported members match what the parsers accept", () => {
-    expect([...USAGE_RANGES]).toEqual(["today", "7d", "30d", "all"]);
+    expect([...USAGE_RANGES]).toEqual(["today", "yesterday", "7d", "30d", "all"]);
     expect([...USAGE_SURFACES]).toEqual(["all", "codex", "claude", "grok"]);
     for (const range of USAGE_RANGES) expect(parseRange(range)).toBe(range);
     for (const surface of USAGE_SURFACES) expect(parseUsageSurface(surface)).toBe(surface);
diff --git a/tests/usage-time-range-enhanced.test.ts b/tests/usage-time-range-enhanced.test.ts
new file mode 100644
index 0000000000..c6931b5a54
--- /dev/null
+++ b/tests/usage-time-range-enhanced.test.ts
@@ -0,0 +1,232 @@
+import { describe, expect, it } from "bun:test";
+import { parseTimeBoundary, resolveTimeRange } from "../src/usage/time-range";
+import { summarizeUsage, summarizeUsageFromLogFile } from "../src/usage/summary";
+import { formatUsageMarkdownReport } from "../src/cli/usage-report";
+import { writeFileSync, mkdtempSync, rmSync } from "node:fs";
+import { join } from "node:path";
+import { tmpdir } from "node:os";
+
+describe("Time Range Parsing & Resolution", () => {
+  const fixedNow = new Date("2026-08-30T12:00:00+08:00").getTime();
+
+  it("parses numeric epoch timestamps", () => {
+    expect(parseTimeBoundary(1787966220000, fixedNow)).toBe(1787966220000);
+    expect(parseTimeBoundary("1787966220000", fixedNow)).toBe(1787966220000);
+    // 10-digit seconds timestamp
+    expect(parseTimeBoundary(1787966220, fixedNow)).toBe(1787966220000);
+  });
+
+  it("parses ISO and space-separated date times", () => {
+    const ts = parseTimeBoundary("2026-08-29 09:17:00", fixedNow);
+    expect(ts).toBeNumber();
+    const d = new Date(ts!);
+    expect(d.getFullYear()).toBe(2026);
+    expect(d.getMonth()).toBe(7); // August (0-indexed)
+    expect(d.getDate()).toBe(29);
+  });
+
+  it("parses relative natural expressions (today, yesterday, Xh ago)", () => {
+    const yesterdayTs = parseTimeBoundary("yesterday 09:17", fixedNow);
+    expect(yesterdayTs).toBeNumber();
+    const d = new Date(yesterdayTs!);
+    expect(d.getDate()).toBe(29);
+    expect(d.getHours()).toBe(9);
+    expect(d.getMinutes()).toBe(17);
+
+    const twoHoursAgo = parseTimeBoundary("2h ago", fixedNow);
+    expect(twoHoursAgo).toBe(fixedNow - 2 * 3600 * 1000);
+  });
+
+  it("rejects out-of-range clock fields in today and yesterday expressions", () => {
+    for (const input of [
+      "today 24:00",
+      "today 23:60",
+      "today 23:59:60",
+      "yesterday 24:00",
+      "yesterday 23:60",
+      "yesterday 23:59:60",
+    ]) {
+      expect(parseTimeBoundary(input, fixedNow)).toBeNull();
+    }
+  });
+
+  it("resolves time range window bounds correctly", () => {
+    const custom = resolveTimeRange({
+      since: "2026-08-29 09:17",
+      until: "2026-08-30 04:23",
+      now: fixedNow,
+    });
+    expect(custom.isCustom).toBe(true);
+    expect(custom.since).toBeNumber();
+    expect(custom.until).toBeNumber();
+    expect(custom.until!).toBeGreaterThan(custom.since!);
+  });
+
+  it("resolves yesterday to the complete previous local calendar day", () => {
+    const expectedSince = new Date(fixedNow);
+    expectedSince.setHours(0, 0, 0, 0);
+    expectedSince.setDate(expectedSince.getDate() - 1);
+    const expectedUntil = new Date(expectedSince);
+    expectedUntil.setHours(23, 59, 59, 999);
+
+    expect(resolveTimeRange({ range: "yesterday", now: fixedNow })).toEqual({
+      since: expectedSince.getTime(),
+      until: expectedUntil.getTime(),
+      rangeLabel: "yesterday",
+      isCustom: false,
+    });
+  });
+
+  it("treats a minute-precision until boundary as inclusive through that minute", () => {
+    const boundary = parseTimeBoundary("2026-08-29T23:59", fixedNow, true);
+    const parsed = new Date(boundary!);
+
+    expect(parsed.getFullYear()).toBe(2026);
+    expect(parsed.getMonth()).toBe(7);
+    expect(parsed.getDate()).toBe(29);
+    expect(parsed.getHours()).toBe(23);
+    expect(parsed.getMinutes()).toBe(59);
+    expect(parsed.getSeconds()).toBe(59);
+    expect(parsed.getMilliseconds()).toBe(999);
+  });
+});
+describe("Usage Summarization and Markdown Output", () => {
+  it("builds the daily grid from custom bounds even when the range token is all", () => {
+    const now = new Date("2026-08-30T12:00:00+08:00").getTime();
+    const since = new Date(2026, 7, 29, 9, 17).getTime();
+    const until = new Date(2026, 7, 30, 4, 23, 59, 999).getTime();
+
+    const summary = summarizeUsage([], "all", now, "all", since, until, "custom");
+
+    expect(summary.days.map(day => day.date)).toEqual(["2026-08-29", "2026-08-30"]);
+  });
+
+  it("formats markdown report properly", () => {
+    const md = formatUsageMarkdownReport({
+      range: "custom",
+      rangeLabel: "2026-08-29 09:17 ~ 2026-08-30 04:23",
+      summary: {
+        requests: 100,
+        totalTokens: 50000,
+        inputTokens: 45000,
+        cachedInputTokens: 40000,
+        outputTokens: 5000,
+        estimatedCostUsd: 1.25,
+      },
+      models: [
+        { model: "gpt-5.6-sol", provider: "openai", requests: 80, totalTokens: 40000, estimatedCostUsd: 1.10 },
+        { model: "gpt-5.6-luna", provider: "openai", requests: 20, totalTokens: 10000, estimatedCostUsd: 0.15 },
+      ],
+    });
+
+    const text = md.join("\n");
+    expect(text).toContain("### OpenCodex Usage Report");
+    expect(text).toContain("| gpt-5.6-sol | openai | 80 | 40,000 |");
+    expect(text).toContain("Estimated API Cost");
+  });
+
+  it("can summarize usage from offline jsonl file", async () => {
+    const tmpDir = mkdtempSync(join(tmpdir(), "ocx-test-"));
+    const tmpFile = join(tmpDir, "test-usage.jsonl");
+
+    const sample = [
+      JSON.stringify({
+        requestId: "req-1",
+        timestamp: 1787966300000,
+        provider: "openai",
+        model: "gpt-5.6-sol",
+        usageStatus: "reported",
+        usage: { inputTokens: 1000, outputTokens: 100, cachedInputTokens: 800, totalTokens: 1100 },
+        totalTokens: 1100,
+      }),
+      JSON.stringify({
+        requestId: "req-2",
+        timestamp: 1787966400000,
+        provider: "openai",
+        model: "gpt-5.6-luna",
+        usageStatus: "reported",
+        usage: { inputTokens: 2000, outputTokens: 200, cachedInputTokens: 1500, totalTokens: 2200 },
+        totalTokens: 2200,
+      }),
+    ].join("\n");
+
+    writeFileSync(tmpFile, sample, "utf-8");
+
+    const summary = await summarizeUsageFromLogFile({
+      filePath: tmpFile,
+      since: 1787966200000,
+      until: 1787966500000,
+    });
+
+    expect(summary.summary.requests).toBe(2);
+    expect(summary.summary.totalTokens).toBe(3300);
+    expect(summary.models.length).toBe(2);
+
+    rmSync(tmpDir, { recursive: true, force: true });
+  });
+
+  it("uses the yesterday preset when summarizing an offline jsonl file", async () => {
+    const tmpDir = mkdtempSync(join(tmpdir(), "ocx-test-yesterday-"));
+    const tmpFile = join(tmpDir, "test-usage.jsonl");
+    const now = new Date(2026, 7, 30, 12).getTime();
+    const yesterday = new Date(2026, 7, 29, 12).getTime();
+    const today = new Date(2026, 7, 30, 1).getTime();
+    const twoDaysAgo = new Date(2026, 7, 28, 12).getTime();
+    const row = (requestId: string, timestamp: number) => JSON.stringify({
+      requestId,
+      timestamp,
+      provider: "openai",
+      model: "gpt-5.6-sol",
+      usageStatus: "reported",
+      usage: { inputTokens: 100, outputTokens: 10 },
+      totalTokens: 110,
+    });
+    writeFileSync(tmpFile, [
+      row("two-days-ago", twoDaysAgo),
+      row("yesterday", yesterday),
+      row("today", today),
+    ].join("\n"), "utf-8");
+
+    const summary = await summarizeUsageFromLogFile({
+      filePath: tmpFile,
+      range: "yesterday",
+      now,
+    });
+
+    expect(summary.summary.requests).toBe(1);
+    expect(summary.summary.totalTokens).toBe(110);
+    expect(summary.days).toHaveLength(1);
+    expect(summary.days[0]?.date).toBe("2026-08-29");
+    rmSync(tmpDir, { recursive: true, force: true });
+  });
+
+  it("applies provider and model filters in offline mode", async () => {
+    const tmpDir = mkdtempSync(join(tmpdir(), "ocx-test-filter-"));
+    const tmpFile = join(tmpDir, "test-usage.jsonl");
+    const at = 1787966300000;
+    writeFileSync(tmpFile, [
+      JSON.stringify({
+        requestId: "openai-1", timestamp: at, provider: "openai", model: "gpt-5.6-sol",
+        usageStatus: "reported", usage: { inputTokens: 100, outputTokens: 10 }, totalTokens: 110,
+      }),
+      JSON.stringify({
+        requestId: "google-1", timestamp: at, provider: "google-antigravity", model: "gemini-3.7-flash",
+        usageStatus: "reported", usage: { inputTokens: 200, outputTokens: 20 }, totalTokens: 220,
+      }),
+    ].join("\n"), "utf-8");
+
+    const summary = await summarizeUsageFromLogFile({
+      filePath: tmpFile,
+      range: "all",
+      provider: "google-antigravity",
+      model: "gemini-3.7-flash",
+    });
+
+    expect(summary.summary.requests).toBe(1);
+    expect(summary.summary.totalTokens).toBe(220);
+    expect(summary.models).toHaveLength(1);
+    expect(summary.models[0]).toMatchObject({ provider: "google-antigravity", model: "gemini-3.7-flash" });
+    expect(summary.filter).toMatchObject({ provider: "google-antigravity", model: "gemini-3.7-flash", matched: true });
+    rmSync(tmpDir, { recursive: true, force: true });
+  });
+});