cluxion-agentplugin-preprocessing 0.3.22__tar.gz → 0.3.24__tar.gz

{cluxion_agentplugin_preprocessing-0.3.22 → cluxion_agentplugin_preprocessing-0.3.24}/Docs/README.md

@@ -17,7 +17,7 @@
 
 1. 사용자 요청 수신 → `cluxion_plan` (또는 `cluxion-runtime plan`)
 2. `clarification.required`이면 사용자에게 질문, 작업 보류
-3. `queued` 모드면 `cluxion_queue_next` → segment 처리 → `cluxion_queue_record` → `cluxion_queue_brief`
+3. `queued` 모드: 수동이면 `cluxion_queue_next` → … → `cluxion_queue_brief`. Hermes 긴 작업은 `/loopauto` 또는 `loop_auto: true`(기본)로 자동 드레인.
 4. `answer_policy.required_checks`를 지키며 응답
 5. (선택) `cluxion_queue_brief` 결과를 ForgetForge에 저장: `forgetforge import-brief --source preprocessing`
 
@@ -37,7 +37,9 @@ cluxion-preprocess enable   # Hermes
 |------|------|
 | [architecture.md](architecture.md) | 패키지 구조, 데이터 흐름, host 경계 |
 | [design.md](design.md) | 정직함, 명확화, 성능 |
-| [installation.md](installation.md) | 설치, Hermes 활성화, Rust 큐 |
+| [installation.md](installation.md) | 설치, Hermes 활성화, 슬래시, Rust 큐 |
+| [tools.md](tools.md) | 도구·슬래시·loopAuto·queued workflow |
+| 통합 가이드 | MacBot `Docs/cluxion-plugins-guide.md` §2-A (5종 슬래시 전체) |
 | [tools.md](tools.md) | 도구, preprocessing mode, queue |
 | [agent-surfaces.md](agent-surfaces.md) | Hermes / Claude / Codex / Grok |
 | [rust-architecture.md](rust-architecture.md) | Rust 메인 · Python adapter |

{cluxion_agentplugin_preprocessing-0.3.22 → cluxion_agentplugin_preprocessing-0.3.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cluxion-agentplugin-preprocessing
-Version: 0.3.22
+Version: 0.3.24
 Summary: Universal agent plugin for Cluxion preprocessing, honesty contracts, clarification, Rust work queue, and resource-aware harness handoff.
 Project-URL: Homepage, https://github.com/cluxion/cluxion-Agentplugin-preprocessing
 Project-URL: Repository, https://github.com/cluxion/cluxion-Agentplugin-preprocessing
@@ -84,6 +84,22 @@ cluxion-preprocess doctor --json   # 구조화 출력
 
 Hermes 안에서는 `cluxion_doctor` 도구로도 노출됩니다.
 
+## Hermes 슬래시 커맨드 (0.3.23+)
+
+`/` 입력 시 🔌로 자동완성됩니다.
+
+| 슬래시 | 용도 |
+|---|---|
+| `/loopauto <prompt>` | plan + 자동 큐 드레인 (`/loopAuto` 지시어와 동일) |
+| `/cluxion-doctor` | doctor (CLI `cluxion-preprocess doctor`와 동일) |
+
+```
+/loopauto 4000줄 요구사항을 순서대로 구현하고 각 항목 증거를 남겨줘
+/cluxion-doctor
+```
+
+비활성: `export CLUXION_LOOP_AUTO=0` · 상세: `Docs/cluxion-plugins-guide.md` §5-A (통합 가이드)
+
 ## 문제 해결
 
 | 증상 | 해결 |
@@ -152,6 +168,22 @@ cluxion-preprocess doctor --json   # structured output
 
 Also exposed inside Hermes as the `cluxion_doctor` tool.
 
+## Hermes slash commands (0.3.23+)
+
+Type `/` to see plugin commands with a 🔌 badge.
+
+| Slash | Purpose |
+|---|---|
+| `/loopauto <prompt>` | Plan + autonomous queue drain (same as `/loopAuto` directive) |
+| `/cluxion-doctor` | Run doctor (same as `cluxion-preprocess doctor`) |
+
+```
+/loopauto implement every REQ line and record evidence
+/cluxion-doctor
+```
+
+Disable auto-loop: `export CLUXION_LOOP_AUTO=0`.
+
 ## Troubleshooting
 
 | Problem | Fix |

{cluxion_agentplugin_preprocessing-0.3.22 → cluxion_agentplugin_preprocessing-0.3.24}/README.md

@@ -52,6 +52,22 @@ cluxion-preprocess doctor --json   # 구조화 출력
 
 Hermes 안에서는 `cluxion_doctor` 도구로도 노출됩니다.
 
+## Hermes 슬래시 커맨드 (0.3.23+)
+
+`/` 입력 시 🔌로 자동완성됩니다.
+
+| 슬래시 | 용도 |
+|---|---|
+| `/loopauto <prompt>` | plan + 자동 큐 드레인 (`/loopAuto` 지시어와 동일) |
+| `/cluxion-doctor` | doctor (CLI `cluxion-preprocess doctor`와 동일) |
+
+```
+/loopauto 4000줄 요구사항을 순서대로 구현하고 각 항목 증거를 남겨줘
+/cluxion-doctor
+```
+
+비활성: `export CLUXION_LOOP_AUTO=0` · 상세: `Docs/cluxion-plugins-guide.md` §5-A (통합 가이드)
+
 ## 문제 해결
 
 | 증상 | 해결 |
@@ -120,6 +136,22 @@ cluxion-preprocess doctor --json   # structured output
 
 Also exposed inside Hermes as the `cluxion_doctor` tool.
 
+## Hermes slash commands (0.3.23+)
+
+Type `/` to see plugin commands with a 🔌 badge.
+
+| Slash | Purpose |
+|---|---|
+| `/loopauto <prompt>` | Plan + autonomous queue drain (same as `/loopAuto` directive) |
+| `/cluxion-doctor` | Run doctor (same as `cluxion-preprocess doctor`) |
+
+```
+/loopauto implement every REQ line and record evidence
+/cluxion-doctor
+```
+
+Disable auto-loop: `export CLUXION_LOOP_AUTO=0`.
+
 ## Troubleshooting
 
 | Problem | Fix |

{cluxion_agentplugin_preprocessing-0.3.22 → cluxion_agentplugin_preprocessing-0.3.24}/adapters/claude/skills/preprocess/SKILL.md

@@ -17,11 +17,14 @@ stdin: `{"prompt": "<user request>", "cwd": "<workspace>"}`
 
 Hermes에서는 `cluxion_plan` 도구를 동일 목적으로 사용합니다.
 
+Hermes 슬래시 (0.3.23+): `/loopauto <prompt>` — plan + 자동 큐 드레인. `/cluxion-doctor` — 점검.
+
 ## 규칙
 
 1. `clarification.required`이 true이면 사용자에게 질문하고 작업을 시작하지 말 것.
 2. context가 부족하면 모른다고 말할 것 — 사실을 지어내지 말 것.
-3. `queued` 모드: `cluxion_queue_next` → segment 처리 → `cluxion_queue_record` → `cluxion_queue_brief`.
+3. `queued` 모드: 수동이면 `cluxion_queue_next` → segment 처리 → `cluxion_queue_record` → `cluxion_queue_brief`.
+   긴 작업은 Hermes에서 `/loopauto` 또는 plan `loop_auto: true`(기본 on)로 자동 드레인.
 4. 세션 맥락 보존이 필요하면 brief를 ForgetForge에 넘길 것: `forgetforge import-brief --source preprocessing --brief "<cluxion_queue_brief output>"` (또는 Hermes `forgetforge_import_brief`).
 5. `answer_policy.required_checks`를 응답 전에 따를 것.
 6. 플러그인이 대신 completion을 생성하지 않음 — **당신**이 계약에 맞게 응답할 것.

{cluxion_agentplugin_preprocessing-0.3.22 → cluxion_agentplugin_preprocessing-0.3.24}/cluxion-Docs/install-and-operations.md

@@ -13,6 +13,7 @@ cluxion-preprocess enable    # Hermes
 ## 연결된 AI 연동
 
 - Hermes: `cluxion_*` 도구 (plugin enable 후)
+- Hermes 슬래시 (0.3.23+): `/loopauto`, `/cluxion-doctor` — `/` 자동완성
 - Claude: `adapters/claude/skills/preprocess/SKILL.md`
 - Codex: `adapters/codex/config-snippet.toml`
 - 공통: `cluxion-runtime plan --surface <hermes|claude|codex|grok_build>`

{cluxion_agentplugin_preprocessing-0.3.22 → cluxion_agentplugin_preprocessing-0.3.24}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "cluxion-agentplugin-preprocessing"
-version = "0.3.22"
+version = "0.3.24"
 description = "Universal agent plugin for Cluxion preprocessing, honesty contracts, clarification, Rust work queue, and resource-aware harness handoff."
 readme = "README.md"
 requires-python = ">=3.11"

{cluxion_agentplugin_preprocessing-0.3.22 → cluxion_agentplugin_preprocessing-0.3.24}/src/cluxion_agentplugin_preprocessing/cli.py

@@ -9,7 +9,7 @@ import sys
 from pathlib import Path
 from typing import TYPE_CHECKING
 
-from cluxion_agentplugin_preprocessing import __version__, hermes_config, runner
+from cluxion_agentplugin_preprocessing import __version__, hermes_config, hermes_deliver_patch, runner
 from cluxion_agentplugin_preprocessing.doctor import (
     render_json,
     render_text,
@@ -39,6 +39,8 @@ def main(argv: Sequence[str] | None = None) -> int:
         return _hermes_config(args)
     if args.command == "doctor":
         return _doctor(args)
+    if args.command == "hermes-patch":
+        return _hermes_patch(args)
     parser.print_help(sys.stderr)
     return 2
 
@@ -83,6 +85,21 @@ def _parser() -> argparse.ArgumentParser:
     doctor = subparsers.add_parser("doctor", help="Run embedded health checks")
     doctor.add_argument("--json", action="store_true")
     doctor.add_argument("--verbose", action="store_true")
+    patch = subparsers.add_parser(
+        "hermes-patch",
+        help="Apply or verify Hermes deliver=agent patch (/supercoder routing)",
+    )
+    patch.add_argument(
+        "--status",
+        action="store_true",
+        help="Only report patch status (default: ensure applied)",
+    )
+    patch.add_argument("--dry-run", action="store_true")
+    patch.add_argument(
+        "--hermes-root",
+        default=None,
+        help="Hermes agent source root (default: auto-detect ~/.hermes/hermes-agent)",
+    )
     return parser
 
 
@@ -117,8 +134,10 @@ def _status(args: argparse.Namespace) -> int:
 
 def _enable(args: argparse.Namespace) -> int:
     result = hermes_config.enable_plugin(args.home, dry_run=bool(args.dry_run))
-    print(json.dumps({"ok": True, **result.to_dict()}, ensure_ascii=False, sort_keys=True))
-    return 0
+    patch = _ensure_hermes_patch(dry_run=bool(args.dry_run))
+    payload = {"ok": True, **result.to_dict(), "hermes_patch": patch.to_dict()}
+    print(json.dumps(payload, ensure_ascii=False, sort_keys=True))
+    return 0 if patch.status in {"applied", "no_hermes"} or args.dry_run else 1
 
 
 def _disable(args: argparse.Namespace) -> int:
@@ -142,6 +161,27 @@ def _hermes_config(args: argparse.Namespace) -> int:
     return 0 if result.ok else 1
 
 
+def _hermes_root_arg(args: argparse.Namespace) -> Path | None:
+    raw = getattr(args, "hermes_root", None)
+    return Path(raw).expanduser() if raw else None
+
+
+def _ensure_hermes_patch(*, dry_run: bool, hermes_root: Path | None = None) -> hermes_deliver_patch.PatchResult:
+    if dry_run:
+        return hermes_deliver_patch.patch_status(hermes_root)
+    return hermes_deliver_patch.ensure_applied(hermes_root=hermes_root)
+
+
+def _hermes_patch(args: argparse.Namespace) -> int:
+    root = _hermes_root_arg(args)
+    if args.status:
+        result = hermes_deliver_patch.patch_status(root)
+    else:
+        result = hermes_deliver_patch.ensure_applied(hermes_root=root, dry_run=bool(args.dry_run))
+    print(json.dumps({"ok": result.status == "applied", **result.to_dict()}, ensure_ascii=False, sort_keys=True))
+    return 0 if result.status == "applied" else 1
+
+
 def _doctor(args: argparse.Namespace) -> int:
     pkg = "cluxion_agentplugin_preprocessing.doctor"
     catalog_path = Path(str(importlib.resources.files(pkg).joinpath("catalog.json")))

{cluxion_agentplugin_preprocessing-0.3.22 → cluxion_agentplugin_preprocessing-0.3.24}/src/cluxion_agentplugin_preprocessing/guard_watch.py

@@ -38,6 +38,7 @@ def on_session_start(**_: Any) -> None:
     Startup is idempotent: an already-running daemon is success. Hook failures
     are logged as one concise stderr warning and never propagated to the host.
     """
+    _maybe_apply_hermes_deliver_patch()
     if not _autostart_enabled():
         return
     try:
@@ -51,6 +52,23 @@ def on_session_start(**_: Any) -> None:
         _warn(f"cluxion guard autostart failed: {reason}")
 
 
+def _maybe_apply_hermes_deliver_patch() -> None:
+    """Best-effort Hermes deliver=agent patch (``CLUXION_HERMES_PATCH_AUTOFIX``, default on)."""
+    try:
+        from cluxion_agentplugin_preprocessing import hermes_deliver_patch
+
+        if not hermes_deliver_patch.autostart_enabled():
+            return
+        status = hermes_deliver_patch.patch_status()
+        if status.status == "applied":
+            return
+        result = hermes_deliver_patch.ensure_applied()
+        if result.status != "applied" and result.status != "no_hermes":
+            _warn(f"cluxion hermes deliver patch: {result.detail}")
+    except Exception as exc:
+        _warn(f"cluxion hermes deliver patch failed: {exc}")
+
+
 def post_tool_call(**_: Any) -> None:
     """Run a throttled guard watch after tool calls.
 

cluxion_agentplugin_preprocessing-0.3.24/src/cluxion_agentplugin_preprocessing/hermes_deliver_patch.py

@@ -0,0 +1,373 @@
+"""Apply and verify Hermes core support for plugin slash ``deliver=agent``."""
+
+from __future__ import annotations
+
+import os
+import shutil
+import subprocess
+import tempfile
+from dataclasses import dataclass
+from datetime import UTC, datetime
+from importlib import resources
+from pathlib import Path
+from typing import Literal
+
+PATCH_RESOURCE = "patches/hermes-deliver-agent.patch"
+BRANCH_NAME = "cluxion/plugin-deliver-agent"
+
+Status = Literal["applied", "missing", "partial", "no_hermes"]
+
+
+@dataclass(frozen=True)
+class PatchResult:
+    hermes_root: Path
+    status: Status
+    applied: bool
+    changed: bool
+    method: str
+    detail: str
+
+    def to_dict(self) -> dict[str, object]:
+        return {
+            "hermes_root": str(self.hermes_root),
+            "status": self.status,
+            "applied": self.applied,
+            "changed": self.changed,
+            "method": self.method,
+            "detail": self.detail,
+        }
+
+
+def resolve_hermes_agent_root(home: str | os.PathLike[str] | None = None) -> Path | None:
+    """Best-effort Hermes agent source tree (contains ``hermes_cli/``)."""
+    candidates: list[Path] = []
+    env_root = os.environ.get("HERMES_AGENT_ROOT", "").strip()
+    if env_root:
+        candidates.append(Path(env_root).expanduser())
+    if home is not None:
+        candidates.append(Path(home).expanduser() / "hermes-agent")
+    hermes_home = Path(os.environ.get("HERMES_HOME", "")).expanduser() if os.environ.get("HERMES_HOME") else Path.home() / ".hermes"
+    candidates.append(hermes_home / "hermes-agent")
+
+    hermes_bin = shutil.which("hermes")
+    if hermes_bin:
+        try:
+            resolved = Path(hermes_bin).resolve()
+            for parent in resolved.parents:
+                if (parent / "hermes_cli" / "plugins.py").is_file():
+                    candidates.append(parent)
+                    break
+        except OSError:
+            pass
+
+    seen: set[Path] = set()
+    for root in candidates:
+        if root in seen:
+            continue
+        seen.add(root)
+        if (root / "hermes_cli" / "plugins.py").is_file():
+            return root
+    return None
+
+
+def patch_status(hermes_root: Path | None = None) -> PatchResult:
+    root = hermes_root or resolve_hermes_agent_root()
+    if root is None:
+        return PatchResult(Path(), "no_hermes", False, False, "none", "hermes-agent tree not found")
+
+    checks = {
+        "plugins": _plugins_applied(root),
+        "cli": _cli_applied(root),
+        "gateway_dispatch": _gateway_dispatch_applied(root),
+        "gateway_slash_exec": _gateway_slash_exec_applied(root),
+    }
+    ok_count = sum(1 for v in checks.values() if v)
+    if ok_count == len(checks):
+        return PatchResult(root, "applied", True, False, "verify", "all markers present")
+    if ok_count == 0:
+        return PatchResult(root, "missing", False, False, "verify", f"missing: {checks}")
+    return PatchResult(root, "partial", False, False, "verify", f"partial: {checks}")
+
+
+def ensure_applied(
+    *,
+    hermes_root: Path | None = None,
+    dry_run: bool = False,
+) -> PatchResult:
+    """Idempotently apply deliver=agent support to the local Hermes checkout."""
+    current = patch_status(hermes_root)
+    if current.status == "no_hermes":
+        return current
+    if current.status == "applied":
+        return PatchResult(current.hermes_root, "applied", True, False, "noop", "already applied")
+
+    if dry_run:
+        return PatchResult(
+            current.hermes_root,
+            current.status,
+            False,
+            False,
+            "dry_run",
+            f"would apply ({current.detail})",
+        )
+
+    for method, result in (
+        ("git_branch", _apply_via_git_branch(current.hermes_root)),
+        ("git_apply", _apply_via_git_patch(current.hermes_root)),
+        ("inline", _apply_inline(current.hermes_root)),
+    ):
+        if result:
+            after = patch_status(current.hermes_root)
+            if after.status == "applied":
+                return PatchResult(
+                    current.hermes_root,
+                    "applied",
+                    True,
+                    True,
+                    method,
+                    "patch applied successfully",
+                )
+
+    after = patch_status(current.hermes_root)
+    return PatchResult(
+        current.hermes_root,
+        after.status,
+        after.status == "applied",
+        False,
+        "failed",
+        after.detail,
+    )
+
+
+def _plugins_applied(root: Path) -> bool:
+    text = (root / "hermes_cli" / "plugins.py").read_text(encoding="utf-8")
+    return 'deliver: str = "output"' in text and '"deliver": deliver_mode' in text
+
+
+def _cli_applied(root: Path) -> bool:
+    text = (root / "cli.py").read_text(encoding="utf-8")
+    return 'entry.get("deliver") == "agent"' in text and "_pending_input.put(str(result))" in text
+
+
+def _gateway_dispatch_applied(root: Path) -> bool:
+    text = (root / "tui_gateway" / "server.py").read_text(encoding="utf-8")
+    return '"type": "send"' in text and 'entry.get("deliver") == "agent"' in text
+
+
+def _gateway_slash_exec_applied(root: Path) -> bool:
+    text = (root / "tui_gateway" / "server.py").read_text(encoding="utf-8")
+    return "agent-deliver command: use command.dispatch" in text
+
+
+def _apply_via_git_branch(root: Path) -> bool:
+    if not (root / ".git").is_dir():
+        return False
+    try:
+        subprocess.run(
+            ["git", "rev-parse", "--verify", BRANCH_NAME],
+            cwd=root,
+            check=True,
+            capture_output=True,
+            text=True,
+        )
+        subprocess.run(["git", "checkout", BRANCH_NAME], cwd=root, check=True, capture_output=True, text=True)
+        return True
+    except (subprocess.CalledProcessError, OSError):
+        return False
+
+
+def _apply_via_git_patch(root: Path) -> bool:
+    if not (root / ".git").is_dir():
+        return False
+    try:
+        patch_bytes = resources.files("cluxion_agentplugin_preprocessing").joinpath(PATCH_RESOURCE).read_bytes()
+    except (FileNotFoundError, ModuleNotFoundError):
+        return False
+    with tempfile.NamedTemporaryFile("wb", suffix=".patch", delete=False) as handle:
+        handle.write(patch_bytes)
+        patch_path = Path(handle.name)
+    try:
+        subprocess.run(
+            ["git", "apply", "--check", str(patch_path)],
+            cwd=root,
+            check=True,
+            capture_output=True,
+            text=True,
+        )
+        subprocess.run(["git", "apply", str(patch_path)], cwd=root, check=True, capture_output=True, text=True)
+        return True
+    except (subprocess.CalledProcessError, OSError):
+        return False
+    finally:
+        patch_path.unlink(missing_ok=True)
+
+
+def _apply_inline(root: Path) -> bool:
+    try:
+        changed = False
+        changed |= _patch_plugins_py(root)
+        changed |= _patch_cli_py(root)
+        changed |= _patch_tui_gateway(root)
+        return changed
+    except OSError:
+        return False
+
+
+def _backup(path: Path) -> None:
+    if not path.exists():
+        return
+    stamp = datetime.now(UTC).strftime("%Y%m%dT%H%M%SZ")
+    shutil.copy2(path, path.with_name(f"{path.name}.bak-cluxion-{stamp}"))
+
+
+def _patch_plugins_py(root: Path) -> bool:
+    path = root / "hermes_cli" / "plugins.py"
+    text = path.read_text(encoding="utf-8")
+    if _plugins_applied(root):
+        return False
+    if 'args_hint: str = "",\n    ) -> None:' not in text:
+        return False
+    old = (
+        "        self._manager._plugin_commands[clean] = {\n"
+        '            "handler": handler,\n'
+        '            "description": description or "Plugin command",\n'
+        '            "plugin": self.manifest.name,\n'
+        '            "args_hint": (args_hint or "").strip(),\n'
+        "        }"
+    )
+    new = (
+        "        deliver_mode = (deliver or \"output\").strip().lower()\n"
+        '        if deliver_mode not in {"output", "agent"}:\n'
+        '            deliver_mode = "output"\n'
+        "        self._manager._plugin_commands[clean] = {\n"
+        '            "handler": handler,\n'
+        '            "description": description or "Plugin command",\n'
+        '            "plugin": self.manifest.name,\n'
+        '            "args_hint": (args_hint or "").strip(),\n'
+        '            "deliver": deliver_mode,\n'
+        "        }"
+    )
+    if old not in text:
+        return False
+    _backup(path)
+    text = text.replace(
+        'args_hint: str = "",\n    ) -> None:',
+        'args_hint: str = "",\n        deliver: str = "output",\n    ) -> None:',
+        1,
+    )
+    text = text.replace(old, new, 1)
+    path.write_text(text, encoding="utf-8")
+    return True
+
+
+def _patch_cli_py(root: Path) -> bool:
+    path = root / "cli.py"
+    text = path.read_text(encoding="utf-8")
+    if _cli_applied(root):
+        return False
+    old = (
+        "                    try:\n"
+        "                        result = resolve_plugin_command_result(\n"
+        "                            plugin_handler(user_args)\n"
+        "                        )\n"
+        "                        if result:\n"
+        "                            _cprint(str(result))"
+    )
+    new = (
+        "                    try:\n"
+        "                        from hermes_cli.plugins import get_plugin_commands\n"
+        "\n"
+        '                        cmd_key = base_cmd.lstrip("/")\n'
+        "                        entry = get_plugin_commands().get(cmd_key, {})\n"
+        "                        result = resolve_plugin_command_result(\n"
+        "                            plugin_handler(user_args)\n"
+        "                        )\n"
+        "                        if (\n"
+        '                            entry.get("deliver") == "agent"\n'
+        "                            and user_args.strip()\n"
+        "                            and result\n"
+        '                            and hasattr(self, "_pending_input")\n'
+        "                        ):\n"
+        "                            _cprint(\n"
+        '                                f"\\n⚡ /{cmd_key} → agent "\n'
+        '                                f"({len(str(result))} chars)"\n'
+        "                            )\n"
+        '                            self._pending_input.put(str(result))\n'
+        "                        elif result:\n"
+        "                            _cprint(str(result))"
+    )
+    if old not in text:
+        return False
+    _backup(path)
+    path.write_text(text.replace(old, new, 1), encoding="utf-8")
+    return True
+
+
+def _patch_tui_gateway(root: Path) -> bool:
+    path = root / "tui_gateway" / "server.py"
+    text = path.read_text(encoding="utf-8")
+    changed = False
+    if not _gateway_dispatch_applied(root):
+        old = (
+            "        if handler:\n"
+            "            result = resolve_plugin_command_result(handler(arg))\n"
+            '            return _ok(rid, {"type": "plugin", "output": str(result or "")})'
+        )
+        new = (
+            "        if handler:\n"
+            "            from hermes_cli.plugins import get_plugin_commands\n"
+            "\n"
+            "            result = resolve_plugin_command_result(handler(arg))\n"
+            "            entry = get_plugin_commands().get(name, {})\n"
+            '            if entry.get("deliver") == "agent" and arg.strip() and result:\n'
+            '                return _ok(rid, {"type": "send", "message": str(result)})\n'
+            '            return _ok(rid, {"type": "plugin", "output": str(result or "")})'
+        )
+        if old in text:
+            _backup(path)
+            text = text.replace(old, new, 1)
+            changed = True
+    if not _gateway_slash_exec_applied(root):
+        old = (
+            "    if plugin_handler and resolve_plugin_command_result:\n"
+            "        try:\n"
+            "            result = resolve_plugin_command_result(plugin_handler(_cmd_arg))\n"
+            '            return _ok(rid, {"output": str(result or "(no output)")})'
+        )
+        new = (
+            "    if plugin_handler and resolve_plugin_command_result:\n"
+            "        try:\n"
+            "            from hermes_cli.plugins import get_plugin_commands\n"
+            "\n"
+            "            entry = get_plugin_commands().get(_cmd_base, {})\n"
+            '            if entry.get("deliver") == "agent":\n'
+            "                return _err(\n"
+            "                    rid,\n"
+            "                    4018,\n"
+            '                    f"agent-deliver command: use command.dispatch for /{_cmd_base}",\n'
+            "                )\n"
+            "            result = resolve_plugin_command_result(plugin_handler(_cmd_arg))\n"
+            '            return _ok(rid, {"output": str(result or "(no output)")})'
+        )
+        if old in text:
+            if not changed:
+                _backup(path)
+            text = text.replace(old, new, 1)
+            changed = True
+    if changed:
+        path.write_text(text, encoding="utf-8")
+    return changed
+
+
+def autostart_enabled() -> bool:
+    value = os.environ.get("CLUXION_HERMES_PATCH_AUTOFIX", "1").strip().lower()
+    return value not in {"0", "false", "no", "off"}
+
+
+__all__ = [
+    "PatchResult",
+    "autostart_enabled",
+    "ensure_applied",
+    "patch_status",
+    "resolve_hermes_agent_root",
+]