From a3512f01a6de2002be3348c2db36f6c15962a8e1 Mon Sep 17 00:00:00 2001
From: Tyler James Leonhardt <2644648+TylerLeonhardt@users.noreply.github.com>
Date: Fri, 20 Mar 2026 15:18:17 -0700
Subject: [PATCH] fix: enhance session resolution in sessionSupportsFork method
 (#303624)

ref https://github.com/microsoft/vscode/issues/300501
---
 .../chat/browser/chatSessions/chatSessions.contribution.ts   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatSessions/chatSessions.contribution.ts b/src/vs/workbench/contrib/chat/browser/chatSessions/chatSessions.contribution.ts
index f98c6d170b6..171d6bc3529 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSessions/chatSessions.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSessions/chatSessions.contribution.ts
@@ -1213,8 +1213,9 @@ export class ChatSessionsService extends Disposable implements IChatSessionsServ
 	}
 
 	public sessionSupportsFork(sessionResource: URI): boolean {
-		const resolved = this._resolveResource(sessionResource);
-		const session = this._sessions.get(resolved);
+		const session = this._sessions.get(sessionResource)
+			// Try to resolve in case an alias was used
+			?? this._sessions.get(this._resolveResource(sessionResource));
 		return !!session?.session.forkSession;
 	}