feat: enhance auto mode service and UI components for branch handling and verification

- Added a new function to retrieve the current branch name in the auto mode service, improving branch management.
- Updated the `getRunningCountForWorktree` method to utilize the current branch name for accurate feature counting.
- Modified UI components to include a toggle for skipping verification in auto mode, enhancing user control.
- Refactored various hooks and components to ensure consistent handling of branch names across the application.
- Introduced a new utility file for string operations, providing common functions for text manipulation.

apps/server/src/services/auto-mode-service.ts

@@ -74,6 +74,21 @@ import { getNotificationService } from './notification-service.js';
 
 const execAsync = promisify(exec);
 
+/**
+ * Get the current branch name for a git repository
+ * @param projectPath - Path to the git repository
+ * @returns The current branch name, or null if not in a git repo or on detached HEAD
+ */
+async function getCurrentBranch(projectPath: string): Promise<string | null> {
+  try {
+    const { stdout } = await execAsync('git branch --show-current', { cwd: projectPath });
+    const branch = stdout.trim();
+    return branch || null;
+  } catch {
+    return null;
+  }
+}
+
 // PlanningMode type is imported from @automaker/types
 
 interface ParsedTask {
@@ -635,7 +650,7 @@ export class AutoModeService {
       iterationCount++;
       try {
         // Count running features for THIS project/worktree only
-        const projectRunningCount = this.getRunningCountForWorktree(projectPath, branchName);
+        const projectRunningCount = await this.getRunningCountForWorktree(projectPath, branchName);
 
         // Check if we have capacity for this project/worktree
         if (projectRunningCount >= projectState.config.maxConcurrency) {
@@ -728,20 +743,24 @@ export class AutoModeService {
   /**
    * Get count of running features for a specific worktree
    * @param projectPath - The project path
-   * @param branchName - The branch name, or null for main worktree (features without branchName or with "main")
+   * @param branchName - The branch name, or null for main worktree (features without branchName or matching primary branch)
    */
-  private getRunningCountForWorktree(projectPath: string, branchName: string | null): number {
-    const normalizedBranch = branchName === 'main' ? null : branchName;
+  private async getRunningCountForWorktree(
+    projectPath: string,
+    branchName: string | null
+  ): Promise<number> {
+    // Get the actual primary branch name for the project
+    const primaryBranch = await getCurrentBranch(projectPath);
+
     let count = 0;
     for (const [, feature] of this.runningFeatures) {
       // Filter by project path AND branchName to get accurate worktree-specific count
       const featureBranch = feature.branchName ?? null;
-      if (normalizedBranch === null) {
-        // Main worktree: match features with branchName === null OR branchName === "main"
-        if (
-          feature.projectPath === projectPath &&
-          (featureBranch === null || featureBranch === 'main')
-        ) {
+      if (branchName === null) {
+        // Main worktree: match features with branchName === null OR branchName matching primary branch
+        const isPrimaryBranch =
+          featureBranch === null || (primaryBranch && featureBranch === primaryBranch);
+        if (feature.projectPath === projectPath && isPrimaryBranch) {
           count++;
         }
       } else {
@@ -790,7 +809,7 @@ export class AutoModeService {
     // Remove from map
     this.autoLoopsByProject.delete(worktreeKey);
 
-    return this.getRunningCountForWorktree(projectPath, branchName);
+    return await this.getRunningCountForWorktree(projectPath, branchName);
   }
 
   /**
@@ -1025,7 +1044,7 @@ export class AutoModeService {
     const maxAgents = await this.resolveMaxConcurrency(projectPath, branchName);
 
     // Get current running count for this worktree
-    const currentAgents = this.getRunningCountForWorktree(projectPath, branchName);
+    const currentAgents = await this.getRunningCountForWorktree(projectPath, branchName);
 
     return {
       hasCapacity: currentAgents < maxAgents,
@@ -2952,6 +2971,10 @@ Format your response as a structured markdown document.`;
     // Features are stored in .automaker directory
     const featuresDir = getFeaturesDir(projectPath);
 
+    // Get the actual primary branch name for the project (e.g., "main", "master", "develop")
+    // This is needed to correctly match features when branchName is null (main worktree)
+    const primaryBranch = await getCurrentBranch(projectPath);
+
     try {
       const entries = await secureFs.readdir(featuresDir, {
         withFileTypes: true,
@@ -2991,17 +3014,21 @@ Format your response as a structured markdown document.`;
               (feature.planSpec.tasksCompleted ?? 0) < (feature.planSpec.tasksTotal ?? 0))
           ) {
             // Filter by branchName:
-            // - If branchName is null (main worktree), include features with branchName === null OR branchName === "main"
+            // - If branchName is null (main worktree), include features with:
+            //   - branchName === null, OR
+            //   - branchName === primaryBranch (e.g., "main", "master", "develop")
             // - If branchName is set, only include features with matching branchName
             const featureBranch = feature.branchName ?? null;
             if (branchName === null) {
-              // Main worktree: include features without branchName OR with branchName === "main"
-              // This handles both correct (null) and legacy ("main") cases
-              if (featureBranch === null || featureBranch === 'main') {
+              // Main worktree: include features without branchName OR with branchName matching primary branch
+              // This handles repos where the primary branch is named something other than "main"
+              const isPrimaryBranch =
+                featureBranch === null || (primaryBranch && featureBranch === primaryBranch);
+              if (isPrimaryBranch) {
                 pendingFeatures.push(feature);
               } else {
                 logger.debug(
-                  `[loadPendingFeatures] Filtering out feature ${feature.id} (branchName: ${featureBranch}) for main worktree`
+                  `[loadPendingFeatures] Filtering out feature ${feature.id} (branchName: ${featureBranch}, primaryBranch: ${primaryBranch}) for main worktree`
                 );
               }
             } else {