fix microsoft#264496 (microsoft#264801)

Author: joshspicer

src/vs/workbench/contrib/chat/browser/chatEditor.ts

@@ -6,7 +6,6 @@
 import * as dom from '../../../../base/browser/dom.js';
 import { raceCancellationError } from '../../../../base/common/async.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
-import { Schemas } from '../../../../base/common/network.js';
 import { IContextKeyService, IScopedContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IEditorOptions } from '../../../../platform/editor/common/editor.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -24,16 +23,15 @@ import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { IChatModel, IExportableChatData, ISerializableChatData } from '../common/chatModel.js';
 import { CHAT_PROVIDER_ID } from '../common/chatParticipantContribTypes.js';
 import { IChatSessionsService } from '../common/chatSessionsService.js';
-import { ChatSessionUri } from '../common/chatUri.js';
 import { ChatAgentLocation, ChatModeKind } from '../common/constants.js';
 import { clearChatEditor } from './actions/chatClear.js';
 import { ChatEditorInput } from './chatEditorInput.js';
+import { getChatSessionType } from './chatSessions/common.js';
 import { ChatWidget, IChatViewState } from './chatWidget.js';
 
 export interface IChatEditorOptions extends IEditorOptions {
 	target?: { sessionId: string } | { data: IExportableChatData | ISerializableChatData };
 	preferredTitle?: string;
-	chatSessionType?: string;
 	ignoreInView?: boolean;
 }
 
@@ -138,18 +136,14 @@ export class ChatEditor extends EditorPane {
 		}
 
 		let isContributedChatSession = false;
-		if (options?.chatSessionType || input.resource.scheme === Schemas.vscodeChatSession) {
-			const chatSessionType = options?.chatSessionType ?? ChatSessionUri.parse(input.resource)?.chatSessionType;
-			if (chatSessionType) {
-				await raceCancellationError(this.chatSessionsService.canResolveContentProvider(chatSessionType), token);
-				const contributions = this.chatSessionsService.getAllChatSessionContributions();
-				const contribution = contributions.find(c => c.type === chatSessionType);
-				if (contribution) {
-					this.widget.lockToCodingAgent(contribution.name, contribution.displayName, contribution.type);
-					isContributedChatSession = true;
-				} else {
-					this.widget.unlockFromCodingAgent();
-				}
+		const chatSessionType = getChatSessionType(input);
+		if (chatSessionType !== 'local') {
+			await raceCancellationError(this.chatSessionsService.canResolveContentProvider(chatSessionType), token);
+			const contributions = this.chatSessionsService.getAllChatSessionContributions();
+			const contribution = contributions.find(c => c.type === chatSessionType);
+			if (contribution) {
+				this.widget.lockToCodingAgent(contribution.name, contribution.displayName, contribution.type);
+				isContributedChatSession = true;
 			} else {
 				this.widget.unlockFromCodingAgent();
 			}

src/vs/workbench/contrib/chat/browser/chatSessions.contribution.ts

@@ -274,10 +274,9 @@ export class ChatSessionsService extends Disposable implements IChatSessionsServ
 					const options: IChatEditorOptions = {
 						override: ChatEditorInput.EditorID,
 						pinned: true,
-						chatSessionType: type, // This will 'lock' the UI of the new, unattached editor to our chat session type
 					};
 					await editorService.openEditor({
-						resource: ChatEditorInput.getNewEditorUri(),
+						resource: ChatEditorInput.getNewEditorUri().with({ query: `chatSessionType=${type}` }),
 						options,
 					});
 				} catch (e) {

src/vs/workbench/contrib/chat/browser/chatSessions/chatSessionTracker.ts

@@ -9,8 +9,7 @@ import { GroupModelChangeKind } from '../../../../common/editor.js';
 import { IEditorGroup, IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.js';
 import { ChatEditorInput } from '../chatEditorInput.js';
 import { EditorInput } from '../../../../common/editor/editorInput.js';
-import { ChatSessionUri } from '../../common/chatUri.js';
-import { ChatSessionItemWithProvider, isChatSession } from './common.js';
+import { ChatSessionItemWithProvider, getChatSessionType, isChatSession } from './common.js';
 import { ChatSessionStatus, IChatSessionItem, IChatSessionItemProvider } from '../../common/chatSessionsService.js';
 import { ILocalChatSessionItem } from '../chatSessions.js';
 import { IChatService } from '../../common/chatService.js';
@@ -48,34 +47,19 @@ export class ChatSessionTracker extends Disposable {
 			}
 
 			const editor = e.editor as ChatEditorInput;
-			const sessionType = this.getChatSessionType(editor);
+			const sessionType = getChatSessionType(editor);
 
 			// Emit targeted event for this session type
 			this._onDidChangeEditors.fire({ sessionType, kind: e.kind });
 		}));
 	}
 
-	private getChatSessionType(editor: ChatEditorInput): string {
-		if (editor.options.chatSessionType) {
-			return editor.options.chatSessionType;
-		}
-
-		if (editor.resource?.scheme === 'vscode-chat-session') {
-			const parsed = ChatSessionUri.parse(editor.resource);
-			if (parsed) {
-				return parsed.chatSessionType;
-			}
-		}
-
-		return 'local';
-	}
-
 	public getLocalEditorsForSessionType(sessionType: string): ChatEditorInput[] {
 		const localEditors: ChatEditorInput[] = [];
 
 		this.editorGroupsService.groups.forEach(group => {
 			group.editors.forEach(editor => {
-				if (editor instanceof ChatEditorInput && this.getChatSessionType(editor) === sessionType) {
+				if (editor instanceof ChatEditorInput && getChatSessionType(editor) === sessionType) {
 					localEditors.push(editor);
 				}
 			});

src/vs/workbench/contrib/chat/browser/chatSessions/common.ts

@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { Schemas } from '../../../../../base/common/network.js';
 import { EditorInput } from '../../../../common/editor/editorInput.js';
 import { IChatSessionItem, IChatSessionItemProvider } from '../../common/chatSessionsService.js';
 import { ChatSessionUri } from '../../common/chatUri.js';
@@ -34,20 +35,28 @@ export function isChatSession(editor?: EditorInput): boolean {
 	return true;
 }
 
+/**
+ * Returns chat session type from a URI, or 'local' if not specified or cannot be determined.
+ */
 export function getChatSessionType(editor: ChatEditorInput): string {
-	// Check if the editor has an explicit chatSessionType in options
-	if (editor.options.chatSessionType) {
-		return editor.options.chatSessionType;
+	if (!editor.resource) {
+		return 'local';
 	}
 
-	// For vscode-chat-session URIs, extract from authority
-	if (editor.resource?.scheme === 'vscode-chat-session') {
+	const { scheme, query } = editor.resource;
+
+	if (scheme === Schemas.vscodeChatSession) {
 		const parsed = ChatSessionUri.parse(editor.resource);
 		if (parsed) {
 			return parsed.chatSessionType;
 		}
 	}
 
+	const sessionTypeFromQuery = new URLSearchParams(query).get('chatSessionType');
+	if (sessionTypeFromQuery) {
+		return sessionTypeFromQuery;
+	}
+
 	// Default to 'local' for vscode-chat-editor scheme or when type cannot be determined
 	return 'local';
 }