[Cherry-pick] Remove last-used session type and agent logic (#323484) (#324826)

* cherry-pick b802a62

* signing commit

* Fix test

* Revert PR #324669

* Revert "Revert PR #324669"

This reverts commit d97c4e5.

* Preserve explicit local chat session branch

* Remove IStorageService

---------

Co-authored-by: Don Jayamanne <don.jayamanne@outlook.com>

Author: benvillalobos

src/vs/workbench/contrib/chat/browser/widget/chatWidgetService.ts

@@ -11,14 +11,11 @@ import { isEqual } from '../../../../../base/common/resources.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { ILayoutService } from '../../../../../platform/layout/browser/layoutService.js';
 import { ILogService } from '../../../../../platform/log/common/log.js';
-import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
 import { ACTIVE_GROUP, IEditorService, type PreferredGroup } from '../../../../services/editor/common/editorService.js';
 import { IEditorGroup, IEditorGroupsService, isEditorGroup } from '../../../../services/editor/common/editorGroupsService.js';
 import { IViewsService } from '../../../../services/views/common/viewsService.js';
 import { IChatService } from '../../common/chatService/chatService.js';
-import { localChatSessionType } from '../../common/chatSessionsService.js';
-import { ChatAgentLocation, ChatLastUsedEditorSessionTypeStorageKey } from '../../common/constants.js';
-import { getChatSessionType } from '../../common/model/chatUri.js';
+import { ChatAgentLocation } from '../../common/constants.js';
 import { ChatViewId, ChatViewPaneTarget, IChatWidget, IChatWidgetService, IQuickChatService, isIChatViewViewContext } from '../chat.js';
 import { ChatEditor, IChatEditorOptions } from '../widgetHosts/editor/chatEditor.js';
 import { ChatEditorInput } from '../widgetHosts/editor/chatEditorInput.js';
@@ -51,7 +48,6 @@ export class ChatWidgetService extends Disposable implements IChatWidgetService
 		@IEditorService private readonly editorService: IEditorService,
 		@IChatService private readonly chatService: IChatService,
 		@ILogService private readonly logService: ILogService,
-		@IStorageService private readonly storageService: IStorageService,
 	) {
 		super();
 	}
@@ -237,30 +233,10 @@ export class ChatWidgetService extends Disposable implements IChatWidgetService
 		}
 
 		this._lastFocusedWidget = widget;
-		this.recordLastUsedSessionType(widget);
 		this._onDidChangeFocusedWidget.fire(widget);
 		this._onDidChangeFocusedSession.fire();
 	}
 
-	/**
-	 * Stores the session type (agent) of the last-focused user-facing chat so new chat editors can reuse it (excluding Quick Chat).
-	 */
-	private recordLastUsedSessionType(widget: IChatWidget | undefined): void {
-		const sessionResource = widget?.viewModel?.sessionResource;
-		if (!sessionResource) {
-			return;
-		}
-		if (this.quickChatService.sessionResource && isEqual(sessionResource, this.quickChatService.sessionResource)) {
-			return;
-		}
-		const sessionType = getChatSessionType(sessionResource);
-		// Only remember non-local agents to avoid clobbering the user's last-used agent.
-		if (sessionType === localChatSessionType) {
-			return;
-		}
-		this.storageService.store(ChatLastUsedEditorSessionTypeStorageKey, sessionType, StorageScope.PROFILE, StorageTarget.USER);
-	}
-
 	register(newWidget: IChatWidget): IDisposable {
 		if (this._widgets.some(widget => widget === newWidget)) {
 			throw new Error('Cannot register the same widget multiple times');
@@ -277,7 +253,6 @@ export class ChatWidgetService extends Disposable implements IChatWidgetService
 			newWidget.onDidFocus(() => this.setLastFocusedWidget(newWidget)),
 			newWidget.onDidChangeViewModel(({ previousSessionResource, currentSessionResource }) => {
 				if (this._lastFocusedWidget === newWidget && !isEqual(previousSessionResource, currentSessionResource)) {
-					this.recordLastUsedSessionType(newWidget);
 					this._onDidChangeFocusedSession.fire();
 				}
 

src/vs/workbench/contrib/chat/browser/widget/input/chatInputPart.ts

@@ -999,21 +999,6 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 			|| hasModelsTargetingSession(this.getAllMergedModels(), sessionType);
 	}
 
-	/**
-	 * Returns the persisted model for the current session type, if it exists in the current model pool.
-	 */
-	private _getRememberedSessionTypeModel(): ILanguageModelChatMetadataAndIdentifier | undefined {
-		const sessionType = this._currentSessionType;
-		if (!sessionType || !this.sessionTypeHasOwnModelPool(sessionType)) {
-			return undefined;
-		}
-		const persisted = this.storageService.get(this.getSelectedModelStorageKey(), StorageScope.APPLICATION);
-		if (!persisted) {
-			return undefined;
-		}
-		return this.getModels().find(m => m.identifier === persisted);
-	}
-
 	private initSelectedModel() {
 		// initSelectedModel is scoped to the current storage key/session type.
 		// Do not let a delayed restore from a previous session type apply later.
@@ -1475,13 +1460,6 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 			if (!state && this._chatSessionIsEmpty) {
 				state = this._getPersistedEmptyInputState();
 				message = `syncing from empty input state for ${forSessionResource.toString()}`;
-				// Seed model/config from the last-used selection for this session type (configured default still wins).
-				const rememberedSessionTypeModel = this._getRememberedSessionTypeModel();
-				if (rememberedSessionTypeModel) {
-					const base = state ?? this.getCurrentInputState();
-					const rememberedModelConfiguration = this._modelConfigStore.getModelConfiguration(rememberedSessionTypeModel.identifier);
-					state = { ...base, selectedModel: rememberedSessionTypeModel, modelConfiguration: rememberedModelConfiguration };
-				}
 				// A configured default model (e.g. set by enterprise policy via
 				// `chat.defaultModel`) starts every NEW conversation and
 				// must win over the remembered empty-input draft model. `initSelectedModel`

src/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditorInput.ts

@@ -16,13 +16,12 @@ import * as nls from '../../../../../../nls.js';
 import { ConfirmResult, IDialogService } from '../../../../../../platform/dialogs/common/dialogs.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
-import { IStorageService, StorageScope } from '../../../../../../platform/storage/common/storage.js';
 import { registerIcon } from '../../../../../../platform/theme/common/iconRegistry.js';
 import { EditorInputCapabilities, IEditorIdentifier, IEditorSerializer, IUntypedEditorInput, Verbosity } from '../../../../../common/editor.js';
 import { EditorInput, IEditorCloseHandler } from '../../../../../common/editor/editorInput.js';
 import { IChatModelReference, IChatService } from '../../../common/chatService/chatService.js';
 import { IChatSessionsService, localChatSessionType } from '../../../common/chatSessionsService.js';
-import { ChatAgentLocation, ChatEditorTitleMaxLength, ChatLastUsedEditorSessionTypeStorageKey, getDefaultNewChatSessionResource, getDefaultNewChatSessionType, getNewChatEditorSessionResource } from '../../../common/constants.js';
+import { ChatAgentLocation, ChatEditorTitleMaxLength, getDefaultNewChatSessionResource, getDefaultNewChatSessionType } from '../../../common/constants.js';
 import { IChatEditingSession, ModifiedFileEntryState } from '../../../common/editing/chatEditingService.js';
 import { IChatModel } from '../../../common/model/chatModel.js';
 import { LocalChatSessionUri, getChatSessionType } from '../../../common/model/chatUri.js';
@@ -66,7 +65,6 @@ export class ChatEditorInput extends EditorInput implements IEditorCloseHandler
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IChatSessionsService private readonly chatSessionsService: IChatSessionsService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@IStorageService private readonly storageService: IStorageService,
 	) {
 		super();
 
@@ -236,8 +234,7 @@ export class ChatEditorInput extends EditorInput implements IEditorCloseHandler
 			if (this.options.explicitSessionType === localChatSessionType) {
 				this.modelRef.value = this.chatService.startNewLocalSession(ChatAgentLocation.Chat, { canUseTools: !inputType, debugOwner: 'ChatEditorInput#resolveExplicitLocal' });
 			} else {
-				const lastUsedSessionType = this.storageService.get(ChatLastUsedEditorSessionTypeStorageKey, StorageScope.PROFILE);
-				const defaultResource = getNewChatEditorSessionResource(this.configurationService, this.chatSessionsService, lastUsedSessionType);
+				const defaultResource = getDefaultNewChatSessionResource(this.configurationService, this.chatSessionsService);
 				if (getChatSessionType(defaultResource) === localChatSessionType) {
 					this.modelRef.value = this.chatService.startNewLocalSession(ChatAgentLocation.Chat, { canUseTools: !inputType, debugOwner: 'ChatEditorInput#resolveUntitled' });
 				} else {

src/vs/workbench/contrib/chat/common/constants.ts

@@ -293,54 +293,6 @@ export function getDefaultNewChatSessionResource(
 		: URI.from({ scheme: defaultType, path: `/untitled-${generateUuid()}` });
 }
 
-/**
- * Storage key for the last-used non-local editor chat session type (agent), persisted at profile scope.
- */
-export const ChatLastUsedEditorSessionTypeStorageKey = 'chat.lastUsedEditorSessionType';
-
-/**
- * Resolves the session type (agent) for a new chat editor, preferring the last-used visible non-local agent when `chat.editor.defaultProvider` isn't explicitly configured.
- */
-export function getNewChatEditorSessionType(
-	configurationService: IConfigurationService,
-	chatSessionsService: Pick<IChatSessionsService, 'getChatSessionContribution' | 'getAllChatSessionContributions'>,
-	lastUsedSessionType: string | undefined,
-): string {
-	const inspected = configurationService.inspect<string>(ChatConfiguration.EditorDefaultProvider);
-	const explicitlyConfigured = inspected.applicationValue !== undefined
-		|| inspected.userValue !== undefined
-		|| inspected.userLocalValue !== undefined
-		|| inspected.userRemoteValue !== undefined
-		|| inspected.workspaceValue !== undefined
-		|| inspected.workspaceFolderValue !== undefined
-		|| inspected.memoryValue !== undefined
-		|| inspected.policyValue !== undefined;
-
-	if (!explicitlyConfigured
-		&& lastUsedSessionType
-		&& lastUsedSessionType !== localChatSessionType
-		&& isVisibleEditorChatSessionType(lastUsedSessionType, configurationService, chatSessionsService)) {
-		return lastUsedSessionType;
-	}
-
-	return getDefaultNewChatSessionType(configurationService, chatSessionsService);
-}
-
-/**
- * Like {@link getDefaultNewChatSessionResource}, but prefers the user's
- * last-used session type via {@link getNewChatEditorSessionType}.
- */
-export function getNewChatEditorSessionResource(
-	configurationService: IConfigurationService,
-	chatSessionsService: Pick<IChatSessionsService, 'getChatSessionContribution' | 'getAllChatSessionContributions'>,
-	lastUsedSessionType: string | undefined,
-): URI {
-	const sessionType = getNewChatEditorSessionType(configurationService, chatSessionsService, lastUsedSessionType);
-	return sessionType === localChatSessionType
-		? LocalChatSessionUri.getNewSessionUri()
-		: URI.from({ scheme: sessionType, path: `/untitled-${generateUuid()}` });
-}
-
 export function isEditorLocalAgentEnabled(configurationService: IConfigurationService): boolean {
 	return configurationService.getValue<boolean>(ChatConfiguration.EditorLocalAgentEnabled) ?? true;
 }

src/vs/workbench/contrib/chat/test/browser/widgetHosts/editor/chatEditorInput.test.ts

@@ -10,7 +10,6 @@ import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../../ba
 import { IConfigurationService } from '../../../../../../../platform/configuration/common/configuration.js';
 import { IDialogService } from '../../../../../../../platform/dialogs/common/dialogs.js';
 import { IInstantiationService } from '../../../../../../../platform/instantiation/common/instantiation.js';
-import { IStorageService } from '../../../../../../../platform/storage/common/storage.js';
 import { ChatEditorInput } from '../../../../browser/widgetHosts/editor/chatEditorInput.js';
 import { IChatService, IChatSessionStartOptions } from '../../../../common/chatService/chatService.js';
 import { IChatSessionsService, localChatSessionType } from '../../../../common/chatSessionsService.js';
@@ -51,7 +50,6 @@ suite('ChatEditorInput', () => {
 			{} as IConfigurationService,
 			{} as IChatSessionsService,
 			{} as IInstantiationService,
-			{} as IStorageService,
 		);
 
 		try {
@@ -103,7 +101,6 @@ suite('ChatEditorInput', () => {
 			{} as IConfigurationService,
 			{} as IChatSessionsService,
 			{} as IInstantiationService,
-			{} as IStorageService,
 		);
 
 		try {