vibecodingmachine-core 2025.12.25-1541 → 2026.1.3-2209

package/src/utils/git-branch-manager.js

@@ -0,0 +1,278 @@
+const { execSync } = require('child_process');
+const path = require('path');
+const { createBranchName, extractRequirementNumber } = require('../requirement-numbering');
+
+/**
+ * Check if a directory is a git repository
+ * @param {string} repoPath - Path to check
+ * @returns {boolean} True if it's a git repo
+ */
+function isGitRepo(repoPath) {
+  try {
+    execSync('git rev-parse --git-dir', {
+      cwd: repoPath,
+      stdio: 'ignore'
+    });
+    return true;
+  } catch (error) {
+    return false;
+  }
+}
+
+/**
+ * Get current git branch name
+ * @param {string} repoPath - Path to repository
+ * @returns {string|null} Current branch name or null
+ */
+function getCurrentBranch(repoPath) {
+  try {
+    const branch = execSync('git rev-parse --abbrev-ref HEAD', {
+      cwd: repoPath,
+      encoding: 'utf8'
+    }).trim();
+    return branch;
+  } catch (error) {
+    return null;
+  }
+}
+
+/**
+ * Create a feature branch for a requirement
+ * @param {string} repoPath - Path to repository
+ * @param {string} requirementTitle - Full requirement title (e.g., "R1: Email System")
+ * @returns {Promise<{success: boolean, branchName: string|null, parentBranch: string|null, error: string|null}>}
+ */
+async function createRequirementBranch(repoPath, requirementTitle) {
+  try {
+    if (!isGitRepo(repoPath)) {
+      return {
+        success: false,
+        branchName: null,
+        parentBranch: null,
+        error: 'Not a git repository'
+      };
+    }
+
+    // Extract requirement number from title
+    const reqNumber = extractRequirementNumber(requirementTitle);
+    if (!reqNumber) {
+      return {
+        success: false,
+        branchName: null,
+        parentBranch: null,
+        error: 'Requirement number not found in title'
+      };
+    }
+
+    // Get parent branch (current branch before creating new one)
+    const parentBranch = getCurrentBranch(repoPath);
+    if (!parentBranch) {
+      return {
+        success: false,
+        branchName: null,
+        parentBranch: null,
+        error: 'Could not determine current branch'
+      };
+    }
+
+    // Create branch name
+    const branchName = createBranchName(reqNumber, requirementTitle);
+
+    // Check if branch already exists
+    try {
+      execSync(`git rev-parse --verify ${branchName}`, {
+        cwd: repoPath,
+        stdio: 'ignore'
+      });
+
+      // Branch exists, check it out
+      execSync(`git checkout ${branchName}`, {
+        cwd: repoPath,
+        stdio: 'ignore'
+      });
+
+      return {
+        success: true,
+        branchName,
+        parentBranch,
+        error: null,
+        alreadyExists: true
+      };
+    } catch (error) {
+      // Branch doesn't exist, create it
+      execSync(`git checkout -b ${branchName}`, {
+        cwd: repoPath,
+        stdio: 'ignore'
+      });
+
+      return {
+        success: true,
+        branchName,
+        parentBranch,
+        error: null,
+        alreadyExists: false
+      };
+    }
+  } catch (error) {
+    return {
+      success: false,
+      branchName: null,
+      parentBranch: null,
+      error: error.message
+    };
+  }
+}
+
+/**
+ * Merge a requirement branch back to parent and delete it
+ * @param {string} repoPath - Path to repository
+ * @param {string} requirementTitle - Full requirement title
+ * @param {string} parentBranch - Parent branch to merge into
+ * @returns {Promise<{success: boolean, error: string|null}>}
+ */
+async function mergeRequirementBranch(repoPath, requirementTitle, parentBranch = 'main') {
+  try {
+    if (!isGitRepo(repoPath)) {
+      return { success: false, error: 'Not a git repository' };
+    }
+
+    // Extract requirement number
+    const reqNumber = extractRequirementNumber(requirementTitle);
+    if (!reqNumber) {
+      return { success: false, error: 'Requirement number not found in title' };
+    }
+
+    // Create branch name
+    const branchName = createBranchName(reqNumber, requirementTitle);
+
+    // Checkout parent branch
+    execSync(`git checkout ${parentBranch}`, {
+      cwd: repoPath,
+      stdio: 'ignore'
+    });
+
+    // Merge the feature branch
+    execSync(`git merge --no-ff ${branchName} -m "Merge ${branchName}"`, {
+      cwd: repoPath,
+      stdio: 'ignore'
+    });
+
+    // Delete the feature branch
+    execSync(`git branch -d ${branchName}`, {
+      cwd: repoPath,
+      stdio: 'ignore'
+    });
+
+    return { success: true, error: null };
+  } catch (error) {
+    return { success: false, error: error.message };
+  }
+}
+
+/**
+ * Remove a feature by reverting its merge commit
+ * @param {string} repoPath - Path to repository
+ * @param {string} requirementTitle - Full requirement title
+ * @returns {Promise<{success: boolean, error: string|null}>}
+ */
+async function removeRequirementFeature(repoPath, requirementTitle) {
+  try {
+    if (!isGitRepo(repoPath)) {
+      return { success: false, error: 'Not a git repository' };
+    }
+
+    // Extract requirement number
+    const reqNumber = extractRequirementNumber(requirementTitle);
+    if (!reqNumber) {
+      return { success: false, error: 'Requirement number not found in title' };
+    }
+
+    // Create branch name to search for
+    const branchName = createBranchName(reqNumber, requirementTitle);
+
+    // Find the merge commit for this branch
+    const mergeCommit = execSync(
+      `git log --grep="Merge ${branchName}" --oneline --format="%H" -1`,
+      {
+        cwd: repoPath,
+        encoding: 'utf8'
+      }
+    ).trim();
+
+    if (!mergeCommit) {
+      return { success: false, error: 'Merge commit not found for this requirement' };
+    }
+
+    // Revert the merge commit
+    execSync(`git revert -m 1 ${mergeCommit} --no-edit`, {
+      cwd: repoPath,
+      stdio: 'ignore'
+    });
+
+    return { success: true, error: null };
+  } catch (error) {
+    return { success: false, error: error.message };
+  }
+}
+
+/**
+ * Get list of all requirement branches
+ * @param {string} repoPath - Path to repository
+ * @returns {Array<{branchName: string, reqNumber: number}>}
+ */
+function listRequirementBranches(repoPath) {
+  try {
+    if (!isGitRepo(repoPath)) {
+      return [];
+    }
+
+    const branches = execSync('git branch --list "R*"', {
+      cwd: repoPath,
+      encoding: 'utf8'
+    });
+
+    return branches
+      .split('\n')
+      .map(b => b.trim().replace(/^\*\s*/, ''))
+      .filter(b => b && b.startsWith('R'))
+      .map(b => {
+        const match = b.match(/^R(\d+)/);
+        return {
+          branchName: b,
+          reqNumber: match ? parseInt(match[1], 10) : 0
+        };
+      })
+      .filter(b => b.reqNumber > 0)
+      .sort((a, b) => a.reqNumber - b.reqNumber);
+  } catch (error) {
+    return [];
+  }
+}
+
+/**
+ * Check if there are any uncommitted changes in the repository
+ * @param {string} repoPath - Path to repository
+ * @returns {boolean} True if there are uncommitted changes
+ */
+function hasUncommittedChanges(repoPath) {
+  try {
+    // Check for staged and unstaged changes
+    const status = execSync('git status --porcelain', {
+      cwd: repoPath,
+      encoding: 'utf8'
+    }).trim();
+    return status.length > 0;
+  } catch (error) {
+    return false;
+  }
+}
+
+module.exports = {
+  isGitRepo,
+  getCurrentBranch,
+  hasUncommittedChanges,
+  createRequirementBranch,
+  mergeRequirementBranch,
+  removeRequirementFeature,
+  listRequirementBranches
+};

package/src/utils/requirement-helpers.js

@@ -514,8 +514,17 @@ async function loadVerifiedFromChangelog(repoPath) {
     for (const line of lines) {
       const trimmed = line.trim();
 
+      if (trimmed.includes('## Verified Requirements')) {
+        inVerifiedSection = true;
+        continue;
+      }
+
+      if (inVerifiedSection && trimmed.startsWith('##') && !trimmed.includes('Verified Requirements')) {
+        break;
+      }
+
       // Collect items starting with "- " as verified requirements
-      if (trimmed.startsWith('- ') && trimmed.length > 5) {
+      if (inVerifiedSection && trimmed.startsWith('- ') && trimmed.length > 5) {
         let reqText = trimmed.substring(2);
         // Extract title part (before timestamp in parentheses if present)
         const titleMatch = reqText.match(/^(.+?)\s*\([\d-]+\)$/);

package/src/utils/requirements-parser.js

@@ -112,9 +112,11 @@ function parseRequirementsFile(content) {
       }
 
       const details = [];
+      const questions = [];
       let package = null;
       let options = null;
       let optionsType = null;
+      let currentQuestion = null;
 
       // Read package, description, and options
       for (let j = i + 1; j < lines.length; j++) {
@@ -140,18 +142,41 @@ function parseRequirementsFile(content) {
             options = [optionsText];
           }
         }
+        // Check for QUESTIONS line (pipe-separated)
+        else if (nextLine.startsWith('QUESTIONS:')) {
+          const questionsText = nextLine.replace(/^QUESTIONS:\s*/, '').trim();
+          const parsedQuestions = questionsText.split('|').map(q => q.trim()).filter(Boolean);
+          for (const q of parsedQuestions) {
+            questions.push({ question: q, response: null });
+          }
+        }
+        // Parse numbered questions/responses in needInformation section (CLI-style)
+        else if (currentSection === 'needInformation' && nextLine.match(/^\d+\./)) {
+          if (currentQuestion) {
+            questions.push(currentQuestion);
+          }
+          currentQuestion = { question: nextLine, response: null };
+        }
+        else if (currentSection === 'needInformation' && currentQuestion && nextLine.startsWith('Response:')) {
+          currentQuestion.response = nextLine.replace(/^Response:\s*/, '').trim();
+        }
         // Description line (include all lines including empty ones to preserve formatting)
         else if (nextLine !== undefined) {
           details.push(nextLine);
         }
       }
 
+      if (currentQuestion) {
+        questions.push(currentQuestion);
+      }
+
       const requirement = {
         title,
         description: details.join('\n'),
         package,
         options,
         optionsType,
+        questions: currentSection === 'needInformation' ? questions : undefined,
         lineIndex: i
       };