Skip to content

Commit bb8d2f2

Browse files
dhhclaude
andauthored
Split agent usage into data files and rename the plugin to omarchy.agents (omacom#6603)
* Add agent usage collectors that write display-ready data files One omarchy-agent-usage-scan-<agent> collector per AI coding agent prints a complete display-ready usage record — identity, tier, status, rate limits, and today/week/all-time stats. omarchy-agent-usage-update runs every collector it finds and writes the records atomically to ~/.local/state/omarchy/agents/usage/, so anything that displays usage only ever reads JSON from there. The Claude collector absorbs what the shell previously did in-process: transcript scanning, the stats-cache/history fallback, credentials parsing, and the OAuth limits probe, now with a probe throttle and last-good limits kept across network failures. The Codex collector is the existing scanner reshaped to the shared record contract. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Redo the model-usage plugin as omarchy.agents watching usage data files The panel is now strictly a display. It discovers the JSON records that omarchy-agent-usage-update maintains under ~/.local/state/omarchy/agents/usage/, watches them for changes, and draws whatever appears — so adding an agent means shipping a collector, never touching the panel. Marks resolve by convention (assets/<id>.svg with an optional -light twin), the limits meters read a generic limits array, and the per-provider QML adapters and in-plugin scanner scripts are gone. Cross-device sync aggregation stays in the shell and keeps the snapshot field names older versions wrote, so mixed-version fleets still merge in both directions. With the provider fan-out gone, the widget takes its real name: the plugin id becomes omarchy.agents. A migration renames it wherever a user's config mentions it — layout entries keep their settings and position, a disabled widget stays disabled — then primes the data files once and drops the old scanner cache. The migration test also drops a stale assertion that expected migrations to restart the shell themselves, which c992cdf moved to omarchy update. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Address Codex review: synced-only tabs, limits retry, history fallback Three data-availability gaps from review. An agent whose records only exist in synced snapshots — a collector installed on just one machine — now gets its tab by unioning the synced aggregate into the provider list, with rate limits blank since those never travel. A Claude limits probe that reaches no server at all writes retryAdvised into its record, and the shell honors it with one 30-second retry instead of waiting out the full refresh interval, restoring the old boot-before-DHCP behavior. And a machine with only history.jsonl — no transcripts, no stats-cache — still reports today's prompt and session counts. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Address second Codex pass: history-only visibility, targeted retries Today's prompt and session counts now count toward an agent's presence in the bar, so a machine whose only Claude source is history.jsonl shows up without waiting for limits. And the 30-second limits retry passes the advising agent ids to the updater, so an outage at one provider no longer puts every other collector on a retry treadmill. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Drop omarchy-cmd-present jq guards from the agents migrations jq ships in the default package set, which makes it a runtime invariant per AGENTS.md — call it directly. The migration tests lose their now-unused omarchy-cmd-present stubs with it. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Drop the scan infix from the collector command names Collectors are omarchy-agent-usage-<agent>; the updater skips its own name when globbing them, and the update test proves it with a decoy. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Keep the credential store out of the printed usage record The Claude collector now reads .credentials.json once into three scalars — the access token, its expiry, and the plan label — instead of passing the parsed store around. The token reaches nothing but the Authorization header of the limits probe, and only the plan label may travel into the record, which is what CodeQL's clear-text-logging alert on the record print was unable to see when the whole dict flowed through. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
1 parent c3bd4a8 commit bb8d2f2

28 files changed

Lines changed: 1352 additions & 1292 deletions

‎bin/omarchy‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ declare -A ROUTE_IS_ALIAS
2626
declare -A BINARY_TO_KEY
2727
declare -A GROUP_DESCRIPTIONS
2828

29+
GROUP_DESCRIPTIONS[agent]="AI coding agent usage data"
2930
GROUP_DESCRIPTIONS[audio]="Audio input and output controls"
3031
GROUP_DESCRIPTIONS[bar]="Omarchy shell bar layout and settings"
3132
GROUP_DESCRIPTIONS[battery]="Battery status helpers"

0 commit comments

Comments
 (0)