Timmy_Foundation/hermes-agent
15
0
Fork 0
Code Issues 282 Pull Requests 87 Actions 1 Packages Projects Releases Wiki Activity

fix: restore /usage account limits in CLI + gateway (#958) #1016

Open
Rockachopa wants to merge 186 commits from fix/958 into main
pull from: fix/958
merge into: Timmy_Foundation:main
Conversation 2 Commits 186 Files Changed 153 +24542 -123
Rockachopa commented 2026-04-22 14:41:12 +00:00
Owner
Copy Link

Closes #958

Summary:

  • add agent/account_usage.py to fetch/render provider account limit snapshots for Codex, Anthropic OAuth, and OpenRouter
  • append account-limit sections to CLI /usage output with a bounded background fetch
  • append the same account-limit section to gateway /usage output, including persisted billing-provider fallback between turns
  • add targeted regression coverage for account-usage fetching/rendering and gateway /usage output

Verification:

  • PYTHONPATH=/tmp/BURN2-FORGE-ALPHA-3 python3 -m pytest -q tests/test_account_usage.py tests/gateway/test_usage_command.py
  • PYTHONPATH=/tmp/BURN2-FORGE-ALPHA-3 python3 -m py_compile agent/account_usage.py cli.py gateway/run.py tests/test_account_usage.py tests/gateway/test_usage_command.py
Closes #958 Summary: - add agent/account_usage.py to fetch/render provider account limit snapshots for Codex, Anthropic OAuth, and OpenRouter - append account-limit sections to CLI /usage output with a bounded background fetch - append the same account-limit section to gateway /usage output, including persisted billing-provider fallback between turns - add targeted regression coverage for account-usage fetching/rendering and gateway /usage output Verification: - PYTHONPATH=/tmp/BURN2-FORGE-ALPHA-3 python3 -m pytest -q tests/test_account_usage.py tests/gateway/test_usage_command.py - PYTHONPATH=/tmp/BURN2-FORGE-ALPHA-3 python3 -m py_compile agent/account_usage.py cli.py gateway/run.py tests/test_account_usage.py tests/gateway/test_usage_command.py
Rockachopa added 1 commit 2026-04-22 14:41:13 +00:00
fix: restore /usage account limits (#958)
All checks were successful
Lint / lint (pull_request) Successful in 9s
Details
eab5635a7a
Rockachopa reviewed 2026-04-22 15:13:14 +00:00
Rockachopa left a comment
Author
Owner
Copy Link

Review: Well-architected account usage feature.

This PR adds account-limits reporting to /usage in both CLI and gateway, with support for Anthropic (OAuth), OpenAI Codex, and OpenRouter providers.

Strengths:

  • The AccountUsageSnapshot dataclass is clean and immutable (frozen=True).
  • Provider-specific fetch functions are properly isolated.
  • Both CLI and gateway fetch usage off the main thread (ThreadPoolExecutor / asyncio.to_thread) with timeouts, so slow provider APIs do not hang the UI.
  • Failures are non-fatal — account_snapshot defaults to None on any exception.
  • _resolve_codex_usage_url normalizes base URLs correctly.
  • _format_reset produces human-friendly relative time strings.
  • httpx.Client is used with explicit timeouts (10-15s).
  • Gateway fallback to persisted billing data (session DB) when no agent is resident is a nice touch.

Security observations:

  • API tokens are read from existing credential stores (resolve_anthropic_token, resolve_codex_runtime_credentials, resolve_runtime_provider) — no new credential handling.
  • The Anthropic OAuth usage endpoint includes the anthropic-beta header, which is correct for the beta API.

Minor observations (non-blocking):

  1. _parse_dt handles both Unix timestamps and ISO strings with Z suffix normalization — good.
  2. The OpenRouter path fetches both /credits and /key endpoints. The /key fetch is wrapped in try/except so it degrades gracefully if the key does not have permission.
  3. The test mocks are well-structured, patching at the gateway module level.
**Review: Well-architected account usage feature.** This PR adds account-limits reporting to `/usage` in both CLI and gateway, with support for Anthropic (OAuth), OpenAI Codex, and OpenRouter providers. **Strengths:** - The `AccountUsageSnapshot` dataclass is clean and immutable (`frozen=True`). - Provider-specific fetch functions are properly isolated. - Both CLI and gateway fetch usage off the main thread (ThreadPoolExecutor / asyncio.to_thread) with timeouts, so slow provider APIs do not hang the UI. - Failures are non-fatal — `account_snapshot` defaults to None on any exception. - `_resolve_codex_usage_url` normalizes base URLs correctly. - `_format_reset` produces human-friendly relative time strings. - `httpx.Client` is used with explicit timeouts (10-15s). - Gateway fallback to persisted billing data (session DB) when no agent is resident is a nice touch. **Security observations:** - API tokens are read from existing credential stores (resolve_anthropic_token, resolve_codex_runtime_credentials, resolve_runtime_provider) — no new credential handling. - The Anthropic OAuth usage endpoint includes the `anthropic-beta` header, which is correct for the beta API. **Minor observations (non-blocking):** 1. `_parse_dt` handles both Unix timestamps and ISO strings with Z suffix normalization — good. 2. The OpenRouter path fetches both `/credits` and `/key` endpoints. The `/key` fetch is wrapped in try/except so it degrades gracefully if the key does not have permission. 3. The test mocks are well-structured, patching at the gateway module level.
claude approved these changes 2026-04-22 16:09:59 +00:00
claude left a comment
Member
Copy Link

Looks good overall. The account usage module is well-structured with proper dataclass patterns, timezone handling, and provider-specific fetching. A few notes:

  1. The httpx timeout of 15s is reasonable for network calls.
  2. Error handling via try/except around provider fetches is appropriate for non-critical display data.
  3. The _parse_dt helper handles edge cases (Unix timestamps, ISO strings, Z-suffix) correctly.

No blocking issues.

Looks good overall. The account usage module is well-structured with proper dataclass patterns, timezone handling, and provider-specific fetching. A few notes: 1. The httpx timeout of 15s is reasonable for network calls. 2. Error handling via try/except around provider fetches is appropriate for non-critical display data. 3. The _parse_dt helper handles edge cases (Unix timestamps, ISO strings, Z-suffix) correctly. No blocking issues.
All checks were successful
Lint / lint (pull_request) Successful in 9s
Details
This pull request has changes conflicting with the target branch.
  • cli.py
  • gateway/platforms/api_server.py
  • gateway/run.py
  • hermes_cli/models.py
  • hermes_cli/web_server.py
  • run_agent.py
  • tests/gateway/test_usage_command.py
  • tests/hermes_cli/test_web_server.py
  • tests/test_account_usage.py
  • tools/browser_tool.py
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin fix/958:fix/958
git checkout fix/958
Sign in to join this conversation.
Reviewers
No Reviewers
Rockachopa
claude
Labels
Clear labels
CI
Continuous integration, runners, workflow issues
 QA
Quality assurance, testing, production audit
 accessibility
Auto-created for game epic
 assigned-claw-code
Queued for Code Claw (qwen/openrouter)
 assigned-kimi
Task assigned to KimiClaw for processing
 audit-finding
batch-pipeline
batch-pipeline label
 blocked
Blocked by external dependency or merge conflict
 bug
claw-code-done
Code Claw completed this task
 claw-code-in-progress
Code Claw is actively working
 critical
docs
Auto-created for game epic
 duplicate
Duplicate of another issue
 epic
Epic - large feature with multiple sub-tasks
 epic:memory
Unified Memory Architecture epic
 game
Auto-created for game epic
 gaming
Gaming agent capabilities
 implementation
Auto-created for game epic
 infra
Infrastructure, VPS, DNS, deployment
 infrastructure
Auto-created for game epic
 juice
Auto-created for game epic
 kimi-done
KimiClaw has completed this task
 kimi-in-progress
KimiClaw is actively working on this
 mcp
MCP (Model Context Protocol) tools & servers
 mechanics
Auto-created for game epic
 mobile
Auto-created for game epic
 morrowind
Morrowind Agent gameplay & MCP integration
 needs-review
PR or issue requires reviewer sign-off before merge/close
 ops
p0-critical
p1-important
performance
Auto-created for game epic
 phase:1-activate
Phase 1: Activate existing systems
 phase:2-operational
Phase 2: Operational memory bridge
 phase:3-episodic
Phase 3: Proactive episodic recall
 phase:4-hygiene
Phase 4: Memory hygiene and quality
 phase:5-integration
Phase 5: Integration and testing
 poka-yoke
polish
Auto-created for game epic
 priority-high
Auto-created for game epic
 priority-low
Auto-created for game epic
 priority-medium
Auto-created for game epic
 research
security
Security hardening, vulnerability fixes
 shared-infra
Shared infrastructure across projects (Playground + LPM)
 sovereign
Auto-created for game epic
 stale
No activity, pending triage or closure
 throughput-10x
throughput-10x label
 token-masterplan
token-masterplan label
 tool-evaluation
ux
Auto-created for game epic
 velocity-engine
Auto-generated by velocity engine
 visuals
Auto-created for game epic
 wont-fix
Closed as intentionally not fixing — explicit descope
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
Rockachopa Timmy allegro antigravity bezalel claude claw-code codex-agent ezra gemini google grok hermes kimi manus perplexity sonnet
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: Timmy_Foundation/hermes-agent#1016
Delete Branch "fix/958"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?