feat: Add conflict source branch tracking and fix auto-mode subscription cascade

2026-03-22 11:43:07 +00:00 · 2026-03-02 07:43:00 -08:00
parent a2db09d2b4
commit 5c51d70e01
11 changed files with 35 additions and 24 deletions
--- a/apps/ui/src/components/views/board-view.tsx
+++ b/apps/ui/src/components/views/board-view.tsx
@@ -843,6 +843,7 @@ export function BoardView({ initialFeatureId }: BoardViewProps) {
    onWorktreeCreated: () => setWorktreeRefreshKey((k) => k + 1),
    onWorktreeAutoSelect: addAndSelectWorktree,
    currentWorktreeBranch,
+    stopFeature: autoMode.stopFeature,
  });

  // Handler for bulk updating multiple features