diff --git a/.agents/skills/lib.sh b/.agents/skills/lib.sh
index ee93964..f53c224 100644
--- a/.agents/skills/lib.sh
+++ b/.agents/skills/lib.sh
@@ -19,7 +19,7 @@ WORKSPACE_ROOT="$(cd "$SKILL_DIR/../.." && pwd)"
 AGENT_SESSIONS_YAML="${AGENT_SESSIONS_YAML:-$WORKSPACE_ROOT/.mam/agent-sessions.yaml}"
 
 # Workspace-relative defaults with environment overrides (Phase Z)
-HOME_DIR="${HOME_DIR:-$WORKSPACE_ROOT}"
+HOME_DIR="${HOME_DIR:-$HOME}"
 CLAUDE_PROJECT_DIR="${CLAUDE_PROJECT_DIR:-$HOME/.claude/projects}"
 LOCAL_BIN="${LOCAL_BIN:-$HOME/.local/bin}"
 
@@ -475,7 +475,7 @@ def db_exists(uuid):
 
 
 def hermes_exists(uuid):
-    hdb = f"{home}/.mam/state.db"
+    hdb = f"{home}/.hermes/state.db"
     if not os.path.exists(hdb):
         return False
     try:
@@ -565,7 +565,7 @@ elif agent == 'agy':
         if cand and db_exists(cand):
             emit(cand)
 elif agent == 'hermes':
-    hdb = f"{home}/.mam/state.db"
+    hdb = f"{home}/.hermes/state.db"
     if os.path.exists(hdb):
         cand = None
         try:
diff --git a/.agents/skills/multi-agent-mux-stop/scripts/stop_session.sh b/.agents/skills/multi-agent-mux-stop/scripts/stop_session.sh
index 7c8828d..9d4bfbc 100755
--- a/.agents/skills/multi-agent-mux-stop/scripts/stop_session.sh
+++ b/.agents/skills/multi-agent-mux-stop/scripts/stop_session.sh
@@ -286,11 +286,11 @@ if purge and purge_uuid:
             print(f"purged: {brain}", flush=True)
         target['agy_conversation_id_own'] = None
     elif agent == 'hermes':
-        json_file = f"{home}/.mam/sessions/session_{purge_uuid}.json"
+        json_file = f"{home}/.hermes/sessions/session_{purge_uuid}.json"
         if os.path.exists(json_file):
             os.remove(json_file)
             print(f"purged: {json_file}", flush=True)
-        hdb = f"{home}/.mam/state.db"
+        hdb = f"{home}/.hermes/state.db"
         if os.path.exists(hdb):
             try:
                 import sqlite3