uv-suite 0.29.0 → 0.32.0

package/bin/cli.js

@@ -34,6 +34,7 @@ function usage() {
   Monitoring:
     uvs watch               Start Watchtower dashboard (open browser)
     uvs watch --bg          Start Watchtower in background
+    uvs watch --legacy      Start the legacy Node Watchtower
 
   Personas:
     spike        Research & docs (Opus, max effort)
@@ -182,19 +183,19 @@ function prompt(rl, question) {
   return new Promise((resolve) => rl.question(question, resolve));
 }
 
-function normalizeKind(s) {
-  const v = (s || "").toLowerCase().trim();
-  if (["l", "long", "long-running"].includes(v)) return "long-running";
-  if (["o", "outcome"].includes(v)) return "outcome";
-  return "";
-}
-
-function normalizePriority(s) {
-  const v = (s || "").toLowerCase().trim();
-  if (["l", "low"].includes(v)) return "low";
-  if (["m", "med", "medium"].includes(v)) return "med";
-  if (["h", "high"].includes(v)) return "high";
-  return "";
+// Prompt for one of a fixed set of values (enum). Accepts the number, the full
+// value, or a unique prefix; Enter skips (returns ""). Re-prompts on invalid input.
+async function promptChoice(rl, label, options) {
+  const menu = options.map((o, i) => `${i + 1}=${o}`).join("  ");
+  for (;;) {
+    const raw = (await prompt(rl, `${label} (${menu}, Enter to skip): `)).trim().toLowerCase();
+    if (!raw) return "";
+    const n = parseInt(raw, 10);
+    if (n >= 1 && n <= options.length) return options[n - 1];
+    const matches = options.filter((o) => o === raw || o.startsWith(raw));
+    if (matches.length === 1) return matches[0];
+    console.log(`  ? pick one of: ${options.join(", ")} (or its number)`);
+  }
 }
 
 // Generate a UVS_SESSION_ID, prompt for metadata (name/kind/purpose/priority),
@@ -220,13 +221,11 @@ async function setupSession(persona) {
     });
     console.log("");
     console.log("Label this session (Enter to skip — you'll be reminded):");
-    name = (await prompt(rl, "  name:                     ")).trim();
-    const kindRaw = await prompt(rl, "  kind [long/outcome]:      ");
-    purpose = (await prompt(rl, "  purpose:                  ")).trim();
-    const priorityRaw = await prompt(rl, "  priority [low/med/high]:  ");
+    name = (await prompt(rl, "  name:     ")).trim();
+    kind = await promptChoice(rl, "  kind", ["long-running", "outcome"]);
+    purpose = (await prompt(rl, "  purpose:  ")).trim();
+    priority = await promptChoice(rl, "  priority", ["low", "med", "high"]);
     rl.close();
-    kind = normalizeKind(kindRaw);
-    priority = normalizePriority(priorityRaw);
   }
 
   const meta = {
@@ -253,6 +252,47 @@ function ensureInstalled(persona) {
   syncPackageFiles(persona);
 }
 
+// Launch `tool` so Watchtower can control it: wrap it in a transparent tmux session
+// (dedicated socket `uvs`) and register the handle, so the dashboard can checkpoint /
+// close / approve it. Falls back to a direct spawn when tmux is unavailable, UVS_NO_TMUX
+// is set, or we're already inside the wrapper.
+function launchWrapped(tool, toolArgs, sid) {
+  const { spawnSync } = require("child_process");
+  const env = { ...process.env, UVS_SESSION_ID: sid };
+  const canTmux =
+    !process.env.UVS_NO_TMUX &&
+    !process.env.UVS_IN_TMUX &&
+    spawnSync("tmux", ["-V"], { stdio: "ignore" }).status === 0;
+
+  if (canTmux) {
+    const tname = "uvs_" + sid;
+    const wtUrl = process.env.UVS_WATCHTOWER_URL || "http://localhost:4200";
+    const shq = (s) => "'" + String(s).replace(/'/g, "'\\''") + "'";
+    const inner =
+      "UVS_SESSION_ID=" + shq(sid) + " UVS_IN_TMUX=1 exec " + [tool, ...toolArgs].map(shq).join(" ");
+    const mk = spawnSync(
+      "tmux", ["-L", "uvs", "new-session", "-d", "-s", tname, "-c", process.cwd(), inner],
+      { stdio: "ignore" },
+    );
+    if (mk.status === 0) {
+      spawnSync("tmux", ["-L", "uvs", "set", "-t", tname, "status", "off"], { stdio: "ignore" });
+      spawnSync(
+        "curl", ["-s", "-m", "2", wtUrl + "/sessions/register",
+          "-H", "Content-Type: application/json",
+          "-d", JSON.stringify({ id: sid, tmux_target: tname, pid: process.pid, cwd: process.cwd() })],
+        { stdio: "ignore" },
+      );
+      const att = spawn("tmux", ["-L", "uvs", "attach", "-t", tname], { stdio: "inherit" });
+      att.on("exit", (code) => process.exit(code || 0));
+      return;
+    }
+    // tmux new-session failed — fall through to a direct spawn.
+  }
+
+  const child = spawn(tool, toolArgs, { stdio: "inherit", env });
+  child.on("exit", (code) => process.exit(code || 0));
+}
+
 async function launchClaude(persona, extra) {
   syncPackageFiles(persona);
   const settings = path.resolve(".claude/personas", `${persona}.json`);
@@ -267,11 +307,7 @@ async function launchClaude(persona, extra) {
   console.log(`UV Suite | Claude Code | ${personaLabel(persona)}`);
   console.log(`Session: ${sid.slice(0, 8)}${name ? " — " + name : ""}`);
   console.log("");
-  const child = spawn("claude", ["--settings", settings, ...extra], {
-    stdio: "inherit",
-    env: { ...process.env, UVS_SESSION_ID: sid },
-  });
-  child.on("exit", (code) => process.exit(code || 0));
+  launchWrapped("claude", ["--settings", settings, ...extra], sid);
 }
 
 async function launchCodex(persona, extra) {
@@ -287,65 +323,102 @@ async function launchCodex(persona, extra) {
   console.log(`UV Suite | Codex | ${personaLabel(persona)}`);
   console.log(`Session: ${sid.slice(0, 8)}${name ? " — " + name : ""}`);
   console.log("");
-  const child = spawn("codex", [...codexArgs, ...extra], {
-    stdio: "inherit",
-    env: { ...process.env, UVS_SESSION_ID: sid },
-  });
-  child.on("exit", (code) => process.exit(code || 0));
+  launchWrapped("codex", [...codexArgs, ...extra], sid);
 }
 
-function watch() {
-  const serverScript = path.join(UV_SUITE_DIR, "watchtower", "server.js");
-  if (!fs.existsSync(serverScript)) {
-    console.error("Error: watchtower server not found at", serverScript);
-    process.exit(1);
+// Resolve how to run the Python app, provisioning deps on first run.
+// Prefers `uv` (astral) if present; otherwise a venv at watchtower/.venv.
+// Returns the argv prefix to which we append `uvicorn` args.
+function ensurePyEnv(wtDir) {
+  const { spawnSync } = require("child_process");
+  const hasUv = spawnSync("uv", ["--version"], { stdio: "ignore" }).status === 0;
+  if (hasUv) {
+    // --native-tls: use the OS cert store so corporate SSL-inspection proxies don't break pypi.
+    return ["uv", "run", "--native-tls", "--python", "3.12", "--no-project", "--with-requirements", "requirements.txt", "--", "python", "-m"];
   }
+  const venv = path.join(wtDir, ".venv");
+  const py =
+    process.platform === "win32"
+      ? path.join(venv, "Scripts", "python.exe")
+      : path.join(venv, "bin", "python");
+  if (!fs.existsSync(py)) {
+    const python3 = spawnSync("python3", ["--version"], { stdio: "ignore" }).status === 0 ? "python3" : "python";
+    console.log("First run: creating Python env in watchtower/.venv (one-time)...");
+    if (spawnSync(python3, ["-m", "venv", ".venv"], { cwd: wtDir, stdio: "inherit" }).status !== 0) {
+      console.error("Failed to create venv. Install Python 3 (python3) and retry.");
+      process.exit(1);
+    }
+    console.log("Installing dependencies (fastapi, uvicorn, aiosqlite)...");
+    if (spawnSync(py, ["-m", "pip", "install", "-q", "-r", "requirements.txt"], { cwd: wtDir, stdio: "inherit" }).status !== 0) {
+      console.error("pip install failed (see output above).");
+      process.exit(1);
+    }
+  }
+  return [py, "-m"];
+}
+
+// If a Watchtower is already running on this port, stop it so we start fresh —
+// uvicorn doesn't hot-reload, so a long-running process serves stale routes while
+// the (disk-served) dashboard updates. Only kills a process that answers /health
+// like a Watchtower, so we never kill an unrelated app on the port.
+function restartIfRunning(port) {
+  const { spawnSync } = require("child_process");
+  if (process.platform === "win32") return;
+  const health = spawnSync("curl", ["-s", "-m", "1", `http://localhost:${port}/health`], { encoding: "utf8" });
+  if (!(health.stdout || "").includes("status")) return;
+  const pids = (spawnSync("lsof", ["-ti", `tcp:${port}`], { encoding: "utf8" }).stdout || "")
+    .trim().split(/\s+/).filter(Boolean);
+  if (!pids.length) return;
+  spawnSync("kill", pids);
+  console.log(`Restarting Watchtower (stopped existing PID ${pids.join(", ")})`);
+  spawnSync("sleep", ["1"]);  // let the port free up before rebinding
+}
+
+function watch() {
+  const wtDir = path.join(UV_SUITE_DIR, "watchtower");
 
+  // Legacy fallback: the original Node Watchtower (no Postgres/Docker). `uvs watch --legacy`.
+  if (args.includes("--legacy")) {
+    const serverScript = path.join(wtDir, "legacy", "server.js");
+    if (!fs.existsSync(serverScript)) {
+      console.error("Error: legacy watchtower not found at", serverScript);
+      process.exit(1);
+    }
+    const lbg = args.includes("--bg") || args.includes("--background");
+    const lurl = "http://localhost:" + (process.env.UVS_WATCHTOWER_PORT || 4200);
+    const lopener =
+      process.platform === "darwin" ? "open" : process.platform === "win32" ? "start" : "xdg-open";
+    console.log("UV Suite Watchtower (legacy Node) starting...");
+    console.log("Dashboard: " + lurl);
+    console.log("");
+    setTimeout(() => spawn(lopener, [lurl], { stdio: "ignore" }), 1000);
+    const lchild = spawn("node", [serverScript], { stdio: lbg ? "ignore" : "inherit", detached: lbg });
+    if (lbg) {
+      lchild.unref();
+      console.log(`Running in background (PID: ${lchild.pid}). Stop with: kill ${lchild.pid}`);
+    } else {
+      lchild.on("exit", (code) => process.exit(code || 0));
+    }
+    return;
+  }
   const bg = args.includes("--bg") || args.includes("--background");
+  const port = process.env.UVS_WATCHTOWER_PORT || 4200;
+  const url = "http://localhost:" + port;
+  const opener =
+    process.platform === "darwin" ? "open" : process.platform === "win32" ? "start" : "xdg-open";
+
+  // Python + SQLite, run locally (no Docker, no database to install).
+  restartIfRunning(port);
   console.log("UV Suite Watchtower starting...");
-  console.log(
-    "Dashboard: http://localhost:" + (process.env.UVS_WATCHTOWER_PORT || 4200),
-  );
+  console.log("Dashboard: " + url);
   console.log("");
-
+  const argv = [...ensurePyEnv(wtDir), "uvicorn", "app.main:app", "--host", "127.0.0.1", "--port", String(port)];
+  setTimeout(() => spawn(opener, [url], { stdio: "ignore" }), 1500);
+  const child = spawn(argv[0], argv.slice(1), { cwd: wtDir, stdio: bg ? "ignore" : "inherit", detached: bg });
   if (bg) {
-    const child = spawn("node", [serverScript], {
-      stdio: "ignore",
-      detached: true,
-    });
     child.unref();
-    console.log(`Running in background (PID: ${child.pid})`);
-    console.log("Stop with: kill " + child.pid);
-
-    // Open browser
-    const opener =
-      process.platform === "darwin"
-        ? "open"
-        : process.platform === "win32"
-          ? "start"
-          : "xdg-open";
-    spawn(
-      opener,
-      ["http://localhost:" + (process.env.UVS_WATCHTOWER_PORT || 4200)],
-      { stdio: "ignore" },
-    );
+    console.log(`Running in background (PID: ${child.pid}). Stop with: kill ${child.pid}`);
   } else {
-    // Foreground — open browser after a short delay
-    setTimeout(() => {
-      const opener =
-        process.platform === "darwin"
-          ? "open"
-          : process.platform === "win32"
-            ? "start"
-            : "xdg-open";
-      spawn(
-        opener,
-        ["http://localhost:" + (process.env.UVS_WATCHTOWER_PORT || 4200)],
-        { stdio: "ignore" },
-      );
-    }, 1000);
-
-    const child = spawn("node", [serverScript], { stdio: "inherit" });
     child.on("exit", (code) => process.exit(code || 0));
   }
 }

package/hooks/auto-checkpoint-helper.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # UV Suite helper: read or change auto-checkpoint settings.
-# Used by the /auto-checkpoint slash command.
+# Used by the /session auto slash command.
 #
 # Usage:
 #   auto-checkpoint-helper.sh status
@@ -66,7 +66,7 @@ case "$ARG" in
       set_field interval_minutes "$ARG"
       echo "Auto-checkpoint interval: $ARG min (mode: $(get_field mode))"
     else
-      echo "Usage: /auto-checkpoint [on | off | <minutes 1-1440> | status]"
+      echo "Usage: /session auto [on | off | <minutes 1-1440> | status]"
       exit 1
     fi
     ;;

package/hooks/auto-checkpoint.sh

@@ -5,7 +5,7 @@
 # Logs every tool call into a per-session activity log. When `interval_minutes`
 # have passed since the last mechanical checkpoint AND there has been activity
 # in the interval, writes a deterministic snapshot to
-# uv-out/checkpoints/<sid>/auto-<ts>-mechanical.md and forwards an
+# uv-out/sessions/<sid>/checkpoints/auto-<ts>-mechanical.md and forwards an
 # AutoCheckpoint event to the watchtower.
 #
 # Tier B (semantic, claude -p) runs separately from the watchtower's timer.
@@ -96,7 +96,7 @@ fi
 
 # Resolve checkpoint dir + metadata via the existing helper
 CP_DIR=$(CLAUDE_PROJECT_DIR="$PROJECT_DIR" "$PROJECT_DIR/.claude/hooks/checkpoint-helper.sh" dir 2>/dev/null)
-[ -z "$CP_DIR" ] && CP_DIR="$PROJECT_DIR/uv-out/checkpoints/$SID" && mkdir -p "$CP_DIR"
+[ -z "$CP_DIR" ] && CP_DIR="$PROJECT_DIR/uv-out/sessions/$SID/checkpoints" && mkdir -p "$CP_DIR"
 
 # Build the mechanical checkpoint body
 TS_FILE=$(date +%Y-%m-%d-%H%M)
@@ -160,7 +160,7 @@ GIT_LOG=$(cd "$PROJECT_DIR" && git log --oneline -5 2>/dev/null)
   fi
 } > "$CP_FILE"
 
-# Update latest.md so /restore picks it up
+# Update latest.md so /session restore picks it up
 cp "$CP_FILE" "$CP_DIR/latest.md" 2>/dev/null
 echo "$NOW" > "$LAST_CP_FILE"
 

package/hooks/auto-restore-on-start.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # UV Suite Hook: SessionStart — when UVS_RESTORE_FROM is set, inject a
-# system-context instruction telling Claude to /restore that session as
+# system-context instruction telling Claude to /session restore that session as
 # the first action of the new session.
 #
 # This is how the Watchtower's "Open in new terminal" restore button hooks
@@ -20,7 +20,7 @@ case "$UVS_RESTORE_FROM" in
     ;;
 esac
 
-MSG="[uv-suite auto-restore] This session was opened via the Watchtower restore flow. Your FIRST action must be to run \`/restore $UVS_RESTORE_FROM\` to load the prior session's latest checkpoint. After /restore completes, summarize what you picked up in 1-2 sentences, then wait for the user's next instruction."
+MSG="[uv-suite auto-restore] This session was opened via the Watchtower restore flow. Your FIRST action must be to run \`/session restore $UVS_RESTORE_FROM\` to load the prior session's latest checkpoint. After /session restore completes, summarize what you picked up in 1-2 sentences, then wait for the user's next instruction."
 
 if command -v jq >/dev/null 2>&1; then
   jq -nc --arg ctx "$MSG" '{hookSpecificOutput:{hookEventName:"SessionStart",additionalContext:$ctx}}'

package/hooks/checkpoint-helper.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # UV Suite helper: locate per-session checkpoint paths and print metadata.
-# Used by the /checkpoint and /restore slash commands.
+# Used by the /session checkpoint and /session restore slash commands.
 #
 # Usage:
 #   checkpoint-helper.sh dir       # ensure + print the dir for current session
@@ -16,11 +16,14 @@ resolve_paths() {
   if [ -z "$SID" ] && [ -f "$STATE_DIR/current-session.txt" ]; then
     SID=$(cat "$STATE_DIR/current-session.txt" 2>/dev/null)
   fi
-  CHECKPOINTS_ROOT="$PROJECT_DIR/uv-out/checkpoints"
-  SESSION_CP_DIR=""
-  [ -n "$SID" ] && SESSION_CP_DIR="$CHECKPOINTS_ROOT/$SID"
-  META_FILE=""
-  [ -n "$SID" ] && META_FILE="$STATE_DIR/sessions/$SID.json"
+  [ -z "$SID" ] && SID="no-session"
+  # Unified layout: everything a session produces lives under uv-out/sessions/<sid>/.
+  SESSIONS_ROOT="$PROJECT_DIR/uv-out/sessions"
+  SESSION_CP_DIR="$SESSIONS_ROOT/$SID/checkpoints"
+  # Legacy locations, read for backward compatibility (pre-unify checkpoints):
+  LEGACY_CP_ROOT="$PROJECT_DIR/uv-out/checkpoints"
+  LEGACY_SESSION_CP_DIR="$LEGACY_CP_ROOT/$SID"
+  META_FILE="$STATE_DIR/sessions/$SID.json"
 }
 
 print_meta_field() {
@@ -37,13 +40,8 @@ resolve_paths
 
 case "$1" in
   dir)
-    if [ -n "$SESSION_CP_DIR" ]; then
-      mkdir -p "$SESSION_CP_DIR"
-      echo "$SESSION_CP_DIR"
-    else
-      mkdir -p "$CHECKPOINTS_ROOT"
-      echo "$CHECKPOINTS_ROOT"
-    fi
+    mkdir -p "$SESSION_CP_DIR"
+    echo "$SESSION_CP_DIR"
     ;;
   meta)
     echo "uvs_session_id=${SID:-}"
@@ -73,25 +71,32 @@ checkpoint_at: ${NOW}
 EOF
     ;;
   latest)
-    if [ -n "$SESSION_CP_DIR" ] && [ -f "$SESSION_CP_DIR/latest.md" ]; then
+    if [ -f "$SESSION_CP_DIR/latest.md" ]; then
       cat "$SESSION_CP_DIR/latest.md"
-    elif [ -f "$CHECKPOINTS_ROOT/latest.md" ]; then
-      echo "(no per-session checkpoint for ${SID:-this session}; showing legacy global latest.md)"
+    elif [ -f "$LEGACY_SESSION_CP_DIR/latest.md" ]; then
+      echo "(no checkpoint at new path; showing legacy uv-out/checkpoints/${SID}/latest.md)"
+      echo
+      cat "$LEGACY_SESSION_CP_DIR/latest.md"
+    elif [ -f "$LEGACY_CP_ROOT/latest.md" ]; then
+      echo "(no per-session checkpoint for ${SID}; showing legacy global latest.md)"
       echo
-      cat "$CHECKPOINTS_ROOT/latest.md"
+      cat "$LEGACY_CP_ROOT/latest.md"
     else
-      echo "No checkpoint found at $CHECKPOINTS_ROOT. Run /checkpoint to create one."
+      echo "No checkpoint found for session ${SID}. Run /session checkpoint to create one."
     fi
     ;;
   list)
-    [ ! -d "$CHECKPOINTS_ROOT" ] && { echo "No checkpoints directory at $CHECKPOINTS_ROOT"; exit 0; }
     found=0
-    for d in "$CHECKPOINTS_ROOT"/*/; do
-      [ -d "$d" ] || continue
-      cp_sid=$(basename "$d")
-      cp_meta="$STATE_DIR/sessions/$cp_sid.json"
-      cp_name=""
-      cp_priority=""
+    seen=" "
+    emit_cp_entry() { # $1 = cp_sid  $2 = checkpoint dir  $3 = origin tag
+      local cp_sid="$1" d="$2" origin="$3"
+      [ -d "$d" ] || return 0
+      case "$seen" in *" $cp_sid "*) return 0 ;; esac   # dedupe sid across new+legacy
+      local latest
+      latest=$(ls -t "$d"/*.md 2>/dev/null | head -1)
+      [ -z "$latest" ] && return 0
+      seen="$seen$cp_sid "
+      local cp_meta="$STATE_DIR/sessions/$cp_sid.json" cp_name="" cp_priority=""
       if [ -f "$cp_meta" ]; then
         if command -v jq >/dev/null 2>&1; then
           cp_name=$(jq -r '.name // ""' "$cp_meta" 2>/dev/null)
@@ -100,20 +105,20 @@ EOF
           cp_name=$(grep -o '"name"[[:space:]]*:[[:space:]]*"[^"]*"' "$cp_meta" | head -1 | sed 's/.*"name"[[:space:]]*:[[:space:]]*"\(.*\)"/\1/')
         fi
       fi
-      latest=$(ls -t "$d"*.md 2>/dev/null | head -1)
-      [ -z "$latest" ] && continue
+      local ts label mark
       ts=$(stat -f '%Sm' -t '%Y-%m-%d %H:%M' "$latest" 2>/dev/null || stat -c '%y' "$latest" 2>/dev/null | cut -c1-16)
       label="${cp_name:-(unlabeled)}"
       [ -n "$cp_priority" ] && label="$label [p:$cp_priority]"
-      mark=" "
-      [ "$cp_sid" = "$SID" ] && mark="*"
-      echo "$mark ${cp_sid:0:8}  $ts  $label"
+      mark=" "; [ "$cp_sid" = "$SID" ] && mark="*"
+      echo "$mark ${cp_sid:0:8}  $ts  $label${origin}"
       found=1
-    done
-    [ "$found" -eq 0 ] && echo "No per-session checkpoints yet (current session: ${SID:-none})"
-    # Note legacy global checkpoint if present
-    if [ -f "$CHECKPOINTS_ROOT/latest.md" ]; then
-      ts=$(stat -f '%Sm' -t '%Y-%m-%d %H:%M' "$CHECKPOINTS_ROOT/latest.md" 2>/dev/null || stat -c '%y' "$CHECKPOINTS_ROOT/latest.md" 2>/dev/null | cut -c1-16)
+    }
+    # New unified layout first, then legacy, deduped by sid.
+    for d in "$SESSIONS_ROOT"/*/checkpoints/; do emit_cp_entry "$(basename "$(dirname "$d")")" "$d" ""; done
+    for d in "$LEGACY_CP_ROOT"/*/; do emit_cp_entry "$(basename "$d")" "$d" "  (legacy path)"; done
+    [ "$found" -eq 0 ] && echo "No per-session checkpoints yet (current session: ${SID})"
+    if [ -f "$LEGACY_CP_ROOT/latest.md" ]; then
+      ts=$(stat -f '%Sm' -t '%Y-%m-%d %H:%M' "$LEGACY_CP_ROOT/latest.md" 2>/dev/null || stat -c '%y' "$LEGACY_CP_ROOT/latest.md" 2>/dev/null | cut -c1-16)
       echo "  legacy   $ts  (pre-metadata global latest.md)"
     fi
     ;;

package/hooks/git-context.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+# UV Suite helper: resolve git worktree context for a directory, as a JSON object.
+# Used to stamp session metadata so the Watchtower can tell apart sessions running
+# in different worktrees of the same repo (e.g. a feature worktree vs the main checkout).
+#
+# Usage: git-context.sh [dir]   (defaults to current directory)
+# Prints: {} if not a git repo, else:
+#   {
+#     "git_worktree":          "/abs/path/to/worktree-root",
+#     "git_branch":            "feature-x",
+#     "git_main_repo":         "/abs/path/to/main/checkout",
+#     "git_is_linked_worktree": true|false
+#   }
+
+DIR="${1:-.}"
+cd "$DIR" 2>/dev/null || { echo '{}'; exit 0; }
+git rev-parse --is-inside-work-tree >/dev/null 2>&1 || { echo '{}'; exit 0; }
+
+WT=$(git rev-parse --show-toplevel 2>/dev/null)
+BR=$(git branch --show-current 2>/dev/null)
+GITDIR=$(git rev-parse --absolute-git-dir 2>/dev/null)
+
+# A linked worktree's git dir lives under <main>/.git/worktrees/<name>.
+case "$GITDIR" in
+  */worktrees/*) LINKED=true ;;
+  *)             LINKED=false ;;
+esac
+
+# Common dir points at the shared .git; its parent is the main checkout.
+COMMON=$(git rev-parse --git-common-dir 2>/dev/null)
+case "$COMMON" in /*) ;; *) COMMON="$WT/$COMMON" ;; esac
+MAIN_REPO=$(cd "$(dirname "$COMMON")" 2>/dev/null && pwd)
+[ -z "$MAIN_REPO" ] && MAIN_REPO="$WT"
+
+if command -v jq >/dev/null 2>&1; then
+  jq -n --arg wt "$WT" --arg br "$BR" --arg main "$MAIN_REPO" --argjson linked "$LINKED" \
+    '{git_worktree: $wt, git_branch: $br, git_main_repo: $main, git_is_linked_worktree: $linked}'
+else
+  printf '{"git_worktree":"%s","git_branch":"%s","git_main_repo":"%s","git_is_linked_worktree":%s}\n' \
+    "$WT" "$BR" "$MAIN_REPO" "$LINKED"
+fi

package/hooks/lite-mode-inject.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+# UV Suite Hook: Lite mode — inject terseness instructions
+# Event: UserPromptSubmit
+# Activates when UVS_LITE=1 OR .uv-suite-state/lite-mode.txt contains "on".
+# Reduces output verbosity to save tokens.
+
+STATE_DIR="${CLAUDE_PROJECT_DIR:-.}/.uv-suite-state"
+STATE_FILE="$STATE_DIR/lite-mode.txt"
+
+is_lite="false"
+[ "$UVS_LITE" = "1" ] && is_lite="true"
+[ -f "$STATE_FILE" ] && [ "$(cat "$STATE_FILE" 2>/dev/null | tr -d '[:space:]')" = "on" ] && is_lite="true"
+
+if [ "$is_lite" != "true" ]; then
+  exit 0
+fi
+
+cat <<'EOF'
+{
+  "continue": true,
+  "hookSpecificOutput": {
+    "hookEventName": "UserPromptSubmit",
+    "additionalContext": "UV Suite lite mode is ACTIVE. Follow these rules for this turn:\n- No preamble. No \"I'll do X\" before doing it. Start with the action.\n- No end-of-turn summaries longer than one sentence.\n- No bullet lists unless the user explicitly asks for one.\n- No code comments unless the user asks.\n- No markdown headers (##, ###) in responses unless the user asks.\n- Inline single-sentence updates between tool calls; never multi-paragraph narration.\n- Cite file paths inline (file.ts:42), not as section headers.\n- Skip pleasantries, acknowledgments, and reassurances.\nThe user is token-constrained. Be useful, not thorough."
+  }
+}
+EOF

package/hooks/session-end-helper.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # UV Suite helper: explicit session termination.
-# Used by the /session-end slash command.
+# Used by the /session end slash command.
 #
 # Writes a "terminated_at" timestamp to the session metadata, fires a
 # SessionEnd event to the Watchtower so the dashboard updates the status
@@ -53,4 +53,4 @@ print(json.dumps({
 fi
 
 echo "Session ${SID:0:8} marked terminated at $NOW_ISO."
-echo "Run /checkpoint first if you want a final state snapshot, then exit the terminal."
+echo "Run /session checkpoint first if you want a final state snapshot, then exit the terminal."

package/hooks/session-end.sh

@@ -33,11 +33,11 @@ UNTRACKED=$(git ls-files --others --exclude-standard 2>/dev/null | head -5)
 
 REVIEW_MSG=""
 if [ -n "$STAGED" ] || [ -n "$UNSTAGED" ] || [ -n "$UNTRACKED" ]; then
-  REVIEW_MSG="Uncommitted changes — consider /review and /slop-check before committing. "
+  REVIEW_MSG="Uncommitted changes — consider /review and /review --slop before committing. "
 fi
 
 # Checkpoint prompt
-CHECKPOINT_MSG="Run /checkpoint to save session state for next time. Run /restore at the start of your next session."
+CHECKPOINT_MSG="Run /session checkpoint to save session state for next time. Run /session restore at the start of your next session."
 
 FULL_MSG="${DURATION_MSG}${REVIEW_MSG}${CHECKPOINT_MSG}"
 

package/hooks/session-label-nag.sh

@@ -4,7 +4,7 @@
 #
 # Reads the metadata file at .uv-suite-state/sessions/$UVS_SESSION_ID.json.
 # If the session has no name, injects an additionalContext nudge once every
-# Nth user prompt (default 3) so Claude reminds the user to run /session-init.
+# Nth user prompt (default 3) so Claude reminds the user to run /session init.
 # Skips when the prompt is itself a slash command.
 
 INPUT=$(cat)
@@ -53,7 +53,7 @@ if [ "$COUNT" -ne 1 ] && [ "$REMAINDER" -ne 1 ]; then
   exit 0
 fi
 
-MSG="[uv-suite] This session has no name yet. Briefly remind the user to run /session-init to set name, kind (long-running/outcome), purpose, and priority — these label the session in the watchtower dashboard. One sentence is enough; then proceed with the user's request."
+MSG="[uv-suite] This session has no name yet. Briefly remind the user to run /session init to set name, kind (long-running/outcome), purpose, and priority — these label the session in the watchtower dashboard. One sentence is enough; then proceed with the user's request."
 
 if command -v jq >/dev/null 2>&1; then
   jq -nc --arg ctx "$MSG" '{hookSpecificOutput:{hookEventName:"UserPromptSubmit",additionalContext:$ctx}}'

package/hooks/session-meta.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # UV Suite helper: read or write session metadata.
-# Used by the /session-init slash command.
+# Used by the /session init slash command.
 #
 # Usage:
 #   session-meta.sh show
@@ -40,6 +40,18 @@ print(json.dumps({
 ' > "$META"
 fi
 
+# Refresh git worktree context (worktree path, branch, main repo) so the Watchtower
+# can distinguish sessions running in different worktrees of the same repo.
+GIT_JSON=$("$(dirname "$0")/git-context.sh" "${CLAUDE_PROJECT_DIR:-$(pwd)}" 2>/dev/null)
+if [ -n "$GIT_JSON" ] && [ "$GIT_JSON" != "{}" ] && command -v jq >/dev/null 2>&1; then
+  TMP=$(mktemp)
+  if jq -s '.[0] * .[1]' "$META" <(printf '%s' "$GIT_JSON") > "$TMP" 2>/dev/null; then
+    mv "$TMP" "$META"
+  else
+    rm -f "$TMP"
+  fi
+fi
+
 ACTION="$1"
 shift || true
 
@@ -53,12 +65,17 @@ kind     = d.get("kind", "") or "(unset)"
 purpose  = d.get("purpose", "") or "(unset)"
 priority = d.get("priority", "") or "(unset)"
 persona  = d.get("persona", "") or "(unset)"
+branch   = d.get("git_branch", "") or "(unset)"
+worktree = d.get("git_worktree", "") or "(unset)"
+linked   = d.get("git_is_linked_worktree", False)
 print(f"session: {sid}")
 print(f"  name:     {name}")
 print(f"  kind:     {kind}")
 print(f"  purpose:  {purpose}")
 print(f"  priority: {priority}")
 print(f"  persona:  {persona}")
+print(f"  branch:   {branch}")
+print(f"  worktree: {worktree}" + ("  (linked)" if linked else ""))
 PY
 }
 

package/hooks/session-review-reminder.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # UV Suite Hook: Remind to review before ending session
 # Event: Stop
-# If there are uncommitted changes, reminds the user to run /review and /slop-check.
+# If there are uncommitted changes, reminds the user to run /review and /review --slop.
 
 # Check for uncommitted changes
 STAGED=$(git diff --cached --stat 2>/dev/null)
@@ -28,7 +28,7 @@ fi
 cat <<EOF
 {
   "continue": true,
-  "systemMessage": "SESSION END REMINDER: There are uncommitted changes in the working tree.\n\n${SUMMARY}\nConsider running /review and /slop-check before committing."
+  "systemMessage": "SESSION END REMINDER: There are uncommitted changes in the working tree.\n\n${SUMMARY}\nConsider running /review and /review --slop before committing."
 }
 EOF