* fix(auth): close the free tier's gaps against the gateway's welcome-tier contract The inference gateway's welcome tier (NousResearch/api DOCS/anon-tier/plan.md) serves an anonymous account exactly one model on its own host, refuses everything else with a structured 429, cross-refuses a request on the wrong host with a 400 (403 while the tier is dark), and tells a signed-in account that still asks for `nous/welcome` what to switch to in an `x-nous-model-switch` header. Four client-side gaps against that contract: - Auxiliary calls were refused on every session. The auxiliary client asked the welcome host for the Portal's recommended compaction/vision model, a guaranteed 429 `model_not_free` before each fallback. On the welcome host it now uses `nous/welcome` (its backing model covers auxiliary work) and skips Nous for vision, which the welcome model does not take. - The structured 429 body was never read. The classifier now parses `reason` / `retry_after` / `alternates` / `upgrade_url`: `model_not_free` and `feature_not_free` are non-retryable gates that fall back; `at_capacity`, `admission_closed` and `rate_limited` are rate limits that honour `retry_after` and never rotate the free tier's only credential. The wrong-host 400 and the dark-tier 403 are deterministic, so they abort this route and fall back instead of retrying or re-exchanging. The terminal paths say what happened and name the sign-in (`/login` in a chat, `hermes auth upgrade` in a terminal). - The `x-nous-model-switch` header was ignored. The chat-completions transport records it beside the rate-limit and credits headers; the next call moves the session, and the config default when it still names `nous/welcome`, to the backing model the gateway named. - A guest fell back to the paid host. With `inference_base_url` absent from the exchange or outside the host allowlist, routing defaulted to inference-api, where every request is a 400. A guest now defaults to the welcome literal at the exchange, in the shared store's shape, and in effective routing. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> (cherry picked from commit fc758aad7efceff6223fc144a9b5c69f13e41bd8) * feat(auth): the free tier is set up on request; nous.guest_setup decides whether also on first use A caller that names nous/welcome on a Nous route with no Nous identity in reach — the guided setup's session (provider=nous, which skips the resolver's nothing-configured rung), the free-tier picker row, a bare --provider nous pointed at it — is asking for the free tier. The OAuth runtime rung now sets it up there instead of failing "not logged in", so the guided chat no longer races the root profile's first-run mint. nous.guest_setup is the policy seam: "auto" (default) keeps today's first-use setup wherever nothing else is configured; "on-request" mints only when the free tier is asked for by name (nous/welcome, /login, hermes auth upgrade, replacing a retired identity). Implicit callers — the resolver's last rung, the first-run check, free_tier.status, the CLI's background setup, the connector token path — still adopt what the shared store holds, so every profile follows the one identity the guided setup created, but never create one on their own. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> (cherry picked from commit ae915ddc65ecdb81b81e29b604671d15cd49233c) (cherry picked from commit 62ad1ff3ab200ea064975a32c502041b25910165) * feat(auth): the guided setup provisions the free tier explicitly; nous.guest_setup is auto | explicit Two questions govern the free tier: may it exist (nous.guest) and who may CREATE the identity (nous.guest_setup). "auto" (default) keeps today's first-use setup wherever nothing else is configured. "explicit" means Hermes never creates one on its own: the only creator is the new provision_free_tier() primitive, exposed as the free_tier.provision RPC, which the guided setup on Hermes Desktop calls as its first step — on the root gateway, before the setup profile and before the guided chat exists — so the identity lands in the root store every profile reads through and is there before any session asks for nous/welcome. That closes the race against the backend's own setup, and makes "only when the setup-bot flow is used" literally true. The earlier "on-request" tier is replaced: it minted whenever any caller named nous/welcome (the hermes model row, --provider nous), which treated a model name as intent and was broader than the guided setup. Under "explicit" a nous/welcome request with no identity fails "not logged in" as before the free tier existed, and /login or hermes auth upgrade report nothing to sign in from. Implicit callers still adopt an identity the shared store holds, and a retired credential is replaced (a continuation, not a creation). Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> (cherry picked from commit c63d2c935c1e59016164fdfb90cf70b4094466a0) * fix(auth): remove the nous.guest_setup knob; the free tier is created on first use `nous.guest_setup: auto | explicit` decided who may CREATE the free-tier identity. Under its default every line it added was inert (`may_mint` always true), nothing in tree set `explicit`, unknown values read as `auto`, and under `explicit` a CLI-only install could never get an identity, which contradicts the first-run contract (first command mints, then chats). The mint race the knob accompanied is already benign: every caller takes the profile lock then the shared-store lock, and the loser adopts what the winner wrote. What makes the guided setup win deterministically is `provision_free_tier()` behind the `free_tier.provision` RPC, which stays. `nous.guest` remains the only free-tier policy. Removed: `guest_setup_policy()` and its constants, the `explicit=` / `may_mint=` threading through `ensure_portal_identity` and `_reconcile_and_provision`, the flag at the three replacement call sites (now no-ops), the config default, the docs section, and the four `guest_setup` test-config entries. The three policy tests that hold regardless of the knob are kept under `TestExplicitProvision`; the two that only tested the knob are deleted. (cherry picked from commit d8a50526d93c374c0067dd935b5a65055e0af261) * fix(gateway): a server-driven model switch off nous/welcome does not evict the cached agent When a signed-in account still asks the paid host for `nous/welcome`, the inference gateway serves the current backing model and names it in `x-nous-model-switch`. `apply_model_switch` moves the live session to that model and moves `config.yaml`'s default off the alias in the same step. The messaging gateway's fallback-eviction check compares the agent's model with the config default and evicts on any mismatch that is not a /model override, so when the config write did not land (unreadable config, lock) the cached agent was evicted once per turn, and prompt caching with it. `apply_model_switch` now stamps the alias it moved the session off on the agent, and `_is_intentional_model_switch` treats "agent moved off the alias the config still carries" as deliberate, beside the existing /model override case. The check takes the agent and the config model instead of a bare model string; its one caller in `_run_agent_evict_on_fallback` passes them. (cherry picked from commit 696d1ec86b69db28bf002c841e9389b85178a954) * fix(auth): the free tier outranks implicit host credentials in provider resolution On a fresh install with a leftover ~/.aws profile, resolve_provider("auto") reached the Bedrock rung before the free-tier rung, so the first turn ran on Bedrock and failed 403 while the free tier was still being minted in the background at agent setup (NS-829). Live on a Mac with ~/.aws present: 28 s, three retries, no answer; the next process then switched to nous/welcome. The free-tier rung now sits directly above the Bedrock chain: when nous.guest is on, an existing free-tier identity answers, else a blocking mint runs, and only then does the boto chain get a say. Everything above is unchanged and still wins: CLI creds, config.yaml model.provider, env keys, the OpenRouter pool, a logged-in active_provider. nous.guest: false skips the rung, and a failed mint still falls through to Bedrock and the no-provider guidance. Tests: six precedence cases (identity present, fresh mint, free tier off, env key still wins, sign-in still wins, failed mint falls through). The opt-out test now neutralizes the AWS chain like the precedence tests do; on a machine with ~/.aws it was failing for the same reason as the bug. Live after the fix, same Mac, AWS credentials visible, isolated shared store: identity minted 2 s in, turn on model=nous/welcome provider=nous, answer in 11 s. (cherry picked from commit a04b05260cd334dd7199ad9b6cd5b2538364c75a) * fix(auth): review follow-ups for the free-tier rung (NS-829) - tests/agent/test_bedrock_integration.py: the Bedrock auto-detect test switches the free tier off; its contract is the boto chain, and the free tier now sits above it. - gateway/run_notifications.py: the free-tier startup line reads auth.json before consulting the resolver, so a gateway boot on a machine with AWS credentials never mints or refreshes over the network. - hermes_cli/anon_auth.py: module docstring says where the free tier sits in the ladder instead of "the ladder is untouched". - tests/hermes_cli/test_provider_precedence.py: two invariant tests instead of six (parametrized ladder cases; a failed mint that returns None or raises falls through to Bedrock). scripts/run_tests.sh on the five affected files: 147 passed, 0 failed. (cherry picked from commit 10790d148c60ada11b9ecdde2cd2c836c6a82a11) * feat(auth): HERMES_GUEST_ONBOARDING=1 is the one launch gate for the free tier; HERMES_FORCE_GUEST is gone The free tier is pre-GA. Until GA it must not exist for anyone who did not ask for it: no identity minted, no portal traffic, no free-tier copy on any surface. One environment variable now decides that, and one function reads it. `guest_enabled()` returns False unless `HERMES_GUEST_ONBOARDING` is exactly "1"; only then does `nous.guest` (the user's off switch) get consulted. Every free-tier site already funnels through `guest_enabled()`, so the gate closes minting, routing, connector entitlement, status lines and the picker row in one place. With the variable unset, `resolve_provider("auto")` on a fresh install raises `no_provider_configured` exactly as upstream does. `HERMES_FORCE_GUEST` and `force_guest_mode()` are removed. They inverted the gate (forced the tier ON over `nous.guest: false`), their "new" value re-minted identities as a side effect of provider resolution, and `_has_any_provider_ configured` read them ahead of every other check, making the CLI a second reader of a flag that must have exactly one. `_forced_new_done` and the `force` parameter of `_reconcile_and_provision` go with them. Supersedes the dev lever introduced in fcf9d11679 (rung 1) and hardened in b5c162c3ec. Ruling: NS-845 Q1.1 (recorded on NS-847). Not a user preference: the variable is never written to config.yaml or .env and never shown in setup. It is deleted at GA together with its comment in anon_auth.py. This is a deliberate, temporary exception to the "no new HERMES_* env vars for non-secret config" rule. Tests: fixtures set the gate instead of deleting the old lever; one new invariant (`test_launch_gate_off_means_no_free_tier_at_all`) proves that "", "0", "true" and "new" all leave the tier off with zero portal calls, red on the previous commit. The `HERMES_FORCE_GUEST=new` re-mint test is deleted with the feature. * feat(auth): the free-tier identity is created in one place, at boot; every other site is a read Before this commit eight sites could create a Nous free-tier identity as a side effect of something else: resolving a provider, the CLI's first-run check, the CLI's session setup (in the background beside an own key), a connector bearer read, the desktop polling `free_tier.status`, the sign-in precondition, the desktop's `free_tier.provision`, and the dead-credential re-mint. A poll could mint. Provider resolution could hit the network. Two of them raced each other on a fresh install. Now `hermes_cli/free_tier_bootstrap.py::run_bootstrap` is the only creator. `hermes serve` runs it on a daemon thread from `_lifespan` beside the other background boots; `cmd_chat` runs it synchronously before the first-run guard. It inventories credentials first (`resolve_provider("auto", skip_free_tier=True)`: what would carry inference if the free tier did not exist), creates the identity only when `guest_enabled()`, resolves inference, records a `SetupRecord` in process memory and broadcasts ONE `setup.ready` event. It runs on every boot; only the mint is gated. `ensure_portal_identity` now requires `explicit=True` and raises otherwise. Its callers are the bootstrap, the desktop's `free_tier.provision` (the explicit retry when the boot could not create the identity) and the two dead-credential replacements (`auth_nous.resolve_nous_runtime_credentials`, `managed_tool_gateway._replace_dead_guest_token`). The background thread path and `provision_free_tier` are deleted with their last callers. Reads that used to mint and now only read: `auth.py::resolve_provider` rung 7 (an existing identity still outranks the Bedrock chain, NS-829 ordering kept), `main.py::_has_any_provider_configured`, `cli_agent_setup_mixin._ensure_runtime_credentials`, `managed_tool_gateway.read_nous_access_token` (no identity -> None), `anon_sign_in.run_sign_in` (no identity -> Unavailable), `methods_free_tier` `free_tier.status`. `setup.status` answers from the record for the launch profile, blocking up to 8 s while the bootstrap is in flight so a client's first poll lands after the identity exists rather than racing it; a named profile, or a process that never ran the bootstrap, keeps today's live probe. The record's fields ride along additively (`ready`, `free_tier`, `other_providers`, `inference_provider`). Identity and inference are decoupled (NS-845 Q1.3): the mint sets `active_provider="nous"` only when the inventory found nothing else usable (`_mint_locked(carries_inference=)`); an adopted account always does. A token refresh no longer re-elects the provider it refreshed (`_save_provider_state_to_source` writes credentials, not the user's choice) — that write was how an own-key install ended up on the free tier after the first connector call. Supersedes the mint sites in fcf9d11679, a42d0748fc (first-run check), bbbaa8935a (CLI background setup), 0179efc989 (`free_tier.status` mint), 62ad1ff3ab / c63d2c935c / d8a50526d9 (the `nous.guest_setup` knob and `provision_free_tier`), and a04b05260c (blocking mint in the resolver). Ruling: NS-845 Q1.2 + Q1.3, recorded on NS-847. Tests: `TestBootstrapIsTheOneCreator` (one mint per process; own key keeps inference; reads never reach the portal; a refused mint is memoised), `free_tier.status` fails loudly if it ever calls the creator, the resolver stub fails loudly if resolution ever mints, `setup.status` reads the record, `skip_free_tier` proves the inventory question. The three sign-in tests for the deleted pre-mint collapse into one (`no identity -> Unavailable, zero portal calls`). Live: real `_lifespan` boot with a fake portal, gate on and off (/tmp/ns847-recon/evidence/e2e-rung5-c2-serve-boot.txt), and the CLI matrix incl. an own-key cell (e2e-rung5-c2-bootstrap.txt), 20/20. * fix(credits): the welcome host is free-tier evidence, so a free-tier identity never sees "run /topup" A free-tier identity carries $0 by design, so the portal seed reports `paid_access=False` for it. `is_free_tier_model` did not know the welcome host, read that as a depleted account, and every free-tier turn ended with the credits-depleted notice telling the user to top up an account they do not have. Rule (4) in `is_free_tier_model`: a `base_url` on the Nous welcome host (`anon_auth.route_is_welcome_host`) is the free tier. The host is the evidence, not the model name: the paid inference host can serve `nous/welcome` to a named account and that account's depletion is real, so `("nous/welcome", <inference host>)` stays False. Local data only, like the three rules above it. Restores the two contracts dropped by hermes-magic 674e11d1eaa (the prototype line ran without unit tests): the welcome host is free without any pricing evidence; the model name alone is not. The first is red without this fix. * fix(copy): free-tier text stops promising a connector transfer and never names the config key Sign-in copy on every surface said "Sign in to keep your connectors" and ended with "Your connectors are kept." The transfer registry that would make that true is empty (NS-821): nothing carries over today. The copy now says what signing in does give ("unlock more models and tools") and the completion line names the account, not a transfer. The docs page loses the "connectors carry over" paragraph for the same reason. The picker's off-state line exposed `nous.guest: false` and the word "guest"; user copy names the free tier only (R-USR-1). The docs page gains the pre-rollout note: until GA nothing on it happens without `HERMES_GUEST_ONBOARDING=1`. Its "first command mints" and "replaced on next use" sentences now describe the boot bootstrap. zh is a strict locale: the `freeTier` block was English placeholder text copied from `en`; it is now Chinese. `connectorsKept` is renamed `completedBody` since it no longer talks about connectors. * feat(desktop): the free-tier launch flag is decided once in Electron and stamped onto every backend spawn The Python backend reads `HERMES_GUEST_ONBOARDING` and treats exactly "1" as on. Until now nothing in the desktop set it, so a packaged app could never turn the free tier on, and a backend spawned by the app could disagree with the app about whether the tier was live. `electron/guest-onboarding.ts` owns the decision: `guestOnboardingEnabled` is true when the launch env has `HERMES_GUEST_ONBOARDING=1` or argv has `--guest-onboarding` (the packaged-app spelling). It is read ONCE at launch into a module constant. `desktopBackendSpawnEnv` wraps every backend env as the outermost call and writes the flag LAST, as "1" or an explicit "0", so no earlier spread (`process.env`, `backend.env`) can resurrect a stray value from the parent shell. Stamped onto all three spawn sites: the primary `serve` spawn, the pooled per-profile spawn, and the remote SSH `exec env ...` command (which gains ` HERMES_GUEST_ONBOARDING=1` only when on). The embedded terminal PTY and the backend probes are not backend spawns and do not get it: a `hermes --tui` typed in the pane must not mint. The renderer learns the same fact read-only through the existing `hermes:launch-flags` sync IPC (`guestOnboarding`) and preload (`window.hermesDesktop.guestOnboardingEnabled`). Ruling: NS-845 Q1.1 / Q2 (env var is the contract, `--guest-onboarding` maps to it in main). Two invariant tests on the pure helpers: only "1" or the argv flag enables; the spawn env carries "1"/"0" as the last word and preserves every other key. * feat(desktop): the renderer learns free-tier readiness from one `setup.ready` push, not a 60 s poll The backend's boot bootstrap now announces `setup.ready` once, after it has created (or refused) the free-tier identity and resolved the inference route. The renderer used to discover both by polling `setup.status`, `setup.runtime_check` and `free_tier.status` every 60 s from `useStatusSnapshot`; a fresh install's chip, notice strip and onboarding overlay could sit stale for up to a minute after boot, and three RPCs a minute per window kept asking a question whose answer changes only at boundaries the backend already announces. `handleLifecycleEvent` routes `setup.ready` (active source only, like `skin.changed`) to `notifySetupReady()`, a one-shot tick atom in `live-sync.ts` beside the other change ticks. `useStatusSnapshot` listens to it and runs one readiness round at once (`setup.status` + `setup.runtime_check` + `free_tier.status`). The readiness legs also run once on open and on return from another app, as today. The 60 s tick keeps only `getStatus()`. `SetupStatusSnapshot` types the record's additive fields (`ready`, `free_tier`, `other_providers`, `inference_provider`); readiness semantics are unchanged and still key on `provider_configured` + `runtime_check`. Ruling: NS-845 Q1.2 (renderer half). Tests: the lifecycle branch fires one refresh from the active source and none from another; the snapshot hook's contract is three legs on open, one leg on the tick. * fix(cli): the banner names the free tier's model instead of "no model configured" The welcome banner prints before credentials resolve, so on a fresh install `model` is empty and the banner said, in red, "no model configured — run /model or hermes setup". Under the free tier that is false: the route is already known from local state (identity on disk, tier on), and the first message will run on `nous/welcome`. `_banner_left_lines` now asks the route the same question when `model` is empty (`guest_carries_inference()`, a local read) and shows `welcome · Nous Research`. When nothing resolves the red line stays. Ruling: NS-845 ("the banner's 'no model configured' line reads the resolved route"). Live: fresh HERMES_HOME + fake portal, gate on -> `welcome · Nous Research`; gate off -> the red line, zero portal calls. * fix(aux): vision on the free tier uses nous/welcome too The text-only modality on the gateway's `nous/welcome` row is DeepSeek V4 Flash's, the backing model until the repoint; `z-ai/glm-5.3-flash` is natively multimodal and the repoint declares the welcome row `text+image->text`. Skipping Nous for vision on the welcome host would have sent every image step past the free tier for no reason, so the auxiliary client pins the route's one model for every lane. A backing model that takes no images answers with the upstream's own error, which the ladder handles as it always has. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> (cherry picked from commit 7456e028faba55480db43015dc2c8df3e393a415) * fix(gateway): hermes gateway run is a boot owner of the free tier too Rung 5 made every demand-time free-tier site a read: resolve_provider, the connector token, the /login precondition. That is only correct if every process that can reach those sites ran the bootstrap first. The CLI (cmd_chat) and hermes serve (_lifespan) did; the standalone messaging gateway did not. A fresh HERMES_HOME with the gate on and `hermes gateway run` reached provider resolution with no identity to consume, and /login returned Unavailable. Reported by @andrexibiza on #107697 (P1). GatewayRunner.start now runs `free_tier_bootstrap.run_bootstrap` on an executor thread right after startup recovery and BEFORE any adapter connects, so a fast first DM cannot arrive with nothing to resolve. It is its own step, not part of the turn-machinery warm-up: the warm-up is an optimisation with an off switch (HERMES_STARTUP_WARMUP_TIMEOUT<=0); the bootstrap is correctness and must always run. With the gate unset it is a local inventory and no network. Live, real GatewayRunner.start against a fake portal in a fresh home: gate on -> 1 create, identity persisted, resolve_runtime_provider=nous, /login precondition sees the identity gate off -> 0 portal calls, no identity, no_provider_configured Before the fix the gate-on row was identical to the gate-off row. Test: the bootstrap seam runs before _start_prefilter_platforms and delegates to the one creator. Red on 5554eb6993 (no seam), green here. --------- Co-authored-by: Robin Fernandes <robin@soal.org> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
380 lines
19 KiB
Python
380 lines
19 KiB
Python
"""Config / projects / setup JSON-RPC handlers. Bodies are rebound onto server.py's globals
|
||
(method_ctx.bind_module) and reference them bare. ``config.set`` lives in methods_config_set.
|
||
"""
|
||
|
||
from .method_ctx import HandlerRegistry, bind_module
|
||
|
||
from hermes_constants import DEFAULT_INDICATOR_STYLE, INDICATOR_STYLES
|
||
from hermes_constants import display_hermes_home as _display_hermes_home
|
||
|
||
_registry = HandlerRegistry()
|
||
method = _registry.method
|
||
_profile_scoped = _registry.profile_scoped
|
||
|
||
|
||
def _projects_handler(name: str):
|
||
"""``@method(name)`` (profile-scoped) whose body's uncaught exception becomes ``_err(rid, 5061)``."""
|
||
def deco(fn):
|
||
def handler(rid, params: dict) -> dict:
|
||
try:
|
||
return fn(rid, params)
|
||
except Exception as e:
|
||
return _err(rid, 5061, str(e))
|
||
return method(name)(_profile_scoped(handler))
|
||
return deco
|
||
|
||
|
||
def _reconcile_repo_discovery(pdb, conn, policy, policy_key):
|
||
pdb.reconcile_discovered_repos_policy(conn, policy_key,
|
||
preserve_unversioned=_repo_discovery_policy_is_default(policy))
|
||
|
||
|
||
@_projects_handler("projects.discover_repos")
|
||
def _(rid, params: dict) -> dict:
|
||
"""Repos for the desktop overview: scanned-from-disk (cached) ∪ session-derived."""
|
||
with _profile_db(params) as db:
|
||
if db is None:
|
||
return _ok(rid, {"repos": []})
|
||
from hermes_cli import projects_db as pdb
|
||
policy = _repo_discovery_policy()
|
||
with pdb.connect_closing() as conn:
|
||
_reconcile_repo_discovery(pdb, conn, policy, _repo_discovery_policy_key(policy))
|
||
# `scan=true` (remote-gateway desktop): its native scan only sees its own filesystem,
|
||
# so the host scans the policy roots so zero-session repos surface.
|
||
# See #81723.
|
||
if params.get("scan") and policy["enabled"]:
|
||
_scan_discovered_repos_remote(conn, policy)
|
||
repos = _discover_repos_payload(db, conn=conn, include_cached=policy["enabled"])
|
||
return _ok(rid, {"repos": repos, "discovery_policy": policy})
|
||
|
||
|
||
@_projects_handler("projects.record_repos")
|
||
def _(rid, params: dict) -> dict:
|
||
"""Persist repo roots found by the client's (desktop-side) scan; return the merged list."""
|
||
from hermes_cli import projects_db as pdb
|
||
policy = _repo_discovery_policy()
|
||
policy_key = _repo_discovery_policy_key(policy)
|
||
incoming = params.get("discovery_policy")
|
||
if isinstance(incoming, dict):
|
||
accepted = _repo_discovery_policy_key(_repo_discovery_policy(incoming)) == policy_key
|
||
else:
|
||
accepted = _repo_discovery_policy_is_default(policy) # legacy client without a policy
|
||
accepted = bool(policy["enabled"] and accepted)
|
||
pairs = [(item, None) if isinstance(item, str) else (str(item["root"]), item.get("label"))
|
||
for item in params.get("repos") or []
|
||
if isinstance(item, str) or (isinstance(item, dict) and item.get("root"))]
|
||
with pdb.connect_closing() as conn:
|
||
_reconcile_repo_discovery(pdb, conn, policy, policy_key)
|
||
if accepted:
|
||
pdb.record_discovered_repos(conn, pairs, replace=True, policy_key=policy_key)
|
||
elif not policy["enabled"]:
|
||
pdb.clear_discovered_repos(conn, policy_key=policy_key)
|
||
with _profile_db(params) as db:
|
||
repos = [] if db is None else _discover_repos_payload(db, include_cached=policy["enabled"])
|
||
return _ok(rid, {"repos": repos, "accepted": accepted, "discovery_policy": policy})
|
||
|
||
|
||
def _stamped_project_tree(db, params, **kwargs):
|
||
"""``_build_project_tree`` + profile stamping shared by the two tree RPCs."""
|
||
from tui_gateway.project_tree import stamp_profile
|
||
tree, active_id = _build_project_tree(db, **kwargs)
|
||
stamp_profile(tree["projects"], _response_profile_name(params.get("profile")))
|
||
return tree, active_id
|
||
|
||
|
||
@_projects_handler("projects.tree")
|
||
def _(rid, params: dict) -> dict:
|
||
"""Project -> repo -> lane overview with counts + a few preview sessions per project, plus the
|
||
flat set of session ids claimed by any project (excluded from flat Recents). Lanes carry no
|
||
session rows; drill-in uses ``projects.project_sessions``."""
|
||
with _profile_db(params) as db:
|
||
if db is None:
|
||
return _ok(rid, {"projects": [], "active_id": None, "scoped_session_ids": []})
|
||
tree, active_id = _stamped_project_tree(
|
||
db, params, preview_limit=int(params.get("preview_limit") or 3), hydrate=False,
|
||
session_limit=int(params.get("session_limit") or 2000), include_discovered=True)
|
||
return _ok(rid, {"projects": tree["projects"], "active_id": active_id,
|
||
"scoped_session_ids": tree["scoped_session_ids"]})
|
||
|
||
|
||
@_projects_handler("projects.project_sessions")
|
||
def _(rid, params: dict) -> dict:
|
||
"""Fully hydrated lanes for one project, from the same grouping as ``projects.tree``."""
|
||
project_id = str(params.get("project_id") or "")
|
||
if not project_id:
|
||
return _err(rid, 5063, "project_id required")
|
||
with _profile_db(params) as db:
|
||
if db is None:
|
||
return _ok(rid, {"project": None})
|
||
# Drill-in only needs the entered project: skip the zero-session discovery tier.
|
||
tree, _active = _stamped_project_tree(
|
||
db, params, preview_limit=0, hydrate=True,
|
||
session_limit=int(params.get("session_limit") or 5000), include_discovered=False)
|
||
return _ok(rid, {"project": next((p for p in tree["projects"] if p["id"] == project_id), None)})
|
||
|
||
|
||
# ── config.get — one getter per key returning the result payload.
|
||
|
||
def _display_raw() -> dict:
|
||
return _load_cfg().get("display") or {}
|
||
|
||
|
||
def _display_word(key: str, default: str, allowed) -> str:
|
||
"""Normalised ``display.<key>``; unknown/garbage values read back as ``default``."""
|
||
raw = str(_display_raw().get(key, default) or "").strip().lower()
|
||
return raw if raw in allowed else default
|
||
|
||
|
||
_THINKING_MODES = frozenset({"collapsed", "truncated", "full"})
|
||
|
||
|
||
def _cfg_get_provider(params):
|
||
from hermes_cli.models import list_available_providers, normalize_provider
|
||
model = _resolve_model()
|
||
parts = model.split("/", 1)
|
||
return {"model": model, "provider": normalize_provider(parts[0]) if len(parts) > 1 else "unknown",
|
||
"providers": list_available_providers()}
|
||
|
||
|
||
def _cfg_get_project(params):
|
||
raw = str(params.get("cwd", "") or (_load_cfg().get("terminal") or {}).get("cwd", "") or "").strip()
|
||
cwd = _completion_cwd({"cwd": raw} if raw else {})
|
||
return {"cwd": cwd, "branch": git_probe.branch(cwd)}
|
||
|
||
|
||
def _cfg_get_personality(params):
|
||
# EFFECTIVE personality via the single owner — a stale/unknown name must not show as active.
|
||
from hermes_cli.personality import active_personality_name
|
||
return {"value": active_personality_name(_load_cfg()) or "none"}
|
||
|
||
|
||
def _cfg_get_reasoning(params):
|
||
cfg = _load_cfg()
|
||
session = _sessions.get(params.get("session_id", "")) or {}
|
||
reasoning_config = session.get("create_reasoning_override")
|
||
if session and not isinstance(reasoning_config, dict):
|
||
reasoning_config = getattr(session.get("agent"), "reasoning_config", None)
|
||
if isinstance(reasoning_config, dict):
|
||
enabled = reasoning_config.get("enabled") is not False
|
||
effort = str(reasoning_config.get("effort") or "medium") if enabled else "none"
|
||
else:
|
||
raw_effort = (cfg.get("agent") or {}).get("reasoning_effort", "")
|
||
# YAML `reasoning_effort: false` means thinking disabled, not "unset".
|
||
effort = "none" if raw_effort is False else str(raw_effort or "medium")
|
||
display = "show" if (cfg.get("display") or {}).get("show_reasoning", True) else "hide"
|
||
return {"value": effort, "display": display}
|
||
|
||
|
||
def _cfg_get_fast(params):
|
||
# `config.set fast` is session-scoped: prefer the session's live/pinned value over the
|
||
# global key (a pre-build session keeps its pin in create_service_tier_override).
|
||
session = _sessions.get(params.get("session_id", "")) or {}
|
||
agent = session.get("agent")
|
||
tier = (getattr(agent, "service_tier", None) if agent is not None
|
||
else session.get("create_service_tier_override"))
|
||
if tier is None:
|
||
tier = _load_service_tier()
|
||
return {"value": "fast" if tier == "priority" else "normal"}
|
||
|
||
|
||
def _cfg_get_thinking_mode(params):
|
||
raw = _display_word("thinking_mode", "", _THINKING_MODES)
|
||
if not raw: # legacy details_mode fallback
|
||
raw = "full" if _display_word("details_mode", "collapsed", _DETAIL_MODES) == "expanded" else "collapsed"
|
||
return {"value": raw}
|
||
|
||
|
||
def _cfg_get_mtime(params):
|
||
cfg_path = _hermes_home / "config.yaml"
|
||
try:
|
||
mtime = cfg_path.stat().st_mtime if cfg_path.exists() else 0
|
||
except Exception:
|
||
return {"mtime": 0}
|
||
# mcp_rev: hash of the MCP-relevant sections so the poller reloads MCP servers only when
|
||
# their config changed — a /skin write bumps mtime but must not cost an MCP reconnect.
|
||
return {"mtime": mtime, "mcp_rev": _compute_mcp_rev()}
|
||
|
||
|
||
# key -> getter(params); bind_module rebinds the table's functions onto server.py's globals.
|
||
_CONFIG_GETTERS = {
|
||
"provider": _cfg_get_provider,
|
||
"profile": lambda params: {"home": str(_hermes_home), "display": _display_hermes_home()},
|
||
"project": _cfg_get_project,
|
||
"full": lambda params: {"config": _load_cfg()},
|
||
"prompt": lambda params: {"prompt": _load_cfg().get("custom_prompt", "")},
|
||
"skin": lambda params: {"value": _display_raw().get("skin", "default")},
|
||
# Normalised like the TUI renders it (frontend falls back to the default for the same inputs).
|
||
"indicator": lambda params: {
|
||
"value": _display_word("tui_status_indicator", DEFAULT_INDICATOR_STYLE, INDICATOR_STYLES)},
|
||
"personality": _cfg_get_personality,
|
||
"reasoning": _cfg_get_reasoning,
|
||
"fast": _cfg_get_fast,
|
||
"busy": lambda params: {"value": _load_busy_input_mode()},
|
||
"approval_mode": lambda params: {"value": _load_approval_mode()},
|
||
"approvals.mode": lambda params: {"value": _load_approval_mode()},
|
||
"details_mode": lambda params: {"value": _display_word("details_mode", "collapsed", _DETAIL_MODES)},
|
||
"thinking_mode": _cfg_get_thinking_mode,
|
||
"density": lambda params: {"value": "on" if bool(_display_raw().get("tui_compact", False)) else "off"},
|
||
"theme": lambda params: {"value": _display_word("tui_theme", "auto", {"auto", "light", "dark"})},
|
||
"statusbar": lambda params: {"value": _coerce_statusbar(_display_cfg().get("tui_statusbar", "top"))},
|
||
"focus": lambda params: {"value": "on" if bool(_display_cfg().get("focus_view", False)) else "off",
|
||
"tool_progress": _load_tool_progress_mode()},
|
||
"mouse": lambda params: {"value": _display_mouse_tracking(_load_cfg().get("display"))},
|
||
"mtime": _cfg_get_mtime}
|
||
# Getters whose failure is a JSON-RPC error of this code (others propagate to dispatch).
|
||
_CONFIG_GET_ERR = {"provider": 5013, "approval_mode": 5001, "approvals.mode": 5001}
|
||
|
||
|
||
@method("config.get")
|
||
@_profile_scoped
|
||
def _(rid, params: dict) -> dict:
|
||
key = params.get("key", "")
|
||
getter = _CONFIG_GETTERS.get(key)
|
||
if getter is None:
|
||
return _err(rid, 4002, f"unknown config key: {key}")
|
||
try:
|
||
return _ok(rid, getter(params))
|
||
except Exception as e:
|
||
if key not in _CONFIG_GET_ERR:
|
||
raise
|
||
return _err(rid, _CONFIG_GET_ERR[key], str(e))
|
||
|
||
|
||
# ── setup readiness
|
||
|
||
def _readiness_check(rid, params, probe):
|
||
"""Shared shell of setup.status / setup.runtime_check. ``probe(profile, scoped)`` runs inside the
|
||
optional ``profile`` param's HERMES_HOME + ``.env`` secret scope (ContextVars: concurrent checks
|
||
stay isolated); ``scoped`` is the ``{"profile": ...}`` payload stamp (``{}`` for the launch
|
||
profile). An unknown profile answers ``ok=False`` (never a JSON-RPC error, never a quiet answer
|
||
for the launch profile instead)."""
|
||
import contextlib
|
||
profile = str(params.get("profile") or "").strip() if isinstance(params, dict) else ""
|
||
scope = contextlib.nullcontext()
|
||
if profile:
|
||
from hermes_cli import profiles as profiles_mod
|
||
if not profiles_mod.profile_exists(profile):
|
||
return _ok(rid, {"ok": False, "profile": params.get("profile"),
|
||
"error": f"Profile '{profile}' does not exist on this backend."})
|
||
home = _profile_home(profile)
|
||
if home is not None:
|
||
scope = _session_profile_runtime_scope({"profile_home": str(home)})
|
||
with scope:
|
||
payload = probe(profile, {"profile": profile} if profile else {})
|
||
return _ok(rid, payload)
|
||
|
||
|
||
@method("setup.status")
|
||
def _(rid, params: dict) -> dict:
|
||
"""Loose provider check; ``profile`` (optional) scopes it to that profile's home.
|
||
|
||
For the launch profile the answer is the boot bootstrap's record (``free_tier_bootstrap``):
|
||
the call blocks up to ``SETUP_READY_WAIT_SECONDS`` for it, so a client's first poll lands after
|
||
the free-tier identity exists (or has been refused) rather than racing the mint. If the record
|
||
is still missing after the wait, or a named profile is asked about, today's live probe answers.
|
||
The record's fields ride along additively (``ready``, ``free_tier``, ``other_providers``)."""
|
||
try:
|
||
from hermes_cli.main import _has_any_provider_configured
|
||
from hermes_cli.free_tier_bootstrap import wait_for_record
|
||
|
||
def probe(profile, scoped):
|
||
record = None if profile else wait_for_record()
|
||
if record is None:
|
||
return {"provider_configured": bool(_has_any_provider_configured(strict_profile_scope=bool(profile))),
|
||
**scoped}
|
||
return {"provider_configured": record.provider_configured, "ready": True,
|
||
"free_tier": record.free_tier, "other_providers": record.other_providers,
|
||
"inference_provider": record.inference_provider, **scoped}
|
||
return _readiness_check(rid, params, probe)
|
||
except Exception as e:
|
||
return _err(rid, 5016, str(e))
|
||
|
||
|
||
@method("setup.runtime_check")
|
||
def _(rid, params: dict) -> dict:
|
||
"""Strict provider check via the same resolve_runtime_provider() the agent uses on session
|
||
creation (setup.status is True if ANY provider auth state is discoverable): ok=False + the auth
|
||
error when the model can't be served, so UIs surface onboarding before a doomed prompt.
|
||
``profile`` answers for THAT profile's pin and ``.env``; unknown -> ``ok=False``."""
|
||
try:
|
||
from hermes_cli.runtime_provider import resolve_runtime_provider
|
||
from hermes_cli.auth import has_usable_secret
|
||
from hermes_cli.main import _has_any_provider_configured
|
||
requested = str(params.get("provider") or "").strip() or None
|
||
|
||
def probe(profile, scoped):
|
||
runtime = resolve_runtime_provider(requested=requested)
|
||
provider_configured = bool(_has_any_provider_configured(strict_profile_scope=bool(profile)))
|
||
provider = runtime.get("provider") or "provider"
|
||
source = str(runtime.get("source") or "")
|
||
|
||
def fail(error, src):
|
||
return {"ok": False, "provider": provider, "model": runtime.get("model"),
|
||
"source": src, "error": error, **scoped}
|
||
if (not provider_configured and provider == "bedrock"
|
||
and source in {"iam-role", "aws-sdk-default-chain"}):
|
||
return fail("No Hermes provider is configured.", source)
|
||
api_key = runtime.get("api_key")
|
||
api_key_text = "" if callable(api_key) else str(api_key or "").strip()
|
||
if not (callable(api_key) or api_key_text in {"aws-sdk", "no-key-required"}
|
||
or has_usable_secret(api_key_text) or bool(runtime.get("command"))):
|
||
return fail(f"No usable credentials found for {provider}.", runtime.get("source"))
|
||
from hermes_cli.anon_auth import route_is_welcome_host
|
||
# free_tier is keyed on the SELECTED route (the welcome host serves only nous/welcome), not
|
||
# on profile state: a paid Nous key beside a free-tier identity must not read as free.
|
||
return {"ok": True, "provider": runtime.get("provider"), "model": runtime.get("model"),
|
||
"source": runtime.get("source"),
|
||
"free_tier": provider == "nous" and route_is_welcome_host(runtime.get("base_url")),
|
||
**scoped}
|
||
return _readiness_check(rid, params, probe)
|
||
except Exception as e:
|
||
return _ok(rid, {"ok": False, "error": str(e)})
|
||
|
||
|
||
def _safe_client_label(label: str) -> str:
|
||
"""Alnum/._- () only, ≤64 chars, dot-runs and leading dots collapsed (no traversal shapes)."""
|
||
safe = "".join(ch for ch in label if ch.isalnum() or ch in "._- ()").strip()[:64]
|
||
while ".." in safe:
|
||
safe = safe.replace("..", ".")
|
||
return safe.lstrip(".").strip()
|
||
|
||
|
||
@method("diagnostics.share_nous")
|
||
def _(rid, params: dict) -> dict:
|
||
"""Upload a redacted debug bundle to Nous-internal diagnostics storage — same collection +
|
||
force-redaction pipeline as ``hermes debug share --nous``; redaction is NOT client-controllable
|
||
and consent lives with the CALLER (privacy notice first). Structured ``ok``/``error`` envelope so
|
||
upload failures render inline. Optional: ``error_context`` (-> ``error-context.txt``),
|
||
``extra_files`` ({label -> text}), ``log_lines`` (default 200); all force-redacted."""
|
||
try:
|
||
from hermes_cli.debug import _redact_log_text, build_nous_bundle, collect_share_bundle
|
||
from hermes_cli.diagnostics_upload import share_to_nous
|
||
log_lines = params.get("log_lines")
|
||
if not isinstance(log_lines, int) or not (10 <= log_lines <= 2000):
|
||
log_lines = 200
|
||
bundle = collect_share_bundle(log_lines=log_lines, redact=True)
|
||
# Client text goes through the SAME upload-safe redactor as backend logs (force secret
|
||
# redaction + email masking), never the weaker bare secret pass.
|
||
error_context = params.get("error_context")
|
||
if isinstance(error_context, str) and error_context.strip():
|
||
bundle["error-context.txt"] = _redact_log_text(error_context.strip()[:8_000])
|
||
# Bounded: at most 4 files, 512KB each, sanitized labels — not an arbitrary upload surface.
|
||
extra_files = params.get("extra_files")
|
||
for label, text in list(extra_files.items())[:4] if isinstance(extra_files, dict) else ():
|
||
safe_label = _safe_client_label(label) if isinstance(label, str) else ""
|
||
if safe_label and isinstance(text, str) and text.strip():
|
||
bundle[f"client/{safe_label}"] = _redact_log_text(text[:524_288])
|
||
res = share_to_nous(build_nous_bundle(bundle, redact=True))
|
||
view_url = res.get("viewUrl") or res.get("view_url")
|
||
upload_id = res.get("id")
|
||
if not view_url and not upload_id: # an upload the user can't reference is useless to support
|
||
return _ok(rid, {"ok": False, "error": "upload succeeded but returned no view URL or id"})
|
||
return _ok(rid, {"ok": True, "view_url": view_url, "upload_id": upload_id,
|
||
"expires_at": res.get("expiresAt") or res.get("expires_at")})
|
||
except Exception as e:
|
||
return _ok(rid, {"ok": False, "error": str(e)})
|
||
|
||
|
||
def register(server) -> None:
|
||
bind_module(globals(), server, skip=("_",))
|