@pushary/agent-hooks 1.9.76 → 1.9.78

package/dist/{chunk-FAGQAR6I.js → chunk-WHTWHHE3.js}

@@ -5,19 +5,19 @@ import {
   hermesAppWiringRecord,
   hermesConfigReceipt,
   hermesSetupReceipt
-} from "./chunk-7KYQ24FI.js";
+} from "./chunk-TQYSBYYZ.js";
 import {
   readJsonSafe,
   resolvePathBinary,
   writeJsonAtomic
-} from "./chunk-T2EJ3H6Y.js";
+} from "./chunk-Y4I5YX3L.js";
 import {
   isNewerVersion,
   isReleaseVersion
 } from "./chunk-QTOLNRET.js";
 import {
   isRecord
-} from "./chunk-Y4OBAK4I.js";
+} from "./chunk-OFJUHEEG.js";
 
 // src/hermes/plugin-payload.ts
 import { createHash } from "crypto";
@@ -30,7 +30,7 @@ import os
 import threading
 from pathlib import Path
 
-from . import api, approval, host, identity, installation, schemas, tools
+from . import api, approval, history, host, identity, installation, schemas, tools
 
 logger = logging.getLogger(__name__)
 
@@ -332,6 +332,7 @@ def _on_post_tool_call(tool_name, args, result, duration_ms=0, status=None, **kw
 
 def _on_session_start(session_id=None, **kwargs):
     identity.remember_session(session_id)
+    history.start_history(session_id, kwargs.get("parent_session_id"))
     _session_totals.update(tools=0, errors=0)
     _last_turn.update(completed=False, interrupted=False)
     _report_session_event("session_start", session_id, can_drain=True)
@@ -358,6 +359,7 @@ def _report_plugin_active_once(session_id):
 
 def _on_pre_llm_call(session_id=None, **kwargs):
     identity.remember_session(session_id)
+    history.start_history(session_id, kwargs.get("parent_session_id"))
     if not api.is_configured() or not identity.session_id():
         return None
     result = api.agent_event("user_prompt", identity.session_id(), can_drain=True)
@@ -402,6 +404,7 @@ def _on_session_end(session_id=None, completed=False, interrupted=False, failed=
 
 
 def _on_session_finalize(session_id=None, **kwargs):
+    history.stop_history(session_id or identity.session_id())
     _report_session_event("session_closed", session_id or identity.session_id())
     tool_count = _session_totals["tools"]
     error_count = _session_totals["errors"]
@@ -932,6 +935,261 @@ def get_end_user_decision(decision_id, wait_seconds=45):
     return _rest_call("GET", f"/decisions/{seg}", params={"wait": wait_seconds})
 ` },
   { path: "approval.py", contents: 'import time\n\nfrom . import api, identity\n\nHERMES_SHELL_TOOL = "terminal"\nDECISION_LINE_MAX = 500\nACTION_BODY_MAX = 4000\n\nPOLL_CEILING_SECONDS = 50.0\n\nCHOICE_LABELS = (\n    ("once", "Allow once"),\n    ("session", "Allow for this session"),\n    ("always", "Always allow"),\n    ("deny", "Deny"),\n)\n\n\nclass TransportUnavailable(Exception):\n    pass\n\n\nQUESTION_COMMAND_MAX = 160\n\nPLUGIN_RULE_MARKER = "(plugin approval rule)"\n\n\ndef _offered(allowed):\n    return [pair for pair in CHOICE_LABELS if pair[0] in set(allowed or ())]\n\n\ndef _command_head(command):\n    return " ".join(str(command or "").split()[:2])[:80]\n\n\ndef _command_summary(command):\n    collapsed = " ".join(str(command or "").split())\n    if len(collapsed) <= QUESTION_COMMAND_MAX:\n        return collapsed\n    return collapsed[:QUESTION_COMMAND_MAX - 1] + "\u2026"\n\n\ndef _choice_from_answer(value, offered, uses_select):\n    answer = str(value or "").strip()\n    if uses_select:\n        for choice, label in offered:\n            if answer.lower() == label.lower():\n                return choice\n        return "deny"\n    return "once" if api.is_affirmative(answer) else "deny"\n\n\ndef _subject(request):\n    """What to put in the question.\n\n    A dangerous-command approval carries the real command. A plugin rule\n    escalated from pre_tool_call carries a synthetic display label instead, and\n    the plugin\'s own message is the part worth reading, so use that.\n    """\n    command = str(request.command or "")\n    if PLUGIN_RULE_MARKER in command:\n        lines = str(request.description or "").strip().splitlines()\n        if lines and lines[0].strip():\n            return _command_summary(lines[0])\n    return _command_summary(command)\n\n\ndef _open_question(request, offered, uses_select):\n    command = str(request.command or "")\n    return api.ask_user(\n        question=f"Allow Hermes to run `{_subject(request)}`?",\n        question_type="select" if uses_select else "confirm",\n        options=[label for _, label in offered] if uses_select else None,\n        context=str(request.description or "")[:500] or None,\n        agent_name=identity.agent_name(),\n        session_id=identity.session_id(),\n        machine_id=identity.machine_id(),\n        tool_name=HERMES_SHELL_TOOL,\n        tool_target=_command_head(command),\n        action=command[:DECISION_LINE_MAX] or None,\n        action_body=command[:ACTION_BODY_MAX] or None,\n        blocker=(\n            f"Hermes flagged this command as {request.pattern_key}"[:DECISION_LINE_MAX]\n            if request.pattern_key\n            else None\n        ),\n        wait=False,\n    )\n\n\ndef _stopped(result):\n    return result.get("handoffAction") == "stop" or result.get("status") in ("cancelled", "unavailable", "stopped")\n\n\ndef _withdraw(correlation_id):\n    try:\n        cancelled = api.cancel_question(correlation_id)\n        if _stopped(cancelled) or cancelled.get("error"):\n            return {"handoffAction": "stop"}\n        if cancelled.get("cancelled") is True:\n            return {}\n        answer = api.wait_for_answer(correlation_id, 1000)\n        if answer.get("answered") or answer.get("status") in ("expired", "missing"):\n            return answer\n    except Exception:\n        pass\n    return {"handoffAction": "stop"}\n\n\ndef present(request):\n    offered = _offered(request.allowed_choices)\n    if not offered:\n        return request.respond("deny")\n    uses_select = [choice for choice, _ in offered] != ["once", "deny"]\n    # Reserve time for withdrawal before the host discards a late decision.\n    started_at = time.monotonic()\n    deadline = started_at + max(float(request.timeout_seconds or 0) - 10, 0.0)\n    created = _open_question(request, offered, uses_select)\n    if created.get("answered"):\n        return request.respond(_choice_from_answer(created.get("value"), offered, uses_select))\n    if _stopped(created):\n        return request.respond("deny")\n    correlation_id = created.get("correlationId")\n    if not correlation_id:\n        raise TransportUnavailable("Pushary did not create an approval")\n\n    policy_deadline = None\n    window_ms = created.get("policyTimeoutMs")\n    if created.get("deliveryMode") == "push_first" and isinstance(window_ms, (int, float)) and window_ms >= 0:\n        policy_deadline = started_at + window_ms / 1000\n        deadline = min(deadline, policy_deadline)\n    handoff = created.get("noDevices") or created.get("suppressed") or created.get("status") in ("terminal", "notified")\n    answer = created\n    try:\n        while not handoff and time.monotonic() < deadline:\n            remaining = deadline - time.monotonic()\n            answer = api.wait_for_answer(correlation_id, int(min(POLL_CEILING_SECONDS, max(1.0, remaining)) * 1000))\n            if answer.get("answered"):\n                return request.respond(_choice_from_answer(answer.get("value"), offered, uses_select))\n            if _stopped(answer) or answer.get("error") or answer.get("status") in ("expired", "missing"):\n                break\n            # Some hosts/proxies return pending immediately instead of long-polling.\n            time.sleep(min(0.1, max(0, deadline - time.monotonic())))\n    except Exception:\n        answer = {"handoffAction": "stop"}\n\n    late = _withdraw(correlation_id)\n    if _stopped(answer) or _stopped(late):\n        return request.respond("deny")\n    if late.get("answered"):\n        return request.respond(_choice_from_answer(late.get("value"), offered, uses_select))\n    if handoff or (policy_deadline is not None and time.monotonic() >= policy_deadline):\n        # Only a fenced question may reach Hermes\'s configured builtin fallback.\n        raise TransportUnavailable("Approval handed back to Hermes")\n    return request.respond("deny")\n' },
+  { path: "history.py", contents: `from __future__ import annotations
+
+import hashlib
+import contextvars
+import json
+import logging
+import math
+import os
+import re
+import shutil
+import subprocess
+import tempfile
+import threading
+import time
+from datetime import datetime, timezone
+from pathlib import Path
+
+from . import api
+
+logger = logging.getLogger(__name__)
+MAX_MESSAGES = 5000
+MAX_SOURCE_BYTES = 20_000_000
+POLL_SECONDS = 5
+_workers: dict[tuple[str, str], tuple[threading.Event, threading.Thread]] = {}
+_lock = threading.Lock()
+
+
+def _text_blocks(content: object) -> list[dict[str, object]]:
+    if isinstance(content, str):
+        return [{"type": "text", "text": content}]
+    if not isinstance(content, list):
+        return []
+    return [{"type": "text", "text": block["text"]} for block in content
+            if isinstance(block, dict) and block.get("type") in ("text", "input_text", "output_text")
+            and isinstance(block.get("text"), str)]
+
+
+def _tool_blocks(calls: object) -> list[dict[str, object]]:
+    blocks = []
+    if not isinstance(calls, list):
+        return blocks
+    for call in calls:
+        if not isinstance(call, dict) or not isinstance(call.get("id"), str):
+            continue
+        function = call.get("function")
+        if not isinstance(function, dict) or not isinstance(function.get("name"), str):
+            continue
+        arguments = function.get("arguments", {})
+        if isinstance(arguments, str):
+            arguments = json.loads(arguments)
+        if not isinstance(arguments, dict):
+            raise ValueError("Invalid Hermes tool arguments")
+        blocks.append({"type": "tool_use", "id": call["id"], "name": function["name"], "input": arguments})
+    return blocks
+
+
+def normalize_messages(rows: list[object]) -> list[dict[str, object]]:
+    messages = []
+    for row in rows:
+        if not isinstance(row, dict):
+            raise ValueError("Invalid Hermes message")
+        if not (row.get("active") or row.get("compacted")) or row.get("display_kind") in ("hidden", "model_only"):
+            continue
+        role = row.get("role")
+        if role not in ("user", "assistant", "tool") or row.get("_compressed_summary"):
+            continue
+        identity = row.get("id")
+        stamp = row.get("timestamp")
+        if not isinstance(identity, int) or isinstance(identity, bool) or identity <= 0:
+            raise ValueError("Invalid Hermes message identity")
+        if not isinstance(stamp, (int, float)) or not math.isfinite(stamp) or stamp <= 0:
+            raise ValueError("Invalid Hermes message timestamp")
+        content = _text_blocks(row.get("content"))
+        if role == "assistant":
+            content.extend(_tool_blocks(row.get("tool_calls")))
+        elif role == "tool":
+            call_id = row.get("tool_call_id")
+            if not isinstance(call_id, str) or not call_id:
+                continue
+            content = [{"type": "tool_result", "tool_use_id": call_id, "content": content}]
+        messages.append({
+            "id": f"hermes:{identity}", "role": "user" if role == "tool" else role,
+            "timestamp": datetime.fromtimestamp(stamp, timezone.utc).isoformat().replace("+00:00", "Z"),
+            "content": content,
+        })
+    return messages
+
+
+def read_display_history(database_path: Path, session_id: str) -> list[dict[str, object]]:
+    from hermes_state import SessionDB
+
+    database = SessionDB(db_path=database_path, read_only=True)
+    try:
+        connection = database._conn
+        deadline = time.monotonic() + 2
+        connection.set_progress_handler(lambda: int(time.monotonic() > deadline), 1000)
+        connection.execute("BEGIN")
+        if database.get_session(session_id) is None:
+            raise ValueError("Hermes session is not in this profile")
+        lineage = database._resume_lineage_ids(session_id)
+        if not lineage or len(lineage) > 100:
+            raise ValueError("Unsupported Hermes compression lineage")
+        columns = [row[1] for row in connection.execute("PRAGMA table_info(messages)")]
+        required = {"id", "session_id", "role", "content", "timestamp", "active", "compacted", "display_kind", "message_uid"}
+        if not required.issubset(columns):
+            raise ValueError("Unsupported Hermes history schema")
+        identifiers = ['"' + column.replace('"', '""') + '"' for column in columns]
+        row_bytes = " + ".join(f"COALESCE(length(CAST({column} AS BLOB)), 0)" for column in identifiers)
+        placeholders = ",".join("?" for _ in lineage)
+        count, size = connection.execute(
+            f"SELECT COUNT(*), SUM({row_bytes}) FROM messages WHERE session_id IN ({placeholders})", lineage
+        ).fetchone()
+        if count > MAX_MESSAGES or (size or 0) > MAX_SOURCE_BYTES:
+            raise ValueError("Hermes history exceeds the bounded reader limit")
+        rows = database.get_messages(session_id, include_compacted=True, include_ancestors=True, limit=MAX_MESSAGES)
+        return normalize_messages(rows)
+    finally:
+        database.close()
+
+
+def write_snapshot(path: Path, session_id: str, messages: list[dict[str, object]], error: str | None = None, completed: bool = False) -> None:
+    value = {"version": 1, "sessionId": session_id, "updatedAtMs": int(time.time() * 1000), "messages": messages, "completed": completed}
+    if error:
+        value["error"] = error
+    encoded = json.dumps(value, ensure_ascii=True, allow_nan=False).encode("utf-8")
+    if len(encoded) > MAX_SOURCE_BYTES:
+        raise ValueError("Hermes history export exceeds its size limit")
+    path.parent.mkdir(mode=0o700, parents=True, exist_ok=True)
+    descriptor, temporary = tempfile.mkstemp(dir=path.parent, prefix=".history-")
+    try:
+        with os.fdopen(descriptor, "wb") as handle:
+            handle.write(encoded)
+            handle.flush()
+            os.fsync(handle.fileno())
+        os.replace(temporary, path)
+    finally:
+        Path(temporary).unlink(missing_ok=True)
+
+
+def _registration_command(key: str) -> list[str] | None:
+    root = Path.home() / ".pushary"
+    try:
+        if (root / "native-transcript-consent.json").exists():
+            bridge = (root / "bin" / "pushary-bridge").resolve(strict=True)
+            helper = str(bridge.parent / "pushary-native-transcripts")
+            command = [helper, "register", "hermes"]
+        else:
+            helper = shutil.which("pushary-transcript-register")
+            if helper is None:
+                return None
+            command = [helper, "hermes"]
+        result = subprocess.run([helper, "authorize-export"],
+                                input=json.dumps({"apiKey": key, "baseUrl": api.BASE_URL}), text=True,
+                                stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, timeout=5, check=False,
+                                env={**os.environ, "PUSHARY_API_KEY": key, "PUSHARY_BASE_URL": api.BASE_URL})
+        if result.returncode != 0:
+            return None
+        authorization = json.loads(result.stdout)
+        if not isinstance(authorization, dict) or type(authorization.get("version")) is not int or authorization.get("version") != 1 or authorization.get("authorized") is not True:
+            return None
+        return command
+    except (OSError, ValueError, subprocess.TimeoutExpired):
+        return None
+
+
+def _export_loop(database_path: Path, session_id: str, key: str, command: list[str], stop: threading.Event) -> None:
+    binding = hashlib.sha256((api.BASE_URL.rstrip("/") + "\\0" + key + "\\0" + str(database_path)).encode()).hexdigest()
+    path = Path.home() / ".pushary" / "hermes-history" / binding / f"{session_id}.json"
+    next_registration = 0
+    warned = False
+    revoked = False
+    try:
+        while True:
+            if api._get_api_key() != key or _registration_command(key) != command:
+                revoked = True
+                break
+            ending = stop.is_set()
+            try:
+                messages = read_display_history(database_path, session_id)
+                write_snapshot(path, session_id, messages, completed=ending)
+                warned = False
+            except Exception:
+                if not warned:
+                    logger.warning("[pushary] Hermes history source is unavailable; existing phone history is preserved")
+                warned = True
+                write_snapshot(path, session_id, [], error="source_unavailable")
+            if ending or time.monotonic() >= next_registration:
+                payload = {"session_id": session_id, "cwd": str(database_path.parent), "transcript_path": str(path),
+                           "hook_event_name": "SessionEnd" if ending else "SessionStart"}
+                environment = {**os.environ, "PUSHARY_API_KEY": key, "PUSHARY_BASE_URL": api.BASE_URL}
+                result = subprocess.run(command, input=json.dumps(payload), text=True, env=environment,
+                                        stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, timeout=5, check=False)
+                if result.returncode != 0:
+                    logger.warning("[pushary] Hermes history reader could not register")
+                next_registration = time.monotonic() + 60
+            if ending:
+                break
+            stop.wait(POLL_SECONDS)
+    except Exception:
+        logger.warning("[pushary] Hermes history reader stopped; reopen the session to retry")
+    finally:
+        if revoked:
+            path.unlink(missing_ok=True)
+        with _lock:
+            _workers.pop((str(database_path), session_id), None)
+
+
+def start_history(session_id: object, parent_session_id: object = None) -> None:
+    if parent_session_id or not isinstance(session_id, str) or not re.fullmatch(r"[A-Za-z0-9_-]{1,128}", session_id):
+        return
+    try:
+        from hermes_constants import get_hermes_home
+
+        key = api._get_api_key()
+        command = _registration_command(key)
+        if command is None:
+            return
+        database_path = (get_hermes_home() / "state.db").resolve()
+        identity = (str(database_path), session_id)
+        with _lock:
+            if identity in _workers or len(_workers) >= 32:
+                return
+            stop = threading.Event()
+        context = contextvars.copy_context()
+        thread = threading.Thread(target=context.run, args=(_export_loop, database_path, session_id, key, command, stop),
+                                  name="pushary-history", daemon=True)
+        with _lock:
+            if identity in _workers or len(_workers) >= 32:
+                return
+            _workers[identity] = (stop, thread)
+        try:
+            thread.start()
+        except Exception:
+            with _lock:
+                _workers.pop(identity, None)
+            raise
+    except Exception:
+        logger.warning("[pushary] Hermes history reader could not start")
+
+
+def stop_history(session_id: str) -> None:
+    try:
+        from hermes_constants import get_hermes_home
+        database_path = str((get_hermes_home() / "state.db").resolve())
+    except Exception:
+        return
+    with _lock:
+        worker = _workers.get((database_path, session_id))
+    if worker:
+        stop, thread = worker
+        stop.set()
+        thread.join(timeout=8)
+        if thread.is_alive():
+            logger.warning("[pushary] Hermes final history export is still pending")
+` },
   { path: "host.py", contents: 'import os\n\nTRANSPORT_NAME = "pushary"\n\nHOOK_TIMEOUT_DEFAULT_SECONDS = 30.0\nHOOK_TIMEOUT_MAX_SECONDS = 600.0\n\nGATE_HEADROOM_SECONDS = 5.0\nGATE_MIN_SECONDS = 5.0\nGATE_MAX_SECONDS = 55.0\n\n# The last Hermes that runs a pre_tool_call callback to completion. Anything\n# after this abandons one that outlives plugins.hook_callback_timeout.\nUNBOUNDED_THROUGH_VERSION = (0, 20, 5)\n\n\ndef _config():\n    try:\n        from hermes_cli.config import load_config_readonly\n\n        loaded = load_config_readonly()\n    except Exception:\n        return {}\n    return loaded if isinstance(loaded, dict) else {}\n\n\ndef _section(node, *path):\n    for key in path:\n        node = node.get(key) if isinstance(node, dict) else None\n        if node is None:\n            return {}\n    return node if isinstance(node, dict) else {}\n\n\ndef profile_secret(name):\n    try:\n        from agent.secret_scope import get_secret\n    except Exception:\n        return os.environ.get(name) or None\n    try:\n        return get_secret(name) or None\n    except Exception:\n        return None\n\n\ndef hermes_version_label():\n    try:\n        from importlib.metadata import version\n\n        return version("hermes-cli")\n    except Exception:\n        try:\n            import hermes_cli\n\n            label = getattr(hermes_cli, "__version__", None)\n        except Exception:\n            return None\n    return str(label) if label else None\n\n\ndef _hermes_version():\n    """This Hermes as a comparable tuple, or None when it will not say."""\n    raw = hermes_version_label()\n    if not raw:\n        return None\n    parts = []\n    for piece in str(raw).split(".")[:3]:\n        digits = ""\n        for char in piece:\n            if not char.isdigit():\n                break\n            digits += char\n        if not digits:\n            return None\n        parts.append(int(digits))\n    while len(parts) < 3:\n        parts.append(0)\n    return tuple(parts)\n\n\ndef bounds_pre_tool_call():\n    """Whether this Hermes abandons a slow pre_tool_call callback.\n\n    The timeout was added after 0.20.5, which runs plugin hooks to completion.\n    Clamping the wait on a host that would never have cut it off just shortens\n    the window the user has to answer, for nothing.\n\n    Unreadable means assume bounded. A wait that is shorter than it had to be\n    costs the user seconds; a wait longer than the host allows costs them the\n    answer they already gave.\n\n    That rule is why the private symbol is not asked on its own. `hasattr` on\n    `_HOOK_TIMEOUT_FAIL_CLOSED_HOOKS` cannot tell "this host runs hooks to\n    completion" apart from "the private name moved", and those two answers want\n    opposite behaviour: the first earns the full window, the second spends 55\n    seconds against a budget of 30 and loses an answer the user already gave.\n    A rename is the likelier of the two, because a private name is the one thing\n    a host is free to change. So the symbol is taken as proof of bounded, and\n    only a version this side of the timeout landing is taken as proof of the\n    other. Anything unreadable falls to bounded.\n    """\n    try:\n        from hermes_cli import plugins\n    except Exception:\n        return True\n    if hasattr(plugins, "_HOOK_TIMEOUT_FAIL_CLOSED_HOOKS"):\n        return True\n    version = _hermes_version()\n    if version is None:\n        return True\n    return version > UNBOUNDED_THROUGH_VERSION\n\n\ndef hook_callback_timeout_seconds():\n    raw = _section(_config(), "plugins").get("hook_callback_timeout")\n    if raw is None:\n        return HOOK_TIMEOUT_DEFAULT_SECONDS\n    try:\n        timeout = float(raw)\n    except (TypeError, ValueError):\n        return HOOK_TIMEOUT_DEFAULT_SECONDS\n    if timeout < 0:\n        return HOOK_TIMEOUT_DEFAULT_SECONDS\n    return min(timeout, HOOK_TIMEOUT_MAX_SECONDS)\n\n\ndef gate_budget_seconds(requested_seconds):\n    if not bounds_pre_tool_call():\n        return max(1.0, min(float(requested_seconds), GATE_MAX_SECONDS))\n    timeout = hook_callback_timeout_seconds()\n    ceiling = (\n        GATE_MAX_SECONDS\n        if timeout <= 0\n        else max(GATE_MIN_SECONDS, timeout - GATE_HEADROOM_SECONDS)\n    )\n    return max(1.0, min(float(requested_seconds), ceiling, GATE_MAX_SECONDS))\n\n\ndef pushary_is_selected_transport():\n    selected = _section(_config(), "security", "approval").get("transport")\n    return str(selected or "").strip().lower() == TRANSPORT_NAME\n' },
   { path: "identity.py", contents: 'import hashlib\nimport os\nimport re\nimport socket\nfrom pathlib import Path\n\nDEFAULT_AGENT_NAME = "Hermes"\nMAX_ID_LENGTH = 128\nSHARED_MACHINE_ID_FILE = Path.home() / ".pushary" / "machine-id"\nSHARED_MACHINE_ID_PATTERN = re.compile(r"^[A-Za-z0-9-]{1,128}$")\n\n_session_id = None\n\n\ndef agent_name():\n    return os.environ.get("PUSHARY_AGENT_NAME", DEFAULT_AGENT_NAME)\n\n\ndef labelled_agent_name(requested):\n    project = str(requested or "").partition(" - ")[2].strip()\n    return f"{agent_name()} - {project}" if project else agent_name()\n\n\ndef shared_machine_id(path=None):\n    try:\n        value = (path or SHARED_MACHINE_ID_FILE).read_text(encoding="utf-8").strip()\n    except OSError:\n        return None\n    return value if SHARED_MACHINE_ID_PATTERN.match(value) else None\n\n\ndef hostname_machine_id():\n    try:\n        host = socket.gethostname()\n    except Exception:\n        return None\n    if not host:\n        return None\n    return hashlib.sha256(host.encode("utf-8")).hexdigest()[:8]\n\n\ndef machine_id():\n    return shared_machine_id() or hostname_machine_id()\n\n\ndef remember_session(value):\n    global _session_id\n    if value:\n        _session_id = str(value)[:MAX_ID_LENGTH]\n\n\ndef forget_session():\n    global _session_id\n    _session_id = None\n\n\ndef session_id():\n    return _session_id\n' },
   { path: "installation.py", contents: `import json
@@ -1063,7 +1321,7 @@ def record_plugin_load(approval_transport_registered, home=None, pid=None, now=N
         logger.debug("[pushary] could not record the plugin load: %s", exc)
         return None
 ` },
-  { path: "plugin.yaml", contents: "name: pushary\nversion: 0.8.1\ndescription: Push notifications and human-in-the-loop for Hermes Agent via Pushary\nauthor: RalphNex OU\nrequires_env:\n  - name: PUSHARY_API_KEY\n    description: Your Pushary API key\n    url: https://pushary.com/sign-up?from=hermes\n    secret: true\nprovides_tools:\n  - pushary_remind\n  - pushary_notify\n  - pushary_ask\n  - pushary_wait\n  - pushary_cancel\n  - pushary_propose_scope\n  - pushary_enroll\n  - pushary_ask_end_user\nprovides_hooks:\n  - pre_llm_call\n  - pre_tool_call\n  - post_tool_call\n  - on_session_start\n  - on_session_end\n  - on_session_finalize\nprovides_approval_transports:\n  - pushary\n" },
+  { path: "plugin.yaml", contents: "name: pushary\nversion: 0.9.0\ndescription: Push notifications and human-in-the-loop for Hermes Agent via Pushary\nauthor: RalphNex OU\nrequires_env:\n  - name: PUSHARY_API_KEY\n    description: Your Pushary API key\n    url: https://pushary.com/sign-up?from=hermes\n    secret: true\nprovides_tools:\n  - pushary_remind\n  - pushary_notify\n  - pushary_ask\n  - pushary_wait\n  - pushary_cancel\n  - pushary_propose_scope\n  - pushary_enroll\n  - pushary_ask_end_user\nprovides_hooks:\n  - pre_llm_call\n  - pre_tool_call\n  - post_tool_call\n  - on_session_start\n  - on_session_end\n  - on_session_finalize\nprovides_approval_transports:\n  - pushary\n" },
   { path: "schemas.py", contents: `PUSHARY_REMIND = {
     "name": "pushary_remind",
     "description": "Schedule a one-time personal reminder on Pushary, even after Hermes exits. Use body plus in_minutes or at (ISO timestamp with explicit UTC offset, within 30 days). Never guess the user's timezone. Confirm the returned time. No arguments lists pending reminders; cancel_reminder_id cancels a scheduled one. Use Hermes cron for agent work; use this for reminding the operator.",
@@ -1670,6 +1928,8 @@ var HERMES_INSTALL_MARKER_OWNER = "pushary";
 var HERMES_LOAD_RECORDS_PATH = "plugin-data/pushary/loaded";
 var HERMES_LEGACY_PIP_PACKAGE = "hermes-plugin-pushary";
 var HERMES_QUESTION_TOOLSET = "clarify";
+var HERMES_PLUGINS_SECTION = "plugins";
+var HERMES_APPROVAL_SECTION = "security.approval";
 var HERMES_APPROVAL_TRANSPORT_KEY = "security.approval.transport";
 var HERMES_APPROVAL_FALLBACK_KEY = "security.approval.transport_fallback";
 var HERMES_PLUGINS_ENABLED_KEY = "plugins.enabled";
@@ -1707,15 +1967,113 @@ var shippedHermesPlugin = (files = HERMES_PLUGIN_FILES) => {
 };
 
 // src/hermes/runtime.ts
-import { execFileSync } from "child_process";
+import { execFile } from "child_process";
 import { accessSync, closeSync, constants, existsSync, mkdirSync, openSync, readFileSync, readSync, renameSync, rmSync, statSync, writeFileSync } from "fs";
 import { homedir } from "os";
 import { basename, dirname, isAbsolute, join } from "path";
+import { promisify } from "util";
+
+// src/hermes/setup-receipt.ts
+var HERMES_SETUP_RECEIPT_VERSION = 2;
+var settingSnapshot = (key, reading) => reading.kind === "set" ? { key, wasSet: true, before: reading.value } : { key, wasSet: false, before: null };
+var isSettingSnapshot = (value) => isRecord(value) && typeof value.key === "string" && typeof value.wasSet === "boolean" && Object.hasOwn(value, "before");
+var parseCurrentReceipt = (value) => {
+  const { settings, pluginWasEnabled, questionRoutingAdded } = value;
+  if (!Array.isArray(settings) || !settings.every(isSettingSnapshot)) return null;
+  if (typeof pluginWasEnabled !== "boolean" || typeof questionRoutingAdded !== "boolean") return null;
+  return { settings, pluginWasEnabled, questionRoutingAdded };
+};
+var LEGACY_SNAPSHOT_KEYS = ["security", "approval", "transport", "fallback", "plugins", "enabled", "agent", "disabled"];
+var isLegacySnapshot = (value) => isRecord(value) && typeof value.present === "boolean" && Object.hasOwn(value, "value");
+var legacySetting = (key, snapshot) => ({ key, wasSet: snapshot.present, before: snapshot.present ? snapshot.value : null });
+var parseLegacyReceipt = (value) => {
+  if (!LEGACY_SNAPSHOT_KEYS.every((key) => isLegacySnapshot(value[key]))) return null;
+  if (typeof value.pushary_enabled !== "boolean" || typeof value.clarify_disabled !== "boolean") return null;
+  const transport = value.transport;
+  const fallback = value.fallback;
+  if (!isLegacySnapshot(transport) || !isLegacySnapshot(fallback)) return null;
+  return {
+    settings: [legacySetting(HERMES_APPROVAL_TRANSPORT_KEY, transport), legacySetting(HERMES_APPROVAL_FALLBACK_KEY, fallback)],
+    pluginWasEnabled: value.pushary_enabled,
+    questionRoutingAdded: !value.clarify_disabled
+  };
+};
+var parseHermesSetupReceipt = (value) => {
+  if (!isRecord(value)) return null;
+  return value.version === HERMES_SETUP_RECEIPT_VERSION ? parseCurrentReceipt(value) : parseLegacyReceipt(value);
+};
+var serializeHermesSetupReceipt = (receipt) => ({ version: HERMES_SETUP_RECEIPT_VERSION, ...receipt });
+var receiptWithoutSnapshots = () => ({
+  settings: [
+    { key: HERMES_APPROVAL_TRANSPORT_KEY, wasSet: false, before: null },
+    { key: HERMES_APPROVAL_FALLBACK_KEY, wasSet: false, before: null }
+  ],
+  pluginWasEnabled: false,
+  questionRoutingAdded: false
+});
+var receiptAfterQuestionRoutingReturned = (receipt) => ({ ...receipt, questionRoutingAdded: false });
+var PUSHARY_VALUES = {
+  [HERMES_APPROVAL_TRANSPORT_KEY]: HERMES_PUSHARY_TRANSPORT,
+  [HERMES_APPROVAL_FALLBACK_KEY]: HERMES_PUSHARY_FALLBACK
+};
+var hermesSettingRestore = (snapshot, current) => {
+  const ours = PUSHARY_VALUES[snapshot.key];
+  const stillOurs = current.kind === "set" && current.value === ours;
+  const oursBeforeSetup = snapshot.wasSet && snapshot.before === ours;
+  return stillOurs && !oursBeforeSetup ? { kind: "restore", key: snapshot.key, snapshot } : { kind: "leave", key: snapshot.key };
+};
+var sameSettingValue = (left, right) => JSON.stringify(left) === JSON.stringify(right);
+
+// src/hermes/config-sections.ts
+var HERMES_CONFIG_SECTION_KEYS = [HERMES_PLUGINS_SECTION, HERMES_APPROVAL_SECTION, HERMES_DISABLED_TOOLSETS_KEY];
+var HERMES_SNAPSHOT_KEYS = [HERMES_APPROVAL_TRANSPORT_KEY, HERMES_APPROVAL_FALLBACK_KEY];
+var KEY_SEPARATOR = ".";
+var UNSET = { kind: "unset" };
+var childReading = (reading, name) => reading.kind === "set" && isRecord(reading.value) && Object.hasOwn(reading.value, name) ? { kind: "set", value: reading.value[name] } : UNSET;
+var sectionHolding = (key) => HERMES_CONFIG_SECTION_KEYS.find((section) => key === section || key.startsWith(`${section}${KEY_SEPARATOR}`)) ?? null;
+var readingFromSections = (sections, key) => {
+  const section = sectionHolding(key);
+  if (section === null) return null;
+  const path = key === section ? [] : key.slice(section.length + KEY_SEPARATOR.length).split(KEY_SEPARATOR);
+  return path.reduce(childReading, sections[section]);
+};
+var stringList = (value) => Array.isArray(value) ? value.filter((item) => typeof item === "string") : [];
+var readingValue = (reading) => reading.kind === "set" ? reading.value : void 0;
+var stringOrNull = (value) => typeof value === "string" ? value : null;
+var hermesSettingsFrom = (sections) => {
+  const plugins = readingValue(sections[HERMES_PLUGINS_SECTION]);
+  const approval = readingValue(sections[HERMES_APPROVAL_SECTION]);
+  const enabled = isRecord(plugins) ? stringList(plugins.enabled) : [];
+  const disabled = isRecord(plugins) ? stringList(plugins.disabled) : [];
+  return {
+    pluginEnabled: enabled.includes(HERMES_PLUGIN_KEY),
+    pluginDisabled: disabled.includes(HERMES_PLUGIN_KEY),
+    approvalTransport: isRecord(approval) ? stringOrNull(approval.transport) : null,
+    approvalFallback: isRecord(approval) ? stringOrNull(approval.transport_fallback) : null,
+    disabledToolsets: stringList(readingValue(sections[HERMES_DISABLED_TOOLSETS_KEY]))
+  };
+};
+var pluginNeedsEnabling = (settings) => !settings.pluginEnabled || settings.pluginDisabled;
+var snapshotFrom = (sections) => (key) => {
+  const reading = readingFromSections(sections, key);
+  return reading === null ? null : settingSnapshot(key, reading);
+};
+var isSnapshot = (snapshot) => snapshot !== null;
+var setupReceiptFrom = (sections) => {
+  const snapshots = HERMES_SNAPSHOT_KEYS.map(snapshotFrom(sections));
+  if (!snapshots.every(isSnapshot)) return null;
+  return { settings: snapshots, pluginWasEnabled: hermesSettingsFrom(sections).pluginEnabled, questionRoutingAdded: false };
+};
+var holdsValue = (reading, value) => reading?.kind === "set" && reading.value === value;
+var pusharySettingsToWrite = (sections) => HERMES_PUSHARY_SETTINGS.filter((setting) => !holdsValue(sections === null ? null : readingFromSections(sections, setting.key), setting.value));
+
+// src/hermes/runtime.ts
 var HERMES_COMMAND_TIMEOUT_MS = 2e4;
+var HERMES_PLUGIN_COMMAND_TIMEOUT_MS = 18e4;
+var HERMES_OUTPUT_LIMIT_BYTES = 1024 * 1024;
 var LEGACY_PIP_TIMEOUT_MS = 6e4;
+var PIP_UNINSTALLED = "Successfully uninstalled";
 var HERMES_SETTING_NOT_SET = "Config key not set";
-var HERMES_PLUGINS_SECTION = "plugins";
-var HERMES_APPROVAL_SECTION = "security.approval";
 var INSTALL_METADATA_FILE = ".install-metadata.json";
 var GATEWAY_STATE_FILE = "gateway_state.json";
 var GATEWAY_PID_FILE = "gateway.pid";
@@ -1743,22 +2101,26 @@ var commandOutput = (error) => {
   if (!isRecord(error)) return String(error);
   return [error.stdout, error.stderr].map((part) => part === void 0 || part === null ? "" : String(part)).join("\n");
 };
-var runHermesCommand = (launcher, args) => {
+var stoppedAtTimeout = (error) => isRecord(error) && error.killed === true;
+var runFileAsync = promisify(execFile);
+var runHermesCommand = async (launcher, args, timeoutMs = HERMES_COMMAND_TIMEOUT_MS) => {
   const shell = needsShell(launcher.path);
   try {
-    const stdout = execFileSync(
+    const running = runFileAsync(
       shell ? quotedForWindowsShell(launcher.path) : launcher.path,
       shell ? args.map(quotedForWindowsShell) : [...args],
-      { encoding: "utf-8", stdio: ["ignore", "pipe", "pipe"], timeout: HERMES_COMMAND_TIMEOUT_MS, shell }
+      { encoding: "utf-8", timeout: timeoutMs, maxBuffer: HERMES_OUTPUT_LIMIT_BYTES, shell, windowsHide: true }
     );
+    running.child.stdin?.end();
+    const { stdout } = await running;
     return { kind: "ok", stdout };
   } catch (error) {
-    return { kind: "failed", output: commandOutput(error) };
+    return { kind: "failed", output: commandOutput(error), timedOut: stoppedAtTimeout(error) };
   }
 };
 var lastLine = (output) => output.trim().split(/\r?\n/).filter((line) => line.trim().length > 0).at(-1)?.trim() ?? "";
-var readHermesHome = (launcher) => {
-  const result = runHermesCommand(launcher, ["config", "path"]);
+var readHermesHome = async (launcher) => {
+  const result = await runHermesCommand(launcher, ["config", "path"]);
   if (result.kind !== "ok") return null;
   const configPath = lastLine(result.stdout);
   return isAbsolute(configPath) ? dirname(configPath) : null;
@@ -1770,42 +2132,35 @@ var parsedJson = (text) => {
     return { ok: false };
   }
 };
-var readHermesSetting = (launcher, key) => {
-  const result = runHermesCommand(launcher, ["config", "get", key, "--json"]);
+var readHermesSetting = async (launcher, key) => {
+  const result = await runHermesCommand(launcher, ["config", "get", key, "--json"]);
   if (result.kind === "failed") return result.output.includes(HERMES_SETTING_NOT_SET) ? { kind: "unset" } : null;
   const parsed = parsedJson(lastLine(result.stdout));
   return parsed.ok ? { kind: "set", value: parsed.value } : null;
 };
 var settingArgument = (value) => typeof value === "string" ? value : JSON.stringify(value);
-var writeHermesSetting = (launcher, key, value) => runHermesCommand(launcher, ["config", "set", key, settingArgument(value)]).kind === "ok";
-var unsetHermesSetting = (launcher, key) => {
-  const result = runHermesCommand(launcher, ["config", "unset", key]);
+var writeHermesSetting = async (launcher, key, value) => (await runHermesCommand(launcher, ["config", "set", key, settingArgument(value)])).kind === "ok";
+var unsetHermesSetting = async (launcher, key) => {
+  const result = await runHermesCommand(launcher, ["config", "unset", key]);
   return result.kind === "ok" || result.output.includes(HERMES_SETTING_NOT_SET);
 };
-var enableHermesPlugin = (launcher) => runHermesCommand(launcher, ["plugins", "enable", HERMES_PLUGIN_KEY]).kind === "ok";
-var disableHermesPlugin = (launcher) => runHermesCommand(launcher, ["plugins", "disable", HERMES_PLUGIN_KEY]).kind === "ok";
-var removeHermesPlugin = (launcher) => runHermesCommand(launcher, ["plugins", "remove", HERMES_PLUGIN_KEY]).kind === "ok";
-var stringList = (value) => Array.isArray(value) ? value.filter((item) => typeof item === "string") : [];
-var readingValue = (reading) => reading.kind === "set" ? reading.value : void 0;
-var stringOrNull = (value) => typeof value === "string" ? value : null;
-var readHermesSettings = (launcher) => {
-  const plugins = readHermesSetting(launcher, HERMES_PLUGINS_SECTION);
-  const approval = readHermesSetting(launcher, HERMES_APPROVAL_SECTION);
-  const toolsets = readHermesSetting(launcher, HERMES_DISABLED_TOOLSETS_KEY);
-  if (!plugins || !approval || !toolsets) return null;
-  const pluginSection = readingValue(plugins);
-  const approvalSection = readingValue(approval);
-  const enabled = isRecord(pluginSection) ? stringList(pluginSection.enabled) : [];
-  const disabled = isRecord(pluginSection) ? stringList(pluginSection.disabled) : [];
-  return {
-    pluginEnabled: enabled.includes(HERMES_PLUGIN_KEY),
-    pluginDisabled: disabled.includes(HERMES_PLUGIN_KEY),
-    approvalTransport: isRecord(approvalSection) ? stringOrNull(approvalSection.transport) : null,
-    approvalFallback: isRecord(approvalSection) ? stringOrNull(approvalSection.transport_fallback) : null,
-    disabledToolsets: stringList(readingValue(toolsets))
-  };
+var runHermesPluginCommand = (launcher, verb) => runHermesCommand(launcher, ["plugins", verb, HERMES_PLUGIN_KEY], HERMES_PLUGIN_COMMAND_TIMEOUT_MS);
+var pluginCommandSucceeded = async (launcher, verb) => (await runHermesPluginCommand(launcher, verb)).kind === "ok";
+var pluginEnablingFrom = (result) => {
+  if (result.kind === "ok") return "enabled";
+  return result.timedOut ? "timed_out" : "refused";
+};
+var enableHermesPlugin = async (launcher) => pluginEnablingFrom(await runHermesPluginCommand(launcher, "enable"));
+var disableHermesPlugin = (launcher) => pluginCommandSucceeded(launcher, "disable");
+var removeHermesPlugin = (launcher) => pluginCommandSucceeded(launcher, "remove");
+var readHermesConfigSections = async (launcher) => {
+  const [plugins, approval, disabledToolsets] = await Promise.all([
+    readHermesSetting(launcher, HERMES_PLUGINS_SECTION),
+    readHermesSetting(launcher, HERMES_APPROVAL_SECTION),
+    readHermesSetting(launcher, HERMES_DISABLED_TOOLSETS_KEY)
+  ]);
+  return plugins && approval && disabledToolsets ? { [HERMES_PLUGINS_SECTION]: plugins, [HERMES_APPROVAL_SECTION]: approval, [HERMES_DISABLED_TOOLSETS_KEY]: disabledToolsets } : null;
 };
-var HERMES_SNAPSHOT_KEYS = [HERMES_APPROVAL_TRANSPORT_KEY, HERMES_APPROVAL_FALLBACK_KEY];
 var hermesPluginDirectory = (home) => join(home, "plugins", HERMES_PLUGIN_KEY);
 var HERMES_ROOT_DIRECTORY = ".hermes";
 var HERMES_CONFIG_FILE = "config.yaml";
@@ -1945,10 +2300,16 @@ var legacyHermesPython = (launcher) => {
     return null;
   }
 };
-var removeLegacyPipCopy = (python, distribution) => {
+var removeLegacyPipCopy = async (python, distribution) => {
   try {
-    execFileSync(python, ["-m", "pip", "uninstall", "-y", distribution], { stdio: "ignore", timeout: LEGACY_PIP_TIMEOUT_MS });
-    return true;
+    const running = runFileAsync(
+      python,
+      ["-m", "pip", "uninstall", "-y", distribution],
+      { encoding: "utf-8", timeout: LEGACY_PIP_TIMEOUT_MS, maxBuffer: HERMES_OUTPUT_LIMIT_BYTES, windowsHide: true }
+    );
+    running.child.stdin?.end();
+    const { stdout } = await running;
+    return stdout.includes(PIP_UNINSTALLED);
   } catch {
     return false;
   }
@@ -2029,72 +2390,25 @@ var toolsetsWithoutPusharyQuestionRouting = (disabledToolsets, questionRoutingAd
 
 // src/hermes/install.ts
 import { existsSync as existsSync2, rmSync as rmSync2 } from "fs";
-
-// src/hermes/setup-receipt.ts
-var HERMES_SETUP_RECEIPT_VERSION = 2;
-var settingSnapshot = (key, reading) => reading.kind === "set" ? { key, wasSet: true, before: reading.value } : { key, wasSet: false, before: null };
-var isSettingSnapshot = (value) => isRecord(value) && typeof value.key === "string" && typeof value.wasSet === "boolean" && Object.hasOwn(value, "before");
-var parseCurrentReceipt = (value) => {
-  const { settings, pluginWasEnabled, questionRoutingAdded } = value;
-  if (!Array.isArray(settings) || !settings.every(isSettingSnapshot)) return null;
-  if (typeof pluginWasEnabled !== "boolean" || typeof questionRoutingAdded !== "boolean") return null;
-  return { settings, pluginWasEnabled, questionRoutingAdded };
-};
-var LEGACY_SNAPSHOT_KEYS = ["security", "approval", "transport", "fallback", "plugins", "enabled", "agent", "disabled"];
-var isLegacySnapshot = (value) => isRecord(value) && typeof value.present === "boolean" && Object.hasOwn(value, "value");
-var legacySetting = (key, snapshot) => ({ key, wasSet: snapshot.present, before: snapshot.present ? snapshot.value : null });
-var parseLegacyReceipt = (value) => {
-  if (!LEGACY_SNAPSHOT_KEYS.every((key) => isLegacySnapshot(value[key]))) return null;
-  if (typeof value.pushary_enabled !== "boolean" || typeof value.clarify_disabled !== "boolean") return null;
-  const transport = value.transport;
-  const fallback = value.fallback;
-  if (!isLegacySnapshot(transport) || !isLegacySnapshot(fallback)) return null;
-  return {
-    settings: [legacySetting(HERMES_APPROVAL_TRANSPORT_KEY, transport), legacySetting(HERMES_APPROVAL_FALLBACK_KEY, fallback)],
-    pluginWasEnabled: value.pushary_enabled,
-    questionRoutingAdded: !value.clarify_disabled
-  };
-};
-var parseHermesSetupReceipt = (value) => {
-  if (!isRecord(value)) return null;
-  return value.version === HERMES_SETUP_RECEIPT_VERSION ? parseCurrentReceipt(value) : parseLegacyReceipt(value);
-};
-var serializeHermesSetupReceipt = (receipt) => ({ version: HERMES_SETUP_RECEIPT_VERSION, ...receipt });
-var receiptWithoutSnapshots = () => ({
-  settings: [
-    { key: HERMES_APPROVAL_TRANSPORT_KEY, wasSet: false, before: null },
-    { key: HERMES_APPROVAL_FALLBACK_KEY, wasSet: false, before: null }
-  ],
-  pluginWasEnabled: false,
-  questionRoutingAdded: false
-});
-var receiptAfterQuestionRoutingReturned = (receipt) => ({ ...receipt, questionRoutingAdded: false });
-var PUSHARY_VALUES = {
-  [HERMES_APPROVAL_TRANSPORT_KEY]: HERMES_PUSHARY_TRANSPORT,
-  [HERMES_APPROVAL_FALLBACK_KEY]: HERMES_PUSHARY_FALLBACK
-};
-var hermesSettingRestore = (snapshot, current) => {
-  const ours = PUSHARY_VALUES[snapshot.key];
-  const stillOurs = current.kind === "set" && current.value === ours;
-  const oursBeforeSetup = snapshot.wasSet && snapshot.before === ours;
-  return stillOurs && !oursBeforeSetup ? { kind: "restore", key: snapshot.key, snapshot } : { kind: "leave", key: snapshot.key };
-};
-var sameSettingValue = (left, right) => JSON.stringify(left) === JSON.stringify(right);
-
-// src/hermes/install.ts
 var RECEIPT_MODE = 384;
-var inspectWithLauncher = (launcher) => {
-  const home = readHermesHome(launcher);
-  const settings = home ? readHermesSettings(launcher) : null;
-  if (!home || !settings) return { kind: "unreadable", home };
+var inspectionFrom = (launcher, home, sections) => {
+  const settings = hermesSettingsFrom(sections);
   const folder = classifyHermesPluginFolder(readHermesPluginFolderFacts(home));
   const gateway = readHermesGateway(home);
   const gatewayLoad = gateway.kind === "running" ? readHermesLoadRecord(home, gateway.pid) : null;
   const state = hermesWiringState({ folder, settings, gateway, gatewayLoad });
   return { kind: "inspected", launcher, home, folder, settings, gateway, state };
 };
+var inspectAt = async (launcher, home) => {
+  const sections = await readHermesConfigSections(launcher);
+  return sections ? inspectionFrom(launcher, home, sections) : { kind: "unreadable", home };
+};
+var inspectWithLauncher = async (launcher) => {
+  const [home, sections] = await Promise.all([readHermesHome(launcher), readHermesConfigSections(launcher)]);
+  return home && sections ? inspectionFrom(launcher, home, sections) : { kind: "unreadable", home };
+};
 var findLauncherWhereHermesLives = () => existsSync2(defaultHermesHome()) ? findHermesLauncher() : null;
-var inspectHermesWiring = (launcher) => {
+var inspectHermesWiring = async (launcher) => {
   const resolved = launcher === void 0 ? findLauncherWhereHermesLives() : launcher;
   return resolved ? inspectWithLauncher(resolved) : { kind: "no_launcher" };
 };
@@ -2124,67 +2438,62 @@ var removeSetupReceipts = (receipts) => {
   rmSync2(receipts.receiptPath, { force: true });
   rmSync2(receipts.legacyReceiptPath, { force: true });
 };
-var snapshotSettings = (launcher) => {
-  const settings = readHermesSettings(launcher);
-  if (!settings) return null;
-  const snapshots = [];
-  for (const key of HERMES_SNAPSHOT_KEYS) {
-    const reading = readHermesSetting(launcher, key);
-    if (!reading) return null;
-    snapshots.push(settingSnapshot(key, reading));
-  }
-  return {
-    settings: snapshots,
-    pluginWasEnabled: settings.pluginEnabled,
-    questionRoutingAdded: false
-  };
-};
-var ensureSetupReceipt = (launcher, receipts) => {
-  const existing = readSetupReceipt(receipts);
-  if (existing.kind === "invalid") return { kind: "failed", reason: "receipt_invalid" };
-  const receipt = existing.kind === "ok" ? existing.receipt : snapshotSettings(launcher);
+var ensureSetupReceipt = (receipts, existing, sections) => {
+  const receipt = existing.kind === "ok" ? existing.receipt : sections && setupReceiptFrom(sections);
   if (!receipt) return { kind: "failed", reason: "settings_unreadable" };
   if (!existsSync2(receipts.receiptPath)) writeSetupReceipt(receipts, receipt);
   return { kind: "ok", receipt };
 };
-var settingNeedsWrite = (launcher, key, value) => {
-  const current = readHermesSetting(launcher, key);
-  return !(current?.kind === "set" && current.value === value);
+var ENABLING_FAILURES = {
+  refused: "settings_failed",
+  timed_out: "plugin_load_timed_out"
+};
+var writeSettingsInTurn = async (launcher, settings) => {
+  for (const setting of settings) {
+    if (!await writeHermesSetting(launcher, setting.key, setting.value)) return false;
+  }
+  return true;
 };
-var applyPusharySettings = (launcher) => {
-  if (!enableHermesPlugin(launcher)) return false;
-  return HERMES_PUSHARY_SETTINGS.every((setting) => !settingNeedsWrite(launcher, setting.key, setting.value) || writeHermesSetting(launcher, setting.key, setting.value));
+var applyPusharySettings = async (launcher, sections) => {
+  const enabling = await enableHermesPlugin(launcher);
+  if (enabling !== "enabled") return { kind: "failed", reason: ENABLING_FAILURES[enabling] };
+  const writes = pusharySettingsToWrite(sections);
+  if (!await writeSettingsInTurn(launcher, writes)) return { kind: "failed", reason: "settings_failed" };
+  const enableChangedConfig = sections === null || pluginNeedsEnabling(hermesSettingsFrom(sections));
+  return { kind: "applied", changedHermes: enableChangedConfig || writes.length > 0 };
 };
-var writeListSetting = (launcher, key, list) => {
+var writeListSetting = async (launcher, key, list) => {
   if (list.length > 0) return writeHermesSetting(launcher, key, list);
-  if (!unsetHermesSetting(launcher, key)) return false;
-  const after = readHermesSetting(launcher, key);
+  if (!await unsetHermesSetting(launcher, key)) return false;
+  const after = await readHermesSetting(launcher, key);
   return after?.kind !== "set" || sameSettingValue(after.value, []) || writeHermesSetting(launcher, key, []);
 };
-var returnQuestionsToHermes = (launcher, receipt) => {
-  const toolsets = readHermesSetting(launcher, HERMES_DISABLED_TOOLSETS_KEY);
+var returnQuestionsToHermes = async (launcher, receipt) => {
+  const toolsets = await readHermesSetting(launcher, HERMES_DISABLED_TOOLSETS_KEY);
   if (!toolsets) return false;
   const current = toolsets.kind === "set" && Array.isArray(toolsets.value) ? toolsets.value.filter((item) => typeof item === "string") : [];
   const next = toolsetsWithoutPusharyQuestionRouting(current, receipt.questionRoutingAdded);
   return next === null || writeListSetting(launcher, HERMES_DISABLED_TOOLSETS_KEY, next);
 };
-var removeLegacyCopy = (launcher) => {
+var removeLegacyCopy = async (launcher) => {
   const python = legacyHermesPython(launcher);
   return python !== null && removeLegacyPipCopy(python, HERMES_LEGACY_PIP_PACKAGE);
 };
-var returnQuestionsIfThePluginRoutesThem = (launcher, home, receipts, receipt) => {
+var returnQuestionsIfThePluginRoutesThem = async (launcher, home, receipts, receipt) => {
   const folder = classifyHermesPluginFolder(readHermesPluginFolderFacts(home));
-  if (!receipt.questionRoutingAdded || !routesHermesQuestions(folder)) return true;
-  if (!returnQuestionsToHermes(launcher, receipt)) return false;
+  if (!receipt.questionRoutingAdded || !routesHermesQuestions(folder)) return "unchanged";
+  if (!await returnQuestionsToHermes(launcher, receipt)) return "failed";
   writeSetupReceipt(receipts, receiptAfterQuestionRoutingReturned(receipt));
-  return true;
+  return "returned";
 };
-var installHermesPlugin = (request) => {
+var installHermesPlugin = async (request) => {
   const launcher = request.launcher === void 0 ? findHermesLauncher() : request.launcher;
   if (!launcher) return { kind: "no_launcher" };
-  const home = readHermesHome(launcher);
+  const existingReceipt = readSetupReceipt(request.receipts);
+  if (existingReceipt.kind === "invalid") return { kind: "failed", reason: "receipt_invalid" };
+  const [home, sections] = await Promise.all([readHermesHome(launcher), readHermesConfigSections(launcher)]);
   if (!home) return { kind: "failed", reason: "home_unknown" };
-  const ensured = ensureSetupReceipt(launcher, request.receipts);
+  const ensured = ensureSetupReceipt(request.receipts, existingReceipt, sections);
   if (ensured.kind === "failed") return ensured;
   const folder = classifyHermesPluginFolder(readHermesPluginFolderFacts(home));
   if (folder.kind === "unknown") return { kind: "failed", reason: "plugin_folder_not_ours" };
@@ -2196,12 +2505,14 @@ var installHermesPlugin = (request) => {
       return { kind: "failed", reason: "plugin_write_failed" };
     }
   }
-  if (!applyPusharySettings(launcher)) return { kind: "failed", reason: "settings_failed" };
-  if (!returnQuestionsIfThePluginRoutesThem(launcher, home, request.receipts, ensured.receipt)) {
-    return { kind: "failed", reason: "settings_failed" };
-  }
-  const legacyCopyRemoved = removeLegacyCopy(launcher);
-  return { kind: "installed", folderWritten, legacyCopyRemoved, inspection: inspectWithLauncher(launcher) };
+  const applied = await applyPusharySettings(launcher, sections);
+  if (applied.kind === "failed") return { kind: "failed", reason: applied.reason };
+  const questions = await returnQuestionsIfThePluginRoutesThem(launcher, home, request.receipts, ensured.receipt);
+  if (questions === "failed") return { kind: "failed", reason: "settings_failed" };
+  const legacyCopyRemoved = await removeLegacyCopy(launcher);
+  const configUnchanged = !applied.changedHermes && questions === "unchanged";
+  const inspection = sections !== null && configUnchanged ? inspectionFrom(launcher, home, sections) : await inspectAt(launcher, home);
+  return { kind: "installed", folderWritten, legacyCopyRemoved, inspection };
 };
 var refreshHermesPluginFiles = (installedBy, plugin, home = defaultHermesHome()) => {
   const folder = classifyHermesPluginFolder(readHermesPluginFolderFacts(home));
@@ -2215,9 +2526,9 @@ var refreshHermesPluginFiles = (installedBy, plugin, home = defaultHermesHome())
   }
 };
 var macAppOwnsHermes = (folder, request) => hermesWiringOwner(folder, existsSync2(request.macAppWiringRecord)) === "mac_app";
-var removePluginEntry = (launcher, settings) => {
-  if (!settings.pluginEnabled || disableHermesPlugin(launcher)) return true;
-  const enabled = readHermesSetting(launcher, HERMES_PLUGINS_ENABLED_KEY);
+var removePluginEntry = async (launcher, settings) => {
+  if (!settings.pluginEnabled || await disableHermesPlugin(launcher)) return true;
+  const enabled = await readHermesSetting(launcher, HERMES_PLUGINS_ENABLED_KEY);
   const list = enabled?.kind === "set" && Array.isArray(enabled.value) ? enabled.value : [];
   return writeListSetting(
     launcher,
@@ -2225,32 +2536,38 @@ var removePluginEntry = (launcher, settings) => {
     list.filter((item) => typeof item === "string" && item !== HERMES_PLUGIN_KEY)
   );
 };
-var removePushPlugin = (launcher, home, folder, settings, receipt) => {
-  removeLegacyCopy(launcher);
+var removePushPlugin = async (launcher, home, folder, settings, receipt) => {
+  await removeLegacyCopy(launcher);
   if (folder.kind === "pushary") {
-    if (removeHermesPlugin(launcher)) return true;
+    if (await removeHermesPlugin(launcher)) return true;
     rmSync2(hermesPluginDirectory(home), { recursive: true, force: true });
     return removePluginEntry(launcher, settings);
   }
   return receipt.pluginWasEnabled || removePluginEntry(launcher, settings);
 };
-var restoreSetting = (launcher, snapshot) => {
-  const current = readHermesSetting(launcher, snapshot.key);
+var restoreSetting = async (launcher, snapshot) => {
+  const current = await readHermesSetting(launcher, snapshot.key);
   if (!current) return false;
   if (hermesSettingRestore(snapshot, current).kind === "leave") return true;
-  if (!unsetHermesSetting(launcher, snapshot.key)) return false;
+  if (!await unsetHermesSetting(launcher, snapshot.key)) return false;
   if (!snapshot.wasSet) return true;
-  const after = readHermesSetting(launcher, snapshot.key);
+  const after = await readHermesSetting(launcher, snapshot.key);
   return after?.kind === "set" && sameSettingValue(after.value, snapshot.before) ? true : writeHermesSetting(launcher, snapshot.key, snapshot.before);
 };
 var macAppOwnsTheFolderOnDisk = (request) => macAppOwnsHermes(classifyHermesPluginFolder(readHermesPluginFolderFacts(request.home ?? defaultHermesHome())), request);
-var removeHermesWiring = (request) => {
+var restoreSettingsInTurn = async (launcher, snapshots) => {
+  for (const snapshot of snapshots) {
+    if (!await restoreSetting(launcher, snapshot)) return false;
+  }
+  return true;
+};
+var removeHermesWiring = async (request) => {
   if (request.keepMacAppWiring && macAppOwnsTheFolderOnDisk(request)) return { kind: "kept_for_mac_app" };
   const receiptRead = readSetupReceipt(request.receipts);
   const launcher = request.launcher === void 0 ? receiptRead.kind === "missing" ? findLauncherWhereHermesLives() : findHermesLauncher() : request.launcher;
   if (!launcher) return receiptRead.kind === "missing" ? { kind: "not_found" } : { kind: "runtime_missing" };
   if (receiptRead.kind === "invalid") return { kind: "failed", step: "receipt_invalid" };
-  const inspection = inspectWithLauncher(launcher);
+  const inspection = await inspectWithLauncher(launcher);
   if (inspection.kind !== "inspected") {
     return receiptRead.kind === "missing" ? { kind: "not_found" } : { kind: "failed", step: "home_unknown" };
   }
@@ -2259,8 +2576,8 @@ var removeHermesWiring = (request) => {
   if (state.kind === "not_wired" && receiptRead.kind === "missing") return { kind: "not_found" };
   const receipt = receiptRead.kind === "ok" ? receiptRead.receipt : receiptWithoutSnapshots();
   if (request.dryRun) return { kind: "removed", pluginRemoved: folder.kind === "pushary", settingsRestored: true, dryRun: true };
-  if (!removePushPlugin(launcher, home, folder, settings, receipt)) return { kind: "failed", step: "plugin" };
-  const settingsRestored = receipt.settings.every((snapshot) => restoreSetting(launcher, snapshot)) && returnQuestionsToHermes(launcher, receipt);
+  if (!await removePushPlugin(launcher, home, folder, settings, receipt)) return { kind: "failed", step: "plugin" };
+  const settingsRestored = await restoreSettingsInTurn(launcher, receipt.settings) && await returnQuestionsToHermes(launcher, receipt);
   if (!settingsRestored) return { kind: "failed", step: "settings" };
   removeSetupReceipts(request.receipts);
   return { kind: "removed", pluginRemoved: folder.kind === "pushary", settingsRestored, dryRun: false };