@delorenj/pjangler 1.2.25 → 1.3.0

package/templates/commonproject/template/mise.toml.jinja

@@ -18,9 +18,12 @@ _.file = [".env"]
 [[hooks.enter]]
 script = "'{% raw %}{{config_root}}{% endraw %}/.mise/scripts/link-agentfiles.sh'"
 [[hooks.enter]]
-script = "op inject -i .env.op > .env"
+# Atomic (PJAN-24/PJAN-57): shell complexity lives in the managed script so
+# mise never interpolates temporary variables. The script uses mktemp, traps
+# cleanup, and replaces .env only after op inject succeeds.
+script = "'{% raw %}{{config_root}}{% endraw %}/.mise/scripts/materialize-env.sh'"
 [[hooks.enter]]
-script = "python3 '{% raw %}{{config_root}}{% endraw %}/.mise/scripts/provision-bmad-skills.py'"
+script = "python3 '{% raw %}{{config_root}}{% endraw %}/.mise/scripts/provision-packs.py'"
 [[hooks.enter]]
 script = "python3 '{% raw %}{{config_root}}{% endraw %}/.mise/scripts/sync-skills.py' --scope project"
 [[hooks.enter]]
@@ -36,43 +39,43 @@ script = "'{% raw %}{{config_root}}{% endraw %}/.agents/hooks/sync.py' --uninsta
 
 [[watch_files]]
 patterns = ["AGENTS.md"]
-task = "link-agentfiles"
+task = "link:agentfiles"
 [[watch_files]]
 patterns = [".agents/skills.json"]
-task = "skills-sync"
+task = "skills:sync"
 {% if agent_hooks_layer %}
 # Re-fan-out the agent hooks whenever the single source of truth changes.
 [[watch_files]]
 patterns = [".agents/hooks/hooks.master.json"]
-task = "hooks-sync"
+task = "hooks:sync"
 {% endif %}
-[tasks.link-agentfiles]
+[tasks."link:agentfiles"]
 description = "Symlink all agent files to AGENTS.md"
 run = "'{% raw %}{{config_root}}{% endraw %}/.mise/scripts/link-agentfiles.sh'"
 
-[tasks.skills-sync]
+[tasks."skills:sync"]
 description = "Sync skills from manifest to local CLI dirs"
-depends = ["skills-provision-bmad"]
+depends = ["skills:provision:packs"]
 run = "python3 '{% raw %}{{config_root}}{% endraw %}/.mise/scripts/sync-skills.py' --scope project"
 
-[tasks.skills-provision-bmad]
-description = "Provision pinned BMAD skills from the Skillex pack"
-run = "python3 '{% raw %}{{config_root}}{% endraw %}/.mise/scripts/provision-bmad-skills.py'"
+[tasks."skills:provision:packs"]
+description = "Provision every Skillex pack declared in .agents/skills.json"
+run = "python3 '{% raw %}{{config_root}}{% endraw %}/.mise/scripts/provision-packs.py'"
 {% if agent_hooks_layer %}
 # --- Project-scoped agent hooks + skill fan-out (see .agents/hooks/README.md) ---
 
-[tasks.hooks-sync]
+[tasks."hooks:sync"]
 description = "Fan out .agents/hooks/hooks.master.json to each agent CLI (claude committed; codex/kimi injected; hermes adapter)"
 run = "'{% raw %}{{config_root}}{% endraw %}/.agents/hooks/sync.py' --install"
 
-[tasks.hooks-check]
+[tasks."hooks:check"]
 description = "Drift gate: verify generated hook configs match hooks.master.json (CI-safe, read-only)"
 run = "'{% raw %}{{config_root}}{% endraw %}/.agents/hooks/sync.py' --check"
 
-[tasks.hooks-uninstall]
+[tasks."hooks:uninstall"]
 description = "Remove per-user agent-hook injections (codex/kimi/hermes)"
 run = "'{% raw %}{{config_root}}{% endraw %}/.agents/hooks/sync.py' --uninstall"
 {% endif %}
-[tasks.hindsight-setup]
-description = "Provision this dev's shared project Hindsight key from 1Password into .env (op inject)"
+[tasks."hindsight:setup"]
+description = "Provision this dev's shared project Hindsight key from 1Password into .env (op read; upserts those two keys, leaves the rest of .env intact)"
 run = "'{% raw %}{{config_root}}{% endraw %}/.mise/scripts/hindsight-setup.sh'"

package/templates/hermes-agent/copier.yml

@@ -10,10 +10,10 @@
 #
 # What it does:
 #   1. Renders agents/hermes/<role>/{role.yaml, SOUL.md, hermes, .scripts/}
-#   2. Creates ignored local state at agents/hermes/<role>/runtime/
-#      (this is HERMES_HOME; no project gitlink or runtime remote)
+#   2. Creates ignored local state at agents/hermes/<role>/runtime/ and delegates
+#      named-profile wiring to `pj migrate hermes.runtime-singleton`
 #   4. Creates a Plane project in 33god workspace
-#   6. Prompts for a BotFather Telegram token, stores in runtime/.env
+#   6. Prompts for a BotFather Telegram token, stores in ignored runtime state
 #   7. Optionally wires a dedicated Slack app+bot pair into runtime/.env
 #   8. Records fleet-shared Bloodbank routing identity (no profile consumer)
 #   9. Installs a profile gateway + heartbeat timer (reconcile + checkpoint)
@@ -50,8 +50,10 @@ role:
   default: pm
   choices:
     "Project Manager (pm)": pm
+    "Company Director (director)": director
     "Developer (dev)": dev
     "Reviewer (review)": review
+    "Company Reporter — daily cross-project rollup (reporter)": reporter
     "Ops (ops)": ops
     "QA (qa)": qa
   validator: "{% if not role %}Required{% endif %}"
@@ -68,7 +70,7 @@ ticket_provider:
 agent_purpose:
   type: str
   help: "One-line description of what this agent does in this repo"
-  default: "Project management, triage, and continuous board reconciliation"
+  default: "{% if role == 'reporter' %}Company-wide evidence gathering, freshness-aware daily reporting, and critical delivery monitoring{% elif role == 'director' %}Company-level portfolio orchestration, delegation, and cross-project control{% else %}Project management, triage, and continuous board reconciliation{% endif %}"
 
 model_provider:
   type: str
@@ -80,6 +82,28 @@ model_name:
   help: "Model name (empty = inherit from global ~/.hermes config)"
   default: ""
 
+model_base_url:
+  type: str
+  help: "Per-agent model API base URL (empty = inherit from shared config)"
+  default: ""
+
+model_api_mode:
+  type: str
+  help: "Per-agent model API protocol (empty = inherit from shared config)"
+  default: ""
+  choices:
+    "Inherit from shared config": ""
+    "OpenAI-compatible chat completions": chat_completions
+    "OpenAI Codex responses": codex_responses
+    "Anthropic messages": anthropic_messages
+    "AWS Bedrock converse": bedrock_converse
+    "Codex app server": codex_app_server
+
+model_key_env:
+  type: str
+  help: "Environment variable NAME holding the per-agent model key (never the key value)"
+  default: ""
+
 soul_tone:
   type: str
   help: "Tone for the agent's SOUL.md"

package/templates/hermes-agent/template/.gitignore.jinja

@@ -7,3 +7,4 @@ runtime/
 # Provisioning logs are host-local as well.
 .scripts/.provision.log
 .scripts/.last-run
+.scripts/.done-*

package/templates/hermes-agent/template/.runtime-scaffold/README.md

@@ -1,21 +1,22 @@
 # {{agent_id}} — runtime
 
-This is the HERMES_HOME for the **{{display_name}}** agent. It is git-tracked
-so memory, SOUL evolution, and conversation history are durable across machines
-and recoverable on failure.
+This is the ignored, role-owned state for the **{{display_name}}** agent. The
+actual HERMES_HOME is a real named directory under `~/.hermes/profiles/`, with
+PJangler-managed links into this runtime. Back it up separately; it is not
+published by project Git.
 
 ## What's in here
 
 | Path | Tracked? | Purpose |
 | --- | --- | --- |
-| `config.yaml` | yes | Inference + skill config (cloned from global at provision time) |
-| `SOUL.md` | yes | The agent's personality, evolves over time |
-| `memories/MEMORY.md` | yes | The condensed mental-model summary loaded each session |
-| `memories/USER.md` | yes | The operator's persona (Jarad DeLorenzo, ...) |
-| `sessions/sessions.db` | yes (LFS) | SQLite store of every conversation |
-| `decisions/` | yes | Agent-emitted decisions, one file per important call |
+| `config.yaml` | local | Legacy seed/delta; shared profile config comes from fleet root |
+| `SOUL.md` | local | The agent's personality, evolves over time |
+| `memories/MEMORY.md` | local | The condensed mental-model summary loaded each session |
+| `memories/USER.md` | local | The operator's persona |
+| `sessions/sessions.db` | local | SQLite store of conversations |
+| `decisions/` | local | Agent-emitted decisions |
 | `.env` | **no** | API keys + Telegram bot token (per-machine secret) |
-| `auth.json` | **no** | Deprecated local OAuth store; fleet auth defaults to `HERMES_OAUTH_FILE=~/.hermes/auth.json` |
+| `auth.json` | **no** | Deprecated local OAuth store; named profiles use fleet auth fallback |
 | `audio_cache/`, `image_cache/` | **no** | Regenerable caches |
 | `sandboxes/` | **no** | Per-session ephemeral execution dirs |
 

package/templates/hermes-agent/template/.scripts/01-config.sh

@@ -21,11 +21,11 @@ else
     cat > "$CONFIG" <<'TOML'
 # hermes-agent-template config — edit for your environment.
 [fleet]
-hermes_bin = "~/.hermes/hermes-agent/.venv/bin/hermes"
-hermes_repo = "~/.hermes/hermes-agent"
+hermes_bin = "~/.local/share/hermes-agent/releases/0408fec7a153e6c32c064acd2b8053917f1525f1/.venv/bin/hermes"
+hermes_repo = "~/.local/share/hermes-agent/releases/0408fec7a153e6c32c064acd2b8053917f1525f1"
 hermes_git_url = "https://github.com/delorenj/hermes-agent.git"
-hermes_git_ref = "feature/PJAN-19-routing-publication"
-hermes_git_sha = "113e1b182b6d72a7dd02a191f134a41668ceaf0e"
+hermes_git_ref = "main"
+hermes_git_sha = "0408fec7a153e6c32c064acd2b8053917f1525f1"
 fleet_env = "~/.hermes/fleet.env"
 registry_file = "~/.hermes/agents-registry.yaml"
 canonical_skills_dir = "/home/delorenj/.agents/skills"

package/templates/hermes-agent/template/.scripts/10-hermes-profile.sh

@@ -1,10 +1,8 @@
 #!/usr/bin/env bash
-# Stage the per-agent runtime config/secrets via a TRANSIENT Hermes profile.
-# HERMES_HOME is the ignored ./runtime directory; this profile dir is a staging area
-# (cred-stripped .env + SOUL) that 20-runtime-repo.sh folds into the runtime and
-# then replaces with a symlink ~/.hermes/profiles/<name> -> ./runtime. That
-# symlink is load-bearing: hermes resolves `--profile <name>` invocations
-# through it (recreating it wrongly if it goes missing).
+# Create the initial named Hermes profile and sanitize cloned chat credentials.
+# The directory remains REAL. Step 20 delegates final shared-vs-owned link
+# topology to `pj migrate hermes.runtime-singleton`; no template step may
+# replace the profile itself with a symlink.
 # shellcheck source=_lib.sh
 source "$(dirname "$0")/_lib.sh"
 load_role_env
@@ -14,9 +12,6 @@ already_done 10-hermes-profile && { log "[10] profile already created — skippi
 log "[10] creating hermes profile: $PROFILE_NAME"
 PROFILE_HOME="$HOME/.hermes/profiles/$PROFILE_NAME"
 
-# Set repo path to directory where .git is
-REPO_PATH="$(cd "$ROLE_DIR" && git rev-parse --show-toplevel 2>/dev/null || echo "$ROLE_DIR")"
-
 if [[ -d "$PROFILE_HOME" ]]; then
   log "    profile dir already exists; reusing"
 else
@@ -112,9 +107,9 @@ PYEOF
   fi
 fi
 
-# Apply role-specific config overrides.
-log "    setting terminal.cwd = $REPO_PATH"
-env HERMES_HOME="$PROFILE_HOME" "$HERMES_BIN" config set terminal.cwd "$REPO_PATH"
+# Never persist a project-specific terminal.cwd through the named profile.
+# PJangler intentionally links profile config.yaml to the fleet-shared config;
+# the generated launchers therefore pass TERMINAL_CWD process-locally instead.
 
 # Canonical shared-skill source of truth + local PM fallback sync.
 CANONICAL_SKILLS_DIR="${CANONICAL_SKILLS_DIR:-$(config_get fleet.canonical_skills_dir '/home/delorenj/.agents/skills')}"

package/templates/hermes-agent/template/.scripts/20-runtime-repo.sh

@@ -6,8 +6,13 @@
 source "$(dirname "$0")/_lib.sh"
 load_role_env
 
-already_done 20-runtime-repo && { log "[20] local runtime already set up — skipping"; exit 0; }
-[[ "${SKIP_RUNTIME_REPO:-0}" == "1" ]] && { log "[20] local runtime — SKIPPED (SKIP_RUNTIME_REPO=1)"; mark_done 20-runtime-repo; exit 0; }
+already_done 20-runtime-repo \
+  && log "[20] local runtime scaffold already set up — re-auditing singleton profile wiring"
+if [[ "${SKIP_RUNTIME_REPO:-0}" == "1" ]]; then
+  clear_done 20-runtime-repo
+  log "[20] local runtime — DEFERRED (SKIP_RUNTIME_REPO=1; completion marker cleared)"
+  exit 0
+fi
 
 PROFILE_HOME="$HOME/.hermes/profiles/$PROFILE_NAME"
 RUNTIME_LOCAL="$ROLE_DIR/runtime"
@@ -62,34 +67,95 @@ for path in root.rglob("*"):
         except UnicodeDecodeError:
             pass
 PYEOF
+# Never let a literal secret reach the runtime. The scaffold is rendered from
+# templates, so a leaked credential shows up here before anything is copied.
+python3 "$(dirname "$0")/secret-scan.py" "$TMP"
 cp -an "$TMP/." "$RUNTIME_LOCAL/"
 
 # Seed mutable identity/config only when no local value exists.
-CANONICAL_PM_CONFIG="$(config_get fleet.canonical_pm_config "$HOME/.hermes/config.yaml")"
-if [[ -f "$CANONICAL_PM_CONFIG" && ! -e "$RUNTIME_LOCAL/config.yaml" ]]; then
-  cp "$CANONICAL_PM_CONFIG" "$RUNTIME_LOCAL/config.yaml"
+if [[ "$ROLE" == "reporter" ]]; then
+  # Generate a delta-only runtime config for least-privilege reporters. Never copy the shared PM
+  # config: it may carry dashboard credentials, write-capable MCPs, or broad tools.
+  MODEL_PROVIDER="$(yaml_get model.provider)"
+  MODEL_NAME="$(yaml_get model.name)"
+  CANONICAL_SKILLS_DIR="${CANONICAL_SKILLS_DIR:-$(config_get fleet.canonical_skills_dir "$HOME/.agents/skills")}"
+  if [[ ! -e "$RUNTIME_LOCAL/config.yaml" ]]; then
+    python3 - "$RUNTIME_LOCAL/config.yaml" "$PROJECT_PATH" "${HERMES_TIMEZONE:-America/New_York}" \
+      "$MODEL_PROVIDER" "$MODEL_NAME" "$CANONICAL_SKILLS_DIR" "$ROLE" <<'PYEOF'
+import json, pathlib, re, sys
+path, cwd, timezone, provider, model, skills, role = sys.argv[1:8]
+if not re.fullmatch(r"[A-Za-z_]+(?:/[A-Za-z_]+)*", timezone):
+    raise SystemExit("unsafe timezone")
+config = {
+    "timezone": timezone,
+    "terminal": {"cwd": cwd},
+    "skills": {"external_dirs": [skills]},
+}
+if provider or model:
+    config["model"] = {}
+    if provider:
+        config["model"]["provider"] = provider
+    if model:
+        config["model"]["default"] = model
+config["platform_toolsets"] = {
+    "cli": ["web", "delegation", "no_mcp"],
+    "cron": ["web", "delegation", "no_mcp"],
+}
+config["agent"] = {
+    "disabled_toolsets": [
+        "browser", "terminal", "file", "code_execution", "cronjob",
+        "kanban", "homeassistant", "computer_use", "project", "skills",
+    ]
+}
+config["delegation"] = {"max_spawn_depth": 1, "inherit_mcp_toolsets": False}
+pathlib.Path(path).write_text(json.dumps(config, indent=2) + "\n")
+PYEOF
+  fi
+  if [[ ! -e "$RUNTIME_LOCAL/profile.yaml" ]]; then
+    cat > "$RUNTIME_LOCAL/profile.yaml" <<'YAML'
+config:
+  inherit_from: default
+  save_mode: delta
+YAML
+  fi
+else
+  CANONICAL_PM_CONFIG="$(config_get fleet.canonical_pm_config "$HOME/.hermes/config.yaml")"
+  if [[ -f "$CANONICAL_PM_CONFIG" && ! -e "$RUNTIME_LOCAL/config.yaml" ]]; then
+    cp "$CANONICAL_PM_CONFIG" "$RUNTIME_LOCAL/config.yaml"
+  fi
 fi
 if [[ ! -e "$RUNTIME_LOCAL/SOUL.md" ]]; then
   cp "$ROLE_DIR/SOUL.md" "$RUNTIME_LOCAL/SOUL.md"
 fi
 
-# Fold the two supported staging-profile files into the runtime without
-# deleting unknown profile content. Unknown content blocks the symlink so an
-# operator can reconcile it explicitly instead of losing state.
-if [[ -d "$PROFILE_HOME" && ! -L "$PROFILE_HOME" ]]; then
-  log "    migrating supported staging profile state into the local runtime"
-  for file_name in .env config.yaml; do
-    [[ -f "$PROFILE_HOME/$file_name" && ! -e "$RUNTIME_LOCAL/$file_name" ]] && cp "$PROFILE_HOME/$file_name" "$RUNTIME_LOCAL/$file_name"
-    [[ -f "$PROFILE_HOME/$file_name" ]] && rm -f -- "$PROFILE_HOME/$file_name"
-  done
-  if ! rmdir "$PROFILE_HOME" 2>/dev/null; then
-    die "staging profile contains unrecognized state and was preserved: $PROFILE_HOME"
-  fi
+# Named-profile topology belongs exclusively to PJangler. Preview first, then
+# apply the one idempotent rule. This script never removes or replaces a real
+# profile directory and never creates the obsolete profile -> runtime symlink.
+if [[ "$PJANGLER_BIN" != */* ]]; then
+  PJANGLER_BIN="$(command -v "$PJANGLER_BIN" 2>/dev/null || true)"
 fi
-ln -sfn "$RUNTIME_LOCAL" "$PROFILE_HOME"
-log "    profile symlink $PROFILE_HOME -> $RUNTIME_LOCAL"
+[[ -n "$PJANGLER_BIN" && -x "$PJANGLER_BIN" ]] \
+  || die "PJángler CLI not found; install 'pj' or set PJANGLER_BIN"
+"$PJANGLER_BIN" migrate hermes.runtime-singleton "$PROJECT_PATH" --dry-run --json >/dev/null \
+  || die "singleton-runtime audit failed; profile was left untouched"
+"$PJANGLER_BIN" migrate hermes.runtime-singleton "$PROJECT_PATH" --json >/dev/null \
+  || die "singleton-runtime migration failed; inspect with: pj migrate hermes.runtime-singleton '$PROJECT_PATH' --dry-run"
+[[ -d "$PROFILE_HOME" && ! -L "$PROFILE_HOME" ]] \
+  || die "PJángler did not establish a real named profile at $PROFILE_HOME"
+log "    singleton profile verified by pj migrate hermes.runtime-singleton: $PROFILE_HOME"
 
-env HERMES_HOME="$RUNTIME_LOCAL" "$HERMES_BIN" config set terminal.cwd "$PROJECT_PATH" >/dev/null 2>&1 || true
+# Never persist a project-specific terminal.cwd through the named profile.
+# config.yaml is fleet-shared in the singleton topology.  The manual and
+# service launchers pass TERMINAL_CWD process-locally for this role instead.
+
+profile_config_set() {
+  local key="$1"
+  [[ -x "$HERMES_BIN" ]] \
+    || die "Hermes CLI is not executable; cannot configure named profile: $HERMES_BIN"
+  if ! env HERMES_HOME="$PROFILE_HOME" "$HERMES_BIN" config set "$@" >/dev/null; then
+    die "required Hermes config write failed for named profile $PROFILE_NAME: $key"
+  fi
+}
 
 if [[ "$ROLE" == "pm" ]]; then
   VOXXY_PLUGIN_DIR="${VOXXY_PLUGIN_DIR:-$(config_get fleet.voxxy_plugin_dir "$HOME/code/voxxy/plugins/tts/voxxy")}"
@@ -101,14 +167,10 @@ if [[ "$ROLE" == "pm" ]]; then
     warn "    Voxxy plugin dir missing: $VOXXY_PLUGIN_DIR"
   fi
 
-  if [[ -x "$HERMES_BIN" ]]; then
-    env HERMES_HOME="$RUNTIME_LOCAL" "$HERMES_BIN" config set plugins.enabled.0 tts/voxxy >/dev/null 2>&1 || true
-    env HERMES_HOME="$RUNTIME_LOCAL" "$HERMES_BIN" config set tts.provider voxxy >/dev/null 2>&1 || true
-    env HERMES_HOME="$RUNTIME_LOCAL" "$HERMES_BIN" config set tts.voice rick >/dev/null 2>&1 || true
-    log "    set PM runtime TTS provider -> voxxy"
-  else
-    warn "    Hermes bin missing; skipped PM Voxxy config"
-  fi
+  profile_config_set plugins.enabled.0 tts/voxxy
+  profile_config_set tts.provider voxxy
+  profile_config_set tts.voice rick
+  log "    set PM named-profile TTS provider -> voxxy"
 fi
 
 mark_done 20-runtime-repo

package/templates/hermes-agent/template/.scripts/30-telegram.sh

@@ -46,15 +46,28 @@ path.write_text(text[: match.start("body")] + body + text[match.end("body") :],
 PYEOF
 }
 
-already_done 30-telegram && { log "[30] telegram already wired — skipping"; exit 0; }
+telegram_status="$(yaml_get telegram.provisioning_status)"
 
 if [[ "${SKIP_TELEGRAM:-0}" == "1" ]]; then
-  telegram_yaml_update provisioning_status disabled
-  log "[30] telegram — SKIPPED (SKIP_TELEGRAM=1)"
-  mark_done 30-telegram
+  if [[ "$telegram_status" == "verified" ]] && already_done 30-telegram; then
+    log "[30] telegram — SKIPPED; existing verified wiring preserved"
+  else
+    telegram_yaml_update provisioning_status disabled
+    clear_done 30-telegram
+    log "[30] telegram — DEFERRED (SKIP_TELEGRAM=1; completion marker cleared)"
+  fi
   exit 0
 fi
 
+if already_done 30-telegram; then
+  if [[ "$telegram_status" == "verified" ]]; then
+    log "[30] telegram already wired — skipping"
+    exit 0
+  fi
+  clear_done 30-telegram
+  log "[30] stale deferred completion marker cleared — reconciling Telegram"
+fi
+
 RUNTIME="$ROLE_DIR/runtime"
 ENVF="$RUNTIME/.env"
 mkdir -p "$RUNTIME"
@@ -81,6 +94,7 @@ fi
 
 if [[ -z "${TELEGRAM_BOT_TOKEN:-}" ]]; then
   telegram_yaml_update provisioning_status deferred
+  clear_done 30-telegram
   warn "    no token provided; Telegram step deferred"
   warn "    re-run later with a profile-dedicated TELEGRAM_BOT_TOKEN invocation"
   exit 0

package/templates/hermes-agent/template/.scripts/70-systemd.sh

@@ -5,9 +5,42 @@
 source "$(dirname "$0")/_lib.sh"
 load_role_env
 
+if [[ "$ROLE" == "reporter" ]]; then
+  log "[70] reporter systemd — gateway/consumer intentionally not installed"
+  log "    use the reporter runtime's explicit install command after credential and policy preflight"
+  mark_done 70-systemd
+  exit 0
+fi
+
+# Resolve expected paths without creating directories or querying the user
+# manager.  A legacy skip-created marker is complete only when all units exist.
 RUNTIME="$ROLE_DIR/runtime"
+FLEET_HOME="${HERMES_FLEET_HOME:-$HOME/.hermes}"
+PROFILE_HOME="$FLEET_HOME/profiles/${PROFILE_NAME:-$AGENT_ID}"
 REPO_ROOT="$(project_repo_path)" || REPO_ROOT="$ROLE_DIR"
 SYS_DIR="$HOME/.config/systemd/user"
+GW_UNIT="hermes-${AGENT_ID}-gateway.service"
+HB_SVC="hermes-${AGENT_ID}-heartbeat.service"
+HB_TIMER="hermes-${AGENT_ID}-heartbeat.timer"
+
+# Local-only provisioning must not inspect or mutate the host user manager.
+# Honor the explicit skip before creating unit directories or querying legacy
+# unit state; cleanup remains fail-closed whenever systemd management is active.
+if [[ "${SKIP_SYSTEMD:-0}" == "1" ]]; then
+  if already_done 70-systemd \
+     && [[ -f "$SYS_DIR/$GW_UNIT" && -f "$SYS_DIR/$HB_SVC" && -f "$SYS_DIR/$HB_TIMER" ]]; then
+    log "[70] systemd — SKIPPED; existing complete unit set preserved"
+  else
+    clear_done 70-systemd
+    log "[70] systemd — DEFERRED (completion marker cleared)"
+  fi
+  exit 0
+fi
+
+# Singleton-runtime contract: units set HERMES_HOME to the agent's NAMED PROFILE
+# dir, never the raw runtime path — Hermes derives profile identity and shared
+# fleet auth from the unresolved HERMES_HOME. $RUNTIME stays correct for
+# EnvironmentFile and logs: those are the repo-owned side the profile links to.
 mkdir -p "$SYS_DIR" "$RUNTIME/logs"
 
 # Upgrade remediation must run before honoring a legacy done marker. Older
@@ -49,17 +82,49 @@ if [[ $legacy_consumer_present -eq 1 ]]; then
   log "    retired legacy per-profile Bloodbank consumer: $LEGACY_CONSUMER_UNIT"
 fi
 
-already_done 70-systemd && { log "[70] systemd already installed — legacy cleanup checked"; exit 0; }
-[[ "${SKIP_SYSTEMD:-0}" == "1" ]] && { log "[70] systemd — SKIPPED"; mark_done 70-systemd; exit 0; }
+if already_done 70-systemd; then
+  if [[ -f "$SYS_DIR/$GW_UNIT" && -f "$SYS_DIR/$HB_SVC" && -f "$SYS_DIR/$HB_TIMER" ]]; then
+    log "[70] systemd already installed — reconciling unit definitions"
+  else
+    clear_done 70-systemd
+    log "    stale/incomplete systemd marker cleared — reconciling required units"
+  fi
+fi
 
 # The heartbeat runner (board-reconciliation sentinel pass + gated checkpoint)
 # and the checkpoint helper both render into the role dir; just ensure they are
 # executable. heartbeat.sh calls checkpoint.sh internally.
 HEARTBEAT_BIN="$ROLE_DIR/.scripts/heartbeat.sh"
-chmod +x "$HEARTBEAT_BIN" "$ROLE_DIR/.scripts/checkpoint.sh" 2>/dev/null || true
+CREDENTIAL_LAUNCHER="$ROLE_DIR/.scripts/credential-launch.sh"
+chmod +x "$HEARTBEAT_BIN" "$CREDENTIAL_LAUNCHER" "$ROLE_DIR/.scripts/checkpoint.sh" 2>/dev/null || true
+
+[[ -d "$PROFILE_HOME" && ! -L "$PROFILE_HOME" ]] \
+  || die "named profile is not a real directory; run: pj migrate hermes.runtime-singleton '$REPO_ROOT'"
+
+# Encrypted credentials are optional and take precedence over the existing
+# ignored runtime/.env fallback. Their plaintext appears only below /run while
+# systemd executes the unit. Files are provisioned separately with
+# `systemd-creds encrypt --user`; this step never reads or writes secret values.
+CREDENTIAL_DIR="${HERMES_SYSTEMD_CREDENTIAL_DIR:-$HOME/.config/hermes-agent/credentials}"
+TELEGRAM_CREDENTIAL="$CREDENTIAL_DIR/${AGENT_ID}-telegram-bot-token.cred"
+MODEL_CREDENTIAL="$CREDENTIAL_DIR/${AGENT_ID}-model-api-key.cred"
+GW_CREDENTIAL_LINES=""
+HB_CREDENTIAL_LINES=""
+if [[ -f "$TELEGRAM_CREDENTIAL" ]]; then
+  command -v systemd-creds >/dev/null 2>&1 \
+    || die "encrypted Telegram credential exists but systemd-creds is unavailable"
+  GW_CREDENTIAL_LINES="LoadCredentialEncrypted=telegram_bot_token:$TELEGRAM_CREDENTIAL"
+fi
+if [[ -f "$MODEL_CREDENTIAL" ]]; then
+  [[ -n "$(yaml_get model.key_env)" ]] \
+    || die "encrypted model credential exists but model.key_env is blank in role.yaml"
+  command -v systemd-creds >/dev/null 2>&1 \
+    || die "encrypted model credential exists but systemd-creds is unavailable"
+  GW_CREDENTIAL_LINES="${GW_CREDENTIAL_LINES}${GW_CREDENTIAL_LINES:+$'\n'}LoadCredentialEncrypted=model_api_key:$MODEL_CREDENTIAL"
+  HB_CREDENTIAL_LINES="LoadCredentialEncrypted=model_api_key:$MODEL_CREDENTIAL"
+fi
 
 # Gateway unit
-GW_UNIT="hermes-${AGENT_ID}-gateway.service"
 cat > "$SYS_DIR/$GW_UNIT" <<UNIT
 [Unit]
 Description=Hermes Gateway — $DISPLAY_NAME
@@ -68,11 +133,13 @@ Wants=network-online.target
 
 [Service]
 Type=simple
-Environment=HERMES_HOME=$RUNTIME
-Environment=HERMES_OAUTH_FILE=$HERMES_OAUTH_FILE
+Environment=HERMES_HOME=$PROFILE_HOME
+Environment=HERMES_BIN=$HERMES_BIN
 Environment=CODEX_HOME=$CODEX_HOME
+Environment="TERMINAL_CWD=$REPO_ROOT"
 EnvironmentFile=-$RUNTIME/.env
-ExecStart=$HERMES_BIN gateway run --replace
+$GW_CREDENTIAL_LINES
+ExecStart=$CREDENTIAL_LAUNCHER gateway
 Restart=on-failure
 RestartSec=10
 StandardOutput=append:$RUNTIME/logs/gateway.systemd.log
@@ -86,8 +153,6 @@ UNIT
 # Frequent ticks (1 min); heartbeat.sh's own cooldown/lock logic rate-limits the
 # full Hermes pass, and the checkpoint is gated to ~hourly inside the runner.
 # The per-agent EnvironmentFiles load ticket-provider creds for the sentinel pass.
-HB_SVC="hermes-${AGENT_ID}-heartbeat.service"
-HB_TIMER="hermes-${AGENT_ID}-heartbeat.timer"
 cat > "$SYS_DIR/$HB_SVC" <<UNIT
 [Unit]
 Description=Hermes Heartbeat (reconcile + checkpoint) — $DISPLAY_NAME
@@ -97,15 +162,17 @@ Wants=network-online.target
 [Service]
 Type=oneshot
 WorkingDirectory=$REPO_ROOT
-Environment=HERMES_HOME=$RUNTIME
-Environment=HERMES_OAUTH_FILE=$HERMES_OAUTH_FILE
+Environment=HERMES_HOME=$PROFILE_HOME
+Environment=HERMES_BIN=$HERMES_BIN
 Environment=CODEX_HOME=$CODEX_HOME
+Environment="TERMINAL_CWD=$REPO_ROOT"
 EnvironmentFile=-%h/.config/hermes-agent/env
 EnvironmentFile=-%h/.hermes/env
 EnvironmentFile=-%h/.hermes/hermes-agent.env
 EnvironmentFile=-%h/.hermes/${AGENT_ID}.env
 EnvironmentFile=-$RUNTIME/.env
-ExecStart=$HEARTBEAT_BIN
+$HB_CREDENTIAL_LINES
+ExecStart=$CREDENTIAL_LAUNCHER heartbeat
 TimeoutStartSec=45min
 StandardOutput=append:$RUNTIME/logs/heartbeat.log
 StandardError=append:$RUNTIME/logs/heartbeat.log

package/templates/hermes-agent/template/.scripts/80-registry.sh

@@ -29,7 +29,8 @@ python3 - "$REGISTRY_FILE" "$AGENT_ID" "$REPO" "$ROLE" "$DISPLAY_NAME" \
   "$(yaml_get slack.provisioning_status)" "$(yaml_get slack.team_id)" \
   "$(yaml_get slack.team_name)" "$(yaml_get slack.bot_user_id)" \
   "$(yaml_get slack.bot_id)" "$(yaml_get slack.bot_username)" \
-  "$(yaml_get bloodbank.gateway_scope)" "$(yaml_get bloodbank.target_agent_id)" \
+  "$(yaml_get bloodbank.enabled)" "$(yaml_get bloodbank.gateway_scope)" \
+  "$(yaml_get bloodbank.target_agent_id)" \
   "$PLANE_WORKSPACE" "$PLANE_PROJECT_ID" "$(yaml_get plane.identifier)" \
   "$RUNTIME_REPO" "$HERMES_BIN" "$HERMES_AGENT_REPO" "$HERMES_RUNTIME_GIT_URL" \
   "$HERMES_RUNTIME_GIT_REF" "$HERMES_RUNTIME_GIT_SHA" "$FLEET_ENV" \
@@ -47,13 +48,21 @@ except ImportError:
 (path, agent_id, repo, role, display, project, role_dir, profile,
  telegram_status, bot, telegram_bot_id,
  slack_status, slack_team_id, slack_team_name, slack_user_id, slack_bot_id,
- slack_username, bloodbank_scope, bloodbank_target, plane_ws, plane_id,
+ slack_username, bloodbank_enabled, bloodbank_scope, bloodbank_target, plane_ws, plane_id,
  plane_ident, runtime_repo, hermes_bin, hermes_repo, hermes_git_url,
- hermes_git_ref, hermes_git_sha, fleet_env, gw, heartbeat) = sys.argv[1:32]
+ hermes_git_ref, hermes_git_sha, fleet_env, gw, heartbeat) = sys.argv[1:33]
 p = pathlib.Path(path)
 if p.is_symlink():
     raise SystemExit(f"refusing to update registry symlink: {p}")
 data = yaml.safe_load(p.read_text()) or {"schema_version": 1, "agents": {}}
+if bloodbank_enabled == "":
+    bloodbank_enabled_value = False
+elif bloodbank_enabled == "true":
+    bloodbank_enabled_value = True
+elif bloodbank_enabled == "false":
+    bloodbank_enabled_value = False
+else:
+    raise SystemExit("bloodbank.enabled must be the strict YAML boolean true or false")
 data.setdefault("agents", {})[agent_id] = {
   "repo": repo, "role": role, "display_name": display,
   "project_path": project, "role_dir": role_dir,
@@ -72,6 +81,7 @@ data.setdefault("agents", {})[agent_id] = {
     "bot_username": slack_username,
   },
   "bloodbank": {
+    "enabled": bloodbank_enabled_value,
     "gateway_scope": bloodbank_scope,
     "target_agent_id": bloodbank_target,
   },