agileflow 2.79.0 → 2.81.0

package/scripts/agileflow-configure.js

@@ -23,12 +23,13 @@
  *   --detect                            Show current status
  *   --help                              Show help
  *
- * Features: sessionstart, precompact, ralphloop, selfimprove, archival, statusline, autoupdate, damagecontrol
+ * Features: sessionstart, precompact, ralphloop, selfimprove, archival, statusline, autoupdate, damagecontrol, askuserquestion
  */
 
 const fs = require('fs');
 const path = require('path');
 const { execSync } = require('child_process');
+const { isValidProfileName, isValidFeatureName, parseIntBounded } = require('../lib/validate');
 
 // ============================================================================
 // CONFIGURATION
@@ -81,6 +82,7 @@ const FEATURES = {
     scripts: ['damage-control-bash.js', 'damage-control-edit.js', 'damage-control-write.js'],
     patternsFile: 'damage-control-patterns.yaml',
   },
+  askuserquestion: { metadataOnly: true }, // Stored in metadata.features.askUserQuestion
 };
 
 // Complete registry of all scripts that may need repair
@@ -131,24 +133,40 @@ const STATUSLINE_COMPONENTS = [
 const PROFILES = {
   full: {
     description: 'All features enabled (including experimental Stop hooks)',
-    enable: ['sessionstart', 'precompact', 'archival', 'statusline', 'ralphloop', 'selfimprove'],
+    enable: [
+      'sessionstart',
+      'precompact',
+      'archival',
+      'statusline',
+      'ralphloop',
+      'selfimprove',
+      'askuserquestion',
+    ],
     archivalDays: 30,
   },
   basic: {
     description: 'Essential hooks + archival (SessionStart + PreCompact + Archival)',
-    enable: ['sessionstart', 'precompact', 'archival'],
+    enable: ['sessionstart', 'precompact', 'archival', 'askuserquestion'],
     disable: ['statusline', 'ralphloop', 'selfimprove'],
     archivalDays: 30,
   },
   minimal: {
     description: 'SessionStart + archival only',
     enable: ['sessionstart', 'archival'],
-    disable: ['precompact', 'statusline', 'ralphloop', 'selfimprove'],
+    disable: ['precompact', 'statusline', 'ralphloop', 'selfimprove', 'askuserquestion'],
     archivalDays: 30,
   },
   none: {
     description: 'Disable all AgileFlow features',
-    disable: ['sessionstart', 'precompact', 'archival', 'statusline', 'ralphloop', 'selfimprove'],
+    disable: [
+      'sessionstart',
+      'precompact',
+      'archival',
+      'statusline',
+      'ralphloop',
+      'selfimprove',
+      'askuserquestion',
+    ],
   },
 };
 
@@ -223,7 +241,23 @@ function detectConfig() {
       selfimprove: { enabled: false, valid: true, issues: [], version: null, outdated: false },
       archival: { enabled: false, threshold: null, version: null, outdated: false },
       statusline: { enabled: false, valid: true, issues: [], version: null, outdated: false },
-      damagecontrol: { enabled: false, valid: true, issues: [], version: null, outdated: false, level: null, patternCount: 0 },
+      damagecontrol: {
+        enabled: false,
+        valid: true,
+        issues: [],
+        version: null,
+        outdated: false,
+        level: null,
+        patternCount: 0,
+      },
+      askuserquestion: {
+        enabled: false,
+        valid: true,
+        issues: [],
+        version: null,
+        outdated: false,
+        mode: null,
+      },
     },
     metadata: { exists: false, version: null },
     currentVersion: VERSION,
@@ -313,13 +347,16 @@ function detectConfig() {
           if (Array.isArray(settings.hooks.PreToolUse) && settings.hooks.PreToolUse.length > 0) {
             // Check for damage-control hooks by looking for damage-control scripts
             const hasBashHook = settings.hooks.PreToolUse.some(
-              h => h.matcher === 'Bash' && h.hooks?.some(hk => hk.command?.includes('damage-control'))
+              h =>
+                h.matcher === 'Bash' && h.hooks?.some(hk => hk.command?.includes('damage-control'))
             );
             const hasEditHook = settings.hooks.PreToolUse.some(
-              h => h.matcher === 'Edit' && h.hooks?.some(hk => hk.command?.includes('damage-control'))
+              h =>
+                h.matcher === 'Edit' && h.hooks?.some(hk => hk.command?.includes('damage-control'))
             );
             const hasWriteHook = settings.hooks.PreToolUse.some(
-              h => h.matcher === 'Write' && h.hooks?.some(hk => hk.command?.includes('damage-control'))
+              h =>
+                h.matcher === 'Write' && h.hooks?.some(hk => hk.command?.includes('damage-control'))
             );
 
             if (hasBashHook || hasEditHook || hasWriteHook) {
@@ -363,17 +400,30 @@ function detectConfig() {
 
       // Damage control metadata
       if (meta.features?.damagecontrol?.enabled) {
-        status.features.damagecontrol.level = meta.features.damagecontrol.protectionLevel || 'standard';
+        status.features.damagecontrol.level =
+          meta.features.damagecontrol.protectionLevel || 'standard';
+      }
+
+      // AskUserQuestion metadata
+      if (meta.features?.askUserQuestion?.enabled) {
+        status.features.askuserquestion.enabled = true;
+        status.features.askuserquestion.mode = meta.features.askUserQuestion.mode || 'all';
       }
 
       // Read feature versions from metadata and check if outdated
       if (meta.features) {
+        // Map metadata keys to status keys (handle camelCase differences)
+        const featureKeyMap = {
+          askUserQuestion: 'askuserquestion',
+        };
         Object.entries(meta.features).forEach(([feature, data]) => {
-          if (status.features[feature] && data.version) {
-            status.features[feature].version = data.version;
+          // Use mapped key if exists, otherwise lowercase
+          const statusKey = featureKeyMap[feature] || feature.toLowerCase();
+          if (status.features[statusKey] && data.version) {
+            status.features[statusKey].version = data.version;
             // Check if feature version differs from current VERSION
-            if (data.version !== VERSION && status.features[feature].enabled) {
-              status.features[feature].outdated = true;
+            if (data.version !== VERSION && status.features[statusKey].enabled) {
+              status.features[statusKey].outdated = true;
               status.hasOutdated = true;
             }
           }
@@ -458,6 +508,16 @@ function printStatus(status) {
     log(`  ❌ Damage Control: disabled`, c.dim);
   }
 
+  // AskUserQuestion
+  const auq = status.features.askuserquestion;
+  if (auq.enabled) {
+    let auqStatusText = 'enabled';
+    if (auq.mode) auqStatusText += ` (mode: ${auq.mode})`;
+    log(`  💬 AskUserQuestion: ${auqStatusText}`, c.green);
+  } else {
+    log(`  ❌ AskUserQuestion: disabled`, c.dim);
+  }
+
   // Metadata
   if (status.metadata.exists) {
     log(`\nMetadata: v${status.metadata.version}`, c.dim);
@@ -741,12 +801,34 @@ function enableFeature(feature, options = {}) {
     return true; // Skip settings.json write for this feature
   }
 
+  // Handle askuserquestion (metadata only, no hooks needed)
+  if (feature === 'askuserquestion') {
+    const mode = options.mode || 'all';
+    updateMetadata({
+      features: {
+        askUserQuestion: {
+          enabled: true,
+          mode: mode,
+          version: VERSION,
+          at: new Date().toISOString(),
+        },
+      },
+    });
+    success(`AskUserQuestion enabled (mode: ${mode})`);
+    info('All commands will end with AskUserQuestion tool for guided interaction');
+    return true; // Skip settings.json write for this feature
+  }
+
   // Handle damage control (PreToolUse hooks)
   if (feature === 'damagecontrol') {
     const level = options.protectionLevel || 'standard';
 
     // Verify all required scripts exist
-    const requiredScripts = ['damage-control-bash.js', 'damage-control-edit.js', 'damage-control-write.js'];
+    const requiredScripts = [
+      'damage-control-bash.js',
+      'damage-control-edit.js',
+      'damage-control-write.js',
+    ];
     for (const script of requiredScripts) {
       if (!scriptExists(script)) {
         error(`Script not found: ${getScriptPath(script)}`);
@@ -761,7 +843,12 @@ function enableFeature(feature, options = {}) {
     if (!fs.existsSync(patternsDest)) {
       ensureDir(patternsDir);
       // Try to copy from templates
-      const templatePath = path.join(process.cwd(), '.agileflow', 'templates', 'damage-control-patterns.yaml');
+      const templatePath = path.join(
+        process.cwd(),
+        '.agileflow',
+        'templates',
+        'damage-control-patterns.yaml'
+      );
       if (fs.existsSync(templatePath)) {
         fs.copyFileSync(templatePath, patternsDest);
         success('Deployed damage control patterns');
@@ -893,6 +980,22 @@ function disableFeature(feature) {
     return true; // Skip settings.json write for this feature
   }
 
+  // Disable askuserquestion
+  if (feature === 'askuserquestion') {
+    updateMetadata({
+      features: {
+        askUserQuestion: {
+          enabled: false,
+          version: VERSION,
+          at: new Date().toISOString(),
+        },
+      },
+    });
+    success('AskUserQuestion disabled');
+    info('Commands will end with natural text questions instead of AskUserQuestion tool');
+    return true; // Skip settings.json write for this feature
+  }
+
   // Disable damage control (PreToolUse hooks)
   if (feature === 'damagecontrol') {
     if (settings.hooks?.PreToolUse && Array.isArray(settings.hooks.PreToolUse)) {
@@ -1396,10 +1499,11 @@ ${c.cyan}Feature Control:${c.reset}
   --enable=<list>     Enable features (comma-separated)
   --disable=<list>    Disable features (comma-separated)
 
-  Features: sessionstart, precompact, ralphloop, selfimprove, archival, statusline, damagecontrol
+  Features: sessionstart, precompact, ralphloop, selfimprove, archival, statusline, damagecontrol, askuserquestion
 
   Stop hooks (ralphloop, selfimprove) run when Claude completes/pauses
   Damage control (damagecontrol) uses PreToolUse hooks to block dangerous commands
+  AskUserQuestion (askuserquestion) makes all commands end with guided options
 
 ${c.cyan}Statusline Components:${c.reset}
   --show=<list>       Show statusline components (comma-separated)
@@ -1465,6 +1569,12 @@ ${c.cyan}Examples:${c.reset}
 
   # Enable damage control (PreToolUse hooks to block dangerous commands)
   node .agileflow/scripts/agileflow-configure.js --enable=damagecontrol
+
+  # Enable AskUserQuestion (all commands end with guided options)
+  node .agileflow/scripts/agileflow-configure.js --enable=askuserquestion
+
+  # Disable AskUserQuestion (commands end with natural text questions)
+  node .agileflow/scripts/agileflow-configure.js --disable=askuserquestion
 `);
 }
 
@@ -1514,7 +1624,8 @@ function main() {
         .split('=')[1]
         .split(',')
         .map(s => s.trim().toLowerCase());
-    else if (arg.startsWith('--archival-days=')) archivalDays = parseInt(arg.split('=')[1]) || 30;
+    else if (arg.startsWith('--archival-days='))
+      archivalDays = parseIntBounded(arg.split('=')[1], 30, 1, 365);
     else if (arg === '--migrate') migrate = true;
     else if (arg === '--detect' || arg === '--validate') detect = true;
     else if (arg === '--upgrade') upgrade = true;

package/scripts/agileflow-welcome.js

@@ -171,6 +171,7 @@ function clearActiveCommands(rootDir) {
     const state = JSON.parse(fs.readFileSync(sessionStatePath, 'utf8'));
     result.ran = true;
 
+    // Handle new array format (active_commands)
     if (state.active_commands && state.active_commands.length > 0) {
       result.cleared = state.active_commands.length;
       // Capture command names before clearing
@@ -179,11 +180,14 @@ function clearActiveCommands(rootDir) {
       }
       state.active_commands = [];
     }
+
+    // Handle legacy singular format (active_command) - only capture if not already in array
     if (state.active_command !== undefined) {
-      result.cleared++;
-      // Capture single command name
-      if (state.active_command.name) {
-        result.commandNames.push(state.active_command.name);
+      const legacyName = state.active_command.name;
+      // Only add to count/names if not already captured from array (avoid duplicates)
+      if (legacyName && !result.commandNames.includes(legacyName)) {
+        result.cleared++;
+        result.commandNames.push(legacyName);
       }
       delete state.active_command;
     }
@@ -203,6 +207,12 @@ function checkParallelSessions(rootDir) {
     otherActive: 0,
     currentId: null,
     cleaned: 0,
+    // Extended session info for non-main sessions
+    isMain: true,
+    nickname: null,
+    branch: null,
+    sessionPath: null,
+    mainPath: rootDir,
   };
 
   try {
@@ -243,6 +253,24 @@ function checkParallelSessions(rootDir) {
     } catch (e) {
       // Count failed
     }
+
+    // Get detailed status for current session (for banner display)
+    try {
+      const statusOutput = execSync(`node "${scriptPath}" status`, {
+        cwd: rootDir,
+        encoding: 'utf8',
+        stdio: ['pipe', 'pipe', 'pipe'],
+      });
+      const statusData = JSON.parse(statusOutput);
+      if (statusData.current) {
+        result.isMain = statusData.current.is_main === true;
+        result.nickname = statusData.current.nickname;
+        result.branch = statusData.current.branch;
+        result.sessionPath = statusData.current.path;
+      }
+    } catch (e) {
+      // Status failed
+    }
   } catch (e) {
     // Session system not available
   }
@@ -298,8 +326,8 @@ function checkDamageControl(rootDir) {
       const settings = JSON.parse(fs.readFileSync(settingsPath, 'utf8'));
       if (settings.hooks?.PreToolUse && Array.isArray(settings.hooks.PreToolUse)) {
         // Check for damage-control hooks
-        const hasDamageControlHooks = settings.hooks.PreToolUse.some(
-          h => h.hooks?.some(hk => hk.command?.includes('damage-control'))
+        const hasDamageControlHooks = settings.hooks.PreToolUse.some(h =>
+          h.hooks?.some(hk => hk.command?.includes('damage-control'))
         );
         if (hasDamageControlHooks) {
           result.configured = true;
@@ -311,8 +339,8 @@ function checkDamageControl(rootDir) {
           result.hooksCount = dcHooks.length;
 
           // Check for enhanced mode (has prompt hook)
-          const hasPromptHook = settings.hooks.PreToolUse.some(
-            h => h.hooks?.some(hk => hk.type === 'prompt')
+          const hasPromptHook = settings.hooks.PreToolUse.some(h =>
+            h.hooks?.some(hk => hk.type === 'prompt')
           );
           if (hasPromptHook) {
             result.level = 'enhanced';
@@ -680,14 +708,24 @@ function formatTable(
   // Show update available notification (using vibrant colors)
   if (updateInfo.available && updateInfo.latest && !updateInfo.justUpdated) {
     lines.push(fullDivider());
-    lines.push(fullRow(`${c.amber}↑${c.reset} Update available: ${c.softGold}v${updateInfo.latest}${c.reset}`, ''));
+    lines.push(
+      fullRow(
+        `${c.amber}↑${c.reset} Update available: ${c.softGold}v${updateInfo.latest}${c.reset}`,
+        ''
+      )
+    );
     lines.push(fullRow(`  Run: ${c.skyBlue}npx agileflow update${c.reset}`, ''));
   }
 
   // Show "just updated" changelog
   if (updateInfo.justUpdated && updateInfo.changelog && updateInfo.changelog.length > 0) {
     lines.push(fullDivider());
-    lines.push(fullRow(`${c.mintGreen}✨${c.reset} What's new in ${c.softGold}v${info.version}${c.reset}:`, ''));
+    lines.push(
+      fullRow(
+        `${c.mintGreen}✨${c.reset} What's new in ${c.softGold}v${info.version}${c.reset}:`,
+        ''
+      )
+    );
     for (const entry of updateInfo.changelog.slice(0, 2)) {
       lines.push(fullRow(`  ${c.teal}•${c.reset} ${truncate(entry, W - 6)}`, ''));
     }
@@ -746,7 +784,9 @@ function formatTable(
 
   // Session cleanup
   const sessionStatus = session.cleared > 0 ? `cleared ${session.cleared} command(s)` : `clean`;
-  lines.push(row('Session state', sessionStatus, c.lavender, session.cleared > 0 ? c.mintGreen : c.dim));
+  lines.push(
+    row('Session state', sessionStatus, c.lavender, session.cleared > 0 ? c.mintGreen : c.dim)
+  );
 
   // PreCompact status with version check
   if (precompact.configured && precompact.scriptExists) {
@@ -798,7 +838,8 @@ function formatTable(
       lines.push(row('Damage control', '⚠️ scripts missing', c.coral, c.coral));
     } else {
       const levelStr = damageControl.level || 'standard';
-      const patternStr = damageControl.patternCount > 0 ? `${damageControl.patternCount} patterns` : '';
+      const patternStr =
+        damageControl.patternCount > 0 ? `${damageControl.patternCount} patterns` : '';
       const dcStatus = `🛡️ ${levelStr}${patternStr ? ` (${patternStr})` : ''}`;
       lines.push(row('Damage control', dcStatus, c.lavender, c.mintGreen));
     }
@@ -823,13 +864,50 @@ function formatTable(
   }
 
   // Last commit (colorful like obtain-context)
-  lines.push(row('Last commit', `${c.peach}${info.commit}${c.reset} ${info.lastCommit}`, c.lavender, ''));
+  lines.push(
+    row('Last commit', `${c.peach}${info.commit}${c.reset} ${info.lastCommit}`, c.lavender, '')
+  );
 
   lines.push(bottomBorder);
 
   return lines.join('\n');
 }
 
+// Format session banner for non-main sessions
+function formatSessionBanner(parallelSessions) {
+  if (!parallelSessions.available || parallelSessions.isMain) {
+    return null;
+  }
+
+  const W = 62; // banner width
+  const lines = [];
+
+  // Get display name
+  const sessionName = parallelSessions.nickname
+    ? `SESSION ${parallelSessions.currentId} "${parallelSessions.nickname}"`
+    : `SESSION ${parallelSessions.currentId}`;
+
+  lines.push(`${c.dim}${box.tl}${box.h.repeat(W)}${box.tr}${c.reset}`);
+  lines.push(
+    `${c.dim}${box.v}${c.reset} ${c.teal}${c.bold}${pad(sessionName, W - 2)}${c.reset} ${c.dim}${box.v}${c.reset}`
+  );
+  lines.push(
+    `${c.dim}${box.v}${c.reset}    ${c.slate}Branch:${c.reset} ${pad(parallelSessions.branch || 'unknown', W - 13)} ${c.dim}${box.v}${c.reset}`
+  );
+
+  // Show relative path to main
+  if (parallelSessions.sessionPath) {
+    const relPath = path.relative(parallelSessions.sessionPath, parallelSessions.mainPath) || '.';
+    lines.push(
+      `${c.dim}${box.v}${c.reset}    ${c.slate}Main at:${c.reset} ${pad(relPath, W - 14)} ${c.dim}${box.v}${c.reset}`
+    );
+  }
+
+  lines.push(`${c.dim}${box.bl}${box.h.repeat(W)}${box.br}${c.reset}`);
+
+  return lines.join('\n');
+}
+
 // Main
 async function main() {
   const rootDir = getProjectRoot();
@@ -863,16 +941,35 @@ async function main() {
     // Update check failed - continue without it
   }
 
+  // Show session banner FIRST if in a non-main session
+  const sessionBanner = formatSessionBanner(parallelSessions);
+  if (sessionBanner) {
+    console.log(sessionBanner);
+  }
+
   console.log(
-    formatTable(info, archival, session, precompact, parallelSessions, updateInfo, expertise, damageControl)
+    formatTable(
+      info,
+      archival,
+      session,
+      precompact,
+      parallelSessions,
+      updateInfo,
+      expertise,
+      damageControl
+    )
   );
 
   // Show warning and tip if other sessions are active (vibrant colors)
   if (parallelSessions.otherActive > 0) {
     console.log('');
     console.log(`${c.amber}⚠️  Other Claude session(s) active in this repo.${c.reset}`);
-    console.log(`${c.slate}   Run ${c.skyBlue}/agileflow:session:status${c.reset}${c.slate} to see all sessions.${c.reset}`);
-    console.log(`${c.slate}   Run ${c.skyBlue}/agileflow:session:new${c.reset}${c.slate} to create isolated workspace.${c.reset}`);
+    console.log(
+      `${c.slate}   Run ${c.skyBlue}/agileflow:session:status${c.reset}${c.slate} to see all sessions.${c.reset}`
+    );
+    console.log(
+      `${c.slate}   Run ${c.skyBlue}/agileflow:session:new${c.reset}${c.slate} to create isolated workspace.${c.reset}`
+    );
   }
 }
 

package/scripts/damage-control/bash-tool-damage-control.js

@@ -139,7 +139,11 @@ function getDefaultPatterns() {
       { pattern: 'DROP\\s+(TABLE|DATABASE)', reason: 'DROP commands are destructive' },
       { pattern: 'DELETE\\s+FROM\\s+\\w+\\s*;', reason: 'DELETE without WHERE clause' },
       { pattern: 'TRUNCATE\\s+(TABLE\\s+)?\\w+', reason: 'TRUNCATE removes all data' },
-      { pattern: 'git\\s+push\\s+.*--force', reason: 'Force push can overwrite history', ask: true },
+      {
+        pattern: 'git\\s+push\\s+.*--force',
+        reason: 'Force push can overwrite history',
+        ask: true,
+      },
       { pattern: 'git\\s+reset\\s+--hard', reason: 'Hard reset discards changes', ask: true },
     ],
     askPatterns: [
@@ -159,10 +163,7 @@ function getDefaultPatterns() {
  */
 function checkCommand(command, patterns) {
   // Combine all pattern sources
-  const allPatterns = [
-    ...(patterns.bashToolPatterns || []),
-    ...(patterns.agileflowPatterns || []),
-  ];
+  const allPatterns = [...(patterns.bashToolPatterns || []), ...(patterns.agileflowPatterns || [])];
 
   // Check block/ask patterns
   for (const p of allPatterns) {
@@ -181,7 +182,7 @@ function checkCommand(command, patterns) {
   }
 
   // Check ask-only patterns
-  for (const p of (patterns.askPatterns || [])) {
+  for (const p of patterns.askPatterns || []) {
     try {
       const regex = new RegExp(p.pattern, 'i');
       if (regex.test(command)) {

package/scripts/damage-control/edit-tool-damage-control.js

@@ -114,27 +114,9 @@ function parsePathRules(content) {
  */
 function getDefaultPathRules() {
   return {
-    zeroAccessPaths: [
-      '~/.ssh/',
-      '~/.aws/credentials',
-      '.env',
-      '.env.local',
-      '.env.production',
-    ],
-    readOnlyPaths: [
-      '/etc/',
-      '~/.bashrc',
-      '~/.zshrc',
-      'package-lock.json',
-      'yarn.lock',
-      '.git/',
-    ],
-    noDeletePaths: [
-      '.agileflow/',
-      '.claude/',
-      'docs/09-agents/status.json',
-      'CLAUDE.md',
-    ],
+    zeroAccessPaths: ['~/.ssh/', '~/.aws/credentials', '.env', '.env.local', '.env.production'],
+    readOnlyPaths: ['/etc/', '~/.bashrc', '~/.zshrc', 'package-lock.json', 'yarn.lock', '.git/'],
+    noDeletePaths: ['.agileflow/', '.claude/', 'docs/09-agents/status.json', 'CLAUDE.md'],
   };
 }
 
@@ -252,9 +234,7 @@ function main() {
   }
 
   // Resolve to absolute path
-  const absolutePath = path.isAbsolute(filePath)
-    ? filePath
-    : path.join(projectDir, filePath);
+  const absolutePath = path.isAbsolute(filePath) ? filePath : path.join(projectDir, filePath);
 
   // Load rules
   const rules = loadPathRules(projectDir);