diff --git a/.agents/skills/lib.sh b/.agents/skills/lib.sh
index 1e8b50a..880af2b 100644
--- a/.agents/skills/lib.sh
+++ b/.agents/skills/lib.sh
@@ -463,7 +463,7 @@ except Exception:
     fi
 
     if [ -z "$existing_ws" ] || [ -z "$target_pane" ]; then
-      ws_json=$(_real_herdr workspace create --cwd "${ws:-.}" $env_flags --no-focus 2>/dev/null || echo "")
+      ws_json=$(_real_herdr workspace create --cwd "${ws:-.}" ${MAM_WS_LABEL:+--label "$MAM_WS_LABEL"} $env_flags --no-focus 2>/dev/null || echo "")
       target_pane=$(echo "$ws_json" | python3 -c "
 import sys, json
 try:
@@ -474,6 +474,10 @@ try:
 except Exception:
     pass
 " 2>/dev/null || echo "")
+    else
+      if [ -n "$MAM_WS_LABEL" ]; then
+        _real_herdr workspace rename "$existing_ws" "$MAM_WS_LABEL" >/dev/null 2>&1 || true
+      fi
     fi
 
     if [ -z "$target_pane" ]; then
diff --git a/.agents/skills/multi-agent-mux-resume/scripts/resume_session.sh b/.agents/skills/multi-agent-mux-resume/scripts/resume_session.sh
index 4521f36..7926333 100755
--- a/.agents/skills/multi-agent-mux-resume/scripts/resume_session.sh
+++ b/.agents/skills/multi-agent-mux-resume/scripts/resume_session.sh
@@ -63,6 +63,12 @@ else
   export HERDR_SESSION_NAME
 fi
 
+if [ -n "$HERDR_WORKSPACE_OPT" ]; then
+  export MAM_WS_LABEL="$HERDR_WORKSPACE_OPT"
+else
+  export MAM_WS_LABEL="$(resolve_herdr_workspace "$SESSION_NAME" "$WORKSPACE")"
+fi
+
 # 2. If herdr is alive, print warning or attach.
 if herdr has-session -t "$SESSION_NAME" 2>/dev/null; then
   if [ "${DRY_RUN:-0}" = "1" ]; then