Patch ~/.local/bin/hermes to default HERMES_HOME — no shell sourcing needed

bootstrap.sh

@@ -215,38 +215,53 @@ chmod 600 "$SECRETS"
 ok "Secrets saved to $SECRETS (mode 600)"
 
 # ----------------------------------------------------------------------------
-# 10. Persistent HERMES_HOME export in your shell rc
+# 10. Patch the hermes entrypoint so HERMES_HOME defaults to the shadow dir
 # ----------------------------------------------------------------------------
-# Aliases were unreliable across shells. Exporting the env var instead means
-# every plain `hermes` / `hermes gateway` / `hermes cron` invocation in any new
-# shell uses the shadow dir automatically — no special command names.
+# Shell-rc exports require users to source/relaunch. Patching the launcher at
+# ~/.local/bin/hermes makes plain `hermes` and `hermes gateway` Just Work in
+# *any* shell, immediately, no sourcing. If a user explicitly sets HERMES_HOME
+# (e.g. for a profile), that wins via :=.
+HERMES_BIN="$HOME/.local/bin/hermes"
+if [ -f "$HERMES_BIN" ] && ! grep -q "HERMES_HOME:=" "$HERMES_BIN"; then
+  python3 - "$HERMES_BIN" "$HOME_DIR" <<'PY'
+import sys, pathlib
+bin_path, home_dir = sys.argv[1], sys.argv[2]
+p = pathlib.Path(bin_path)
+lines = p.read_text().splitlines(keepends=True)
+# Find the exec line and inject defaults right before it
+out = []
+injected = False
+for line in lines:
+    if not injected and line.lstrip().startswith("exec "):
+        out.append(f': "${{HERMES_HOME:={home_dir}}}"\n')
+        out.append("export HERMES_HOME\n")
+        injected = True
+    out.append(line)
+p.write_text("".join(out))
+PY
+  ok "Patched $HERMES_BIN so 'hermes' defaults to HERMES_HOME=$HOME_DIR"
+else
+  ok "$HERMES_BIN already patched (or not found)"
+fi
+
+# Clean up any prior shell-rc block from older bootstrap versions
 SHELL_NAME="${SHELL##*/}"
 case "$SHELL_NAME" in
   zsh)  SHELL_RC="$HOME/.zshrc" ;;
   bash) SHELL_RC="$HOME/.bashrc" ;;
   *)    SHELL_RC="$HOME/.profile" ;;
 esac
-
-# Remove any prior block we added (old alias-based version or earlier export)
 if [ -f "$SHELL_RC" ] && grep -q "# hermes-bucket" "$SHELL_RC"; then
   python3 - "$SHELL_RC" <<'PY'
 import sys, pathlib, re
 p = pathlib.Path(sys.argv[1])
 text = p.read_text()
-# Strip every block we previously injected, identified by the marker comment
 new = re.sub(r"\n*# hermes-bucket[^\n]*\n(?:[^\n]*\n)*?(?=\n|\Z)", "\n", text)
 p.write_text(new)
 PY
+  ok "Removed legacy hermes-bucket block from $SHELL_RC"
 fi
 
-cat >> "$SHELL_RC" <<EOF
-
-# hermes-bucket: export HERMES_HOME so 'hermes', 'hermes gateway', 'hermes cron'
-# all use the bucket-backed shadow dir. Remove this if you'd rather manage it yourself.
-export HERMES_HOME="\$HOME/.hermes-home"
-EOF
-ok "Added 'export HERMES_HOME=$HOME_DIR' to $SHELL_RC"
-
 # ----------------------------------------------------------------------------
 # 11. Summary + launch
 # ----------------------------------------------------------------------------
@@ -263,7 +278,8 @@ ${G}✓ Ready.${N}
   ${C}hermes gateway run${N}   — start Telegram bot in the foreground (Ctrl-C to stop)
   ${C}hermes gateway install${N} && ${C}hermes gateway start${N}  — run gateway as a background service
 
-  Open a new shell (or run ${C}source $SHELL_RC${N}) so HERMES_HOME is picked up automatically.
+  These work in any shell — no sourcing, no aliases. The hermes launcher
+  itself now defaults HERMES_HOME to $HOME_DIR.
 
 EOF