From accaa4d82a7d504dabe6a7b160177be39621c122 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Wed, 1 Apr 2026 08:16:17 +0000
Subject: [PATCH] Sessions - update order for setting the default value for the
 branch picker (#307053)

---
 src/vs/sessions/contrib/chat/browser/branchPicker.ts          | 4 ----
 .../browser/copilotChatSessionsProvider.ts                    | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)
 delete mode 100644 src/vs/sessions/contrib/chat/browser/branchPicker.ts

diff --git a/src/vs/sessions/contrib/chat/browser/branchPicker.ts b/src/vs/sessions/contrib/chat/browser/branchPicker.ts
deleted file mode 100644
index a4a092d8349..00000000000
--- a/src/vs/sessions/contrib/chat/browser/branchPicker.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
diff --git a/src/vs/sessions/contrib/copilotChatSessions/browser/copilotChatSessionsProvider.ts b/src/vs/sessions/contrib/copilotChatSessions/browser/copilotChatSessionsProvider.ts
index 9990b803d50..a2ce751d408 100644
--- a/src/vs/sessions/contrib/copilotChatSessions/browser/copilotChatSessionsProvider.ts
+++ b/src/vs/sessions/contrib/copilotChatSessions/browser/copilotChatSessionsProvider.ts
@@ -235,9 +235,9 @@ export class CopilotCLISession extends Disposable implements ISessionData {
 				.filter((name): name is string => !!name)
 				.filter(name => !name.includes(CopilotCLISession.COPILOT_WORKTREE_PATTERN));
 
-			const defaultBranch = branches.find(b => b === repo.state.get().HEAD?.name)
-				?? branches.find(b => b === 'main')
+			const defaultBranch = branches.find(b => b === 'main')
 				?? branches.find(b => b === 'master')
+				?? branches.find(b => b === repo.state.get().HEAD?.name)
 				?? branches[0];
 
 			this._defaultBranch = defaultBranch;