agileflow 2.99.8 → 3.0.0

package/scripts/claude-smart.sh

@@ -0,0 +1,67 @@
+#!/bin/bash
+# claude-smart.sh - Smart resume wrapper for Claude in tmux
+#
+# Uses per-pane tmux option @claude_uuid to track conversation identity.
+# New windows start fresh; re-running in the same pane resumes the conversation.
+#
+# Usage:
+#   claude-smart.sh              # Resume if UUID stored, else fresh
+#   claude-smart.sh --fresh      # Force fresh start (ignore stored UUID)
+#   claude-smart.sh [flags...]   # Pass-through flags to claude
+#
+# NO set -e: UUID capture must run even after Ctrl+C / non-zero exit
+
+FRESH=false
+ARGS=()
+
+for arg in "$@"; do
+  case $arg in
+    --fresh)
+      FRESH=true
+      ;;
+    *)
+      ARGS+=("$arg")
+      ;;
+  esac
+done
+
+# ── Resolve conversation UUID ──────────────────────────────────────────────
+STORED_UUID=""
+if [ "$FRESH" = false ] && [ -n "$TMUX" ]; then
+  STORED_UUID=$(tmux show-options -pqv @claude_uuid 2>/dev/null || true)
+fi
+
+# Validate: the .jsonl file must still exist
+if [ -n "$STORED_UUID" ]; then
+  PROJ_DIR=$(pwd | sed 's|/|-|g' | sed 's|^-||')
+  SESSIONS_DIR="$HOME/.claude/projects/-$PROJ_DIR"
+  if [ ! -f "$SESSIONS_DIR/$STORED_UUID.jsonl" ]; then
+    STORED_UUID=""  # File gone, start fresh
+  fi
+fi
+
+# ── Build and run Claude command ───────────────────────────────────────────
+CMD=(claude)
+if [ -n "$STORED_UUID" ]; then
+  CMD+=(--resume "$STORED_UUID")
+fi
+CMD+=("${ARGS[@]}")
+
+"${CMD[@]}"
+EXIT_CODE=$?
+
+# ── Capture UUID after exit ────────────────────────────────────────────────
+# Store the most recent non-agent .jsonl as the pane's conversation UUID
+if [ -n "$TMUX" ]; then
+  PROJ_DIR=${PROJ_DIR:-$(pwd | sed 's|/|-|g' | sed 's|^-||')}
+  SESSIONS_DIR=${SESSIONS_DIR:-"$HOME/.claude/projects/-$PROJ_DIR"}
+  if [ -d "$SESSIONS_DIR" ]; then
+    NEWEST=$(ls -t "$SESSIONS_DIR"/*.jsonl 2>/dev/null | grep -v "agent-" | head -1)
+    if [ -n "$NEWEST" ]; then
+      NEW_UUID=$(basename "$NEWEST" .jsonl)
+      tmux set-option -p @claude_uuid "$NEW_UUID" 2>/dev/null || true
+    fi
+  fi
+fi
+
+exit $EXIT_CODE

package/scripts/claude-tmux.sh

@@ -2,8 +2,9 @@
 # claude-tmux.sh - Wrapper script that auto-starts Claude Code in a tmux session
 #
 # Usage:
-#   ./claude-tmux.sh              # Create new tmux session (supports multiple from same dir)
-#   ./claude-tmux.sh --attach     # Reattach to most recent session
+#   ./claude-tmux.sh              # Reattach to detached session, or create new
+#   ./claude-tmux.sh --new        # Force create a new session
+#   ./claude-tmux.sh --attach     # Reattach to most recent session (any state)
 #   ./claude-tmux.sh --no-tmux    # Start without tmux (regular claude)
 #   ./claude-tmux.sh -n           # Same as --no-tmux
 #   ./claude-tmux.sh --kill       # Kill ALL sessions for this directory
@@ -11,11 +12,12 @@
 #   ./claude-tmux.sh --help       # Show help with keybinds
 #
 # When already in tmux: Just runs claude normally
-# When not in tmux: Creates a tmux session and runs claude inside it
+# When not in tmux: Reattaches to a detached session if one exists, otherwise
+#   creates a new tmux session. Use --new to always create a fresh session.
 #
 # Multiple terminals can run `af` from the same directory simultaneously.
 # Sessions are named: claude-<dir>, claude-<dir>-2, claude-<dir>-3, etc.
-# Your Claude conversation is preserved via --resume regardless of tmux state.
+# Your Claude conversation is preserved via smart resume (per-pane UUID tracking).
 #
 # SESSION CREATION (while inside tmux):
 #   - Alt+N     New worktree session (isolated branch + directory)
@@ -29,11 +31,15 @@
 
 set -e
 
+# Resolve script directory (used for claude-smart.sh and other helpers)
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
 # Parse arguments
 NO_TMUX=false
 KILL_SESSION=false
 SHOW_HELP=false
 ATTACH_ONLY=false
+FORCE_NEW=false
 REFRESH_CONFIG=false
 USE_RESUME=false
 RESUME_SESSION_ID=""
@@ -48,6 +54,10 @@ for arg in "$@"; do
       ATTACH_ONLY=true
       shift
       ;;
+    --new)
+      FORCE_NEW=true
+      shift
+      ;;
     --fresh|-f)
       # Kept for backwards compat, but this is now the default behavior
       shift
@@ -81,38 +91,38 @@ USAGE:
   agileflow [options] [claude-args...]
 
 OPTIONS:
-  --attach, -a     Reattach to most recent session for this directory
+  --attach, -a     Reattach to most recent session (attached or detached)
+  --new            Force create a new session (skip auto-reattach)
   --no-tmux, -n    Run claude without tmux
   --kill           Kill ALL sessions for this directory
   --refresh        Refresh tmux config on all existing sessions
   --help, -h       Show this help
 
-By default, af creates a new tmux session. Multiple terminals can run
-af from the same directory simultaneously (sessions: claude-dir,
-claude-dir-2, claude-dir-3, etc.).
+By default, af reattaches to a detached session if one exists (so Alt+Q
+then af gets you right back). Use --new to force a new session.
+
+SESSIONS:
+  Alt+s            New Claude window
+  Alt+l            Switch between sessions (picker)
+  Alt+q            Detach (run af to reattach)
 
-TMUX KEYBINDS:
+WINDOWS:
   Alt+1-9          Switch to window N
-  Alt+c            Create new window
+  Alt+c            Create empty window
   Alt+n/p          Next/previous window
-  Alt+d            Split horizontally
-  Alt+s            Split vertically
-  Alt+arrows       Navigate panes
-  Alt+z            Zoom/unzoom pane
-  Alt+[            Enter copy mode (scroll)
   Alt+r            Rename window
-  Alt+x            Close pane
   Alt+w            Close window
-  Alt+q            Detach from tmux
 
-SESSION CREATION:
-  Alt+N            New worktree session (isolated branch + directory)
-  Alt+S            Same-directory session (quick, no worktree)
+PANES:
+  Alt+d            Split side by side
+  Alt+v            Split top/bottom
+  Alt+arrows       Navigate panes
+  Alt+z            Zoom/unzoom pane
+  Alt+x            Close pane
 
-FREEZE RECOVERY:
-  Alt+k            Send Ctrl+C twice (soft interrupt)
-  Alt+K            Force kill pane immediately
-  Alt+R            Respawn pane with fresh shell
+OTHER:
+  Alt+[            Scroll mode
+  Alt+k            Send Ctrl+C twice (unfreeze)
 EOF
   exit 0
 fi
@@ -145,6 +155,156 @@ if command -v tmux &> /dev/null; then
   unset _TMUX_BASE _TMUX_SOCK_DIR
 fi
 
+# ══════════════════════════════════════════════════════════════════════════════
+# TMUX CONFIGURATION FUNCTION — applies theme, keybinds, and status bar
+# Defined early so --refresh can use it before any session logic
+# ══════════════════════════════════════════════════════════════════════════════
+configure_tmux_session() {
+  local target_session="$1"
+
+  # Enable mouse support
+  tmux set-option -t "$target_session" mouse on
+
+  # Fix colors - proper terminal support
+  tmux set-option -t "$target_session" default-terminal "xterm-256color"
+  tmux set-option -t "$target_session" -ga terminal-overrides ",xterm-256color:Tc"
+
+  # ─── Status Bar Styling (2-line) ────────────────────────────────────────────
+
+  # Status bar position and refresh
+  tmux set-option -t "$target_session" status-position bottom
+  # Reduce refresh rate to prevent CPU overhead and freezes (was 5s, now 30s)
+  tmux set-option -t "$target_session" status-interval 30
+
+  # Enable 2-line status bar
+  tmux set-option -t "$target_session" status 2
+
+  # Base styling - Tokyo Night inspired dark theme
+  tmux set-option -t "$target_session" status-style "bg=#1a1b26,fg=#a9b1d6"
+
+  # Line 0 (top): Session name + live git branch + keybind hints
+  # Uses #() for live branch updates (runs on status-interval, every 30s)
+  tmux set-option -t "$target_session" status-format[0] "#[bg=#1a1b26]  #[fg=#e8683a bold]#{s/claude-//:session_name}  #[fg=#3b4261]·  #[fg=#7aa2f7]󰘬 #(git -C #{pane_current_path} branch --show-current 2>/dev/null || echo '-')#[align=right]#[fg=#565a6e]Alt+h help  "
+
+  # Line 1 (bottom): Window tabs with smart truncation and brand color
+  tmux set-option -t "$target_session" status-format[1] "#[bg=#1a1b26]#{W:#{?window_active,#[fg=#1a1b26 bg=#e8683a bold]  #I  #[fg=#e8683a bg=#2d2f3a]#[fg=#e0e0e0] #{=15:window_name} #[bg=#1a1b26 fg=#2d2f3a],#[fg=#8a8a8a]  #I:#{=|8|...:window_name}  }}"
+
+  # Pane border styling - blue inactive, orange active
+  tmux set-option -t "$target_session" pane-border-style "fg=#3d59a1"
+  tmux set-option -t "$target_session" pane-active-border-style "fg=#e8683a"
+
+  # Message styling - orange highlight
+  tmux set-option -t "$target_session" message-style "bg=#e8683a,fg=#1a1b26,bold"
+
+  # ─── Keybindings ────────────────────────────────────────────────────────────
+
+  # Alt+number to switch windows (1-9)
+  for i in 1 2 3 4 5 6 7 8 9; do
+    tmux bind-key -n "M-$i" select-window -t ":$i"
+  done
+
+  # Alt+c to create new window
+  tmux bind-key -n M-c new-window -c "#{pane_current_path}"
+
+  # Alt+q to detach
+  tmux bind-key -n M-q detach-client
+
+  # Alt+l to list and switch between sessions (interactive picker)
+  tmux bind-key -n M-l choose-tree -s -Z
+
+  # Alt+d to split horizontally (side by side)
+  tmux bind-key -n M-d split-window -h -c "#{pane_current_path}"
+
+  # Alt+v to split vertically (top/bottom)
+  tmux bind-key -n M-v split-window -v -c "#{pane_current_path}"
+
+  # Alt+arrow to navigate panes
+  tmux bind-key -n M-Left select-pane -L
+  tmux bind-key -n M-Right select-pane -R
+  tmux bind-key -n M-Up select-pane -U
+  tmux bind-key -n M-Down select-pane -D
+
+  # Alt+x to close current pane (with confirmation)
+  tmux bind-key -n M-x confirm-before -p "Close pane? (y/n)" kill-pane
+
+  # Alt+w to close current window (with confirmation)
+  tmux bind-key -n M-w confirm-before -p "Close window? (y/n)" kill-window
+
+  # Alt+n/p for next/previous window
+  tmux bind-key -n M-n next-window
+  tmux bind-key -n M-p previous-window
+
+  # Alt+r to rename window
+  tmux bind-key -n M-r command-prompt -I "#W" "rename-window '%%'"
+
+  # Alt+z to zoom/unzoom pane (fullscreen toggle)
+  tmux bind-key -n M-z resize-pane -Z
+
+  # Alt+[ to enter copy mode (for scrolling)
+  tmux bind-key -n M-[ copy-mode
+
+  # ─── Session Creation Keybindings ──────────────────────────────────────────
+  # Alt+s to create a new Claude window (starts fresh, future re-runs in same pane resume)
+  tmux bind-key -n M-s run-shell "tmux new-window -n claude -c '#{pane_current_path}' && tmux send-keys '\"\$AGILEFLOW_SCRIPTS/claude-smart.sh\" --fresh \$CLAUDE_SESSION_FLAGS' Enter"
+
+  # ─── Freeze Recovery Keybindings ───────────────────────────────────────────
+  # Alt+k to send Ctrl+C twice (soft interrupt for frozen processes)
+  tmux bind-key -n M-k run-shell "tmux send-keys C-c; sleep 0.5; tmux send-keys C-c"
+
+  # ─── Help Panel ──────────────────────────────────────────────────────────
+  # Alt+h to show keybind cheat sheet in a popup
+  tmux bind-key -n M-h display-popup -E -w 52 -h 24 "\
+    printf '\\n';\
+    printf '  \\033[1;38;5;208mSESSIONS\\033[0m\\n';\
+    printf '  Alt+s   New Claude window\\n';\
+    printf '  Alt+l   Switch session\\n';\
+    printf '  Alt+q   Detach (af to resume)\\n';\
+    printf '\\n';\
+    printf '  \\033[1;38;5;208mWINDOWS\\033[0m\\n';\
+    printf '  Alt+1-9 Switch to window\\n';\
+    printf '  Alt+c   New empty window\\n';\
+    printf '  Alt+n/p Next / previous\\n';\
+    printf '  Alt+r   Rename window\\n';\
+    printf '  Alt+w   Close window\\n';\
+    printf '\\n';\
+    printf '  \\033[1;38;5;208mPANES\\033[0m\\n';\
+    printf '  Alt+d   Split side by side\\n';\
+    printf '  Alt+v   Split top / bottom\\n';\
+    printf '  Alt+←→↑↓  Navigate\\n';\
+    printf '  Alt+z   Zoom / unzoom\\n';\
+    printf '  Alt+x   Close pane\\n';\
+    printf '\\n';\
+    printf '  \\033[1;38;5;208mOTHER\\033[0m\\n';\
+    printf '  Alt+[   Scroll mode\\n';\
+    printf '  Alt+k   Unfreeze (Ctrl+C×2)\\n';\
+    printf '  Alt+h   This help\\n';\
+    printf '\\n';\
+    read -n 1 -s -r -p '  Press any key to close'"
+}
+
+# Handle --refresh flag — re-apply config to all existing claude-* sessions
+if [ "$REFRESH_CONFIG" = true ]; then
+  REFRESHED=0
+  for sid in $(tmux list-sessions -F '#{session_name}' 2>/dev/null | grep "^claude-"); do
+    configure_tmux_session "$sid"
+    # Ensure AGILEFLOW_SCRIPTS is set (needed by Alt+S keybind)
+    tmux set-environment -t "$sid" AGILEFLOW_SCRIPTS "$SCRIPT_DIR" 2>/dev/null || true
+    REFRESHED=$((REFRESHED + 1))
+  done
+  if [ "$REFRESHED" -gt 0 ]; then
+    echo "Refreshed config on $REFRESHED session(s)."
+  else
+    echo "No claude-* sessions found to refresh."
+  fi
+  exit 0
+fi
+
+# Check if we're already inside tmux — use smart wrapper instead of session management
+if [ -n "$TMUX" ]; then
+  # shellcheck disable=SC2086
+  exec "$SCRIPT_DIR/claude-smart.sh" $CLAUDE_SESSION_FLAGS "$@"
+fi
+
 # Generate directory name (used for session name patterns)
 DIR_NAME=$(basename "$(pwd)")
 
@@ -190,8 +350,59 @@ if [ "$ATTACH_ONLY" = true ]; then
   fi
 fi
 
-# Find next available session name (supports multiple from same directory)
+# ── Auto-cleanup dead sessions ────────────────────────────────────────────
+# Silently remove sessions where all panes have exited (dead/empty shells).
+# This prevents accumulation of orphan sessions over time.
 SESSION_BASE="claude-${DIR_NAME}"
+for sid in $(tmux list-sessions -F '#{session_name}' 2>/dev/null | grep "^${SESSION_BASE}\(\$\|-[0-9]*\$\)"); do
+  # Count alive panes (pane_dead=0 means alive)
+  ALIVE=$(tmux list-panes -t "$sid" -F '#{pane_dead}' 2>/dev/null | grep -c '^0$' || true)
+  if [ "$ALIVE" = "0" ]; then
+    tmux kill-session -t "$sid" 2>/dev/null || true
+  fi
+done
+
+# ── Auto-reattach to detached session ──────────────────────────────────────
+# When user does Alt+Q (detach) and then runs `af` again, reattach to the
+# existing session instead of creating a new one. This preserves tmux windows,
+# pane layout, and the live Claude chat session.
+# If multiple detached sessions exist, show a picker so user can choose.
+if [ "$FORCE_NEW" = false ]; then
+  DETACHED=()
+  while IFS= read -r sid; do
+    [ -n "$sid" ] && DETACHED+=("$sid")
+  done < <(tmux list-sessions -F '#{session_name} #{session_attached}' 2>/dev/null | awk '$2 == "0" {print $1}' | grep "^${SESSION_BASE}\(\$\|-[0-9]*\$\)")
+
+  if [ "${#DETACHED[@]}" -eq 1 ]; then
+    # Single detached session — just reattach
+    echo "Reattaching to: ${DETACHED[0]}"
+    exec tmux attach-session -t "${DETACHED[0]}"
+  elif [ "${#DETACHED[@]}" -gt 1 ]; then
+    # Multiple detached sessions — let user pick
+    echo ""
+    echo "  Multiple detached sessions found:"
+    echo ""
+    i=1
+    for sid in "${DETACHED[@]}"; do
+      WINS=$(tmux list-windows -t "$sid" -F '#{window_name}' 2>/dev/null | tr '\n' ',' | sed 's/,$//')
+      printf "    %d) %s  (%s)\n" "$i" "$sid" "$WINS"
+      i=$((i + 1))
+    done
+    printf "    %d) Create new session\n" "$i"
+    echo ""
+    printf "  Pick [1]: "
+    read -r CHOICE
+    CHOICE=${CHOICE:-1}
+    if [ "$CHOICE" -ge 1 ] 2>/dev/null && [ "$CHOICE" -lt "$i" ] 2>/dev/null; then
+      IDX=$((CHOICE - 1))
+      echo "Reattaching to: ${DETACHED[$IDX]}"
+      exec tmux attach-session -t "${DETACHED[$IDX]}"
+    fi
+    # Fall through to create new session
+  fi
+fi
+
+# No detached session found — create a new one
 SESSION_NAME="$SESSION_BASE"
 SESSION_NUM=1
 while tmux has-session -t "$SESSION_NAME" 2>/dev/null; do
@@ -265,12 +476,6 @@ if [ -f "$METADATA_FILE" ]; then
   fi
 fi
 
-# Check if we're already inside tmux
-if [ -n "$TMUX" ]; then
-  # Already in tmux, just run claude
-  exec claude "$@"
-fi
-
 # Check if tmux is available
 if ! command -v tmux &> /dev/null; then
   echo "tmux not found. Running claude without tmux."
@@ -281,118 +486,6 @@ if ! command -v tmux &> /dev/null; then
   exec claude "$@"
 fi
 
-# ══════════════════════════════════════════════════════════════════════════════
-# TMUX CONFIGURATION FUNCTION — applies theme, keybinds, and status bar
-# Extracted so --refresh can re-apply to existing sessions
-# ══════════════════════════════════════════════════════════════════════════════
-configure_tmux_session() {
-  local target_session="$1"
-
-  # Enable mouse support
-  tmux set-option -t "$target_session" mouse on
-
-  # Fix colors - proper terminal support
-  tmux set-option -t "$target_session" default-terminal "xterm-256color"
-  tmux set-option -t "$target_session" -ga terminal-overrides ",xterm-256color:Tc"
-
-  # ─── Status Bar Styling (2-line) ────────────────────────────────────────────
-
-  # Status bar position and refresh
-  tmux set-option -t "$target_session" status-position bottom
-  # Reduce refresh rate to prevent CPU overhead and freezes (was 5s, now 30s)
-  tmux set-option -t "$target_session" status-interval 30
-
-  # Enable 2-line status bar
-  tmux set-option -t "$target_session" status 2
-
-  # Base styling - Tokyo Night inspired dark theme
-  tmux set-option -t "$target_session" status-style "bg=#1a1b26,fg=#a9b1d6"
-
-  # Capture git branch once (avoids spawning process every refresh)
-  local git_branch
-  git_branch=$(git branch --show-current 2>/dev/null || echo '-')
-
-  # Line 0 (top): Session name (stripped of claude- prefix) + Keybinds + Git branch
-  tmux set-option -t "$target_session" status-format[0] "#[bg=#1a1b26]  #[fg=#e8683a bold]#{s/claude-//:session_name}  #[fg=#3b4261]·  #[fg=#7aa2f7]󰘬 ${git_branch}  #[align=right]#[fg=#7a7e8a]Alt+1-9 windows  Alt+s new session  Alt+q detach  "
-
-  # Line 1 (bottom): Window tabs with smart truncation and brand color
-  tmux set-option -t "$target_session" status-format[1] "#[bg=#1a1b26]#{W:#{?window_active,#[fg=#1a1b26 bg=#e8683a bold]  #I  #[fg=#e8683a bg=#2d2f3a]#[fg=#e0e0e0] #{=15:window_name} #[bg=#1a1b26 fg=#2d2f3a],#[fg=#8a8a8a]  #I:#{=|8|...:window_name}  }}"
-
-  # Pane border styling - blue inactive, orange active
-  tmux set-option -t "$target_session" pane-border-style "fg=#3d59a1"
-  tmux set-option -t "$target_session" pane-active-border-style "fg=#e8683a"
-
-  # Message styling - orange highlight
-  tmux set-option -t "$target_session" message-style "bg=#e8683a,fg=#1a1b26,bold"
-
-  # ─── Keybindings ────────────────────────────────────────────────────────────
-
-  # Alt+number to switch windows (1-9)
-  for i in 1 2 3 4 5 6 7 8 9; do
-    tmux bind-key -n "M-$i" select-window -t ":$i"
-  done
-
-  # Alt+c to create new window
-  tmux bind-key -n M-c new-window -c "#{pane_current_path}"
-
-  # Alt+q to detach
-  tmux bind-key -n M-q detach-client
-
-  # Alt+d to split horizontally (side by side)
-  tmux bind-key -n M-d split-window -h -c "#{pane_current_path}"
-
-  # Alt+v to split vertically (top/bottom)
-  tmux bind-key -n M-v split-window -v -c "#{pane_current_path}"
-
-  # Alt+arrow to navigate panes
-  tmux bind-key -n M-Left select-pane -L
-  tmux bind-key -n M-Right select-pane -R
-  tmux bind-key -n M-Up select-pane -U
-  tmux bind-key -n M-Down select-pane -D
-
-  # Alt+x to close current pane (with confirmation)
-  tmux bind-key -n M-x confirm-before -p "Close pane? (y/n)" kill-pane
-
-  # Alt+w to close current window (with confirmation)
-  tmux bind-key -n M-w confirm-before -p "Close window? (y/n)" kill-window
-
-  # Alt+n/p for next/previous window
-  tmux bind-key -n M-n next-window
-  tmux bind-key -n M-p previous-window
-
-  # Alt+r to rename window
-  tmux bind-key -n M-r command-prompt -I "#W" "rename-window '%%'"
-
-  # Alt+z to zoom/unzoom pane (fullscreen toggle)
-  tmux bind-key -n M-z resize-pane -Z
-
-  # Alt+[ to enter copy mode (for scrolling)
-  tmux bind-key -n M-[ copy-mode
-
-  # ─── Session Creation Keybindings ──────────────────────────────────────────
-  # Alt+s to create a same-directory Claude window
-  tmux bind-key -n M-s run-shell "tmux new-window -c '#{pane_current_path}' && tmux send-keys 'claude \$CLAUDE_SESSION_FLAGS' Enter && tmux display-message 'New Claude session created'"
-
-  # ─── Freeze Recovery Keybindings ───────────────────────────────────────────
-  # Alt+k to send Ctrl+C twice (soft interrupt for frozen processes)
-  tmux bind-key -n M-k run-shell "tmux send-keys C-c; sleep 0.5; tmux send-keys C-c"
-}
-
-# Handle --refresh flag — re-apply config to all existing claude-* sessions
-if [ "$REFRESH_CONFIG" = true ]; then
-  REFRESHED=0
-  for sid in $(tmux list-sessions -F '#{session_name}' 2>/dev/null | grep "^claude-"); do
-    configure_tmux_session "$sid"
-    REFRESHED=$((REFRESHED + 1))
-  done
-  if [ "$REFRESHED" -gt 0 ]; then
-    echo "Refreshed config on $REFRESHED session(s)."
-  else
-    echo "No claude-* sessions found to refresh."
-  fi
-  exit 0
-fi
-
 # Create new tmux session with Claude
 echo "Starting Claude in tmux session: $SESSION_NAME"
 
@@ -408,33 +501,27 @@ tmux move-window -t "$SESSION_NAME":1 >/dev/null 2>&1 || true
 # Apply tmux configuration
 configure_tmux_session "$SESSION_NAME"
 
-# Send the claude command to the first window
-CLAUDE_CMD="claude"
-
-# Check for inherited session flags (set by parent Claude session)
-INHERITED_FLAGS=""
+# Export scripts directory to tmux session environment (used by keybinds)
+tmux set-environment -t "$SESSION_NAME" AGILEFLOW_SCRIPTS "$SCRIPT_DIR"
 if [ -n "$CLAUDE_SESSION_FLAGS" ]; then
-  INHERITED_FLAGS="$CLAUDE_SESSION_FLAGS"
+  tmux set-environment -t "$SESSION_NAME" CLAUDE_SESSION_FLAGS "$CLAUDE_SESSION_FLAGS"
 fi
 
+# Pre-seed @claude_uuid on initial pane if we found a recent conversation
 if [ "$USE_RESUME" = true ] && [ -n "$RESUME_SESSION_ID" ]; then
-  # Fresh restart with specific conversation resume (skips picker)
-  CLAUDE_CMD="claude --resume $RESUME_SESSION_ID"
-elif [ "$USE_RESUME" = true ]; then
-  # Fresh restart with conversation picker
-  CLAUDE_CMD="claude --resume"
+  tmux set-option -p -t "$SESSION_NAME" @claude_uuid "$RESUME_SESSION_ID" 2>/dev/null || true
 fi
 
-# Add inherited flags if present (e.g., --dangerously-skip-permissions)
-if [ -n "$INHERITED_FLAGS" ]; then
-  CLAUDE_CMD="$CLAUDE_CMD $INHERITED_FLAGS"
+# Launch Claude via smart wrapper (handles resume from @claude_uuid)
+SMART_CMD="\"$SCRIPT_DIR/claude-smart.sh\""
+if [ -n "$CLAUDE_SESSION_FLAGS" ]; then
+  SMART_CMD="$SMART_CMD $CLAUDE_SESSION_FLAGS"
 fi
-
 if [ $# -gt 0 ]; then
-  # Pass any remaining arguments to claude
-  CLAUDE_CMD="$CLAUDE_CMD $*"
+  SMART_CMD="$SMART_CMD $*"
 fi
-tmux send-keys -t "$SESSION_NAME" "$CLAUDE_CMD" Enter
+
+tmux send-keys -t "$SESSION_NAME" "$SMART_CMD" Enter
 
 # Attach to the session
 exec tmux attach-session -t "$SESSION_NAME"