vibecodingmachine-cli 2025.12.6-1702 → 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)
@@ -694,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'], {
@@ -708,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',
@@ -741,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;
@@ -893,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
@@ -1017,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) => {
@@ -1064,29 +1075,64 @@ async function start(options) {
           let title = null;
           let status = 'PREPARE';
           let inTodoSection = false;
+          let inCurrentSection = false;
 
           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 we hit another section header, stop looking
-            if (inTodoSection && line.startsWith('##') && !line.startsWith('###')) {
-              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 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;
+            // 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;
               }
             }
           }
@@ -4912,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
 };

package/src/commands/computers.js

@@ -93,7 +93,7 @@ async function listComputers(options = {}) {
 /**
  * Show detailed status of a specific computer
  */
-async function showComputerStatus(computerId, options = {}) {
+async function showComputerStatus(computerId) {
   const syncEngine = new SyncEngine();
   
   try {
@@ -149,7 +149,7 @@ async function showComputerStatus(computerId, options = {}) {
 /**
  * Register current computer with focus area
  */
-async function registerComputer(focusArea, options = {}) {
+async function registerComputer(focusArea) {
   const syncEngine = new SyncEngine();
   
   try {
@@ -185,7 +185,7 @@ async function registerComputer(focusArea, options = {}) {
 /**
  * Update focus area for current computer
  */
-async function updateFocus(newFocusArea, options = {}) {
+async function updateFocus(newFocusArea) {
   const syncEngine = new SyncEngine();
   
   try {
@@ -195,7 +195,7 @@ async function updateFocus(newFocusArea, options = {}) {
     
     if (!computer) {
       console.log(chalk.yellow('\n⚠ Computer not registered. Registering now...\n'));
-      await registerComputer(newFocusArea, options);
+      await registerComputer(newFocusArea);
       return;
     }
     

package/src/commands/repo.js

@@ -4,7 +4,6 @@ const chalk = require('chalk');
 const inquirer = require('inquirer');
 const { getRepoPath, setRepoPath } = require('../utils/config');
 const {
-  checkVibeCodingMachineExists,
   getHostname,
   getRequirementsFilename,
   isComputerNameEnabled

package/src/commands/requirements-remote.js

@@ -6,7 +6,7 @@ const inquirer = require('inquirer');
 /**
  * List requirements for a specific computer
  */
-async function listRemoteRequirements(computerId, options = {}) {
+async function listRemoteRequirements(computerId) {
   try {
     const repoPath = process.cwd();
     const reqFilename = `REQUIREMENTS-${computerId}.md`;
@@ -60,7 +60,7 @@ async function listRemoteRequirements(computerId, options = {}) {
 /**
  * Add a requirement to another computer's requirements file
  */
-async function addRemoteRequirement(computerId, requirementText, options = {}) {
+async function addRemoteRequirement(computerId, requirementText) {
   try {
     const repoPath = process.cwd();
     const reqFilename = `REQUIREMENTS-${computerId}.md`;
@@ -168,7 +168,7 @@ async function manageRemoteRequirements(computerId) {
   ]);
   
   switch (action) {
-    case 'view':
+    case 'view': {
       await listRemoteRequirements(computerId);
       console.log(chalk.gray('Press Enter to continue...'));
       await new Promise(resolve => {
@@ -184,8 +184,9 @@ async function manageRemoteRequirements(computerId) {
       });
       await manageRemoteRequirements(computerId);
       break;
+    }
       
-    case 'add':
+    case 'add': {
       const { requirement } = await inquirer.prompt([
         {
           type: 'input',
@@ -211,8 +212,9 @@ async function manageRemoteRequirements(computerId) {
       }
       await manageRemoteRequirements(computerId);
       break;
+    }
       
-    case 'edit':
+    case 'edit': {
       const repoPath = process.cwd();
       const reqFilename = `REQUIREMENTS-${computerId}.md`;
       const reqPath = path.join(repoPath, '.vibecodingmachine', reqFilename);
@@ -237,9 +239,11 @@ async function manageRemoteRequirements(computerId) {
       }
       await manageRemoteRequirements(computerId);
       break;
+    }
       
-    case 'back':
+    case 'back': {
       break;
+    }
   }
 }
 

package/src/commands/requirements.js

@@ -130,7 +130,7 @@ async function add(name, pkg, description) {
 
     // Find the TODO section
     const todoSectionHeader = '## ⏳ Requirements not yet completed';
-    if (!content.includes(todoSectionHeader)) {
+    if (!content.includes('Requirements not yet completed')) {
       content += '\n\n' + todoSectionHeader + '\n';
     }
 
@@ -142,8 +142,8 @@ async function add(name, pkg, description) {
     for (let i = 0; i < lines.length; i++) {
       newLines.push(lines[i]);
 
-      // Insert right after the TODO section header (new header format)
-      if (!inserted && lines[i].includes(todoSectionHeader)) {
+      // Insert right after the TODO section header
+      if (!inserted && lines[i].startsWith('##') && lines[i].includes('Requirements not yet completed')) {
         // Add requirement header
         newLines.push(`### ${name}`);
 
@@ -338,10 +338,36 @@ async function rename(oldTitle, newTitle, description) {
   }
 }
 
+async function working() {
+  try {
+    const { reqPath } = await getReqPathOrExit();
+    if (!await fs.pathExists(reqPath)) {
+      console.log(chalk.yellow('No REQUIREMENTS.md found.'));
+      return;
+    }
+    const { getCurrentRequirement } = require('vibecodingmachine-core');
+    // Note: Core's getCurrentRequirement returns "Working on: X" or default text.
+    // It assumes process.cwd() or similar. 
+    // But wait, Core's getCurrentRequirement takes 'repoPath'.
+    // And imported from core index.cjs might need repoPath.
+
+    // Let's manually implement it to be safe and use getReqPathOrExit's resolved path
+    // OR use the core helper but pass the correct repo path.
+    const { repoPath } = await getReqPathOrExit();
+    const coreResult = await getCurrentRequirement(repoPath);
+    console.log(chalk.cyan(coreResult));
+
+  } catch (error) {
+    console.error(chalk.red('Error getting working requirement:'), error.message);
+    process.exit(1);
+  }
+}
+
 module.exports = {
   list,
   add,
   current,
+  working,
   next,
   edit,
   watch,

package/src/commands/status.js

@@ -64,7 +64,6 @@ async function progress() {
 
 async function logs(cmd) {
   const lines = parseInt((cmd && cmd.lines) || '50', 10);
-  const repoPath = await getRepoPath();
   const defaultLog = path.join(process.cwd(), 'logs', 'security', 'security-2025-10-29.log');
   const logPath = await fs.pathExists(defaultLog) ? defaultLog : null;
   console.log(chalk.bold('\nRecent Logs'));

package/src/commands/sync.js

@@ -5,7 +5,7 @@ const SyncEngine = require('vibecodingmachine-core/src/sync/sync-engine');
 /**
  * Trigger immediate sync
  */
-async function syncNow(options = {}) {
+async function syncNow() {
   const syncEngine = new SyncEngine();
   
   try {
@@ -52,7 +52,7 @@ async function syncNow(options = {}) {
 /**
  * Show sync status and statistics
  */
-async function syncStatus(options = {}) {
+async function syncStatus() {
   const syncEngine = new SyncEngine();
   
   try {
@@ -117,7 +117,7 @@ async function syncStatus(options = {}) {
 /**
  * View pending changes in offline queue
  */
-async function viewQueue(options = {}) {
+async function viewQueue() {
   const syncEngine = new SyncEngine();
   
   try {
@@ -172,7 +172,7 @@ async function viewQueue(options = {}) {
 /**
  * Force sync even if offline
  */
-async function forceSync(options = {}) {
+async function forceSync() {
   const syncEngine = new SyncEngine();
   
   try {

package/src/utils/agent-selector.js

@@ -0,0 +1,50 @@
+/**
+ * Centralized agent selection logic
+ * Respects provider preferences order and ensures DRY principle
+ */
+
+const { getProviderPreferences } = require('./provider-registry');
+
+/**
+ * Get the effective agent based on provider preferences and options
+ * @param {Object} options - Command line options (may include ide)
+ * @param {Array} providerDefinitions - Array of provider definitions
+ * @param {Map} providerDefinitionMap - Map of provider definitions by ID
+ * @returns {Object} - { effectiveAgent: string, providerDef: Object }
+ */
+async function getEffectiveAgent(options = {}, providerDefinitions, providerDefinitionMap) {
+  const prefs = await getProviderPreferences();
+  
+  // Get all available providers in the order specified in preferences
+  const availableProviders = [];
+  for (const id of prefs.order) {
+    if (prefs.enabled[id] !== false && providerDefinitionMap.has(id)) {
+      availableProviders.push(id);
+    }
+  }
+  
+  // If no providers are available, use the first one from definitions as fallback
+  if (availableProviders.length === 0) {
+    availableProviders.push(providerDefinitions[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 = providerDefinitionMap.get(effectiveAgent);
+  
+  return {
+    effectiveAgent,
+    providerDef,
+    availableProviders
+  };
+}
+
+module.exports = {
+  getEffectiveAgent
+};