uv-suite 0.26.0 → 0.26.2

package/personas/professional.json

@@ -1,7 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/claude-code-settings.json",
   "effort": "high",
-
   "permissions": {
     "allow": [
       "Read(*)",
@@ -46,7 +45,6 @@
       "Bash(git reset --hard origin/*)"
     ]
   },
-
   "hooks": {
     "SessionStart": [
       {
@@ -70,6 +68,16 @@
       {
         "matcher": "*",
         "hooks": [
+          {
+            "type": "command",
+            "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/confirm-prompt.sh",
+            "timeout": 3
+          },
+          {
+            "type": "command",
+            "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/session-label-nag.sh",
+            "timeout": 3
+          },
           {
             "type": "command",
             "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/watchtower-send.sh UserPromptSubmit",
@@ -83,7 +91,12 @@
       {
         "matcher": "*",
         "hooks": [
-          { "type": "command", "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/watchtower-send.sh PermissionRequest", "timeout": 2, "async": true }
+          {
+            "type": "command",
+            "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/watchtower-send.sh PermissionRequest",
+            "timeout": 2,
+            "async": true
+          }
         ]
       }
     ],
@@ -91,7 +104,12 @@
       {
         "matcher": "*",
         "hooks": [
-          { "type": "command", "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/watchtower-send.sh Notification", "timeout": 2, "async": true }
+          {
+            "type": "command",
+            "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/watchtower-send.sh Notification",
+            "timeout": 2,
+            "async": true
+          }
         ]
       }
     ],
@@ -99,7 +117,12 @@
       {
         "matcher": "*",
         "hooks": [
-          { "type": "command", "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/watchtower-send.sh PostToolUseFailure", "timeout": 2, "async": true }
+          {
+            "type": "command",
+            "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/watchtower-send.sh PostToolUseFailure",
+            "timeout": 2,
+            "async": true
+          }
         ]
       }
     ],
@@ -176,9 +199,8 @@
       }
     ]
   },
-
   "statusLine": {
     "type": "command",
     "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/status-line.sh"
   }
-}
+}

package/personas/spike.json

@@ -2,7 +2,6 @@
   "$schema": "https://json.schemastore.org/claude-code-settings.json",
   "model": "claude-opus-4-6",
   "effort": "max",
-
   "permissions": {
     "allow": [
       "Read(*)",
@@ -34,14 +33,22 @@
       "Bash(npx *)"
     ]
   },
-
   "hooks": {
     "SessionStart": [
       {
         "matcher": "*",
         "hooks": [
-          { "type": "command", "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/session-start.sh", "timeout": 5 },
-          { "type": "command", "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/watchtower-send.sh SessionStart", "timeout": 2, "async": true }
+          {
+            "type": "command",
+            "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/session-start.sh",
+            "timeout": 5
+          },
+          {
+            "type": "command",
+            "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/watchtower-send.sh SessionStart",
+            "timeout": 2,
+            "async": true
+          }
         ]
       }
     ],
@@ -49,30 +56,74 @@
       {
         "matcher": "*",
         "hooks": [
-          { "type": "command", "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/watchtower-send.sh UserPromptSubmit", "timeout": 2, "async": true }
+          {
+            "type": "command",
+            "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/confirm-prompt.sh",
+            "timeout": 3
+          },
+          {
+            "type": "command",
+            "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/session-label-nag.sh",
+            "timeout": 3
+          },
+          {
+            "type": "command",
+            "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/watchtower-send.sh UserPromptSubmit",
+            "timeout": 2,
+            "async": true
+          }
         ]
       }
     ],
     "PermissionRequest": [
-      { "matcher": "*", "hooks": [
-        { "type": "command", "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/watchtower-send.sh PermissionRequest", "timeout": 2, "async": true }
-      ]}
+      {
+        "matcher": "*",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/watchtower-send.sh PermissionRequest",
+            "timeout": 2,
+            "async": true
+          }
+        ]
+      }
     ],
     "Notification": [
-      { "matcher": "*", "hooks": [
-        { "type": "command", "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/watchtower-send.sh Notification", "timeout": 2, "async": true }
-      ]}
+      {
+        "matcher": "*",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/watchtower-send.sh Notification",
+            "timeout": 2,
+            "async": true
+          }
+        ]
+      }
     ],
     "PostToolUseFailure": [
-      { "matcher": "*", "hooks": [
-        { "type": "command", "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/watchtower-send.sh PostToolUseFailure", "timeout": 2, "async": true }
-      ]}
+      {
+        "matcher": "*",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/watchtower-send.sh PostToolUseFailure",
+            "timeout": 2,
+            "async": true
+          }
+        ]
+      }
     ],
     "PostToolUse": [
       {
         "matcher": "*",
         "hooks": [
-          { "type": "command", "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/watchtower-send.sh PostToolUse", "timeout": 2, "async": true }
+          {
+            "type": "command",
+            "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/watchtower-send.sh PostToolUse",
+            "timeout": 2,
+            "async": true
+          }
         ]
       },
       {
@@ -91,14 +142,17 @@
       {
         "matcher": "*",
         "hooks": [
-          { "type": "command", "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/session-end.sh", "timeout": 10 }
+          {
+            "type": "command",
+            "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/session-end.sh",
+            "timeout": 10
+          }
         ]
       }
     ]
   },
-
   "statusLine": {
     "type": "command",
     "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/status-line.sh"
   }
-}
+}

package/personas/sport.json

@@ -2,7 +2,6 @@
   "$schema": "https://json.schemastore.org/claude-code-settings.json",
   "model": "claude-sonnet-4-6",
   "effort": "high",
-
   "permissions": {
     "allow": [
       "Read(*)",
@@ -20,14 +19,22 @@
       "Bash(git *)"
     ]
   },
-
   "hooks": {
     "SessionStart": [
       {
         "matcher": "*",
         "hooks": [
-          { "type": "command", "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/session-start.sh", "timeout": 5 },
-          { "type": "command", "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/watchtower-send.sh SessionStart", "timeout": 2, "async": true }
+          {
+            "type": "command",
+            "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/session-start.sh",
+            "timeout": 5
+          },
+          {
+            "type": "command",
+            "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/watchtower-send.sh SessionStart",
+            "timeout": 2,
+            "async": true
+          }
         ]
       }
     ],
@@ -35,30 +42,74 @@
       {
         "matcher": "*",
         "hooks": [
-          { "type": "command", "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/watchtower-send.sh UserPromptSubmit", "timeout": 2, "async": true }
+          {
+            "type": "command",
+            "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/confirm-prompt.sh",
+            "timeout": 3
+          },
+          {
+            "type": "command",
+            "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/session-label-nag.sh",
+            "timeout": 3
+          },
+          {
+            "type": "command",
+            "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/watchtower-send.sh UserPromptSubmit",
+            "timeout": 2,
+            "async": true
+          }
         ]
       }
     ],
     "PermissionRequest": [
-      { "matcher": "*", "hooks": [
-        { "type": "command", "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/watchtower-send.sh PermissionRequest", "timeout": 2, "async": true }
-      ]}
+      {
+        "matcher": "*",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/watchtower-send.sh PermissionRequest",
+            "timeout": 2,
+            "async": true
+          }
+        ]
+      }
     ],
     "Notification": [
-      { "matcher": "*", "hooks": [
-        { "type": "command", "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/watchtower-send.sh Notification", "timeout": 2, "async": true }
-      ]}
+      {
+        "matcher": "*",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/watchtower-send.sh Notification",
+            "timeout": 2,
+            "async": true
+          }
+        ]
+      }
     ],
     "PostToolUseFailure": [
-      { "matcher": "*", "hooks": [
-        { "type": "command", "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/watchtower-send.sh PostToolUseFailure", "timeout": 2, "async": true }
-      ]}
+      {
+        "matcher": "*",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/watchtower-send.sh PostToolUseFailure",
+            "timeout": 2,
+            "async": true
+          }
+        ]
+      }
     ],
     "PostToolUse": [
       {
         "matcher": "*",
         "hooks": [
-          { "type": "command", "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/watchtower-send.sh PostToolUse", "timeout": 2, "async": true }
+          {
+            "type": "command",
+            "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/watchtower-send.sh PostToolUse",
+            "timeout": 2,
+            "async": true
+          }
         ]
       },
       {
@@ -77,14 +128,17 @@
       {
         "matcher": "*",
         "hooks": [
-          { "type": "command", "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/session-end.sh", "timeout": 10 }
+          {
+            "type": "command",
+            "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/session-end.sh",
+            "timeout": 10
+          }
         ]
       }
     ]
   },
-
   "statusLine": {
     "type": "command",
     "command": "\"$CLAUDE_PROJECT_DIR\"/.claude/hooks/status-line.sh"
   }
-}
+}

package/skills/checkpoint/SKILL.md

@@ -12,23 +12,35 @@ allowed-tools:
   - Bash(git status *)
   - Bash(git diff *)
   - Bash(git log *)
+  - Bash(git rev-parse *)
   - Bash(date *)
   - Bash(ls *)
+  - Bash(mkdir *)
+  - Bash(echo *)
 ---
 
-## Write a checkpoint to uv-out/checkpoints/
+## Resolve checkpoint directory
 
-Create the directory `uv-out/checkpoints/` if it doesn't exist.
+Anchor checkpoints to `$CLAUDE_PROJECT_DIR` (or the git repo root, or the current
+working dir as a last resort) so `/checkpoint` and `/restore` always agree, no matter
+which subdirectory the session was launched from.
 
-Write a file named `uv-out/checkpoints/YYYY-MM-DD-HHMM.md` (using the current timestamp).
+!`DIR="${CLAUDE_PROJECT_DIR:-$(git rev-parse --show-toplevel 2>/dev/null || pwd)}/uv-out/checkpoints"; mkdir -p "$DIR"; echo "$DIR"`
 
-Also write/overwrite `uv-out/checkpoints/latest.md` with the same content (so the next session can always find the most recent checkpoint).
+Use the absolute path printed above as `<checkpoint-dir>` for every file path below.
+
+## Write a checkpoint
+
+Write a file named `<checkpoint-dir>/YYYY-MM-DD-HHMM.md` using the current timestamp.
+
+Also write/overwrite `<checkpoint-dir>/latest.md` with the same content, so the next
+session's `/restore` always finds the freshest state.
 
 ## Label
 
 $ARGUMENTS
 
-If a label was provided, include it in the filename: `uv-out/checkpoints/YYYY-MM-DD-HHMM-[label].md`
+If a label was provided, include it in the filename: `<checkpoint-dir>/YYYY-MM-DD-HHMM-[label].md`
 
 ## What to capture
 

package/skills/confirm/SKILL.md

@@ -0,0 +1,35 @@
+---
+name: confirm
+description: >
+  Toggle confirm-mode (reframe-and-confirm long prompts) or change the word threshold.
+  When confirm-mode is on and a user prompt exceeds the threshold, the assistant will
+  restate the request and wait for confirmation before doing any work.
+argument-hint: "[on|off|<number>|status]"
+user-invocable: true
+allowed-tools:
+  - Bash(mkdir *)
+  - Bash(echo *)
+  - Bash(cat *)
+  - Bash(printf *)
+---
+
+## Apply /confirm $ARGUMENTS
+
+!`STATE_DIR="${CLAUDE_PROJECT_DIR:-.}/.uv-suite-state"; mkdir -p "$STATE_DIR"; MODE_FILE="$STATE_DIR/confirm-mode.txt"; THRESH_FILE="$STATE_DIR/confirm-threshold.txt"; ARG=$(printf '%s' "$ARGUMENTS" | tr -d '[:space:]'); current_mode() { cat "$MODE_FILE" 2>/dev/null || echo "on"; }; current_thresh() { cat "$THRESH_FILE" 2>/dev/null || echo "50"; }; case "$ARG" in on) echo "on" > "$MODE_FILE"; echo "Confirm mode: ON (threshold: $(current_thresh) words)";; off) echo "off" > "$MODE_FILE"; echo "Confirm mode: OFF";; ''|status) echo "Confirm mode: $(current_mode) (threshold: $(current_thresh) words)";; *) if printf '%s' "$ARG" | grep -qE '^[0-9]+$'; then echo "$ARG" > "$THRESH_FILE"; echo "Threshold set to $ARG words (mode: $(current_mode))"; else echo "Usage: /confirm [on | off | <number> | status]"; fi;; esac`
+
+## Instructions
+
+Show the user the line of output above as the response — that line is the confirmation
+that the toggle took effect. Do not add commentary. The change applies to the very
+next user prompt; no restart needed.
+
+## What this controls
+
+- `on` / `off` — enable or disable the reframe-and-confirm behavior driven by
+  `hooks/confirm-prompt.sh` on every UserPromptSubmit event.
+- `<number>` — set the word-count threshold above which prompts trigger a confirmation
+  step. Slash commands (`/foo ...`) are always exempt.
+- `status` (or no argument) — print the current mode and threshold.
+
+State lives in `${CLAUDE_PROJECT_DIR}/.uv-suite-state/confirm-mode.txt` and
+`confirm-threshold.txt`. Defaults if missing: mode `on`, threshold `50`.

package/skills/restore/SKILL.md

@@ -7,15 +7,18 @@ user-invocable: true
 allowed-tools:
   - Read(*)
   - Bash(ls *)
+  - Bash(cat *)
+  - Bash(grep *)
+  - Bash(git rev-parse *)
 ---
 
 ## Latest checkpoint
 
-!`cat uv-out/checkpoints/latest.md 2>/dev/null || echo "No checkpoint found. Run /checkpoint to create one."`
+!`DIR="${CLAUDE_PROJECT_DIR:-$(git rev-parse --show-toplevel 2>/dev/null || pwd)}/uv-out/checkpoints"; if [ -f "$DIR/latest.md" ]; then cat "$DIR/latest.md"; else echo "No checkpoint found at $DIR. Run /checkpoint to create one."; fi`
 
 ## All checkpoints
 
-!`ls -la uv-out/checkpoints/*.md 2>/dev/null | tail -10 || echo "No checkpoints directory"`
+!`DIR="${CLAUDE_PROJECT_DIR:-$(git rev-parse --show-toplevel 2>/dev/null || pwd)}/uv-out/checkpoints"; if [ -d "$DIR" ]; then matches=$(ls -la "$DIR"/ 2>/dev/null | grep '\.md$' | tail -10); if [ -n "$matches" ]; then echo "$matches"; else echo "No checkpoints in $DIR"; fi; else echo "No checkpoints directory at $DIR"; fi`
 
 ## Instructions
 

package/skills/session-init/SKILL.md

@@ -0,0 +1,45 @@
+---
+name: session-init
+description: >
+  Label or relabel the current UV Suite session — sets name, kind (long-running
+  vs outcome), purpose, and priority (low/med/high). Metadata appears in the
+  watchtower dashboard. Use when you skipped the launcher prompt or want to
+  rename a session mid-flight.
+argument-hint: "<name> | --kind long|outcome | --purpose <text> | --priority low|med|high | show | clear"
+user-invocable: true
+allowed-tools:
+  - Bash("$CLAUDE_PROJECT_DIR"/.claude/hooks/session-meta.sh *)
+---
+
+## Apply /session-init $ARGUMENTS
+
+!`HELPER="$CLAUDE_PROJECT_DIR/.claude/hooks/session-meta.sh"; ARGS="$ARGUMENTS"; if [ -z "$ARGS" ] || [ "$ARGS" = "show" ]; then "$HELPER" show; elif [ "$ARGS" = "clear" ]; then "$HELPER" clear; else FIRST=$(printf '%s' "$ARGS" | awk '{print $1}'); REST=$(printf '%s' "$ARGS" | sed 's/^[^ ]* *//'); case "$FIRST" in --kind) "$HELPER" set-kind "$REST" ;; --priority) "$HELPER" set-priority "$REST" ;; --purpose) "$HELPER" set-purpose "$REST" ;; --name) "$HELPER" set-name "$REST" ;; *) "$HELPER" set-name "$ARGS" ;; esac; fi`
+
+## Instructions
+
+Show the user the output of the command above. Do not add commentary — the
+command itself confirms what changed. The dashboard reflects changes within
+a few seconds (next event refreshes session metadata).
+
+## Usage
+
+```
+/session-init                                  show current values
+/session-init show                             show current values
+/session-init <free-text name>                 set the name (default action)
+/session-init --kind long                      set kind: long-running
+/session-init --kind outcome                   set kind: outcome
+/session-init --priority high                  set priority: low | med | high
+/session-init --purpose <free text>            set the purpose
+/session-init clear                            clear name, kind, purpose, priority
+```
+
+## Notes
+
+- The session id is generated by `uv.sh` at launch and exported as
+  `UVS_SESSION_ID`. If you launched `claude` directly, this falls back
+  to an `ad-hoc-<timestamp>` id.
+- Metadata lives at `.uv-suite-state/sessions/<id>.json`.
+- Persona is captured at launch time and is not editable from here —
+  re-launch with a different `uv` persona to change it.
+- Each invocation sets one field at a time. Run multiple times to set more.

package/uv.sh

@@ -41,6 +41,12 @@ case "$1" in
     echo "    pro      Production code (all hooks, all guardrails)"
     echo "    auto     Fully autonomous (max effort, everything approved)"
     echo ""
+    echo "  Session metadata:"
+    echo "    On launch you'll be prompted for name, kind, purpose, and"
+    echo "    priority. Press Enter to skip any field; you'll be reminded"
+    echo "    until the session is named. Use /session-init to relabel."
+    echo "    Set UVS_NO_PROMPT=1 to suppress prompts entirely."
+    echo ""
     exit 0
     ;;
   "")
@@ -73,6 +79,76 @@ case "$PERSONA" in
   auto)         LABEL="Auto — autonomous (max, everything approved)" ;;
 esac
 
+# --- Session metadata: generate id and prompt for label ---
+PROJECT_DIR="$(pwd)"
+STATE_DIR="$PROJECT_DIR/.uv-suite-state"
+SESSIONS_DIR="$STATE_DIR/sessions"
+mkdir -p "$SESSIONS_DIR"
+
+if command -v uuidgen >/dev/null 2>&1; then
+  UVS_SESSION_ID=$(uuidgen | tr '[:upper:]' '[:lower:]')
+else
+  UVS_SESSION_ID="uvs-$(date +%s)-$$"
+fi
+export UVS_SESSION_ID
+
+UVS_NAME=""
+UVS_KIND=""
+UVS_PURPOSE=""
+UVS_PRIORITY=""
+
+# Prompt only if attached to a TTY and not explicitly suppressed
+if [ -t 0 ] && [ -z "$UVS_NO_PROMPT" ]; then
+  echo ""
+  echo "Label this session (Enter to skip — you'll be reminded):"
+  read -r -p "  name:                     " UVS_NAME
+  read -r -p "  kind [long/outcome]:      " UVS_KIND_RAW
+  read -r -p "  purpose:                  " UVS_PURPOSE
+  read -r -p "  priority [low/med/high]:  " UVS_PRIORITY_RAW
+
+  case "$UVS_KIND_RAW" in
+    l|long|long-running) UVS_KIND="long-running" ;;
+    o|outcome)           UVS_KIND="outcome" ;;
+    "")                  UVS_KIND="" ;;
+    *) echo "  (kind '$UVS_KIND_RAW' not recognized — leaving blank)"; UVS_KIND="" ;;
+  esac
+
+  case "$UVS_PRIORITY_RAW" in
+    l|low)        UVS_PRIORITY="low" ;;
+    m|med|medium) UVS_PRIORITY="med" ;;
+    h|high)       UVS_PRIORITY="high" ;;
+    "")           UVS_PRIORITY="" ;;
+    *) echo "  (priority '$UVS_PRIORITY_RAW' not recognized — leaving blank)"; UVS_PRIORITY="" ;;
+  esac
+fi
+
+# Write metadata as JSON. Use python3 for proper escaping of free-text fields.
+META_FILE="$SESSIONS_DIR/$UVS_SESSION_ID.json"
+SID="$UVS_SESSION_ID" \
+NAME="$UVS_NAME" \
+KIND="$UVS_KIND" \
+PURPOSE="$UVS_PURPOSE" \
+PRIORITY="$UVS_PRIORITY" \
+PERSONA_VAL="$PERSONA" \
+CWD_VAL="$PROJECT_DIR" \
+STARTED="$(date +%s)" \
+python3 -c '
+import json, os
+print(json.dumps({
+    "uvs_session_id": os.environ["SID"],
+    "name": os.environ["NAME"],
+    "kind": os.environ["KIND"],
+    "purpose": os.environ["PURPOSE"],
+    "priority": os.environ["PRIORITY"],
+    "persona": os.environ["PERSONA_VAL"],
+    "cwd": os.environ["CWD_VAL"],
+    "started_at": int(os.environ["STARTED"]),
+}, indent=2))
+' > "$META_FILE" 2>/dev/null
+
+# Latest-session pointer (used by hooks that lack UVS_SESSION_ID in their env)
+echo "$UVS_SESSION_ID" > "$STATE_DIR/current-session.txt"
+
 SETTINGS=".claude/personas/$PERSONA.json"
 
 if [ "$TOOL" = "claude" ]; then
@@ -87,7 +163,9 @@ if [ "$TOOL" = "claude" ]; then
     exit 1
   fi
 
+  echo ""
   echo "UV Suite | Claude Code | $LABEL"
+  echo "Session: ${UVS_SESSION_ID:0:8}${UVS_NAME:+ — $UVS_NAME}"
   echo ""
   exec claude --settings "$SETTINGS" "$@"
 
@@ -99,24 +177,16 @@ elif [ "$TOOL" = "codex" ]; then
     exit 1
   fi
 
-  # Codex doesn't have --settings, but reads AGENTS.md and .codex/agents/
-  # We can pass model and approval mode based on persona
   case "$PERSONA" in
-    spike)
-      CODEX_ARGS="--model o3 --approval-mode suggest"
-      ;;
-    sport)
-      CODEX_ARGS="--approval-mode auto-edit"
-      ;;
-    professional)
-      CODEX_ARGS="--approval-mode suggest"
-      ;;
-    auto)
-      CODEX_ARGS="--approval-mode full-auto"
-      ;;
+    spike)        CODEX_ARGS="--model o3 --approval-mode suggest" ;;
+    sport)        CODEX_ARGS="--approval-mode auto-edit" ;;
+    professional) CODEX_ARGS="--approval-mode suggest" ;;
+    auto)         CODEX_ARGS="--approval-mode full-auto" ;;
   esac
 
+  echo ""
   echo "UV Suite | Codex | $LABEL"
+  echo "Session: ${UVS_SESSION_ID:0:8}${UVS_NAME:+ — $UVS_NAME}"
   echo ""
   exec codex $CODEX_ARGS "$@"
 fi