sessions: fix TypeError when copilot pickers react to non-copilot sessions (#310353)

roblourens · Copilot · web-flow · commit f58e28cd72b3 · 2026-04-15T17:36:17.000-07:00
* sessions: fix TypeError when copilot pickers react to non-copilot sessions

The copilot-specific pickers (BranchPicker, IsolationPicker, ModePicker,
ModelPicker, PermissionPicker) use autorun observers that react to
activeSession changes. They used getProvider&lt;CopilotChatSessionsProvider&gt;()
which is a compile-time-only generic  at runtime, when a non-Copilotcast
provider's session becomes active, the returned object doesn't have
getSession(), causing a TypeError.

Replace all unsafe generic casts with instanceof CopilotChatSessionsProvider
runtime checks across 6 files, so the pickers safely return undefined for
non-Copilot providers.

(Written by Copilot)

Co-authored-by: Copilot &lt;223556219+Copilot@users.noreply.github.com&gt;

* fix isolationPicker test stub to pass instanceof check

Use Object.create(CopilotChatSessionsProvider.prototype) so the test stub
passes the runtime instanceof guard.

(Written by Copilot)

Co-authored-by: Copilot &lt;223556219+Copilot@users.noreply.github.com&gt;

---------

Co-authored-by: Copilot &lt;223556219+Copilot@users.noreply.github.com&gt;
diff --git a/src/vs/sessions/contrib/copilotChatSessions/browser/branchPicker.ts b/src/vs/sessions/contrib/copilotChatSessions/browser/branchPicker.ts
@@ -41,7 +41,8 @@ export class BranchPicker extends Disposable {
 
 		this._register(autorun(reader => {
 			const session = this.sessionsManagementService.activeSession.read(reader);
-			const providerSession = session ? this.sessionsProvidersService.getProvider<CopilotChatSessionsProvider>(session.providerId)?.getSession(session.sessionId) : undefined;
+			const provider = session ? this.sessionsProvidersService.getProvider(session.providerId) : undefined;
+			const providerSession = provider instanceof CopilotChatSessionsProvider ? provider.getSession(session!.sessionId) : undefined;
 			if (providerSession) {
 				providerSession.loading.read(reader);
 				providerSession.branches.read(reader);
@@ -57,7 +58,8 @@ export class BranchPicker extends Disposable {
 		if (!session) {
 			return undefined;
 		}
-		return this.sessionsProvidersService.getProvider<CopilotChatSessionsProvider>(session.providerId)?.getSession(session.sessionId);
+		const provider = this.sessionsProvidersService.getProvider(session.providerId);
+		return provider instanceof CopilotChatSessionsProvider ? provider.getSession(session.sessionId) : undefined;
 	}
 
 	render(container: HTMLElement): void {
diff --git a/src/vs/sessions/contrib/copilotChatSessions/browser/copilotChatSessionsActions.ts b/src/vs/sessions/contrib/copilotChatSessions/browser/copilotChatSessionsActions.ts
@@ -315,7 +315,8 @@ class CopilotActiveSessionContribution extends Disposable implements IWorkbenchC
 		this._register(autorun((reader: IReader) => {
 			const session = sessionsManagementService.activeSession.read(reader);
 			if (session?.providerId === COPILOT_PROVIDER_ID) {
-				const providerSession = sessionsProvidersService.getProvider<CopilotChatSessionsProvider>(session.providerId)?.getSession(session.sessionId);
+				const provider = sessionsProvidersService.getProvider(session.providerId);
+				const providerSession = provider instanceof CopilotChatSessionsProvider ? provider.getSession(session.sessionId) : undefined;
 				const isLoading = providerSession?.loading.read(reader);
 				hasRepositoryKey.set(!isLoading && !!providerSession?.gitRepository);
 			} else {
diff --git a/src/vs/sessions/contrib/copilotChatSessions/browser/isolationPicker.ts b/src/vs/sessions/contrib/copilotChatSessions/browser/isolationPicker.ts
@@ -66,7 +66,8 @@ export class IsolationPicker extends Disposable {
 		this._register(autorun(reader => {
 			const session = this.sessionsManagementService.activeSession.read(reader);
 			const isLoading = session?.loading.read(reader);
-			const providerSession = session ? this.sessionsProvidersService.getProvider<CopilotChatSessionsProvider>(session.providerId)?.getSession(session.sessionId) : undefined;
+			const provider = session ? this.sessionsProvidersService.getProvider(session.providerId) : undefined;
+			const providerSession = provider instanceof CopilotChatSessionsProvider ? provider.getSession(session!.sessionId) : undefined;
 			if (providerSession) {
 				const gitRepo = providerSession.gitRepository;
 				const repoState = gitRepo?.state?.read?.(reader);
@@ -84,7 +85,8 @@ export class IsolationPicker extends Disposable {
 
 	private _getSessionIsolationMode(): IsolationMode {
 		const session = this.sessionsManagementService.activeSession.get();
-		const providerSession = session ? this.sessionsProvidersService.getProvider<CopilotChatSessionsProvider>(session.providerId)?.getSession(session.sessionId) : undefined;
+		const provider = session ? this.sessionsProvidersService.getProvider(session.providerId) : undefined;
+		const providerSession = provider instanceof CopilotChatSessionsProvider ? provider.getSession(session!.sessionId) : undefined;
 		return providerSession?.isolationMode.get() ?? 'worktree';
 	}
 
@@ -165,7 +167,8 @@ export class IsolationPicker extends Disposable {
 
 	private _setModeOnSession(mode: IsolationMode): void {
 		const session = this.sessionsManagementService.activeSession.get();
-		const providerSession = session ? this.sessionsProvidersService.getProvider<CopilotChatSessionsProvider>(session.providerId)?.getSession(session.sessionId) : undefined;
+		const provider = session ? this.sessionsProvidersService.getProvider(session.providerId) : undefined;
+		const providerSession = provider instanceof CopilotChatSessionsProvider ? provider.getSession(session!.sessionId) : undefined;
 		providerSession?.setIsolationMode(mode);
 	}
 
diff --git a/src/vs/sessions/contrib/copilotChatSessions/browser/modePicker.ts b/src/vs/sessions/contrib/copilotChatSessions/browser/modePicker.ts
@@ -218,7 +218,10 @@ export class ModePicker extends Disposable {
 			return;
 		}
 
-		this.sessionsProvidersService.getProvider<CopilotChatSessionsProvider>(session.providerId)?.getSession(session.sessionId)?.setMode(mode);
+		const provider = this.sessionsProvidersService.getProvider(session.providerId);
+		if (provider instanceof CopilotChatSessionsProvider) {
+			provider.getSession(session.sessionId)?.setMode(mode);
+		}
 	}
 
 	private _updateTriggerLabel(): void {
diff --git a/src/vs/sessions/contrib/copilotChatSessions/browser/modelPicker.ts b/src/vs/sessions/contrib/copilotChatSessions/browser/modelPicker.ts
@@ -58,7 +58,8 @@ export class CloudModelPicker extends Disposable {
 
 		this._register(autorun(reader => {
 			const session = sessionsManagementService.activeSession.read(reader);
-			const providerSession = session ? sessionsProvidersService.getProvider<CopilotChatSessionsProvider>(session.providerId)?.getSession(session.sessionId) : undefined;
+			const provider = session ? sessionsProvidersService.getProvider(session.providerId) : undefined;
+			const providerSession = provider instanceof CopilotChatSessionsProvider ? provider.getSession(session!.sessionId) : undefined;
 			if (providerSession instanceof RemoteNewSession) {
 				this._setSession(providerSession);
 			}
diff --git a/src/vs/sessions/contrib/copilotChatSessions/browser/permissionPicker.ts b/src/vs/sessions/contrib/copilotChatSessions/browser/permissionPicker.ts
@@ -67,7 +67,10 @@ export class PermissionPicker extends Disposable {
 			if (!session) {
 				return;
 			}
-			this.sessionsProvidersService.getProvider<CopilotChatSessionsProvider>(session.providerId)?.getSession(session.sessionId)?.setPermissionLevel(level);
+			const provider = this.sessionsProvidersService.getProvider(session.providerId);
+			if (provider instanceof CopilotChatSessionsProvider) {
+				provider.getSession(session.sessionId)?.setPermissionLevel(level);
+			}
 		}));
 	}
 
diff --git a/src/vs/sessions/contrib/copilotChatSessions/test/browser/isolationPicker.test.ts b/src/vs/sessions/contrib/copilotChatSessions/test/browser/isolationPicker.test.ts
@@ -16,6 +16,7 @@ import { TestInstantiationService } from '../../../../../platform/instantiation/
 import { GitRefType } from '../../../../../workbench/contrib/git/common/gitService.js';
 import { ISessionsProvidersService } from '../../../../services/sessions/browser/sessionsProvidersService.js';
 import { IActiveSession, ISessionsManagementService } from '../../../../services/sessions/common/sessionsManagement.js';
+import { CopilotChatSessionsProvider } from '../../browser/copilotChatSessionsProvider.js';
 import { IsolationMode, IsolationPicker } from '../../browser/isolationPicker.js';
 
 interface IIsolationActionItem {
@@ -49,12 +50,12 @@ function createPicker(
 		workingTreeChanges: [],
 		untrackedChanges: [],
 	});
-	const provider = {
+	const provider = Object.assign(Object.create(CopilotChatSessionsProvider.prototype), {
 		getSession: () => ({
 			gitRepository: { state: gitState },
 			isolationMode,
 		}),
-	};
+	});
 
 	instantiationService.stub(IActionWidgetService, {
 		isVisible: false,

Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,10 @@ export class ModePicker extends Disposable {`
`218`	`218`	`return;`
`219`	`219`	`}`
`220`	`220`
`221`		`- this.sessionsProvidersService.getProvider<CopilotChatSessionsProvider>(session.providerId)?.getSession(session.sessionId)?.setMode(mode);`
	`221`	`+ const provider = this.sessionsProvidersService.getProvider(session.providerId);`
	`222`	`+ if (provider instanceof CopilotChatSessionsProvider) {`
	`223`	`+ provider.getSession(session.sessionId)?.setMode(mode);`
	`224`	`+ }`
`222`	`225`	`}`
`223`	`226`
`224`	`227`	`private _updateTriggerLabel(): void {`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,8 @@ export class CloudModelPicker extends Disposable {`
`58`	`58`
`59`	`59`	`this._register(autorun(reader => {`
`60`	`60`	`const session = sessionsManagementService.activeSession.read(reader);`
`61`		`- const providerSession = session ? sessionsProvidersService.getProvider<CopilotChatSessionsProvider>(session.providerId)?.getSession(session.sessionId) : undefined;`
	`61`	`+ const provider = session ? sessionsProvidersService.getProvider(session.providerId) : undefined;`
	`62`	`+ const providerSession = provider instanceof CopilotChatSessionsProvider ? provider.getSession(session!.sessionId) : undefined;`
`62`	`63`	`if (providerSession instanceof RemoteNewSession) {`
`63`	`64`	`this._setSession(providerSession);`
`64`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,10 @@ export class PermissionPicker extends Disposable {`
`67`	`67`	`if (!session) {`
`68`	`68`	`return;`
`69`	`69`	`}`
`70`		`- this.sessionsProvidersService.getProvider<CopilotChatSessionsProvider>(session.providerId)?.getSession(session.sessionId)?.setPermissionLevel(level);`
	`70`	`+ const provider = this.sessionsProvidersService.getProvider(session.providerId);`
	`71`	`+ if (provider instanceof CopilotChatSessionsProvider) {`
	`72`	`+ provider.getSession(session.sessionId)?.setPermissionLevel(level);`
	`73`	`+ }`
`71`	`74`	`}));`
`72`	`75`	`}`
`73`	`76`