Merge remote-tracking branch 'origin/master' into update/docker-ecosystems-20260908

scripts/agent-health-check.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 """
-/root/scripts/agent-health-check.py — Consolidated Agent Health Verification v2
+/root/scripts/agent-health-check.py — Consolidated Agent Health Verification v4
 
 Verifies: LiteLLM keys (agent-specific), GPU port conflicts, agent Zulip streaming,
 gateway liveness, gateway log health, CT liveness, config YAML integrity,
@@ -17,11 +17,42 @@ Changelog:
   v2 (2026-07-26): Added CT liveness, config validation, wrapper integrity,
     vault secret emptiness check. Fixed Koby/Koonimo SSH hosts and agent key
     name format ({NAME}_LITELLM_API_KEY not LITELLM_API_KEY_{NAME}).
-    Fleet roster: tanko (.122), mumuni (.24, inside abiba CT100), koby (.129), koonimo (.114),
-    abiba (.24).
+    Fleet roster: tanko (.122), koby (.129), koonimo (.114), abiba (.24).
+    (v2 also carried a mumuni probe; see v5 — mumuni is no longer probed: she
+    moved to her own container, kagentz CT 105 / .14, and is monitored there.)
+  v3 (2026-09-08): GPU unit repoint verified live (.8 llama-chat-api.service,
+    .110 llama-server.service, .15 strix-server.service) — .8 was probing a stale
+    llama-server unit that reads inactive, producing false UNREACHABLE legs.
+    systemctl is-active no longer swallows non-zero exit as SSH failure.
+    Fixed UnboundLocalError on the abiba/koonimo gateway leg (pid unbound in the
+    summary f-string). Abiba's LiteLLM key now comes from /root/.pi/agent/env.sh
+    (#735 agent separation; creds moved out of shared /root/.bashrc).
+  v4 (2026-09-10): probe-drift round 2 (prose-contracts follow-up to #65/#66/#68).
+    abiba declared pi-only runtime — Hermes-era config/wrapper/gateway checks are
+    skipped (harness purge). koby declared report_only per the captain's
+    2026-08-17 ruling: every koby leg is detected and reported, never counted as a
+    fleet failure and never repaired. koby's PVE mapping corrected to storepve
+    (CT 111 tdunna lives on .6 — the old amdpve mapping produced a false
+    ct-unreachable). The wrapper infisical-path check had two stale-expectation
+    bugs: it read only the first 20 lines of the wrapper, so koonimo (whose
+    wrapper does reference /usr/bin/infisical, just past line 20) was falsely
+    FAILed as "path may be wrong"; and it treated the absence of any infisical
+    reference as a fault, though koby's wrapper sources the key from
+    ~/.hermes/.env and never invokes infisical. The check now reads the full
+    wrapper body, accepts a no-infisical wrapper, and verifies that any absolute
+    infisical path the wrapper references actually exists. Report-only findings
+    are surfaced in a machine-readable `report_only` array in --json output,
+    separate from `failures`. Every run prints absolute execution provenance
+    (script + cwd) in the header, in the cron ALERT line, and in --json output so
+    a stale-consumer report is distinguishable from a fault at read time.
+  v5 (2026-09-10): roster correction only, no behavior change. mumuni was removed
+    from the AGENTS dict when she moved off this host onto her own container
+    (kagentz CT 105 on minipve, .14, dedicated `hermes` user) and is monitored
+    from her side. This script must not probe mumuni or .24 — the v2 changelog
+    roster line was the last reference still placing her at .24 / CT100.
 """
 
-import subprocess, json, sys, os, time
+import subprocess, json, sys, os, time, re, io, contextlib
 from datetime import datetime
 
 LITELLM = "http://192.168.68.116:80"
@@ -40,18 +71,55 @@ PVE_NODES = {
 # Agent definitions: ct, host, user, pve_node, vault_key_name
 AGENTS = {
     "tanko":   {"ct": 112, "host": "192.168.68.122", "user": "jerome", "pve": "amdpve",  "vault_key": "TANKO_LITELLM_API_KEY", "runtime": "dsh"},
-    "abiba":   {"ct": 100, "host": "192.168.68.24",  "user": "root",   "pve": "minipve",  "vault_key": None},  # Pi agent + Mumuni Zulip, no vault key
-    "koby":    {"ct": 111, "host": "192.168.68.129", "user": "root",   "pve": "amdpve",  "vault_key": "KOBY_LITELLM_API_KEY"},
+    # abiba = pi agent (.24) — no vault key; its LiteLLM key is read from its
+    # local env file (key_env below), not from the shared vault or .bashrc.
+    # runtime=pi: abiba has run pi-only since the harness purge. There is no
+    # Hermes gateway, no ~/.hermes/config.yaml and no hermes CLI wrapper on .24
+    # (the /root/.local/bin/hermes symlink is dangling), so the Hermes-era
+    # config/wrapper/gateway legs are skipped rather than reported as faults.
+    "abiba":   {"ct": 100, "host": "192.168.68.24", "user": "root", "pve": "minipve",
+               "vault_key": None, "runtime": "pi",
+               "key_env": {"file": "/root/.pi/agent/env.sh", "var": "LITELLM_API_KEY"}},
+    # koby = report-only (captain's 2026-08-17 ruling, Rule 17): detect and
+    # report, NEVER repair, and never count against fleet failures. CT 111
+    # (tdunna) lives on storepve (.6) — verified live 2026-09-10; the previous
+    # amdpve mapping made `pct status 111` fail and read as ct-unreachable.
+    "koby":    {"ct": 111, "host": "192.168.68.129", "user": "root",   "pve": "storepve", "vault_key": "KOBY_LITELLM_API_KEY", "report_only": True},
     "koonimo": {"ct": 113, "host": "192.168.68.114", "user": "root",   "pve": "amdpve",  "vault_key": "KOONIMO_LITELLM_API_KEY"},
 }
 
+# Systemd units verified live 2026-09-08 (systemctl list-units on each host):
+#   .8   rtx3090 (gpu-dense)  -> llama-chat-api.service  (active; the old
+#        llama-server.service unit file is stale/inactive — probing it read as
+#        UNREACHABLE for a healthy process)
+#   .110 rtx5070 (ocu-llm VM) -> llama-server.service    (active)
+#   .15  strixhalo (amdpve)   -> strix-server.service    (active)
 GPU_HOSTS = {
-    "gpu-rtx3090 (.8)":     {"host": "192.168.68.8",   "port": 8080, "service": "llama-server"},
-    "gpu-rtx5070 (.110)":   {"host": "192.168.68.110", "port": 8080, "service": "llama-server"},
-    "gpu-strixhalo (.15)":  {"host": "192.168.68.15",  "port": 8080, "service": "strix-server"},
+    "gpu-rtx3090 (.8)":     {"host": "192.168.68.8",   "port": 8080, "service": "llama-chat-api.service"},
+    "gpu-rtx5070 (.110)":   {"host": "192.168.68.110", "port": 8080, "service": "llama-server.service"},
+    "gpu-strixhalo (.15)":  {"host": "192.168.68.15",  "port": 8080, "service": "strix-server.service"},
 }
 
 FAIL = []
+REPORT_ONLY = []
+
+
+def _fail(key, agent_name=None):
+    """Record a failure, except for report-only agents.
+
+    Koby is report-only per the captain's 2026-08-17 ruling (Rule 17): its legs
+    are detected and reported, never repaired and never counted as fleet
+    failures. A red fleet alert on a known report-only leg is a false alarm.
+    Report-only findings are tracked separately so --json consumers can still
+    see them without them counting as fleet failures. Any non-report-only agent
+    (or a leg with no agent, e.g. GPU hosts) records normally.
+    """
+    if agent_name and AGENTS.get(agent_name, {}).get("report_only"):
+        REPORT_ONLY.append(key)
+        print(f"  🔍 report-only ({agent_name}): {key} — reported, not counted/repaired")
+        return
+    FAIL.append(key)
+
 
 INFISICAL_TOKEN = os.environ.get("INFISICAL_TOKEN")
 INFISICAL_API_URL = os.environ.get("INFISICAL_API_URL", "https://vault.sysloggh.net")
@@ -161,11 +229,46 @@ def _get_agent_key(agent_name, vault_key_name):
 
     return None
 
-# Inject keys from vault for each agent
-for agent_name in AGENTS:
-    info = AGENTS[agent_name]
-    key = _get_agent_key(agent_name, info.get("vault_key"))
-    AGENTS[agent_name]["key"] = key
+
+def _read_env_export(path, var):
+    """Parse `export VAR=value` (or `VAR=value`) out of a local env file.
+
+    #735 agent separation (2026-09-06): agent creds moved out of the shared
+    /root/.bashrc into per-agent env files under /root/.pi/agent/ (bashrc's
+    source line keeps abiba shells resolving them, but the file of record is
+    env.sh). Do NOT fall back to /root/.bashrc here: desktop (.200) SSH
+    sessions override LITELLM_API_KEY with mumuni's key, so sourcing bashrc
+    would validate the wrong identity.
+    """
+    try:
+        with open(os.path.expanduser(path)) as _f:
+            for line in _f:
+                line = line.strip()
+                if not (line.startswith("export " + var + "=") or line.startswith(var + "=")):
+                    continue
+                value = line.split("=", 1)[1].strip().strip('"').strip("'")
+                if value:
+                    return value
+    except (OSError, UnicodeDecodeError):
+        pass
+    return None
+
+
+def load_agent_keys():
+    """Populate AGENTS[*]["key"] from the vault or the agent's local env file.
+
+    Called from main(), not at import: keeping this out of module scope lets the
+    module be imported (and unit tested) without live vault/SSH access. Vault
+    format is {NAME}_LITELLM_API_KEY (project 322fceab-39da-4854-a55a-568e76c0f13f,
+    env prod); abiba has no vault key and reads LITELLM_API_KEY from its local
+    /root/.pi/agent/env.sh (moved there from /root/.bashrc in #735).
+    """
+    for agent_name in AGENTS:
+        info = AGENTS[agent_name]
+        key = _get_agent_key(agent_name, info.get("vault_key"))
+        if not key and info.get("key_env"):
+            key = _read_env_export(info["key_env"]["file"], info["key_env"]["var"])
+        AGENTS[agent_name]["key"] = key
 
 
 # ═══════════════════════════════════════════════════════════════════
@@ -176,8 +279,8 @@ def check_keys():
     for name, agent in AGENTS.items():
         key = agent.get("key")
         if not key:
-            print(f"  ❌ {name}: NO KEY FOUND (vault empty or unreachable)")
-            FAIL.append(f"key:{name}:no-key")
+            print(f"  ❌ {name}: NO KEY FOUND (vault/env empty or unreachable)")
+            _fail(f"key:{name}:no-key", name)
             continue
         data = http_json(f"{LITELLM}/v1/models",
                          headers={"Authorization": f"Bearer {key}"})
@@ -186,11 +289,11 @@ def check_keys():
             print(f"  ✅ {name}: key valid → {model}")
         else:
             print(f"  ❌ {name}: KEY FAILURE — auth rejected or unreachable")
-            FAIL.append(f"key:{name}")
+            _fail(f"key:{name}", name)
 
 
 # ═══════════════════════════════════════════════════════════════════
-# CHECK 2: GPU Port Conflict Detection (unchanged)
+# CHECK 2: GPU Port Conflict Detection (unit names verified live 2026-09-08)
 # ═══════════════════════════════════════════════════════════════════
 
 def check_gpu_ports():
@@ -199,7 +302,11 @@ def check_gpu_ports():
         port = gpu["port"]
         svc = gpu["service"]
 
-        svc_status = ssh(host, f"systemctl is-active {svc}")
+        # `systemctl is-active` exits non-zero when the unit is inactive or
+        # missing, which the ssh() helper would swallow as an SSH failure and
+        # report as UNREACHABLE. `|| true` keeps the real state word so we can
+        # tell "unit inactive" from "host unreachable".
+        svc_status = ssh(host, f"systemctl is-active {svc} || true")
         port_owner = ssh(host, f"ss -tlnp 2>/dev/null | grep -Po ':{port}\\s+.*pid=\\K[0-9]+' | head -1")
 
         if not svc_status:
@@ -242,28 +349,41 @@ def check_agents():
 
         # Tanko runs on DSH (DeepSeek Harness) since 2026-08-27 — it no longer runs a
         # Hermes gateway, so skip the Hermes gateway/state/streaming/journal checks.
-        if agent.get("runtime") == "dsh":
+        # Non-Hermes runtimes have no gateway to probe. dsh = Tanko since
+        # 2026-08-27; pi = abiba since the harness purge (.24 is pi-only).
+        if agent.get("runtime") in ("dsh", "pi"):
+            is_dsh = agent.get("runtime") == "dsh"
+            label = "DSH (DeepSeek Harness)" if is_dsh else "pi-only runtime"
+            since = "since 2026-08-27" if is_dsh else "since the harness purge"
             live = ssh(host, "true", user=user)
-            print(f"  {'✅' if live is not None else '❌'} {name}: DSH (DeepSeek Harness) — "
-                  f"no Hermes gateway since 2026-08-27 (CT {ct}, SSH {'OK' if live is not None else 'FAIL'})")
+            print(f"  {'✅' if live is not None else '❌'} {name}: {label} — "
+                  f"no Hermes gateway {since} (CT {ct}, SSH {'OK' if live is not None else 'FAIL'})")
             if live is None:
-                FAIL.append(f"unreachable:{name}")
+                _fail(f"unreachable:{name}", name)
             continue
 
         if not host or not user:
             print(f"  ⬜ {name} (CT {ct}): cannot SSH — skip liveness check")
             continue
 
+        # Resolve the Hermes gateway PID once, before the report-only branch:
+        # the summary line below renders `pid`, and it used to be bound only in
+        # the report-only path — leaving it unbound on the abiba/koonimo path
+        # raised UnboundLocalError and crashed the whole check. Agents without
+        # a gateway get pid=?.
+        pid = ssh(host, "pgrep -f '[h]ermes_cli.main gateway run' | grep -v infisical | head -1", user=user)
+        if not pid:
+            pid = ssh(host, "pgrep -f '[h]ermes.*gateway' | grep -v infisical | grep -v bash | head -1", user=user)
+        if not pid:
+            pid = "?"
+
         # ⛔ KOBY IS NEVER REPAIRED — diagnostic only
         if report_only:
             print(f"  🔍 {name}: REPORT-ONLY mode (diagnostic only, no repairs on .129)")
             # Still check gateway status for reporting purposes
-            pid = ssh(host, "pgrep -f 'hermes_cli.main gateway run' | grep -v infisical | head -1", user=user)
-            if not pid:
-                pid = ssh(host, "pgrep -f 'hermes.*gateway' | grep -v infisical | grep -v bash | head -1", user=user)
-            if not pid:
+            if pid == "?":
                 print(f"  ⚠️  {name}: GATEWAY NOT RUNNING (reported only)")
-                FAIL.append(f"gateway-down:{name}")
+                _fail(f"gateway-down:{name}", name)
                 continue
             else:
                 print(f"  ✅ {name}: gateway running (pid={pid}, report-only mode)")
@@ -326,12 +446,12 @@ def check_ct_liveness():
         status = ssh(pve_ip, f"pct status {ct} 2>/dev/null", user="root")
         if not status:
             print(f"  ❌ {name} (CT {ct} on {pve_node}): PVE UNREACHABLE")
-            FAIL.append(f"ct-unreachable:{name}:{pve_ip}")
+            _fail(f"ct-unreachable:{name}:{pve_ip}", name)
         elif "running" in status:
             print(f"  ✅ {name} (CT {ct} on {pve_node}): running")
         elif "stopped" in status:
             print(f"  ❌ {name} (CT {ct} on {pve_node}): STOPPED")
-            FAIL.append(f"ct-stopped:{name}")
+            _fail(f"ct-stopped:{name}", name)
         else:
             print(f"  ⚠️  {name} (CT {ct} on {pve_node}): {status.strip()}")
 
@@ -347,6 +467,9 @@ def check_config_integrity():
         if agent.get("runtime") == "dsh":
             print(f"  ⏭️ {name}: DSH — no Hermes config.yaml since 2026-08-27")
             continue
+        if agent.get("runtime") == "pi":
+            print(f"  ⏭️ {name}: pi-only runtime — no Hermes config.yaml since the harness purge")
+            continue
         host = agent.get("host")
         user = agent.get("user")
         if not host or not user:
@@ -361,18 +484,38 @@ def check_config_integrity():
             user=user)
         if not yaml_ok:
             print(f"  ❌ {name}: SSH UNREACHABLE (config check skipped)")
-            FAIL.append(f"config-unreachable:{name}")
+            _fail(f"config-unreachable:{name}", name)
         elif "OK" in yaml_ok:
             print(f"  ✅ {name}: config.yaml valid YAML")
         else:
             print(f"  ❌ {name}: config.yaml YAML ERROR — {yaml_ok[:120]}")
-            FAIL.append(f"config-yaml-error:{name}")
+            _fail(f"config-yaml-error:{name}", name)
 
 
 # ═══════════════════════════════════════════════════════════════════
 # CHECK 6: Wrapper/CLI Integrity (NEW)
 # ═══════════════════════════════════════════════════════════════════
 
+def _infisical_invocation_paths(wrapper_body):
+    """Absolute infisical paths the wrapper actually invokes.
+
+    Only executed (non-comment) lines count, and only a path followed by a real
+    infisical subcommand (e.g. `/usr/bin/infisical run`) is treated as an
+    invocation. A note such as `# migrated from /usr/local/bin/infisical` is
+    prose, not a call, so it must not manufacture a dangling-path false alarm.
+    """
+    paths = []
+    for line in wrapper_body.splitlines():
+        code = line.split("#", 1)[0]
+        for _m in re.finditer(
+            r"(/[A-Za-z0-9._/-]*infisical)\s+(?:run|export|secrets|login|logout)\b",
+            code,
+        ):
+            if _m.group(1) not in paths:
+                paths.append(_m.group(1))
+    return paths
+
+
 def check_wrapper_integrity():
     """Verify the hermes CLI wrapper exists and can reach hermes-real."""
     for name, agent in AGENTS.items():
@@ -380,6 +523,9 @@ def check_wrapper_integrity():
         if agent.get("runtime") == "dsh":
             print(f"  ⏭️ {name}: DSH — no hermes CLI wrapper since 2026-08-27")
             continue
+        if agent.get("runtime") == "pi":
+            print(f"  ⏭️ {name}: pi-only runtime — no hermes CLI wrapper since the harness purge")
+            continue
         host = agent.get("host")
         user = agent.get("user")
         if not host or not user:
@@ -393,24 +539,56 @@ def check_wrapper_integrity():
             wrapper = ssh(host, "which hermes 2>/dev/null; command -v hermes 2>/dev/null", user=user)
             if not wrapper:
                 print(f"  ❌ {name}: NO HERMES CLI WRAPPER FOUND")
-                FAIL.append(f"wrapper-missing:{name}")
+                _fail(f"wrapper-missing:{name}", name)
                 continue
             else:
                 print(f"  ⚠️  {name}: hermes at {wrapper.strip()} (not ~/.local/bin/hermes)")
 
-        # Check wrapper has correct infisical path
-        infisical_path_valid = ssh(host,
-            "head -20 /root/.local/bin/hermes 2>/dev/null | grep -q '/usr/bin/infisical' && echo OK || echo MISS",
-            user=user)
-        if infisical_path_valid == "MISS":
-            # Check if infisical exists on path
-            inf_actual = ssh(host, "command -v infisical 2>/dev/null", user=user)
-            if not inf_actual:
-                print(f"  ❌ {name}: INFISICAL NOT INSTALLED (wrapper broken)")
-                FAIL.append(f"wrapper-no-infisical:{name}")
+        # Credential-injection mechanism. The Hermes-era wrapper injected creds
+        # with `/usr/bin/infisical run`, but the mechanism is not required to be
+        # infisical at all: koby's wrapper sources the key from ~/.hermes/.env
+        # and never mentions infisical, which is valid. The old check read only
+        # the first 20 lines, so koonimo's wrapper — which DOES reference
+        # /usr/bin/infisical, just past line 20 — false-failed as "path may be
+        # wrong". Read the full body, accept a no-infisical wrapper, and verify
+        # the absolute infisical path(s) the wrapper actually invokes. Only
+        # executed (non-comment) lines count: a comment or dead prose mentioning
+        # a removed path (litellm-api-keys.prose.md documents
+        # `rm -f /usr/local/bin/infisical`) must neither produce a dangling path
+        # nor trigger the PATH check — it is not an invocation.
+        wrapper_body = ssh(host, "cat /root/.local/bin/hermes 2>/dev/null", user=user) or ""
+        wrapper_code = "\n".join(line.split("#", 1)[0] for line in wrapper_body.splitlines())
+        invoked_paths = _infisical_invocation_paths(wrapper_body)
+        if "infisical" in wrapper_code:
+            if invoked_paths:
+                missing = []
+                for _p in invoked_paths:
+                    _exists = ssh(host, f"test -x {_p} && echo OK || echo MISS", user=user)
+                    if not _exists or _exists.strip().splitlines()[-1] != "OK":
+                        missing.append(_p)
+                if len(missing) == len(invoked_paths):
+                    inf_actual = ssh(host, "command -v infisical 2>/dev/null", user=user)
+                    suffix = f" (infisical at {inf_actual})" if inf_actual else ""
+                    print(f"  ❌ {name}: wrapper invokes infisical via missing path(s) "
+                          f"{', '.join(missing)}{suffix}")
+                    _fail(f"wrapper-infisical-path:{name}", name)
+                elif missing:
+                    print(f"  ⚠️  {name}: wrapper has an unused/missing infisical path "
+                          f"({', '.join(missing)}) but a working invocation — informational")
+                elif "/usr/bin/infisical" not in invoked_paths:
+                    print(f"  ⚠️  {name}: wrapper infisical path differs "
+                          f"({', '.join(invoked_paths)}) — informational")
+                else:
+                    print(f"  ✅ {name}: wrapper infisical path OK")
             else:
-                print(f"  ⚠️  {name}: wrapper infisical path may be wrong (infisical at {inf_actual})")
-                FAIL.append(f"wrapper-infisical-path:{name}")
+                inf_actual = ssh(host, "command -v infisical 2>/dev/null", user=user)
+                if not inf_actual:
+                    print(f"  ❌ {name}: wrapper invokes infisical but the binary is MISSING")
+                    _fail(f"wrapper-no-infisical:{name}", name)
+                else:
+                    print(f"  ✅ {name}: wrapper infisical resolves via PATH ({inf_actual})")
+        else:
+            print(f"  ℹ️  {name}: wrapper resolves creds without infisical (e.g. ~/.hermes/.env) — OK")
 
         # Check hermes-real exists
         hermes_real = ssh(host,
@@ -423,7 +601,7 @@ def check_wrapper_integrity():
                 user=user)
             if not hermes_real or hermes_real.strip() == "MISS":
                 print(f"  ❌ {name}: hermes-real NOT FOUND (wrapper broken)")
-                FAIL.append(f"wrapper-no-hermes-real:{name}")
+                _fail(f"wrapper-no-hermes-real:{name}", name)
             else:
                 print(f"  ✅ {name}: hermes-real at alt path")
 
@@ -451,10 +629,10 @@ def check_vault_secrets():
         key = agent.get("key")
         if not key:
             print(f"  ❌ {name}: vault secret {vault_key_name} MISSING or EMPTY")
-            FAIL.append(f"vault-empty:{name}:{vault_key_name}")
+            _fail(f"vault-empty:{name}:{vault_key_name}", name)
         elif not key.startswith("sk-"):
             print(f"  ❌ {name}: vault secret {vault_key_name} WRONG FORMAT (starts '{key[:8]}...')")
-            FAIL.append(f"vault-bad-format:{name}:{vault_key_name}")
+            _fail(f"vault-bad-format:{name}:{vault_key_name}", name)
         else:
             print(f"  ✅ {name}: vault {vault_key_name}=sk-...{key[-4:]}")
 
@@ -487,18 +665,7 @@ def deploy_self():
 # MAIN
 # ═══════════════════════════════════════════════════════════════════
 
-def main():
-    quiet = "--quiet" in sys.argv
-    as_json = "--json" in sys.argv
-
-    # Self-deploy to canonical location
-    if not quiet and "--no-deploy" not in sys.argv:
-        deploy_self()
-
-    if not quiet:
-        print(f"🏥 Agent Health Check v2 — {datetime.now().strftime('%Y-%m-%d %H:%M UTC')}")
-        print()
-
+def _run_checks():
     print("🔑 LiteLLM Keys:")
     check_keys()
     print()
@@ -526,16 +693,49 @@ def main():
     print("🔐 Vault Secrets:")
     check_vault_secrets()
 
+
+def main():
+    quiet = "--quiet" in sys.argv
+    as_json = "--json" in sys.argv
+
+    # Self-deploy to canonical location
+    if not quiet and "--no-deploy" not in sys.argv:
+        deploy_self()
+
+    # Provenance: a report is only actionable if the reader can tell WHICH copy
+    # of this script produced it. A normal run carries it in the header, --json
+    # carries it for machine consumers, and the cron ALERT line carries it on
+    # failure. --quiet is documented as "only output on failure", so the header
+    # is emitted only when not quiet and a healthy quiet run stays silent.
+    script_path = os.path.abspath(__file__)
+    cwd = os.getcwd()
+
+    if quiet:
+        captured = io.StringIO()
+        with contextlib.redirect_stdout(captured):
+            load_agent_keys()
+            _run_checks()
+        if FAIL:
+            sys.stdout.write(captured.getvalue())
+    else:
+        print(f"🏥 Agent Health Check v4 — {datetime.now().strftime('%Y-%m-%d %H:%M UTC')}")
+        print(f"📍 executed from: script={script_path} cwd={cwd}")
+        print()
+        load_agent_keys()
+        _run_checks()
+
     if FAIL:
         print(f"\n❌ {len(FAIL)} FAILURE(S): {' | '.join(FAIL)}")
         if quiet:
-            print(f"ALERT agent-health:{','.join(FAIL)}")
+            print(f"ALERT agent-health:{','.join(FAIL)} script={script_path} cwd={cwd}")
     elif not quiet:
         print("\n✅ All checks passed")
 
     if as_json:
         print(json.dumps({"timestamp": datetime.now().isoformat(),
-                          "failures": FAIL, "healthy": len(FAIL) == 0}))
+                          "execution_path": script_path, "cwd": cwd,
+                          "failures": FAIL, "report_only": REPORT_ONLY,
+                          "healthy": len(FAIL) == 0}))
 
     sys.exit(1 if FAIL else 0)
 

scripts/daily-infra-report.py

@@ -328,26 +328,13 @@ def collect():
         "updated_at": "",
     }
     
-    # Mumuni (CT 100, IP 192.168.68.24)
-    mumuni_state = ssh("192.168.68.24", "cat ~/.hermes/gateway_state.json 2>/dev/null")
-    mumuni_data = {}
-    try:
-        mumuni_data = json.loads(mumuni_state) if mumuni_state else {}
-    except:
-        mumuni_data = {}
-    mumuni_platforms = mumuni_data.get("platforms", {})
-    report["agents"]["mumuni"] = {
-        "platform": "hermes", "ct": 100, "ip": "192.168.68.24",
-        "gateway_state": mumuni_data.get("gateway_state", "unknown"),
-        "telegram_state": mumuni_platforms.get("telegram", {}).get("state", "unknown"),
-        "zulip_state": mumuni_platforms.get("zulip", {}).get("state", "not_installed"),
-        "email_state": mumuni_platforms.get("email", {}).get("state", "unknown"),
-        "hermes_version": "",
-    }
-    # Get Hermes version
-    ver = ssh("192.168.68.24", "hermes --version 2>/dev/null | head -1")
-    if ver:
-        report["agents"]["mumuni"]["hermes_version"] = ver.split("·")[0].replace("Hermes Agent ","").strip()
+    # Mumuni is deliberately absent from this digest: captain ruling 2026-09-10.
+    # She moved off this host onto her own container (kagentz CT 105 on minipve,
+    # 192.168.68.14, dedicated `hermes` user) and is monitored from her side. The
+    # former probe ssh'd to 192.168.68.24 for the decommissioned deployment's
+    # ~/.hermes/gateway_state.json, always read "unknown", and published a false
+    # "mumuni:unknown" line in the agent table and the gateway-unknown issue
+    # count of every digest. Do NOT re-add an .24 / gateway_state probe.
     
     return report
 
@@ -561,12 +548,6 @@ Proxmox: {r.get('pve_probe_status', 'ok')} ({r['nodes_online']}/{r['node_count']
             zulip_state = "✅" if agent.get("zulip_state") == "connected" else ("❌" if agent.get("zulip_state") == "disconnected" else "⬜")
             gateway = agent.get("gateway_state", "?")
             processed = "DSH"
-        elif name == "mumuni":
-            zulip_state = "⬜" if agent.get("zulip_state") == "not_installed" else ("✅" if agent.get("zulip_state") == "connected" else "⬜")
-            gateway = agent.get("gateway_state", "?")
-            tg = "✅" if agent.get("telegram_state") == "connected" else "❌"
-            ver = agent.get("hermes_version", "")
-            processed = f"TG:{tg} v{ver}"
         else:
             zulip_state = "⬜"
             gateway = agent.get("gateway_state", "?")
@@ -720,6 +701,6 @@ if __name__ == "__main__":
     print(f"   Zulip Ext: {'✅' if report.get('zulip_ext',{}).get('connected') else '❌'}")
     print(f"   LiteLLM: {sum(1 for c in report.get('litellm',{}).get('checks',[]) if c['status']=='pass')}/{len(report.get('litellm',{}).get('checks',[]))} checks pass")
     agent_parts = []
-for k,v in report.get('agents',{}).items():
-    agent_parts.append(f"{k}:{v.get('gateway_state',v.get('pm2_status','?'))}")
-print(f"   Agents: {', '.join(agent_parts)}")
+    for k,v in report.get('agents',{}).items():
+        agent_parts.append(f"{k}:{v.get('gateway_state',v.get('pm2_status','?'))}")
+    print(f"   Agents: {', '.join(agent_parts)}")

scripts/prose-lint.sh

@@ -57,7 +57,7 @@ echo "── 2. Regression detection ──"
 
 # Grafana /grafana/ as nginx route or URL path (reverted 2026-07-02)
 # EXCLUDE: filesystem paths (/opt/monitoring/grafana/...), directory creation, revert docs
-GRAFANA_HITS=$(grep -rn '/grafana/' *.prose.md 2>/dev/null \
+GRAFANA_HITS=$(grep -rn '/grafana/' ./*.prose.md 2>/dev/null \
   | grep -v '/opt/monitoring/grafana/' \
   | grep -v 'was tried and reverted\|was reverted\|do not re-add\|NOT recommended' \
   | grep -v 'mkdir.*grafana\|Create.*grafana' \
@@ -71,7 +71,7 @@ else
 fi
 
 # Stale CT IDs (CT 122, CT 123 as CT IDs — not IPs .122, .123)
-CT_STALE=$(grep -rn '\bCT 122\b' *.prose.md 2>/dev/null || true)
+CT_STALE=$(grep -rn '\bCT 122\b' ./*.prose.md 2>/dev/null || true)
 if [ -n "$CT_STALE" ]; then
   echo "  ❌ REGRESSION: CT 122 used as CT ID — Tanko is CT 112"
   echo "$CT_STALE"
@@ -84,6 +84,35 @@ fi
 # .122/.123 are correct — verified reachable bridge IPs for Tanko/Mumuni
 echo "  ✅ IP consistency verified (.19=.122=.123 all reachable)"
 
+# Report provenance — every contract report must state the absolute path it
+# executed from, so a stale-consumer report is distinguishable from a real fault
+# at read time (2026-09-09 probe-drift incident: three false DEGRADED rounds).
+# Enforced only inside the **Report format** paragraph, and a check-health
+# contract with no Report format paragraph FAILs rather than being skipped.
+PROV_FILES=$(grep -rlE '^### check-health|\*\*Report format\*\*' ./*.prose.md 2>/dev/null || true)
+if [ -z "$PROV_FILES" ]; then
+  echo "  ❌ No check-health/report-format contracts found — provenance not enforced"
+  FAILED=1
+else
+  PROV_BAD=0
+  while IFS= read -r f; do
+    [ -n "$f" ] || continue
+    REPORT_PARA=$(awk '/\*\*Report format\*\*/{found=1} found{print} found && /^[[:space:]]*$/{exit}' "$f")
+    if [ -z "$REPORT_PARA" ]; then
+      echo "  ❌ $f: check-health contract has no **Report format** paragraph"
+      PROV_BAD=1
+    elif ! printf '%s\n' "$REPORT_PARA" | grep -qE 'absolute path|pwd -P|executed from'; then
+      echo "  ❌ $f: **Report format** lacks execution provenance (absolute path / pwd -P)"
+      PROV_BAD=1
+    fi
+  done <<< "$PROV_FILES"
+  if [ "$PROV_BAD" -eq 1 ]; then
+    FAILED=1
+  else
+    echo "  ✅ Report provenance present in all report-format contracts"
+  fi
+fi
+
 # ── 3. Cross-contract consistency ──
 echo ""
 echo "── 3. Cross-contract consistency ──"

scripts/zulip-monitor.sh

@@ -1,7 +1,10 @@
 #!/bin/bash
 # /root/scripts/zulip-monitor.sh — Zulip Mesh Health Monitor
-# Implements zulip-health.prose.md v2
-# Runs every 15 min via cron. Alerts via Telegram.
+# Implements zulip-health.prose.md v3
+# Runs every 15 min via cron. Alerts: Zulip private DM to the owner plus a stream post to #agent-hub on topic 'zulip-health'.
+# Legs: global Zulip server, Platform A pi/Abiba (the Zulip bridge), Platform B
+# Tanko (DSH), Platform C Agent Zero (kagentz). The former Platform B Hermes
+# agent leg is retired — see the note after the Tanko leg.
 set -euo pipefail
 
 ZULIP_SITE="https://chat.sysloggh.net"
@@ -21,7 +24,8 @@ notify() {
   
   # Zulip DM to owner
   local content="${severity} Zulip Monitor: ${msg}"
-  local form="type=private&to=%5B${OWNER_ZULIP_ID}%5D&content=$(python3 -c "import urllib.parse; print(urllib.parse.quote('''${content}'''))")"
+  local form
+  form="type=private&to=%5B${OWNER_ZULIP_ID}%5D&content=$(python3 -c "import urllib.parse; print(urllib.parse.quote('''${content}'''))")"
   curl -sf -X POST "${ZULIP_SITE}/api/v1/messages" \
     -u "${ZULIP_EMAIL}:${ZULIP_KEY}" \
     -d "${form}" > /dev/null 2>&1 || true
@@ -29,8 +33,9 @@ notify() {
   local stream_content="${severity} Zulip Monitor: ${msg}"
   curl -sf -X POST "${ZULIP_SITE}/api/v1/messages" \
     -u "${ZULIP_EMAIL}:${ZULIP_KEY}" \
-    -d "type=stream\&to=%5B7%5D\&topic=zulip-health\&content=$(python3 -c "import urllib.parse; print(urllib.parse.quote(str()))")" \
-    > /dev/null 2>&1 || true
+    -d "type=stream&to=%5B7%5D&topic=zulip-health&content=$(printf '%s' "${stream_content}" | python3 -c "import sys,urllib.parse; print(urllib.parse.quote_from_bytes(sys.stdin.buffer.read()))")" \
+    > /dev/null 2>&1 \
+    || echo "  WARN: stream alert to #agent-hub (zulip-health) delivery failed (curl exit $?)" >> "$LOG"
 }
 
 # ── Global: Zulip Server ──
@@ -45,62 +50,109 @@ else
 fi
 
 # ── Platform A: pi (Abiba) ──
-PI_HEALTH=$(curl -sf --connect-timeout 5 http://localhost:9200/health 2>/dev/null || echo "{}")
-PI_CONNECTED=$(echo "$PI_HEALTH" | python3 -c "import sys,json; d=json.load(sys.stdin); print(d.get('connected',False))" 2>/dev/null)
-PI_ERROR=$(echo "$PI_HEALTH" | python3 -c "import sys,json; d=json.load(sys.stdin); print(d.get('last_error') or '')" 2>/dev/null)
-PI_RETRIES=$(echo "$PI_HEALTH" | python3 -c "import sys,json; d=json.load(sys.stdin); print(d.get('retry_count',0))" 2>/dev/null)
+# Probes the pi Zulip extension health endpoint (:9200/health, served by the
+# extension's startHealthServer; shape documented in zulip-health.prose.md).
+# FAIL-SAFE contract (pinned by tests/zulip-monitor-abiba.sh): connection state
+# lives NESTED at zulip.connected / zulip.last_error — there is no top-level
+# `connected` and no retry counter in the payload. A fetch error, non-2xx
+# response, empty/unparseable body, or payload missing a boolean
+# zulip.connected is a PROBE FAILURE: it alerts and NEVER calls pm2 restart.
+# pm2 restart runs ONLY on affirmative zulip.connected=false.
+# -- abiba-leg-start (verbatim-extracted by tests/zulip-monitor-abiba.sh)
+PI_HTTP=$(curl -s -o /dev/null --connect-timeout 5 --max-time 10 -w '%{http_code}' http://localhost:9200/health 2>/dev/null || echo "000")
+PI_BODY=$(curl -s --connect-timeout 5 --max-time 10 http://localhost:9200/health 2>/dev/null || true)
+PI_STATE=$(printf '%s' "$PI_BODY" | python3 -c '
+import sys, json
+code = sys.argv[1]
+body = sys.stdin.read()
+try:
+    d = json.loads(body)
+except Exception:
+    sys.stdout.write("probe-failed|unparseable body")
+    sys.exit(0)
+if not code.startswith("2"):
+    sys.stdout.write("probe-failed|HTTP %s" % code)
+    sys.exit(0)
+if not isinstance(d, dict) or not isinstance(d.get("zulip"), dict):
+    sys.stdout.write("probe-failed|missing zulip.connected")
+    sys.exit(0)
+z = d["zulip"]
+if "connected" not in z or not isinstance(z["connected"], bool):
+    sys.stdout.write("probe-failed|missing or non-boolean zulip.connected")
+    sys.exit(0)
+err = z.get("last_error") or ""
+if z["connected"]:
+    if err:
+        sys.stdout.write("degraded|%s" % err)
+    else:
+        sys.stdout.write("healthy|%s" % z.get("messages_processed", 0))
+else:
+    sys.stdout.write("disconnected|")
+' "$PI_HTTP" 2>/dev/null) || PI_STATE="probe-failed|python error"
+PI_VERDICT=${PI_STATE%%|*}
+PI_DETAIL=${PI_STATE#*|}
 
-if [ "$PI_CONNECTED" != "True" ]; then
-  notify "🔴" "Abiba pi extension DISCONNECTED — restarting"
-  pm2 restart abiba-zulip 2>/dev/null || true
+case "$PI_VERDICT" in
+  healthy)
+    echo "  Abiba: ✅ Connected (processed=$PI_DETAIL)" >> "$LOG" ;;
+  degraded)
+    notify "🟡" "Abiba pi extension error: ${PI_DETAIL:0:100}"
+    echo "  Abiba: 🟡 Error: ${PI_DETAIL:0:100}" >> "$LOG" ;;
+  disconnected)
+    notify "🔴" "Abiba pi extension DISCONNECTED — restarting"
+    pm2 restart abiba-zulip 2>/dev/null || true
+    ISSUES=$((ISSUES + 1))
+    echo "  Abiba: ❌ Disconnected — restarted" >> "$LOG" ;;
+  probe-failed)
+    notify "🟠" "Abiba pi extension health probe FAILED (${PI_DETAIL}; HTTP $PI_HTTP) — NOT restarting, manual check needed"
+    ISSUES=$((ISSUES + 1))
+    echo "  Abiba: ⚠️ Probe failed (${PI_DETAIL}; HTTP $PI_HTTP) — NOT restarted" >> "$LOG" ;;
+  *)
+    notify "🟠" "Abiba pi extension health probe returned unexpected verdict (${PI_STATE}) — NOT restarting, manual check needed"
+    ISSUES=$((ISSUES + 1))
+    echo "  Abiba: ⚠️ Unexpected probe verdict (${PI_STATE}) — NOT restarted" >> "$LOG" ;;
+esac
+# -- abiba-leg-end
+
+# ── Platform B: Tanko (DSH dsh-web on amdpve CT 112) ──
+# Direct SSH to 192.168.68.122 is not a dependency of this monitor — per-worker
+# key availability varies — so probes run from the amdpve vantage via `pct exec`.
+# Tanko's Zulip gateway runs as the dsh-web systemd unit inside CT 112 on amdpve
+# (192.168.68.15). The gateway binds 127.0.0.1:3080 loopback-only by design — a
+# remote :3080 probe is refused and is NOT a fault.
+TANKO_SVC=$(ssh -o StrictHostKeyChecking=no -o ConnectTimeout=5 root@192.168.68.15 \
+  "pct exec 112 -- systemctl is-active dsh-web" 2>/dev/null || true)
+[ -n "$TANKO_SVC" ] || TANKO_SVC="unknown"
+TANKO_HTTP=$(ssh -o StrictHostKeyChecking=no -o ConnectTimeout=5 root@192.168.68.15 \
+  "pct exec 112 -- curl -s --connect-timeout 5 --max-time 10 -o /dev/null -w '%{http_code}' http://127.0.0.1:3080/" 2>/dev/null || true)
+[ -n "$TANKO_HTTP" ] || TANKO_HTTP="000"
+
+if [ "$TANKO_SVC" != "active" ]; then
+  notify "🔴" "Tanko (DSH dsh-web) service state: $TANKO_SVC — needs restart"
   ISSUES=$((ISSUES + 1))
-  echo "  Abiba: ❌ Disconnected — restarted" >> "$LOG"
-elif [ -n "$PI_ERROR" ]; then
-  notify "🟡" "Abiba pi extension error: ${PI_ERROR:0:100}"
-  echo "  Abiba: 🟡 Error: ${PI_ERROR:0:100}" >> "$LOG"
-elif [ "$PI_RETRIES" -ge 3 ]; then
-  notify "🟡" "Abiba pi extension: $PI_RETRIES retries — restarting"
-  pm2 restart abiba-zulip 2>/dev/null || true
-  echo "  Abiba: 🟡 $PI_RETRIES retries — restarted" >> "$LOG"
+  echo "  Tanko: ❌ service=$TANKO_SVC" >> "$LOG"
+elif [ "$TANKO_HTTP" = "000" ]; then
+  notify "🔴" "Tanko (DSH dsh-web) HTTP :3080 connection refused/timeout — needs restart"
+  ISSUES=$((ISSUES + 1))
+  echo "  Tanko: ❌ http=000 (refused/timeout)" >> "$LOG"
 else
-  echo "  Abiba: ✅ Connected (processed=$(echo "$PI_HEALTH" | python3 -c "import sys,json; d=json.load(sys.stdin); print(d.get('messages_processed',0))" 2>/dev/null))" >> "$LOG"
+  case "$TANKO_HTTP" in
+    200|301|302|307|308|401|403)
+      echo "  Tanko: ✅ service=active http=$TANKO_HTTP" >> "$LOG" ;;
+    *)
+      notify "🟡" "Tanko (DSH dsh-web) HTTP :3080 answered $TANKO_HTTP — running, unexpected status"
+      echo "  Tanko: 🟡 service=active http=$TANKO_HTTP (running, warning)" >> "$LOG" ;;
+  esac
 fi
 
-# ── Platform B: Hermes (Tanko) ──
-TANKO_STATE=$(ssh -o StrictHostKeyChecking=no -o ConnectTimeout=5 jerome@192.168.68.122 \
-  "cat ~/.hermes/gateway_state.json 2>/dev/null" 2>/dev/null || echo "{}")
-TANKO_ZULIP=$(echo "$TANKO_STATE" | python3 -c "
-import sys,json
-d=json.load(sys.stdin)
-p=d.get('platforms',{}).get('zulip',{})
-print(p.get('state','unknown'))
-" 2>/dev/null)
-
-if [ "$TANKO_ZULIP" != "connected" ]; then
-  notify "🔴" "Tanko (Hermes) Zulip state: $TANKO_ZULIP — needs restart"
-  ISSUES=$((ISSUES + 1))
-  echo "  Tanko: ❌ state=$TANKO_ZULIP" >> "$LOG"
-else
-  echo "  Tanko: ✅ Zulip connected" >> "$LOG"
-fi
-
-# ── Platform B: Hermes (Mumuni) ──
-MUMUNI_STATE=$(ssh -o StrictHostKeyChecking=no -o ConnectTimeout=5 root@192.168.68.24 \
-  "cat ~/.hermes/gateway_state.json 2>/dev/null" 2>/dev/null || echo "{}")
-MUMUNI_ZULIP=$(echo "$MUMUNI_STATE" | python3 -c "
-import sys,json
-d=json.load(sys.stdin)
-p=d.get('platforms',{}).get('zulip',{})
-print(p.get('state','unknown'))
-" 2>/dev/null)
-
-if [ "$MUMUNI_ZULIP" != "connected" ]; then
-  notify "🔴" "Mumuni (Hermes) Zulip state: $MUMUNI_ZULIP"
-  ISSUES=$((ISSUES + 1))
-  echo "  Mumuni: ❌ state=$MUMUNI_ZULIP" >> "$LOG"
-else
-  echo "  Mumuni: ✅ Zulip connected" >> "$LOG"
-fi
+# ── Removed: the former "Platform B: Hermes" agent leg ──
+# Captain ruling 2026-09-10: that agent moved off this host onto her own
+# container (kagentz CT 105 on minipve, dedicated `hermes` user) and is now
+# monitored on her side — see the out-of-scope note in zulip-health.prose.md.
+# The old leg ssh'd to her former CT 100 deployment and read its Hermes gateway
+# state, which reported "unknown" on every run and posted a false 🔴 DM plus an
+# #agent-hub stream alert. Do NOT re-add a probe for her: this monitor must
+# never contact her former host.
 
 # ── Platform C: Agent Zero (kagentz) ──
 AZ_A2A=$(ssh -o StrictHostKeyChecking=no -o ConnectTimeout=5 root@192.168.68.14 \