Merge remote-tracking branch 'origin/main' into roblou/metropolitan-bear

roblourens · roblourens · commit 4277a9a29610 · 2025-09-07T10:41:12.000-07:00
diff --git a/src/vs/workbench/api/common/extHostChatAgents2.ts b/src/vs/workbench/api/common/extHostChatAgents2.ts
@@ -495,7 +495,7 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 
 		// in-place converting for location-data
 		let location: vscode.ChatRequestEditorData | vscode.ChatRequestNotebookData | undefined;
-		if (request.locationData?.type === ChatAgentLocation.TextEditor) {
+		if (request.locationData?.type === ChatAgentLocation.EditorInline) {
 			// editor data
 			const document = this._documents.getDocument(request.locationData.document);
 			location = new extHostTypes.ChatRequestEditorData(document, typeConvert.Selection.to(request.locationData.selection), typeConvert.Range.to(request.locationData.wholeRange));
diff --git a/src/vs/workbench/api/common/extHostTypeConverters.ts b/src/vs/workbench/api/common/extHostTypeConverters.ts
@@ -3167,7 +3167,7 @@ export namespace ChatLocation {
 			case ChatAgentLocation.Notebook: return types.ChatLocation.Notebook;
 			case ChatAgentLocation.Terminal: return types.ChatLocation.Terminal;
 			case ChatAgentLocation.Chat: return types.ChatLocation.Panel;
-			case ChatAgentLocation.TextEditor: return types.ChatLocation.Editor;
+			case ChatAgentLocation.EditorInline: return types.ChatLocation.Editor;
 		}
 	}
 
@@ -3176,7 +3176,7 @@ export namespace ChatLocation {
 			case types.ChatLocation.Notebook: return ChatAgentLocation.Notebook;
 			case types.ChatLocation.Terminal: return ChatAgentLocation.Terminal;
 			case types.ChatLocation.Panel: return ChatAgentLocation.Chat;
-			case types.ChatLocation.Editor: return ChatAgentLocation.TextEditor;
+			case types.ChatLocation.Editor: return ChatAgentLocation.EditorInline;
 		}
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts
@@ -339,7 +339,7 @@ class OpenModelPickerAction extends Action2 {
 						ChatContextKeys.languageModelsAreUserSelectable,
 						ContextKeyExpr.or(
 							ContextKeyExpr.equals(ChatContextKeys.location.key, ChatAgentLocation.Chat),
-							ContextKeyExpr.equals(ChatContextKeys.location.key, ChatAgentLocation.TextEditor),
+							ContextKeyExpr.equals(ChatContextKeys.location.key, ChatAgentLocation.EditorInline),
 							ContextKeyExpr.equals(ChatContextKeys.location.key, ChatAgentLocation.Notebook),
 							ContextKeyExpr.equals(ChatContextKeys.location.key, ChatAgentLocation.Terminal))
 					)
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
@@ -523,7 +523,7 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 			get feature(): string {
 				if (responseModel.session.initialLocation === ChatAgentLocation.Chat) {
 					return 'sideBarChat';
-				} else if (responseModel.session.initialLocation === ChatAgentLocation.TextEditor) {
+				} else if (responseModel.session.initialLocation === ChatAgentLocation.EditorInline) {
 					return 'inlineChat';
 				}
 				return responseModel.session.initialLocation;
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -1237,7 +1237,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 			hoverDelegate,
 			hiddenItemStrategy: HiddenItemStrategy.Ignore, // keep it lean when hiding items and avoid a "..." overflow menu
 			actionViewItemProvider: (action, options) => {
-				if (this.location === ChatAgentLocation.Chat || this.location === ChatAgentLocation.TextEditor) {
+				if (this.location === ChatAgentLocation.Chat || this.location === ChatAgentLocation.EditorInline) {
 					if ((action.id === ChatSubmitAction.ID || action.id === CancelAction.ID || action.id === ChatEditingSessionSubmitAction.ID) && action instanceof MenuItemAction) {
 						const dropdownAction = this.instantiationService.createInstance(MenuItemAction, { id: 'chat.moreExecuteActions', title: localize('notebook.moreExecuteActionsLabel', "More..."), icon: Codicon.chevronDown }, undefined, undefined, undefined, undefined);
 						return this.instantiationService.createInstance(ChatSubmitDropdownActionItem, action, dropdownAction, { ...options, menuAsChild: false });
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -126,7 +126,7 @@ class SetupAgent extends Disposable implements IChatAgentImplementation {
 				case ChatAgentLocation.Terminal:
 					id = 'setup.terminal';
 					break;
-				case ChatAgentLocation.TextEditor:
+				case ChatAgentLocation.EditorInline:
 					id = 'setup.editor';
 					break;
 				case ChatAgentLocation.Notebook:
@@ -876,7 +876,7 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 					// Inline Agents
 					disposables.add(SetupAgent.registerDefaultAgents(this.instantiationService, ChatAgentLocation.Terminal, undefined, context, controller).disposable);
 					disposables.add(SetupAgent.registerDefaultAgents(this.instantiationService, ChatAgentLocation.Notebook, undefined, context, controller).disposable);
-					disposables.add(SetupAgent.registerDefaultAgents(this.instantiationService, ChatAgentLocation.TextEditor, undefined, context, controller).disposable);
+					disposables.add(SetupAgent.registerDefaultAgents(this.instantiationService, ChatAgentLocation.EditorInline, undefined, context, controller).disposable);
 				}
 
 				// Built-In Agent + Tool (unless installed, signed-in and enabled)
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatImplicitContext.ts
@@ -221,7 +221,7 @@ export class ChatImplicitContextContribution extends Disposable implements IWork
 
 		const isPromptFile = languageId && getPromptsTypeForLanguageId(languageId) !== undefined;
 
-		const widgets = updateWidget ? [updateWidget] : [...this.chatWidgetService.getWidgetsByLocations(ChatAgentLocation.Chat), ...this.chatWidgetService.getWidgetsByLocations(ChatAgentLocation.TextEditor)];
+		const widgets = updateWidget ? [updateWidget] : [...this.chatWidgetService.getWidgetsByLocations(ChatAgentLocation.Chat), ...this.chatWidgetService.getWidgetsByLocations(ChatAgentLocation.EditorInline)];
 		for (const widget of widgets) {
 			if (!widget.input.implicitContext) {
 				continue;
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
@@ -805,7 +805,7 @@ class BuiltinDynamicCompletions extends Disposable {
 				return;
 			}
 
-			if (widget.location === ChatAgentLocation.TextEditor) {
+			if (widget.location === ChatAgentLocation.EditorInline) {
 				return;
 			}
 
diff --git a/src/vs/workbench/contrib/chat/common/chatService.ts b/src/vs/workbench/contrib/chat/common/chatService.ts
@@ -622,7 +622,7 @@ export interface IChatSendRequestData extends IChatSendRequestResponseState {
 }
 
 export interface IChatEditorLocationData {
-	type: ChatAgentLocation.TextEditor;
+	type: ChatAgentLocation.EditorInline;
 	document: URI;
 	selection: ISelection;
 	wholeRange: IRange;
diff --git a/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts b/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
@@ -167,7 +167,7 @@ export class ChatService extends Disposable implements IChatService {
 	private saveState(): void {
 		const liveChats = Array.from(this._sessionModels.values())
 			.filter(session =>
-				this.shouldSaveToHistory(session.sessionId) && (session.initialLocation === ChatAgentLocation.Chat || session.initialLocation === ChatAgentLocation.TextEditor));
+				this.shouldSaveToHistory(session.sessionId) && (session.initialLocation === ChatAgentLocation.Chat || session.initialLocation === ChatAgentLocation.EditorInline));
 
 		this._chatSessionStore.storeSessions(liveChats);
 	}
@@ -1076,7 +1076,7 @@ export class ChatService extends Disposable implements IChatService {
 			throw new Error(`Unknown session: ${sessionId}`);
 		}
 
-		if (shouldSaveToHistory && (model.initialLocation === ChatAgentLocation.Chat || model.initialLocation === ChatAgentLocation.TextEditor)) {
+		if (shouldSaveToHistory && (model.initialLocation === ChatAgentLocation.Chat || model.initialLocation === ChatAgentLocation.EditorInline)) {
 			// Always preserve sessions that have custom titles, even if empty
 			if (model.getRequests().length === 0 && !model.customTitle) {
 				await this._chatSessionStore.deleteSession(sessionId);
diff --git a/src/vs/workbench/contrib/chat/common/constants.ts b/src/vs/workbench/contrib/chat/common/constants.ts
@@ -58,14 +58,15 @@ export type RawChatParticipantLocation = 'panel' | 'terminal' | 'notebook' | 'ed
 export enum ChatAgentLocation {
 	/**
 	 * This is chat, whether it's in the sidebar, a chat editor, or quick chat.
+	 * Leaving the values alone as they are in stored data so we don't have to normalize them.
 	 */
 	Chat = 'panel',
 	Terminal = 'terminal',
 	Notebook = 'notebook',
 	/**
-	 * TextEditor means inline chat in a text editor.
+	 * EditorInline means inline chat in a text editor.
 	 */
-	TextEditor = 'editor',
+	EditorInline = 'editor',
 }
 
 export namespace ChatAgentLocation {
@@ -74,7 +75,7 @@ export namespace ChatAgentLocation {
 			case 'panel': return ChatAgentLocation.Chat;
 			case 'terminal': return ChatAgentLocation.Terminal;
 			case 'notebook': return ChatAgentLocation.Notebook;
-			case 'editor': return ChatAgentLocation.TextEditor;
+			case 'editor': return ChatAgentLocation.EditorInline;
 		}
 		return ChatAgentLocation.Chat;
 	}
diff --git a/src/vs/workbench/contrib/chat/electron-browser/actions/voiceChatActions.ts b/src/vs/workbench/contrib/chat/electron-browser/actions/voiceChatActions.ts
@@ -686,7 +686,7 @@ class ChatSynthesizerSessionController {
 		const chatWidgetService = accessor.get(IChatWidgetService);
 		const contextKeyService = accessor.get(IContextKeyService);
 		let chatWidget = chatWidgetService.getWidgetBySessionId(response.session.sessionId);
-		if (chatWidget?.location === ChatAgentLocation.TextEditor) {
+		if (chatWidget?.location === ChatAgentLocation.EditorInline) {
 			// workaround for https://github.com/microsoft/vscode/issues/212785
 			chatWidget = chatWidgetService.lastFocusedWidget;
 		}
diff --git a/src/vs/workbench/contrib/chat/test/common/chatModel.test.ts b/src/vs/workbench/contrib/chat/test/common/chatModel.test.ts
@@ -52,7 +52,7 @@ suite('ChatModel', () => {
 	});
 
 	test('adoptRequest', async function () {
-		const model1 = testDisposables.add(instantiationService.createInstance(ChatModel, undefined, ChatAgentLocation.TextEditor));
+		const model1 = testDisposables.add(instantiationService.createInstance(ChatModel, undefined, ChatAgentLocation.EditorInline));
 		const model2 = testDisposables.add(instantiationService.createInstance(ChatModel, undefined, ChatAgentLocation.Chat));
 
 		const text = 'hello';
diff --git a/src/vs/workbench/contrib/codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.ts b/src/vs/workbench/contrib/codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.ts
@@ -110,7 +110,7 @@ export class EmptyTextEditorHintContribution extends Disposable implements IEdit
 			return false;
 		}
 
-		const hasEditorAgents = Boolean(this.chatAgentService.getDefaultAgent(ChatAgentLocation.TextEditor));
+		const hasEditorAgents = Boolean(this.chatAgentService.getDefaultAgent(ChatAgentLocation.EditorInline));
 		const shouldRenderDefaultHint = model?.uri.scheme === Schemas.untitled && languageId === PLAINTEXT_LANGUAGE_ID;
 		return hasEditorAgents || shouldRenderDefaultHint;
 	}
@@ -200,7 +200,7 @@ class EmptyTextEditorHintContentWidget extends Disposable implements IContentWid
 	}
 
 	private getHint() {
-		const hasInlineChatProvider = this.chatAgentService.getActivatedAgents().filter(candidate => candidate.locations.includes(ChatAgentLocation.TextEditor)).length > 0;
+		const hasInlineChatProvider = this.chatAgentService.getActivatedAgents().filter(candidate => candidate.locations.includes(ChatAgentLocation.EditorInline)).length > 0;
 
 		const hintHandler: IContentActionHandler = {
 			disposables: this._store,
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts
@@ -228,12 +228,12 @@ export class InlineChatController1 implements IEditorContribution {
 		this._ui = new Lazy(() => {
 
 			const location: IChatWidgetLocationOptions = {
-				location: ChatAgentLocation.TextEditor,
+				location: ChatAgentLocation.EditorInline,
 				resolveData: () => {
 					assertType(this._editor.hasModel());
 					assertType(this._session);
 					return {
-						type: ChatAgentLocation.TextEditor,
+						type: ChatAgentLocation.EditorInline,
 						selection: this._editor.getSelection(),
 						document: this._session.textModelN.uri,
 						wholeRange: this._session?.wholeRange.trackedInitialRange,
@@ -1261,12 +1261,12 @@ export class InlineChatController2 implements IEditorContribution {
 
 
 			const location: IChatWidgetLocationOptions = {
-				location: ChatAgentLocation.TextEditor,
+				location: ChatAgentLocation.EditorInline,
 				resolveData: () => {
 					assertType(this._editor.hasModel());
 
 					return {
-						type: ChatAgentLocation.TextEditor,
+						type: ChatAgentLocation.EditorInline,
 						selection: this._editor.getSelection(),
 						document: this._editor.getModel().uri,
 						wholeRange: this._editor.getSelection(),
@@ -1532,7 +1532,7 @@ export async function reviewEdits(accessor: ServicesAccessor, editor: ICodeEdito
 
 	const chatService = accessor.get(IChatService);
 	const uri = editor.getModel().uri;
-	const chatModel = chatService.startSession(ChatAgentLocation.TextEditor, token, false);
+	const chatModel = chatService.startSession(ChatAgentLocation.EditorInline, token, false);
 
 	chatModel.startEditingSession(true);
 
@@ -1585,7 +1585,7 @@ export async function reviewNotebookEdits(accessor: ServicesAccessor, uri: URI,
 	const chatService = accessor.get(IChatService);
 	const notebookService = accessor.get(INotebookService);
 	const isNotebook = notebookService.hasSupportedNotebooks(uri);
-	const chatModel = chatService.startSession(ChatAgentLocation.TextEditor, token, false);
+	const chatModel = chatService.startSession(ChatAgentLocation.EditorInline, token, false);
 
 	chatModel.startEditingSession(true);
 
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.ts
@@ -286,7 +286,7 @@ export class InlineChatHintsController extends Disposable implements IEditorCont
 				return;
 			}
 
-			const agentName = chatAgentService.getDefaultAgent(ChatAgentLocation.TextEditor)?.name ?? localize('defaultTitle', "Chat");
+			const agentName = chatAgentService.getDefaultAgent(ChatAgentLocation.EditorInline)?.name ?? localize('defaultTitle', "Chat");
 			const { position, isEol, isWhitespace, kb, model } = showData;
 
 			const inlineClassName: string[] = ['a' /*HACK but sorts as we want*/, 'inline-chat-hint', 'inline-chat-hint-text'];
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.ts
@@ -108,7 +108,7 @@ export class InlineChatSessionServiceImpl implements IInlineChatSessionService {
 
 	async createSession(editor: IActiveCodeEditor, options: { headless?: boolean; wholeRange?: Range; session?: Session }, token: CancellationToken): Promise<Session | undefined> {
 
-		const agent = this._chatAgentService.getDefaultAgent(ChatAgentLocation.TextEditor);
+		const agent = this._chatAgentService.getDefaultAgent(ChatAgentLocation.EditorInline);
 
 		if (!agent) {
 			this._logService.trace('[IE] NO agent found');
@@ -123,7 +123,7 @@ export class InlineChatSessionServiceImpl implements IInlineChatSessionService {
 		const store = new DisposableStore();
 		this._logService.trace(`[IE] creating NEW session for ${editor.getId()}, ${agent.extensionId}`);
 
-		const chatModel = options.session?.chatModel ?? this._chatService.startSession(ChatAgentLocation.TextEditor, token);
+		const chatModel = options.session?.chatModel ?? this._chatService.startSession(ChatAgentLocation.EditorInline, token);
 		if (!chatModel) {
 			this._logService.trace('[IE] NO chatModel found');
 			return undefined;
@@ -431,7 +431,7 @@ export class InlineChatEnabler {
 		this._ctxHasProvider2 = CTX_INLINE_CHAT_HAS_AGENT2.bindTo(contextKeyService);
 		this._ctxPossible = CTX_INLINE_CHAT_POSSIBLE.bindTo(contextKeyService);
 
-		const agentObs = observableFromEvent(this, chatAgentService.onDidChangeAgents, () => chatAgentService.getDefaultAgent(ChatAgentLocation.TextEditor));
+		const agentObs = observableFromEvent(this, chatAgentService.onDidChangeAgents, () => chatAgentService.getDefaultAgent(ChatAgentLocation.EditorInline));
 		const inlineChat2Obs = observableConfigValue(InlineChatConfigKeys.EnableV2, false, configService);
 
 		this._store.add(autorun(r => {
diff --git a/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts b/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts
@@ -94,7 +94,7 @@ suite('InlineChatController', function () {
 		// id: 'testEditorAgent',
 		name: 'testEditorAgent',
 		isDefault: true,
-		locations: [ChatAgentLocation.TextEditor],
+		locations: [ChatAgentLocation.EditorInline],
 		modes: [ChatModeKind.Ask],
 		metadata: {},
 		slashCommands: [],
@@ -611,7 +611,7 @@ suite('InlineChatController', function () {
 
 		assert.strictEqual(model.getValue(), 'eins\nHello\nWorld\nHello Again\nHello World\n');
 
-		const targetModel = chatService.startSession(ChatAgentLocation.TextEditor, CancellationToken.None)!;
+		const targetModel = chatService.startSession(ChatAgentLocation.EditorInline, CancellationToken.None)!;
 		store.add(targetModel);
 		chatWidget = new class extends mock<IChatWidget>() {
 			override get viewModel() {
@@ -659,7 +659,7 @@ suite('InlineChatController', function () {
 
 		assert.strictEqual(model.getValue(), 'zwei\neins\nHello\nWorld\nHello Again\nHello World\n');
 
-		const targetModel = chatService.startSession(ChatAgentLocation.TextEditor, CancellationToken.None)!;
+		const targetModel = chatService.startSession(ChatAgentLocation.EditorInline, CancellationToken.None)!;
 		store.add(targetModel);
 		chatWidget = new class extends mock<IChatWidget>() {
 			override get viewModel() {
@@ -722,7 +722,7 @@ suite('InlineChatController', function () {
 		assertType(request);
 		const p2 = Event.toPromise(onDidInvoke.event);
 		const p3 = ctrl.awaitStates([State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
-		chatService.resendRequest(request, { noCommandDetection: true, attempt: request.attempt + 1, location: ChatAgentLocation.TextEditor });
+		chatService.resendRequest(request, { noCommandDetection: true, attempt: request.attempt + 1, location: ChatAgentLocation.EditorInline });
 
 		await p2;
 		assert.strictEqual(await p3, undefined);
@@ -759,7 +759,7 @@ suite('InlineChatController', function () {
 		const request = ctrl.chatWidget.viewModel?.model.getRequests().at(-1);
 		assertType(request);
 		const p2 = ctrl.awaitStates([State.SHOW_REQUEST, State.WAIT_FOR_INPUT]);
-		chatService.resendRequest(request, { noCommandDetection: true, attempt: request.attempt + 1, location: ChatAgentLocation.TextEditor });
+		chatService.resendRequest(request, { noCommandDetection: true, attempt: request.attempt + 1, location: ChatAgentLocation.EditorInline });
 
 		assert.strictEqual(await p2, undefined);
 
@@ -864,7 +864,7 @@ suite('InlineChatController', function () {
 		const newSession = await inlineChatSessionService.createSession(editor, {}, CancellationToken.None);
 		assertType(newSession);
 
-		await (await chatService.sendRequest(newSession.chatModel.sessionId, 'Existing', { location: ChatAgentLocation.TextEditor }))?.responseCreatedPromise;
+		await (await chatService.sendRequest(newSession.chatModel.sessionId, 'Existing', { location: ChatAgentLocation.EditorInline }))?.responseCreatedPromise;
 
 		assert.strictEqual(newSession.chatModel.requestInProgress, true);
 
diff --git a/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatSession.test.ts b/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatSession.test.ts
@@ -152,7 +152,7 @@ suite('InlineChatSession', function () {
 			id: 'testAgent',
 			name: 'testAgent',
 			isDefault: true,
-			locations: [ChatAgentLocation.TextEditor],
+			locations: [ChatAgentLocation.EditorInline],
 			modes: [ChatModeKind.Ask],
 			metadata: {},
 			slashCommands: [],
diff --git a/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController.ts b/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController.ts
@@ -501,7 +501,7 @@ export class NotebookChatController extends Disposable implements INotebookEdito
 
 	private async _startSession(token: CancellationToken) {
 		if (!this._model.value) {
-			this._model.value = this._chatService.startSession(ChatAgentLocation.TextEditor, token);
+			this._model.value = this._chatService.startSession(ChatAgentLocation.EditorInline, token);
 
 			if (!this._model.value) {
 				throw new Error('Failed to start chat session');

Original file line number	Diff line number	Diff line change
`@@ -3167,7 +3167,7 @@ export namespace ChatLocation {`
`3167`	`3167`	`case ChatAgentLocation.Notebook: return types.ChatLocation.Notebook;`
`3168`	`3168`	`case ChatAgentLocation.Terminal: return types.ChatLocation.Terminal;`
`3169`	`3169`	`case ChatAgentLocation.Chat: return types.ChatLocation.Panel;`
`3170`		`- case ChatAgentLocation.TextEditor: return types.ChatLocation.Editor;`
	`3170`	`+ case ChatAgentLocation.EditorInline: return types.ChatLocation.Editor;`
`3171`	`3171`	`}`
`3172`	`3172`	`}`
`3173`	`3173`
`@@ -3176,7 +3176,7 @@ export namespace ChatLocation {`
`3176`	`3176`	`case types.ChatLocation.Notebook: return ChatAgentLocation.Notebook;`
`3177`	`3177`	`case types.ChatLocation.Terminal: return ChatAgentLocation.Terminal;`
`3178`	`3178`	`case types.ChatLocation.Panel: return ChatAgentLocation.Chat;`
`3179`		`- case types.ChatLocation.Editor: return ChatAgentLocation.TextEditor;`
	`3179`	`+ case types.ChatLocation.Editor: return ChatAgentLocation.EditorInline;`
`3180`	`3180`	`}`
`3181`	`3181`	`}`
`3182`	`3182`	`}`
Original file line number	Diff line number	Diff line change
`@@ -339,7 +339,7 @@ class OpenModelPickerAction extends Action2 {`
`339`	`339`	`ChatContextKeys.languageModelsAreUserSelectable,`
`340`	`340`	`ContextKeyExpr.or(`
`341`	`341`	`ContextKeyExpr.equals(ChatContextKeys.location.key, ChatAgentLocation.Chat),`
`342`		`- ContextKeyExpr.equals(ChatContextKeys.location.key, ChatAgentLocation.TextEditor),`
	`342`	`+ ContextKeyExpr.equals(ChatContextKeys.location.key, ChatAgentLocation.EditorInline),`
`343`	`343`	`ContextKeyExpr.equals(ChatContextKeys.location.key, ChatAgentLocation.Notebook),`
`344`	`344`	`ContextKeyExpr.equals(ChatContextKeys.location.key, ChatAgentLocation.Terminal))`
`345`	`345`	`)`
Original file line number	Diff line number	Diff line change
`@@ -523,7 +523,7 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio`
`523`	`523`	`get feature(): string {`
`524`	`524`	`if (responseModel.session.initialLocation === ChatAgentLocation.Chat) {`
`525`	`525`	`return 'sideBarChat';`
`526`		`- } else if (responseModel.session.initialLocation === ChatAgentLocation.TextEditor) {`
	`526`	`+ } else if (responseModel.session.initialLocation === ChatAgentLocation.EditorInline) {`
`527`	`527`	`return 'inlineChat';`
`528`	`528`	`}`
`529`	`529`	`return responseModel.session.initialLocation;`
Original file line number	Diff line number	Diff line change
`@@ -805,7 +805,7 @@ class BuiltinDynamicCompletions extends Disposable {`
`805`	`805`	`return;`
`806`	`806`	`}`
`807`	`807`
`808`		`- if (widget.location === ChatAgentLocation.TextEditor) {`
	`808`	`+ if (widget.location === ChatAgentLocation.EditorInline) {`
`809`	`809`	`return;`
`810`	`810`	`}`
`811`	`811`
Original file line number	Diff line number	Diff line change
`@@ -622,7 +622,7 @@ export interface IChatSendRequestData extends IChatSendRequestResponseState {`
`622`	`622`	`}`
`623`	`623`
`624`	`624`	`export interface IChatEditorLocationData {`
`625`		`- type: ChatAgentLocation.TextEditor;`
	`625`	`+ type: ChatAgentLocation.EditorInline;`
`626`	`626`	`document: URI;`
`627`	`627`	`selection: ISelection;`
`628`	`628`	`wholeRange: IRange;`