agileflow 3.2.1 → 3.4.0

package/CHANGELOG.md

@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [3.4.0] - 2026-02-28
+
+### Added
+- Ads audit system, SEO analysis, ultradeep concurrency controls, and domain-first command naming
+
+## [3.3.0] - 2026-02-24
+
+### Added
+- Per-agent file tracking, tmux restore, and completeness audit
+
 ## [3.2.1] - 2026-02-21
 
 ### Added

package/README.md

@@ -3,8 +3,8 @@
 </p>
 
 [![npm version](https://img.shields.io/npm/v/agileflow?color=brightgreen)](https://www.npmjs.com/package/agileflow)
-[![Commands](https://img.shields.io/badge/commands-98-blue)](https://docs.agileflow.projectquestorg.com/docs/commands)
-[![Agents/Experts](https://img.shields.io/badge/agents%2Fexperts-83-orange)](https://docs.agileflow.projectquestorg.com/docs/agents)
+[![Commands](https://img.shields.io/badge/commands-124-blue)](https://docs.agileflow.projectquestorg.com/docs/commands)
+[![Agents/Experts](https://img.shields.io/badge/agents%2Fexperts-111-orange)](https://docs.agileflow.projectquestorg.com/docs/agents)
 [![Skills](https://img.shields.io/badge/skills-dynamic-purple)](https://docs.agileflow.projectquestorg.com/docs/features/skills)
 
 **AI-driven agile development for Claude Code, Cursor, Windsurf, OpenAI Codex, and more.** Combining Scrum, Kanban, ADRs, and docs-as-code principles into one framework-agnostic system.
@@ -54,9 +54,9 @@ Traditional project management tools create friction between planning and execut
 
 | Component | Count | Description |
 |-----------|-------|-------------|
-| [Commands](https://docs.agileflow.projectquestorg.com/docs/commands) | 98 | Slash commands for agile workflows |
-| [Agents/Experts](https://docs.agileflow.projectquestorg.com/docs/agents) | 83 | Specialized agents with self-improving knowledge bases |
-| [Skills](https://docs.agileflow.projectquestorg.com/docs/features/skills) | Dynamic | Generated on-demand with `/agileflow:skill:create` |
+| [Commands](https://docs.agileflow.projectquestorg.com/docs/commands) | 124 | Slash commands for agile workflows |
+| [Agents/Experts](https://docs.agileflow.projectquestorg.com/docs/agents) | 111 | Specialized agents with self-improving knowledge bases |
+| [Skills](https://docs.agileflow.projectquestorg.com/docs/features/skills) | Dynamic | Browse and install from skills.sh marketplace via `/agileflow:skill:recommend` |
 
 ---
 
@@ -66,7 +66,7 @@ Traditional project management tools create friction between planning and execut
 |---------|-------------|------|
 | Agent Expertise | Self-improving agents that maintain domain knowledge | [Learn more](https://docs.agileflow.projectquestorg.com/docs/features/agent-expertise-system) |
 | Agent Teams | Multi-domain expert coordination with quality gates | [Learn more](https://docs.agileflow.projectquestorg.com/docs/features/agent-teams) |
-| Skills System | Custom AI prompts that learn from your feedback | [Learn more](https://docs.agileflow.projectquestorg.com/docs/features/skills) |
+| Skills System | Browse and install skills from the skills.sh marketplace | [Learn more](https://docs.agileflow.projectquestorg.com/docs/features/skills) |
 | Parallel Sessions | Isolated workspaces with boundary protection | [Learn more](https://docs.agileflow.projectquestorg.com/docs/features/parallel-sessions) |
 | Loop Mode | Autonomous story execution until epic completion | [Learn more](https://docs.agileflow.projectquestorg.com/docs/features/loop-mode) |
 | AI Council | Three-perspective strategic decision analysis | [Learn more](https://docs.agileflow.projectquestorg.com/docs/commands/council) |

package/lib/feature-flags.js

@@ -11,6 +11,12 @@
 
 const fs = require('fs');
 
+/**
+ * Tools expected to be available when Agent Teams native mode is enabled.
+ * Used for feature detection and capability reporting.
+ */
+const AGENT_TEAMS_TOOLS = Object.freeze(['TeamCreate', 'SendMessage', 'ListTeams']);
+
 // Lazy-load paths to avoid circular dependency issues
 let _paths;
 function getPaths() {
@@ -67,6 +73,24 @@ function getAgentTeamsMode(options = {}) {
   return 'native';
 }
 
+/**
+ * Get the list of Agent Teams tools available in the current environment.
+ *
+ * When Agent Teams is enabled (native mode), returns the expected tool names.
+ * When disabled, returns an empty array.
+ *
+ * @param {object} [options] - Options
+ * @param {string} [options.rootDir] - Project root directory
+ * @param {object} [options.metadata] - Pre-loaded metadata
+ * @returns {string[]} Array of available tool names
+ */
+function getAvailableTools(options = {}) {
+  if (!isAgentTeamsEnabled(options)) {
+    return [];
+  }
+  return [...AGENT_TEAMS_TOOLS];
+}
+
 /**
  * Get all feature flags as an object.
  *
@@ -77,10 +101,12 @@ function getAgentTeamsMode(options = {}) {
  */
 function getFeatureFlags(options = {}) {
   const metadata = options.metadata || loadMetadataSafe(options.rootDir);
+  const opts = { ...options, metadata };
 
   return {
-    agentTeams: isAgentTeamsEnabled({ ...options, metadata }),
-    agentTeamsMode: getAgentTeamsMode({ ...options, metadata }),
+    agentTeams: isAgentTeamsEnabled(opts),
+    agentTeamsMode: getAgentTeamsMode(opts),
+    availableTools: getAvailableTools(opts),
   };
 }
 
@@ -93,12 +119,12 @@ function getFeatureFlags(options = {}) {
  */
 function getAgentTeamsDisplayInfo(options = {}) {
   const enabled = isAgentTeamsEnabled(options);
-  const mode = getAgentTeamsMode(options);
 
   if (enabled) {
+    const tools = getAvailableTools(options);
     return {
       label: 'Agent Teams',
-      value: 'ENABLED (native)',
+      value: `ENABLED (native, ${tools.length} tools)`,
       status: 'enabled',
     };
   }
@@ -136,8 +162,10 @@ function loadMetadataSafe(rootDir) {
 }
 
 module.exports = {
+  AGENT_TEAMS_TOOLS,
   isAgentTeamsEnabled,
   getAgentTeamsMode,
+  getAvailableTools,
   getFeatureFlags,
   getAgentTeamsDisplayInfo,
 };

package/lib/skill-loader.js

@@ -126,7 +126,6 @@ function loadSkill(skillDir) {
       path: skillDir,
       hasReferences: fs.existsSync(path.join(skillDir, 'references.md')),
       hasCookbook: fs.existsSync(path.join(skillDir, 'cookbook')),
-      hasMcp: fs.existsSync(path.join(skillDir, '.mcp.json')),
       metadata,
     };
   } catch {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agileflow",
-  "version": "3.2.1",
+  "version": "3.4.0",
   "description": "AI-driven agile development system for Claude Code, Cursor, Windsurf, and more",
   "keywords": [
     "agile",

package/scripts/agileflow-statusline.sh

@@ -88,6 +88,7 @@ SHOW_SESSION_TIME=false
 SHOW_COST=false
 SHOW_GIT=true
 SHOW_SCALE=true
+SHOW_ULTRADEEP=true
 
 # Check agileflow-metadata.json for component settings
 if [ -f "docs/00-meta/agileflow-metadata.json" ]; then
@@ -106,6 +107,7 @@ if [ -f "docs/00-meta/agileflow-metadata.json" ]; then
     SHOW_COST=$(echo "$COMPONENTS" | jq -r '.cost | if . == null then true else . end')
     SHOW_GIT=$(echo "$COMPONENTS" | jq -r '.git | if . == null then true else . end')
     SHOW_SCALE=$(echo "$COMPONENTS" | jq -r '.scale | if . == null then true else . end')
+    SHOW_ULTRADEEP=$(echo "$COMPONENTS" | jq -r '.ultradeep | if . == null then true else . end')
   fi
 fi
 
@@ -669,6 +671,79 @@ if [ "$SHOW_SCALE" = "true" ] && [ -f "docs/09-agents/session-state.json" ]; the
   fi
 fi
 
+# ============================================================================
+# Ultradeep Audit Progress Detection
+# ============================================================================
+ULTRADEEP_DISPLAY=""
+if [ "$SHOW_ULTRADEEP" = "true" ]; then
+  ULTRADEEP_DIR="docs/09-agents/ultradeep"
+  if [ -d "$ULTRADEEP_DIR" ]; then
+    # Find most recent trace directory by modification time
+    LATEST_TRACE=$(ls -td "$ULTRADEEP_DIR"/*/ 2>/dev/null | head -1)
+    if [ -n "$LATEST_TRACE" ]; then
+      ULTRA_STATUS_FILE="${LATEST_TRACE}_status.json"
+      if [ -f "$ULTRA_STATUS_FILE" ]; then
+        ULTRA_STATUS=$(cat "$ULTRA_STATUS_FILE" 2>/dev/null)
+        ULTRA_AUDIT_TYPE=$(echo "$ULTRA_STATUS" | jq -r '.audit_type // empty' 2>/dev/null)
+        ULTRA_TOTAL=$(echo "$ULTRA_STATUS" | jq -r '.analyzers | length' 2>/dev/null)
+        ULTRA_COMPLETED=$(echo "$ULTRA_STATUS" | jq -r '.completed | length' 2>/dev/null)
+        ULTRA_STARTED=$(echo "$ULTRA_STATUS" | jq -r '.started_at // empty' 2>/dev/null)
+        ULTRA_LAST_CHECKED=$(echo "$ULTRA_STATUS" | jq -r '.last_checked // empty' 2>/dev/null)
+
+        # Validate we got numeric values
+        [[ "$ULTRA_TOTAL" =~ ^[0-9]+$ ]] || ULTRA_TOTAL=0
+        [[ "$ULTRA_COMPLETED" =~ ^[0-9]+$ ]] || ULTRA_COMPLETED=0
+
+        if [ "$ULTRA_TOTAL" -gt 0 ] && [ -n "$ULTRA_AUDIT_TYPE" ]; then
+          # Staleness check: skip if started >60 min ago and no recent activity
+          ULTRA_STALE=false
+          if [ -n "$ULTRA_STARTED" ]; then
+            ULTRA_START_EPOCH=$(to_epoch "$ULTRA_STARTED" 2>/dev/null)
+            ULTRA_NOW=$(date +%s)
+            if [ -n "$ULTRA_START_EPOCH" ] && [ $((ULTRA_NOW - ULTRA_START_EPOCH)) -gt 3600 ]; then
+              # Started over 60 min ago - check last_checked
+              if [ -n "$ULTRA_LAST_CHECKED" ] && [ "$ULTRA_LAST_CHECKED" != "null" ]; then
+                ULTRA_LC_EPOCH=$(to_epoch "$ULTRA_LAST_CHECKED" 2>/dev/null)
+                if [ -n "$ULTRA_LC_EPOCH" ] && [ $((ULTRA_NOW - ULTRA_LC_EPOCH)) -gt 120 ]; then
+                  ULTRA_STALE=true
+                fi
+              else
+                # No last_checked at all and started >60 min ago
+                ULTRA_STALE=true
+              fi
+            fi
+          fi
+
+          if [ "$ULTRA_STALE" = "false" ]; then
+            # Map audit type to color and prefix
+            case "$ULTRA_AUDIT_TYPE" in
+              logic)        ULTRA_COLOR="\033[38;2;122;162;247m"; ULTRA_PREFIX="Logic" ;;
+              security)     ULTRA_COLOR="\033[38;2;247;118;142m"; ULTRA_PREFIX="Sec" ;;
+              performance)  ULTRA_COLOR="\033[38;2;115;218;202m"; ULTRA_PREFIX="Perf" ;;
+              test)         ULTRA_COLOR="\033[38;2;224;175;104m"; ULTRA_PREFIX="Test" ;;
+              completeness) ULTRA_COLOR="\033[38;2;187;154;247m"; ULTRA_PREFIX="Comp" ;;
+              legal)        ULTRA_COLOR="\033[38;2;158;206;106m"; ULTRA_PREFIX="Legal" ;;
+              *)            ULTRA_COLOR="$DIM";                   ULTRA_PREFIX="Audit" ;;
+            esac
+
+            # Build display with progress coloring
+            if [ "$ULTRA_COMPLETED" -eq "$ULTRA_TOTAL" ]; then
+              # All complete - green checkmark
+              ULTRADEEP_DISPLAY="${ULTRA_COLOR}${ULTRA_PREFIX}${RESET} ${GREEN}${ULTRA_COMPLETED}/${ULTRA_TOTAL}✓${RESET}"
+            elif [ "$ULTRA_COMPLETED" -gt 0 ]; then
+              # In progress
+              ULTRADEEP_DISPLAY="${ULTRA_COLOR}${ULTRA_PREFIX}${RESET} ${ULTRA_COLOR}${ULTRA_COMPLETED}/${ULTRA_TOTAL}${RESET}"
+            else
+              # Just started (0 complete) - dim the fraction
+              ULTRADEEP_DISPLAY="${ULTRA_COLOR}${ULTRA_PREFIX}${RESET} ${DIM}${ULTRA_COMPLETED}/${ULTRA_TOTAL}${RESET}"
+            fi
+          fi
+        fi
+      fi
+    fi
+  fi
+fi
+
 # ============================================================================
 # Build Status Line
 # ============================================================================
@@ -759,6 +834,12 @@ if [ "$SHOW_SCALE" = "true" ] && [ -n "$SCALE_DISPLAY" ]; then
   OUTPUT="${OUTPUT}${SCALE_DISPLAY}"
 fi
 
+# Add ultradeep audit progress (if enabled and active)
+if [ "$SHOW_ULTRADEEP" = "true" ] && [ -n "$ULTRADEEP_DISPLAY" ]; then
+  [ -n "$OUTPUT" ] && OUTPUT="${OUTPUT}${SEP}"
+  OUTPUT="${OUTPUT}${ULTRADEEP_DISPLAY}"
+fi
+
 # Session health indicator (next to git branch)
 if [ "$SHOW_SESSION" = "true" ]; then
   SCRIPTS_DIR="$(dirname "$0")"

package/scripts/babysit-clear-restore.js

@@ -0,0 +1,154 @@
+#!/usr/bin/env node
+/**
+ * babysit-clear-restore.js - SessionStart hook for babysit context preservation
+ *
+ * When context is cleared (e.g., after plan approval), this hook:
+ * 1. Detects source="clear" from Claude Code's SessionStart event
+ * 2. Checks if /babysit is active in session-state.json
+ * 3. If both, outputs the COMPACT_SUMMARY from the babysit command file
+ * 4. Sets last_precompact_at so the welcome script preserves active_commands
+ *
+ * This eliminates the need to manually embed babysit rules in plan files (Rule #6).
+ * The hook automatically injects the rules into the fresh context after clear.
+ *
+ * Exit codes:
+ *   0 = Success (always - SessionStart hooks should never block)
+ *
+ * Input: JSON on stdin with { source: "startup"|"resume"|"clear"|"compact", ... }
+ * Output: Babysit compact summary to stdout (appears as system-reminder)
+ */
+
+const fs = require('fs');
+const path = require('path');
+
+const STDIN_TIMEOUT_MS = 3000;
+
+function findProjectRoot() {
+  let dir = process.cwd();
+  while (dir !== '/') {
+    if (fs.existsSync(path.join(dir, '.agileflow'))) return dir;
+    if (fs.existsSync(path.join(dir, 'docs', '09-agents'))) return dir;
+    dir = path.dirname(dir);
+  }
+  return process.cwd();
+}
+
+const ROOT = findProjectRoot();
+
+function getSessionState() {
+  const statePath = path.join(ROOT, 'docs', '09-agents', 'session-state.json');
+  try {
+    if (fs.existsSync(statePath)) {
+      return JSON.parse(fs.readFileSync(statePath, 'utf8'));
+    }
+  } catch (e) {
+    // Silently fail
+  }
+  return null;
+}
+
+function isBabysitActive(state) {
+  if (!state) return false;
+  const activeCommands = state.active_commands || [];
+  return activeCommands.some(cmd => cmd.name === 'babysit');
+}
+
+function setPrecompactTimestamp(state) {
+  const statePath = path.join(ROOT, 'docs', '09-agents', 'session-state.json');
+  try {
+    state.last_precompact_at = new Date().toISOString();
+    fs.writeFileSync(statePath, JSON.stringify(state, null, 2) + '\n');
+  } catch (e) {
+    // Silently fail
+  }
+}
+
+function getBabysitCompactSummary() {
+  // Search for the babysit command file in known locations
+  const locations = [
+    path.join(ROOT, 'packages', 'cli', 'src', 'core', 'commands', 'babysit.md'),
+    path.join(ROOT, '.agileflow', 'commands', 'babysit.md'),
+    path.join(ROOT, '.claude', 'commands', 'agileflow', 'babysit.md'),
+  ];
+
+  for (const filePath of locations) {
+    try {
+      if (!fs.existsSync(filePath)) continue;
+      const content = fs.readFileSync(filePath, 'utf8');
+      const match = content.match(
+        /<!-- COMPACT_SUMMARY_START[\s\S]*?-->([\s\S]*?)<!-- COMPACT_SUMMARY_END -->/
+      );
+      if (match) {
+        return match[1].trim();
+      }
+    } catch (e) {
+      // Try next location
+    }
+  }
+  return null;
+}
+
+// Read stdin for hook event data
+let inputData = '';
+
+process.stdin.setEncoding('utf8');
+
+process.stdin.on('data', chunk => {
+  inputData += chunk;
+});
+
+process.stdin.on('end', () => {
+  try {
+    const input = JSON.parse(inputData);
+    const source = input.source;
+
+    // Only act on "clear" events (context cleared after plan approval, /clear, etc.)
+    if (source !== 'clear') {
+      process.exit(0);
+      return;
+    }
+
+    const state = getSessionState();
+    if (!isBabysitActive(state)) {
+      process.exit(0);
+      return;
+    }
+
+    // Set last_precompact_at so the welcome script preserves active_commands
+    // instead of clearing them (it checks this timestamp)
+    setPrecompactTimestamp(state);
+
+    // Output the babysit compact summary
+    const summary = getBabysitCompactSummary();
+    if (summary) {
+      console.log('## ACTIVE COMMAND: /agileflow:babysit (restored after context clear)');
+      console.log('');
+      console.log(summary);
+    } else {
+      // Fallback: output minimal babysit rules if command file not found
+      console.log('## /agileflow:babysit IS ACTIVE (restored after context clear)');
+      console.log('');
+      console.log('MANDATORY RULES:');
+      console.log('1. ALWAYS end responses with AskUserQuestion tool (specific options, not text)');
+      console.log('2. Use EnterPlanMode for non-trivial tasks');
+      console.log('3. Delegate complex work to domain experts via Task tool');
+      console.log('4. Track progress with TaskCreate/TaskUpdate for multi-step work');
+      console.log(
+        '5. ALWAYS suggest logic audit post-implementation (after tests pass, make Recommended)'
+      );
+    }
+  } catch (e) {
+    // Parse failed or other error - fail open
+  }
+  process.exit(0);
+});
+
+// Handle no stdin (direct invocation or timeout)
+process.stdin.on('error', () => {
+  process.exit(0);
+});
+
+// Timeout safety - don't hang
+setTimeout(() => {
+  process.exit(0);
+}, STDIN_TIMEOUT_MS);

package/scripts/claude-tmux.sh

@@ -112,6 +112,8 @@ WINDOWS:
   Alt+n/p          Next/previous window
   Alt+r            Rename window
   Alt+w            Close window
+  Alt+W            Batch close windows (picker)
+  Alt+t            Reopen closed window
 
 PANES:
   Alt+d            Split side by side
@@ -120,9 +122,14 @@ PANES:
   Alt+z            Zoom/unzoom pane
   Alt+x            Close pane
 
+FREEZE RECOVERY:
+  Alt+k            Send Ctrl+C twice (soft unfreeze)
+  Alt+K            Force kill Claude process (keeps tab)
+  Alt+R            Respawn pane (fresh shell)
+
 OTHER:
-  Alt+[            Scroll mode
-  Alt+k            Send Ctrl+C twice (unfreeze)
+  Alt+b            Scroll mode (browse history)
+  Alt+h            Show keybind help panel
 EOF
   exit 0
 fi
@@ -185,19 +192,24 @@ build_tab_format() {
   # ── Inactive tab: gray text ─────────────────────────────────────────────
   # "  I:" prefix = 4 visible chars (wide); " I:" = 3 chars (narrow)
   # Width = prefix + pN(name) + 1(space)
-  local i0='#[fg=#8a8a8a]  #I:#{p35:#{=35:window_name}} '
-  local i1='#[fg=#8a8a8a]  #I:#{p22:#{=22:window_name}} '
-  local i2='#[fg=#8a8a8a]  #I:#{p15:#{=15:window_name}} '
-  local i3='#[fg=#8a8a8a] #I:#{p12:#{=12:window_name}} '
-  local i4='#[fg=#8a8a8a] #I:#{p9:#{=9:window_name}} '
-  local i5='#[fg=#8a8a8a] #I:#{p7:#{=7:window_name}} '
-  local i6='#[fg=#8a8a8a] #I:#{p6:#{=6:window_name}} '
-  local i7='#[fg=#8a8a8a] #I:#{p5:#{=5:window_name}} '
-  local i8='#[fg=#8a8a8a] #I:#{p4:#{=4:window_name}} '
-  local i9='#[fg=#8a8a8a] #I:#{p3:#{=3:window_name}} '
-  local i10='#[fg=#8a8a8a] #I:#{p2:#{=2:window_name}} '
-  local i11='#[fg=#8a8a8a] #I:#{p1:#{=1:window_name}} '
-  local i12='#[fg=#8a8a8a] #I '
+  #
+  # Group color support: when @group_color is set on a window (e.g. by
+  # spawn-audit-sessions.js), show a colored dot prefix to visually
+  # identify grouped windows (ULTRADEEP audit tabs in main session).
+  local gc='#{?#{@group_color},#[fg=#{@group_color}]•,}'
+  local i0="${gc}"'#[fg=#8a8a8a]  #I:#{p35:#{=35:window_name}} '
+  local i1="${gc}"'#[fg=#8a8a8a]  #I:#{p22:#{=22:window_name}} '
+  local i2="${gc}"'#[fg=#8a8a8a]  #I:#{p15:#{=15:window_name}} '
+  local i3="${gc}"'#[fg=#8a8a8a] #I:#{p12:#{=12:window_name}} '
+  local i4="${gc}"'#[fg=#8a8a8a] #I:#{p9:#{=9:window_name}} '
+  local i5="${gc}"'#[fg=#8a8a8a] #I:#{p7:#{=7:window_name}} '
+  local i6="${gc}"'#[fg=#8a8a8a] #I:#{p6:#{=6:window_name}} '
+  local i7="${gc}"'#[fg=#8a8a8a] #I:#{p5:#{=5:window_name}} '
+  local i8="${gc}"'#[fg=#8a8a8a] #I:#{p4:#{=4:window_name}} '
+  local i9="${gc}"'#[fg=#8a8a8a] #I:#{p3:#{=3:window_name}} '
+  local i10="${gc}"'#[fg=#8a8a8a] #I:#{p2:#{=2:window_name}} '
+  local i11="${gc}"'#[fg=#8a8a8a] #I:#{p1:#{=1:window_name}} '
+  local i12="${gc}"'#[fg=#8a8a8a] #I '
   local i13='#[fg=#565a6e]#I'
 
   # ── Tier selection: budget = width / windows ─────────────────────────────
@@ -240,6 +252,14 @@ configure_tmux_session() {
   # Enable mouse support
   tmux set-option -t "$target_session" mouse on
 
+  # Reduce escape-time from default 500ms to 10ms.
+  # The default causes two problems:
+  #   1) Arrow keys (which send \e[A etc.) get misinterpreted as Alt+[ if
+  #      there's any delivery delay, accidentally triggering copy-mode.
+  #   2) Pressing Escape in Claude Code has a 500ms lag before tmux forwards it.
+  # 10ms is enough to detect genuine escape sequences on localhost/fast SSH.
+  tmux set-option -t "$target_session" escape-time 10
+
   # Automatically renumber windows when one is closed (no gaps)
   tmux set-option -t "$target_session" renumber-windows on
 
@@ -308,8 +328,14 @@ configure_tmux_session() {
   # 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+w to close current window (save state for Alt+T restore, then kill)
+  tmux bind-key -n M-w confirm-before -p "Close window? (y/n)" "run-shell '\"\$AGILEFLOW_SCRIPTS/tmux-save-closed-window.sh\"' ; kill-window"
+
+  # Alt+W (uppercase) to batch-close windows via multi-select picker
+  tmux bind-key -n M-W display-popup -E -w 60 -h 20 "\"$AGILEFLOW_SCRIPTS/tmux-close-windows.sh\""
+
+  # Alt+t to restore the most recently closed window (like Ctrl+Shift+T in browsers)
+  tmux bind-key -n M-t run-shell '"$AGILEFLOW_SCRIPTS/tmux-restore-window.sh"'
 
   # Alt+n/p for next/previous window
   tmux bind-key -n M-n next-window
@@ -321,8 +347,39 @@ configure_tmux_session() {
   # 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
+  # Alt+b to enter copy mode (for scrolling / browsing history)
+  # NOTE: Do NOT use Alt+[ here — \e[ is the CSI prefix for arrow keys and
+  # function keys. Binding M-[ in the root table causes accidental copy-mode
+  # entry whenever an escape sequence is split by network latency, making the
+  # terminal appear to "lose focus" until Escape is pressed.
+  tmux bind-key -n M-b copy-mode
+
+  # Disable ALL command-prompt bindings in copy mode — they open a text input
+  # in the status bar which intercepts keystrokes and confuses the workflow.
+  # Navigation (arrows, scroll, mouse, PgUp/PgDn) and exit (q/Escape) still work.
+  #
+  # Emacs copy-mode: goto-line, search, jump-to-char, repeat-count
+  tmux unbind-key -T copy-mode g
+  tmux unbind-key -T copy-mode C-r
+  tmux unbind-key -T copy-mode C-s
+  tmux unbind-key -T copy-mode f
+  tmux unbind-key -T copy-mode F
+  tmux unbind-key -T copy-mode t
+  tmux unbind-key -T copy-mode T
+  for i in 1 2 3 4 5 6 7 8 9; do
+    tmux unbind-key -T copy-mode "M-$i"
+  done
+  # Vi copy-mode: goto-line, search, jump-to-char, repeat-count
+  tmux unbind-key -T copy-mode-vi :
+  tmux unbind-key -T copy-mode-vi /
+  tmux unbind-key -T copy-mode-vi ?
+  tmux unbind-key -T copy-mode-vi f
+  tmux unbind-key -T copy-mode-vi F
+  tmux unbind-key -T copy-mode-vi t
+  tmux unbind-key -T copy-mode-vi T
+  for i in 1 2 3 4 5 6 7 8 9; do
+    tmux unbind-key -T copy-mode-vi "$i"
+  done
 
   # ─── Session Creation Keybindings ──────────────────────────────────────────
   # Alt+s to create a new Claude window (starts fresh, future re-runs in same pane resume)
@@ -331,11 +388,31 @@ configure_tmux_session() {
 
   # ─── 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"
+  # Uses #{pane_id} to target the correct pane even if focus shifts during the sleep
+  tmux bind-key -n M-k run-shell "tmux send-keys -t '#{pane_id}' C-c; sleep 0.5; tmux send-keys -t '#{pane_id}' C-c"
+
+  # Alt+K (uppercase) to force kill Claude process in pane without closing tab
+  # Finds the claude child process under the pane's shell and kills it,
+  # leaving the shell prompt intact so the user can restart or continue.
+  # Uses ps -o pid=,args= with grep to find claude, then cuts the PID (avoids awk quoting issues in tmux run-shell).
+  tmux bind-key -n M-K run-shell '\
+    PANE_PID=$(tmux display-message -p "#{pane_pid}"); \
+    CLAUDE_PID=$(ps --ppid "$PANE_PID" -o pid=,args= 2>/dev/null | grep -v "watchdog" | grep "claude" | head -1 | sed "s/^[[:space:]]*//" | cut -d" " -f1); \
+    if [ -n "$CLAUDE_PID" ]; then \
+      kill -TERM "$CLAUDE_PID" 2>/dev/null; \
+      sleep 2; \
+      kill -0 "$CLAUDE_PID" 2>/dev/null && kill -KILL "$CLAUDE_PID" 2>/dev/null; \
+      tmux display-message "Killed Claude process (PID $CLAUDE_PID)"; \
+    else \
+      tmux display-message "No Claude process found in this pane"; \
+    fi'
+
+  # Alt+R to respawn pane (kills everything in the pane, starts fresh shell)
+  tmux bind-key -n M-R respawn-pane -k
 
   # ─── Help Panel ──────────────────────────────────────────────────────────
   # Alt+h to show all Alt keybindings in a popup
-  tmux bind-key -n M-h display-popup -E -w 52 -h 30 "\
+  tmux bind-key -n M-h display-popup -E -w 52 -h 32 "\
     printf '\\n';\
     printf '  \\033[1;38;5;208mSESSIONS\\033[0m\\n';\
     printf '  Alt+s      New Claude session\\n';\
@@ -348,6 +425,8 @@ configure_tmux_session() {
     printf '  Alt+n/p    Next / previous window\\n';\
     printf '  Alt+r      Rename window\\n';\
     printf '  Alt+w      Close window\\n';\
+    printf '  Alt+W      Batch close windows\\n';\
+    printf '  Alt+t      Reopen closed window\\n';\
     printf '\\n';\
     printf '  \\033[1;38;5;208mPANES\\033[0m\\n';\
     printf '  Alt+d      Split side by side\\n';\
@@ -355,11 +434,11 @@ configure_tmux_session() {
     printf '  Alt+arrows Navigate panes\\n';\
     printf '  Alt+z      Zoom / unzoom\\n';\
     printf '  Alt+x      Close pane (confirm)\\n';\
-    printf '  Alt+K      Kill pane (no confirm)\\n';\
-    printf '  Alt+R      Restart pane\\n';\
+    printf '  Alt+K      Force kill process\\n';\
+    printf '  Alt+R      Respawn pane (fresh)\\n';\
     printf '\\n';\
     printf '  \\033[1;38;5;208mOTHER\\033[0m\\n';\
-    printf '  Alt+[      Scroll mode\\n';\
+    printf '  Alt+b      Scroll mode\\n';\
     printf '  Alt+k      Unfreeze (Ctrl+C x2)\\n';\
     printf '  Alt+h      This help\\n';\
     printf '\\n';\
@@ -373,6 +452,14 @@ if [ "$REFRESH_CONFIG" = true ]; then
     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
+    # (Re)start watchdog if not running for this session
+    _EXISTING_WD=$(tmux show-environment -t "$sid" WATCHDOG_PID 2>/dev/null | cut -d= -f2)
+    if [ -z "$_EXISTING_WD" ] || ! kill -0 "$_EXISTING_WD" 2>/dev/null; then
+      "$SCRIPT_DIR/claude-watchdog.sh" "$sid" &
+      _WD_PID=$!
+      tmux set-environment -t "$sid" WATCHDOG_PID "$_WD_PID"
+      disown "$_WD_PID"
+    fi
     REFRESHED=$((REFRESHED + 1))
   done
   if [ "$REFRESHED" -gt 0 ]; then
@@ -645,6 +732,15 @@ if [ -n "$CLAUDE_SESSION_FLAGS" ]; then
   tmux set-environment -t "$SESSION_NAME" CLAUDE_SESSION_FLAGS "$CLAUDE_SESSION_FLAGS"
 fi
 
+# Start watchdog to auto-detect and kill frozen Claude processes
+EXISTING_WD=$(tmux show-environment -t "$SESSION_NAME" WATCHDOG_PID 2>/dev/null | cut -d= -f2)
+if [ -z "$EXISTING_WD" ] || ! kill -0 "$EXISTING_WD" 2>/dev/null; then
+  "$SCRIPT_DIR/claude-watchdog.sh" "$SESSION_NAME" &
+  _WD_PID=$!
+  tmux set-environment -t "$SESSION_NAME" WATCHDOG_PID "$_WD_PID"
+  disown "$_WD_PID"
+fi
+
 # Pre-seed @claude_uuid on initial pane if we found a recent conversation
 if [ "$USE_RESUME" = true ] && [ -n "$RESUME_SESSION_ID" ]; then
   tmux set-option -p -t "$SESSION_NAME" @claude_uuid "$RESUME_SESSION_ID" 2>/dev/null || true