ros/automaker
1
0
Fork 0
mirror of https://github.com/AutoMaker-Org/automaker.git synced 2026-03-22 23:53:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Add conflict source branch detection and fix re-render cascade in BoardView

Browse Source
This commit is contained in:
gsxdsm
2026-03-02 07:20:11 -08:00
committed by gsxdsm
parent 64625f5ccf
commit a2db09d2b4
8 changed files with 158 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
apps/ui/src/components/views/board-view.tsx
View File

@@ -715,15 +715,27 @@ export function BoardView({ initialFeatureId }: BoardViewProps) {
const selectedWorktreeBranch =
currentWorktreeBranch || worktrees.find((w) => w.isMain)?.branch || 'main';
// Aggregate running auto tasks across all worktrees for this project
const autoModeByWorktree = useAppStore((state) => state.autoModeByWorktree);
const runningAutoTasksAllWorktrees = useMemo(() => {
if (!currentProject?.id) return [];
const prefix = `${currentProject.id}::`;
return Object.entries(autoModeByWorktree)
.filter(([key]) => key.startsWith(prefix))
.flatMap(([, state]) => state.runningTasks ?? []);
}, [autoModeByWorktree, currentProject?.id]);
// Aggregate running auto tasks across all worktrees for this project.
// IMPORTANT: Use a derived selector with shallow equality instead of subscribing
// to the raw autoModeByWorktree object. The raw subscription caused the entire
// BoardView to re-render on EVERY auto-mode state change (any worktree), which
// during worktree switches cascaded through DndContext/KanbanBoard and triggered
// React error #185 (maximum update depth exceeded), crashing the board view.
const runningAutoTasksAllWorktrees = useAppStore(
useShallow((state) => {
if (!currentProject?.id) return [] as string[];
const prefix = `${currentProject.id}::`;
const tasks: string[] = [];
for (const [key, worktreeState] of Object.entries(state.autoModeByWorktree)) {
if (key.startsWith(prefix) && worktreeState.runningTasks) {
for (const task of worktreeState.runningTasks) {
tasks.push(task);
}
}
}
return tasks;
})
);
// Get in-progress features for keyboard shortcuts (needed before actions hook)
// Must be after runningAutoTasks is defined
@@ -1506,6 +1518,7 @@ export function BoardView({ initialFeatureId }: BoardViewProps) {
runningAutoTasks: runningAutoTasksAllWorktrees,
persistFeatureUpdate,
handleStartImplementation,
stopFeature: autoMode.stopFeature,
});
// Handle dependency link creation