src/tui/components/RunApp.tsx (2)

1489-1511: ⚠️ Potential issue | 🟠 Major

handleKeyboard can read a stale conflict selection.

The callback reads conflictSelectedIndex and the new onConflict* props but they aren’t in the dependency list. After navigating conflicts with j/k, pressing a may still accept the original file. Add those dependencies (or move them into refs) to keep the handler fresh.

Suggested fix

-    [displayedTasks, selectedIndex, status, engine, onQuit, viewMode, iterations, iterationSelectedIndex, iterationHistoryLength, onIterationDrillDown, showInterruptDialog, onInterruptConfirm, onInterruptCancel, showHelp, showSettings, showQuitDialog, showKillDialog, showEpicLoader, showRemoteManagement, onStart, storedConfig, onSaveSettings, onLoadEpics, subagentDetailLevel, onSubagentPanelVisibilityChange, currentIteration, maxIterations, renderer, detailsViewMode, subagentPanelVisible, focusedPane, navigateSubagentTree, instanceTabs, selectedTabIndex, onSelectTab, isViewingRemote, displayStatus, instanceManager, isParallelMode, parallelWorkers, parallelConflicts, showConflictPanel, onParallelKill, onParallelPause, onParallelResume, onParallelStart, parallelDerivedStatus]
+    [displayedTasks, selectedIndex, status, engine, onQuit, viewMode, iterations, iterationSelectedIndex, iterationHistoryLength, onIterationDrillDown, showInterruptDialog, onInterruptConfirm, onInterruptCancel, showHelp, showSettings, showQuitDialog, showKillDialog, showEpicLoader, showRemoteManagement, onStart, storedConfig, onSaveSettings, onLoadEpics, subagentDetailLevel, onSubagentPanelVisibilityChange, currentIteration, maxIterations, renderer, detailsViewMode, subagentPanelVisible, focusedPane, navigateSubagentTree, instanceTabs, selectedTabIndex, onSelectTab, isViewingRemote, displayStatus, instanceManager, isParallelMode, parallelWorkers, parallelConflicts, showConflictPanel, conflictSelectedIndex, onConflictAbort, onConflictAccept, onConflictAcceptAll, onParallelKill, onParallelPause, onParallelResume, onParallelStart, parallelDerivedStatus]

Also applies to: 2071-2071

---

1489-1527: ⚠️ Potential issue | 🟠 Major

Move accept-all check before the switch statement to prevent double-invocation on Shift+A.

When user presses Shift+A, the current code executes both the single-accept (case 'a') and accept-all branches because key.name === 'a' remains true whilst key.shift is set. Check for Shift+A upfront using key.sequence === 'A' (consistent with established patterns in this codebase for Shift+letter combinations) and return early to prevent the case statement from being reached.

Suggested fix

      if (showConflictPanel) {
+       const isAcceptAll = key.sequence === 'A' || (key.shift && key.name === 'a');
+       if (isAcceptAll) {
+         onConflictAcceptAll?.();
+         setShowConflictPanel(false);
+         return;
+       }
        switch (key.name) {
          case 'escape':
            // Abort conflict resolution and rollback
            if (onConflictAbort) {
              onConflictAbort().catch(() => {});
            }
            setShowConflictPanel(false);
            break;
          case 'j':
          case 'down':
            setConflictSelectedIndex((prev) => Math.min(prev + 1, parallelConflicts.length - 1));
            break;
          case 'k':
          case 'up':
            setConflictSelectedIndex((prev) => Math.max(prev - 1, 0));
            break;
          case 'a':
            // Accept AI resolution for the selected file
            if (onConflictAccept && parallelConflicts[conflictSelectedIndex]) {
              onConflictAccept(parallelConflicts[conflictSelectedIndex].filePath);
            }
            break;
          case 'r':
            // Reject - abort conflict resolution for this merge
            if (onConflictAbort) {
              onConflictAbort().catch(() => {});
            }
            setShowConflictPanel(false);
            break;
         }
-        // Handle shift+A for Accept All (key.shift is true when shift is held)
-        if (key.shift && key.name === 'a') {
-          if (onConflictAcceptAll) {
-            onConflictAcceptAll();
-          }
-          setShowConflictPanel(false);
-        }
         return;
       }

src/tui/components/RunApp.tsx (1)

1494-1527: ⚠️ Potential issue | 🟡 Minor

Move Shift+A check before the switch statement with an early return to prevent dual callback execution.

When Shift+A is pressed, key.name === 'a' and key.shift === true both match, so the case 'a' block fires (calling onConflictAccept() on the current file), then the if statement below the switch also fires (calling onConflictAcceptAll()). This causes both single-file and accept-all callbacks to execute unintentionally. Detect Shift+A first before entering the switch, and return early to prevent the single-file accept from triggering.

🛠️ Suggested guard

      if (showConflictPanel) {
+       // Handle Shift+A first so it doesn't also trigger single-file accept.
+       if (key.shift && key.name === 'a') {
+         if (onConflictAcceptAll) {
+           onConflictAcceptAll();
+         }
+         setShowConflictPanel(false);
+         return;
+       }
        switch (key.name) {
          case 'escape':
             // Abort conflict resolution and rollback
             if (onConflictAbort) {
               onConflictAbort().catch(() => {});
             }
             setShowConflictPanel(false);
             break;
           case 'j':
           case 'down':
             setConflictSelectedIndex((prev) => Math.min(prev + 1, parallelConflicts.length - 1));
             break;
           case 'k':
           case 'up':
             setConflictSelectedIndex((prev) => Math.max(prev - 1, 0));
             break;
           case 'a':
             // Accept AI resolution for the selected file
             if (onConflictAccept && parallelConflicts[conflictSelectedIndex]) {
               onConflictAccept(parallelConflicts[conflictSelectedIndex].filePath);
             }
             break;
           case 'r':
             // Reject - abort conflict resolution for this merge
             if (onConflictAbort) {
               onConflictAbort().catch(() => {});
             }
             setShowConflictPanel(false);
             break;
         }
-        // Handle shift+A for Accept All (key.shift is true when shift is held)
-        if (key.shift && key.name === 'a') {
-          if (onConflictAcceptAll) {
-            onConflictAcceptAll();
-          }
-          setShowConflictPanel(false);
-        }
         return;
       }