vibecodingmachine-cli 2025.12.6-1702 → 2025.12.22-2230

package/src/utils/interactive.js

@@ -9,7 +9,7 @@ const repo = require('../commands/repo');
 const auto = require('../commands/auto');
 const status = require('../commands/status');
 const requirements = require('../commands/requirements');
-const { getRepoPath, readConfig, writeConfig } = require('./config');
+const { getRepoPath, readConfig, writeConfig, getAutoConfig } = require('./config');
 const { getProviderPreferences, saveProviderPreferences, getProviderDefinitions } = require('../utils/provider-registry');
 const { checkAutoModeStatus } = require('./auto-mode');
 const {
@@ -19,6 +19,7 @@ const {
   requirementsExists,
   isComputerNameEnabled
 } = require('vibecodingmachine-core');
+const pkg = require('../../package.json');
 
 /**
  * Format IDE name for display
@@ -213,95 +214,9 @@ function formatPath(fullPath) {
 
 async function countRequirements() {
   try {
-    const { getRequirementsPath, getVibeCodingMachineDir } = require('vibecodingmachine-core');
+    const { getProjectRequirementStats } = require('vibecodingmachine-core');
     const repoPath = await getRepoPath();
-    const reqPath = await getRequirementsPath(repoPath);
-
-    if (!reqPath || !await fs.pathExists(reqPath)) {
-      return null;
-    }
-
-    const content = await fs.readFile(reqPath, 'utf8');
-
-    // Count requirements in each section
-    let todoCount = 0;
-    let toVerifyCount = 0;
-    let verifiedCount = 0;
-
-    // Split by sections
-    const lines = content.split('\n');
-    let currentSection = '';
-
-    for (const line of lines) {
-      const trimmed = line.trim();
-
-      // Check for requirement headers first (###), then section headers (##)
-      // This prevents ### from being treated as section headers
-      if (trimmed.startsWith('###')) {
-        // Count requirements (### headers in new format)
-        // IMPORTANT: Only count if we're in a recognized section
-        if (currentSection) {
-          const requirementText = trimmed.replace(/^###\s*/, '').trim();
-          if (requirementText) { // Only count if requirement text is not empty
-            if (currentSection === 'todo') {
-              todoCount++;
-            } else if (currentSection === 'toverify') {
-              toVerifyCount++;
-            }
-          }
-        }
-      } else if (trimmed.startsWith('##') && !trimmed.startsWith('###')) {
-        // Detect section headers (must start with ## but not ###)
-        if (trimmed.includes('⏳ Requirements not yet completed') ||
-          trimmed.includes('Requirements not yet completed')) {
-          currentSection = 'todo';
-        } else if (trimmed.includes('🔍 TO VERIFY BY HUMAN') ||
-          trimmed.includes('TO VERIFY BY HUMAN') ||
-          trimmed.includes('🔍 TO VERIFY') ||
-          trimmed.includes('TO VERIFY') ||
-          trimmed.includes('✅ Verified by AI') ||
-          trimmed.includes('Verified by AI')) {
-          currentSection = 'toverify';
-        } else {
-          // Any other section header clears the current section
-          currentSection = '';
-        }
-      }
-    }
-
-    // Count verified requirements from CHANGELOG.md (at repository root)
-    const allnightDir = await getVibeCodingMachineDir();
-    if (allnightDir) {
-      // CHANGELOG.md is at the repository root
-      // If .vibecodingmachine is inside repo: go up one level
-      // If .vibecodingmachine is sibling (../.vibecodingmachine-reponame): go up one level then into repo
-      let changelogPath;
-      const allnightStatus = await require('vibecodingmachine-core').checkVibeCodingMachineExists();
-
-      if (allnightStatus.insideExists) {
-        // .vibecodingmachine is inside repo, so go up one level
-        changelogPath = path.join(path.dirname(allnightDir), 'CHANGELOG.md');
-      } else if (allnightStatus.siblingExists) {
-        // .vibecodingmachine is sibling, use current working directory
-        changelogPath = path.join(process.cwd(), 'CHANGELOG.md');
-      }
-
-      if (changelogPath && await fs.pathExists(changelogPath)) {
-        const changelogContent = await fs.readFile(changelogPath, 'utf8');
-        // Count entries that look like completed requirements
-        // Each entry typically starts with "- " followed by date/description
-        const changelogLines = changelogContent.split('\n');
-        for (const line of changelogLines) {
-          const trimmed = line.trim();
-          // Count lines that start with "- " and have substantial content (not just empty bullets)
-          if (trimmed.startsWith('- ') && trimmed.length > 10) {
-            verifiedCount++;
-          }
-        }
-      }
-    }
-
-    return { todoCount, toVerifyCount, verifiedCount };
+    return await getProjectRequirementStats(repoPath);
   } catch (error) {
     return null;
   }
@@ -357,25 +272,14 @@ async function showWelcomeScreen() {
 
   const repoPath = process.cwd(); // Always use current working directory
   const autoStatus = await checkAutoModeStatus();
-  const allnightStatus = await checkVibeCodingMachineExists();
   const hostname = getHostname();
-  const requirementsFilename = await getRequirementsFilename();
-  const useHostname = await isComputerNameEnabled();
 
   // Get current IDE from config
   const { getAutoConfig } = require('./config');
   const autoConfig = await getAutoConfig();
-  const currentIDE = autoConfig.ide || autoStatus.ide || 'claude-code';
 
   // Check for requirements file
   const hasRequirements = await requirementsExists();
-  let requirementsLocation = '';
-
-  if (allnightStatus.insideExists) {
-    requirementsLocation = '.vibecodingmachine';
-  } else if (allnightStatus.siblingExists) {
-    requirementsLocation = path.basename(allnightStatus.siblingDir);
-  }
 
   // Count requirements if file exists
   const counts = hasRequirements ? await countRequirements() : null;
@@ -385,7 +289,6 @@ async function showWelcomeScreen() {
   console.clear();
 
   // Get version from package.json
-  const pkg = require('../../package.json');
   const version = `v${pkg.version}`;
 
   // Display welcome banner with version
@@ -485,7 +388,7 @@ async function showRequirementsTree() {
   };
 
   // Build tree structure
-  const buildTree = () => {
+  const buildTree = async () => {
     tree.items = [];
 
     // Root: Requirements
@@ -495,23 +398,22 @@ async function showRequirementsTree() {
       tree.items.push({ level: 1, type: 'add', label: '➕ Add new requirement', key: 'add-one' });
       tree.items.push({ level: 1, type: 'add', label: '➕ Add multiple requirements', key: 'add-many' });
 
-      // Calculate counts and percentages
+      // Use pre-calculated stats and labels from shared logic
+      const stats = await countRequirements();
+      const { todoCount, toVerifyCount, verifiedCount, total, todoLabel, toVerifyLabel, verifiedLabel } = stats || {
+        todoCount: 0, toVerifyCount: 0, verifiedCount: 0, total: 0,
+        todoLabel: '⏳ TODO (0 - 0%)', toVerifyLabel: '✅ TO VERIFY (0 - 0%)', verifiedLabel: '🎉 VERIFIED (0 - 0%)'
+      };
+
       const verifiedReqs = tree.verifiedReqs || [];
       const verifyReqs = tree.verifyReqs || [];
       const clarificationReqs = tree.clarificationReqs || [];
       const todoReqs = tree.todoReqs || [];
       const recycledReqs = tree.recycledReqs || [];
-      const total = verifiedReqs.length + verifyReqs.length + clarificationReqs.length + todoReqs.length + recycledReqs.length;
-
-      const verifiedPercent = total > 0 ? Math.round((verifiedReqs.length / total) * 100) : 0;
-      const verifyPercent = total > 0 ? Math.round((verifyReqs.length / total) * 100) : 0;
-      const clarificationPercent = total > 0 ? Math.round((clarificationReqs.length / total) * 100) : 0;
-      const todoPercent = total > 0 ? Math.round((todoReqs.length / total) * 100) : 0;
-      const recycledPercent = total > 0 ? Math.round((recycledReqs.length / total) * 100) : 0;
 
       // VERIFIED section (first) - only show if has requirements
-      if (verifiedReqs.length > 0) {
-        tree.items.push({ level: 1, type: 'section', label: `🎉 VERIFIED (${verifiedReqs.length} - ${verifiedPercent}%)`, key: 'verified' });
+      if (verifiedReqs.length > 0 || verifiedCount > 0) {
+        tree.items.push({ level: 1, type: 'section', label: `🎉 ${verifiedLabel}`, key: 'verified' });
 
         if (tree.expanded.verified) {
           verifiedReqs.forEach((req, idx) => {
@@ -521,8 +423,8 @@ async function showRequirementsTree() {
       }
 
       // TO VERIFY section (second) - only show if has requirements
-      if (verifyReqs.length > 0) {
-        tree.items.push({ level: 1, type: 'section', label: `✅ TO VERIFY (${verifyReqs.length} - ${verifyPercent}%)`, key: 'verify', section: '✅ Verified by AI screenshot' });
+      if (verifyReqs.length > 0 || toVerifyCount > 0) {
+        tree.items.push({ level: 1, type: 'section', label: `✅ ${toVerifyLabel}`, key: 'verify', section: '✅ Verified by AI screenshot' });
 
         if (tree.expanded.verify) {
           verifyReqs.forEach((req, idx) => {
@@ -543,8 +445,8 @@ async function showRequirementsTree() {
       }
 
       // TODO section (fourth) - only show if has requirements
-      if (todoReqs.length > 0) {
-        tree.items.push({ level: 1, type: 'section', label: `⏳ TODO (${todoReqs.length} - ${todoPercent}%)`, key: 'todo', section: '⏳ Requirements not yet completed' });
+      if (todoReqs.length > 0 || todoCount > 0) {
+        tree.items.push({ level: 1, type: 'section', label: `⏳ ${todoLabel}`, key: 'todo', section: '⏳ Requirements not yet completed' });
 
         if (tree.expanded.todo) {
           todoReqs.forEach((req, idx) => {
@@ -600,17 +502,6 @@ async function showRequirementsTree() {
         // Reset inSection if we hit a section header that's not our target section
         if (sectionKey === 'verify' && inSection) {
           // Check if this is still a TO VERIFY section header
-          const isStillToVerify = trimmed === '## 🔍 TO VERIFY BY HUMAN' ||
-            trimmed.startsWith('## 🔍 TO VERIFY BY HUMAN') ||
-            trimmed === '## 🔍 TO VERIFY' ||
-            trimmed.startsWith('## 🔍 TO VERIFY') ||
-            trimmed === '## TO VERIFY' ||
-            trimmed.startsWith('## TO VERIFY') ||
-            trimmed === '## ✅ TO VERIFY' ||
-            trimmed.startsWith('## ✅ TO VERIFY') ||
-            trimmed === '## ✅ Verified by AI screenshot. Needs Human to Verify and move to CHANGELOG' ||
-            (trimmed.startsWith('## ✅ Verified by AI screenshot. Needs Human to Verify and move to CHANGELOG') &&
-              trimmed.includes('Needs Human to Verify'));
           if (!isStillToVerify) {
             // This will be handled by the "leaving section" check below, but ensure we don't process it as entering
           }
@@ -658,11 +549,6 @@ async function showRequirementsTree() {
         if (sectionKey === 'verify') {
           // For TO VERIFY, only break if this is clearly a different section
           // Check for specific section headers that indicate we've left TO VERIFY
-          const isVerifiedSection = trimmed === '## 📝 VERIFIED' || trimmed.startsWith('## 📝 VERIFIED');
-          const isTodoSection = trimmed.includes('⏳ Requirements not yet completed') || trimmed.includes('Requirements not yet completed');
-          const isRecycledSection = trimmed === '## ♻️ RECYCLED' || trimmed.startsWith('## ♻️ RECYCLED') ||
-            trimmed === '## 📦 RECYCLED' || trimmed.startsWith('## 📦 RECYCLED');
-          const isClarificationSection = trimmed.includes('## ❓ Requirements needing') || trimmed.includes('❓ Requirements needing');
 
           if (isVerifiedSection || isTodoSection || isRecycledSection || isClarificationSection) {
             break; // Different section, we've left TO VERIFY
@@ -688,7 +574,7 @@ async function showRequirementsTree() {
         }
 
         const details = [];
-        let package = null;
+        let pkg = null;
 
         // Read package and description
         for (let j = i + 1; j < lines.length; j++) {
@@ -699,14 +585,14 @@ async function showRequirementsTree() {
           }
           // Check for PACKAGE line
           if (nextLine.startsWith('PACKAGE:')) {
-            package = nextLine.replace(/^PACKAGE:\s*/, '').trim();
+            pkg = nextLine.replace(/^PACKAGE:\s*/, '').trim();
           } else if (nextLine && !nextLine.startsWith('PACKAGE:')) {
             // Description line
             details.push(nextLine);
           }
         }
 
-        requirements.push({ title, details, package, lineIndex: i });
+        requirements.push({ title, details, pkg, lineIndex: i });
       }
     }
 
@@ -837,7 +723,7 @@ async function showRequirementsTree() {
   tree.recycledReqs = await loadSection('recycled', '♻️ Recycled');
 
   let inTree = true;
-  buildTree();
+  await buildTree();
 
   while (inTree) {
     console.clear();
@@ -944,7 +830,7 @@ async function showRequirementsTree() {
       if (tree.expanded[current.key]) {
         // Collapse expanded section
         tree.expanded[current.key] = false;
-        buildTree();
+        await buildTree();
       } else if (current.level > 0) {
         // Go to parent
         for (let i = tree.selected - 1; i >= 0; i--) {
@@ -957,10 +843,12 @@ async function showRequirementsTree() {
         // At root level, go back to main menu
         inTree = false;
       }
-    } else if (key.name === 'up') {
+    } else if (key.name === 'k' || key.name === 'up') {
       tree.selected = Math.max(0, tree.selected - 1);
-    } else if (key.name === 'down') {
+      await buildTree();
+    } else if (key.name === 'j' || key.name === 'down') {
       tree.selected = Math.min(tree.items.length - 1, tree.selected + 1);
+      await buildTree();
     } else if (key.name === 'right' || key.name === 'return' || key.name === 'space') {
       const current = tree.items[tree.selected];
       if (!current) continue; // Safety check
@@ -977,19 +865,19 @@ async function showRequirementsTree() {
           } else if (current.key === 'recycled') {
             tree.recycledReqs = await loadSection(current.key, current.section);
           }
-          buildTree();
+          await buildTree();
         } else {
           tree.expanded[current.key] = false;
-          buildTree();
+          await buildTree();
         }
       } else if (current.type === 'requirement') {
         // Show requirement actions
         await showRequirementActions(current.req, current.sectionKey, tree);
-        buildTree();
+        await buildTree();
       } else if (current.type === 'clarification') {
         // Show clarification requirement with questions
         await showClarificationActions(current.req, tree, loadClarification);
-        buildTree();
+        await buildTree();
       } else if (current.type === 'verified') {
         // Show verified item details (read-only)
         console.clear();
@@ -1016,7 +904,7 @@ async function showRequirementsTree() {
         await handleAddRequirement(current.key);
         // Reload TODO section
         tree.todoReqs = await loadSection('todo', '⏳ Requirements not yet completed');
-        buildTree();
+        await buildTree();
       }
     } else if (key.name === 'r') {
       const current = tree.items[tree.selected];
@@ -1030,15 +918,15 @@ async function showRequirementsTree() {
         } else if (current.sectionKey === 'verify') {
           tree.verifyReqs = await loadSection('verify', '✅ Verified by AI screenshot');
         }
-        buildTree();
+        await buildTree();
       } else if (current.type === 'clarification') {
         await deleteClarification(current.req, tree);
         tree.clarificationReqs = await loadClarification();
-        buildTree();
+        await buildTree();
       } else if (current.type === 'recycled') {
         await permanentlyDeleteRequirement(current.req, current.sectionKey, tree);
         tree.recycledReqs = await loadSection('recycled', '♻️ Recycled');
-        buildTree();
+        await buildTree();
       }
     } else if (key.name === 'j') {
       const current = tree.items[tree.selected];
@@ -1046,7 +934,7 @@ async function showRequirementsTree() {
 
       if (current.type === 'requirement') {
         await moveRequirementDown(current.req, current.sectionKey, tree);
-        buildTree();
+        await buildTree();
         // Move selection down to follow the item
         if (tree.selected < tree.items.length - 1) {
           tree.selected++;
@@ -1058,7 +946,7 @@ async function showRequirementsTree() {
 
       if (current.type === 'requirement') {
         await moveRequirementUp(current.req, current.sectionKey, tree);
-        buildTree();
+        await buildTree();
         // Move selection up to follow the item
         if (tree.selected > 0) {
           tree.selected--;
@@ -1070,7 +958,7 @@ async function showRequirementsTree() {
 
       if (current.type === 'requirement') {
         await promoteRequirement(current.req, current.sectionKey, tree, loadSection, loadVerified);
-        buildTree();
+        await buildTree();
       }
     } else if (key.name === 'd') {
       const current = tree.items[tree.selected];
@@ -1081,12 +969,12 @@ async function showRequirementsTree() {
         await moveClarificationToTodo(current.req, tree);
         tree.clarificationReqs = await loadClarification();
         tree.todoReqs = await loadSection('todo', '⏳ Requirements not yet completed');
-        buildTree();
+        await buildTree();
       } else if (current.type === 'requirement' || current.type === 'verified') {
         const sectionKey = current.type === 'verified' ? 'verified' : current.sectionKey;
         const reqTitle = current.type === 'verified' ? current.label : current.req.title;
         await demoteRequirement(reqTitle, sectionKey, tree, loadSection, loadVerified);
-        buildTree();
+        await buildTree();
       }
     }
   }
@@ -1853,7 +1741,7 @@ async function permanentlyDeleteRequirement(req, sectionKey, tree) {
       const line = lines[i].trim();
       if (line.startsWith('###')) {
         const title = line.replace(/^###\s*/, '').trim();
-        if (title && title.includes(req.title)) {
+        if (title && title === req.title) {
           requirementStartIndex = i;
           // Find the end of this requirement (next ### or ## header)
           for (let j = i + 1; j < lines.length; j++) {
@@ -1898,7 +1786,7 @@ async function moveRequirementToRecycled(reqPath, requirementTitle, fromSection)
     const line = lines[i].trim();
     if (line.startsWith('###')) {
       const title = line.replace(/^###\s*/, '').trim();
-      if (title && title.includes(requirementTitle)) {
+      if (title && title === requirementTitle) {
         requirementStartIndex = i;
         // Find the end of this requirement (next ### or ## header)
         for (let j = i + 1; j < lines.length; j++) {
@@ -2219,7 +2107,7 @@ async function handleAddRequirement(type) {
       while (!done) {
         try {
           // Ask for package
-          const { package } = await inquirer.prompt([{
+          const { package: pkg } = await inquirer.prompt([{
             type: 'list',
             name: 'package',
             message: `Package for requirement ${requirements.length + 1}:`,
@@ -2268,7 +2156,7 @@ async function handleAddRequirement(type) {
             }
 
             const description = descriptionLines.join('\n');
-            requirements.push({ name, package, description });
+            requirements.push({ name, package: pkg, description });
           }
         } catch (err) {
           done = true;
@@ -2565,7 +2453,6 @@ async function showQuickMenu(items, initialSelectedIndex = 0) {
     if (selectedIndex >= items.length) selectedIndex = 0;
 
     let isFirstRender = true;
-    let lastLinesPrinted = 0;
 
     // Helper to calculate visual lines occupied by text
     const getVisualLineCount = (text) => {
@@ -2751,22 +2638,27 @@ async function showQuickMenu(items, initialSelectedIndex = 0) {
 
       // Arrow keys for navigation
       if (key.name === 'up') {
-        // Skip blank and info lines when navigating
-        let newIndex = selectedIndex > 0 ? selectedIndex - 1 : items.length - 1;
-        while ((items[newIndex].type === 'blank' || items[newIndex].type === 'info') && newIndex !== selectedIndex) {
-          newIndex = newIndex > 0 ? newIndex - 1 : items.length - 1;
+        // Search backwards for the previous selectable item
+        let testIndex = selectedIndex - 1;
+        while (testIndex >= 0) {
+          if (items[testIndex].type !== 'blank' && items[testIndex].type !== 'info') {
+            selectedIndex = testIndex;
+            await displayMenu();
+            break;
+          }
+          testIndex--;
         }
-        selectedIndex = newIndex;
-        await displayMenu();
       } else if (key.name === 'down') {
-        // Skip blank and info lines when navigating
-        let newIndex = selectedIndex < items.length - 1 ? selectedIndex + 1 : 0;
-        while ((items[newIndex].type === 'blank' || items[newIndex].type === 'info') && newIndex !== selectedIndex) {
-          newIndex = newIndex < items.length - 1 ? newIndex + 1 : 0;
+        // Search forwards for the next selectable item
+        let testIndex = selectedIndex + 1;
+        while (testIndex < items.length) {
+          if (items[testIndex].type !== 'blank' && items[testIndex].type !== 'info') {
+            selectedIndex = testIndex;
+            await displayMenu();
+            break;
+          }
+          testIndex++;
         }
-        selectedIndex = newIndex;
-        await displayMenu();
-
       } else if (key.name === 'return' || key.name === 'right') {
         // Don't allow selecting blank or info lines
         if (items[selectedIndex].type !== 'blank' && items[selectedIndex].type !== 'info') {
@@ -2789,24 +2681,59 @@ async function showProviderManagerMenu() {
   let selectedIndex = 0;
   let dirty = false;
 
-  // Initialize ProviderManager to check rate limits
-  const ProviderManager = require('vibecodingmachine-core/src/ide-integration/provider-manager.cjs');
-  const providerManager = new ProviderManager();
+  const { fetchQuotaForAgent } = require('vibecodingmachine-core/src/quota-management');
 
-  const render = () => {
+  const debugQuota = process.env.VCM_DEBUG_QUOTA === '1' || process.env.VCM_DEBUG_QUOTA === 'true';
+
+  const formatDuration = (ms) => {
+    if (!ms || ms <= 0) return 'now';
+    const totalSeconds = Math.ceil(ms / 1000);
+    const hours = Math.floor(totalSeconds / 3600);
+    const minutes = Math.floor((totalSeconds % 3600) / 60);
+    const seconds = totalSeconds % 60;
+
+    if (hours > 0) return `${hours}h ${minutes}m`;
+    if (minutes > 0) return `${minutes}m ${seconds}s`;
+    return `${seconds}s`;
+  };
+
+  const render = async () => {
     process.stdout.write('\x1Bc');
     console.log(chalk.bold.cyan('⚙ Provider Order & Availability\n'));
+
+    // Fetch quota info
+    const sharedAuth = require('vibecodingmachine-core/src/auth/shared-auth-storage');
+    const autoConfig = await getAutoConfig();
+    const quotaInfo = await sharedAuth.canRunAutoMode();
+    const remaining = Math.max(0, (quotaInfo.maxIterations || 10) - (quotaInfo.todayUsage || 0));
+
+    // Calculate time until reset (midnight)
+    const now = new Date();
+    const tonight = new Date(now);
+    tonight.setHours(24, 0, 0, 0);
+    const msUntilReset = tonight.getTime() - now.getTime();
+    const hoursUntilReset = Math.floor(msUntilReset / (1000 * 60 * 60));
+    const minsUntilReset = Math.floor((msUntilReset % (1000 * 60 * 60)) / (1000 * 60));
+
+    // Display quota as time-based instead of numeric (0/1 or 1/1 format)
+    let quotaDisplay;
+    if (remaining === 0) {
+      // Rate limit active - show when it resets (in red)
+      quotaDisplay = chalk.gray('  Overall Quota: ') + chalk.red(`⏰ Rate limit resets in ${hoursUntilReset}h ${minsUntilReset}m`);
+    } else {
+      // Quota available - show when it resets (in green)
+      quotaDisplay = chalk.gray('  Overall Quota: ') + chalk.green(`✓ Available (${remaining}/${quotaInfo.maxIterations})`) + chalk.gray(' • Resets in ') + chalk.cyan(`${hoursUntilReset}h ${minsUntilReset}m`);
+    }
+    console.log(quotaDisplay);
     console.log(chalk.gray('  ↑/↓ move selection    j/k reorder    e enable    d disable    Space toggle    Enter save/select    Esc cancel\n'));
 
-    order.forEach((id, idx) => {
+    for (let idx = 0; idx < order.length; idx++) {
+      const id = order[idx];
       const def = defMap.get(id);
-      if (!def) return;
+      if (!def) continue;
       const isSelected = idx === selectedIndex;
       const isEnabled = enabled[id] !== false;
 
-      // Check for rate limits
-      const timeUntilReset = providerManager.getTimeUntilReset(id, def.model || id);
-
       // Check for Kiro installation
       let isInstalled = true;
       if (id === 'kiro') {
@@ -2830,50 +2757,53 @@ async function showProviderManagerMenu() {
       const prefix = isSelected ? chalk.cyan('❯') : ' ';
       let line = `${prefix} ${statusEmoji} ${idx + 1}. ${def.name} ${chalk.gray(`(${def.id})`)}  ${typeLabel}`;
 
-      // Add rate limit time if applicable
-      if (timeUntilReset && isEnabled) {
-        // Calculate reset time
-        const now = new Date();
-        const resetTime = new Date(now.getTime() + timeUntilReset);
+      // Fetch and display specific quota for this agent
+      try {
+        // Find the active model for this provider if possible
+        let model = def.defaultModel || id;
+        if (id === 'groq') model = autoConfig.groqModel || model;
+        else if (id === 'anthropic') model = autoConfig.anthropicModel || model;
+        else if (id === 'ollama') {
+          const preferredModel = autoConfig.llmModel && autoConfig.llmModel.includes('ollama/')
+            ? autoConfig.llmModel.split('/')[1]
+            : autoConfig.llmModel || autoConfig.aiderModel;
+          model = (preferredModel && preferredModel !== id) ? preferredModel : model;
+        }
 
-        // Format reset time in human-readable format
-        const timeFormatter = new Intl.DateTimeFormat('en-US', {
-          hour: 'numeric',
-          minute: '2-digit',
-          timeZoneName: 'short'
-        });
-        const timeStr = timeFormatter.format(resetTime);
-
-        // Determine if it's today, tomorrow, or a specific date
-        const today = new Date();
-        today.setHours(0, 0, 0, 0);
-        const resetDate = new Date(resetTime);
-        resetDate.setHours(0, 0, 0, 0);
-        const tomorrow = new Date(today);
-        tomorrow.setDate(tomorrow.getDate() + 1);
-
-        let dateStr = '';
-        if (resetDate.getTime() === today.getTime()) {
-          // Today - just show time
-          dateStr = timeStr;
-        } else if (resetDate.getTime() === tomorrow.getTime()) {
-          // Tomorrow
-          dateStr = `tomorrow, ${timeStr}`;
-        } else {
-          // Specific date - show date and time
-          const dateFormatter = new Intl.DateTimeFormat('en-US', {
-            month: 'short',
-            day: 'numeric',
-            year: 'numeric'
-          });
-          dateStr = `${timeStr} ${dateFormatter.format(resetTime)}`;
+        const agentId = `${id}:${model}`;
+        const quota = await fetchQuotaForAgent(agentId);
+
+        if (debugQuota) {
+          const resetMs = quota?.resetsAt ? (new Date(quota.resetsAt).getTime() - Date.now()) : null;
+          console.error(`[VCM_DEBUG_QUOTA] provider=${id} model=${model} type=${quota?.type} remaining=${quota?.remaining} limit=${quota?.limit} resetsAt=${quota?.resetsAt ? new Date(quota.resetsAt).toISOString() : 'null'} resetIn=${resetMs !== null ? formatDuration(resetMs) : 'null'}`);
         }
 
-        line += ` ${chalk.red('rate limited until ' + dateStr)}`;
+        if (quota.type === 'infinite') {
+          line += ` ${chalk.gray('[Quota: Infinite]')}`;
+        } else if (quota.type === 'rate-limit') {
+          if (quota.isExceeded()) {
+            if (quota.resetsAt) {
+              const msUntilReset = new Date(quota.resetsAt).getTime() - Date.now();
+              line += ` ${chalk.red(`[⏳ resets in ${formatDuration(msUntilReset)}]`)}`;
+            } else {
+              line += ` ${chalk.red('[Rate limited]')}`;
+            }
+          } else {
+            // Show time until rate limit starts (when it resets)
+            if (quota.resetsAt) {
+              const msUntilReset = new Date(quota.resetsAt).getTime() - Date.now();
+              line += ` ${chalk.green(`[✓ available • resets in ${formatDuration(msUntilReset)}]`)}`;
+            } else {
+              line += ` ${chalk.green('[Available]')}`;
+            }
+          }
+        }
+      } catch (e) {
+        // Silently skip if quota fetch fails
       }
 
       console.log(line);
-    });
+    }
 
     console.log();
     if (dirty) {
@@ -2883,7 +2813,12 @@ async function showProviderManagerMenu() {
     }
   };
 
-  return new Promise((resolve) => {
+  if (process.env.VCM_RENDER_ONCE === '1' || process.env.VCM_RENDER_ONCE === 'true') {
+    await render();
+    return;
+  }
+
+  return new Promise(async (resolve) => {
     const cleanup = () => {
       if (process.stdin.isTTY && process.stdin.setRawMode) {
         process.stdin.setRawMode(false);
@@ -2926,15 +2861,15 @@ async function showProviderManagerMenu() {
       resolve(null);
     };
 
-    const moveSelection = (delta) => {
+    const moveSelection = async (delta) => {
       const next = selectedIndex + delta;
       if (next >= 0 && next < order.length) {
         selectedIndex = next;
-        render();
+        await render();
       }
     };
 
-    const reorder = (delta) => {
+    const reorder = async (delta) => {
       const target = selectedIndex + delta;
       if (target < 0 || target >= order.length) return;
       const temp = order[selectedIndex];
@@ -2942,17 +2877,17 @@ async function showProviderManagerMenu() {
       order[target] = temp;
       selectedIndex = target;
       dirty = true;
-      render();
+      await render();
     };
 
-    const toggle = (value) => {
+    const toggle = async (value) => {
       const id = order[selectedIndex];
       enabled[id] = value;
       dirty = true;
-      render();
+      await render();
     };
 
-    const onKeypress = (str, key = {}) => {
+    const onKeypress = async (str, key = {}) => {
       if (key.ctrl && key.name === 'c') {
         cancel();
         return;
@@ -2960,25 +2895,25 @@ async function showProviderManagerMenu() {
 
       switch (key.name) {
         case 'up':
-          moveSelection(-1);
+          await moveSelection(-1);
           break;
         case 'down':
-          moveSelection(1);
+          await moveSelection(1);
           break;
         case 'j':
-          reorder(1);
+          await reorder(1);
           break;
         case 'k':
-          reorder(-1);
+          await reorder(-1);
           break;
         case 'e':
-          toggle(true);
+          await toggle(true);
           break;
         case 'd':
-          toggle(false);
+          await toggle(false);
           break;
         case 'space':
-          toggle(!(enabled[order[selectedIndex]] !== false));
+          await toggle(!(enabled[order[selectedIndex]] !== false));
           break;
         case 'return':
           saveAndExit(order[selectedIndex]);
@@ -3000,11 +2935,11 @@ async function showProviderManagerMenu() {
     process.stdin.on('keypress', onKeypress);
     process.stdin.resume();
 
-    render();
+    await render();
   });
 }
 
-async function showSettings() {
+/* async function showSettings() {
   console.log(chalk.bold.cyan('\n⚙️  Settings\n'));
 
   const { setConfigValue } = require('vibecodingmachine-core');
@@ -3096,7 +3031,7 @@ async function showSettings() {
 async function showCloudSyncMenu() {
   console.clear();
   console.log(chalk.bold.cyan('\n☁️  Cloud Sync Management\n'));
-  
+
   // Check if cloud sync is configured
   try {
     const SyncEngine = require('vibecodingmachine-core/src/sync/sync-engine');
@@ -3110,7 +3045,7 @@ async function showCloudSyncMenu() {
     console.log(chalk.gray('2. Add AWS configuration to your .env file'));
     console.log(chalk.gray('3. Restart vcm\n'));
     console.log(chalk.gray('For more info, see: ') + chalk.cyan('docs/CLOUD_SYNC.md\n'));
-    
+
     console.log(chalk.gray('Press Enter to return to main menu...'));
     await new Promise(resolve => {
       const rl = readline.createInterface({
@@ -3124,10 +3059,10 @@ async function showCloudSyncMenu() {
     });
     return;
   }
-  
+
   const computerCommands = require('../commands/computers');
   const syncCommands = require('../commands/sync');
-  
+
   const choices = [
     { name: '📊 View All Computers', value: 'computers' },
     { name: '🖥️  Manage Another Computer\'s Requirements', value: 'manage-remote' },
@@ -3139,7 +3074,7 @@ async function showCloudSyncMenu() {
     { name: '🎯 Update Focus Area', value: 'update-focus' },
     { name: chalk.gray('← Back to Main Menu'), value: 'back' }
   ];
-  
+
   const { action } = await inquirer.prompt([
     {
       type: 'list',
@@ -3148,7 +3083,7 @@ async function showCloudSyncMenu() {
       choices: choices
     }
   ]);
-  
+
   switch (action) {
     case 'computers':
       try {
@@ -3170,23 +3105,23 @@ async function showCloudSyncMenu() {
       });
       await showCloudSyncMenu();
       break;
-      
+
     case 'manage-remote':
       try {
         // First, get list of computers
         const SyncEngine = require('vibecodingmachine-core/src/sync/sync-engine');
         const { ScanCommand } = require('@aws-sdk/lib-dynamodb');
-        
+
         const syncEngine = new SyncEngine();
         await syncEngine.initialize();
-        
+
         const tableName = 'vibecodingmachine-computers';
         const command = new ScanCommand({ TableName: tableName });
         const response = await syncEngine.dynamoClient.send(command);
         const computers = response.Items || [];
-        
+
         syncEngine.stop();
-        
+
         if (computers.length === 0) {
           console.log(chalk.yellow('\n⚠ No computers registered yet.\n'));
         } else {
@@ -3196,7 +3131,7 @@ async function showCloudSyncMenu() {
             value: c.computerId
           }));
           computerChoices.push({ name: chalk.gray('← Cancel'), value: null });
-          
+
           const { selectedComputer } = await inquirer.prompt([
             {
               type: 'list',
@@ -3205,7 +3140,7 @@ async function showCloudSyncMenu() {
               choices: computerChoices
             }
           ]);
-          
+
           if (selectedComputer) {
             const remoteReqCommands = require('../commands/requirements-remote');
             await remoteReqCommands.manageRemoteRequirements(selectedComputer);
@@ -3216,7 +3151,7 @@ async function showCloudSyncMenu() {
       }
       await showCloudSyncMenu();
       break;
-      
+
     case 'sync-now':
       try {
         await syncCommands.syncNow();
@@ -3236,7 +3171,7 @@ async function showCloudSyncMenu() {
       });
       await showCloudSyncMenu();
       break;
-      
+
     case 'sync-status':
       try {
         await syncCommands.syncStatus();
@@ -3256,7 +3191,7 @@ async function showCloudSyncMenu() {
       });
       await showCloudSyncMenu();
       break;
-      
+
     case 'sync-history':
       try {
         await syncCommands.viewHistory({ limit: 50 });
@@ -3276,7 +3211,7 @@ async function showCloudSyncMenu() {
       });
       await showCloudSyncMenu();
       break;
-      
+
     case 'sync-queue':
       try {
         await syncCommands.viewQueue();
@@ -3296,7 +3231,7 @@ async function showCloudSyncMenu() {
       });
       await showCloudSyncMenu();
       break;
-      
+
     case 'register':
       try {
         const { focusArea } = await inquirer.prompt([
@@ -3324,7 +3259,7 @@ async function showCloudSyncMenu() {
       });
       await showCloudSyncMenu();
       break;
-      
+
     case 'update-focus':
       try {
         const { newFocus } = await inquirer.prompt([
@@ -3353,7 +3288,7 @@ async function showCloudSyncMenu() {
       });
       await showCloudSyncMenu();
       break;
-      
+
     case 'back':
       // Return to main menu
       break;
@@ -3400,6 +3335,11 @@ async function startInteractive() {
 
   await showWelcomeScreen();
 
+  if (process.env.VCM_OPEN_PROVIDER_MENU === '1' || process.env.VCM_OPEN_PROVIDER_MENU === 'true') {
+    await showProviderManagerMenu();
+    return;
+  }
+
   let exit = false;
   let lastSelectedIndex = 0; // Track last selected menu item
   while (!exit) {
@@ -3572,21 +3512,31 @@ async function startInteractive() {
         value: 'setting:hostname'
       });
 
+      // Add Stages configuration
+      const { getStages } = require('./config');
+      const configuredStages = await getStages();
+      const stagesCount = configuredStages.length;
+      items.push({
+        type: 'setting',
+        name: `  └─ Configure Stages: ${chalk.cyan(stagesCount + ' stages')}`,
+        value: 'setting:stages'
+      });
+
       // Cloud Sync Status
       try {
         const SyncEngine = require('vibecodingmachine-core/src/sync/sync-engine');
         const syncEngine = new SyncEngine();
-        
+
         // Try to initialize, but don't fail if AWS not configured
         try {
           await syncEngine.initialize();
           const syncStatus = syncEngine.getStatus();
           syncEngine.stop();
-          
+
           const onlineIcon = syncStatus.isOnline ? chalk.green('●') : chalk.red('●');
           const onlineText = syncStatus.isOnline ? 'Online' : 'Offline';
           const queueText = syncStatus.queuedChanges > 0 ? chalk.yellow(` (${syncStatus.queuedChanges} queued)`) : '';
-          
+
           items.push({
             type: 'setting',
             name: `Cloud Sync: ${onlineIcon} ${onlineText}${queueText}`,
@@ -3739,7 +3689,6 @@ async function startInteractive() {
               const path = require('path');
               const os = require('os');
               const yaml = require('js-yaml');
-              const { spawn } = require('child_process');
               const configPath = path.join(os.homedir(), '.continue', 'config.yaml');
 
               if (fs.existsSync(configPath)) {
@@ -3930,6 +3879,53 @@ async function startInteractive() {
           await showWelcomeScreen();
           break;
         }
+        case 'setting:stages': {
+          // Configure stages
+          const { getStages, setStages, DEFAULT_STAGES } = require('./config');
+          const inquirer = require('inquirer');
+
+          const currentStages = await getStages();
+
+          console.log(chalk.cyan('\n🔨 Configure Workflow Stages\n'));
+          console.log(chalk.gray('Select the stages you want to include in the auto-mode workflow.'));
+          console.log(chalk.gray('Stages will be executed in the order shown.\n'));
+
+          const { selectedStages } = await inquirer.prompt([
+            {
+              type: 'checkbox',
+              name: 'selectedStages',
+              message: 'Select stages:',
+              choices: DEFAULT_STAGES.map(stage => ({
+                name: stage,
+                checked: currentStages.includes(stage)
+              })),
+              validate: (answer) => {
+                if (answer.length < 1) {
+                  return 'You must select at least one stage.';
+                }
+                return true;
+              },
+              loop: false,
+              pageSize: 15
+            }
+          ]);
+
+          // Preserve order from DEFAULT_STAGES for selected items
+          // This ensures stages always run in the correct logical order
+          const newStages = DEFAULT_STAGES.filter(stage => selectedStages.includes(stage));
+
+          await setStages(newStages);
+          console.log(chalk.green('\n✓'), `Stages configuration updated: ${newStages.join(' → ')}\n`);
+
+          const { continue: _ } = await inquirer.prompt([{
+            type: 'input',
+            name: 'continue',
+            message: 'Press Enter to return to menu...'
+          }]);
+
+          await showWelcomeScreen();
+          break;
+        }
         case 'setting:auto-start': {
           try {
             console.log(chalk.bold.cyan('\n🚀 Starting Auto Mode...\n'));
@@ -4116,7 +4112,7 @@ async function startInteractive() {
         case 'repo:init':
           await repo.initRepo();
           break;
-        
+
         case 'computers:list': {
           const computerCommands = require('../commands/computers');
           await computerCommands.listComputers();
@@ -4134,7 +4130,7 @@ async function startInteractive() {
           await showWelcomeScreen();
           break;
         }
-        
+
         case 'sync:now': {
           const syncCommands = require('../commands/sync');
           await syncCommands.syncNow();
@@ -4152,13 +4148,13 @@ async function startInteractive() {
           await showWelcomeScreen();
           break;
         }
-        
+
         case 'setting:cloud-sync': {
           await showCloudSyncMenu();
           await showWelcomeScreen();
           break;
         }
-        
+
         case 'setting:cloud-sync-setup': {
           console.clear();
           console.log(chalk.bold.cyan('\n☁️  Cloud Sync Setup\n'));
@@ -4168,7 +4164,7 @@ async function startInteractive() {
           console.log(chalk.gray('2. Add AWS configuration to your .env file'));
           console.log(chalk.gray('3. Register this computer with: ') + chalk.cyan('vcm computer:register "<focus>"'));
           console.log(chalk.gray('\nFor more info, see: ') + chalk.cyan('docs/CLOUD_SYNC.md\n'));
-          
+
           console.log(chalk.gray('Press Enter to continue...'));
           await new Promise(resolve => {
             const rl = readline.createInterface({