Issue Station
Sign In
Tools hereToolbox

hermes - ✅(Solved) Fix restructure PR 3: move gateway/ → hermes_agent/gateway/ [2 pull requests, 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#14588•Fetched 2026-04-24 06:16:15
View on GitHub
Comments
0
Participants
1
Timeline
7
Reactions
0
Author
alt-glitchalt-glitch
Participants
alt-glitchalt-glitch
Timeline (top)
cross-referenced ×4labeled ×3

Root Cause

  • hermes_agent/cron/ files that import from gateway.* — these lines were left as-is in PR 2 because gateway hadn't moved yet. This is the expected one-time rewrite.

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 #14923: refactor: move gateway/ to hermes_agent/gateway/

Description (problem / solution / changelog)

Summary

Closes #14588.

This is PR 3 of the codebase restructuring plan to move all loose modules into a hermes_agent/ root package.

Changes

  • Moved gateway/ to hermes_agent/gateway/.
  • Updated all imports project-wide from gateway.* to hermes_agent.gateway.*.

This branch is built on top of PR 2 (#14922) and targets main.

Changed files

  • agent/prompt_builder.py (modified, +1/-1)
  • agent/skill_utils.py (modified, +1/-1)
  • cli.py (modified, +3/-3)
  • hermes_agent/__init__.py (added, +0/-0)
  • hermes_agent/cron/__init__.py (renamed, +2/-2)
  • hermes_agent/cron/jobs.py (renamed, +0/-0)
  • hermes_agent/cron/scheduler.py (renamed, +5/-5)
  • hermes_agent/gateway/__init__.py (renamed, +0/-0)
  • hermes_agent/gateway/builtin_hooks/__init__.py (renamed, +0/-0)
  • hermes_agent/gateway/builtin_hooks/boot_md.py (renamed, +0/-0)
  • hermes_agent/gateway/channel_directory.py (renamed, +1/-1)
  • hermes_agent/gateway/config.py (renamed, +0/-0)
  • hermes_agent/gateway/delivery.py (renamed, +0/-0)
  • hermes_agent/gateway/display_config.py (renamed, +0/-0)
  • hermes_agent/gateway/hooks.py (renamed, +1/-1)
  • hermes_agent/gateway/mirror.py (renamed, +0/-0)
  • hermes_agent/gateway/pairing.py (renamed, +0/-0)
  • hermes_agent/gateway/platforms/ADDING_A_PLATFORM.md (renamed, +1/-1)
  • hermes_agent/gateway/platforms/__init__.py (renamed, +0/-0)
  • hermes_agent/gateway/platforms/api_server.py (renamed, +6/-6)
  • hermes_agent/gateway/platforms/base.py (renamed, +7/-7)
  • hermes_agent/gateway/platforms/bluebubbles.py (renamed, +4/-4)
  • hermes_agent/gateway/platforms/dingtalk.py (renamed, +3/-3)
  • hermes_agent/gateway/platforms/discord.py (renamed, +9/-9)
  • hermes_agent/gateway/platforms/email.py (renamed, +2/-2)
  • hermes_agent/gateway/platforms/feishu.py (renamed, +7/-7)
  • hermes_agent/gateway/platforms/feishu_comment.py (renamed, +3/-3)
  • hermes_agent/gateway/platforms/feishu_comment_rules.py (renamed, +0/-0)
  • hermes_agent/gateway/platforms/helpers.py (renamed, +1/-1)
  • hermes_agent/gateway/platforms/homeassistant.py (renamed, +2/-2)
  • hermes_agent/gateway/platforms/matrix.py (renamed, +5/-5)
  • hermes_agent/gateway/platforms/mattermost.py (renamed, +6/-6)
  • hermes_agent/gateway/platforms/qqbot/__init__.py (renamed, +2/-2)
  • hermes_agent/gateway/platforms/qqbot/adapter.py (renamed, +5/-5)
  • hermes_agent/gateway/platforms/qqbot/constants.py (renamed, +0/-0)
  • hermes_agent/gateway/platforms/qqbot/crypto.py (renamed, +0/-0)
  • hermes_agent/gateway/platforms/qqbot/onboard.py (renamed, +0/-0)
  • hermes_agent/gateway/platforms/qqbot/utils.py (renamed, +0/-0)
  • hermes_agent/gateway/platforms/signal.py (renamed, +3/-3)
  • hermes_agent/gateway/platforms/slack.py (renamed, +7/-7)
  • hermes_agent/gateway/platforms/sms.py (renamed, +3/-3)
  • hermes_agent/gateway/platforms/telegram.py (renamed, +7/-7)
  • hermes_agent/gateway/platforms/telegram_network.py (renamed, +1/-1)
  • hermes_agent/gateway/platforms/webhook.py (renamed, +2/-2)
  • hermes_agent/gateway/platforms/wecom.py (renamed, +4/-4)
  • hermes_agent/gateway/platforms/wecom_callback.py (renamed, +3/-3)
  • hermes_agent/gateway/platforms/wecom_crypto.py (renamed, +0/-0)
  • hermes_agent/gateway/platforms/weixin.py (renamed, +3/-3)
  • hermes_agent/gateway/platforms/whatsapp.py (renamed, +2/-2)
  • hermes_agent/gateway/restart.py (renamed, +0/-0)
  • hermes_agent/gateway/run.py (renamed, +58/-58)
  • hermes_agent/gateway/session.py (renamed, +0/-0)
  • hermes_agent/gateway/session_context.py (renamed, +1/-1)
  • hermes_agent/gateway/status.py (renamed, +0/-0)
  • hermes_agent/gateway/sticker_cache.py (renamed, +0/-0)
  • hermes_agent/gateway/stream_consumer.py (renamed, +0/-0)
  • hermes_cli/claw.py (modified, +1/-1)
  • hermes_cli/cron.py (modified, +4/-4)
  • hermes_cli/gateway.py (modified, +16/-16)
  • hermes_cli/pairing.py (modified, +1/-1)
  • hermes_cli/profiles.py (modified, +1/-1)
  • hermes_cli/web_server.py (modified, +10/-10)
  • pyproject.toml (modified, +1/-1)
  • tests/agent/test_credential_pool_routing.py (modified, +1/-1)
  • tests/cli/test_personality_none.py (modified, +6/-6)
  • tests/cli/test_quick_commands.py (modified, +5/-5)
  • tests/conftest.py (modified, +1/-1)
  • tests/cron/test_codex_execution_paths.py (modified, +4/-4)
  • tests/cron/test_cron_inactivity_timeout.py (modified, +1/-1)
  • tests/cron/test_cron_script.py (modified, +28/-28)
  • tests/cron/test_file_permissions.py (modified, +19/-19)
  • tests/cron/test_jobs.py (modified, +5/-5)
  • tests/cron/test_scheduler.py (modified, +140/-140)
  • tests/e2e/conftest.py (modified, +10/-10)
  • tests/e2e/test_platform_commands.py (modified, +1/-1)
  • tests/gateway/restart_test_helpers.py (modified, +5/-5)
  • tests/gateway/test_agent_cache.py (modified, +29/-29)
  • tests/gateway/test_api_server.py (modified, +12/-12)
  • tests/gateway/test_api_server_bind_guard.py (modified, +6/-6)
  • tests/gateway/test_api_server_jobs.py (modified, +2/-2)
  • tests/gateway/test_api_server_multimodal.py (modified, +2/-2)
  • tests/gateway/test_api_server_normalize.py (modified, +1/-1)
  • tests/gateway/test_api_server_toolset.py (modified, +12/-12)
  • tests/gateway/test_approve_deny_commands.py (modified, +4/-4)
  • tests/gateway/test_async_memory_flush.py (modified, +5/-5)
  • tests/gateway/test_background_command.py (modified, +13/-13)
  • tests/gateway/test_background_process_notifications.py (modified, +10/-10)
  • tests/gateway/test_base_topic_sessions.py (modified, +3/-3)
  • tests/gateway/test_bluebubbles.py (modified, +7/-7)
  • tests/gateway/test_busy_session_ack.py (modified, +3/-3)
  • tests/gateway/test_cancel_background_drain.py (modified, +3/-3)
  • tests/gateway/test_channel_directory.py (modified, +10/-10)
  • tests/gateway/test_clean_shutdown_marker.py (modified, +12/-12)
  • tests/gateway/test_command_bypass_active_session.py (modified, +3/-3)
  • tests/gateway/test_compress_command.py (modified, +8/-8)
  • tests/gateway/test_compress_focus.py (modified, +8/-8)
  • tests/gateway/test_config.py (modified, +1/-1)
  • tests/gateway/test_debug_command.py (modified, +4/-4)
  • tests/gateway/test_delivery.py (modified, +3/-3)
  • tests/gateway/test_dingtalk.py (modified, +42/-42)

Code Example

rg "from gateway[\. ]" --type py       # should return 0
rg "import gateway\b" --type py        # should return 0
pytest
RAW_BUFFERClick to expand / collapse

Parent: #14182 Depends on: #14587 (PR 2)

Goal

Move gateway/ into hermes_agent/gateway/. First PR with a large test diff (1,224 test import refs, ~178 test files). Production callers concentrated in tools/send_message_tool.py (38 refs) and hermes_cli/gateway.py (20 refs).

What moves

All .py files under gateway/ move to hermes_agent/gateway/ preserving directory structure (~48 files including platforms/, builtin_hooks/ subdirectories).

Import rewrites

Internal: all gateway.* → hermes_agent.gateway.*

External callers (68 prod refs):

  • tools/send_message_tool.py (38 refs)
  • hermes_cli/gateway.py (20 refs)
  • agent/ (2 refs)
  • hermes_agent/cron/ (4 refs — already moved, rewrite in this PR)

Test files: ~1,224 import refs across tests/gateway/ (~178 test files)

Also rewrites in this PR

  • hermes_agent/cron/ files that import from gateway.* — these lines were left as-is in PR 2 because gateway hadn't moved yet. This is the expected one-time rewrite.

pyproject.toml changes

  • REMOVE gateway, gateway.* from packages.find include

Non-.py files to check

  • scripts/hermes-gateway (no extension) — has from gateway.run import start_gateway

Verification

rg "from gateway[\. ]" --type py       # should return 0
rg "import gateway\b" --type py        # should return 0
pytest

extent analysis

TL;DR

Move the gateway/ directory into hermes_agent/gateway/ and update import statements accordingly to resolve the issue.

Guidance

  • Verify that all internal imports have been updated from gateway.* to hermes_agent.gateway.*.
  • Check external callers, such as tools/send_message_tool.py and hermes_cli/gateway.py, to ensure they have been updated to use the new import path.
  • Run the provided verification commands, including rg and pytest, to confirm that all import statements have been updated correctly.
  • Review non-.py files, like scripts/hermes-gateway, for any necessary updates.

Example

No code snippet is provided as it is not explicitly supported by the issue.

Notes

This guidance assumes that the move of the gateway/ directory into hermes_agent/gateway/ is the primary goal and that updating import statements is the main task.

Recommendation

Apply the workaround by manually updating import statements and moving the gateway/ directory, as the issue does not imply a straightforward version upgrade.

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…
#memory management#API rate limit#retriever error#indexing error#inference speed

Still need to ship something?

×6

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

Back to top recommendations

TRENDING