Issue Station
Sign In
Tools hereToolbox

hermes - ✅(Solved) Fix restructure PR 1: move acp_adapter/ → hermes_agent/acp/ (canary) [2 pull requests, 1 comments, 1 participants]

Official PRs (…)
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.

Helpful · Quick feedback

Loading…
GitHub stats
NousResearch/hermes-agent#14586•Fetched 2026-04-24 06:16:19
View on GitHub
Comments
1
Participants
1
Timeline
9
Reactions
0
Author
alt-glitchalt-glitch
Participants
alt-glitchalt-glitch
Timeline (top)
cross-referenced ×5labeled ×3commented ×1

Fix Action

Fixed

PR fix notes

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

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:

CategoryFiles+lines-linesWhat it is
Pure renames7200git mv only — invisible in diff
Renames + import rewrites2192,1092,104Moved files that also had imports rewritten
Tests (not renamed)6499,8149,895Import rewrites + test fixture fixes
Scripts1191436Move map + import rewriter (new files)
Infra + other42226245tui_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

#CommitPurpose
18bff8bf2Add move map data structure (268 file mappings)
265ca3ba9Pure git mv — all files into hermes_agent/ (100% similarity)
34b163419Rewrite all imports + string references (898 files)
4a1e667b9Fix test regressions from import rewrite (113 test files)
576aebd73Update infrastructure (pyproject, Docker, shell scripts, vite, AGENTS.md)
6ff99611eUpdate Nix files
725072fe6Fix stale references missed by import rewrite
8987962f4Add .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

DecisionChoiceRationale
plugins/ locationMoved into hermes_agent/plugins/Single package boundary
Layer inversions (agent→cli)Moved as-isPR 1 is mechanical only; fix in follow-up #14278
sys.path hacks in prod codeStrippedAll install paths use editable installs; hacks are redundant
tests/conftest.py sys.pathStripped, added ImportError guardForces proper uv pip install -e '.[all,dev]'
Logger COMPONENT_PREFIXESUpdated to new pathsPreserves hermes logs --component filtering
Process-name matching (gateway)New patterns added alongside oldRunning gateways from pre-upgrade installs still have old cmdline
skills_syncAdded hermes-skills-sync console_scriptDecouples setup-hermes.sh, install.sh, entrypoint.sh from internal layout
Transport discoveryUpdated _discover_transports()Same auto-discovery pattern, new hermes_agent.providers.*_transport paths
Tool registryExtended discover_builtin_tools()Scans browser/, files/, media/, skills/ subpackage directories

Test results

MetricBaseline (pre-restructure)After restructure
Passed14,09914,220 (+121)
Failed6771
Errors7372
Skipped3830

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)

PR #14606: refactor(acp): move acp_adapter/ → hermes_agent/acp/

Description (problem / solution / changelog)

Summary

  • Move acp_adapter/ (9 files) into hermes_agent/acp/, creating the hermes_agent/ top-level package
  • Rewrite all imports, patch() targets, monkeypatch.setattr strings, and docstrings from acp_adapter.* → hermes_agent.acp.*
  • Convert relative imports to absolute per manifest convention
  • Strip sys.path hack from entry.py (redundant with editable install)
  • Update pyproject.toml entry point and packages.find

This is the canary PR for the restructure (#14182) — smallest possible move (1 external prod caller) to prove the workflow.

Commit strategy: Commit 1 is a pure git mv (100% similarity for blame). Commit 2 is all import rewrites + infra.

Closes #14586

Test plan

  • rg "acp_adapter" --type py returns 0 results
  • rg "from \." hermes_agent/acp/ --type py returns 0 (no relative imports)
  • All 164 ACP tests pass (pytest tests/acp/ -v)
  • Full test suite: 14754 passed, 30 failed (all pre-existing), 41 skipped
  • from hermes_agent.acp.server import HermesACPAgent resolves
  • hermes-acp console script entry point resolves
  • Cross-package imports (hermes_constants, hermes_cli, agent, tools, run_agent) preserved untouched

Changed files

  • AGENTS.md (modified, +1/-1)
  • acp_adapter/__main__.py (removed, +0/-5)
  • cli.py (modified, +1/-1)
  • hermes_agent/__init__.py (added, +1/-0)
  • hermes_agent/acp/__init__.py (renamed, +0/-0)
  • hermes_agent/acp/__main__.py (added, +5/-0)
  • hermes_agent/acp/auth.py (renamed, +0/-0)
  • hermes_agent/acp/entry.py (renamed, +2/-8)
  • hermes_agent/acp/events.py (renamed, +1/-1)
  • hermes_agent/acp/permissions.py (renamed, +0/-0)
  • hermes_agent/acp/server.py (renamed, +4/-4)
  • hermes_agent/acp/session.py (renamed, +0/-0)
  • hermes_agent/acp/tools.py (renamed, +0/-0)
  • hermes_cli/main.py (modified, +1/-1)
  • pyproject.toml (modified, +2/-2)
  • tests/acp/test_auth.py (modified, +2/-2)
  • tests/acp/test_entry.py (modified, +2/-2)
  • tests/acp/test_events.py (modified, +21/-21)
  • tests/acp/test_mcp_e2e.py (modified, +3/-3)
  • tests/acp/test_permissions.py (modified, +5/-5)
  • tests/acp/test_ping_suppression.py (modified, +2/-2)
  • tests/acp/test_server.py (modified, +8/-8)
  • tests/acp/test_session.py (modified, +3/-3)
  • tests/acp/test_tools.py (modified, +2/-2)
  • website/docs/developer-guide/acp-internals.md (modified, +15/-15)
  • website/docs/developer-guide/architecture.md (modified, +2/-2)
  • website/docs/reference/cli-commands.md (modified, +1/-1)
  • website/docs/user-guide/features/acp.md (modified, +2/-2)

Code Example

# hermes_cli/main.py:
from acp_adapter.entry import main as acp_main
→ from hermes_agent.acp.entry import main as acp_main

---

rg "from acp_adapter[\. ]" --type py       # should return 0
rg "import acp_adapter" --type py           # should return 0
pytest
hermes-acp --help
RAW_BUFFERClick to expand / collapse

Parent: #14182

Goal

Move acp_adapter/ into hermes_agent/acp/. This is the canary PR — the smallest possible move (9 files, 1 external prod import) that creates the hermes_agent/ package and proves the workflow.

What moves

Current PathNew Path
acp_adapter/__init__.pyhermes_agent/acp/__init__.py
acp_adapter/__main__.pyhermes_agent/acp/__main__.py
acp_adapter/server.pyhermes_agent/acp/server.py
acp_adapter/session.pyhermes_agent/acp/session.py
acp_adapter/tools.pyhermes_agent/acp/tools.py
acp_adapter/auth.pyhermes_agent/acp/auth.py
acp_adapter/permissions.pyhermes_agent/acp/permissions.py
acp_adapter/events.pyhermes_agent/acp/events.py
acp_adapter/entry.pyhermes_agent/acp/entry.py

New files

  • hermes_agent/__init__.py (creates the package)

Import rewrites

Internal (within moved files): acp_adapter.* → hermes_agent.acp.*

External callers (1 file):

# hermes_cli/main.py:
from acp_adapter.entry import main as acp_main
→ from hermes_agent.acp.entry import main as acp_main

Test files: ~11 import refs across tests/acp_adapter/

pyproject.toml changes

  • ADD hermes_agent, hermes_agent.* to packages.find include
  • REMOVE acp_adapter from packages.find include
  • UPDATE entry point: hermes-acp = "hermes_agent.acp.entry:main"

What this PR does NOT do

  • No logic changes
  • No __init__.py re-exports (deferred to PR 6 when all packages exist)
  • No infrastructure changes beyond pyproject.toml

Verification

rg "from acp_adapter[\. ]" --type py       # should return 0
rg "import acp_adapter" --type py           # should return 0
pytest
hermes-acp --help

extent analysis

TL;DR

The most likely fix involves verifying the import rewrites and pyproject.toml changes to ensure a smooth package migration from acp_adapter to hermes_agent.acp.

Guidance

  • Review the import rewrites in the moved files to ensure all acp_adapter.* imports are correctly updated to hermes_agent.acp.*.
  • Verify the pyproject.toml changes, including the addition of hermes_agent and hermes_agent.* to packages.find include, the removal of acp_adapter, and the update of the entry point to hermes_agent.acp.entry:main.
  • Run the provided verification commands, including rg searches and pytest, to ensure the changes do not introduce any issues.
  • Test the hermes-acp command with the --help flag to verify the entry point update is correct.

Example

No code snippet is provided as the issue is focused on package migration and configuration changes.

Notes

This guidance assumes the provided changes are accurate and complete. Additional verification may be necessary to ensure the package migration is successful.

Recommendation

Apply the workaround by carefully reviewing and testing the import rewrites and pyproject.toml changes to ensure a smooth package migration.

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?
Loading…
#retriever error#indexing error#inference speed#output truncation#response parsing

Still need to ship something?

×6

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

Back to top recommendations

TRENDING