diff --git a/apps/server/src/services/auto-mode-service.ts b/apps/server/src/services/auto-mode-service.ts
index 36ae4a2e..b7095941 100644
--- a/apps/server/src/services/auto-mode-service.ts
+++ b/apps/server/src/services/auto-mode-service.ts
@@ -63,6 +63,11 @@ import {
   validateWorkingDirectory,
 } from '../lib/sdk-options.js';
 import { FeatureLoader } from './feature-loader.js';
+import {
+  ConcurrencyManager,
+  type RunningFeature,
+  type GetCurrentBranchFn,
+} from './concurrency-manager.js';
 import type { SettingsService } from './settings-service.js';
 import { pipelineService, PipelineService } from './pipeline-service.js';
 import {
@@ -341,19 +346,6 @@ interface FeatureWithPlanning extends Feature {
   requirePlanApproval?: boolean;
 }
 
-interface RunningFeature {
-  featureId: string;
-  projectPath: string;
-  worktreePath: string | null;
-  branchName: string | null;
-  abortController: AbortController;
-  isAutoMode: boolean;
-  startTime: number;
-  leaseCount: number;
-  model?: string;
-  provider?: ModelProvider;
-}
-
 interface AutoLoopState {
   projectPath: string;
   maxConcurrency: number;
@@ -429,7 +421,7 @@ const FAILURE_WINDOW_MS = 60000; // Failures within 1 minute count as consecutiv
 
 export class AutoModeService {
   private events: EventEmitter;
-  private runningFeatures = new Map<string, RunningFeature>();
+  private concurrencyManager: ConcurrencyManager;
   private autoLoop: AutoLoopState | null = null;
   private featureLoader = new FeatureLoader();
   // Per-project autoloop state (supports multiple concurrent projects)
@@ -446,15 +438,20 @@ export class AutoModeService {
   // Track if idle event has been emitted (legacy, now per-project in autoLoopsByProject)
   private hasEmittedIdleEvent = false;
 
-  constructor(events: EventEmitter, settingsService?: SettingsService) {
+  constructor(
+    events: EventEmitter,
+    settingsService?: SettingsService,
+    concurrencyManager?: ConcurrencyManager
+  ) {
     this.events = events;
     this.settingsService = settingsService ?? null;
+    // Pass the getCurrentBranch function to ConcurrencyManager for worktree counting
+    this.concurrencyManager = concurrencyManager ?? new ConcurrencyManager(getCurrentBranch);
   }
 
   /**
    * Acquire a slot in the runningFeatures map for a feature.
-   * Implements reference counting via leaseCount to support nested calls
-   * (e.g., resumeFeature -> executeFeature).
+   * Delegates to ConcurrencyManager for lease-based reference counting.
    *
    * @param params.featureId - ID of the feature to track
    * @param params.projectPath - Path to the project
@@ -471,53 +468,18 @@ export class AutoModeService {
     allowReuse?: boolean;
     abortController?: AbortController;
   }): RunningFeature {
-    const existing = this.runningFeatures.get(params.featureId);
-    if (existing) {
-      if (!params.allowReuse) {
-        throw new Error('already running');
-      }
-      existing.leaseCount += 1;
-      return existing;
-    }
-
-    const abortController = params.abortController ?? new AbortController();
-    const entry: RunningFeature = {
-      featureId: params.featureId,
-      projectPath: params.projectPath,
-      worktreePath: null,
-      branchName: null,
-      abortController,
-      isAutoMode: params.isAutoMode,
-      startTime: Date.now(),
-      leaseCount: 1,
-    };
-    this.runningFeatures.set(params.featureId, entry);
-    return entry;
+    return this.concurrencyManager.acquire(params);
   }
 
   /**
    * Release a slot in the runningFeatures map for a feature.
-   * Decrements leaseCount and only removes the entry when it reaches zero,
-   * unless force option is used.
+   * Delegates to ConcurrencyManager for lease-based reference counting.
    *
    * @param featureId - ID of the feature to release
    * @param options.force - If true, immediately removes the entry regardless of leaseCount
    */
   private releaseRunningFeature(featureId: string, options?: { force?: boolean }): void {
-    const entry = this.runningFeatures.get(featureId);
-    if (!entry) {
-      return;
-    }
-
-    if (options?.force) {
-      this.runningFeatures.delete(featureId);
-      return;
-    }
-
-    entry.leaseCount -= 1;
-    if (entry.leaseCount <= 0) {
-      this.runningFeatures.delete(featureId);
-    }
+    this.concurrencyManager.release(featureId, options);
   }
 
   /**
@@ -969,7 +931,7 @@ export class AutoModeService {
 
         // Find a feature not currently running and not yet finished
         const nextFeature = pendingFeatures.find(
-          (f) => !this.runningFeatures.has(f.id) && !this.isFeatureFinished(f)
+          (f) => !this.concurrencyManager.isRunning(f.id) && !this.isFeatureFinished(f)
         );
 
         if (nextFeature) {
@@ -1005,19 +967,15 @@ export class AutoModeService {
 
   /**
    * Get count of running features for a specific project
+   * Delegates to ConcurrencyManager.
    */
   private getRunningCountForProject(projectPath: string): number {
-    let count = 0;
-    for (const [, feature] of this.runningFeatures) {
-      if (feature.projectPath === projectPath) {
-        count++;
-      }
-    }
-    return count;
+    return this.concurrencyManager.getRunningCount(projectPath);
   }
 
   /**
    * Get count of running features for a specific worktree
+   * Delegates to ConcurrencyManager.
    * @param projectPath - The project path
    * @param branchName - The branch name, or null for main worktree (features without branchName or matching primary branch)
    */
@@ -1025,28 +983,7 @@ export class AutoModeService {
     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 (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 {
-        // Feature worktree: exact match
-        if (feature.projectPath === projectPath && featureBranch === branchName) {
-          count++;
-        }
-      }
-    }
-    return count;
+    return this.concurrencyManager.getRunningCountForWorktree(projectPath, branchName);
   }
 
   /**
@@ -1127,9 +1064,10 @@ export class AutoModeService {
     try {
       await ensureAutomakerDir(projectPath);
       const statePath = getExecutionStatePath(projectPath);
-      const runningFeatureIds = Array.from(this.runningFeatures.entries())
-        .filter(([, f]) => f.projectPath === projectPath)
-        .map(([id]) => id);
+      const runningFeatureIds = this.concurrencyManager
+        .getAllRunning()
+        .filter((f) => f.projectPath === projectPath)
+        .map((f) => f.featureId);
 
       const state: ExecutionState = {
         version: 1,
@@ -1210,7 +1148,8 @@ export class AutoModeService {
     ) {
       try {
         // Check if we have capacity
-        if (this.runningFeatures.size >= (this.config?.maxConcurrency || DEFAULT_MAX_CONCURRENCY)) {
+        const totalRunning = this.concurrencyManager.getAllRunning().length;
+        if (totalRunning >= (this.config?.maxConcurrency || DEFAULT_MAX_CONCURRENCY)) {
           await this.sleep(5000);
           continue;
         }
@@ -1220,7 +1159,7 @@ export class AutoModeService {
 
         if (pendingFeatures.length === 0) {
           // Emit idle event only once when backlog is empty AND no features are running
-          const runningCount = this.runningFeatures.size;
+          const runningCount = this.concurrencyManager.getAllRunning().length;
           if (runningCount === 0 && !this.hasEmittedIdleEvent) {
             this.emitAutoModeEvent('auto_mode_idle', {
               message: 'No pending features - auto mode idle',
@@ -1240,7 +1179,7 @@ export class AutoModeService {
         }
 
         // Find a feature not currently running
-        const nextFeature = pendingFeatures.find((f) => !this.runningFeatures.has(f.id));
+        const nextFeature = pendingFeatures.find((f) => !this.concurrencyManager.isRunning(f.id));
 
         if (nextFeature) {
           // Reset idle event flag since we're doing work again
@@ -1292,7 +1231,7 @@ export class AutoModeService {
       });
     }
 
-    return this.runningFeatures.size;
+    return this.concurrencyManager.getAllRunning().length;
   }
 
   /**
@@ -1841,7 +1780,7 @@ Complete the pipeline step instructions above. Review the previous work and appl
    * Stop a specific feature
    */
   async stopFeature(featureId: string): Promise<boolean> {
-    const running = this.runningFeatures.get(featureId);
+    const running = this.concurrencyManager.getRunningFeature(featureId);
     if (!running) {
       return false;
     }
@@ -2840,10 +2779,11 @@ Format your response as a structured markdown document.`;
     runningFeatures: string[];
     runningCount: number;
   } {
+    const allRunning = this.concurrencyManager.getAllRunning();
     return {
-      isRunning: this.runningFeatures.size > 0,
-      runningFeatures: Array.from(this.runningFeatures.keys()),
-      runningCount: this.runningFeatures.size,
+      isRunning: allRunning.length > 0,
+      runningFeatures: allRunning.map((rf) => rf.featureId),
+      runningCount: allRunning.length,
     };
   }
 
@@ -2864,14 +2804,10 @@ Format your response as a structured markdown document.`;
   } {
     const worktreeKey = getWorktreeAutoLoopKey(projectPath, branchName);
     const projectState = this.autoLoopsByProject.get(worktreeKey);
-    const runningFeatures: string[] = [];
-
-    for (const [featureId, feature] of this.runningFeatures) {
-      // Filter by project path AND branchName to get worktree-specific features
-      if (feature.projectPath === projectPath && feature.branchName === branchName) {
-        runningFeatures.push(featureId);
-      }
-    }
+    const runningFeatures = this.concurrencyManager
+      .getAllRunning()
+      .filter((f) => f.projectPath === projectPath && f.branchName === branchName)
+      .map((f) => f.featureId);
 
     return {
       isAutoLoopRunning: projectState?.isRunning ?? false,
@@ -2929,7 +2865,7 @@ Format your response as a structured markdown document.`;
     }>
   > {
     const agents = await Promise.all(
-      Array.from(this.runningFeatures.values()).map(async (rf) => {
+      this.concurrencyManager.getAllRunning().map(async (rf) => {
         // Try to fetch feature data to get title, description, and branchName
         let title: string | undefined;
         let description: string | undefined;
@@ -3350,7 +3286,8 @@ Format your response as a structured markdown document.`;
    * @returns Promise that resolves when all features have been marked as interrupted
    */
   async markAllRunningFeaturesInterrupted(reason?: string): Promise<void> {
-    const runningCount = this.runningFeatures.size;
+    const allRunning = this.concurrencyManager.getAllRunning();
+    const runningCount = allRunning.length;
 
     if (runningCount === 0) {
       logger.info('No running features to mark as interrupted');
@@ -3362,13 +3299,15 @@ Format your response as a structured markdown document.`;
 
     const markPromises: Promise<void>[] = [];
 
-    for (const [featureId, runningFeature] of this.runningFeatures) {
+    for (const runningFeature of allRunning) {
       markPromises.push(
-        this.markFeatureInterrupted(runningFeature.projectPath, featureId, logReason).catch(
-          (error) => {
-            logger.error(`Failed to mark feature ${featureId} as interrupted:`, error);
-          }
-        )
+        this.markFeatureInterrupted(
+          runningFeature.projectPath,
+          runningFeature.featureId,
+          logReason
+        ).catch((error) => {
+          logger.error(`Failed to mark feature ${runningFeature.featureId} as interrupted:`, error);
+        })
       );
     }
 
@@ -3401,7 +3340,7 @@ Format your response as a structured markdown document.`;
    * @returns true if the feature is currently running, false otherwise
    */
   isFeatureRunning(featureId: string): boolean {
-    return this.runningFeatures.has(featureId);
+    return this.concurrencyManager.isRunning(featureId);
   }
 
   /**
@@ -5344,13 +5283,14 @@ This mock response was generated because AUTOMAKER_MOCK_AGENT=true was set.
     try {
       await ensureAutomakerDir(projectPath);
       const statePath = getExecutionStatePath(projectPath);
+      const runningFeatureIds = this.concurrencyManager.getAllRunning().map((rf) => rf.featureId);
       const state: ExecutionState = {
         version: 1,
         autoLoopWasRunning: this.autoLoopRunning,
         maxConcurrency: this.config?.maxConcurrency ?? DEFAULT_MAX_CONCURRENCY,
         projectPath,
         branchName: null, // Legacy global auto mode uses main worktree
-        runningFeatureIds: Array.from(this.runningFeatures.keys()),
+        runningFeatureIds,
         savedAt: new Date().toISOString(),
       };
       await secureFs.writeFile(statePath, JSON.stringify(state, null, 2), 'utf-8');
diff --git a/apps/server/src/services/concurrency-manager.ts b/apps/server/src/services/concurrency-manager.ts
index 8ef80aa3..909727e3 100644
--- a/apps/server/src/services/concurrency-manager.ts
+++ b/apps/server/src/services/concurrency-manager.ts
@@ -13,7 +13,12 @@
  */
 
 import type { ModelProvider } from '@automaker/types';
-import { getCurrentBranch } from '@automaker/git-utils';
+
+/**
+ * Function type for getting the current branch of a project.
+ * Injected to allow for testing and decoupling from git operations.
+ */
+export type GetCurrentBranchFn = (projectPath: string) => Promise<string | null>;
 
 /**
  * Represents a running feature execution with all tracking metadata
@@ -50,6 +55,15 @@ export interface AcquireParams {
  */
 export class ConcurrencyManager {
   private runningFeatures = new Map<string, RunningFeature>();
+  private getCurrentBranch: GetCurrentBranchFn;
+
+  /**
+   * @param getCurrentBranch - Function to get the current branch for a project.
+   *                           If not provided, defaults to returning 'main'.
+   */
+  constructor(getCurrentBranch?: GetCurrentBranchFn) {
+    this.getCurrentBranch = getCurrentBranch ?? (() => Promise.resolve('main'));
+  }
 
   /**
    * Acquire a slot in the runningFeatures map for a feature.
@@ -163,7 +177,7 @@ export class ConcurrencyManager {
     branchName: string | null
   ): Promise<number> {
     // Get the actual primary branch name for the project
-    const primaryBranch = await getCurrentBranch(projectPath);
+    const primaryBranch = await this.getCurrentBranch(projectPath);
 
     let count = 0;
     for (const [, feature] of this.runningFeatures) {
diff --git a/apps/server/tests/unit/services/auto-mode-service.test.ts b/apps/server/tests/unit/services/auto-mode-service.test.ts
index 7f3f9af0..909de21a 100644
--- a/apps/server/tests/unit/services/auto-mode-service.test.ts
+++ b/apps/server/tests/unit/services/auto-mode-service.test.ts
@@ -69,12 +69,16 @@ describe('auto-mode-service.ts', () => {
   });
 
   describe('getRunningAgents', () => {
-    // Helper to access private runningFeatures Map
-    const getRunningFeaturesMap = (svc: AutoModeService) =>
-      (svc as any).runningFeatures as Map<
-        string,
-        { featureId: string; projectPath: string; isAutoMode: boolean }
-      >;
+    // Helper to access private concurrencyManager
+    const getConcurrencyManager = (svc: AutoModeService) => (svc as any).concurrencyManager;
+
+    // Helper to add a running feature via concurrencyManager
+    const addRunningFeature = (
+      svc: AutoModeService,
+      feature: { featureId: string; projectPath: string; isAutoMode: boolean }
+    ) => {
+      getConcurrencyManager(svc).acquire(feature);
+    };
 
     // Helper to get the featureLoader and mock its get method
     const mockFeatureLoaderGet = (svc: AutoModeService, mockFn: ReturnType<typeof vi.fn>) => {
@@ -88,9 +92,8 @@ describe('auto-mode-service.ts', () => {
     });
 
     it('should return running agents with basic info when feature data is not available', async () => {
-      // Arrange: Add a running feature to the Map
-      const runningFeaturesMap = getRunningFeaturesMap(service);
-      runningFeaturesMap.set('feature-123', {
+      // Arrange: Add a running feature via concurrencyManager
+      addRunningFeature(service, {
         featureId: 'feature-123',
         projectPath: '/test/project/path',
         isAutoMode: true,
@@ -117,8 +120,7 @@ describe('auto-mode-service.ts', () => {
 
     it('should return running agents with title and description when feature data is available', async () => {
       // Arrange
-      const runningFeaturesMap = getRunningFeaturesMap(service);
-      runningFeaturesMap.set('feature-456', {
+      addRunningFeature(service, {
         featureId: 'feature-456',
         projectPath: '/home/user/my-project',
         isAutoMode: false,
@@ -152,13 +154,12 @@ describe('auto-mode-service.ts', () => {
 
     it('should handle multiple running agents', async () => {
       // Arrange
-      const runningFeaturesMap = getRunningFeaturesMap(service);
-      runningFeaturesMap.set('feature-1', {
+      addRunningFeature(service, {
         featureId: 'feature-1',
         projectPath: '/project-a',
         isAutoMode: true,
       });
-      runningFeaturesMap.set('feature-2', {
+      addRunningFeature(service, {
         featureId: 'feature-2',
         projectPath: '/project-b',
         isAutoMode: false,
@@ -188,8 +189,7 @@ describe('auto-mode-service.ts', () => {
 
     it('should silently handle errors when fetching feature data', async () => {
       // Arrange
-      const runningFeaturesMap = getRunningFeaturesMap(service);
-      runningFeaturesMap.set('feature-error', {
+      addRunningFeature(service, {
         featureId: 'feature-error',
         projectPath: '/project-error',
         isAutoMode: true,
@@ -215,8 +215,7 @@ describe('auto-mode-service.ts', () => {
 
     it('should handle feature with title but no description', async () => {
       // Arrange
-      const runningFeaturesMap = getRunningFeaturesMap(service);
-      runningFeaturesMap.set('feature-title-only', {
+      addRunningFeature(service, {
         featureId: 'feature-title-only',
         projectPath: '/project',
         isAutoMode: false,
@@ -239,8 +238,7 @@ describe('auto-mode-service.ts', () => {
 
     it('should handle feature with description but no title', async () => {
       // Arrange
-      const runningFeaturesMap = getRunningFeaturesMap(service);
-      runningFeaturesMap.set('feature-desc-only', {
+      addRunningFeature(service, {
         featureId: 'feature-desc-only',
         projectPath: '/project',
         isAutoMode: false,
@@ -263,8 +261,7 @@ describe('auto-mode-service.ts', () => {
 
     it('should extract projectName from nested paths correctly', async () => {
       // Arrange
-      const runningFeaturesMap = getRunningFeaturesMap(service);
-      runningFeaturesMap.set('feature-nested', {
+      addRunningFeature(service, {
         featureId: 'feature-nested',
         projectPath: '/home/user/workspace/projects/my-awesome-project',
         isAutoMode: true,
@@ -282,9 +279,8 @@ describe('auto-mode-service.ts', () => {
 
     it('should fetch feature data in parallel for multiple agents', async () => {
       // Arrange: Add multiple running features
-      const runningFeaturesMap = getRunningFeaturesMap(service);
       for (let i = 1; i <= 5; i++) {
-        runningFeaturesMap.set(`feature-${i}`, {
+        addRunningFeature(service, {
           featureId: `feature-${i}`,
           projectPath: `/project-${i}`,
           isAutoMode: i % 2 === 0,
@@ -581,12 +577,16 @@ describe('auto-mode-service.ts', () => {
   });
 
   describe('markAllRunningFeaturesInterrupted', () => {
-    // Helper to access private runningFeatures Map
-    const getRunningFeaturesMap = (svc: AutoModeService) =>
-      (svc as any).runningFeatures as Map<
-        string,
-        { featureId: string; projectPath: string; isAutoMode: boolean }
-      >;
+    // Helper to access private concurrencyManager
+    const getConcurrencyManager = (svc: AutoModeService) => (svc as any).concurrencyManager;
+
+    // Helper to add a running feature via concurrencyManager
+    const addRunningFeatureForInterrupt = (
+      svc: AutoModeService,
+      feature: { featureId: string; projectPath: string; isAutoMode: boolean }
+    ) => {
+      getConcurrencyManager(svc).acquire(feature);
+    };
 
     // Helper to mock updateFeatureStatus
     const mockUpdateFeatureStatus = (svc: AutoModeService, mockFn: ReturnType<typeof vi.fn>) => {
@@ -608,8 +608,7 @@ describe('auto-mode-service.ts', () => {
     });
 
     it('should mark a single running feature as interrupted', async () => {
-      const runningFeaturesMap = getRunningFeaturesMap(service);
-      runningFeaturesMap.set('feature-1', {
+      addRunningFeatureForInterrupt(service, {
         featureId: 'feature-1',
         projectPath: '/project/path',
         isAutoMode: true,
@@ -626,18 +625,17 @@ describe('auto-mode-service.ts', () => {
     });
 
     it('should mark multiple running features as interrupted', async () => {
-      const runningFeaturesMap = getRunningFeaturesMap(service);
-      runningFeaturesMap.set('feature-1', {
+      addRunningFeatureForInterrupt(service, {
         featureId: 'feature-1',
         projectPath: '/project-a',
         isAutoMode: true,
       });
-      runningFeaturesMap.set('feature-2', {
+      addRunningFeatureForInterrupt(service, {
         featureId: 'feature-2',
         projectPath: '/project-b',
         isAutoMode: false,
       });
-      runningFeaturesMap.set('feature-3', {
+      addRunningFeatureForInterrupt(service, {
         featureId: 'feature-3',
         projectPath: '/project-a',
         isAutoMode: true,
@@ -657,9 +655,8 @@ describe('auto-mode-service.ts', () => {
     });
 
     it('should mark features in parallel', async () => {
-      const runningFeaturesMap = getRunningFeaturesMap(service);
       for (let i = 1; i <= 5; i++) {
-        runningFeaturesMap.set(`feature-${i}`, {
+        addRunningFeatureForInterrupt(service, {
           featureId: `feature-${i}`,
           projectPath: `/project-${i}`,
           isAutoMode: true,
@@ -686,13 +683,12 @@ describe('auto-mode-service.ts', () => {
     });
 
     it('should continue marking other features when one fails', async () => {
-      const runningFeaturesMap = getRunningFeaturesMap(service);
-      runningFeaturesMap.set('feature-1', {
+      addRunningFeatureForInterrupt(service, {
         featureId: 'feature-1',
         projectPath: '/project-a',
         isAutoMode: true,
       });
-      runningFeaturesMap.set('feature-2', {
+      addRunningFeatureForInterrupt(service, {
         featureId: 'feature-2',
         projectPath: '/project-b',
         isAutoMode: false,
@@ -713,8 +709,7 @@ describe('auto-mode-service.ts', () => {
     });
 
     it('should use provided reason in logging', async () => {
-      const runningFeaturesMap = getRunningFeaturesMap(service);
-      runningFeaturesMap.set('feature-1', {
+      addRunningFeatureForInterrupt(service, {
         featureId: 'feature-1',
         projectPath: '/project/path',
         isAutoMode: true,
@@ -731,8 +726,7 @@ describe('auto-mode-service.ts', () => {
     });
 
     it('should use default reason when none provided', async () => {
-      const runningFeaturesMap = getRunningFeaturesMap(service);
-      runningFeaturesMap.set('feature-1', {
+      addRunningFeatureForInterrupt(service, {
         featureId: 'feature-1',
         projectPath: '/project/path',
         isAutoMode: true,
@@ -749,18 +743,17 @@ describe('auto-mode-service.ts', () => {
     });
 
     it('should preserve pipeline statuses for running features', async () => {
-      const runningFeaturesMap = getRunningFeaturesMap(service);
-      runningFeaturesMap.set('feature-1', {
+      addRunningFeatureForInterrupt(service, {
         featureId: 'feature-1',
         projectPath: '/project-a',
         isAutoMode: true,
       });
-      runningFeaturesMap.set('feature-2', {
+      addRunningFeatureForInterrupt(service, {
         featureId: 'feature-2',
         projectPath: '/project-b',
         isAutoMode: false,
       });
-      runningFeaturesMap.set('feature-3', {
+      addRunningFeatureForInterrupt(service, {
         featureId: 'feature-3',
         projectPath: '/project-c',
         isAutoMode: true,
@@ -791,20 +784,23 @@ describe('auto-mode-service.ts', () => {
   });
 
   describe('isFeatureRunning', () => {
-    // Helper to access private runningFeatures Map
-    const getRunningFeaturesMap = (svc: AutoModeService) =>
-      (svc as any).runningFeatures as Map<
-        string,
-        { featureId: string; projectPath: string; isAutoMode: boolean }
-      >;
+    // Helper to access private concurrencyManager
+    const getConcurrencyManager = (svc: AutoModeService) => (svc as any).concurrencyManager;
+
+    // Helper to add a running feature via concurrencyManager
+    const addRunningFeatureForIsRunning = (
+      svc: AutoModeService,
+      feature: { featureId: string; projectPath: string; isAutoMode: boolean }
+    ) => {
+      getConcurrencyManager(svc).acquire(feature);
+    };
 
     it('should return false when no features are running', () => {
       expect(service.isFeatureRunning('feature-123')).toBe(false);
     });
 
     it('should return true when the feature is running', () => {
-      const runningFeaturesMap = getRunningFeaturesMap(service);
-      runningFeaturesMap.set('feature-123', {
+      addRunningFeatureForIsRunning(service, {
         featureId: 'feature-123',
         projectPath: '/project/path',
         isAutoMode: true,
@@ -814,8 +810,7 @@ describe('auto-mode-service.ts', () => {
     });
 
     it('should return false for non-running feature when others are running', () => {
-      const runningFeaturesMap = getRunningFeaturesMap(service);
-      runningFeaturesMap.set('feature-other', {
+      addRunningFeatureForIsRunning(service, {
         featureId: 'feature-other',
         projectPath: '/project/path',
         isAutoMode: true,
@@ -825,13 +820,12 @@ describe('auto-mode-service.ts', () => {
     });
 
     it('should correctly track multiple running features', () => {
-      const runningFeaturesMap = getRunningFeaturesMap(service);
-      runningFeaturesMap.set('feature-1', {
+      addRunningFeatureForIsRunning(service, {
         featureId: 'feature-1',
         projectPath: '/project-a',
         isAutoMode: true,
       });
-      runningFeaturesMap.set('feature-2', {
+      addRunningFeatureForIsRunning(service, {
         featureId: 'feature-2',
         projectPath: '/project-b',
         isAutoMode: false,
diff --git a/apps/server/tests/unit/services/concurrency-manager.test.ts b/apps/server/tests/unit/services/concurrency-manager.test.ts
index 2810120a..465964d0 100644
--- a/apps/server/tests/unit/services/concurrency-manager.test.ts
+++ b/apps/server/tests/unit/services/concurrency-manager.test.ts
@@ -1,22 +1,19 @@
-import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { ConcurrencyManager, type RunningFeature } from '@/services/concurrency-manager.js';
-
-// Mock git-utils to control getCurrentBranch behavior
-vi.mock('@automaker/git-utils', () => ({
-  getCurrentBranch: vi.fn(),
-}));
-
-import { getCurrentBranch } from '@automaker/git-utils';
-const mockGetCurrentBranch = vi.mocked(getCurrentBranch);
+import { describe, it, expect, beforeEach, vi, type Mock } from 'vitest';
+import {
+  ConcurrencyManager,
+  type RunningFeature,
+  type GetCurrentBranchFn,
+} from '@/services/concurrency-manager.js';
 
 describe('ConcurrencyManager', () => {
   let manager: ConcurrencyManager;
+  let mockGetCurrentBranch: Mock<GetCurrentBranchFn>;
 
   beforeEach(() => {
     vi.clearAllMocks();
-    manager = new ConcurrencyManager();
     // Default: primary branch is 'main'
-    mockGetCurrentBranch.mockResolvedValue('main');
+    mockGetCurrentBranch = vi.fn().mockResolvedValue('main');
+    manager = new ConcurrencyManager(mockGetCurrentBranch);
   });
 
   describe('acquire', () => {