mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-06-20 10:11:58 +00:00
* feat(billing): nous_billing http client + BillingState core (phase 2b)
Phase 2b terminal-billing client foundation:
- hermes_cli/nous_billing.py: typed client for the 4 /api/billing/* endpoints
(state/charge/poll/auto-top-up). Raises typed errors (BillingScopeRequired,
BillingRateLimited, BillingAuthError) mapped from the live-verified contract;
fail-open is the caller's job. Idempotency-Key enforced client-side.
- agent/billing_view.py: surface-agnostic BillingState core + Decimal money
parsing (server emits decimal strings, not 2dp), fail-open builder,
idempotency-key gen, custom-amount validation.
- 51 unit tests (decimal parse/format, payload tiering, error->exception
matrix, fail-open, amount validation).
Plan: docs/plans/2026-06-13-001-phase-2b-terminal-billing-tui-plan.md
* feat(billing): billing:manage scope + lazy step-up re-auth (phase 2b)
- NOUS_BILLING_MANAGE_SCOPE constant.
- nous_token_has_billing_scope(): split-based scope check (no false-positive
substring match).
- step_up_nous_billing_scope(): re-runs the device flow requesting
billing:manage, reusing the held credential's portal/inference URLs + client_id
(so a preview stays a preview), persists like _login_nous but WITHOUT the model
picker. Returns True iff the minted token carries the scope (False when NAS
silently downscopes a non-admin / unticked grant).
Lazy step-up (plan D-A): normal login path unchanged; 403 insufficient_scope
from a billing call triggers this. 7 unit tests.
* feat(billing): billing JSON-RPC methods for the TUI (phase 2b)
billing.state / charge / charge_status / auto_reload / step_up in
tui_gateway/server.py. Return STRUCTURED success envelopes (result.ok +
result.error=<code>) rather than JSON-RPC-level errors, so the Ink rpc() promise
always resolves and the TUI branches on the typed billing error code
(insufficient_scope, rate_limited, no_payment_method, …) to render the right
affordance. Money serialized as decimal STRINGS + display strings. charge mints
+ echoes an idempotency_key for retry reuse. 16 unit tests.
* feat(billing): /billing CLI handler + command registry (phase 2b)
- CommandDef("billing", subcommands=buy|auto-reload|limit), added to
_SLACK_VIA_HERMES_ONLY so it routes via /hermes on Slack (keeps the 50-cap
parity test green, same as /credits).
- cli.py::_show_billing + screen helpers: all 5 screens (overview, buy→confirm→
poll, auto-reload, monthly-limit read-only). Reuses _prompt_text_input_modal /
_prompt_text_input (D-C). Non-interactive (_app is None) renders text + portal
deep-link, never prompts (R7). Decimal money end-to-end. 2s/5-min cancellable
poll loop; 429/503 = retry not failure; settled = ledger truth. Lazy step-up on
403 insufficient_scope. no_payment_method treated as mainline funnel-to-portal.
- 6 CLI tests; 156 command tests (incl. Slack/Telegram parity) green.
* feat(billing): /billing Ink TUI screens + tests (phase 2b)
- ui-tui/src/app/slash/commands/billing.ts: /billing TUI command covering all 5
screens — overview (text), buy <amt> → ConfirmReq → charge → non-blocking 2s/
5-min poll loop → settled/failed/timeout branches, auto-reload <below> <to> →
ConfirmReq → PATCH, limit (read-only). Reuses the existing ConfirmReq overlay
(D-C) — no bespoke component. Typed-error envelope branching: insufficient_scope
arms the lazy step-up confirm; no_payment_method/rate_limited/cap funnel to
portal. Client-side amount validation mirrors the server (bounds + 2dp).
- gatewayTypes.ts: Billing* response interfaces.
- registry.ts: register billingCommands.
- billingCommand.test.ts: 12 vitest cases (overview/gating/buy-confirm-poll-
settled/no_payment_method/step-up/limit/auto-reload/validation).
TUI build green; 12/12 vitest pass; slash tests pass once @hermes/ink is built.
* docs(billing): scrub private cross-repo references
NAS is a private repo — remove all references to it from the public PR:
- drop the cross-repo planning doc (planning scaffolding, not a deliverable;
the PR description documents the design)
- replace 'NAS' / 'PR #412 preview' mentions in code + test comments with
generic 'the server' / 'a preview deployment'
* docs(billing): scrub final NAS reference in step-up docstring
* docs(billing): drop dangling plan-doc refs
The phase-2b plan doc was removed in the cross-repo scrub (300afcc0b)
but two module docstrings still pointed at it. Drop the dead refs.
* feat(billing): interactive /billing overlay + step-up UX, portal-URL & token fixes
Adds the interactive /billing TUI overlay and hardens the terminal-billing
client across CLI and TUI.
- TUI: full /billing overlay state machine (overview to buy to confirm,
auto-reload, read-only monthly limit) reusing the existing confirm overlay.
- Step-up: surface the verification link in-transcript and open the browser
via the TUI's own opener (the device flow runs in the headless gateway, so a
printed URL was being dropped); run the step-up handler off the main loop and
emit the link as an out-of-band event so the gateway stays responsive.
- Step-up copy is scope-accurate ("Billing permission granted") and re-checks
/state so it never claims "enabled" when the org kill-switch is still off.
- Portal deep-links resolve to absolute URLs against the active portal base
(the server emits them relative) - fixes a bare "/billing?topup=open" link.
- Billing calls refresh an expired access token via the stored refresh token
instead of reporting a false "not logged in".
- Optimistic funnel: advise "set up a saved card on the portal" up front when
no card is on file (advisory, not a hard gate).
- Token resolution is cached briefly so the 2s charge poll loop stops
re-locking + re-reading the auth store on every tick; 401 re-resolves fresh.
- Remove the temporary demo-mode shims.
Validation: 87 Python billing tests, 88 TS tests (billing command + gateway
event handler), tsc clean, ink + ui-tui builds green.
* docs(billing): add /billing TUI screenshots for PR
* fix(cli): guard _last_invalidate on bare instances; update stale prompt-fallback test
The UI-invalidate throttle read self._last_invalidate unconditionally, which
raised AttributeError on HermesCLI instances built without __init__ (the
thread-safety test's object.__new__ shell). Guard the read with getattr.
The off-main-thread branch of _prompt_text_input was changed (#23185) to cancel
cleanly to None instead of falling back to a bare input() that would hang on the
slash-worker thread; the test still asserted the old direct-input fallback.
Update it to assert the current intended behavior: returns None, calls neither
run_in_terminal nor input(), and does not hang.
136 lines
5.5 KiB
Python
136 lines
5.5 KiB
Python
"""Tests for the /billing CLI handler (cli.py::_show_billing).
|
|
|
|
Focus on the non-interactive (no live prompt_toolkit app) path — the same
|
|
discipline as the /credits non-interactive test: it must render text, never
|
|
invoke the modal (which would read the slash-worker's JSON-RPC stdin and hang).
|
|
Plus role/kill-switch gating and logged-out handling.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from decimal import Decimal
|
|
|
|
import pytest
|
|
|
|
import agent.billing_view as bv
|
|
from agent.billing_view import BillingState, CardInfo, MonthlyCap
|
|
from cli import HermesCLI
|
|
|
|
|
|
@pytest.fixture
|
|
def cli():
|
|
obj = HermesCLI.__new__(HermesCLI) # bypass __init__ (no full app needed)
|
|
obj._app = None # non-interactive: forces the text path
|
|
return obj
|
|
|
|
|
|
def _boom_modal(*a, **kw):
|
|
raise AssertionError("modal must NOT be called in non-interactive mode")
|
|
|
|
|
|
def test_billing_logged_out(cli, monkeypatch, capsys):
|
|
monkeypatch.setattr(bv, "build_billing_state", lambda *a, **kw: BillingState(logged_in=False))
|
|
cli._show_billing("/billing")
|
|
out = capsys.readouterr().out
|
|
assert "Not logged into Nous Portal" in out
|
|
assert "hermes portal" in out
|
|
|
|
|
|
def test_billing_overview_non_interactive_renders_text_not_modal(cli, monkeypatch, capsys):
|
|
monkeypatch.setattr(HermesCLI, "_prompt_text_input_modal", _boom_modal, raising=False)
|
|
state = BillingState(
|
|
logged_in=True,
|
|
org_name="Acme",
|
|
role="OWNER",
|
|
balance_usd=Decimal("142.5"),
|
|
cli_billing_enabled=True,
|
|
charge_presets=(Decimal("100"),),
|
|
monthly_cap=MonthlyCap(limit_usd=Decimal("1000"), spent_this_month_usd=Decimal("180"),
|
|
is_default_ceiling=True),
|
|
portal_url="https://portal/billing?topup=open",
|
|
)
|
|
monkeypatch.setattr(bv, "build_billing_state", lambda *a, **kw: state)
|
|
cli._show_billing("/billing")
|
|
out = capsys.readouterr().out
|
|
assert "Usage credits" in out
|
|
assert "$142.50" in out
|
|
assert "$180 of $1000 used (default ceiling)" in out
|
|
# New design: a spend bar with a percentage on the overview.
|
|
assert "%" in out and ("█" in out or "░" in out)
|
|
# ZERO sub-commands: no /billing buy|auto-reload|limit advertising.
|
|
assert "/billing buy" not in out
|
|
assert "Actions:" not in out
|
|
# Non-interactive funnels to the portal (the URL is the affordance).
|
|
assert "Manage on portal:" in out
|
|
|
|
|
|
def test_billing_member_cannot_charge(cli, monkeypatch, capsys):
|
|
state = BillingState(
|
|
logged_in=True, role="MEMBER", balance_usd=Decimal("10"),
|
|
cli_billing_enabled=True, portal_url="https://portal/billing",
|
|
)
|
|
monkeypatch.setattr(bv, "build_billing_state", lambda *a, **kw: state)
|
|
cli._show_billing("/billing")
|
|
out = capsys.readouterr().out
|
|
assert "require an org admin/owner" in out
|
|
|
|
|
|
def test_billing_killswitch_off_blocks(cli, monkeypatch, capsys):
|
|
state = BillingState(
|
|
logged_in=True, role="OWNER", balance_usd=Decimal("10"),
|
|
cli_billing_enabled=False, portal_url="https://portal/billing",
|
|
)
|
|
monkeypatch.setattr(bv, "build_billing_state", lambda *a, **kw: state)
|
|
cli._show_billing("/billing")
|
|
out = capsys.readouterr().out
|
|
assert "turned off for this org" in out
|
|
|
|
|
|
def test_billing_limit_screen_readonly(cli, monkeypatch, capsys):
|
|
state = BillingState(
|
|
logged_in=True, role="OWNER", cli_billing_enabled=True,
|
|
monthly_cap=MonthlyCap(limit_usd=Decimal("1000"), spent_this_month_usd=Decimal("250"),
|
|
is_default_ceiling=True),
|
|
portal_url="https://portal/billing",
|
|
)
|
|
monkeypatch.setattr(bv, "build_billing_state", lambda *a, **kw: state)
|
|
# ZERO sub-commands: the limit screen is reached via the menu, never a
|
|
# sub-command — call it directly the way the overview menu would.
|
|
cli._billing_limit_screen(state)
|
|
out = capsys.readouterr().out
|
|
assert "Monthly spend limit" in out
|
|
assert "$250 of $1000 used" in out
|
|
assert "read-only" in out
|
|
|
|
|
|
def test_billing_sub_arg_ignored_opens_overview(cli, monkeypatch, capsys):
|
|
# A stray sub-arg must NOT error and must NOT dispatch to a sub-screen —
|
|
# it just opens the overview (spec §0.4: zero sub-commands).
|
|
monkeypatch.setattr(HermesCLI, "_prompt_text_input_modal", _boom_modal, raising=False)
|
|
state = BillingState(
|
|
logged_in=True, role="OWNER", balance_usd=Decimal("142.5"),
|
|
cli_billing_enabled=True, charge_presets=(Decimal("25"),),
|
|
portal_url="https://portal/billing",
|
|
)
|
|
monkeypatch.setattr(bv, "build_billing_state", lambda *a, **kw: state)
|
|
cli._show_billing("/billing buy") # arg is ignored
|
|
out = capsys.readouterr().out
|
|
assert "Usage credits" in out # overview, NOT the buy screen
|
|
assert "Buy usage credits" not in out
|
|
|
|
|
|
def test_billing_buy_non_interactive_defers_to_portal(cli, monkeypatch, capsys):
|
|
monkeypatch.setattr(HermesCLI, "_prompt_text_input_modal", _boom_modal, raising=False)
|
|
state = BillingState(
|
|
logged_in=True, role="OWNER", cli_billing_enabled=True,
|
|
charge_presets=(Decimal("25"), Decimal("50"), Decimal("100")),
|
|
card=CardInfo(brand="visa", last4="4242"),
|
|
portal_url="https://portal/billing",
|
|
)
|
|
monkeypatch.setattr(bv, "build_billing_state", lambda *a, **kw: state)
|
|
# Reached via the menu in real use; non-interactively it defers to the portal.
|
|
cli._billing_buy_flow(state)
|
|
out = capsys.readouterr().out
|
|
assert "Buy usage credits" in out
|
|
assert "$25" in out and "$50" in out and "$100" in out
|
|
assert "interactive CLI" in out # defers; no charge attempted non-interactively
|