agileflow 2.86.0 → 2.87.0

package/CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.87.0] - 2026-01-13
+
+### Added
+- Multi-session visibility with cleanup notifications and status line indicators
+
 ## [2.86.0] - 2026-01-13
 
 ### Added

package/package.json

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

package/scripts/agileflow-statusline.sh

@@ -510,8 +510,9 @@ fi
 # ============================================================================
 # Session Info (Multi-session awareness)
 # ============================================================================
-# Show current session if in a non-main session
+# Show current session info for ALL sessions (main and non-main)
 SESSION_INFO=""
+OTHER_SESSIONS=""
 SHOW_SESSION=true  # New component - default enabled
 
 # Check component setting
@@ -531,17 +532,28 @@ if [ "$SHOW_SESSION" = "true" ]; then
       {id: .key, nickname: .value.nickname, is_main: .value.is_main}
     ' "$REGISTRY_FILE" 2>/dev/null)
 
+    # Count total sessions and other active sessions (sessions with lock files)
+    TOTAL_SESSIONS=$(jq '.sessions | length' "$REGISTRY_FILE" 2>/dev/null)
+
     if [ -n "$SESSION_DATA" ]; then
       SESSION_NUM=$(echo "$SESSION_DATA" | jq -r '.id')
       SESSION_NICK=$(echo "$SESSION_DATA" | jq -r '.nickname // empty')
       IS_MAIN=$(echo "$SESSION_DATA" | jq -r '.is_main // false')
 
-      # Only show for non-main sessions
-      if [ "$IS_MAIN" != "true" ] && [ -n "$SESSION_NUM" ]; then
+      # Only show session info for non-main sessions (main is default, no need to show)
+      if [ -n "$SESSION_NUM" ] && [ "$IS_MAIN" != "true" ]; then
         if [ -n "$SESSION_NICK" ] && [ "$SESSION_NICK" != "null" ]; then
-          SESSION_INFO="${DIM}[${RESET}${MAGENTA}S${SESSION_NUM}${RESET}${DIM}:${RESET}${SESSION_NICK}${DIM}]${RESET}"
+          # With nickname
+          SESSION_INFO="${DIM}⎇${RESET} ${MAGENTA}Session ${SESSION_NUM}${RESET}${DIM}:${RESET}${SESSION_NICK}"
         else
-          SESSION_INFO="${DIM}[${RESET}${MAGENTA}S${SESSION_NUM}${RESET}${DIM}]${RESET}"
+          # Without nickname - show simple
+          SESSION_INFO="${DIM}⎇${RESET} ${MAGENTA}Session ${SESSION_NUM}${RESET}"
+        fi
+
+        # Show other sessions count if > 1 (only relevant for non-main)
+        if [ -n "$TOTAL_SESSIONS" ] && [ "$TOTAL_SESSIONS" -gt 1 ] 2>/dev/null; then
+          OTHER_COUNT=$((TOTAL_SESSIONS - 1))
+          OTHER_SESSIONS="${DIM} +${OTHER_COUNT}${RESET}"
         fi
       fi
     fi
@@ -561,10 +573,14 @@ if [ "$SHOW_AGILEFLOW" = "true" ] && [ -n "$AGILEFLOW_DISPLAY" ]; then
   OUTPUT="${AGILEFLOW_DISPLAY}"
 fi
 
-# Session info (if in a non-main session)
+# Session info (always show when available, with other sessions count)
 if [ "$SHOW_SESSION" = "true" ] && [ -n "$SESSION_INFO" ]; then
   [ -n "$OUTPUT" ] && OUTPUT="${OUTPUT}${SEP}"
   OUTPUT="${OUTPUT}${SESSION_INFO}"
+  # Append other sessions count if there are parallel sessions
+  if [ -n "$OTHER_SESSIONS" ]; then
+    OUTPUT="${OUTPUT}${OTHER_SESSIONS}"
+  fi
 fi
 
 # Model with subtle styling (if enabled and available)

package/scripts/agileflow-welcome.js

@@ -341,6 +341,7 @@ function checkParallelSessions(rootDir) {
     otherActive: 0,
     currentId: null,
     cleaned: 0,
+    cleanedSessions: [], // Detailed info about cleaned sessions
     // Extended session info for non-main sessions
     isMain: true,
     nickname: null,
@@ -374,6 +375,7 @@ function checkParallelSessions(rootDir) {
       result.currentId = data.id;
       result.otherActive = data.otherActive || 0;
       result.cleaned = data.cleaned || 0;
+      result.cleanedSessions = data.cleanedSessions || [];
 
       if (data.current) {
         result.isMain = data.current.is_main === true;
@@ -1277,6 +1279,18 @@ async function main() {
     );
   }
 
+  // Show detailed message if sessions were cleaned (VISIBLE - not hidden!)
+  if (parallelSessions.cleaned > 0 && parallelSessions.cleanedSessions) {
+    console.log('');
+    console.log(`${c.amber}📋 Cleaned ${parallelSessions.cleaned} inactive session(s):${c.reset}`);
+    parallelSessions.cleanedSessions.forEach((sess) => {
+      const name = sess.nickname ? `${sess.id} "${sess.nickname}"` : `Session ${sess.id}`;
+      const reason = sess.reason === 'pid_dead' ? 'process ended' : sess.reason;
+      console.log(`   ${c.dim}└─ ${name} (${reason}, PID ${sess.pid})${c.reset}`);
+    });
+    console.log(`   ${c.slate}Sessions are cleaned when their Claude Code process is no longer running.${c.reset}`);
+  }
+
   // Story claiming: cleanup stale claims and show warnings
   if (storyClaiming) {
     try {

package/scripts/obtain-context.js

@@ -386,6 +386,67 @@ function generateFullContent() {
   content += `${C.lavender}${C.bold}${title}${C.reset}\n`;
   content += `${C.dim}Generated: ${new Date().toISOString()}${C.reset}\n`;
 
+  // 0.5 SESSION CONTEXT BANNER (FIRST - before everything else)
+  // This is critical for multi-session awareness - agents need to know which session they're in
+  const sessionManagerPath = path.join(__dirname, 'session-manager.js');
+  const altSessionManagerPath = '.agileflow/scripts/session-manager.js';
+
+  if (fs.existsSync(sessionManagerPath) || fs.existsSync(altSessionManagerPath)) {
+    const managerPath = fs.existsSync(sessionManagerPath)
+      ? sessionManagerPath
+      : altSessionManagerPath;
+    const sessionStatus = safeExec(`node "${managerPath}" status`);
+
+    if (sessionStatus) {
+      try {
+        const statusData = JSON.parse(sessionStatus);
+        if (statusData.current) {
+          const session = statusData.current;
+          const isMain = session.is_main === true;
+          const sessionName = session.nickname
+            ? `Session ${session.id} "${session.nickname}"`
+            : `Session ${session.id}`;
+
+          content += `\n${C.teal}${C.bold}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${C.reset}\n`;
+          content += `${C.teal}${C.bold}📍 SESSION CONTEXT${C.reset}\n`;
+          content += `${C.teal}${C.bold}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${C.reset}\n`;
+
+          if (isMain) {
+            content += `${C.mintGreen}${C.bold}${sessionName}${C.reset} ${C.dim}(main project)${C.reset}\n`;
+          } else {
+            content += `${C.peach}${C.bold}🔀 ${sessionName}${C.reset} ${C.dim}(worktree)${C.reset}\n`;
+            content += `Branch: ${C.skyBlue}${session.branch || 'unknown'}${C.reset}\n`;
+            content += `${C.dim}Path: ${session.path || process.cwd()}${C.reset}\n`;
+          }
+
+          // Show other active sessions prominently
+          if (statusData.otherActive > 0) {
+            content += `${C.amber}⚠️ ${statusData.otherActive} other active session(s)${C.reset} - check story claims below\n`;
+          }
+
+          content += `${C.teal}${C.bold}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${C.reset}\n\n`;
+        }
+      } catch (e) {
+        // Silently ignore session parse errors - will still show detailed session context later
+      }
+    }
+  }
+
+  // 0.7 INTERACTION MODE (AskUserQuestion) - EARLY for visibility
+  // This MUST appear before other content to ensure Claude sees it
+  const earlyMetadata = safeReadJSON('docs/00-meta/agileflow-metadata.json');
+  const askUserQuestionConfig = earlyMetadata?.features?.askUserQuestion;
+
+  if (askUserQuestionConfig?.enabled) {
+    content += `${C.coral}${C.bold}┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓${C.reset}\n`;
+    content += `${C.coral}${C.bold}┃ 🔔 MANDATORY: AskUserQuestion After EVERY Response      ┃${C.reset}\n`;
+    content += `${C.coral}${C.bold}┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛${C.reset}\n`;
+    content += `${C.bold}After completing ANY task${C.reset} (implementation, fix, etc.):\n`;
+    content += `${C.mintGreen}→ ALWAYS${C.reset} call ${C.skyBlue}AskUserQuestion${C.reset} tool to offer next steps\n`;
+    content += `${C.coral}→ NEVER${C.reset} end with text like "Done!" or "What's next?"\n\n`;
+    content += `${C.dim}Balance: Use at natural pause points. Don't ask permission for routine work.${C.reset}\n\n`;
+  }
+
   // 0. PROGRESSIVE DISCLOSURE (section activation)
   if (activeSections.length > 0) {
     content += `\n${C.cyan}${C.bold}═══ 📖 Progressive Disclosure: Active Sections ═══${C.reset}\n`;
@@ -490,58 +551,35 @@ function generateFullContent() {
     content += `${C.dim}No session-state.json found${C.reset}\n`;
   }
 
-  // 4. SESSION CONTEXT (multi-session awareness)
-  content += `\n${C.skyBlue}${C.bold}═══ Session Context ═══${C.reset}\n`;
-  const sessionManagerPath = path.join(__dirname, 'session-manager.js');
-  const altSessionManagerPath = '.agileflow/scripts/session-manager.js';
+  // 4. SESSION CONTEXT (details - banner shown above)
+  // Note: Prominent SESSION CONTEXT banner is shown at the top of output
+  // This section provides additional details for non-main sessions
+  const sessionMgrPath = path.join(__dirname, 'session-manager.js');
+  const altSessionMgrPath = '.agileflow/scripts/session-manager.js';
 
-  if (fs.existsSync(sessionManagerPath) || fs.existsSync(altSessionManagerPath)) {
-    const managerPath = fs.existsSync(sessionManagerPath)
-      ? sessionManagerPath
-      : altSessionManagerPath;
-    const sessionStatus = safeExec(`node "${managerPath}" status`);
+  if (fs.existsSync(sessionMgrPath) || fs.existsSync(altSessionMgrPath)) {
+    const mgrPath = fs.existsSync(sessionMgrPath) ? sessionMgrPath : altSessionMgrPath;
+    const sessionStatusStr = safeExec(`node "${mgrPath}" status`);
 
-    if (sessionStatus) {
+    if (sessionStatusStr) {
       try {
-        const statusData = JSON.parse(sessionStatus);
-        if (statusData.current) {
+        const statusData = JSON.parse(sessionStatusStr);
+        if (statusData.current && !statusData.current.is_main) {
+          // Only show additional details for non-main sessions
+          content += `\n${C.skyBlue}${C.bold}═══ Session Details ═══${C.reset}\n`;
           const session = statusData.current;
-          const isMain = session.is_main === true;
 
-          if (isMain) {
-            content += `Session: ${C.mintGreen}Main project${C.reset} (Session ${session.id || 1})\n`;
-          } else {
-            // NON-MAIN SESSION - Show prominent banner
-            const sessionName = session.nickname
-              ? `${session.id} "${session.nickname}"`
-              : `${session.id}`;
-            content += `${C.teal}${C.bold}🔀 SESSION ${sessionName} (worktree)${C.reset}\n`;
-            content += `Branch: ${C.skyBlue}${session.branch || 'unknown'}${C.reset}\n`;
-            content += `Path: ${C.dim}${session.path || process.cwd()}${C.reset}\n`;
-
-            // Calculate relative path to main
-            const mainPath = process.cwd().replace(/-[^/]+$/, ''); // Heuristic: strip session suffix
-            content += `Main project: ${C.dim}${mainPath}${C.reset}\n`;
-
-            // Remind about merge flow
-            content += `${C.lavender}💡 When done: /agileflow:session:end → merge to main${C.reset}\n`;
-          }
+          // Calculate relative path to main
+          const mainPath = process.cwd().replace(/-[^/]+$/, ''); // Heuristic: strip session suffix
+          content += `Main project: ${C.dim}${mainPath}${C.reset}\n`;
 
-          // Show other active sessions
-          if (statusData.otherActive > 0) {
-            content += `${C.peach}⚠️ ${statusData.otherActive} other session(s) active${C.reset}\n`;
-          }
-        } else {
-          content += `${C.dim}No session registered${C.reset}\n`;
+          // Remind about merge flow
+          content += `${C.lavender}💡 When done: /agileflow:session:end → merge to main${C.reset}\n`;
         }
       } catch (e) {
-        content += `${C.dim}Session manager available but status parse failed${C.reset}\n`;
+        // Silently ignore - banner above has basic info
       }
-    } else {
-      content += `${C.dim}Session manager available${C.reset}\n`;
     }
-  } else {
-    content += `${C.dim}Multi-session not configured${C.reset}\n`;
   }
 
   // 5. STORY CLAIMS (inter-session coordination)
@@ -662,35 +700,7 @@ function generateFullContent() {
     content += `${C.dim}  /agileflow:configure → Visual E2E testing${C.reset}\n\n`;
   }
 
-  // 6. INTERACTION MODE (AskUserQuestion guidance)
-  const askUserQuestionConfig = metadata?.features?.askUserQuestion;
-
-  if (askUserQuestionConfig?.enabled) {
-    content += `\n${C.brand}${C.bold}═══ ⚡ INTERACTION MODE: AskUserQuestion ENABLED ═══${C.reset}\n`;
-    content += `${C.dim}${'─'.repeat(60)}${C.reset}\n`;
-    content += `${C.bold}CRITICAL RULE:${C.reset} End ${C.skyBlue}EVERY${C.reset} response with the AskUserQuestion tool.\n\n`;
-    content += `${C.mintGreen}✓ CORRECT:${C.reset} Call the actual AskUserQuestion tool\n`;
-    content += `${C.coral}✗ WRONG:${C.reset} Text like "Want me to continue?" or "What's next?"\n\n`;
-    content += `${C.lavender}Required format:${C.reset}\n`;
-    content += `${C.dim}\`\`\`xml
-<invoke name="AskUserQuestion">
-<parameter name="questions">[{
-  "question": "What would you like to do next?",
-  "header": "Next step",
-  "multiSelect": false,
-  "options": [
-    {"label": "Option A (Recommended)", "description": "Why this is best"},
-    {"label": "Option B", "description": "Alternative approach"},
-    {"label": "Pause", "description": "Stop here for now"}
-  ]
-}]</parameter>
-</invoke>
-\`\`\`${C.reset}\n`;
-    content += `${C.dim}${'─'.repeat(60)}${C.reset}\n`;
-    content += `${C.dim}Mode: ${askUserQuestionConfig.mode || 'all'} | Configure: /agileflow:configure${C.reset}\n\n`;
-  }
-
-  // 5. DOCS STRUCTURE (using vibrant 256-color palette)
+  // DOCS STRUCTURE (using vibrant 256-color palette)
   content += `\n${C.skyBlue}${C.bold}═══ Documentation ═══${C.reset}\n`;
   const docsDir = 'docs';
   const docFolders = safeLs(docsDir).filter(f => {

package/scripts/session-manager.js

@@ -117,19 +117,39 @@ function isSessionActive(sessionId) {
   return isPidAlive(parseInt(lock.pid, 10));
 }
 
-// Clean up stale locks
-function cleanupStaleLocks(registry) {
+// Clean up stale locks (with detailed tracking)
+function cleanupStaleLocks(registry, options = {}) {
+  const { verbose = false, dryRun = false } = options;
   let cleaned = 0;
+  const cleanedSessions = [];
 
   for (const [id, session] of Object.entries(registry.sessions)) {
     const lock = readLock(id);
-    if (lock && !isPidAlive(parseInt(lock.pid, 10))) {
-      removeLock(id);
-      cleaned++;
+    if (lock) {
+      const pid = parseInt(lock.pid, 10);
+      const isAlive = isPidAlive(pid);
+
+      if (!isAlive) {
+        // Track what we're cleaning and why
+        cleanedSessions.push({
+          id,
+          nickname: session.nickname,
+          branch: session.branch,
+          pid,
+          reason: 'pid_dead',
+          path: session.path,
+        });
+
+        if (!dryRun) {
+          removeLock(id);
+        }
+        cleaned++;
+      }
     }
   }
 
-  return cleaned;
+  // Return detailed info for display
+  return { count: cleaned, sessions: cleanedSessions };
 }
 
 // Get current git branch
@@ -342,7 +362,7 @@ function createSession(options = {}) {
 // Get all sessions with status
 function getSessions() {
   const registry = loadRegistry();
-  const cleaned = cleanupStaleLocks(registry);
+  const cleanupResult = cleanupStaleLocks(registry);
 
   const sessions = [];
   for (const [id, session] of Object.entries(registry.sessions)) {
@@ -357,7 +377,12 @@ function getSessions() {
   // Sort by ID (numeric)
   sessions.sort((a, b) => parseInt(a.id) - parseInt(b.id));
 
-  return { sessions, cleaned };
+  // Return count for backward compat, plus detailed info
+  return {
+    sessions,
+    cleaned: cleanupResult.count,
+    cleanedSessions: cleanupResult.sessions,
+  };
 }
 
 // Get count of active sessions (excluding current)
@@ -989,7 +1014,7 @@ function main() {
 
       // Register in single pass (combines register + count + status)
       const registry = loadRegistry();
-      const cleaned = cleanupStaleLocks(registry);
+      const cleanupResult = cleanupStaleLocks(registry);
       const branch = getCurrentBranch();
       const story = getCurrentStory();
       const pid = process.ppid || process.pid;
@@ -1055,7 +1080,8 @@ function main() {
           current,
           otherActive,
           total: sessions.length,
-          cleaned,
+          cleaned: cleanupResult.count,
+          cleanedSessions: cleanupResult.sessions,
         })
       );
       break;

package/src/core/commands/babysit.md

@@ -5,16 +5,21 @@ compact_context:
   priority: critical
   preserve_rules:
     - "ACTIVE COMMAND: /agileflow-babysit - Mentor mode with expert delegation"
+    - "🔔 MANDATORY: Call AskUserQuestion tool at END of EVERY response - especially after completing tasks"
+    - "NEVER end with text like 'Done!' or 'What's next?' - ALWAYS use AskUserQuestion tool instead"
     - "MUST use EnterPlanMode FIRST for ANY non-trivial task (explore codebase, design approach, get approval)"
     - "MUST delegate complex work to domain experts (don't do everything yourself)"
-    - "MUST use AskUserQuestion for decisions, TodoWrite for tracking"
     - "Simple task → do yourself | Complex single-domain → spawn expert | Multi-domain → spawn orchestrator"
     - "STUCK DETECTION: If same error 2+ times, suggest /agileflow:research:ask with 200+ line detailed prompt"
     - "Research prompts MUST include: 50+ lines actual code, exact error, what was tried, 3+ specific questions"
+    - "STORY CLAIMING: Run 'node .agileflow/scripts/lib/story-claiming.js claim <id>' IMMEDIATELY after user selects story"
+    - "STORY CLAIMING: Run 'node .agileflow/scripts/lib/story-claiming.js others' BEFORE suggesting stories, exclude 🔒 claimed"
+    - "STORY CLAIMING: Run 'node .agileflow/scripts/lib/story-claiming.js release <id>' when story marked done"
   state_fields:
     - current_story
     - current_epic
     - delegation_mode
+    - claimed_story_id
 ---
 
 # /agileflow-babysit
@@ -224,6 +229,17 @@ node scripts/ralph-loop.js --reset    # Reset loop state
 
 **EVERY response MUST end with the AskUserQuestion tool.** Not text like "Want me to...?" - the ACTUAL TOOL CALL.
 
+**This applies (natural pause points):**
+- ✅ After completing a task (ESPECIALLY important - don't leave user hanging)
+- ✅ After spawning an agent and receiving results
+- ✅ When presenting options or decisions
+- ✅ Even when you think you're "done" - ask what's next
+
+**Don't be annoying - DON'T ask for:**
+- ❌ Permission to read files, spawn experts, or do routine work
+- ❌ Confirmation of obvious next steps you should just do
+- ❌ Every micro-step in a workflow
+
 **Required format:**
 ```xml
 <function_calls>
@@ -242,8 +258,8 @@ node scripts/ralph-loop.js --reset    # Reset loop state
 </function_calls>
 ```
 
-**❌ WRONG:** "Want me to continue?" / "Should I proceed?" / "Let me know what you think"
-**✅ RIGHT:** Call the AskUserQuestion tool with actual options
+**❌ WRONG:** "Want me to continue?" / "Should I proceed?" / "Done! Let me know what's next"
+**✅ RIGHT:** Call the AskUserQuestion tool with actual options - NEVER end without it
 
 ---
 
@@ -320,23 +336,32 @@ Use TodoWrite for any task with 3+ steps. Update status as you complete each ste
 
 **Phase 1: Context & Task Selection**
 1. Run context script (obtain-context.js babysit)
-2. Present task options using AskUserQuestion
-3. User selects task
+2. Check for stories claimed by OTHER sessions (filter from suggestions)
+3. Present task options using AskUserQuestion (with 🔒 badges for claimed)
+4. User selects task
+5. **CLAIM THE STORY immediately after selection:**
+   ```bash
+   node .agileflow/scripts/lib/story-claiming.js claim <story-id>
+   ```
 
 **Phase 2: Plan Mode (for non-trivial tasks)**
-4. Call `EnterPlanMode` tool
-5. Explore codebase with Glob, Grep, Read
-6. Design approach, write to plan file
-7. Call `ExitPlanMode` for user approval
+6. Call `EnterPlanMode` tool
+7. Explore codebase with Glob, Grep, Read
+8. Design approach, write to plan file
+9. Call `ExitPlanMode` for user approval
 
 **Phase 3: Execution**
-8. Delegate to experts based on scope
-9. Collect results if async (TaskOutput)
-10. Verify tests pass
+10. Delegate to experts based on scope
+11. Collect results if async (TaskOutput)
+12. Verify tests pass
 
 **Phase 4: Completion**
-11. Update status.json
-12. Present next steps via AskUserQuestion
+13. Update status.json (mark story done)
+14. **RELEASE THE STORY claim:**
+    ```bash
+    node .agileflow/scripts/lib/story-claiming.js release <story-id>
+    ```
+15. Present next steps via AskUserQuestion
 
 ---
 
@@ -352,12 +377,35 @@ Use TodoWrite for any task with 3+ steps. Update status as you complete each ste
 
 ### SUGGESTIONS PRIORITY (for task selection)
 
+**BEFORE suggesting stories, check for claims:**
+```bash
+node .agileflow/scripts/lib/story-claiming.js others
+```
+
+**Story badges in suggestions:**
+| Badge | Meaning | Include in suggestions? |
+|-------|---------|------------------------|
+| ⭐ | Ready, available | YES - prioritize these |
+| 🔒 | Claimed by other session | NO - exclude or show disabled |
+| ✓ | Claimed by this session | YES - show as "continue" |
+
+**Priority order (for unclaimed stories):**
 1. ⭐ READY stories (all AC complete, no blockers)
 2. Blocked with simple unblock
 3. Near-complete epics (80%+ done)
 4. README TODOs
 5. New features
 
+**Example with claim filtering:**
+```json
+[
+  {"label": "US-0042: Auth API ⭐ (Recommended)", "description": "Ready to implement"},
+  {"label": "US-0038: User Profile ✓", "description": "Continue your work"},
+  {"label": "US-0041: Settings 🔒", "description": "Claimed by Session 2 - skip"},
+  {"label": "Other", "description": "Tell me what you want"}
+]
+```
+
 Present top 3-5 via AskUserQuestion, always include "Other" option.
 
 ---
@@ -377,12 +425,17 @@ Present top 3-5 via AskUserQuestion, always include "Other" option.
 ### REMEMBER AFTER COMPACTION
 
 - `/agileflow:babysit` IS ACTIVE - follow these rules
-- ALWAYS end with AskUserQuestion tool (not text questions)
+- **🔔 AskUserQuestion AFTER EVERY RESPONSE** - especially after task completion!
+  - Don't say "Done!" and stop - call AskUserQuestion with next step options
+  - Don't leave user waiting - proactively suggest what to do next
 - Plan mode FIRST for non-trivial tasks
 - Delegate complex work to experts
 - If stuck 2+ times → research prompt
 - Use state narration markers (📍🔀🔄⚠️✅) for visibility
-- **STORY CLAIMING**: Claim stories before working, skip 🔒 claimed stories in suggestions
+- **STORY CLAIMING - CRITICAL:**
+  1. BEFORE suggesting: `node .agileflow/scripts/lib/story-claiming.js others` → exclude 🔒
+  2. AFTER user selects: `node .agileflow/scripts/lib/story-claiming.js claim <id>`
+  3. WHEN done: `node .agileflow/scripts/lib/story-claiming.js release <id>`
 
 <!-- COMPACT_SUMMARY_END -->
 
@@ -795,12 +848,19 @@ User: "Fix the typo in README"
 - Initial task selection
 - Choosing between approaches
 - Architectural decisions
-- End of every response
-
-**DON'T use for:**
-- Routine operations (just do them)
-- Spawning experts (just spawn)
-- Obvious next steps
+- End of every response (to keep user engaged)
+- After completing a task (offer next steps)
+
+**DON'T use for (avoid being annoying):**
+- Routine operations ("Can I read this file?" → just read it)
+- Spawning experts ("Should I spawn the API expert?" → just spawn it)
+- Obvious next steps that don't need confirmation
+- Asking the same question repeatedly
+- Interrupting workflow when you already know what to do
+- Asking permission for every small action
+
+**Balance:**
+Use AskUserQuestion at natural pause points (task completion, decision needed) but NOT for every micro-step. If you know the next action, do it. Ask only when user input genuinely helps.
 
 **Format:**
 ```xml