`gjNH UdZddlmZddlZddlmZmZddlmZm Z m Z eGddZ eGdd Z gZ d ed <dd Zdd ZddZddZddZddZddZddZddZddZddZddZddZddZey)uUnified removal contract for every credential source Hermes reads from. Hermes seeds its credential pool from many places: env: — os.environ / ~/.hermes/.env claude_code — ~/.claude/.credentials.json hermes_pkce — ~/.hermes/.anthropic_oauth.json device_code — auth.json providers. (nous, openai-codex, ...) qwen-cli — ~/.qwen/oauth_creds.json gh_cli — gh auth token config: — custom_providers config entry model_config — model.api_key when model.provider == "custom" manual — user ran `hermes auth add` Each source has its own reader inside ``agent.credential_pool._seed_from_*`` (which keep their existing shape — we haven't restructured them). What we unify here is **removal**: ``hermes auth remove `` must make the pool entry stay gone. Before this module, every source had an ad-hoc removal branch in ``auth_remove_command``, and several sources had no branch at all — so ``auth remove`` silently reverted on the next ``load_pool()`` call for qwen-cli, nous device_code (partial), hermes_pkce, copilot gh_cli, and custom-config sources. Now every source registers a ``RemovalStep`` that does exactly three things in the same shape: 1. Clean up whatever externally-readable state the source reads from (.env line, auth.json block, OAuth file, etc.) 2. Suppress the ``(provider, source_id)`` in auth.json so the corresponding ``_seed_from_*`` branch skips the upsert on re-load 3. Return ``RemovalResult`` describing what was cleaned and any diagnostic hints the user should see (shell-exported env vars, external credential files we deliberately don't delete, etc.) Adding a new credential source is: - wire up a reader branch in ``_seed_from_*`` (existing pattern) - gate that reader behind ``is_source_suppressed(provider, source_id)`` - register a ``RemovalStep`` here No more per-source if/elif chain in ``auth_remove_command``. ) annotationsN) dataclassfield)CallableListOptionalcXeZdZUdZeeZded<eeZded<dZ ded<y ) RemovalResultuOutcome of removing a credential source. Attributes: cleaned: Short strings describing external state that was actually mutated (``"Cleared XAI_API_KEY from .env"``, ``"Cleared openai-codex OAuth tokens from auth store"``). Printed as plain lines to the user. hints: Diagnostic lines ABOUT state the user may need to clean up themselves or is deliberately left intact (shell-exported env var, Claude Code credential file we don't delete, etc.). Printed as plain lines to the user. Always non-destructive. suppress: Whether to call ``suppress_credential_source`` after cleanup so future ``load_pool`` calls skip this source. Default True — almost every source needs this to stay sticky. The only legitimate False is ``manual`` entries, which aren't seeded from anywhere external. )default_factoryz List[str]cleanedhintsTboolsuppressN) __name__ __module__ __qualname____doc__rlistr __annotations__r rK/root/.hermes/venv/lib/python3.12/site-packages/agent/credential_sources.pyr r 5s1$t4GY4T2E92Hdrr cTeZdZUdZded<ded<ded<dZded <d Zded <d d Zy) RemovalStepuHow to remove one specific credential source cleanly. Attributes: provider: Provider pool key (``"xai"``, ``"anthropic"``, ``"nous"``, ...). Special value ``"*"`` means "matches any provider" — used for sources like ``manual`` that aren't provider-specific. source_id: Source identifier as it appears in ``PooledCredential.source``. May be a literal (``"claude_code"``) or a prefix pattern matched via ``match_fn``. match_fn: Optional predicate overriding literal ``source_id`` matching. Gets the removed entry's source string. Used for ``env:*`` (any env-seeded key), ``config:*`` (any custom pool), and ``manual:*`` (any manual-source variant). remove_fn: ``(provider, removed_entry) -> RemovalResult``. Does the actual cleanup and returns what happened for the user. description: One-line human-readable description for docs / tests. strprovider source_idzCallable[..., RemovalResult] remove_fnNzOptional[Callable[[str], bool]]match_fn descriptionc|jdk7r|j|k7ry|j|j|S||jk(S)N*F)rrr)selfrsources rmatcheszRemovalStep.matcheshsD ==C DMMX$= == $==( (''r)rrr%rreturnr)rrrrrrr!r&rrrrrNs3$MN++04H-4K(rrzList[RemovalStep] _REGISTRYc0tj||S)N)r(append)steps rregisterr,ss T KrcFtD]}|j||s|cSy)uReturn the first matching RemovalStep, or None if unregistered. Unregistered sources fall through to the default remove path in ``auth_remove_command``: the pool entry is already gone (that happens before dispatch), no external cleanup, no suppression. This is the correct behaviour for ``manual`` entries — they were only ever stored in the pool, nothing external to clean up. N)r(r&)rr%r+s rfind_removal_stepr.xs+ <<& )K rc N ddlm}m}t}|jt dd s|St tj }d} |}|jr2t fd|jdjD}|xr| }| } | r|jjd d |r+|j j#d d d d d|dg|S|j jd d|S#t$rYwxYw)uRenv: — the most common case. Handles three user situations: 1. Var lives only in ~/.hermes/.env → clear it 2. Var lives only in the user's shell (shell profile, systemd EnvironmentFile, launchd plist) → hint them where to unset it 3. Var lives in both → clear from .env, hint about shell r) get_env_pathremove_env_valueenv:NFc3bK|]&}|jjd(yw)=N)strip startswith).0lineenv_vars r z%_remove_env_source..s0  ''7)1 6 s,/replace)errorsCleared z from .envzNote: z@ is still set in your shell environment (not in ~/.hermes/.env).zw Unset it there (shell profile, systemd EnvironmentFile, launchd plist, etc.) or it will keep being visible to Hermes.u: The pool entry is now suppressed — Hermes will ignore z until you run `hermes auth add z`.zSuppressed env:uH — it will not be re-seeded even if the variable is re-exported later.)hermes_cli.configr0r1r r%lenrosgetenvexistsany read_text splitlinesOSErrorr r*r extend) rremovedr0r1resultenv_in_process env_in_dotenvenv_pathshell_exportedclearedr9s @r_remove_env_sourcerOsPA _FnnS[\*G  "))G,-NM > ??  $..i.@KKM M $9M(9Nw'G <= WI' ( LHi7z E    M  gY'4 5  M-    sA D D$#D$ctgdS)u~/.claude/.credentials.json is owned by Claude Code itself. We don't delete it — the user's Claude Code install still needs to work. We just suppress it so Hermes stops reading it. )u?Suppressed claude_code credential — it will not be re-seeded.zGNote: Claude Code credentials still live in ~/.claude/.credentials.jsonz7Run `hermes auth add anthropic` to re-enable if needed.r r rrHs r_remove_claude_coderT   rc&ddlm}t}|dz }|jr. |j |j j d|S|S#t$r,}|jj d|d|Yd}~|Sd}~wwxYw)u?~/.hermes/.anthropic_oauth.json is ours — delete it outright.r)get_hermes_homez.anthropic_oauth.jsonz*Cleared Hermes Anthropic OAuth credentialszCould not delete z: N) hermes_constantsrWr rBunlinkr r*rFr )rrHrWrI oauth_fileexcs r_remove_hermes_pkcer\s0 _F "%<`` silently undoes itself: the central dispatcher only removes the in-memory pool entry, leaves ``providers.xai-oauth`` in auth.json intact, and on the next ``load_pool("xai-oauth")`` call ``_seed_from_singletons`` re-seeds the entry from the still-present singleton — credentials reappear with no user feedback. Clearing the singleton in step with the suppression set by the central dispatcher makes the removal stick. r=rjuZRun `hermes model` → xAI Grok OAuth (SuperGrok / Premium+) to re-authenticate if needed.)r rhr r*r rls r_remove_xai_oauth_device_coderq sK_F!(+ 2OPQ LLd Mrcddlm}t}t|r|jj d|d||d|j jgd|S)uCodex tokens live in TWO places: our auth store AND ~/.codex/auth.json. refresh_codex_oauth_pure() writes both every time, so clearing only the Hermes auth store is not enough — _seed_from_singletons() would re-import from ~/.codex/auth.json on the next load_pool() call and the removal would be instantly undone. We suppress instead of deleting Codex CLI's file, so the Codex CLI itself keeps working. The canonical source name in ``_seed_from_singletons`` is ``"device_code"`` (no prefix). Entries may show up in the pool as either ``"device_code"`` (seeded) or ``"manual:device_code"`` (added via ``hermes auth add openai-codex``), but in both cases the re-seed gate lives at the ``"device_code"`` suppression key. We suppress that canonical key here; the central dispatcher also suppresses ``removed.source`` which is fine — belt-and-suspenders, idempotent. rsuppress_credential_sourcer=rj device_code)uHSuppressed openai-codex device_code source — it will not be re-seeded.z from ``_seed_from_env``), so removing one entry without suppressing the others lets the duplicates resurrect. We suppress ALL known copilot sources here so removal is stable regardless of which entry the user clicked. We don't touch the user's gh CLI or shell state — just suppress so Hermes stops picking the token up. rrsgh_cli)COPILOT_GITHUB_TOKENGH_TOKEN GITHUB_TOKENr2)uXSuppressed all copilot token sources (gh_cli + env vars) — they will not be re-seeded.z3Note: Your gh CLI / shell environment is unchanged.z5Run `hermes auth add copilot` to re-enable if needed.rQ)rbrtr )rrHrtr9s r_remove_copilot_ghr~OsE";x2G?"8tG9-=>?   rc>|j}td|ddgS)uCustom provider pools are seeded from custom_providers config or model.api_key. Both are in config.yaml — modifying that from here is more invasive than suppression. We suppress; the user can edit config.yaml if they want to remove the key from disk entirely. z Suppressed u — it will not be re-seeded.zyNote: The underlying value in config.yaml is unchanged. Edit it directly if you want to remove the credential from disk.rQ)r%r )rrH source_labels r_remove_custom_configrls2 >>L  l^#AB C  rc Dttdddtdttdddtd ttd d td ttd dt d ttddt d ttdddtdttddtd ttddtd ttddtd ttdddtd y!)"uiCalled once on module import. ORDER MATTERS — ``find_removal_step`` returns the first match. Put provider-specific steps before the generic ``env:*`` step so that e.g. copilot's ``env:GH_TOKEN`` goes through the copilot removal (which doesn't touch the user's shell), not the generic env-var removal (which would try to clear .env). copilotrzc2|dk(xs|jdS)Nrzr2r6srcs rz'_register_all_sources..sSH_Fv0Frz/gh auth token / COPILOT_GITHUB_TOKEN / GH_TOKEN)rrrrr!r#r2c$|jdS)Nr2rrs rrz'_register_all_sources..sS^^F3rz?Any env-seeded credential (XAI_API_KEY, DEEPSEEK_API_KEY, etc.) anthropic claude_codez~/.claude/.credentials.json)rrrr! hermes_pkcez~/.hermes/.anthropic_oauth.jsonnousruzauth.json providers.nousz openai-codexc2|dk(xs|jdS)Nruz :device_code)endswithrs rrz'_register_all_sources..sSM1QS\\.5Qrz5auth.json providers.openai-codex + ~/.codex/auth.jsonz xai-oauthzauth.json providers.xai-oauthz qwen-oauthzqwen-cliz~/.qwen/oauth_creds.jsonz minimax-oauthoauthz!auth.json providers.minimax-oauthconfig:c2|jdxs|dk(S)Nr model_configrrs rrz'_register_all_sources..sS^^I6O#:Orz)Custom provider config.yaml api_key fieldN) r,rr~rOrTr\rmrvrqrxrorrrr_register_all_sourcesrzs& [hF$E   [3$U   [ %1  [ %5  [=*.  [=Q+K   [ /3  [".  [ G'7  [ O'? r)r+rr'r)rrr%rr'zOptional[RemovalStep])rrr'r )rrr'r)r'None)r __future__rr@ dataclassesrrtypingrrrr rr(rr,r.rOrTr\rhrmrorqrvrxr~rrrrrrs+Z# (++  0 (( (B " ! .0f  $  (D : >Br