new implicit context flow (microsoft#254768)

* new implicit flow

* new implicit flow

* some logic cleanup:

* gate implicit context stuff behind setting

* cleanup

* hygiene weewoowewoo

Author: justschen

src/vs/workbench/contrib/chat/browser/attachments/implicitContextAttachment.ts

@@ -4,10 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as dom from '../../../../../base/browser/dom.js';
+import { StandardKeyboardEvent } from '../../../../../base/browser/keyboardEvent.js';
 import { StandardMouseEvent } from '../../../../../base/browser/mouseEvent.js';
 import { Button } from '../../../../../base/browser/ui/button/button.js';
 import { getDefaultHoverDelegate } from '../../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
+import { KeyCode } from '../../../../../base/common/keyCodes.js';
 import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
 import { Schemas } from '../../../../../base/common/network.js';
 import { basename, dirname } from '../../../../../base/common/resources.js';
@@ -17,6 +19,7 @@ import { IModelService } from '../../../../../editor/common/services/model.js';
 import { localize } from '../../../../../nls.js';
 import { getFlatContextMenuActions } from '../../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { IMenuService, MenuId } from '../../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
 import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
 import { FileKind, IFileService } from '../../../../../platform/files/common/files.js';
@@ -25,6 +28,8 @@ import { ILabelService } from '../../../../../platform/label/common/label.js';
 import { ResourceLabels } from '../../../../browser/labels.js';
 import { ResourceContextKey } from '../../../../common/contextkeys.js';
 import { IChatRequestImplicitVariableEntry } from '../../common/chatVariableEntries.js';
+import { IChatWidgetService } from '../chat.js';
+import { ChatAttachmentModel } from '../chatAttachmentModel.js';
 
 export class ImplicitContextAttachmentWidget extends Disposable {
 	public readonly domNode: HTMLElement;
@@ -34,6 +39,7 @@ export class ImplicitContextAttachmentWidget extends Disposable {
 	constructor(
 		private readonly attachment: IChatRequestImplicitVariableEntry,
 		private readonly resourceLabels: ResourceLabels,
+		private readonly attachmentModel: ChatAttachmentModel,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IContextMenuService private readonly contextMenuService: IContextMenuService,
 		@ILabelService private readonly labelService: ILabelService,
@@ -42,6 +48,8 @@ export class ImplicitContextAttachmentWidget extends Disposable {
 		@ILanguageService private readonly languageService: ILanguageService,
 		@IModelService private readonly modelService: IModelService,
 		@IHoverService private readonly hoverService: IHoverService,
+		@IChatWidgetService private readonly chatWidgetService: IChatWidgetService,
+		@IConfigurationService private readonly configService: IConfigurationService
 	) {
 		super();
 
@@ -80,17 +88,56 @@ export class ImplicitContextAttachmentWidget extends Disposable {
 		this.domNode.ariaLabel = ariaLabel;
 		this.domNode.tabIndex = 0;
 
-		const hintLabel = localize('hint.label.current', "Current {0}", attachmentTypeName);
+		const isSuggestedEnabled = this.configService.getValue('chat.implicitContext.suggestedContext');
+		const hintLabel = !this.attachment.isSelection && !isSuggestedEnabled ? localize('hint.label.current', "Current {0}", attachmentTypeName) : '';
 		const hintElement = dom.append(this.domNode, dom.$('span.chat-implicit-hint', undefined, hintLabel));
 		this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), hintElement, title));
 
-		const buttonMsg = this.attachment.enabled ? localize('disable', "Disable current {0} context", attachmentTypeName) : localize('enable', "Enable current {0} context", attachmentTypeName);
-		const toggleButton = this.renderDisposables.add(new Button(this.domNode, { supportIcons: true, title: buttonMsg }));
-		toggleButton.icon = this.attachment.enabled ? Codicon.eye : Codicon.eyeClosed;
-		this.renderDisposables.add(toggleButton.onDidClick((e) => {
-			e.stopPropagation(); // prevent it from triggering the click handler on the parent immediately after rerendering
-			this.attachment.enabled = !this.attachment.enabled;
-		}));
+
+		if (isSuggestedEnabled) {
+			if (!this.attachment.isSelection) {
+				const buttonMsg = this.attachment.enabled ? localize('disable', "Disable current {0} context", attachmentTypeName) : localize('enable', "Enable current {0} context", attachmentTypeName);
+				const toggleButton = this.renderDisposables.add(new Button(this.domNode, { supportIcons: true, title: buttonMsg }));
+				toggleButton.icon = this.attachment.enabled ? Codicon.x : Codicon.plus;
+				this.renderDisposables.add(toggleButton.onDidClick((e) => {
+					e.stopPropagation();
+					e.preventDefault();
+					if (!this.attachment.enabled) {
+						this.convertToRegularAttachment();
+					}
+					this.attachment.enabled = false;
+				}));
+			}
+
+			if (!this.attachment.enabled && this.attachment.isSelection) {
+				this.domNode.classList.remove('disabled');
+			}
+
+			this.renderDisposables.add(dom.addDisposableListener(this.domNode, dom.EventType.CLICK, e => {
+				if (!this.attachment.enabled && !this.attachment.isSelection) {
+					this.convertToRegularAttachment();
+				}
+			}));
+
+			this.renderDisposables.add(dom.addDisposableListener(this.domNode, dom.EventType.KEY_DOWN, e => {
+				const event = new StandardKeyboardEvent(e);
+				if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) {
+					if (!this.attachment.enabled && !this.attachment.isSelection) {
+						e.preventDefault();
+						e.stopPropagation();
+						this.convertToRegularAttachment();
+					}
+				}
+			}));
+		} else {
+			const buttonMsg = this.attachment.enabled ? localize('disable', "Disable current {0} context", attachmentTypeName) : localize('enable', "Enable current {0} context", attachmentTypeName);
+			const toggleButton = this.renderDisposables.add(new Button(this.domNode, { supportIcons: true, title: buttonMsg }));
+			toggleButton.icon = this.attachment.enabled ? Codicon.eye : Codicon.eyeClosed;
+			this.renderDisposables.add(toggleButton.onDidClick((e) => {
+				e.stopPropagation(); // prevent it from triggering the click handler on the parent immediately after rerendering
+				this.attachment.enabled = !this.attachment.enabled;
+			}));
+		}
 
 		// Context menu
 		const scopedContextKeyService = this.renderDisposables.add(this.contextKeyService.createScoped(this.domNode));
@@ -112,4 +159,13 @@ export class ImplicitContextAttachmentWidget extends Disposable {
 			});
 		}));
 	}
+
+	private convertToRegularAttachment(): void {
+		if (!this.attachment.value) {
+			return;
+		}
+		const file = URI.isUri(this.attachment.value) ? this.attachment.value : this.attachment.value.uri;
+		this.attachmentModel.addFile(file);
+		this.chatWidgetService.lastFocusedWidget?.focusInput();
+	}
 }

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

@@ -170,6 +170,12 @@ configurationRegistry.registerConfiguration({
 				'panel': 'always',
 			}
 		},
+		'chat.implicitContext.suggestedContext': {
+			type: 'boolean',
+			tags: ['experimental'],
+			markdownDescription: nls.localize('chat.implicitContext.suggestedContext', "Controls whether the new implicit context flow is shown. In Ask and Edit modes, the context will automatically be included. In Agent mode context will be suggested as an attachment. Selections are always included as context."),
+			default: true,
+		},
 		'chat.editing.autoAcceptDelay': {
 			type: 'number',
 			markdownDescription: nls.localize('chat.editing.autoAcceptDelay', "Delay after which changes made by chat are automatically accepted. Values are in seconds, `0` means disabled and `100` seconds is the maximum."),

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

@@ -102,6 +102,8 @@ import { ChatRelatedFiles } from './contrib/chatInputRelatedFilesContrib.js';
 import { resizeImage } from './imageUtils.js';
 import { IModelPickerDelegate, ModelPickerActionItem } from './modelPicker/modelPickerActionItem.js';
 import { IModePickerDelegate, ModePickerActionItem } from './modelPicker/modePickerActionItem.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { isLocation } from '../../../../editor/common/languages.js';
 
 const $ = dom.$;
 
@@ -169,7 +171,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 
 		contextArr.add(...this.attachmentModel.attachments);
 
-		if (this.implicitContext?.enabled && this.implicitContext.value) {
+		if ((this.implicitContext?.enabled && this.implicitContext?.value) || (isLocation(this.implicitContext?.value) && this.configurationService.getValue<boolean>('chat.implicitContext.suggestedContext'))) {
 			const implicitChatVariables = this.implicitContext.toBaseEntries();
 			contextArr.add(...implicitChatVariables);
 		}
@@ -442,6 +444,10 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 			if (this._inputEditor) {
 				this._inputEditor.updateOptions({ ariaLabel: this._getAriaLabel() });
 			}
+
+			if (this.implicitContext && this.configurationService.getValue<boolean>('chat.implicitContext.suggestedContext')) {
+				this.implicitContext.enabled = this._currentModeObservable.get() !== ChatMode.Agent;
+			}
 		}));
 		this._register(this._onDidChangeCurrentLanguageModel.event(() => {
 			if (this._currentLanguageModel?.metadata.name) {
@@ -1301,8 +1307,10 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 			this._indexOfLastOpenedContext = -1;
 		}
 
-		if (this.implicitContext?.value) {
-			const implicitPart = store.add(this.instantiationService.createInstance(ImplicitContextAttachmentWidget, this.implicitContext, this._contextResourceLabels));
+		const isSuggestedEnabled = this.configurationService.getValue<boolean>('chat.implicitContext.suggestedContext');
+
+		if (this.implicitContext?.value && !isSuggestedEnabled) {
+			const implicitPart = store.add(this.instantiationService.createInstance(ImplicitContextAttachmentWidget, this.implicitContext, this._contextResourceLabels, this.attachmentModel));
 			container.appendChild(implicitPart.domNode);
 		}
 
@@ -1355,6 +1363,19 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 			}));
 		}
 
+		const implicitUri = this.implicitContext?.value;
+		const isUri = URI.isUri(implicitUri);
+
+		if (isSuggestedEnabled && implicitUri && (isUri || isLocation(implicitUri))) {
+			const targetUri = isUri ? implicitUri : implicitUri.uri;
+			const currentlyAttached = attachments.some(([, attachment]) => URI.isUri(attachment.value) && isEqual(attachment.value, targetUri));
+
+			const shouldShowImplicit = isUri ? !currentlyAttached : implicitUri.range;
+			if (shouldShowImplicit) {
+				const implicitPart = store.add(this.instantiationService.createInstance(ImplicitContextAttachmentWidget, this.implicitContext, this._contextResourceLabels, this._attachmentModel));
+				container.appendChild(implicitPart.domNode);
+			}
+		}
 
 		if (oldHeight !== this.attachmentsContainer.offsetHeight) {
 			this._onDidChangeHeight.fire();
@@ -1369,9 +1390,18 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 			this._indexOfLastAttachedContextDeletedWithKeyboard = index;
 		}
 
-
 		this._attachmentModel.delete(attachment.id);
 
+
+		if (this.configurationService.getValue<boolean>('chat.implicitContext.enableImplicitContext')) {
+			// if currently opened file is deleted, do not show implicit context
+			const implicitValue = URI.isUri(this.implicitContext?.value) && URI.isUri(attachment.value) && isEqual(this.implicitContext.value, attachment.value);
+
+			if (this.implicitContext?.isFile && implicitValue) {
+				this.implicitContext.enabled = false;
+			}
+		}
+
 		if (this._attachmentModel.size === 0) {
 			this.focus();
 		}

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

@@ -161,17 +161,21 @@ export class ChatImplicitContextContribution extends Disposable implements IWork
 				newValue = { uri: model.uri, range: selection } satisfies Location;
 				isSelection = true;
 			} else {
-				const visibleRanges = codeEditor?.getVisibleRanges();
-				if (visibleRanges && visibleRanges.length > 0) {
-					// Merge visible ranges. Maybe the reference value could actually be an array of Locations?
-					// Something like a Location with an array of Ranges?
-					let range = visibleRanges[0];
-					visibleRanges.slice(1).forEach(r => {
-						range = range.plusRange(r);
-					});
-					newValue = { uri: model.uri, range } satisfies Location;
-				} else {
+				if (this.configurationService.getValue('chat.implicitContext.suggestedContext')) {
 					newValue = model.uri;
+				} else {
+					const visibleRanges = codeEditor?.getVisibleRanges();
+					if (visibleRanges && visibleRanges.length > 0) {
+						// Merge visible ranges. Maybe the reference value could actually be an array of Locations?
+						// Something like a Location with an array of Ranges?
+						let range = visibleRanges[0];
+						visibleRanges.slice(1).forEach(r => {
+							range = range.plusRange(r);
+						});
+						newValue = { uri: model.uri, range } satisfies Location;
+					} else {
+						newValue = model.uri;
+					}
 				}
 			}
 		}

src/vs/workbench/contrib/chat/browser/media/chat.css

@@ -1255,6 +1255,10 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	outline-offset: -4px;
 }
 
+.interactive-session .chat-attached-context .chat-attached-context-attachment .monaco-button.codicon.codicon-plus {
+	font-size: 12px;
+}
+
 .chat-related-files .monaco-button.codicon.codicon-add:hover,
 .action-item.chat-attached-context-attachment.chat-add-files:hover,
 .interactive-session .chat-attached-context .chat-attached-context-attachment .monaco-button:hover {
@@ -2061,3 +2065,10 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	width: 1px;
 	height: 1px;
 }
+
+
+.interactive-session .chat-attached-context .chat-attached-context-attachment.implicit.disabled:hover {
+	cursor: pointer;
+	border-style: solid;
+	background-color: var(--vscode-toolbar-hoverBackground);
+}