vibecodingmachine-core 2026.3.9-907 → 2026.3.10-1548

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

@@ -1,278 +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
-};
+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
+};