# Conflicts: # AGENTS.md # acp_adapter/edit_approval.py # acp_adapter/server.py # agent/agent_init.py # agent/anthropic_adapter.py # agent/anthropic_credentials.py # agent/auxiliary_client.py # agent/azure_identity_adapter.py # agent/bedrock_adapter.py # agent/browser_registry.py # agent/chat_completion_helpers.py # agent/coding_context.py # agent/context_references.py # agent/conversation_loop.py # agent/copilot_acp_client.py # agent/credits_tracker.py # agent/curator.py # agent/curator_backup.py # agent/deadline.py # agent/display.py # agent/errors.py # agent/estop.py # agent/i18n.py # agent/image_gen_registry.py # agent/image_routing.py # agent/learning_graph.py # agent/learning_mutations.py # agent/lsp/servers.py # agent/model_metadata.py # agent/models_dev.py # agent/monitoring/gateway_health_export.py # agent/monitoring/otlp_exporter.py # agent/pet/store.py # agent/process_bootstrap.py # agent/prompt_builder.py # agent/proxy_sources/iron_proxy.py # agent/secret_sources/_cache.py # agent/secret_sources/bitwarden.py # agent/secret_sources/registry.py # agent/shell_hooks.py # agent/skill_bundles.py # agent/skill_commands.py # agent/skill_utils.py # agent/ssl_guard.py # agent/ssl_verify.py # agent/system_prompt.py # agent/terminal_env_registry.py # agent/trace_upload.py # agent/transcription_registry.py # agent/tts_registry.py # agent/verify/environment.py # agent/vertex_adapter.py # agent/video_gen_registry.py # agent/web_search_registry.py # cli.py # cron/jobs.py # cron/scheduler.py # gateway/agent_cache_pressure.py # gateway/cgroup_cleanup.py # gateway/channel_directory.py # gateway/config.py # gateway/control_socket.py # gateway/dead_targets.py # gateway/drain_control.py # gateway/hooks.py # gateway/kanban_watchers.py # gateway/lifecycle_ledger.py # gateway/mirror.py # gateway/pairing.py # gateway/platform_registry.py # gateway/platforms/helpers.py # gateway/platforms/weixin.py # gateway/readiness.py # gateway/restart_loop_guard.py # gateway/rich_sent_store.py # gateway/run.py # gateway/session.py # gateway/shutdown_flush.py # gateway/shutdown_forensics.py # gateway/slash_commands.py # gateway/status.py # gateway/sticker_cache.py # gateway/whatsapp_identity.py # hermes_bootstrap.py # hermes_cli/_early_recovery.py # hermes_cli/_install_repair.py # hermes_cli/_startup_fast.py # hermes_cli/_subprocess_compat.py # hermes_cli/agent_plugins.py # hermes_cli/auth.py # hermes_cli/backup.py # hermes_cli/banner.py # hermes_cli/browser_connect.py # hermes_cli/build_info.py # hermes_cli/cli_agent_setup_mixin.py # hermes_cli/cli_commands_mixin.py # hermes_cli/codex_models.py # hermes_cli/config.py # hermes_cli/config_defaults.py # hermes_cli/config_migrations.py # hermes_cli/container_boot.py # hermes_cli/dashboard_auth/registry.py # hermes_cli/debug.py # hermes_cli/dep_ensure.py # hermes_cli/doctor.py # hermes_cli/doctor_live.py # hermes_cli/dump.py # hermes_cli/env_loader.py # hermes_cli/foreign_sessions.py # hermes_cli/gateway.py # hermes_cli/gateway_windows.py # hermes_cli/gui_uninstall.py # hermes_cli/image_provenance.py # hermes_cli/install_identity.py # hermes_cli/kanban.py # hermes_cli/kanban_db.py # hermes_cli/linux_desktop_entry.py # hermes_cli/local_runtime/binaries.py # hermes_cli/local_runtime/endpoint.py # hermes_cli/local_runtime/growth.py # hermes_cli/local_runtime/supervisor.py # hermes_cli/logs.py # hermes_cli/macos_tcc_anchor.py # hermes_cli/main.py # hermes_cli/memory_setup.py # hermes_cli/model_catalog.py # hermes_cli/models.py # hermes_cli/nous_subscription.py # hermes_cli/npm_engine.py # hermes_cli/plugin_index.py # hermes_cli/plugins.py # hermes_cli/plugins_cmd.py # hermes_cli/profile_distribution.py # hermes_cli/profiles.py # hermes_cli/prompt_size.py # hermes_cli/psutil_android.py # hermes_cli/runtime_repair.py # hermes_cli/security_advisories.py # hermes_cli/security_audit.py # hermes_cli/security_audit_startup.py # hermes_cli/service_manager.py # hermes_cli/session_export_md.py # hermes_cli/setup.py # hermes_cli/skills_hub.py # hermes_cli/slack_cli.py # hermes_cli/status.py # hermes_cli/subcommands/gateway.py # hermes_cli/subcommands/uninstall.py # hermes_cli/tools_config.py # hermes_cli/uninstall.py # hermes_cli/update_cmd.py # hermes_cli/update_contract.py # hermes_cli/update_inventory.py # hermes_cli/update_lock.py # hermes_cli/update_receipt.py # hermes_cli/urllib_security.py # hermes_cli/web_routers/local_models.py # hermes_cli/web_routers/profiles.py # hermes_cli/web_routers/skills.py # hermes_cli/web_server.py # hermes_constants.py # hermes_state.py # plugins/disk-cleanup/__init__.py # plugins/disk-cleanup/disk_cleanup.py # plugins/google_meet/node/registry.py # plugins/google_meet/node/server.py # plugins/google_meet/process_manager.py # plugins/google_meet/realtime/openai_client.py # plugins/hermes-achievements/dashboard/plugin_api.py # plugins/memory/hindsight/__init__.py # plugins/memory/honcho/__init__.py # plugins/memory/honcho/cli.py # plugins/memory/honcho/client.py # plugins/memory/honcho/oauth.py # plugins/memory/honcho/session.py # plugins/memory/mem0/__init__.py # plugins/memory/mem0/_setup.py # plugins/memory/openviking/__init__.py # plugins/memory/retaindb/__init__.py # plugins/memory/supermemory/__init__.py # plugins/platforms/a2a/protocol.py # plugins/platforms/dingtalk/adapter.py # plugins/platforms/discord/adapter.py # plugins/platforms/feishu/adapter.py # plugins/platforms/google_chat/adapter.py # plugins/platforms/matrix/adapter.py # plugins/platforms/photon/adapter.py # plugins/platforms/photon/auth.py # plugins/platforms/photon/cli.py # plugins/platforms/slack/adapter.py # plugins/platforms/teams/adapter.py # plugins/platforms/telegram/adapter.py # plugins/platforms/wecom/callback_adapter.py # plugins/platforms/whatsapp/adapter.py # plugins/teams_pipeline/store.py # plugins/video_gen/fal/__init__.py # plugins/web/ddgs/provider.py # plugins/web/exa/provider.py # plugins/web/firecrawl/provider.py # plugins/web/parallel/provider.py # tests/agent/test_ssl_ca_guard.py # tests/hermes_cli/test_certifi_repair.py # tests/hermes_cli/test_cmd_update.py # tests/hermes_cli/test_cmd_update_apt.py # tests/hermes_cli/test_dashboard_unified_launch.py # tests/hermes_cli/test_dep_ensure.py # tests/hermes_cli/test_doctor.py # tests/hermes_cli/test_doctor_live.py # tests/hermes_cli/test_gui_command.py # tests/hermes_cli/test_kanban_boards.py # tests/hermes_cli/test_kanban_db.py # tests/hermes_cli/test_lazy_refresh_venv_repair.py # tests/hermes_cli/test_memory_setup_provider_arg.py # tests/hermes_cli/test_nous_subscription.py # tests/hermes_cli/test_pip_install_detection.py # tests/hermes_cli/test_profile_export_credentials.py # tests/hermes_cli/test_psutil_android_extract.py # tests/hermes_cli/test_status.py # tests/hermes_cli/test_tui_npm_install.py # tests/hermes_cli/test_update_fleet_restart_pending.py # tests/hermes_cli/test_update_head_moved_gate.py # tests/hermes_cli/test_update_interrupted_recovery.py # tests/hermes_cli/test_web_server.py # tests/hermes_cli/test_web_ui_build.py # tests/test_hermes_logging.py # tests/test_managed_runtime_resolution.py # tests/tools/test_browser_chromium_autoinstall.py # tests/tools/test_browser_chromium_check.py # tests/tools/test_browser_homebrew_paths.py # tests/tools/test_browser_lightpanda.py # tests/tools/test_browser_npx_warmup.py # tests/tools/test_browser_open_timeout.py # tests/tools/test_browser_orphan_reaper.py # tests/tools/test_browser_real_profile.py # tests/tools/test_browser_suspect_recycle.py # tests/tools/test_find_shell.py # tests/tools/test_local_env_blocklist.py # tests/tools/test_macos_protected_search.py # tests/tui_gateway/test_compute_host.py # tools/approval.py # tools/blueprints.py # tools/bot_mode_dm.py # tools/bot_mode_probe.py # tools/bot_relay.py # tools/browser_tool.py # tools/browser_use_cli.py # tools/checkpoint_manager.py # tools/code_execution_tool.py # tools/code_kernel.py # tools/computer_use/cua_backend.py # tools/cronjob_tools.py # tools/discord_tool.py # tools/environments/base.py # tools/environments/daytona.py # tools/environments/local.py # tools/environments/modal.py # tools/environments/vercel_sandbox.py # tools/fal_common.py # tools/file_operations.py # tools/lazy_deps.py # tools/mcp_tool.py # tools/neutts_synth.py # tools/process_registry.py # tools/read_extract.py # tools/registry.py # tools/skill_ledger.py # tools/skill_linter.py # tools/skill_manager_tool.py # tools/skill_usage.py # tools/skills_ast_audit.py # tools/skills_guard.py # tools/skills_hub.py # tools/skills_sync.py # tools/skills_sync_client.py # tools/skills_tool.py # tools/terminal_scope.py # tools/terminal_tool.py # tools/tirith_security.py # tools/transcription_tools.py # tools/tts_tool.py # tools/vision_tools.py # tools/voice_mode.py # tools/wake_word.py # tools/web_result_cache.py # tools/website_policy.py # tools/working_diff.py # tools/write_approval.py # tui_gateway/entry.py # tui_gateway/methods_tools.py # tui_gateway/server.py
221 lines
9.4 KiB
Python
221 lines
9.4 KiB
Python
"""Unified provider-credential lifecycle across every store Hermes reads.
|
|
|
|
Deleting a key from ``.env`` alone leaves the stale ``credential_pool`` entry (and the
|
|
``provider_models_cache.json`` row) behind, so the provider keeps appearing in the model picker
|
|
even across restarts (the pool loader is additive-only). Every surface that saves or removes a
|
|
provider credential should route through :func:`save_provider_env_credential` /
|
|
:func:`remove_provider_env_credential` so all stores stay consistent.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from typing import Any, Dict, List
|
|
|
|
__all__ = [
|
|
"save_provider_env_credential",
|
|
"remove_provider_env_credential",
|
|
"purge_env_credential_references"]
|
|
|
|
|
|
def _providers_for_env_var(env_var: str) -> List[str]:
|
|
"""Provider ids whose registered api_key_env_vars include ``env_var``."""
|
|
try:
|
|
from hermes_cli.auth import PROVIDER_REGISTRY
|
|
except Exception:
|
|
return []
|
|
hits: List[str] = []
|
|
for pid, cfg in PROVIDER_REGISTRY.items():
|
|
try:
|
|
if env_var in (cfg.api_key_env_vars or ()):
|
|
hits.append(pid)
|
|
except Exception:
|
|
continue
|
|
return hits
|
|
|
|
|
|
def _for_each_provider(providers: List[str], import_path: str, *args: Any) -> None:
|
|
"""Best-effort ``module.fn(provider, *args)`` for every provider; failures never propagate."""
|
|
try:
|
|
import importlib
|
|
|
|
module_name, fn_name = import_path.rsplit(".", 1)
|
|
fn = getattr(importlib.import_module(module_name), fn_name)
|
|
for provider in providers:
|
|
fn(provider, *args)
|
|
except Exception:
|
|
pass
|
|
|
|
|
|
def _prune_env_pool_entries(env_var: str) -> List[str]:
|
|
"""Drop ``credential_pool`` entries seeded from ``env:<env_var>``; return providers pruned.
|
|
|
|
Spans ALL providers (shared vars like GITHUB_TOKEN seed several). Entries with any other
|
|
source (OAuth, device-code, manual, borrowed-CLI) are preserved verbatim.
|
|
"""
|
|
from hermes_cli.auth import _auth_store_lock, _load_auth_store, _save_auth_store
|
|
|
|
source = f"env:{env_var}"
|
|
pruned: List[str] = []
|
|
with _auth_store_lock():
|
|
auth_store = _load_auth_store()
|
|
pool = auth_store.get("credential_pool")
|
|
if not isinstance(pool, dict):
|
|
return pruned
|
|
for provider in list(pool.keys()):
|
|
entries = pool[provider]
|
|
if not isinstance(entries, list):
|
|
continue
|
|
kept = [e for e in entries if not (isinstance(e, dict) and e.get("source") == source)]
|
|
if len(kept) == len(entries):
|
|
continue
|
|
pruned.append(provider)
|
|
if kept:
|
|
pool[provider] = kept
|
|
else:
|
|
del pool[provider]
|
|
if pruned:
|
|
_save_auth_store(auth_store)
|
|
return pruned
|
|
|
|
|
|
def _scrub_config_yaml_mirrors(old_value: str, new_value: str | None) -> List[str]:
|
|
"""Reconcile config.yaml api_key mirrors holding ``old_value``; return dotted paths touched.
|
|
|
|
Value-matched on purpose: only an entry holding the SAME credential that just changed in
|
|
``.env`` is touched. ``new_value=None`` removes the field. Operates on the RAW user config
|
|
so defaults are never baked into the user's file.
|
|
"""
|
|
if not old_value:
|
|
return []
|
|
from utils import atomic_yaml_write, fast_safe_load
|
|
|
|
from hermes_cli.config import get_config_path, require_readable_config_before_write
|
|
|
|
config_path = get_config_path()
|
|
if not config_path.exists():
|
|
return []
|
|
try:
|
|
with open(config_path, encoding="utf-8-sig") as f:
|
|
user_config = fast_safe_load(f) or {}
|
|
except Exception:
|
|
return []
|
|
if not isinstance(user_config, dict):
|
|
return []
|
|
|
|
touched: List[str] = []
|
|
|
|
def _fix(section: Any, key_path: str, fields: tuple[str, ...] = ("api_key", "api")) -> None:
|
|
# "api" is the legacy alias for model.api_key in older configs. In the keyed ``providers``
|
|
# schema ``api`` means the base_url, not a credential, so that section passes
|
|
# ``fields=("api_key",)``.
|
|
if not isinstance(section, dict):
|
|
return
|
|
for field in fields:
|
|
current = section.get(field)
|
|
if isinstance(current, str) and current == old_value:
|
|
if new_value:
|
|
section[field] = new_value
|
|
else:
|
|
section.pop(field, None)
|
|
touched.append(f"{key_path}.{field}")
|
|
|
|
def _items(value: Any, allow_list: bool):
|
|
if isinstance(value, dict):
|
|
return value.items()
|
|
return enumerate(value) if allow_list and isinstance(value, list) else ()
|
|
|
|
_fix(user_config.get("model"), "model")
|
|
for task, slot_cfg in _items(user_config.get("auxiliary"), False):
|
|
_fix(slot_cfg, f"auxiliary.{task}")
|
|
for name, entry in _items(user_config.get("custom_providers"), True):
|
|
_fix(entry, f"custom_providers.{name}")
|
|
|
|
# ``providers.<id>.api_key`` (v12+) is where dashboard/desktop write custom-endpoint
|
|
# credentials. It is a real inline secret with higher precedence than the env var, so a stale
|
|
# copy shadows a rotation (persistent 401 with a key the UI no longer shows) and survives a
|
|
# removal that promised to clear EVERY store.
|
|
for provider_id, entry in _items(user_config.get("providers"), False):
|
|
_fix(entry, f"providers.{provider_id}", fields=("api_key",))
|
|
|
|
if touched:
|
|
require_readable_config_before_write(config_path)
|
|
atomic_yaml_write(config_path, user_config, sort_keys=False)
|
|
return touched
|
|
|
|
|
|
def purge_env_credential_references(
|
|
env_var: str, *, clear_models_cache: bool = True) -> Dict[str, Any]:
|
|
"""Remove non-.env references to an env-var credential.
|
|
|
|
Prunes env-seeded pool entries and (optionally) the affected ``provider_models_cache.json`` rows
|
|
so the model picker stops advertising a provider whose key is gone.
|
|
|
|
See #59761.
|
|
"""
|
|
pruned = _prune_env_pool_entries(env_var)
|
|
providers = sorted(set(pruned) | set(_providers_for_env_var(env_var)))
|
|
# Make the removal sticky the same way `hermes auth remove` does: a lingering shell export (or
|
|
# another live process's os.environ) would otherwise re-seed the pool entry on the next
|
|
# load_pool(). The save path lifts the suppression on an explicit re-add.
|
|
_for_each_provider(providers, "hermes_cli.auth.suppress_credential_source", f"env:{env_var}")
|
|
if clear_models_cache and providers:
|
|
# Best-effort — a cache failure must not block the credential removal itself.
|
|
_for_each_provider(providers, "hermes_cli.models.clear_provider_models_cache")
|
|
return {"pool_pruned": pruned, "providers": providers}
|
|
|
|
|
|
def save_provider_env_credential(env_var: str, value: str) -> Dict[str, Any]:
|
|
"""Save/update a credential in ``.env`` and reconcile every mirror.
|
|
|
|
config.yaml mirrors of the PREVIOUS value are updated so a stale higher-precedence copy cannot
|
|
shadow the rotation, and ``load_pool()`` runs now so the env-seeded ``credential_pool`` entry
|
|
lands in ``auth.json`` (a ``.env``-only write left env-backed providers 401'ing).
|
|
|
|
Suppressed ``env:<VAR>`` pool sources are re-enabled so a deliberate re-add through the UI behaves like
|
|
``hermes auth add``. See #62269.
|
|
The save also forces an immediate ``load_pool()`` for every provider registered against this env var so
|
|
the env-seeded ``credential_pool`` entry is materialized to ``auth.json`` right now — the live runtime
|
|
reads from the pool, and before #96058 the Desktop "Save" action only touched ``.env`` while
|
|
``auth.json``'s mtime stayed unchanged, so an OpenCode Go (or any other env-backed provider) request
|
|
kept 401'ing until the user ran ``hermes auth add <provider> --type api-key`` separately. This makes the
|
|
Desktop save's effect on disk match what ``hermes auth add`` does.
|
|
"""
|
|
from hermes_cli.config import load_env, save_env_value
|
|
|
|
old_value = load_env().get(env_var)
|
|
save_env_value(env_var, value)
|
|
|
|
config_updates: List[str] = []
|
|
if value and old_value and old_value != value:
|
|
config_updates = _scrub_config_yaml_mirrors(old_value, value)
|
|
|
|
# A prior removal may have suppressed this env source; a fresh save is an explicit re-add.
|
|
providers = _providers_for_env_var(env_var)
|
|
_for_each_provider(providers, "hermes_cli.auth.unsuppress_credential_source", f"env:{env_var}")
|
|
|
|
# ``load_pool`` is idempotent and additive-only for env sources, so re-running is safe even when
|
|
# the pool already had this entry. Best-effort: never masks the successful .env write above.
|
|
_for_each_provider(providers, "agent.credential_pool.load_pool")
|
|
|
|
return {"ok": True, "key": env_var, "config_updates": config_updates}
|
|
|
|
|
|
def remove_provider_env_credential(env_var: str) -> Dict[str, Any]:
|
|
"""Remove a credential from EVERY store: ``.env`` (and process env), env-seeded
|
|
``credential_pool`` entries, model-cache rows, config.yaml mirrors of the same value."""
|
|
from hermes_cli.config import load_env, remove_env_value
|
|
|
|
old_value = load_env().get(env_var)
|
|
removed_from_env = remove_env_value(env_var)
|
|
refs = purge_env_credential_references(env_var)
|
|
config_scrubbed = _scrub_config_yaml_mirrors(old_value, None) if old_value else []
|
|
|
|
return {
|
|
"ok": True,
|
|
"key": env_var,
|
|
"removed": removed_from_env,
|
|
"pool_pruned": refs["pool_pruned"],
|
|
"providers": refs["providers"],
|
|
"config_scrubbed": config_scrubbed,
|
|
"found": bool(removed_from_env or refs["pool_pruned"] or config_scrubbed)}
|