From b10501ea79fc7d9e4b3ebafff724eee51d9e749b Mon Sep 17 00:00:00 2001 From: Noam Loewenstern Date: Fri, 30 Jan 2026 02:44:51 +0200 Subject: [PATCH 1/2] fix(ui): handle null selectedWorktree in max concurrency handler --- apps/ui/src/components/views/board-view.tsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/ui/src/components/views/board-view.tsx b/apps/ui/src/components/views/board-view.tsx index 2624514a3..64c4d287b 100644 --- a/apps/ui/src/components/views/board-view.tsx +++ b/apps/ui/src/components/views/board-view.tsx @@ -1274,8 +1274,11 @@ export function BoardView() { maxConcurrency={maxConcurrency} runningAgentsCount={runningAutoTasks.length} onConcurrencyChange={(newMaxConcurrency) => { - if (currentProject && selectedWorktree) { - const branchName = selectedWorktree.isMain ? null : selectedWorktree.branch; + if (currentProject) { + // If selectedWorktree is undefined, fallback to null (main/primary worktree) + // Use null for the main worktree, otherwise use the branch name; also null if no worktree selected + const branchName = + selectedWorktree && !selectedWorktree.isMain ? selectedWorktree.branch : null; setMaxConcurrencyForWorktree(currentProject.id, branchName, newMaxConcurrency); // Also update backend if auto mode is running if (autoMode.isRunning) { From 07f777da2241bfc6bda932c5a60594e365c56d3f Mon Sep 17 00:00:00 2001 From: Noam Loewenstern Date: Fri, 30 Jan 2026 02:52:27 +0200 Subject: [PATCH 2/2] Update apps/ui/src/components/views/board-view.tsx Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --- apps/ui/src/components/views/board-view.tsx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/ui/src/components/views/board-view.tsx b/apps/ui/src/components/views/board-view.tsx index 64c4d287b..48d068a1e 100644 --- a/apps/ui/src/components/views/board-view.tsx +++ b/apps/ui/src/components/views/board-view.tsx @@ -1275,10 +1275,9 @@ export function BoardView() { runningAgentsCount={runningAutoTasks.length} onConcurrencyChange={(newMaxConcurrency) => { if (currentProject) { - // If selectedWorktree is undefined, fallback to null (main/primary worktree) - // Use null for the main worktree, otherwise use the branch name; also null if no worktree selected - const branchName = - selectedWorktree && !selectedWorktree.isMain ? selectedWorktree.branch : null; + // If selectedWorktree is undefined or it's the main worktree, branchName will be null. + // Otherwise, use the branch name. + const branchName = selectedWorktree?.isMain === false ? selectedWorktree.branch : null; setMaxConcurrencyForWorktree(currentProject.id, branchName, newMaxConcurrency); // Also update backend if auto mode is running if (autoMode.isRunning) {