fix(chatsessions): handle incorrect option groups being sent in request handler (#309982)

Author: DonJayamanne

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

@@ -1036,7 +1036,7 @@ export class ChatSessionsService extends Disposable implements IChatSessionsServ
 		}
 
 		let session: IChatSession;
-		const newSessionOptionGroups = await this.getNewChatSessionInputState(resolvedType);
+		const newSessionOptionGroups = isUntitledChatSession(sessionResource) ? await this.getNewChatSessionInputState(resolvedType) : undefined;
 		if (isUntitledChatSession(sessionResource) && newSessionOptionGroups) {
 			const options: ChatSessionOptionsMap = new Map();
 			for (const group of newSessionOptionGroups) {

src/vs/workbench/contrib/chat/common/chatService/chatServiceImpl.ts

@@ -878,14 +878,15 @@ export class ChatService extends Disposable implements IChatService {
 
 				const newItem = await this.chatSessionService.createNewChatSessionItem(getChatSessionType(sessionResource), { prompt: requestText, command: commandPart?.text, initialSessionOptions }, CancellationToken.None);
 				if (newItem) {
+					// Register alias so session-option lookups work with the new resource
+					this.chatSessionService.registerSessionResourceAlias(sessionResource, newItem.resource);
+
 					tempRef = await this.loadRemoteSession(newItem.resource, model.initialLocation, CancellationToken.None);
 					model = tempRef?.object as ChatModel | undefined;
 					if (!model) {
 						throw new Error(`Failed to load session for resource: ${newItem.resource}`);
 					}
 
-					// Register alias so session-option lookups work with the new resource
-					this.chatSessionService.registerSessionResourceAlias(sessionResource, newItem.resource);
 
 					// Update the new model's contributed session with initialSessionOptions
 					// so that the agent receives them when invoked.