@codingame/monaco-vscode-api 7.1.0 → 7.1.1

package/vscode/src/vs/workbench/contrib/chat/browser/chatInputPart.js

@@ -17,7 +17,7 @@ import { CodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/c
 import { Range } from '../../../../editor/common/core/range.js';
 import { IModelService } from '../../../../editor/common/services/model.js';
 import { HoverController } from '../../../../editor/contrib/hover/browser/hoverController.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.service.js';
 import { DropdownWithPrimaryActionViewItem } from '../../../../platform/actions/browser/dropdownWithPrimaryActionViewItem.js';
 import { createAndFillInActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
@@ -46,7 +46,6 @@ import { CONTEXT_CHAT_INPUT_HAS_TEXT, CONTEXT_CHAT_INPUT_CURSOR_AT_TOP, CONTEXT_
 import { IChatWidgetHistoryService } from '../common/chatWidgetHistoryService.service.js';
 import { getSimpleEditorOptions, getSimpleCodeEditorWidgetOptions } from '../../codeEditor/browser/simpleEditorOptions.js';
 var ChatInputPart_1;
-const _moduleId = "vs/workbench/contrib/chat/browser/chatInputPart";
 const $ = $$1;
 const INPUT_EDITOR_MAX_HEIGHT = 250;
 let ChatInputPart = class ChatInputPart extends Disposable {
@@ -83,8 +82,8 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this.onDidFocus = this._onDidFocus.event;
         this._onDidBlur = this._register(( (new Emitter())));
         this.onDidBlur = this._onDidBlur.event;
-        this._onDidDeleteContext = this._register(( (new Emitter())));
-        this.onDidDeleteContext = this._onDidDeleteContext.event;
+        this._onDidChangeContext = this._register(( (new Emitter())));
+        this.onDidChangeContext = this._onDidChangeContext.event;
         this._onDidAcceptFollowup = this._register(( (new Emitter())));
         this.onDidAcceptFollowup = this._onDidAcceptFollowup.event;
         this._indexOfLastAttachedContextDeletedWithKeyboard = -1;
@@ -122,18 +121,16 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         const verbose = this.configurationService.getValue(AccessibilityVerbositySettingId.Chat);
         if (verbose) {
             const kbLabel = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getLabel();
-            return kbLabel ? ( localizeWithPath(
-                _moduleId,
-                0,
+            return kbLabel ? ( localize(
+                7148,
                 "Chat Input,  Type to ask questions or type / for topics, press enter to send out the request. Use {0} for Chat Accessibility Help.",
                 kbLabel
-            )) : ( localizeWithPath(
-                _moduleId,
-                1,
+            )) : ( localize(
+                7149,
                 "Chat Input,  Type code here and press Enter to run. Use the Chat Accessibility Help command for more information."
             ));
         }
-        return ( localizeWithPath(_moduleId, 2, "Chat Input"));
+        return ( localize(7150, "Chat Input"));
     }
     updateState(inputState) {
         if (this.inHistoryNavigation) {
@@ -255,11 +252,30 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this._inputEditorElement.appendChild(domNode);
         this._inputEditor.focus();
     }
-    attachContext(...contentReferences) {
-        for (const reference of contentReferences) {
-            this.attachedContext.add(reference);
+    clearContext() {
+        if (this._attachedContext.size > 0) {
+            const removed = Array.from(this._attachedContext);
+            this._attachedContext.clear();
+            this._onDidChangeContext.fire({ removed });
+        }
+    }
+    attachContext(overwrite, ...contentReferences) {
+        const removed = [];
+        if (overwrite) {
+            removed.push(...Array.from(this._attachedContext));
+            this._attachedContext.clear();
+        }
+        if (contentReferences.length > 0) {
+            for (const reference of contentReferences) {
+                this._attachedContext.add(reference);
+            }
+        }
+        if (removed.length > 0 || contentReferences.length > 0) {
+            this.initAttachedContext(this.attachedContextContainer);
+            if (!overwrite) {
+                this._onDidChangeContext.fire({ removed, added: contentReferences });
+            }
         }
-        this.initAttachedContext(this.attachedContextContainer);
     }
     render(container, initialValue, widget) {
         this.container = append(container, $('.interactive-input-part'));
@@ -271,7 +287,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         const inputContainer = append(inputAndSideToolbar, $('.interactive-input-and-execute-toolbar'));
         const inputScopedContextKeyService = this._register(this.contextKeyService.createScoped(inputContainer));
         CONTEXT_IN_CHAT_INPUT.bindTo(inputScopedContextKeyService).set(true);
-        const scopedInstantiationService = this.instantiationService.createChild(( (new ServiceCollection([IContextKeyService, inputScopedContextKeyService]))));
+        const scopedInstantiationService = this._register(this.instantiationService.createChild(( (new ServiceCollection([IContextKeyService, inputScopedContextKeyService])))));
         const { historyNavigationBackwardsEnablement, historyNavigationForwardsEnablement } = this._register(registerAndCreateHistoryNavigationContext(inputScopedContextKeyService, this));
         this.historyNavigationBackwardsEnablement = historyNavigationBackwardsEnablement;
         this.historyNavigationForewardsEnablement = historyNavigationForwardsEnablement;
@@ -294,6 +310,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             insertMode: 'replace',
         };
         options.scrollbar = { ...(options.scrollbar ?? {}), vertical: 'hidden' };
+        options.stickyScroll = { enabled: false };
         this._inputEditorElement = append(inputContainer, $('.interactive-input-editor'));
         const editorOptions = getSimpleCodeEditorWidgetOptions();
         editorOptions.contributions?.push(...EditorExtensionsRegistry.getSomeEditorContributions([HoverController.ID]));
@@ -337,7 +354,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             actionViewItemProvider: (action, options) => {
                 if (this.location === ChatAgentLocation.Panel) {
                     if ((action.id === SubmitAction.ID || action.id === CancelAction.ID) && action instanceof MenuItemAction) {
-                        const dropdownAction = this.instantiationService.createInstance(MenuItemAction, { id: 'chat.moreExecuteActions', title: ( localizeWithPath(_moduleId, 3, "More...")), icon: Codicon.chevronDown }, undefined, undefined, undefined, undefined);
+                        const dropdownAction = this.instantiationService.createInstance(MenuItemAction, { id: 'chat.moreExecuteActions', title: ( localize(7151, "More...")), icon: Codicon.chevronDown }, undefined, undefined, undefined, undefined);
                         return this.instantiationService.createInstance(ChatSubmitDropdownActionItem, action, dropdownAction);
                     }
                 }
@@ -377,6 +394,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         }
     }
     initAttachedContext(container) {
+        const oldHeight = container.offsetHeight;
         clearNode(container);
         this.attachedContextDisposables.clear();
         setVisibility(Boolean(this.attachedContext.size), this.attachedContextContainer);
@@ -392,14 +410,13 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                 const fileBasename = basename(file.path);
                 const fileDirname = dirname(file.path);
                 const friendlyName = `${fileBasename} ${fileDirname}`;
-                const ariaLabel = range ? ( localizeWithPath(
-                    _moduleId,
-                    4,
+                const ariaLabel = range ? ( localize(
+                    7152,
                     "Attached file, {0}, line {1} to line {2}",
                     friendlyName,
                     range.startLineNumber,
                     range.endLineNumber
-                )) : ( localizeWithPath(_moduleId, 5, "Attached file, {0}", friendlyName));
+                )) : ( localize(7153, "Attached file, {0}", friendlyName));
                 label.setFile(file, {
                     fileKind: FileKind.FILE,
                     hidePath: true,
@@ -410,8 +427,9 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             }
             else {
                 const attachmentLabel = attachment.fullName ?? attachment.name;
-                label.setLabel(attachmentLabel, undefined);
-                widget.ariaLabel = ( localizeWithPath(_moduleId, 6, "Attached context, {0}", attachment.name));
+                const withIcon = attachment.icon?.id ? `$(${attachment.icon.id}) ${attachmentLabel}` : attachmentLabel;
+                label.setLabel(withIcon, undefined);
+                widget.ariaLabel = ( localize(7154, "Attached context, {0}", attachment.name));
                 widget.tabIndex = 0;
             }
             const clearButton = ( (new Button(widget, { supportIcons: true })));
@@ -421,7 +439,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             this.attachedContextDisposables.add(clearButton);
             clearButton.icon = Codicon.close;
             const disp = clearButton.onDidClick((e) => {
-                this.attachedContext.delete(attachment);
+                this._attachedContext.delete(attachment);
                 disp.dispose();
                 if (isKeyboardEvent(e)) {
                     const event = ( (new StandardKeyboardEvent(e)));
@@ -430,10 +448,13 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                     }
                 }
                 this._onDidChangeHeight.fire();
-                this._onDidDeleteContext.fire(attachment);
+                this._onDidChangeContext.fire({ removed: [attachment] });
             });
             this.attachedContextDisposables.add(disp);
         });
+        if (oldHeight !== container.offsetHeight) {
+            this._onDidChangeHeight.fire();
+        }
     }
     async renderFollowups(items, response) {
         if (!this.options.renderFollowups) {
@@ -519,7 +540,7 @@ let ChatSubmitDropdownActionItem = class ChatSubmitDropdownActionItem extends Dr
             if (secondaryAgent) {
                 secondary.forEach(a => {
                     if (a.id === ChatSubmitSecondaryAgentAction.ID) {
-                        a.label = ( localizeWithPath(_moduleId, 7, "Send to @{0}", secondaryAgent.name));
+                        a.label = ( localize(7155, "Send to @{0}", secondaryAgent.name));
                     }
                     return a;
                 });

package/vscode/src/vs/workbench/contrib/chat/browser/chatListRenderer.js

@@ -8,7 +8,7 @@ import { Codicon } from '../../../../base/common/codicons.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { KeyCode } from '../../../../base/common/keyCodes.js';
-import { Disposable, toDisposable, dispose, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { Disposable, dispose, toDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { ResourceMap } from '../../../../base/common/map.js';
 import { FileAccess } from '../../../../base/common/network.js';
 import { clamp } from '../../../../base/common/numbers.js';
@@ -18,7 +18,7 @@ import '../../../../base/common/observableInternal/utils.js';
 import '../../../../base/common/cancellation.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { URI } from '../../../../base/common/uri.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { createActionViewItem, MenuEntryActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
 import { MenuId, MenuItemAction } from '../../../../platform/actions/common/actions.js';
@@ -33,11 +33,13 @@ import { ColorScheme } from '../../../../platform/theme/common/theme.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
 import { GeneratingPhrase } from './chat.js';
 import { ChatAgentHover, getChatAgentHoverOptions } from './chatAgentHover.js';
+import { ChatAttachmentsContentPart } from './chatContentParts/chatAttachmentsContentPart.js';
+import { ChatCodeCitationContentPart } from './chatContentParts/chatCodeCitationContentPart.js';
 import { ChatCommandButtonContentPart } from './chatContentParts/chatCommandContentPart.js';
 import { ChatConfirmationContentPart } from './chatContentParts/chatConfirmationContentPart.js';
 import { EditorPool, ChatMarkdownContentPart } from './chatContentParts/chatMarkdownContentPart.js';
 import { ChatProgressContentPart } from './chatContentParts/chatProgressContentPart.js';
-import { ContentReferencesListPool, ChatReferencesContentPart } from './chatContentParts/chatReferencesContentPart.js';
+import { CollapsibleListPool, ChatCollapsibleListContentPart } from './chatContentParts/chatReferencesContentPart.js';
 import { ChatTaskContentPart } from './chatContentParts/chatTaskContentPart.js';
 import { DiffEditorPool, ChatTextEditContentPart } from './chatContentParts/chatTextEditContentPart.js';
 import { TreePool, ChatTreeContentPart } from './chatContentParts/chatTreeContentPart.js';
@@ -53,7 +55,6 @@ import { isResponseVM, isRequestVM, isWelcomeVM } from '../common/chatViewModel.
 import { getNWords } from '../common/chatWordCounter.js';
 import { annotateSpecialMarkdownContent } from '../common/annotations.js';
 var ChatListItemRenderer_1;
-const _moduleId = "vs/workbench/contrib/chat/browser/chatListRenderer";
 const $ = $$1;
 let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
     static { ChatListItemRenderer_1 = this; }
@@ -88,7 +89,7 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
         this._editorPool = this._register(this.instantiationService.createInstance(EditorPool, editorOptions, delegate, overflowWidgetsDomNode));
         this._diffEditorPool = this._register(this.instantiationService.createInstance(DiffEditorPool, editorOptions, delegate, overflowWidgetsDomNode));
         this._treePool = this._register(this.instantiationService.createInstance(TreePool, this._onDidChangeVisibility.event));
-        this._contentReferencesListPool = this._register(this.instantiationService.createInstance(ContentReferencesListPool, this._onDidChangeVisibility.event));
+        this._contentReferencesListPool = this._register(this.instantiationService.createInstance(CollapsibleListPool, this._onDidChangeVisibility.event));
         this._register(this.instantiationService.createInstance(ChatCodeBlockContentProvider));
     }
     get templateId() {
@@ -107,10 +108,9 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
             return 80;
         }
         if (element.contentUpdateTimings && element.contentUpdateTimings.impliedWordLoadRate) {
-            const minRate = 12;
+            const minRate = 5;
             const maxRate = 80;
-            const rateBoost = 1.5;
-            const rate = element.contentUpdateTimings.impliedWordLoadRate * rateBoost;
+            const rate = element.contentUpdateTimings.impliedWordLoadRate;
             return clamp(rate, minRate, maxRate);
         }
         return 8;
@@ -182,7 +182,7 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
         const value = append(valueParent, $('.value'));
         const elementDisposables = ( (new DisposableStore()));
         const contextKeyService = templateDisposables.add(this.contextKeyService.createScoped(rowContainer));
-        const scopedInstantiationService = this.instantiationService.createChild(( (new ServiceCollection([IContextKeyService, contextKeyService]))));
+        const scopedInstantiationService = templateDisposables.add(this.instantiationService.createChild(( (new ServiceCollection([IContextKeyService, contextKeyService])))));
         let titleToolbar;
         if (this.rendererOptions.noHeader) {
             header.classList.add('hidden');
@@ -299,9 +299,12 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
     }
     _renderDetail(element, templateData) {
         clearNode(templateData.detail);
-        if (element.slashCommand && element.agentOrSlashCommandDetected) {
-            const usingMsg = `${chatSubcommandLeader}${element.slashCommand.name}`;
-            const msg = ( localizeWithPath(_moduleId, 0, "used {0} [[(rerun without)]]", usingMsg));
+        if (element.agentOrSlashCommandDetected) {
+            const msg = element.slashCommand ? ( localize(
+                7156,
+                "used {0} [[(rerun without)]]",
+                `${chatSubcommandLeader}${element.slashCommand.name}`
+            )) : ( localize(7157, "[[(rerun without)]]"));
             reset(templateData.detail, renderFormattedText(msg, {
                 className: 'agentOrSlashCommandDetected',
                 inline: true,
@@ -354,9 +357,12 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
             value = [{ content: ( (new MarkdownString(markdown))), kind: 'markdownContent' }];
         }
         else if (isResponseVM(element)) {
-            value = annotateSpecialMarkdownContent(element.response.value);
             if (element.contentReferences.length) {
-                value.unshift({ kind: 'references', references: element.contentReferences });
+                value.push({ kind: 'references', references: element.contentReferences });
+            }
+            value.push(...annotateSpecialMarkdownContent(element.response.value));
+            if (element.codeCitations.length) {
+                value.push({ kind: 'codeCitations', citations: element.codeCitations });
             }
         }
         clearNode(templateData.value);
@@ -377,7 +383,17 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
                 parts.push(newPart);
             }
         });
+        if (templateData.renderedParts) {
+            dispose(templateData.renderedParts);
+        }
         templateData.renderedParts = parts;
+        if (isRequestVM(element) && element.variables.length) {
+            const newPart = this.renderAttachments(element.variables, element.contentReferences, templateData);
+            if (newPart) {
+                templateData.value.appendChild(newPart.domNode);
+                templateData.elementDisposables.add(newPart);
+            }
+        }
         if (isResponseVM(element) && element.errorDetails?.message) {
             const renderedError = this.instantiationService.createInstance(ChatWarningContentPart, element.errorDetails.responseIsFiltered ? 'info' : 'error', ( (new MarkdownString(element.errorDetails.message))), this.renderer);
             templateData.elementDisposables.add(renderedError);
@@ -406,7 +422,7 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
         clearNode(templateData.value);
         element.content.forEach((item, i) => {
             if (Array.isArray(item)) {
-                const scopedInstaService = this.instantiationService.createChild(( (new ServiceCollection([IContextKeyService, templateData.contextKeyService]))));
+                const scopedInstaService = templateData.elementDisposables.add(this.instantiationService.createChild(( (new ServiceCollection([IContextKeyService, templateData.contextKeyService])))));
                 templateData.elementDisposables.add(scopedInstaService.createInstance(ChatFollowups, templateData.value, item, this.location, undefined, followup => this._onDidClickFollowup.fire(followup)));
             }
             else {
@@ -436,37 +452,35 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
         if (!this._isVisible) {
             return true;
         }
-        let isFullyRendered = false;
         if (element.isCanceled) {
             this.traceLayout('doNextProgressiveRender', `canceled, index=${index}`);
             element.renderData = undefined;
             this.basicRenderElement(element, index, templateData);
-            isFullyRendered = true;
+            return true;
         }
-        else {
-            this.traceLayout('doNextProgressiveRender', `START progressive render, index=${index}, renderData=${JSON.stringify(element.renderData)}`);
-            const contentForThisTurn = this.getNextProgressiveRenderContent(element);
-            const partsToRender = this.diff(templateData.renderedParts ?? [], contentForThisTurn, element);
-            isFullyRendered = partsToRender.every(part => part === null);
-            if (isFullyRendered && element.isComplete) {
+        let isFullyRendered = false;
+        this.traceLayout('doNextProgressiveRender', `START progressive render, index=${index}, renderData=${JSON.stringify(element.renderData)}`);
+        const contentForThisTurn = this.getNextProgressiveRenderContent(element);
+        const partsToRender = this.diff(templateData.renderedParts ?? [], contentForThisTurn, element);
+        isFullyRendered = partsToRender.every(part => part === null);
+        if (isFullyRendered) {
+            if (element.isComplete) {
                 this.traceLayout('doNextProgressiveRender', `END progressive render, index=${index} and clearing renderData, response is complete`);
                 element.renderData = undefined;
                 this.basicRenderElement(element, index, templateData);
+                return true;
             }
-            else if (!isFullyRendered) {
-                this.traceLayout('doNextProgressiveRender', `doing progressive render, ${partsToRender.length} parts to render`);
-                this.renderChatContentDiff(partsToRender, contentForThisTurn, element, templateData);
-            }
-            else {
-                return false;
-            }
+            this.traceLayout('doNextProgressiveRender', 'caught up with the stream- no new content to render');
+            return false;
         }
+        this.traceLayout('doNextProgressiveRender', `doing progressive render, ${partsToRender.length} parts to render`);
+        this.renderChatContentDiff(partsToRender, contentForThisTurn, element, templateData);
         const height = templateData.rowContainer.offsetHeight;
         element.currentRenderedHeight = height;
         if (!isInRenderElement) {
             this._onDidChangeItemHeight.fire({ element, height: templateData.rowContainer.offsetHeight });
         }
-        return isFullyRendered;
+        return false;
     }
     renderChatContentDiff(partsToRender, contentForThisTurn, element, templateData) {
         const renderedParts = templateData.renderedParts ?? [];
@@ -509,13 +523,14 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
     getNextProgressiveRenderContent(element) {
         const data = this.getDataForProgressiveRender(element);
         const renderableResponse = annotateSpecialMarkdownContent(element.response.value);
-        this.traceLayout('getNextProgressiveRenderContent', `Want to render ${data.numWordsToRender}, counting...`);
+        this.traceLayout('getNextProgressiveRenderContent', `Want to render ${data.numWordsToRender} at ${data.rate} words/s, counting...`);
         let numNeededWords = data.numWordsToRender;
         const partsToRender = [];
         if (element.contentReferences.length) {
             partsToRender.push({ kind: 'references', references: element.contentReferences });
         }
-        for (const part of renderableResponse) {
+        for (let i = 0; i < renderableResponse.length; i++) {
+            const part = renderableResponse[i];
             if (numNeededWords <= 0) {
                 break;
             }
@@ -527,16 +542,18 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
                 else {
                     partsToRender.push({ kind: 'markdownContent', content: ( (new MarkdownString(wordCountResult.value, part.content))) });
                 }
-                this.traceLayout('getNextProgressiveRenderContent', `  Want to render ${numNeededWords} words and found ${wordCountResult.returnedWordCount} words. Total words in chunk: ${wordCountResult.totalWordCount}`);
+                this.traceLayout('getNextProgressiveRenderContent', `  Chunk ${i}: Want to render ${numNeededWords} words and found ${wordCountResult.returnedWordCount} words. Total words in chunk: ${wordCountResult.totalWordCount}`);
                 numNeededWords -= wordCountResult.returnedWordCount;
             }
             else {
                 partsToRender.push(part);
             }
         }
-        this.traceLayout('getNextProgressiveRenderContent', `Want to render ${data.numWordsToRender} words and ${data.numWordsToRender - numNeededWords} words available`);
+        const lastWordCount = element.contentUpdateTimings?.lastWordCount ?? 0;
         const newRenderedWordCount = data.numWordsToRender - numNeededWords;
-        if (newRenderedWordCount !== element.renderData?.renderedWordCount) {
+        const bufferWords = lastWordCount - newRenderedWordCount;
+        this.traceLayout('getNextProgressiveRenderContent', `Want to render ${data.numWordsToRender} words. Rendering ${newRenderedWordCount} words. Buffer: ${bufferWords} words`);
+        if (newRenderedWordCount > 0 && newRenderedWordCount !== element.renderData?.renderedWordCount) {
             element.renderData = { lastRenderTime: Date.now(), renderedWordCount: newRenderedWordCount, renderedParts: partsToRender };
         }
         return partsToRender;
@@ -595,6 +612,9 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
         else if (content.kind === 'references') {
             return this.renderContentReferencesListData(content, undefined, context, templateData);
         }
+        else if (content.kind === 'codeCitations') {
+            return this.renderCodeCitationsListData(content, context, templateData);
+        }
         return undefined;
     }
     renderTreeData(content, templateData, context) {
@@ -623,12 +643,16 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
         return treePart;
     }
     renderContentReferencesListData(references, labelOverride, context, templateData) {
-        const referencesPart = this.instantiationService.createInstance(ChatReferencesContentPart, references.references, labelOverride, context.element, this._contentReferencesListPool);
+        const referencesPart = this.instantiationService.createInstance(ChatCollapsibleListContentPart, references.references, labelOverride, context.element, this._contentReferencesListPool);
         referencesPart.addDisposable(referencesPart.onDidChangeHeight(() => {
             this.updateItemHeight(templateData);
         }));
         return referencesPart;
     }
+    renderCodeCitationsListData(citations, context, templateData) {
+        const citationsPart = this.instantiationService.createInstance(ChatCodeCitationContentPart, citations, context);
+        return citationsPart;
+    }
     renderProgressTask(task, templateData, context) {
         if (!isResponseVM(context.element)) {
             return;
@@ -644,6 +668,9 @@ let ChatListItemRenderer = class ChatListItemRenderer extends Disposable {
         part.addDisposable(part.onDidChangeHeight(() => this.updateItemHeight(templateData)));
         return part;
     }
+    renderAttachments(variables, contentReferences, templateData) {
+        return this.instantiationService.createInstance(ChatAttachmentsContentPart, variables, contentReferences, undefined);
+    }
     renderTextEdit(context, chatTextEdit, templateData) {
         const textEditPart = this.instantiationService.createInstance(ChatTextEditContentPart, chatTextEdit, context, this.rendererOptions, this._diffEditorPool, this._currentLayoutWidth);
         textEditPart.addDisposable(textEditPart.onDidChangeHeight(() => {

package/vscode/src/vs/workbench/contrib/chat/browser/chatMarkdownRenderer.js

@@ -22,6 +22,8 @@ const allowedHtmlTags = [
     'p',
     'pre',
     'strong',
+    'sub',
+    'sup',
     'table',
     'tbody',
     'td',

package/vscode/src/vs/workbench/contrib/chat/browser/chatWidget.js

@@ -67,9 +67,11 @@ let ChatWidget = class ChatWidget extends Disposable {
     get scopedContextKeyService() {
         return this.contextKeyService;
     }
+    get location() {
+        return this._location.location;
+    }
     constructor(location, viewContext, viewOptions, styles, codeEditorService, contextKeyService, instantiationService, chatService, chatAgentService, chatWidgetService, contextMenuService, chatAccessibilityService, logService, themeService, chatSlashCommandService) {
         super();
-        this.location = location;
         this.viewContext = viewContext;
         this.viewOptions = viewOptions;
         this.styles = styles;
@@ -84,6 +86,8 @@ let ChatWidget = class ChatWidget extends Disposable {
         this.chatSlashCommandService = chatSlashCommandService;
         this._onDidSubmitAgent = this._register(( new Emitter()));
         this.onDidSubmitAgent = this._onDidSubmitAgent.event;
+        this._onDidChangeAgent = this._register(( new Emitter()));
+        this.onDidChangeAgent = this._onDidChangeAgent.event;
         this._onDidFocus = this._register(( new Emitter()));
         this.onDidFocus = this._onDidFocus.event;
         this._onDidChangeViewModel = this._register(( new Emitter()));
@@ -94,8 +98,8 @@ let ChatWidget = class ChatWidget extends Disposable {
         this.onDidClear = this._onDidClear.event;
         this._onDidAcceptInput = this._register(( new Emitter()));
         this.onDidAcceptInput = this._onDidAcceptInput.event;
-        this._onDidDeleteContext = this._register(( new Emitter()));
-        this.onDidDeleteContext = this._onDidDeleteContext.event;
+        this._onDidChangeContext = this._register(( new Emitter()));
+        this.onDidChangeContext = this._onDidChangeContext.event;
         this._onDidHide = this._register(( new Emitter()));
         this.onDidHide = this._onDidHide.event;
         this._onDidChangeParsedInput = this._register(( new Emitter()));
@@ -111,8 +115,14 @@ let ChatWidget = class ChatWidget extends Disposable {
         this._visible = false;
         this.previousTreeScrollHeight = 0;
         this.viewModelDisposables = this._register(( new DisposableStore()));
+        if (typeof location === 'object') {
+            this._location = location;
+        }
+        else {
+            this._location = { location };
+        }
         CONTEXT_IN_CHAT_SESSION.bindTo(contextKeyService).set(true);
-        CONTEXT_CHAT_LOCATION.bindTo(contextKeyService).set(location);
+        CONTEXT_CHAT_LOCATION.bindTo(contextKeyService).set(this._location.location);
         CONTEXT_IN_QUICK_CHAT.bindTo(contextKeyService).set('resource' in viewContext);
         this.agentInInput = CONTEXT_CHAT_INPUT_HAS_AGENT.bindTo(contextKeyService);
         this.requestInProgress = CONTEXT_CHAT_REQUEST_IN_PROGRESS.bindTo(contextKeyService);
@@ -143,8 +153,8 @@ let ChatWidget = class ChatWidget extends Disposable {
                         inner.setSelection({
                             startLineNumber: input.options.selection.startLineNumber,
                             startColumn: input.options.selection.startColumn,
-                            endLineNumber: input.options.selection.startLineNumber ?? input.options.selection.endLineNumber,
-                            endColumn: input.options.selection.startColumn ?? input.options.selection.endColumn
+                            endLineNumber: input.options.selection.endLineNumber ?? input.options.selection.startLineNumber,
+                            endColumn: input.options.selection.endColumn ?? input.options.selection.startColumn
                         });
                     }
                     return inner;
@@ -225,7 +235,7 @@ let ChatWidget = class ChatWidget extends Disposable {
     hasInputFocus() {
         return this.inputPart.hasFocus();
     }
-    moveFocus(item, type) {
+    getSibling(item, type) {
         if (!isResponseVM(item)) {
             return;
         }
@@ -242,7 +252,7 @@ let ChatWidget = class ChatWidget extends Disposable {
         if (indexToFocus < 0 || indexToFocus > responseItems.length - 1) {
             return;
         }
-        this.focus(responseItems[indexToFocus]);
+        return responseItems[indexToFocus];
     }
     clear() {
         if (this._dynamicMessageLayoutData) {
@@ -268,7 +278,8 @@ let ChatWidget = class ChatWidget extends Disposable {
                             ((isWelcomeVM(element) && this.viewModel) ? `_${ChatModelInitState[this.viewModel.initState]}` : '') +
                             `${(isRequestVM(element) || isWelcomeVM(element)) }` +
                             `${isResponseVM(element) && element.renderData ? `_${this.visibleChangeCount}` : ''}` +
-                            (isResponseVM(element) ? `_${element.contentReferences.length}` : '');
+                            (isResponseVM(element) ? `_${element.contentReferences.length}` : '') +
+                            (isRequestVM(element) && element.contentReferences ? `_${element.contentReferences?.length}` : '');
                     },
                 }
             });
@@ -311,7 +322,7 @@ let ChatWidget = class ChatWidget extends Disposable {
         }
     }
     createList(listContainer, options) {
-        const scopedInstantiationService = this._register(this.instantiationService.createChild(( new ServiceCollection([IContextKeyService, this.contextKeyService]))));
+        const scopedInstantiationService = this._register(this._register(this.instantiationService.createChild(( new ServiceCollection([IContextKeyService, this.contextKeyService])))));
         const delegate = scopedInstantiationService.createInstance(ChatListDelegate, this.viewOptions.defaultElementHeight ?? 200);
         const rendererDelegate = {
             getListLength: () => this.tree.getNode(null).visibleChildrenCount,
@@ -414,7 +425,7 @@ let ChatWidget = class ChatWidget extends Disposable {
             });
         }));
         this._register(this.inputPart.onDidFocus(() => this._onDidFocus.fire()));
-        this._register(this.inputPart.onDidDeleteContext((e) => this._onDidDeleteContext.fire(e)));
+        this._register(this.inputPart.onDidChangeContext((e) => this._onDidChangeContext.fire(e)));
         this._register(this.inputPart.onDidAcceptFollowup(e => {
             if (!this.viewModel) {
                 return;
@@ -443,6 +454,7 @@ let ChatWidget = class ChatWidget extends Disposable {
                 sessionId: this.viewModel.sessionId,
                 requestId: e.response.requestId,
                 agentId: e.response.agent?.id,
+                command: e.response.slashCommand?.name,
                 result: e.response.result,
                 action: {
                     kind: 'followUp',
@@ -493,6 +505,11 @@ let ChatWidget = class ChatWidget extends Disposable {
                 c.setInputState(viewState.inputState?.[c.id]);
             }
         });
+        this.viewModelDisposables.add(model.onDidChange((e) => {
+            if (e.kind === 'setAgent') {
+                this._onDidChangeAgent.fire({ agent: e.agent, slashCommand: e.command });
+            }
+        }));
         if (this.tree) {
             this.onDidChangeItems();
             revealLastElement(this.tree);
@@ -555,12 +572,17 @@ let ChatWidget = class ChatWidget extends Disposable {
                 'query' in opts ? opts.query :
                     `${opts.prefix} ${editorValue}`;
             const isUserQuery = !opts || 'prefix' in opts;
-            const result = await this.chatService.sendRequest(this.viewModel.sessionId, input, { location: this.location, parserContext: { selectedAgent: this._lastSelectedAgent }, attachedContext: [...( this.inputPart.attachedContext.values())] });
+            const result = await this.chatService.sendRequest(this.viewModel.sessionId, input, {
+                location: this.location,
+                locationData: this._location.resolveData?.(),
+                parserContext: { selectedAgent: this._lastSelectedAgent },
+                attachedContext: [...( this.inputPart.attachedContext.values())]
+            });
             if (result) {
-                this.inputPart.attachedContext.clear();
                 this.inputPart.acceptInput(isUserQuery);
                 this._onDidSubmitAgent.fire({ agent: result.agent, slashCommand: result.slashCommand });
                 this.inputPart.updateState(this.collectInputState());
+                this.inputPart.clearContext();
                 result.responseCompletePromise.then(() => {
                     const responses = this.viewModel?.getItems().filter(isResponseVM);
                     const lastResponse = responses?.[responses.length - 1];
@@ -572,13 +594,7 @@ let ChatWidget = class ChatWidget extends Disposable {
         return undefined;
     }
     setContext(overwrite, ...contentReferences) {
-        if (overwrite) {
-            this.inputPart.attachedContext.clear();
-        }
-        this.inputPart.attachContext(...contentReferences);
-        if (this.bodyDimension) {
-            this.layout(this.bodyDimension.height, this.bodyDimension.width);
-        }
+        this.inputPart.attachContext(overwrite, ...contentReferences);
     }
     getCodeBlockInfosForResponse(response) {
         return this.renderer.getCodeBlockInfosForResponse(response);