diff --git a/hermes_cli/subcommands/acp.py b/hermes_cli/subcommands/acp.py
index 528299666d..5b8cb9adc3 100644
--- a/hermes_cli/subcommands/acp.py
+++ b/hermes_cli/subcommands/acp.py
@@ -1,8 +1,4 @@
-"""``hermes acp`` subcommand parser.
-
-Extracted from ``hermes_cli/main.py:main()`` (god-file Phase 2 follow-up).
-Handler injected to avoid importing ``main``.
-"""
+"""``hermes acp`` subcommand parser."""
 
 from __future__ import annotations
 
diff --git a/hermes_cli/subcommands/auth.py b/hermes_cli/subcommands/auth.py
index e81fcea8c1..25baccfc1e 100644
--- a/hermes_cli/subcommands/auth.py
+++ b/hermes_cli/subcommands/auth.py
@@ -1,8 +1,4 @@
-"""``hermes auth`` subcommand parser.
-
-Extracted verbatim from ``hermes_cli/main.py:main()`` (god-file Phase 2).
-Handler injected to avoid importing ``main``.
-"""
+"""``hermes auth`` subcommand parser."""
 
 from __future__ import annotations
 
diff --git a/hermes_cli/subcommands/backup.py b/hermes_cli/subcommands/backup.py
index 745d219330..9e3fb7ff0c 100644
--- a/hermes_cli/subcommands/backup.py
+++ b/hermes_cli/subcommands/backup.py
@@ -1,8 +1,4 @@
-"""``hermes backup`` subcommand parser.
-
-Extracted verbatim from ``hermes_cli/main.py:main()`` (god-file Phase 2).
-Handler injected to avoid importing ``main``.
-"""
+"""``hermes backup`` subcommand parser."""
 
 from __future__ import annotations
 
@@ -11,9 +7,6 @@ from typing import Callable
 
 def build_backup_parser(subparsers, *, cmd_backup: Callable) -> None:
     """Attach the ``backup`` subcommand to ``subparsers``."""
-    # =========================================================================
-    # backup command
-    # =========================================================================
     backup_parser = subparsers.add_parser(
         "backup",
         help="Back up Hermes home directory to a zip file",
diff --git a/hermes_cli/subcommands/browser.py b/hermes_cli/subcommands/browser.py
index c81e61ffcd..fc4c881c4c 100644
--- a/hermes_cli/subcommands/browser.py
+++ b/hermes_cli/subcommands/browser.py
@@ -1,8 +1,4 @@
-"""``hermes browser`` subcommand parser.
-
-Extracted from ``hermes_cli/main.py:main()`` (god-file Phase 2 follow-up).
-Handlers are injected or imported lazily so this module never imports ``main``.
-"""
+"""``hermes browser`` subcommand parser."""
 
 from __future__ import annotations
 
diff --git a/hermes_cli/subcommands/bundles.py b/hermes_cli/subcommands/bundles.py
index a007cca2e7..ccbb537737 100644
--- a/hermes_cli/subcommands/bundles.py
+++ b/hermes_cli/subcommands/bundles.py
@@ -1,8 +1,4 @@
-"""``hermes bundles`` subcommand parser.
-
-Extracted from ``hermes_cli/main.py:main()`` (god-file Phase 2 follow-up).
-Handlers are injected or imported lazily so this module never imports ``main``.
-"""
+"""``hermes bundles`` subcommand parser."""
 
 from __future__ import annotations
 
diff --git a/hermes_cli/subcommands/checkpoints.py b/hermes_cli/subcommands/checkpoints.py
index 08ee5d227f..a8449de861 100644
--- a/hermes_cli/subcommands/checkpoints.py
+++ b/hermes_cli/subcommands/checkpoints.py
@@ -1,8 +1,4 @@
-"""``hermes checkpoints`` subcommand parser.
-
-Extracted from ``hermes_cli/main.py:main()`` (god-file Phase 2 follow-up).
-Handlers are injected or imported lazily so this module never imports ``main``.
-"""
+"""``hermes checkpoints`` subcommand parser."""
 
 from __future__ import annotations
 
diff --git a/hermes_cli/subcommands/claw.py b/hermes_cli/subcommands/claw.py
index 75cf5566ed..139b5e679d 100644
--- a/hermes_cli/subcommands/claw.py
+++ b/hermes_cli/subcommands/claw.py
@@ -1,8 +1,4 @@
-"""``hermes claw`` subcommand parser.
-
-Extracted from ``hermes_cli/main.py:main()`` (god-file Phase 2 follow-up).
-Handler injected to avoid importing ``main``.
-"""
+"""``hermes claw`` subcommand parser."""
 
 from __future__ import annotations
 
diff --git a/hermes_cli/subcommands/completion.py b/hermes_cli/subcommands/completion.py
index 48ae317d9d..a5970abd25 100644
--- a/hermes_cli/subcommands/completion.py
+++ b/hermes_cli/subcommands/completion.py
@@ -1,8 +1,4 @@
-"""``hermes completion`` subcommand parser.
-
-Extracted from ``hermes_cli/main.py:main()`` (god-file Phase 2 follow-up).
-Handlers are injected or imported lazily so this module never imports ``main``.
-"""
+"""``hermes completion`` subcommand parser."""
 
 from __future__ import annotations
 
diff --git a/hermes_cli/subcommands/computer_use.py b/hermes_cli/subcommands/computer_use.py
index 9f68806bfb..156d48e1e6 100644
--- a/hermes_cli/subcommands/computer_use.py
+++ b/hermes_cli/subcommands/computer_use.py
@@ -1,8 +1,4 @@
-"""``hermes computer-use`` subcommand parser.
-
-Extracted from ``hermes_cli/main.py:main()`` (god-file Phase 2 follow-up).
-Handlers are injected or imported lazily so this module never imports ``main``.
-"""
+"""``hermes computer-use`` subcommand parser."""
 
 from __future__ import annotations
 
diff --git a/hermes_cli/subcommands/config.py b/hermes_cli/subcommands/config.py
index 8fe1297407..48d08ec731 100644
--- a/hermes_cli/subcommands/config.py
+++ b/hermes_cli/subcommands/config.py
@@ -1,8 +1,4 @@
-"""``hermes config`` subcommand parser.
-
-Extracted verbatim from ``hermes_cli/main.py:main()`` (god-file Phase 2).
-Handler injected to avoid importing ``main``.
-"""
+"""``hermes config`` subcommand parser."""
 
 from __future__ import annotations
 
@@ -11,9 +7,6 @@ from typing import Callable
 
 def build_config_parser(subparsers, *, cmd_config: Callable) -> None:
     """Attach the ``config`` subcommand to ``subparsers``."""
-    # =========================================================================
-    # config command
-    # =========================================================================
     config_parser = subparsers.add_parser(
         "config",
         help="View and edit configuration",
diff --git a/hermes_cli/subcommands/cron.py b/hermes_cli/subcommands/cron.py
index 4501578b2c..312613efa8 100644
--- a/hermes_cli/subcommands/cron.py
+++ b/hermes_cli/subcommands/cron.py
@@ -1,9 +1,4 @@
-"""``hermes cron`` subcommand parser.
-
-Extracted verbatim from ``hermes_cli/main.py:main()`` — same arguments, same
-``func=cmd_cron`` dispatch. The handler is injected so this module does not
-import ``main`` (cycle avoidance).
-"""
+"""``hermes cron`` subcommand parser."""
 
 from __future__ import annotations
 
diff --git a/hermes_cli/subcommands/curator.py b/hermes_cli/subcommands/curator.py
index 161e1b4521..50199411c9 100644
--- a/hermes_cli/subcommands/curator.py
+++ b/hermes_cli/subcommands/curator.py
@@ -1,8 +1,4 @@
-"""``hermes curator`` subcommand parser.
-
-Extracted from ``hermes_cli/main.py:main()`` (god-file Phase 2 follow-up).
-Handlers are injected or imported lazily so this module never imports ``main``.
-"""
+"""``hermes curator`` subcommand parser."""
 
 from __future__ import annotations
 
diff --git a/hermes_cli/subcommands/dashboard.py b/hermes_cli/subcommands/dashboard.py
index 8b2e6cc487..a3c882317a 100644
--- a/hermes_cli/subcommands/dashboard.py
+++ b/hermes_cli/subcommands/dashboard.py
@@ -3,9 +3,7 @@
 ``dashboard`` is the browser web UI; ``serve`` is the same gateway, headless —
 what the desktop app and remote backends run. ``serve`` also skips the web UI
 build (``headless_backend=True``): pure JSON-RPC/WS clients never load the SPA.
-Both share one handler (``cmd_dashboard`` → ``start_server``). Extracted from
-``hermes_cli/main.py:main()`` (god-file Phase 2); handler injected to avoid
-importing ``main``.
+Both share one handler (``cmd_dashboard`` → ``start_server``).
 """
 
 from __future__ import annotations
@@ -149,9 +147,6 @@ def build_dashboard_parser(
     "launches" the other — so the desktop app spawns ``serve``, never
     ``dashboard``.
     """
-    # =========================================================================
-    # dashboard command — the browser web UI
-    # =========================================================================
     dashboard_parser = subparsers.add_parser(
         "dashboard",
         help="Start the web UI dashboard",
@@ -178,7 +173,6 @@ def build_dashboard_parser(
     )
     dashboard_parser.set_defaults(func=cmd_dashboard)
 
-    # =========================================================================
     # serve command — the headless backend server
     #
     # `serve` boots the exact same gateway as `dashboard` but never opens a
@@ -186,7 +180,6 @@ def build_dashboard_parser(
     # backends) can launch a backend WITHOUT invoking `dashboard`: the desktop
     # app and the web dashboard are independent surfaces that merely share this
     # server, and neither should appear to launch the other.
-    # =========================================================================
     serve_parser = subparsers.add_parser(
         "serve",
         help="Start the Hermes backend server (headless; powers the desktop app and remote backends)",
diff --git a/hermes_cli/subcommands/debug.py b/hermes_cli/subcommands/debug.py
index 65eb842ec8..5e797f5281 100644
--- a/hermes_cli/subcommands/debug.py
+++ b/hermes_cli/subcommands/debug.py
@@ -1,8 +1,4 @@
-"""``hermes debug`` subcommand parser.
-
-Extracted verbatim from ``hermes_cli/main.py:main()`` (god-file Phase 2).
-Handler injected to avoid importing ``main``.
-"""
+"""``hermes debug`` subcommand parser."""
 
 from __future__ import annotations
 
@@ -12,9 +8,6 @@ from typing import Callable
 
 def build_debug_parser(subparsers, *, cmd_debug: Callable) -> None:
     """Attach the ``debug`` subcommand to ``subparsers``."""
-    # =========================================================================
-    # debug command
-    # =========================================================================
     debug_parser = subparsers.add_parser(
         "debug",
         help="Debug tools — upload logs and system info for support",
diff --git a/hermes_cli/subcommands/doctor.py b/hermes_cli/subcommands/doctor.py
index 81a257192a..30e77e0f0f 100644
--- a/hermes_cli/subcommands/doctor.py
+++ b/hermes_cli/subcommands/doctor.py
@@ -1,8 +1,4 @@
-"""``hermes doctor`` subcommand parser.
-
-Extracted verbatim from ``hermes_cli/main.py:main()`` (god-file Phase 2).
-Handler injected to avoid importing ``main``.
-"""
+"""``hermes doctor`` subcommand parser."""
 
 from __future__ import annotations
 
@@ -11,9 +7,6 @@ from typing import Callable
 
 def build_doctor_parser(subparsers, *, cmd_doctor: Callable) -> None:
     """Attach the ``doctor`` subcommand to ``subparsers``."""
-    # =========================================================================
-    # doctor command
-    # =========================================================================
     doctor_parser = subparsers.add_parser(
         "doctor",
         help="Check configuration and dependencies",
diff --git a/hermes_cli/subcommands/dump.py b/hermes_cli/subcommands/dump.py
index fdad4e5a66..a056a4b60b 100644
--- a/hermes_cli/subcommands/dump.py
+++ b/hermes_cli/subcommands/dump.py
@@ -1,8 +1,4 @@
-"""``hermes dump`` subcommand parser.
-
-Extracted verbatim from ``hermes_cli/main.py:main()`` (god-file Phase 2).
-Handler injected to avoid importing ``main``.
-"""
+"""``hermes dump`` subcommand parser."""
 
 from __future__ import annotations
 
@@ -11,9 +7,6 @@ from typing import Callable
 
 def build_dump_parser(subparsers, *, cmd_dump: Callable) -> None:
     """Attach the ``dump`` subcommand to ``subparsers``."""
-    # =========================================================================
-    # dump command
-    # =========================================================================
     dump_parser = subparsers.add_parser(
         "dump",
         help="Dump setup summary for support/debugging",
diff --git a/hermes_cli/subcommands/egress.py b/hermes_cli/subcommands/egress.py
index d7d765db5d..f7d7ec2566 100644
--- a/hermes_cli/subcommands/egress.py
+++ b/hermes_cli/subcommands/egress.py
@@ -1,8 +1,4 @@
-"""``hermes egress`` subcommand parser.
-
-Extracted from ``hermes_cli/main.py:main()`` (god-file Phase 2 follow-up).
-Handlers are injected or imported lazily so this module never imports ``main``.
-"""
+"""``hermes egress`` subcommand parser."""
 
 from __future__ import annotations
 
diff --git a/hermes_cli/subcommands/fallback.py b/hermes_cli/subcommands/fallback.py
index 7e4a3f4c03..64b8de7500 100644
--- a/hermes_cli/subcommands/fallback.py
+++ b/hermes_cli/subcommands/fallback.py
@@ -1,8 +1,4 @@
-"""``hermes fallback`` subcommand parser.
-
-Extracted from ``hermes_cli/main.py:main()`` (god-file Phase 2 follow-up).
-Handlers are injected or imported lazily so this module never imports ``main``.
-"""
+"""``hermes fallback`` subcommand parser."""
 
 from __future__ import annotations
 
diff --git a/hermes_cli/subcommands/gateway.py b/hermes_cli/subcommands/gateway.py
index d541b69554..eeb7e68dfd 100644
--- a/hermes_cli/subcommands/gateway.py
+++ b/hermes_cli/subcommands/gateway.py
@@ -1,10 +1,4 @@
-"""``hermes gateway`` and ``hermes proxy`` subcommand parsers.
-
-Extracted verbatim from ``hermes_cli/main.py:main()`` (god-file Phase 2).
-Both parsers are built together because they shared one inline block (the
-``gateway`` section also defined ``proxy``). Handlers injected to avoid
-importing ``main``.
-"""
+"""``hermes gateway`` and ``hermes proxy`` subcommand parsers."""
 
 from __future__ import annotations
 
@@ -33,9 +27,6 @@ def build_gateway_parser(
     subparsers, *, cmd_gateway: Callable, cmd_proxy: Callable, cmd_gateway_enroll: Callable
 ) -> None:
     """Attach the ``gateway`` and ``proxy`` subcommands to ``subparsers``."""
-    # =========================================================================
-    # gateway command
-    # =========================================================================
     gateway_parser = subparsers.add_parser(
         "gateway",
         help="Messaging gateway management",
@@ -307,12 +298,10 @@ def build_gateway_parser(
     )
     gateway_enroll.set_defaults(func=cmd_gateway_enroll)
 
-    # =========================================================================
     # proxy command — local OpenAI-compatible proxy that attaches the user's
     # OAuth-authenticated provider credentials to outbound requests. Lets
     # external apps (OpenViking, Karakeep, Open WebUI, ...) ride a logged-in
     # subscription without copy-pasting static API keys.
-    # =========================================================================
     proxy_parser = subparsers.add_parser(
         "proxy",
         help="Local OpenAI-compatible proxy to OAuth providers",
diff --git a/hermes_cli/subcommands/gui.py b/hermes_cli/subcommands/gui.py
index d856137a3c..7cfd3e5c17 100644
--- a/hermes_cli/subcommands/gui.py
+++ b/hermes_cli/subcommands/gui.py
@@ -1,8 +1,4 @@
-"""``hermes gui`` subcommand parser.
-
-Extracted verbatim from ``hermes_cli/main.py:main()`` (god-file Phase 2).
-Handler injected to avoid importing ``main``.
-"""
+"""``hermes gui`` subcommand parser."""
 
 from __future__ import annotations
 
@@ -11,7 +7,6 @@ from typing import Callable
 
 def build_gui_parser(subparsers, *, cmd_gui: Callable) -> None:
     """Attach the ``gui`` subcommand to ``subparsers``."""
-    # =========================================================================
     gui_parser = subparsers.add_parser(
         "desktop",
         aliases=["gui"],
diff --git a/hermes_cli/subcommands/hooks.py b/hermes_cli/subcommands/hooks.py
index 2e71f2fb89..20a8ba3a5e 100644
--- a/hermes_cli/subcommands/hooks.py
+++ b/hermes_cli/subcommands/hooks.py
@@ -1,8 +1,4 @@
-"""``hermes hooks`` subcommand parser.
-
-Extracted verbatim from ``hermes_cli/main.py:main()`` (god-file Phase 2).
-Handler injected to avoid importing ``main``.
-"""
+"""``hermes hooks`` subcommand parser."""
 
 from __future__ import annotations
 
@@ -11,7 +7,6 @@ from typing import Callable
 
 def build_hooks_parser(subparsers, *, cmd_hooks: Callable) -> None:
     """Attach the ``hooks`` subcommand to ``subparsers``."""
-    # =========================================================================
     hooks_parser = subparsers.add_parser(
         "hooks",
         help="Inspect and manage shell-script hooks",
diff --git a/hermes_cli/subcommands/import_cmd.py b/hermes_cli/subcommands/import_cmd.py
index 36ed375d8d..46649cf2f4 100644
--- a/hermes_cli/subcommands/import_cmd.py
+++ b/hermes_cli/subcommands/import_cmd.py
@@ -1,8 +1,4 @@
-"""``hermes import`` subcommand parser.
-
-Extracted verbatim from ``hermes_cli/main.py:main()`` (god-file Phase 2).
-Handler injected to avoid importing ``main``.
-"""
+"""``hermes import`` subcommand parser."""
 
 from __future__ import annotations
 
@@ -11,9 +7,6 @@ from typing import Callable
 
 def build_import_cmd_parser(subparsers, *, cmd_import: Callable) -> None:
     """Attach the ``import`` subcommand to ``subparsers``."""
-    # =========================================================================
-    # import command
-    # =========================================================================
     import_parser = subparsers.add_parser(
         "import",
         help="Restore a Hermes backup from a zip file",
diff --git a/hermes_cli/subcommands/insights.py b/hermes_cli/subcommands/insights.py
index 42746e8030..93e20d97c3 100644
--- a/hermes_cli/subcommands/insights.py
+++ b/hermes_cli/subcommands/insights.py
@@ -1,8 +1,4 @@
-"""``hermes insights`` subcommand parser.
-
-Extracted from ``hermes_cli/main.py:main()`` (god-file Phase 2 follow-up).
-Handler injected to avoid importing ``main``.
-"""
+"""``hermes insights`` subcommand parser."""
 
 from __future__ import annotations
 
diff --git a/hermes_cli/subcommands/journey.py b/hermes_cli/subcommands/journey.py
index 199264f42f..8b56ffd621 100644
--- a/hermes_cli/subcommands/journey.py
+++ b/hermes_cli/subcommands/journey.py
@@ -1,8 +1,4 @@
-"""``hermes journey`` subcommand parser.
-
-Extracted from ``hermes_cli/main.py:main()`` (god-file Phase 2 follow-up).
-Handlers are injected or imported lazily so this module never imports ``main``.
-"""
+"""``hermes journey`` subcommand parser."""
 
 from __future__ import annotations
 
diff --git a/hermes_cli/subcommands/login.py b/hermes_cli/subcommands/login.py
index c5837e9aa3..0607008aad 100644
--- a/hermes_cli/subcommands/login.py
+++ b/hermes_cli/subcommands/login.py
@@ -1,8 +1,4 @@
-"""``hermes login`` subcommand parser.
-
-Extracted verbatim from ``hermes_cli/main.py:main()`` (god-file Phase 2).
-Handler injected to avoid importing ``main``.
-"""
+"""``hermes login`` subcommand parser."""
 
 from __future__ import annotations
 
diff --git a/hermes_cli/subcommands/logout.py b/hermes_cli/subcommands/logout.py
index 292b327c0f..29d806598b 100644
--- a/hermes_cli/subcommands/logout.py
+++ b/hermes_cli/subcommands/logout.py
@@ -1,8 +1,4 @@
-"""``hermes logout`` subcommand parser.
-
-Extracted verbatim from ``hermes_cli/main.py:main()`` (god-file Phase 2).
-Handler injected to avoid importing ``main``.
-"""
+"""``hermes logout`` subcommand parser."""
 
 from __future__ import annotations
 
@@ -11,9 +7,6 @@ from typing import Callable
 
 def build_logout_parser(subparsers, *, cmd_logout: Callable) -> None:
     """Attach the ``logout`` subcommand to ``subparsers``."""
-    # =========================================================================
-    # logout command
-    # =========================================================================
     logout_parser = subparsers.add_parser(
         "logout",
         help="Clear authentication for an inference provider",
diff --git a/hermes_cli/subcommands/logs.py b/hermes_cli/subcommands/logs.py
index 53964b022f..a1fc029587 100644
--- a/hermes_cli/subcommands/logs.py
+++ b/hermes_cli/subcommands/logs.py
@@ -1,8 +1,4 @@
-"""``hermes logs`` subcommand parser.
-
-Extracted verbatim from ``hermes_cli/main.py:main()`` (god-file Phase 2).
-Handler injected to avoid importing ``main``.
-"""
+"""``hermes logs`` subcommand parser."""
 
 from __future__ import annotations
 
@@ -12,9 +8,6 @@ from typing import Callable
 
 def build_logs_parser(subparsers, *, cmd_logs: Callable) -> None:
     """Attach the ``logs`` subcommand to ``subparsers``."""
-    # =========================================================================
-    # logs command
-    # =========================================================================
     logs_parser = subparsers.add_parser(
         "logs",
         help="View and filter Hermes log files",
diff --git a/hermes_cli/subcommands/mcp.py b/hermes_cli/subcommands/mcp.py
index 387a88e85a..ca8a4a58c2 100644
--- a/hermes_cli/subcommands/mcp.py
+++ b/hermes_cli/subcommands/mcp.py
@@ -1,8 +1,4 @@
-"""``hermes mcp`` subcommand parser.
-
-Extracted from ``hermes_cli/main.py:main()`` (god-file Phase 2 follow-up).
-Handler injected to avoid importing ``main``.
-"""
+"""``hermes mcp`` subcommand parser."""
 
 from __future__ import annotations
 
diff --git a/hermes_cli/subcommands/memory.py b/hermes_cli/subcommands/memory.py
index 23fe0b8576..25dcf726ed 100644
--- a/hermes_cli/subcommands/memory.py
+++ b/hermes_cli/subcommands/memory.py
@@ -1,8 +1,4 @@
-"""``hermes memory`` subcommand parser.
-
-Extracted from ``hermes_cli/main.py:main()`` (god-file Phase 2 follow-up).
-Handler injected to avoid importing ``main``.
-"""
+"""``hermes memory`` subcommand parser."""
 
 from __future__ import annotations
 
diff --git a/hermes_cli/subcommands/migrate.py b/hermes_cli/subcommands/migrate.py
index 879412fe82..ac08ecc241 100644
--- a/hermes_cli/subcommands/migrate.py
+++ b/hermes_cli/subcommands/migrate.py
@@ -1,8 +1,4 @@
-"""``hermes migrate`` subcommand parser.
-
-Extracted from ``hermes_cli/main.py:main()`` (god-file Phase 2 follow-up).
-Handlers are injected or imported lazily so this module never imports ``main``.
-"""
+"""``hermes migrate`` subcommand parser."""
 
 from __future__ import annotations
 
diff --git a/hermes_cli/subcommands/moa.py b/hermes_cli/subcommands/moa.py
index a4de1169ce..77c82eeebe 100644
--- a/hermes_cli/subcommands/moa.py
+++ b/hermes_cli/subcommands/moa.py
@@ -1,8 +1,4 @@
-"""``hermes moa`` subcommand parser.
-
-Extracted from ``hermes_cli/main.py:main()`` (god-file Phase 2 follow-up).
-Handlers are injected or imported lazily so this module never imports ``main``.
-"""
+"""``hermes moa`` subcommand parser."""
 
 from __future__ import annotations
 
diff --git a/hermes_cli/subcommands/model.py b/hermes_cli/subcommands/model.py
index 11b9676f91..d2d24c2c5d 100644
--- a/hermes_cli/subcommands/model.py
+++ b/hermes_cli/subcommands/model.py
@@ -1,8 +1,4 @@
-"""``hermes model`` subcommand parser.
-
-Extracted verbatim from ``hermes_cli/main.py:main()`` (god-file Phase 2).
-Handler injected to avoid importing ``main``.
-"""
+"""``hermes model`` subcommand parser."""
 
 from __future__ import annotations
 
@@ -11,9 +7,6 @@ from typing import Callable
 
 def build_model_parser(subparsers, *, cmd_model: Callable) -> None:
     """Attach the ``model`` subcommand to ``subparsers``."""
-    # =========================================================================
-    # model command
-    # =========================================================================
     model_parser = subparsers.add_parser(
         "model",
         help="Select default model and provider",
diff --git a/hermes_cli/subcommands/pairing.py b/hermes_cli/subcommands/pairing.py
index 0da4003c2a..d9baae5cba 100644
--- a/hermes_cli/subcommands/pairing.py
+++ b/hermes_cli/subcommands/pairing.py
@@ -1,8 +1,4 @@
-"""``hermes pairing`` subcommand parser.
-
-Extracted from ``hermes_cli/main.py:main()`` (god-file Phase 2 follow-up).
-Handler injected to avoid importing ``main``.
-"""
+"""``hermes pairing`` subcommand parser."""
 
 from __future__ import annotations
 
diff --git a/hermes_cli/subcommands/pets.py b/hermes_cli/subcommands/pets.py
index ad2062a1ed..a026110321 100644
--- a/hermes_cli/subcommands/pets.py
+++ b/hermes_cli/subcommands/pets.py
@@ -1,8 +1,4 @@
-"""``hermes pets`` subcommand parser.
-
-Extracted from ``hermes_cli/main.py:main()`` (god-file Phase 2 follow-up).
-Handlers are injected or imported lazily so this module never imports ``main``.
-"""
+"""``hermes pets`` subcommand parser."""
 
 from __future__ import annotations
 
diff --git a/hermes_cli/subcommands/plugins.py b/hermes_cli/subcommands/plugins.py
index 975770c2fd..855b58d9a0 100644
--- a/hermes_cli/subcommands/plugins.py
+++ b/hermes_cli/subcommands/plugins.py
@@ -1,8 +1,4 @@
-"""``hermes plugins`` subcommand parser.
-
-Extracted from ``hermes_cli/main.py:main()`` (god-file Phase 2 follow-up).
-Handler injected to avoid importing ``main``.
-"""
+"""``hermes plugins`` subcommand parser."""
 
 from __future__ import annotations
 
diff --git a/hermes_cli/subcommands/profile.py b/hermes_cli/subcommands/profile.py
index ee5e361a57..b224fafc27 100644
--- a/hermes_cli/subcommands/profile.py
+++ b/hermes_cli/subcommands/profile.py
@@ -1,8 +1,4 @@
-"""``hermes profile`` subcommand parser.
-
-Extracted verbatim from ``hermes_cli/main.py:main()`` (god-file Phase 2).
-Handler injected to avoid importing ``main``.
-"""
+"""``hermes profile`` subcommand parser."""
 
 from __future__ import annotations
 
@@ -11,9 +7,6 @@ from typing import Callable
 
 def build_profile_parser(subparsers, *, cmd_profile: Callable) -> None:
     """Attach the ``profile`` subcommand to ``subparsers``."""
-    # =========================================================================
-    # profile command
-    # =========================================================================
     profile_parser = subparsers.add_parser(
         "profile",
         help="Manage profiles — multiple isolated Hermes instances",
diff --git a/hermes_cli/subcommands/prompt_size.py b/hermes_cli/subcommands/prompt_size.py
index d79fcb30bc..ae3c24b149 100644
--- a/hermes_cli/subcommands/prompt_size.py
+++ b/hermes_cli/subcommands/prompt_size.py
@@ -1,8 +1,4 @@
-"""``hermes prompt-size`` subcommand parser.
-
-Extracted verbatim from ``hermes_cli/main.py:main()`` (god-file Phase 2).
-Handler injected to avoid importing ``main``.
-"""
+"""``hermes prompt-size`` subcommand parser."""
 
 from __future__ import annotations
 
@@ -11,9 +7,6 @@ from typing import Callable
 
 def build_prompt_size_parser(subparsers, *, cmd_prompt_size: Callable) -> None:
     """Attach the ``prompt-size`` subcommand to ``subparsers``."""
-    # =========================================================================
-    # prompt-size command
-    # =========================================================================
     prompt_size_parser = subparsers.add_parser(
         "prompt-size",
         help="Show a byte breakdown of the system prompt + tool schemas",
diff --git a/hermes_cli/subcommands/secrets.py b/hermes_cli/subcommands/secrets.py
index def2fdba7d..bc78b0fd6c 100644
--- a/hermes_cli/subcommands/secrets.py
+++ b/hermes_cli/subcommands/secrets.py
@@ -1,8 +1,4 @@
-"""``hermes secrets`` subcommand parser.
-
-Extracted from ``hermes_cli/main.py:main()`` (god-file Phase 2 follow-up).
-Handlers are injected or imported lazily so this module never imports ``main``.
-"""
+"""``hermes secrets`` subcommand parser."""
 
 from __future__ import annotations
 
diff --git a/hermes_cli/subcommands/security.py b/hermes_cli/subcommands/security.py
index b763a6e62e..9af73489c1 100644
--- a/hermes_cli/subcommands/security.py
+++ b/hermes_cli/subcommands/security.py
@@ -1,8 +1,4 @@
-"""``hermes security`` subcommand parser.
-
-Extracted verbatim from ``hermes_cli/main.py:main()`` (god-file Phase 2).
-Handler injected to avoid importing ``main``.
-"""
+"""``hermes security`` subcommand parser."""
 
 from __future__ import annotations
 
@@ -11,7 +7,6 @@ from typing import Callable
 
 def build_security_parser(subparsers, *, cmd_security: Callable) -> None:
     """Attach the ``security`` subcommand to ``subparsers``."""
-    # =========================================================================
     security_parser = subparsers.add_parser(
         "security",
         help="Supply-chain audit (OSV.dev) for venv, plugins, and MCP servers",
diff --git a/hermes_cli/subcommands/sessions.py b/hermes_cli/subcommands/sessions.py
index 1bf300ca51..5da91f2fba 100644
--- a/hermes_cli/subcommands/sessions.py
+++ b/hermes_cli/subcommands/sessions.py
@@ -1,8 +1,4 @@
-"""``hermes sessions`` subcommand parser.
-
-Extracted from ``hermes_cli/main.py:main()`` (god-file Phase 2 follow-up).
-Handlers are injected or imported lazily so this module never imports ``main``.
-"""
+"""``hermes sessions`` subcommand parser."""
 
 from __future__ import annotations
 
diff --git a/hermes_cli/subcommands/setup.py b/hermes_cli/subcommands/setup.py
index fa0c0dc37c..974f6f7761 100644
--- a/hermes_cli/subcommands/setup.py
+++ b/hermes_cli/subcommands/setup.py
@@ -1,8 +1,4 @@
-"""``hermes setup`` subcommand parser.
-
-Extracted verbatim from ``hermes_cli/main.py:main()`` (god-file Phase 2).
-Handler injected to avoid importing ``main``.
-"""
+"""``hermes setup`` subcommand parser."""
 
 from __future__ import annotations
 
@@ -11,9 +7,6 @@ from typing import Callable
 
 def build_setup_parser(subparsers, *, cmd_setup: Callable) -> None:
     """Attach the ``setup`` subcommand to ``subparsers``."""
-    # =========================================================================
-    # setup command
-    # =========================================================================
     setup_parser = subparsers.add_parser(
         "setup",
         help="Interactive setup wizard",
diff --git a/hermes_cli/subcommands/skills.py b/hermes_cli/subcommands/skills.py
index cfcc677f18..0b27df083a 100644
--- a/hermes_cli/subcommands/skills.py
+++ b/hermes_cli/subcommands/skills.py
@@ -1,8 +1,4 @@
-"""``hermes skills`` subcommand parser.
-
-Extracted from ``hermes_cli/main.py:main()`` (god-file Phase 2 follow-up).
-Handler injected to avoid importing ``main``.
-"""
+"""``hermes skills`` subcommand parser."""
 
 from __future__ import annotations
 
diff --git a/hermes_cli/subcommands/slack.py b/hermes_cli/subcommands/slack.py
index 5eb424986e..9fe34afc73 100644
--- a/hermes_cli/subcommands/slack.py
+++ b/hermes_cli/subcommands/slack.py
@@ -1,8 +1,4 @@
-"""``hermes slack`` subcommand parser.
-
-Extracted verbatim from ``hermes_cli/main.py:main()`` (god-file Phase 2).
-Handler injected to avoid importing ``main``.
-"""
+"""``hermes slack`` subcommand parser."""
 
 from __future__ import annotations
 
@@ -11,9 +7,6 @@ from typing import Callable
 
 def build_slack_parser(subparsers, *, cmd_slack: Callable) -> None:
     """Attach the ``slack`` subcommand to ``subparsers``."""
-    # =========================================================================
-    # slack command
-    # =========================================================================
     slack_parser = subparsers.add_parser(
         "slack",
         help="Slack integration helpers (manifest generation, etc.)",
diff --git a/hermes_cli/subcommands/status.py b/hermes_cli/subcommands/status.py
index ad107a32a6..d79b274a00 100644
--- a/hermes_cli/subcommands/status.py
+++ b/hermes_cli/subcommands/status.py
@@ -1,8 +1,4 @@
-"""``hermes status`` subcommand parser.
-
-Extracted verbatim from ``hermes_cli/main.py:main()`` (god-file Phase 2).
-Handler injected to avoid importing ``main``.
-"""
+"""``hermes status`` subcommand parser."""
 
 from __future__ import annotations
 
@@ -11,9 +7,6 @@ from typing import Callable
 
 def build_status_parser(subparsers, *, cmd_status: Callable) -> None:
     """Attach the ``status`` subcommand to ``subparsers``."""
-    # =========================================================================
-    # status command
-    # =========================================================================
     status_parser = subparsers.add_parser(
         "status",
         help="Show status of all components",
diff --git a/hermes_cli/subcommands/tools.py b/hermes_cli/subcommands/tools.py
index 19b85db5f1..b926f5da45 100644
--- a/hermes_cli/subcommands/tools.py
+++ b/hermes_cli/subcommands/tools.py
@@ -1,8 +1,4 @@
-"""``hermes tools`` subcommand parser.
-
-Extracted from ``hermes_cli/main.py:main()`` (god-file Phase 2 follow-up).
-Handler injected to avoid importing ``main``.
-"""
+"""``hermes tools`` subcommand parser."""
 
 from __future__ import annotations
 
diff --git a/hermes_cli/subcommands/uninstall.py b/hermes_cli/subcommands/uninstall.py
index f746a8906a..cb4364802a 100644
--- a/hermes_cli/subcommands/uninstall.py
+++ b/hermes_cli/subcommands/uninstall.py
@@ -1,8 +1,4 @@
-"""``hermes uninstall`` subcommand parser.
-
-Extracted verbatim from ``hermes_cli/main.py:main()`` (god-file Phase 2).
-Handler injected to avoid importing ``main``.
-"""
+"""``hermes uninstall`` subcommand parser."""
 
 from __future__ import annotations
 
@@ -11,9 +7,6 @@ from typing import Callable
 
 def build_uninstall_parser(subparsers, *, cmd_uninstall: Callable) -> None:
     """Attach the ``uninstall`` subcommand to ``subparsers``."""
-    # =========================================================================
-    # uninstall command
-    # =========================================================================
     uninstall_parser = subparsers.add_parser(
         "uninstall",
         help="Uninstall Hermes Agent",
diff --git a/hermes_cli/subcommands/update.py b/hermes_cli/subcommands/update.py
index 58c37e1d8b..8186035915 100644
--- a/hermes_cli/subcommands/update.py
+++ b/hermes_cli/subcommands/update.py
@@ -1,8 +1,4 @@
-"""``hermes update`` subcommand parser.
-
-Extracted verbatim from ``hermes_cli/main.py:main()`` (god-file Phase 2).
-Handler injected to avoid importing ``main``.
-"""
+"""``hermes update`` subcommand parser."""
 
 from __future__ import annotations
 
@@ -11,9 +7,6 @@ from typing import Callable
 
 def build_update_parser(subparsers, *, cmd_update: Callable) -> None:
     """Attach the ``update`` subcommand to ``subparsers``."""
-    # =========================================================================
-    # update command
-    # =========================================================================
     update_parser = subparsers.add_parser(
         "update",
         help="Update Hermes Agent to the latest version",
diff --git a/hermes_cli/subcommands/webhook.py b/hermes_cli/subcommands/webhook.py
index 38085141b0..72efbb4d0b 100644
--- a/hermes_cli/subcommands/webhook.py
+++ b/hermes_cli/subcommands/webhook.py
@@ -1,8 +1,4 @@
-"""``hermes webhook`` subcommand parser.
-
-Extracted verbatim from ``hermes_cli/main.py:main()`` (god-file Phase 2).
-Handler injected to avoid importing ``main``.
-"""
+"""``hermes webhook`` subcommand parser."""
 
 from __future__ import annotations
 
@@ -11,9 +7,6 @@ from typing import Callable
 
 def build_webhook_parser(subparsers, *, cmd_webhook: Callable) -> None:
     """Attach the ``webhook`` subcommand to ``subparsers``."""
-    # =========================================================================
-    # webhook command
-    # =========================================================================
     webhook_parser = subparsers.add_parser(
         "webhook",
         help="Manage dynamic webhook subscriptions",
diff --git a/hermes_cli/subcommands/whatsapp.py b/hermes_cli/subcommands/whatsapp.py
index 9d093bc93c..31656a8f3a 100644
--- a/hermes_cli/subcommands/whatsapp.py
+++ b/hermes_cli/subcommands/whatsapp.py
@@ -1,8 +1,4 @@
-"""``hermes whatsapp`` subcommand parser.
-
-Extracted verbatim from ``hermes_cli/main.py:main()`` (god-file Phase 2).
-Handler injected to avoid importing ``main``.
-"""
+"""``hermes whatsapp`` subcommand parser."""
 
 from __future__ import annotations
 
@@ -11,9 +7,6 @@ from typing import Callable
 
 def build_whatsapp_parser(subparsers, *, cmd_whatsapp: Callable) -> None:
     """Attach the ``whatsapp`` subcommand to ``subparsers``."""
-    # =========================================================================
-    # whatsapp command
-    # =========================================================================
     whatsapp_parser = subparsers.add_parser(
         "whatsapp",
         help="Set up WhatsApp integration",
diff --git a/hermes_cli/subcommands/worktree.py b/hermes_cli/subcommands/worktree.py
index f9feeafc5f..0e73031451 100644
--- a/hermes_cli/subcommands/worktree.py
+++ b/hermes_cli/subcommands/worktree.py
@@ -1,8 +1,4 @@
-"""``hermes worktree`` subcommand parser.
-
-Extracted from ``hermes_cli/main.py:main()`` (god-file Phase 2 follow-up).
-Handlers are injected or imported lazily so this module never imports ``main``.
-"""
+"""``hermes worktree`` subcommand parser."""
 
 from __future__ import annotations