hermes - ✅(Solved) Fix restructure follow-up: fix agent→cli layer inversions in providers/ [1 pull requests, 1 participants]

alt-glitch · 2026-04-23T01:46:36Z

[hermes] Deliberately deferred from PR 1 14183 which is purely mechanical — no logic changes. PR 14498: refactor: move all source into hermes agent/ package PR… Deliberately deferred from PR 1 (#14183) which is purely mechanical — no logic changes. # PR #14498: refactor: move all source into hermes_agent/ package (PR 1/3) - Repository: NousResearch/hermes-agent - Author: alt-glitch - State: closed | merged: False - Link: https://github.com/NousResearch/hermes-agent/pull/14498 ## Description (problem / solution / changelog) ## Summary Consolidates the entire codebase into a single `hermes_agent/` Python package. This is **PR 1 of 3** in the restructure tracked by #14182 (sub-issue: #14183). **Before:** 8 independent packages (`agent/`, `tools/`, `hermes_cli/`, `gateway/`, `acp_adapter/`, `cron/`, `plugins/`) + 11 top-level modules (`run_agent.py`, `cli.py`, `model_tools.py`, etc.) with unprefixed imports (`from agent.prompt_builder import ...`). **After:** One `hermes_agent/` package with organized subpackages. All imports are `from hermes_agent.X import ...`. ### Diff breakdown The diff looks large (+13,057 / -12,287) but ~95% is mechanical one-line import path changes. Here's the breakdown: | Category | Files | +lines | -lines | What it is | |----------|-------|--------|--------|------------| | Pure renames | 72 | 0 | 0 | `git mv` only — invisible in diff | | Renames + import rewrites | 219 | 2,109 | 2,104 | Moved files that also had imports rewritten | | Tests (not renamed) | 649 | 9,814 | 9,895 | Import rewrites + test fixture fixes | | Scripts | 11 | 914 | 36 | Move map + import rewriter (new files) | | Infra + other | 42 | 226 | 245 | `tui_gateway/`, `environments/`, Dockerfile, AGENTS.md, etc. | Tests dominate because every test file imports from the packages we moved, so every `from agent.`, `from tools.`, `from hermes_cli.` line was rewritten — plus all `patch()` and `monkeypatch.setattr()` target strings. There are more test files (649) than source files (291) because each test imports and mocks multiple modules. The actual semantic changes (infra, new scripts, `.git-blame-ignore-revs`) account for ~1,100 lines. ### What changed - **268 source files** moved into `hermes_agent/` via `git mv` (100% similarity preserved for blame) - **All imports rewritten** across 898 files — covers `import X`, `from X import`, `patch()` strings, `monkeypatch.setattr()`, `sys.modules[]` keys, `importlib.import_module()` strings - **Infrastructure updated** — `pyproject.toml` entry points, `Dockerfile`, `docker/entrypoint.sh`, `scripts/install.sh`, `setup-hermes.sh`, `scripts/install.ps1`, `web/vite.config.ts`, `MANIFEST.in`, `AGENTS.md`, `nix/checks.nix` - **New subpackage organization:** - `agent/transports/` + provider adapters → `hermes_agent/providers/` - `tools/environments/` → `hermes_agent/backends/` - `tools/browser_*.py` → `hermes_agent/tools/browser/` - `tools/mcp_*.py` → `hermes_agent/tools/mcp/` - `tools/skills_*.py` → `hermes_agent/tools/skills/` - `tools/file_*.py` → `hermes_agent/tools/files/` - `tools/*_tool.py` (media) → `hermes_agent/tools/media/` - `hermes_cli/auth*.py` → `hermes_agent/cli/auth/` - `hermes_cli/model*.py` → `hermes_agent/cli/models/` - `hermes_cli/banner.py`, `colors.py`, etc. → `hermes_agent/cli/ui/` - **New console script:** `hermes-skills-sync` — decouples shell scripts from internal module layout - **Zero logic changes** — this is purely mechanical file moves + import rewrites ### Commit strategy | # | Commit | Purpose | |---|--------|---------| | 1 | `8bff8bf2` | Add move map data structure (268 file mappings) | | 2 | `65ca3ba9` | Pure `git mv` — all files into `hermes_agent/` (100% similarity) | | 3 | `4b163419` | Rewrite all imports + string references (898 files) | | 4 | `a1e667b9` | Fix test regressions from import rewrite (113 test files) | | 5 | `76aebd73` | Update infrastructure (pyproject, Docker, shell scripts, vite, AGENTS.md) | | 6 | `ff99611e` | Update Nix files | | 7 | `25072fe6` | Fix stale references missed by import rewrite | | 8 | `987962f4` | Add `.git-blame-ignore-revs` for restructure commits | Commits 1-2 are separated so `git log --follow` and `git blame` work correctly. The `git mv` commit has 100% similarity on all 268 files. `.git-blame-ignore-revs` tells git blame (and GitHub) to skip commits 2-3. ### Key decisions | Decision | Choice | Rationale | |----------|--------|-----------| | `plugins/` location | Moved into `hermes_agent/plugins/` | Single package boundary | | Layer inversions (agent→cli) | Moved as-is | PR 1 is mechanical only; fix in follow-up #14278 | | `sys.path` hacks in prod code | Stripped | All install paths use editable installs; hacks are redundant | | `tests/conftest.py` `sys.path` | Stripped, added `ImportError` guard | Forces proper `uv pip install -e '.[all,dev]'` | | Logger `COMPONENT_PREFIXES` | Updated to new paths | Preserves `hermes logs --component` filtering | | Process-name matching (gateway) | New patterns added alongsid

hermes2026-04-23 01:46:36

ON THIS PAGE

Recommended Tools

×6

Utilities matched from this issue’s tags and category — try them while you read without losing context.

GitHub issue graph ai analysis

Paste a GitHub issue URL. We fetch that issue, discover linked issues from bodies/comments/timeline, collect linked pull requests, and produce a structured English report.

The report is written in English Markdown for sharing and archival.

GitHub issue URL

Helpful · Quick feedback

GitHub stats

NousResearch/hermes-agent#14278•Fetched 2026-04-23 07:45:51

View on GitHub

Comments

Participants

Timeline

Reactions

Author

alt-glitch

Participants

alt-glitch

Timeline (top)

labeled ×4cross-referenced ×1

Deliberately deferred from PR 1 (#14183) which is purely mechanical — no logic changes.

Root Cause

Deliberately deferred from PR 1 (#14183) which is purely mechanical — no logic changes.

PR fix notes

PR #14498: refactor: move all source into hermes_agent/ package (PR 1/3)

Repository: NousResearch/hermes-agent
Author: alt-glitch
State: closed | merged: False
Link: https://github.com/NousResearch/hermes-agent/pull/14498

Description (problem / solution / changelog)

Summary

Consolidates the entire codebase into a single hermes_agent/ Python package. This is PR 1 of 3 in the restructure tracked by #14182 (sub-issue: #14183).

Before: 8 independent packages (agent/, tools/, hermes_cli/, gateway/, acp_adapter/, cron/, plugins/) + 11 top-level modules (run_agent.py, cli.py, model_tools.py, etc.) with unprefixed imports (from agent.prompt_builder import ...).

After: One hermes_agent/ package with organized subpackages. All imports are from hermes_agent.X import ....

Diff breakdown

The diff looks large (+13,057 / -12,287) but ~95% is mechanical one-line import path changes. Here's the breakdown:

Category	Files	+lines	-lines	What it is
Pure renames	72	0	0	`git mv` only — invisible in diff
Renames + import rewrites	219	2,109	2,104	Moved files that also had imports rewritten
Tests (not renamed)	649	9,814	9,895	Import rewrites + test fixture fixes
Scripts	11	914	36	Move map + import rewriter (new files)
Infra + other	42	226	245	`tui_gateway/`, `environments/`, Dockerfile, AGENTS.md, etc.

Tests dominate because every test file imports from the packages we moved, so every from agent., from tools., from hermes_cli. line was rewritten — plus all patch() and monkeypatch.setattr() target strings. There are more test files (649) than source files (291) because each test imports and mocks multiple modules.

The actual semantic changes (infra, new scripts, .git-blame-ignore-revs) account for ~1,100 lines.

What changed

268 source files moved into hermes_agent/ via git mv (100% similarity preserved for blame)
All imports rewritten across 898 files — covers import X, from X import, patch() strings, monkeypatch.setattr(), sys.modules[] keys, importlib.import_module() strings
Infrastructure updated — pyproject.toml entry points, Dockerfile, docker/entrypoint.sh, scripts/install.sh, setup-hermes.sh, scripts/install.ps1, web/vite.config.ts, MANIFEST.in, AGENTS.md, nix/checks.nix
New subpackage organization:
- agent/transports/ + provider adapters → hermes_agent/providers/
- tools/environments/ → hermes_agent/backends/
- tools/browser_*.py → hermes_agent/tools/browser/
- tools/mcp_*.py → hermes_agent/tools/mcp/
- tools/skills_*.py → hermes_agent/tools/skills/
- tools/file_*.py → hermes_agent/tools/files/
- tools/*_tool.py (media) → hermes_agent/tools/media/
- hermes_cli/auth*.py → hermes_agent/cli/auth/
- hermes_cli/model*.py → hermes_agent/cli/models/
- hermes_cli/banner.py, colors.py, etc. → hermes_agent/cli/ui/
New console script: hermes-skills-sync — decouples shell scripts from internal module layout
Zero logic changes — this is purely mechanical file moves + import rewrites

Commit strategy

#	Commit	Purpose
1	`8bff8bf2`	Add move map data structure (268 file mappings)
2	`65ca3ba9`	Pure `git mv` — all files into `hermes_agent/` (100% similarity)
3	`4b163419`	Rewrite all imports + string references (898 files)
4	`a1e667b9`	Fix test regressions from import rewrite (113 test files)
5	`76aebd73`	Update infrastructure (pyproject, Docker, shell scripts, vite, AGENTS.md)
6	`ff99611e`	Update Nix files
7	`25072fe6`	Fix stale references missed by import rewrite
8	`987962f4`	Add `.git-blame-ignore-revs` for restructure commits

Commits 1-2 are separated so git log --follow and git blame work correctly. The git mv commit has 100% similarity on all 268 files. .git-blame-ignore-revs tells git blame (and GitHub) to skip commits 2-3.

Key decisions

Decision	Choice	Rationale
`plugins/` location	Moved into `hermes_agent/plugins/`	Single package boundary
Layer inversions (agent→cli)	Moved as-is	PR 1 is mechanical only; fix in follow-up #14278
`sys.path` hacks in prod code	Stripped	All install paths use editable installs; hacks are redundant
`tests/conftest.py` `sys.path`	Stripped, added `ImportError` guard	Forces proper `uv pip install -e '.[all,dev]'`
Logger `COMPONENT_PREFIXES`	Updated to new paths	Preserves `hermes logs --component` filtering
Process-name matching (gateway)	New patterns added alongside old	Running gateways from pre-upgrade installs still have old cmdline
`skills_sync`	Added `hermes-skills-sync` console_script	Decouples `setup-hermes.sh`, `install.sh`, `entrypoint.sh` from internal layout
Transport discovery	Updated `_discover_transports()`	Same auto-discovery pattern, new `hermes_agent.providers.*_transport` paths
Tool registry	Extended `discover_builtin_tools()`	Scans `browser/`, `files/`, `media/`, `skills/` subpackage directories

Test results

Metric	Baseline (pre-restructure)	After restructure
Passed	14,099	14,220 (+121)
Failed	67	71
Errors	73	72
Skipped	38	30

All errors are pre-existing (Callable type annotation bug). The +121 passed is from previously-erroring tests now resolving correctly. No regressions introduced.

Entry points verified

hermes --help          ✅
hermes-agent --help    ✅
hermes-acp --help      ✅
hermes-skills-sync     ✅

Follow-up issues

#14278 — Fix layer inversions (agent→cli imports)
#14279 — Remove legacy process-name patterns after one release cycle

Directories unchanged (stay at repo root)

skills/, optional-skills/, environments/, tui_gateway/, ui-tui/, web/, website/, docker/, nix/, packaging/, scripts/, tests/, acp_registry/, assets/

Closes #14183

Part of #14182

Changed files

.git-blame-ignore-revs (added, +5/-0)
AGENTS.md (modified, +64/-73)
Dockerfile (modified, +2/-2)
MANIFEST.in (modified, +1/-0)
datagen-config-examples/run_browser_tasks.sh (modified, +1/-1)
datagen-config-examples/web_research.yaml (modified, +1/-1)
docker/entrypoint.sh (modified, +1/-1)
environments/agent_loop.py (modified, +9/-6)
environments/benchmarks/terminalbench_2/terminalbench2_env.py (modified, +3/-3)
environments/benchmarks/yc_bench/yc_bench_env.py (modified, +2/-2)
environments/hermes_base_env.py (modified, +4/-4)
environments/tool_context.py (modified, +4/-4)
hermes (modified, +1/-1)
hermes_agent/__init__.py (added, +0/-0)
hermes_agent/acp/__init__.py (renamed, +0/-0)
hermes_agent/acp/__main__.py (renamed, +0/-0)
hermes_agent/acp/auth.py (renamed, +1/-1)
hermes_agent/acp/entry.py (renamed, +2/-7)
hermes_agent/acp/events.py (renamed, +1/-1)
hermes_agent/acp/permissions.py (renamed, +0/-0)
hermes_agent/acp/server.py (renamed, +14/-14)
hermes_agent/acp/session.py (renamed, +7/-7)
hermes_agent/acp/tools.py (renamed, +2/-2)
hermes_agent/agent/__init__.py (renamed, +0/-0)
hermes_agent/agent/context/__init__.py (added, +0/-0)
hermes_agent/agent/context/compressor.py (renamed, +4/-4)
hermes_agent/agent/context/engine.py (renamed, +0/-0)
hermes_agent/agent/context/references.py (renamed, +3/-3)
hermes_agent/agent/copilot_acp_client.py (renamed, +2/-2)
hermes_agent/agent/display.py (renamed, +6/-5)
hermes_agent/agent/file_safety.py (renamed, +1/-1)
hermes_agent/agent/image_gen/__init__.py (added, +0/-0)
hermes_agent/agent/image_gen/provider.py (renamed, +1/-1)
hermes_agent/agent/image_gen/registry.py (renamed, +2/-2)
hermes_agent/agent/insights.py (renamed, +2/-2)
hermes_agent/agent/loop.py (renamed, +149/-143)
hermes_agent/agent/manual_compression_feedback.py (renamed, +0/-0)
hermes_agent/agent/memory/__init__.py (added, +0/-0)
hermes_agent/agent/memory/manager.py (renamed, +3/-3)
hermes_agent/agent/memory/provider.py (renamed, +0/-0)
hermes_agent/agent/prompt_builder.py (renamed, +7/-7)
hermes_agent/agent/redact.py (renamed, +0/-0)
hermes_agent/agent/shell_hooks.py (renamed, +3/-3)
hermes_agent/agent/skill_commands.py (renamed, +7/-7)
hermes_agent/agent/skill_utils.py (renamed, +4/-3)
hermes_agent/agent/subdirectory_hints.py (renamed, +1/-1)
hermes_agent/agent/title_generator.py (renamed, +1/-1)
hermes_agent/agent/trajectory.py (renamed, +0/-0)
hermes_agent/backends/__init__.py (renamed, +1/-1)
hermes_agent/backends/base.py (renamed, +6/-6)
hermes_agent/backends/daytona.py (renamed, +2/-2)
hermes_agent/backends/docker.py (renamed, +6/-6)
hermes_agent/backends/file_sync.py (renamed, +3/-3)
hermes_agent/backends/local.py (renamed, +8/-8)
hermes_agent/backends/managed_modal.py (renamed, +3/-3)
hermes_agent/backends/modal.py (renamed, +4/-4)
hermes_agent/backends/modal_utils.py (renamed, +3/-3)
hermes_agent/backends/singularity.py (renamed, +4/-4)
hermes_agent/backends/ssh.py (renamed, +2/-2)
hermes_agent/cli/__init__.py (renamed, +0/-0)
hermes_agent/cli/auth/__init__.py (added, +0/-0)
hermes_agent/cli/auth/auth.py (renamed, +28/-24)
hermes_agent/cli/auth/commands.py (renamed, +13/-13)
hermes_agent/cli/auth/copilot.py (renamed, +0/-0)
hermes_agent/cli/auth/dingtalk.py (renamed, +3/-3)
hermes_agent/cli/backup.py (renamed, +2/-2)
hermes_agent/cli/claw.py (renamed, +5/-5)
hermes_agent/cli/clipboard.py (renamed, +8/-5)
hermes_agent/cli/commands.py (renamed, +12/-12)
hermes_agent/cli/config.py (renamed, +374/-23)
hermes_agent/cli/cron.py (renamed, +9/-10)
hermes_agent/cli/debug.py (renamed, +4/-4)
hermes_agent/cli/default_soul.py (renamed, +0/-0)
hermes_agent/cli/doctor.py (renamed, +26/-28)
hermes_agent/cli/dump.py (renamed, +7/-7)
hermes_agent/cli/env_loader.py (renamed, +1/-1)
hermes_agent/cli/gateway.py (renamed, +44/-32)
hermes_agent/cli/hooks.py (renamed, +8/-8)
hermes_agent/cli/logs.py (renamed, +2/-2)
hermes_agent/cli/main.py (renamed, +167/-171)
hermes_agent/cli/mcp_config.py (renamed, +11/-11)
hermes_agent/cli/memory_setup.py (renamed, +7/-7)
hermes_agent/cli/models/__init__.py (added, +0/-0)
hermes_agent/cli/models/codex.py (renamed, +0/-0)
hermes_agent/cli/models/models.py (renamed, +23/-23)
hermes_agent/cli/models/normalize.py (renamed, +2/-2)
hermes_agent/cli/models/switch.py (renamed, +20/-20)
hermes_agent/cli/nous_subscription.py (renamed, +8/-8)
hermes_agent/cli/pairing.py (renamed, +1/-1)
hermes_agent/cli/platforms.py (renamed, +0/-0)
hermes_agent/cli/plugins.py (renamed, +13/-13)
hermes_agent/cli/plugins_cmd.py (renamed, +22/-22)
hermes_agent/cli/profiles.py (renamed, +9/-9)
hermes_agent/cli/providers.py (renamed, +3/-3)
hermes_agent/cli/repl.py (renamed, +205/-177)
hermes_agent/cli/runtime_provider.py (renamed, +12/-12)
hermes_agent/cli/setup_wizard.py (renamed, +44/-44)
hermes_agent/cli/skills_config.py (renamed, +6/-6)
hermes_agent/cli/skills_hub.py (renamed, +30/-30)
hermes_agent/cli/timeouts.py (renamed, +2/-2)

RAW_BUFFERClick to expand / collapse

Parent: #14182

Problem

After the restructure (PR 1), these files in hermes_agent/providers/ import from hermes_agent/cli/ at the top level, violating the dependency DAG (cli → agent → providers, never reverse):

File	Import	What it pulls
`hermes_agent/providers/credential_pool.py`	`import hermes_agent.cli.auth as auth_mod` + 15-line `from hermes_agent.cli.auth import ...`	Credential resolution functions
`hermes_agent/providers/account_usage.py`	`from hermes_agent.cli.auth import _read_codex_tokens, resolve_codex_runtime_credentials`	Token readers
`hermes_agent/providers/account_usage.py`	`from hermes_agent.cli.runtime_provider import resolve_runtime_provider`	Provider resolution
`hermes_agent/providers/auxiliary.py`	`from hermes_agent.cli.config import get_hermes_home`	Config path
`tools/browser_camofox.py`	`from hermes_agent.cli.config import load_config`	Config loader
`tools/process_registry.py`	`from hermes_agent.cli.config import get_hermes_home`	Config path

Impact

hermes_agent.providers cannot be used without hermes_agent.cli installed
Prevents headless/SDK usage of the provider layer
Circular dependency risk (credential_pool ↔ auth is a known near-cycle)

Proposed fix

Extract shared leaf functions into modules that both providers/ and cli/ can import:

get_hermes_home(), load_config() → hermes_agent/config.py (new leaf module)
Credential resolution functions → hermes_agent/providers/credentials.py (providers-internal)
resolve_runtime_provider() → stays in cli/ but account_usage.py late-imports it

Context

Deliberately deferred from PR 1 (#14183) which is purely mechanical — no logic changes.

extent analysis

TL;DR

Extract shared functions into separate modules to resolve the circular dependency issue between hermes_agent/providers/ and hermes_agent/cli/.

Guidance

Identify and extract shared leaf functions that can be moved to a separate module, such as hermes_agent/config.py for get_hermes_home() and load_config().
Create a new module hermes_agent/providers/credentials.py to hold credential resolution functions, allowing hermes_agent/providers/ to import from it instead of hermes_agent/cli/auth.
Consider late-importing resolve_runtime_provider() in account_usage.py to avoid direct dependency on hermes_agent/cli/.
Review the dependency DAG to ensure the changes do not introduce new circular dependencies.

Example

# hermes_agent/config.py
def get_hermes_home():
    # implementation

def load_config():
    # implementation

Notes

The proposed fix requires careful consideration of the dependency structure to avoid introducing new issues. It's essential to review the changes and test the updated code to ensure the circular dependency is resolved.

Recommendation

Apply the proposed workaround by extracting shared functions into separate modules, as it addresses the root cause of the issue and allows for a more modular and maintainable code structure.

Vote matrix · Quick signals

Works

Did the solution work? Tap to confirm.

Easy Fix

Was it a quick fix?

Time Saver

Did it save you time?

Blocking

Was it severely blocking?

Common Issue

Are others likely hitting this too?

Flaky / Intermittent

Is it intermittent?

Verified / Reproducible

Can you reproduce it reliably?

#ssr #cache issue #memory leak #API versioning #request timeout

Still need to ship something?

×6

Another batch ranked right after the header list — different links, same matching logic.

Data

Security

Network

Code

UI/UX

Text

System

Multimedia

Protocol

API

Engineering

hermes - ✅(Solved) Fix restructure follow-up: fix agent→cli layer inversions in providers/ [1 pull requests, 1 participants]

Recommended Tools

GitHub issue graph ai analysis

Root Cause

PR fix notes

PR #14498: refactor: move all source into hermes_agent/ package (PR 1/3)

Description (problem / solution / changelog)

Summary

Diff breakdown

What changed

Commit strategy

Key decisions

Test results

Entry points verified

Follow-up issues

Directories unchanged (stay at repo root)

Changed files

Problem

Impact

Proposed fix

Context

extent analysis

TL;DR

Guidance

Example

Notes

Recommendation

Still need to ship something?

TRENDING

hermes - ✅(Solved) Fix restructure follow-up: fix agent→cli layer inversions in providers/ [1 pull requests, 1 participants]

Recommended Tools

GitHub issue graph ai analysis

Root Cause

PR fix notes

PR #14498: refactor: move all source into hermes_agent/ package (PR 1/3)

Description (problem / solution / changelog)

Summary

Diff breakdown

What changed

Commit strategy

Key decisions

Test results

Entry points verified

Follow-up issues

Directories unchanged (stay at repo root)

Changed files

Problem

Impact

Proposed fix

Context

extent analysis

TL;DR

Guidance

Example

Notes

Recommendation

Still need to ship something?

RELATED_DISCOVERY

TRENDING