agentHost: Address model restore review feedback (Written by Copilot)

Author: roblourens

src/vs/platform/agentHost/node/copilot/copilotAgent.ts

@@ -166,8 +166,8 @@ export class CopilotAgent extends Disposable implements IAgent {
 		const projectByContext = new Map<string, Promise<IAgentSessionProjectInfo | undefined>>();
 		const result: IAgentSessionMetadata[] = await Promise.all(sessions.map(async s => {
 			const session = AgentSession.uri(this.id, s.sessionId);
-			const metadata = await this._readSessionMetadata(session);
-			let { project, resolved } = await this._readSessionProject(session);
+			const metadata = await this._readStoredSessionMetadata(session);
+			let { project, resolved } = metadata;
 			if (!resolved) {
 				project = await this._resolveSessionProject(s.context, projectLimiter, projectByContext);
 				this._storeSessionProjectResolution(session, project);
@@ -179,7 +179,7 @@ export class CopilotAgent extends Disposable implements IAgent {
 				...(project ? { project } : {}),
 				summary: s.summary,
 				model: metadata.model,
-				workingDirectory: typeof s.context?.cwd === 'string' ? URI.file(s.context.cwd) : undefined,
+				workingDirectory: typeof s.context?.cwd === 'string' ? URI.file(s.context.cwd) : metadata.workingDirectory,
 			};
 		}));
 		this._logService.info(`[Copilot] Found ${result.length} sessions`);
@@ -566,19 +566,21 @@ export class CopilotAgent extends Disposable implements IAgent {
 		}
 	}
 
-	private async _readSessionProject(session: URI): Promise<{ project?: IAgentSessionProjectInfo; resolved: boolean }> {
+	private async _readStoredSessionMetadata(session: URI): Promise<{ model?: string; workingDirectory?: URI; project?: IAgentSessionProjectInfo; resolved: boolean }> {
 		const ref = await this._sessionDataService.tryOpenDatabase(session);
 		if (!ref) {
 			return { resolved: false };
 		}
 		try {
-			const [resolved, uri, displayName] = await Promise.all([
+			const [model, cwd, resolved, uri, displayName] = await Promise.all([
+				ref.object.getMetadata(CopilotAgent._META_MODEL),
+				ref.object.getMetadata(CopilotAgent._META_CWD),
 				ref.object.getMetadata(CopilotAgent._META_PROJECT_RESOLVED),
 				ref.object.getMetadata(CopilotAgent._META_PROJECT_URI),
 				ref.object.getMetadata(CopilotAgent._META_PROJECT_DISPLAY_NAME),
 			]);
 			const project = uri && displayName ? { uri: URI.parse(uri), displayName } : undefined;
-			return { project, resolved: resolved === 'true' || project !== undefined };
+			return { model, workingDirectory: cwd ? URI.parse(cwd) : undefined, project, resolved: resolved === 'true' || project !== undefined };
 		} finally {
 			ref.dispose();
 		}

src/vs/sessions/contrib/copilotChatSessions/browser/copilotChatSessionsActions.ts

@@ -223,7 +223,7 @@ class CopilotPickerActionViewItemContribution extends Disposable implements IWor
 							provider?.setModel(session.sessionId, model.identifier);
 						}
 					},
-					getModels: () => getAvailableModels(languageModelsService, sessionsManagementService),
+					getModels: () => getAvailableModels(languageModelsService, sessionsManagementService.activeSession.get()),
 					useGroupedModelPicker: () => true,
 					showManageModelsAction: () => false,
 					showUnavailableFeatured: () => false,
@@ -237,7 +237,7 @@ class CopilotPickerActionViewItemContribution extends Disposable implements IWor
 				const modelPicker = instantiationService.createInstance(EnhancedModelPickerActionItem, action, delegate, pickerOptions);
 
 				const updatePickerModel = (session: ISession | undefined, sessionModelId: string | undefined) => {
-					const models = getAvailableModels(languageModelsService, sessionsManagementService);
+					const models = getAvailableModels(languageModelsService, session);
 					modelPicker.setEnabled(models.length > 0);
 					currentModel.set(sessionModelId ? models.find(model => model.identifier === sessionModelId) : undefined, undefined);
 				};
@@ -278,9 +278,8 @@ class CopilotPickerActionViewItemContribution extends Disposable implements IWor
 
 function getAvailableModels(
 	languageModelsService: ILanguageModelsService,
-	sessionsManagementService: ISessionsManagementService,
+	session: ISession | undefined,
 ): ILanguageModelChatMetadataAndIdentifier[] {
-	const session = sessionsManagementService.activeSession.get();
 	if (!session) {
 		return [];
 	}

src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionHandler.ts

@@ -368,7 +368,8 @@ export class AgentHostSessionHandler extends Disposable implements IChatSessionC
 				}
 				const sessionState = this._getSessionState(resolvedSession.toString());
 				if (sessionState) {
-					history.push(...turnsToHistory(sessionState.turns, this._config.agentId, this._toLanguageModelId(sessionResource, sessionState.summary.model)));
+					const modelId = this._toLanguageModelId(sessionResource, sessionState.summary.model);
+					history.push(...turnsToHistory(sessionState.turns, this._config.agentId, modelId));
 
 					// Enrich history with inner tool calls from subagent
 					// child sessions. Subscribes to each child session so
@@ -395,6 +396,7 @@ export class AgentHostSessionHandler extends Disposable implements IChatSessionC
 							type: 'request',
 							prompt: sessionState.activeTurn.userMessage.text,
 							participant: this._config.agentId,
+							modelId,
 						});
 						history.push({
 							type: 'response',