vibecodingmachine-cli 2025.12.1-534 → 2025.12.22-2230

package/src/commands/auto.js

@@ -2,18 +2,18 @@ const chalk = require('chalk');
 const ora = require('ora');
 const path = require('path');
 const os = require('os');
-const { AppleScriptManager, ClineCLIManager, AiderCLIManager, ClaudeCodeCLIManager, logIDEMessage, runContinueCLICommand, runContinueCLIAutoMode } = require('vibecodingmachine-core');
-const { getRepoPath, getAutoConfig, setAutoConfig } = require('../utils/config');
+const { spawn } = require('child_process');
+const { AppleScriptManager, ClineCLIManager, AiderCLIManager, ClaudeCodeCLIManager, logIDEMessage, runContinueCLIAutoMode } = require('vibecodingmachine-core');
+const { getRepoPath, getAutoConfig, setAutoConfig, getStages } = require('../utils/config');
 const { checkAutoModeStatus, startAutoMode, stopAutoMode, updateAutoModeStatus } = require('../utils/auto-mode');
 const logger = require('../utils/logger');
 const { createKeyboardHandler } = require('../utils/keyboard-handler');
 const { getProviderDefinitions, getProviderPreferences } = require('../utils/provider-registry');
 const PROVIDER_DEFINITIONS = getProviderDefinitions();
-const DIRECT_AGENT_IDS = PROVIDER_DEFINITIONS.filter(def => def.type === 'direct').map(def => def.id);
 const PROVIDER_DEFINITION_MAP = new Map(PROVIDER_DEFINITIONS.map(def => [def.id, def]));
 const { handleAutoStart: handleDirectAutoStart } = require('./auto-direct');
 
-const DEFAULT_INSTRUCTION_TEXT = 'Follow INSTRUCTIONS.md from .vibecodingmachine directory.\n\nCRITICAL FOR IDE AGENTS: You MUST work through ALL stages (ACT → CLEAN UP → VERIFY → DONE) without stopping. Update the "🚦 Current Status" section in the REQUIREMENTS file as you progress through each stage. DO NOT stop after acknowledging stages - you must COMPLETE the work and set status to DONE in the requirements file. The CLI is monitoring the file and waiting for you to finish.';
+
 
 /**
  * Get available LLM providers from config and environment variables
@@ -182,6 +182,7 @@ async function moveRequirementBackToTodo(repoPath, requirementText) {
 
     for (let i = 0; i < lines.length; i++) {
       const line = lines[i];
+      const trimmed = line.trim();
 
       // Find verified section
       if (line.includes('## ✅ Verified by AI screenshot')) {
@@ -199,7 +200,7 @@ async function moveRequirementBackToTodo(repoPath, requirementText) {
       }
 
       // Check if we're in verified section and this is the requirement to move
-      if (inVerifiedSection && line.trim().startsWith('- ')) {
+      if (inVerifiedSection && trimmed.startsWith('- ')) {
         const lineRequirement = line.substring(2).trim();
         // Remove date prefix if present (format: "2025-11-05: **requirement**")
         const cleanRequirement = lineRequirement.replace(/^\d{4}-\d{2}-\d{2}:\s*\*\*/, '').replace(/\*\*$/, '').trim();
@@ -210,20 +211,21 @@ async function moveRequirementBackToTodo(repoPath, requirementText) {
           requirementFound = true;
           continue;
         }
-        updatedLines.push(line);
-        continue;
       }
 
       // If we're in not yet completed section and haven't added the requirement yet, add it at the top
-      if (inNotYetCompleted && !requirementFound && line.trim().startsWith('- ')) {
+      if (inNotYetCompleted && !requirementFound && trimmed.startsWith('- ')) {
         // Add the requirement before the first existing requirement
-        updatedLines.push(`- ${requirementText}`);
-        updatedLines.push('');
-        requirementFound = true; // Mark as added so we don't add it again
+        const newUpdatedLines = lines.slice(0, i);
+        newUpdatedLines.push(`- ${requirementText}`);
+        newUpdatedLines.push('');
+        newUpdatedLines.push(...lines.slice(i));
+        await fs.writeFile(reqPath, newUpdatedLines.join('\n'));
+        return { success: true };
       }
 
       // Reset section flags when hitting new sections
-      if (line.trim().startsWith('##')) {
+      if (trimmed.startsWith('##')) {
         inVerifiedSection = false;
         inNotYetCompleted = false;
       }
@@ -234,6 +236,7 @@ async function moveRequirementBackToTodo(repoPath, requirementText) {
     // If requirement wasn't found in verified section, try to add it to not yet completed anyway
     if (!requirementFound) {
       // Find the not yet completed section and add requirement at the top
+      const newUpdatedLines = lines.slice();
       for (let i = 0; i < updatedLines.length; i++) {
         if (updatedLines[i].includes('## ⏳ Requirements not yet completed')) {
           // Find the first requirement line after this section
@@ -243,18 +246,13 @@ async function moveRequirementBackToTodo(repoPath, requirementText) {
             insertIndex++;
           }
           updatedLines.splice(insertIndex, 0, `- ${requirementText}`, '');
-          requirementFound = true;
-          break;
+          await fs.writeFile(reqPath, updatedLines.join('\n'));
+          return { success: true };
         }
       }
     }
 
-    if (requirementFound) {
-      await fs.writeFile(reqPath, updatedLines.join('\n'));
-      return { success: true };
-    } else {
-      return { success: false, error: 'Requirement not found in verified section' };
-    }
+    return { success: false, error: 'Requirement not found in verified section' };
   } catch (error) {
     return { success: false, error: error.message };
   }
@@ -279,10 +277,8 @@ async function moveRequirementToFeedback(repoPath, requirementText, questions, f
 
     const content = await fs.readFile(reqPath, 'utf8');
     const lines = content.split('\n');
-    const updatedLines = [];
 
     let inTodoSection = false;
-    let inFeedbackSection = false;
     let requirementRemoved = false;
     let feedbackAdded = false;
 
@@ -292,15 +288,13 @@ async function moveRequirementToFeedback(repoPath, requirementText, questions, f
       // Find TODO section
       if (trimmed.startsWith('##') && trimmed.includes('Requirements not yet completed')) {
         inTodoSection = true;
-        inFeedbackSection = false;
-        updatedLines.push(line);
         continue;
       }
 
       // Find "Requirements needing manual feedback" section
       if (trimmed.startsWith('##') && (trimmed.includes('Requirements needing manual feedback') || trimmed.includes('❓ Requirements needing'))) {
         inTodoSection = false;
-        inFeedbackSection = true;
+        const updatedLines = lines.slice(0, lines.indexOf(line));
         updatedLines.push(line);
 
         // Add blank line if not already present
@@ -328,13 +322,14 @@ async function moveRequirementToFeedback(repoPath, requirementText, questions, f
           updatedLines.push('');
           feedbackAdded = true;
         }
-        continue;
+        updatedLines.push(...lines.slice(lines.indexOf(line) + 1));
+        await fs.writeFile(reqPath, updatedLines.join('\n'));
+        return { success: true };
       }
 
       // Stop sections at next header
       if (trimmed.startsWith('##')) {
         inTodoSection = false;
-        inFeedbackSection = false;
       }
 
       // Remove requirement from TODO section (match first occurrence)
@@ -421,60 +416,229 @@ async function moveCompletedRequirement(repoPath, completedRequirement) {
     const content = await fs.readFile(reqPath, 'utf8');
     const lines = content.split('\n');
 
-    const updatedLines = [];
-    let inTodoSection = false;
-    let inVerifiedSection = false;
-    let removedCompleted = false;
-    let addedToVerified = false;
+    // First, check if requirement is already in TO VERIFY section
+    const verifySectionVariants = [
+      '## 🔍 TO VERIFY BY HUMAN',
+      '## 🔍 TO VERIFY',
+      '## TO VERIFY',
+      '## ✅ TO VERIFY',
+      '## ✅ Verified by AI screenshot. Needs Human to Verify and move to CHANGELOG'
+    ];
 
-    for (const line of lines) {
+    let inVerifySection = false;
+    let alreadyInVerify = false;
+    const normalizedCompleted = completedRequirement.trim();
+    const snippet = normalizedCompleted.substring(0, 80);
+
+    for (let i = 0; i < lines.length; i++) {
+      const line = lines[i];
       const trimmed = line.trim();
 
-      // Find TODO section
+      // Check if we're entering TO VERIFY section
+      if (trimmed.startsWith('##')) {
+        inVerifySection = verifySectionVariants.some(variant => {
+          const variantTrimmed = variant.trim();
+          return trimmed === variantTrimmed || trimmed.startsWith(variantTrimmed);
+        }) && !trimmed.includes('## 📝 VERIFIED') && !trimmed.match(/^##\s+VERIFIED$/i);
+
+        if (inVerifySection && trimmed.includes('TO VERIFY') || trimmed.includes('Verified by AI screenshot')) {
+          continue;
+        }
+      }
+
+      // Check if we're leaving TO VERIFY section
+      if (inVerifySection && trimmed.startsWith('##') && !trimmed.startsWith('###')) {
+        const isVerifyHeader = verifySectionVariants.some(variant => {
+          const variantTrimmed = variant.trim();
+          return trimmed === variantTrimmed || trimmed.startsWith(variantTrimmed);
+        });
+        if (!isVerifyHeader) {
+          inVerifySection = false;
+        }
+      }
+
+      // Check if requirement is already in TO VERIFY
+      if (inVerifySection && trimmed.startsWith('###')) {
+        const title = trimmed.replace(/^###\s*/, '').trim();
+        if (title) {
+          const normalizedTitle = title.trim();
+          if (normalizedTitle === normalizedCompleted ||
+            normalizedTitle.includes(normalizedCompleted) ||
+            normalizedCompleted.includes(normalizedTitle) ||
+            normalizedTitle.includes(snippet) ||
+            snippet.includes(normalizedTitle.substring(0, 80))) {
+            alreadyInVerify = true;
+            break;
+          }
+        }
+      }
+    }
+
+    if (alreadyInVerify) {
+      return { success: true }; // Already in TO VERIFY, nothing to do
+    }
+
+    // Find the requirement by its title (in ### header format)
+    // Normalize the completed requirement text for matching
+    let requirementStartIndex = -1;
+    let requirementEndIndex = -1;
+
+    // Try to find the requirement in TODO section first
+    let inTodoSection = false;
+    for (let i = 0; i < lines.length; i++) {
+      const line = lines[i];
+      const trimmed = line.trim();
+
+      // Check if we're entering TODO section
       if (trimmed.startsWith('##') && trimmed.includes('Requirements not yet completed')) {
         inTodoSection = true;
-        inVerifiedSection = false;
-        updatedLines.push(line);
         continue;
       }
 
-      // Find TO VERIFY section
-      if (trimmed.startsWith('##') && (trimmed.includes('TO VERIFY') || trimmed.includes('Verified by AI screenshot'))) {
+      // Check if we're leaving TODO section
+      if (inTodoSection && trimmed.startsWith('##') && !trimmed.startsWith('###') && !trimmed.includes('Requirements not yet completed')) {
         inTodoSection = false;
-        inVerifiedSection = true;
-        updatedLines.push(line);
+      }
 
-        // Add completed requirement at the top of TO VERIFY section
-        if (!addedToVerified) {
-          const today = new Date().toISOString().split('T')[0];
-          updatedLines.push(`- ${today}: **${completedRequirement}**`);
-          addedToVerified = true;
+      // Only look for requirements in TODO section
+      if (inTodoSection && trimmed.startsWith('###')) {
+        const title = trimmed.replace(/^###\s*/, '').trim();
+        if (title) {
+          // Try multiple matching strategies
+          const normalizedTitle = title.trim();
+          const titleSnippet = normalizedTitle.substring(0, 80);
+
+          // Exact match
+          if (normalizedTitle === normalizedCompleted) {
+            requirementStartIndex = i;
+          }
+          // Check if either contains the other (for partial matches)
+          else if (normalizedTitle.includes(normalizedCompleted) || normalizedCompleted.includes(normalizedTitle)) {
+            requirementStartIndex = i;
+          }
+          // Check snippet matches
+          else if (normalizedTitle.includes(snippet) || snippet.includes(titleSnippet)) {
+            requirementStartIndex = i;
+          }
+          // Check if they start the same (for REGRESSION: prefix issues)
+          else if (normalizedTitle.replace(/^REGRESSION:\s*/i, '') === normalizedCompleted.replace(/^REGRESSION:\s*/i, '') ||
+            normalizedTitle.replace(/^REGRESSION:\s*/i, '').includes(snippet.replace(/^REGRESSION:\s*/i, '')) ||
+            snippet.replace(/^REGRESSION:\s*/i, '').includes(normalizedTitle.replace(/^REGRESSION:\s*/i, ''))) {
+            requirementStartIndex = i;
+          }
+
+          if (requirementStartIndex !== -1) {
+            // Find the end of this requirement (next ### or ## header)
+            for (let j = i + 1; j < lines.length; j++) {
+              const nextLine = lines[j].trim();
+              if (nextLine.startsWith('###') || (nextLine.startsWith('##') && !nextLine.startsWith('###'))) {
+                requirementEndIndex = j;
+                break;
+              }
+            }
+            if (requirementEndIndex === -1) {
+              requirementEndIndex = lines.length;
+            }
+            break;
+          }
         }
-        continue;
       }
+    }
 
-      // Stop sections at next header
-      if (trimmed.startsWith('##')) {
-        inTodoSection = false;
-        inVerifiedSection = false;
-      }
+    if (requirementStartIndex === -1) {
+      return { success: false, error: `Could not find requirement "${completedRequirement.substring(0, 60)}..." in TODO section` };
+    }
 
-      // Remove completed requirement from TODO section (match first occurrence)
-      if (inTodoSection && !removedCompleted && trimmed.startsWith('- ')) {
-        const reqText = trimmed.substring(2).trim();
-        // Simple match - just check if this is the completed requirement
-        if (reqText === completedRequirement ||
-          reqText.includes(completedRequirement) ||
-          completedRequirement.includes(reqText)) {
-          removedCompleted = true;
-          continue; // Skip this line
+    // Extract the entire requirement block
+    const requirementBlock = lines.slice(requirementStartIndex, requirementEndIndex);
+
+    // Remove the requirement from its current location
+    lines.splice(requirementStartIndex, requirementEndIndex - requirementStartIndex);
+
+    // Find or create TO VERIFY BY HUMAN section (reuse the variants we defined earlier)
+    let verifyIndex = -1;
+    for (let i = 0; i < lines.length; i++) {
+      const line = lines[i];
+      const trimmed = line.trim();
+
+      // Check each variant more carefully
+      for (const variant of verifySectionVariants) {
+        const variantTrimmed = variant.trim();
+        // Exact match or line starts with variant
+        if (trimmed === variantTrimmed || trimmed.startsWith(variantTrimmed)) {
+          // Double-check: make sure it's NOT a VERIFIED section (without TO VERIFY)
+          if (!trimmed.includes('## 📝 VERIFIED') && !trimmed.match(/^##\s+VERIFIED$/i) &&
+            (trimmed.includes('TO VERIFY') || trimmed.includes('Verified by AI screenshot'))) {
+            verifyIndex = i;
+            break;
+          }
         }
       }
+      if (verifyIndex !== -1) break;
+    }
 
-      updatedLines.push(line);
+    if (verifyIndex === -1) {
+      // Create TO VERIFY section - place it BEFORE VERIFIED section if one exists, otherwise before CHANGELOG
+      const verifiedIndex = lines.findIndex(line => {
+        const trimmed = line.trim();
+        return trimmed === '## 📝 VERIFIED' || trimmed.startsWith('## 📝 VERIFIED') ||
+          (trimmed.startsWith('##') && trimmed.includes('VERIFIED') && !trimmed.includes('TO VERIFY'));
+      });
+      const changelogIndex = lines.findIndex(line => line.includes('## CHANGELOG'));
+      const manualFeedbackIndex = lines.findIndex(line => line.trim().startsWith('## ❓'));
+
+      // Prefer: before VERIFIED > before CHANGELOG > before manual feedback > at end
+      let insertionIndex = lines.length;
+      if (verifiedIndex > 0) {
+        insertionIndex = verifiedIndex;
+      } else if (changelogIndex > 0) {
+        insertionIndex = changelogIndex;
+      } else if (manualFeedbackIndex > 0) {
+        insertionIndex = manualFeedbackIndex;
+      }
+
+      const block = [];
+      if (insertionIndex > 0 && lines[insertionIndex - 1].trim() !== '') {
+        block.push('');
+      }
+      block.push('## 🔍 TO VERIFY BY HUMAN', '');
+      lines.splice(insertionIndex, 0, ...block);
+      verifyIndex = lines.findIndex(line => {
+        const trimmed = line.trim();
+        return trimmed === '## 🔍 TO VERIFY BY HUMAN' || trimmed.startsWith('## 🔍 TO VERIFY BY HUMAN');
+      });
+
+      if (verifyIndex === -1) {
+        return { success: false, error: 'Failed to create TO VERIFY BY HUMAN section' };
+      }
     }
 
-    await fs.writeFile(reqPath, updatedLines.join('\n'));
+    // Safety check: verify we're not inserting into a VERIFIED section
+    const verifyLine = lines[verifyIndex] || '';
+    if (verifyLine.includes('## 📝 VERIFIED') || (verifyLine.trim().startsWith('##') && verifyLine.includes('VERIFIED') && !verifyLine.includes('TO VERIFY'))) {
+      return { success: false, error: 'Attempted to insert into VERIFIED section instead of TO VERIFY' };
+    }
+
+    // Insert requirement block at TOP of TO VERIFY section (right after section header)
+    let insertIndex = verifyIndex + 1;
+
+    // Ensure there's a blank line after the section header
+    if (lines[insertIndex]?.trim() !== '') {
+      lines.splice(insertIndex, 0, '');
+      insertIndex++;
+    }
+
+    // Insert the requirement block
+    lines.splice(insertIndex, 0, ...requirementBlock);
+
+    // Ensure there's a blank line after the requirement block
+    const afterIndex = insertIndex + requirementBlock.length;
+    if (afterIndex < lines.length && lines[afterIndex]?.trim() !== '') {
+      lines.splice(afterIndex, 0, '');
+    }
+
+    // Write the file
+    await fs.writeFile(reqPath, lines.join('\n'));
     return { success: true };
   } catch (error) {
     return { success: false, error: error.message };
@@ -499,6 +663,14 @@ function getTimestamp() {
 }
 
 async function start(options) {
+  // First Run Check
+  try {
+    const { checkFirstRun } = require('../utils/first-run');
+    await checkFirstRun();
+  } catch (e) {
+    // Continue if check fails
+  }
+
   // STRICT AUTH CHECK
   const auth = require('../utils/auth');
   const isAuth = await auth.isAuthenticated();
@@ -517,8 +689,6 @@ async function start(options) {
   if (global.pendingUpdate) {
     const updateSpinner = ora('Installing update...').start();
     try {
-      const { spawn } = require('child_process');
-
       // Install update using npm
       await new Promise((resolve, reject) => {
         const npmInstall = spawn('npm', ['install', '-g', 'vibecodingmachine-cli'], {
@@ -531,7 +701,6 @@ async function start(options) {
             console.log(chalk.green('\n✓ Restarting with new version...\n'));
 
             // Restart CLI with same arguments
-            const { spawn } = require('child_process');
             const args = process.argv.slice(2);
             spawn(process.argv[0], [process.argv[1], ...args], {
               stdio: 'inherit',
@@ -564,15 +733,32 @@ async function start(options) {
       throw new Error('No repository configured');
     }
 
-    // Read saved auto config first, then override with options
+    // Get provider preferences and definitions
     const savedConfig = await getAutoConfig();
     const prefs = await getProviderPreferences();
-    const firstEnabledFromPrefs = prefs.order.find(id => prefs.enabled[id] !== false);
-    const fallbackAgent = firstEnabledFromPrefs || 'claude-code';
-    const savedAgent = savedConfig.agent || savedConfig.ide;
-    const requestedAgent = options.ide || savedAgent || fallbackAgent;
-    const providerDef = PROVIDER_DEFINITION_MAP.get(requestedAgent) || PROVIDER_DEFINITION_MAP.get(fallbackAgent);
-    const effectiveAgent = providerDef ? providerDef.id : 'claude-code';
+
+    // Get all available providers in the order specified in preferences
+    const availableProviders = [];
+    for (const id of prefs.order) {
+      if (prefs.enabled[id] !== false && PROVIDER_DEFINITION_MAP.has(id)) {
+        availableProviders.push(id);
+      }
+    }
+
+    // If no providers are available, use the first one from definitions as fallback
+    if (availableProviders.length === 0) {
+      availableProviders.push(PROVIDER_DEFINITIONS[0]?.id || 'claude-code');
+    }
+
+    // Use the first available provider by default, unless overridden by options
+    let effectiveAgent = options.ide || availableProviders[0];
+
+    // If the requested agent isn't available, use the first available one
+    if (!availableProviders.includes(effectiveAgent)) {
+      effectiveAgent = availableProviders[0];
+    }
+
+    const providerDef = PROVIDER_DEFINITION_MAP.get(effectiveAgent);
 
     const resolvedNeverStop = (() => {
       if (options.neverStop !== undefined) return options.neverStop;
@@ -716,8 +902,15 @@ async function start(options) {
       await startAutoMode(repoPath, config);
     }
 
+    // Get configured stages
+    const stages = await getStages();
+    const stagesList = stages.join(' → ');
+    const defaultInstructionText = `Follow INSTRUCTIONS.md from .vibecodingmachine directory.
+
+CRITICAL FOR IDE AGENTS: You MUST work through ALL configured stages (${stagesList}) without stopping. Update the "🚦 Current Status" section in the REQUIREMENTS file as you progress through each stage. DO NOT stop after acknowledging stages - you must COMPLETE the work and set status to DONE in the requirements file. The CLI is monitoring the file and waiting for you to finish.`;
+
     // Send initial instruction to IDE or Continue/Cline CLI
-    const textToSend = options.text || DEFAULT_INSTRUCTION_TEXT;
+    const textToSend = options.text || defaultInstructionText;
 
     if (config.ide === 'continue') {
       // Use Continue CLI with command-line approach
@@ -840,14 +1033,9 @@ async function start(options) {
             'DONE': '⏳'
           };
 
-          const stages = ['PREPARE', 'ACT', 'CLEAN UP', 'VERIFY', 'DONE'];
-          const stageMap = {
-            'PREPARE': 0,
-            'ACT': 1,
-            'CLEAN UP': 2,
-            'VERIFY': 3,
-            'DONE': 4
-          };
+          // Build stage map dynamically
+          const stageMap = {};
+          stages.forEach((s, i) => stageMap[s] = i);
 
           const currentIndex = stageMap[currentStatus] || 0;
           const workflowLine = stages.map((stage, idx) => {
@@ -887,21 +1075,65 @@ async function start(options) {
           let title = null;
           let status = 'PREPARE';
           let inTodoSection = false;
+          let inCurrentSection = false;
 
-          for (const line of lines) {
-            if (line.includes('Requirements not yet completed') && line.trim().startsWith('##')) {
+          for (let i = 0; i < lines.length; i++) {
+            const line = lines[i].trim();
+
+            // Check if we're in the Current section
+            if (line.includes('## 🔨 Current In Progress Requirement') ||
+              line.includes('Current In Progress Requirement')) {
+              inCurrentSection = true;
+              inTodoSection = false;
+              continue;
+            }
+
+            // Check if we're in the TODO section
+            if (line.includes('## ⏳ Requirements not yet completed') ||
+              (line.includes('Requirements not yet completed') && line.startsWith('##'))) {
               inTodoSection = true;
+              inCurrentSection = false;
               continue;
             }
 
-            if (inTodoSection && line.trim().startsWith('- ')) {
-              title = line.substring(2).trim();
-              status = 'PREPARE';
-              break;
+            // If we hit another section header, stop looking in current section/todo section logic
+            if ((inTodoSection || inCurrentSection) && line.startsWith('##') && !line.startsWith('###')) {
+              if (inCurrentSection) {
+                // If we finished current section and found nothing, move to next sections (which might be TODO)
+                inCurrentSection = false;
+                continue;
+              }
+              if (inTodoSection) {
+                break;
+              }
             }
 
-            if (inTodoSection && line.trim().startsWith('##')) {
-              break;
+            // If we're in Current section, look for bullet or header
+            if (inCurrentSection) {
+              if (line.startsWith('- ')) {
+                title = line.substring(2).trim();
+                // Remove bold if present
+                title = title.replace(/\*\*/g, '');
+                if (title) break;
+              }
+              if (line.startsWith('###')) {
+                title = line.replace(/^###\s*/, '').trim();
+                if (title) break;
+              }
+            }
+
+            // If we're in TODO section and find a requirement header (###) or bullet
+            if (inTodoSection) {
+              if (line.startsWith('###')) {
+                title = line.replace(/^###\s*/, '').trim();
+                if (title) break;
+              }
+              // Also support bullet points in TODO if that's a format used
+              if (line.startsWith('- ')) {
+                title = line.substring(2).trim();
+                title = title.replace(/\*\*/g, '');
+                if (title) break;
+              }
             }
           }
 
@@ -1789,25 +2021,30 @@ Please implement this requirement now.`;
         let status = 'PREPARE';
         let inTodoSection = false;
 
-        // Read from TODO list instead of "Current In Progress Requirement" section
-        for (const line of lines) {
-          // Find TODO section
-          if (line.includes('Requirements not yet completed') && line.trim().startsWith('##')) {
+        // Read from TODO list - requirements are in ### format
+        for (let i = 0; i < lines.length; i++) {
+          const line = lines[i].trim();
+
+          // Check if we're in the TODO section
+          if (line.includes('## ⏳ Requirements not yet completed') ||
+            (line.includes('Requirements not yet completed') && line.startsWith('##'))) {
             inTodoSection = true;
             continue;
           }
 
-          // Get first TODO item
-          if (inTodoSection && line.trim().startsWith('- ')) {
-            title = line.substring(2).trim();
-            // Always start at PREPARE for TODO items
-            status = 'PREPARE';
+          // If we hit another section header, stop looking
+          if (inTodoSection && line.startsWith('##') && !line.startsWith('###')) {
             break;
           }
 
-          // Stop if we hit another section
-          if (inTodoSection && line.trim().startsWith('##')) {
-            break;
+          // If we're in TODO section and find a requirement header (###)
+          if (inTodoSection && line.startsWith('###')) {
+            title = line.replace(/^###\s*/, '').trim();
+            // Skip empty titles
+            if (title && title.length > 0) {
+              status = 'PREPARE';
+              break;
+            }
           }
         }
 
@@ -2646,11 +2883,43 @@ NOW: Search for and make the minimal code changes needed.`;
             } else {
               console.log(chalk.yellow(`\n⚠️  Aider did not complete implementation.\n`));
 
-              // Check if requirement might be too vague by having Aider search the codebase first
-              console.log(chalk.cyan(`\n[${getTimestamp()}] 🔍 Searching codebase for relevant code...\n`));
+              // Check if any code changes were made during implementation attempt
+              console.log(chalk.cyan(`\n[${getTimestamp()}] 🔍 Checking for code changes...\n`));
+
+              let hasCodeChanges = false;
+              try {
+                const { execSync } = require('child_process');
+                const gitStatus = execSync('git status --porcelain', { cwd: repoPath, encoding: 'utf8' });
+                hasCodeChanges = gitStatus.trim().length > 0;
+
+                if (hasCodeChanges) {
+                  console.log(chalk.cyan(`✓ Code changes detected. Will move to TO VERIFY.\n`));
+                } else {
+                  console.log(chalk.gray(`No code changes detected.\n`));
+                }
+              } catch (err) {
+                console.log(chalk.gray(`Could not check git status: ${err.message}\n`));
+              }
 
-              // STEP 1: Have Aider search the codebase for relevant files
-              const searchPrompt = `Search the codebase to understand this requirement:
+              // If code changes were made, move to TO VERIFY (even if incomplete)
+              if (hasCodeChanges) {
+                console.log(chalk.cyan(`\n[${getTimestamp()}] Moving requirement to TO VERIFY (code changes were made): "${currentTitle.substring(0, 60)}..."`));
+                const moveResult = await moveCompletedRequirement(repoPath, currentTitle);
+
+                if (moveResult.success) {
+                  console.log(chalk.green(`\n✓ Successfully moved requirement to TO VERIFY section (code changes made, needs human verification)`));
+                  requirementsCompleted++; // Count as "completed" so we move to next requirement
+                } else {
+                  console.log(chalk.red(`\n❌ Error moving requirement: ${moveResult.error}`));
+                  console.log(chalk.yellow(`  Requirement title: "${currentTitle}"`));
+                  console.log(chalk.gray('  Requirement remains in TODO for retry.\n'));
+                }
+              } else {
+                // No code changes made - check if requirement might be too vague by having Aider search the codebase first
+                console.log(chalk.cyan(`\n[${getTimestamp()}] 🔍 Searching codebase for relevant code...\n`));
+
+                // STEP 1: Have Aider search the codebase for relevant files
+                const searchPrompt = `Search the codebase to understand this requirement:
 
 "${currentTitle}"
 
@@ -2659,30 +2928,30 @@ Focus on: What files/functions are related? What patterns exist?
 
 If you cannot find any relevant code, say "NO RELEVANT CODE FOUND".`;
 
-              const searchResult = await aiderManager.sendText(
-                searchPrompt,
-                repoPath,
-                provider,
-                modelName,
-                null,
-                [], // No files - let Aider search
-                (output) => {
-                  // Show search progress
-                  if (output.includes('Searching') || output.includes('Found')) {
-                    process.stdout.write(chalk.gray(output));
-                  }
-                },
-                () => { },
-                90000 // 1.5 minute timeout for search
-              );
+                const searchResult = await aiderManager.sendText(
+                  searchPrompt,
+                  repoPath,
+                  provider,
+                  modelName,
+                  null,
+                  [], // No files - let Aider search
+                  (output) => {
+                    // Show search progress
+                    if (output.includes('Searching') || output.includes('Found')) {
+                      process.stdout.write(chalk.gray(output));
+                    }
+                  },
+                  () => { },
+                  90000 // 1.5 minute timeout for search
+                );
 
-              const searchFindings = searchResult.output || 'Search completed but no findings reported.';
-              console.log(chalk.gray(`\nFindings: ${searchFindings}\n`));
+                const searchFindings = searchResult.output || 'Search completed but no findings reported.';
+                console.log(chalk.gray(`\nFindings: ${searchFindings}\n`));
 
-              // STEP 2: Check if requirement is vague and generate questions focused on USER INTENT
-              console.log(chalk.cyan(`\n[${getTimestamp()}] 🤔 Analyzing if clarification is needed...\n`));
+                // STEP 2: Check if requirement is vague and generate questions focused on USER INTENT
+                console.log(chalk.cyan(`\n[${getTimestamp()}] 🤔 Analyzing if clarification is needed...\n`));
 
-              const vagueCheckPrompt = `Based on these findings from the codebase:
+                const vagueCheckPrompt = `Based on these findings from the codebase:
 "${searchFindings}"
 
 Analyze if this requirement needs clarification:
@@ -2709,45 +2978,46 @@ Example BAD questions (never ask these):
 - What file contains the confirmation prompt? (You should search for this yourself)
 - Which component needs to be modified? (You should find this yourself)`;
 
-              const vagueCheckResult = await aiderManager.sendText(
-                vagueCheckPrompt,
-                repoPath,
-                provider,
-                modelName,
-                null,
-                [], // No files needed for vague check
-                () => { }, // Silent mode
-                () => { },
-                60000 // 1 minute timeout
-              );
+                const vagueCheckResult = await aiderManager.sendText(
+                  vagueCheckPrompt,
+                  repoPath,
+                  provider,
+                  modelName,
+                  null,
+                  [], // No files needed for vague check
+                  () => { }, // Silent mode
+                  () => { },
+                  60000 // 1 minute timeout
+                );
 
-              const vagueCheckOutput = vagueCheckResult.output || '';
-              const isVague = vagueCheckOutput.toUpperCase().includes('REQUIREMENT NEEDS CLARIFICATION');
+                const vagueCheckOutput = vagueCheckResult.output || '';
+                const isVague = vagueCheckOutput.toUpperCase().includes('REQUIREMENT NEEDS CLARIFICATION');
 
-              if (isVague) {
-                // Extract clarifying questions from output
-                const questionMatch = vagueCheckOutput.match(/\d+\.\s*(.+)/g);
-                const questions = questionMatch ? questionMatch.map(q => q.trim()).join('\n') :
-                  '1. What is the desired behavior for this feature?\n2. Should this apply to all cases or specific scenarios?';
+                if (isVague) {
+                  // Extract clarifying questions from output
+                  const questionMatch = vagueCheckOutput.match(/\d+\.\s*(.+)/g);
+                  const questions = questionMatch ? questionMatch.map(q => q.trim()).join('\n') :
+                    '1. What is the desired behavior for this feature?\n2. Should this apply to all cases or specific scenarios?';
 
-                console.log(chalk.yellow(`\n❓ Requirement flagged as TOO VAGUE. Moving to "Requirements needing manual feedback" section.\n`));
-                console.log(chalk.gray('AI Findings:'));
-                console.log(chalk.white(searchFindings));
-                console.log(chalk.gray('\nClarifying questions:'));
-                console.log(chalk.white(questions));
+                  console.log(chalk.yellow(`\n❓ Requirement flagged as TOO VAGUE (and no code changes made). Moving to "Requirements needing manual feedback" section.\n`));
+                  console.log(chalk.gray('AI Findings:'));
+                  console.log(chalk.white(searchFindings));
+                  console.log(chalk.gray('\nClarifying questions:'));
+                  console.log(chalk.white(questions));
 
-                // Move requirement to "Requirements needing manual feedback" section with findings
-                const moveToFeedbackResult = await moveRequirementToFeedback(repoPath, currentTitle, questions, searchFindings);
+                  // Move requirement to "Requirements needing manual feedback" section with findings
+                  const moveToFeedbackResult = await moveRequirementToFeedback(repoPath, currentTitle, questions, searchFindings);
 
-                if (moveToFeedbackResult.success) {
-                  console.log(chalk.green(`\n✓ Requirement moved to feedback section. Please provide clarification.\n`));
-                  requirementsCompleted++; // Count as "completed" so we move to next requirement
+                  if (moveToFeedbackResult.success) {
+                    console.log(chalk.green(`\n✓ Requirement moved to feedback section. Please provide clarification.\n`));
+                    requirementsCompleted++; // Count as "completed" so we move to next requirement
+                  } else {
+                    console.log(chalk.yellow(`\n⚠️  Could not move requirement: ${moveToFeedbackResult.error}\n`));
+                    console.log(chalk.gray('  Requirement remains in TODO for retry.\n'));
+                  }
                 } else {
-                  console.log(chalk.yellow(`\n⚠️  Could not move requirement: ${moveToFeedbackResult.error}\n`));
-                  console.log(chalk.gray('  Requirement remains in TODO for retry.\n'));
+                  console.log(chalk.cyan(`\n✓ Requirement appears clear. Will retry on next run.\n`));
                 }
-              } else {
-                console.log(chalk.cyan(`\n✓ Requirement appears clear. Will retry on next run.\n`));
               }
             }
 
@@ -2766,16 +3036,18 @@ Example BAD questions (never ask these):
                   console.log(chalk.green('\n✅ Requirement marked as DONE and verified complete!'));
 
                   // Move completed requirement to TO VERIFY section (for human verification)
+                  console.log(chalk.cyan(`\n[${getTimestamp()}] Moving requirement to TO VERIFY: "${currentTitle.substring(0, 60)}..."`));
                   const moveResult = await moveCompletedRequirement(repoPath, currentTitle);
 
                   if (!moveResult.success) {
-                    console.log(chalk.yellow(`\n⚠️  Error moving requirement: ${moveResult.error}`));
+                    console.log(chalk.red(`\n❌ Error moving requirement: ${moveResult.error}`));
+                    console.log(chalk.yellow(`  Requirement title: "${currentTitle}"`));
                     console.log('  Auto mode stopping.');
                     exitReason = 'error';
                     break;
                   }
 
-                  console.log(chalk.green(`\n✓ Moved requirement to TO VERIFY section (awaiting human verification)`));
+                  console.log(chalk.green(`\n✓ Successfully moved requirement to TO VERIFY section (awaiting human verification)`));
 
                   // Increment requirements completed counter
                   requirementsCompleted++;
@@ -2855,16 +3127,18 @@ Example BAD questions (never ask these):
                   console.log(chalk.gray('  Marking as complete and moving to next requirement...'));
 
                   // Move completed requirement to TO VERIFY section (for human verification)
+                  console.log(chalk.cyan(`\n[${getTimestamp()}] Moving requirement to TO VERIFY: "${currentTitle.substring(0, 60)}..."`));
                   const moveResult = await moveCompletedRequirement(repoPath, currentTitle);
 
                   if (!moveResult.success) {
-                    console.log(chalk.yellow(`\n⚠️  Error moving requirement: ${moveResult.error}`));
+                    console.log(chalk.red(`\n❌ Error moving requirement: ${moveResult.error}`));
+                    console.log(chalk.yellow(`  Requirement title: "${currentTitle}"`));
                     console.log('  Auto mode stopping.');
                     exitReason = 'error';
                     break;
                   }
 
-                  console.log(chalk.green(`\n✓ Moved requirement to TO VERIFY section (awaiting human verification)`));
+                  console.log(chalk.green(`\n✓ Successfully moved requirement to TO VERIFY section (awaiting human verification)`));
 
                   // Increment requirements completed counter
                   requirementsCompleted++;
@@ -4684,9 +4958,60 @@ async function config(options) {
   }
 }
 
+async function listAgents() {
+  const ProviderManager = require('vibecodingmachine-core/src/ide-integration/provider-manager.cjs');
+  const providerManager = new ProviderManager();
+
+  console.log(chalk.blue('\n📋 Available IDE Agents and Quota Status:\n'));
+
+  // Get all provider definitions
+  const providers = getProviderDefinitions();
+
+  // Check each provider's quota status
+  for (const provider of providers) {
+    const rateLimitInfo = providerManager.getRateLimitInfo(provider.id);
+
+    let statusIcon = '✅';
+    let statusText = chalk.green('Available');
+    let quotaInfo = '';
+
+    if (rateLimitInfo.isRateLimited) {
+      statusIcon = '⚠️';
+      statusText = chalk.yellow('Quota Limit');
+
+      if (rateLimitInfo.resetTime) {
+        const resetDate = new Date(rateLimitInfo.resetTime);
+        const now = new Date();
+        const minutesRemaining = Math.ceil((resetDate - now) / (1000 * 60));
+
+        if (minutesRemaining > 60) {
+          const hoursRemaining = Math.ceil(minutesRemaining / 60);
+          quotaInfo = chalk.gray(` (resets in ${hoursRemaining}h)`);
+        } else if (minutesRemaining > 0) {
+          quotaInfo = chalk.gray(` (resets in ${minutesRemaining}m)`);
+        } else {
+          quotaInfo = chalk.gray(' (resetting soon)');
+        }
+      }
+
+      if (rateLimitInfo.reason) {
+        quotaInfo += chalk.gray(` - ${rateLimitInfo.reason}`);
+      }
+    }
+
+    console.log(`${statusIcon} ${chalk.cyan(provider.name)} ${statusText}${quotaInfo}`);
+    if (provider.description) {
+      console.log(`   ${chalk.gray(provider.description)}`);
+    }
+  }
+
+  console.log(chalk.gray('\n💡 Tip: Auto mode will automatically skip quota-limited agents\n'));
+}
+
 module.exports = {
   start,
   stop,
   status,
-  config
+  config,
+  listAgents
 };