@codingame/monaco-vscode-katex-common 24.3.0 → 25.0.1

package/vscode/src/vs/workbench/contrib/chat/browser/{chatInputPart.js → widget/input/chatInputPart.js}

@@ -29,6 +29,7 @@ import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { EditorExtensionsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions';
 import { CodeEditorWidget } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/codeEditor/codeEditorWidget';
 import { EditorOptions } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/config/editorOptions';
+import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { isLocation } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
 import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
 import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
@@ -40,7 +41,7 @@ import { LinkDetector } from '@codingame/monaco-vscode-api/vscode/vs/editor/cont
 import { SuggestController } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/suggest/browser/suggestController';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IAccessibilityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service';
-import { MenuWorkbenchButtonBar } from '../../../../platform/actions/browser/buttonbar.js';
+import { MenuWorkbenchButtonBar } from '../../../../../../platform/actions/browser/buttonbar.js';
 import { MenuWorkbenchToolBar, HiddenItemStrategy } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/toolbar';
 import { MenuId, MenuItemAction } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
@@ -66,42 +67,42 @@ import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 import { AccessibilityVerbositySettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { AccessibilityCommandId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/common/accessibilityCommands';
 import { getSimpleEditorOptions, getSimpleCodeEditorWidgetOptions, setupSimpleEditorSelectionStyling } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
-import { InlineChatConfigKeys } from '../../inlineChat/common/inlineChat.js';
-import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
+import { InlineChatConfigKeys } from '../../../../inlineChat/common/inlineChat.js';
+import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService';
 import { ChatMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes';
 import { IChatModeService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes.service';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { localChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
-import { getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatUri';
-import { ChatRequestVariableSet, isImageVariableEntry, isNotebookOutputVariableEntry, isPromptFileVariableEntry, isPromptTextVariableEntry, isElementVariableEntry, isPasteVariableEntry, isSCMHistoryItemVariableEntry, isSCMHistoryItemChangeVariableEntry, isSCMHistoryItemChangeRangeVariableEntry, isStringVariableEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries';
-import { ChatHistoryNavigator } from '../common/chatWidgetHistoryService.js';
+import { getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
+import { ChatRequestVariableSet, isImageVariableEntry, isNotebookOutputVariableEntry, isPromptFileVariableEntry, isPromptTextVariableEntry, isElementVariableEntry, isPasteVariableEntry, isSCMHistoryItemVariableEntry, isSCMHistoryItemChangeVariableEntry, isSCMHistoryItemChangeRangeVariableEntry, isStringVariableEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
+import { ChatHistoryNavigator } from '../../../common/widget/chatWidgetHistoryService.js';
 import { ChatModeKind, ChatConfiguration, validateChatMode, ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { ILanguageModelChatMetadata } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels';
 import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
-import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
-import { ContinueChatInSessionAction, ChatContinueInSessionActionItem, ActionLocation } from './actions/chatContinueInAction.js';
-import { ChatSubmitAction, ChatOpenModelPickerActionId, OpenModePickerAction, ChatSessionPrimaryPickerAction } from './actions/chatExecuteActions.js';
+import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
+import { ContinueChatInSessionAction, ChatContinueInSessionActionItem, ActionLocation } from '../../actions/chatContinueInAction.js';
+import { ChatSubmitAction, ChatOpenModelPickerActionId, OpenModePickerAction, ChatSessionPrimaryPickerAction } from '../../actions/chatExecuteActions.js';
 import { IAgentSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service';
-import { ImplicitContextAttachmentWidget } from './attachments/implicitContextAttachment.js';
-import { ChatAttachmentModel } from './chatAttachmentModel.js';
-import { ToolSetOrToolItemAttachmentWidget, NotebookCellOutputChatAttachmentWidget, PromptFileAttachmentWidget, PromptTextAttachmentWidget, FileAttachmentWidget, TerminalCommandAttachmentWidget, ImageAttachmentWidget, ElementChatAttachmentWidget, PasteAttachmentWidget, SCMHistoryItemAttachmentWidget, SCMHistoryItemChangeAttachmentWidget, SCMHistoryItemChangeRangeAttachmentWidget, DefaultChatAttachmentWidget } from './chatAttachmentWidgets.js';
-import { CollapsibleListPool } from './chatContentParts/chatReferencesContentPart.js';
-import { ChatTodoListWidget } from './chatContentParts/chatTodoListWidget.js';
-import { IChatContextService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContextService.service';
-import { ChatDragAndDrop } from './chatDragAndDrop.js';
-import { ChatEditingShowChangesAction, ViewPreviousEditsAction, ViewAllSessionChangesAction } from './chatEditing/chatEditingActions.js';
+import { ImplicitContextAttachmentWidget } from '../../attachments/implicitContextAttachment.js';
+import { ChatAttachmentModel } from '../../attachments/chatAttachmentModel.js';
+import { ToolSetOrToolItemAttachmentWidget, NotebookCellOutputChatAttachmentWidget, PromptFileAttachmentWidget, PromptTextAttachmentWidget, FileAttachmentWidget, TerminalCommandAttachmentWidget, ImageAttachmentWidget, ElementChatAttachmentWidget, PasteAttachmentWidget, SCMHistoryItemAttachmentWidget, SCMHistoryItemChangeAttachmentWidget, SCMHistoryItemChangeRangeAttachmentWidget, DefaultChatAttachmentWidget } from '../../attachments/chatAttachmentWidgets.js';
+import { CollapsibleListPool } from '../chatContentParts/chatReferencesContentPart.js';
+import { ChatTodoListWidget } from '../chatContentParts/chatTodoListWidget.js';
+import { IChatContextService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/contextContrib/chatContextService.service';
+import { ChatDragAndDrop } from '../chatDragAndDrop.js';
+import { ChatEditingShowChangesAction, ViewPreviousEditsAction, ViewAllSessionChangesAction } from '../../chatEditing/chatEditingActions.js';
 import { ChatFollowups } from './chatFollowups.js';
 import { ChatInputPartWidgetController } from './chatInputPartWidgets.js';
 import { ChatSelectedTools } from './chatSelectedTools.js';
-import { ChatSessionPickerActionItem } from './chatSessions/chatSessionPickerActionItem.js';
-import { ChatImplicitContext } from './contrib/chatImplicitContext.js';
-import { ChatRelatedFiles } from './contrib/chatInputRelatedFilesContrib.js';
-import { resizeImage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/imageUtils';
-import { ModelPickerActionItem } from './modelPicker/modelPickerActionItem.js';
-import { ModePickerActionItem } from './modelPicker/modePickerActionItem.js';
+import { ChatSessionPickerActionItem } from '../../chatSessions/chatSessionPickerActionItem.js';
+import { ChatImplicitContext } from '../../attachments/chatImplicitContext.js';
+import { ChatRelatedFiles } from '../../attachments/chatInputRelatedFilesContrib.js';
+import { resizeImage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatImageUtils';
+import { ModelPickerActionItem } from './modelPickerActionItem.js';
+import { ModePickerActionItem } from './modePickerActionItem.js';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 import { derivedOpts, derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
@@ -707,44 +708,44 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         }
         const mode = this._currentModeObservable.get();
         const modelName = this._currentLanguageModel?.metadata.name;
-        const modelInfo = modelName ? ( localize(5307, ", {0}. ", modelName)) : '';
+        const modelInfo = modelName ? ( localize(5812, ", {0}. ", modelName)) : '';
         let modeLabel = '';
         if (!mode.isBuiltin) {
             const mode = this.currentModeObs.get();
-            modeLabel = ( localize(5308, "({0}), {1}", mode.label.get(), mode.description.get()));
+            modeLabel = ( localize(5813, "({0}), {1}", mode.label.get(), mode.description.get()));
         }
         else {
             switch (this.currentModeKind) {
                 case ChatModeKind.Agent:
-                    modeLabel = ( localize(5309, "(Agent), edit files in your workspace."));
+                    modeLabel = ( localize(5814, "(Agent), edit files in your workspace."));
                     break;
                 case ChatModeKind.Edit:
-                    modeLabel = ( localize(5310, "(Edit), edit files in your workspace."));
+                    modeLabel = ( localize(5815, "(Edit), edit files in your workspace."));
                     break;
                 case ChatModeKind.Ask:
                 default:
-                    modeLabel = ( localize(5311, "(Ask), ask questions or type / for topics."));
+                    modeLabel = ( localize(5816, "(Ask), ask questions or type / for topics."));
                     break;
             }
         }
         if (verbose) {
             return kbLabel
                 ? ( localize(
-                5312,
+                5817,
                 "Chat Input {0}{1} Press Enter to send out the request. Use {2} for Chat Accessibility Help.",
                 modeLabel,
                 modelInfo,
                 kbLabel
             ))
                 : ( localize(
-                5313,
+                5818,
                 "Chat Input {0}{1} Press Enter to send out the request. Use the Chat Accessibility Help command for more information.",
                 modeLabel,
                 modelInfo
             ));
         }
         else {
-            return localize(5314, "Chat Input {0}{1}.", modeLabel, modelInfo);
+            return localize(5819, "Chat Input {0}{1}.", modeLabel, modelInfo);
         }
     }
     validateCurrentChatMode() {
@@ -1113,7 +1114,6 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             this._implicitContext = undefined;
         }
         this.tryUpdateWidgetController();
-        this.renderAttachedContext();
         this._register(this._attachmentModel.onDidChange((e) => {
             if (e.added.length > 0) {
                 this._indexOfLastAttachedContextDeletedWithKeyboard = -1;
@@ -1351,12 +1351,13 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                 return undefined;
             }
         }));
-        this.addFilesToolbar.context = { widget, placeholder: ( localize(5315, 'Search for files and context to add to your request')) };
+        this.addFilesToolbar.context = { widget, placeholder: ( localize(5820, 'Search for files and context to add to your request')) };
         this._register(this.addFilesToolbar.onDidChangeMenuItems(() => {
             if (this.cachedDimensions) {
                 this._onDidChangeHeight.fire();
             }
         }));
+        this.renderAttachedContext();
     }
     toggleChatInputOverlay(editing) {
         this.chatInputOverlay.classList.toggle('disabled', editing);
@@ -1455,17 +1456,9 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         const implicitValue = this.implicitContext?.value;
         if (isSuggestedEnabled && implicitValue) {
             const targetUri = this.implicitContext.uri;
-            const currentlyAttached = ( attachments.some(([, attachment]) => {
-                let uri;
-                if (URI.isUri(attachment.value)) {
-                    uri = attachment.value;
-                }
-                else if (isStringVariableEntry(attachment)) {
-                    uri = attachment.uri;
-                }
-                return uri && isEqual(uri, targetUri);
-            }));
-            const shouldShowImplicit = !isLocation(implicitValue) ? !currentlyAttached : implicitValue.range;
+            const targetRange = isLocation(implicitValue) ? implicitValue.range : undefined;
+            const currentlyAttached = this.isAttachmentAlreadyAttached(targetUri, targetRange, ( attachments.map(([, a]) => a)));
+            const shouldShowImplicit = !currentlyAttached;
             if (shouldShowImplicit) {
                 const implicitPart = store.add(this.instantiationService.createInstance(ImplicitContextAttachmentWidget, () => this._widget, this.implicitContext, this._contextResourceLabels, this._attachmentModel));
                 container.appendChild(implicitPart.domNode);
@@ -1489,13 +1482,36 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         const isUri = URI.isUri(implicit);
         if (isUri || isLocation(implicit)) {
             const targetUri = isUri ? implicit : implicit.uri;
-            const attachments = [...this._attachmentModel.attachments.entries()];
-            const currentlyAttached = ( attachments.some(([, a]) => URI.isUri(a.value) && isEqual(a.value, targetUri)));
-            const shouldShowImplicit = isUri ? !currentlyAttached : implicit.range;
-            return !!shouldShowImplicit;
+            const targetRange = isLocation(implicit) ? implicit.range : undefined;
+            const attachments = [...( this._attachmentModel.attachments.values())];
+            const currentlyAttached = this.isAttachmentAlreadyAttached(targetUri, targetRange, attachments);
+            return !currentlyAttached;
         }
         return false;
     }
+    isAttachmentAlreadyAttached(targetUri, targetRange, attachments) {
+        return ( attachments.some((attachment) => {
+            let uri;
+            let range;
+            if (URI.isUri(attachment.value)) {
+                uri = attachment.value;
+            }
+            else if (isLocation(attachment.value)) {
+                uri = attachment.value.uri;
+                range = attachment.value.range;
+            }
+            else if (isStringVariableEntry(attachment)) {
+                uri = attachment.uri;
+            }
+            if (!uri || !isEqual(uri, targetUri)) {
+                return false;
+            }
+            if (targetRange) {
+                return range && Range.equalsRange(range, targetRange);
+            }
+            return true;
+        }));
+    }
     handleAttachmentDeletion(e, index, attachment) {
         if (isKeyboardEvent(e)) {
             this._indexOfLastAttachedContextDeletedWithKeyboard = index;
@@ -1659,7 +1675,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         const button = this._chatEditsActionsDisposables.add(( new ButtonWithIcon(overviewTitle, {
             supportIcons: true,
             secondary: true,
-            ariaLabel: ( localize(5316, 'Toggle changed files.')),
+            ariaLabel: ( localize(5821, 'Toggle changed files.')),
         })));
         const topLevelStats = derived(reader => {
             let added = 0;
@@ -1671,7 +1687,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                     removed += entry.linesRemoved.read(reader);
                 }
             }
-            let baseLabel = entries.length === 1 ? ( localize(5317, '1 file changed')) : ( localize(5318, '{0} files changed', entries.length));
+            let baseLabel = entries.length === 1 ? ( localize(5822, '1 file changed')) : ( localize(5823, '{0} files changed', entries.length));
             let shouldShowEditingSession = added > 0 || removed > 0;
             let topLevelIsSessionMenu = false;
             if (added === 0 && removed === 0) {
@@ -1681,7 +1697,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                     removed += entry.deletions;
                 }
                 shouldShowEditingSession = sessionValue.length > 0;
-                baseLabel = sessionValue.length === 1 ? ( localize(5319, '1 file ready to merge')) : ( localize(5320, '{0} files ready to merge', sessionValue.length));
+                baseLabel = sessionValue.length === 1 ? ( localize(5824, '1 file ready to merge')) : ( localize(5825, '{0} files ready to merge', sessionValue.length));
                 topLevelIsSessionMenu = true;
             }
             button.label = baseLabel;
@@ -1711,7 +1727,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             button.label = baseLabel;
             this._workingSetLinesAddedSpan.value.textContent = `+${added}`;
             this._workingSetLinesRemovedSpan.value.textContent = `-${removed}`;
-            button.element.setAttribute('aria-label', ( localize(5321, '{0}, {1} lines added, {2} lines removed', baseLabel, added, removed)));
+            button.element.setAttribute('aria-label', ( localize(5826, '{0}, {1} lines added, {2} lines removed', baseLabel, added, removed)));
             setVisibility(shouldShowEditingSession, this.chatEditingSessionWidgetContainer);
             if (!shouldShowEditingSession) {
                 this._onDidChangeHeight.fire();
@@ -1786,7 +1802,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                 if (editEntries.length > 0) {
                     allEntries.push({
                         kind: 'divider',
-                        label: ( localize(5322, 'Worktree Changes')),
+                        label: ( localize(5827, 'Worktree Changes')),
                         menuId: MenuId.ChatEditingSessionChangesToolbar,
                         menuArg: sessionResource,
                         scopedInstantiationService,
@@ -1822,7 +1838,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             uriLabel.label = this.labelService.getUriBasenameLabel(uri);
             uriLabel.element.classList.add('monaco-icon-label');
             uriLabel.element.title = ( localize(
-                5323,
+                5828,
                 "{0} - {1}",
                 this.labelService.getUriLabel(uri, { relative: true }),
                 description ?? ''
@@ -1837,13 +1853,13 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                 secondary: true,
                 hoverDelegate,
                 ariaLabel: ( localize(
-                    5324,
+                    5829,
                     'Add suggestion {0}',
                     this.labelService.getUriLabel(uri, { relative: true })
                 )),
             })));
             addButton.icon = Codicon.add;
-            addButton.setTitle(( localize(5325, 'Add suggestion')));
+            addButton.setTitle(( localize(5830, 'Add suggestion')));
             this._chatEditsActionsDisposables.add(addButton.onDidClick(async () => {
                 group.remove();
                 await this._attachmentModel.addFile(uri);

package/vscode/src/vs/workbench/contrib/chat/browser/{chatSelectedTools.d.ts → widget/input/chatSelectedTools.d.ts}

@@ -2,10 +2,10 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
-import { UserSelectedTools } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents";
+import { UserSelectedTools } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents";
 import { IChatMode } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes";
-import { IToolAndToolSetEnablementMap } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
-import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service";
+import { IToolAndToolSetEnablementMap } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService";
+import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service";
 export declare enum ToolsScope {
     Global = 0,
     Session = 1,

package/vscode/src/vs/workbench/contrib/chat/browser/{chatSelectedTools.js → widget/input/chatSelectedTools.js}

@@ -9,8 +9,8 @@ import { observableMemento } from '@codingame/monaco-vscode-api/vscode/vs/platfo
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { ToolSet } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
-import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
+import { ToolSet } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
+import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
 import { PromptsStorage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
 import { PromptFileRewriter } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/promptSyntax/promptFileRewriter';
 import { ObservableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/map';

package/vscode/src/vs/workbench/contrib/chat/browser/{contrib → widget/input/editor}/chatInputCompletions.js

@@ -5,6 +5,7 @@ import { raceTimeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/
 import { decodeBase64 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
 import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { StopWatch } from '@codingame/monaco-vscode-api/vscode/vs/base/common/stopwatch';
 import { isPatternInWord } from '@codingame/monaco-vscode-api/vscode/vs/base/common/filters';
 import { Disposable, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ResourceSet } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
@@ -33,28 +34,28 @@ import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/pla
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
-import { EditorsOrder } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
+import { EditorsOrder, isDiffEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IHistoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/history/common/history.service';
 import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { ISearchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/search/common/search.service';
-import { McpPromptArgumentPick } from '../../../mcp/browser/mcpPromptArgumentPick.js';
+import { McpPromptArgumentPick } from '../../../../../mcp/browser/mcpPromptArgumentPick.js';
 import { McpResourceURI } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
 import { IMcpService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service';
 import { searchFilesAndFolders } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/search/browser/searchChatContext';
-import { getFullyQualifiedId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents';
-import { IChatAgentService, IChatAgentNameService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
-import { getAttachableImageExtension } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel';
-import { ChatRequestAgentPart, chatSubcommandLeader, chatAgentLeader, ChatRequestAgentSubcommandPart, ChatRequestSlashPromptPart, ChatRequestTextPart, chatVariableLeader, ChatRequestToolPart, ChatRequestToolSetPart } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
-import { IChatSlashCommandService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSlashCommands.service';
+import { getFullyQualifiedId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents';
+import { IChatAgentService, IChatAgentNameService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service';
+import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService.service';
+import { getAttachableImageExtension } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
+import { ChatRequestAgentPart, chatSubcommandLeader, chatAgentLeader, ChatRequestAgentSubcommandPart, ChatRequestSlashPromptPart, ChatRequestTextPart, chatVariableLeader, ChatRequestToolPart, ChatRequestToolSetPart } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatParserTypes';
+import { IChatSlashCommandService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatSlashCommands.service';
 import { ChatAgentLocation, ChatModeKind, isSupportedChatFileScheme } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { ToolSet } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
+import { ToolSet } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
 import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
-import { ChatSubmitAction } from '../actions/chatExecuteActions.js';
+import { ChatSubmitAction } from '../../../actions/chatExecuteActions.js';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { resizeImage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/imageUtils';
-import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
+import { resizeImage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatImageUtils';
+import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatDynamicVariables';
 
 var BuiltinDynamicCompletions_1, ToolCompletions_1;
 let SlashCommandCompletions = class SlashCommandCompletions extends Disposable {
@@ -419,7 +420,7 @@ let AgentCompletions = class AgentCompletions extends Disposable {
                 if (!isEmptyUpToCompletionWord(model, range)) {
                     return;
                 }
-                const label = ( localize(5687, "Install Chat Extensions..."));
+                const label = ( localize(5837, "Install Chat Extensions..."));
                 const item = {
                     label,
                     insertText: '',
@@ -556,7 +557,7 @@ class StartParameterizedPromptAction extends Action2 {
             }
             catch (e) {
                 if (!cts.token.isCancellationRequested) {
-                    notificationService.error(( localize(5688, "Error resolving prompt: {0}", String(e))));
+                    notificationService.error(( localize(5838, "Error resolving prompt: {0}", String(e))));
                 }
                 replaceTextWith('');
                 return;
@@ -587,7 +588,7 @@ class StartParameterizedPromptAction extends Action2 {
                             id: generateUuid(),
                             kind: 'generic',
                             value: contents,
-                            name: ( localize(5689, 'Prompt Resource')),
+                            name: ( localize(5839, 'Prompt Resource')),
                         });
                     }
                 }
@@ -596,8 +597,8 @@ class StartParameterizedPromptAction extends Action2 {
                         .catch(() => decodeBase64(contents).buffer);
                     chatWidget.attachmentModel.addContext({
                         id: generateUuid(),
-                        name: ( localize(5690, 'Prompt Image')),
-                        fullName: ( localize(5690, 'Prompt Image')),
+                        name: ( localize(5840, 'Prompt Image')),
+                        fullName: ( localize(5840, 'Prompt Image')),
                         value: resized,
                         kind: 'image',
                         references: validURI && [{ reference: validURI, kind: 'reference' }],
@@ -793,7 +794,7 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
             const text = `${chatVariableLeader}file:${basename}`;
             const uriLabel = this.labelService.getUriLabel(resource, { relative: true });
             const labelDescription = description
-                ? ( localize(5691, '{0} ({1})', uriLabel, description))
+                ? ( localize(5841, '{0} ({1})', uriLabel, description))
                 : uriLabel;
             const sortText = boostPriority ? ' ' : '!';
             return {
@@ -821,17 +822,18 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
         const seen = ( new ResourceSet());
         const len = result.suggestions.length;
         for (const [i, item] of this.historyService.getHistory().entries()) {
-            if (!item.resource || ( seen.has(item.resource)) || !this.instantiationService.invokeFunction(accessor => isSupportedChatFileScheme(accessor, item.resource.scheme))) {
+            const resource = isDiffEditorInput(item) ? item.modified.resource : item.resource;
+            if (!resource || ( seen.has(resource)) || !this.instantiationService.invokeFunction(accessor => isSupportedChatFileScheme(accessor, resource.scheme))) {
                 continue;
             }
             if (pattern) {
-                const basename = this.labelService.getUriBasenameLabel(item.resource).toLowerCase();
+                const basename = this.labelService.getUriBasenameLabel(resource).toLowerCase();
                 if (!isPatternInWord(pattern, 0, pattern.length, basename, 0, basename.length)) {
                     continue;
                 }
             }
-            seen.add(item.resource);
-            const newLen = result.suggestions.push(makeCompletionItem(item.resource, FileKind.FILE, i === 0 ? ( localize(5692, 'Active file')) : undefined, i === 0));
+            seen.add(resource);
+            const newLen = result.suggestions.push(makeCompletionItem(resource, FileKind.FILE, i === 0 ? ( localize(5842, 'Active file')) : undefined, i === 0));
             if (newLen - len >= 5) {
                 break;
             }
@@ -869,6 +871,8 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
         result.incomplete = true;
     }
     addSymbolEntries(widget, result, info, token) {
+        const timeoutMs = 100;
+        const stopwatch = ( new StopWatch());
         const makeSymbolCompletionItem = (symbolItem, pattern) => {
             const text = `${chatVariableLeader}sym:${symbolItem.name}`;
             const resource = symbolItem.location.uri;
@@ -903,10 +907,15 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
                 symbolsToAdd.push({ symbol, uri: outlineModel.uri });
             }
         }
+        let timedOut = false;
         for (const symbol of symbolsToAdd) {
+            if (stopwatch.elapsed() > timeoutMs || token.isCancellationRequested) {
+                timedOut = true;
+                break;
+            }
             result.suggestions.push(makeSymbolCompletionItem({ ...symbol.symbol, location: { uri: symbol.uri, range: symbol.symbol.range } }, pattern ?? ''));
         }
-        result.incomplete = !!pattern;
+        result.incomplete = !!pattern || timedOut;
     }
     updateCacheKey() {
         if (this.cacheKey && Date.now() - this.cacheKey.time > 60000) {
@@ -1031,6 +1040,7 @@ let ToolCompletions = class ToolCompletions extends Disposable {
                         continue;
                     }
                     let detail;
+                    let documentation;
                     let name;
                     if (item instanceof ToolSet) {
                         detail = item.description;
@@ -1038,8 +1048,9 @@ let ToolCompletions = class ToolCompletions extends Disposable {
                     }
                     else {
                         const source = item.source;
-                        detail = ( localize(5693, "{0}: {1}", source.label, item.displayName));
+                        detail = ( localize(5843, "{0}: {1}", source.label, item.displayName));
                         name = item.toolReferenceName ?? item.displayName;
+                        documentation = item.userDescription ?? item.modelDescription;
                     }
                     if (( usedNames.has(name))) {
                         continue;
@@ -1049,6 +1060,7 @@ let ToolCompletions = class ToolCompletions extends Disposable {
                         label: withLeader,
                         range,
                         detail,
+                        documentation,
                         insertText: withLeader + ' ',
                         kind: CompletionItemKind.Tool,
                         sortText: 'z',

package/vscode/src/vs/workbench/contrib/chat/browser/{modelPicker → widget/input}/modePickerActionItem.d.ts

@@ -1,7 +1,7 @@
 import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { ActionWidgetDropdownActionViewItem } from "../../../../../platform/actions/browser/actionWidgetDropdownActionViewItem.js";
+import { ActionWidgetDropdownActionViewItem } from "../../../../../../platform/actions/browser/actionWidgetDropdownActionViewItem.js";
 import { MenuItemAction } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
 import { IMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service";
 import { IActionWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/platform/actionWidget/browser/actionWidget.service";
@@ -10,7 +10,7 @@ import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
 import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
-import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service";
+import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service";
 import { IChatMode } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes";
 import { IChatModeService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes.service";
 export interface IModePickerDelegate {

package/vscode/src/vs/workbench/contrib/chat/browser/{modelPicker → widget/input}/modePickerActionItem.js

@@ -8,7 +8,7 @@ import { groupBy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/coll
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { ActionWidgetDropdownActionViewItem } from '../../../../../platform/actions/browser/actionWidgetDropdownActionViewItem.js';
+import { ActionWidgetDropdownActionViewItem } from '../../../../../../platform/actions/browser/actionWidgetDropdownActionViewItem.js';
 import { getFlatActionBarActions } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
 import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service';
@@ -18,20 +18,20 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
-import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
+import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service';
 import { ChatMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes';
 import { IChatModeService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes.service';
 import { ChatConfiguration, ChatModeKind, ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { PromptsStorage, ExtensionAgentSourceType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
 import { getOpenChatActionIdForMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { ToggleAgentModeActionId } from '../actions/chatExecuteActions.js';
+import { ToggleAgentModeActionId } from '../../actions/chatExecuteActions.js';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 let ModePickerActionItem = class ModePickerActionItem extends ActionWidgetDropdownActionViewItem {
     constructor(action, delegate, actionWidgetService, chatAgentService, keybindingService, configurationService, contextKeyService, chatModeService, menuService, commandService, productService) {
-        const builtInCategory = { label: ( localize(5739, "Built-In")), order: 0 };
-        const customCategory = { label: ( localize(5740, "Custom")), order: 1 };
-        const policyDisabledCategory = { label: ( localize(5741, "Managed by your organization")), order: 999, showHeader: true };
+        const builtInCategory = { label: ( localize(5852, "Built-In")), order: 0 };
+        const customCategory = { label: ( localize(5853, "Custom")), order: 1 };
+        const policyDisabledCategory = { label: ( localize(5854, "Managed by your organization")), order: 999, showHeader: true };
         const agentModeDisabledViaPolicy = configurationService.inspect(ChatConfiguration.AgentEnabled).policyValue === false;
         const makeAction = (mode, currentMode) => {
             const isDisabledViaPolicy = mode.kind === ChatModeKind.Agent &&
@@ -51,7 +51,9 @@ let ModePickerActionItem = class ModePickerActionItem extends ActionWidgetDropdo
                         return;
                     }
                     const result = await commandService.executeCommand(ToggleAgentModeActionId, { modeId: mode.id, sessionResource: this.delegate.sessionResource() });
-                    this.renderLabel(this.element);
+                    if (this.element) {
+                        this.renderLabel(this.element);
+                    }
                     return result;
                 },
                 category: isDisabledViaPolicy ? policyDisabledCategory : builtInCategory

package/vscode/src/vs/workbench/contrib/chat/browser/{modelPicker → widget/input}/modelPickerActionItem.d.ts

@@ -2,15 +2,16 @@ import { IAction } from "@codingame/monaco-vscode-api/vscode/vs/base/common/acti
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { ILanguageModelChatMetadataAndIdentifier } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels";
 import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { ActionWidgetDropdownActionViewItem } from "../../../../../platform/actions/browser/actionWidgetDropdownActionViewItem.js";
+import { ActionWidgetDropdownActionViewItem } from "../../../../../../platform/actions/browser/actionWidgetDropdownActionViewItem.js";
 import { IActionWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/platform/actionWidget/browser/actionWidget.service";
-import { IActionWidgetDropdownOptions } from "../../../../../platform/actionWidget/browser/actionWidgetDropdown.js";
+import { IActionWidgetDropdownOptions } from "../../../../../../platform/actionWidget/browser/actionWidgetDropdown.js";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 import { IChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service";
 import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
+import { IManagedHoverContent } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hover";
 export interface IModelPickerDelegate {
     readonly onDidChangeModel: Event<ILanguageModelChatMetadataAndIdentifier>;
     getCurrentModel(): ILanguageModelChatMetadataAndIdentifier | undefined;
@@ -23,6 +24,7 @@ export interface IModelPickerDelegate {
 export declare class ModelPickerActionItem extends ActionWidgetDropdownActionViewItem {
     protected currentModel: ILanguageModelChatMetadataAndIdentifier | undefined;
     constructor(action: IAction, currentModel: ILanguageModelChatMetadataAndIdentifier | undefined, widgetOptions: Omit<IActionWidgetDropdownOptions, "label" | "labelRenderer"> | undefined, delegate: IModelPickerDelegate, actionWidgetService: IActionWidgetService, contextKeyService: IContextKeyService, commandService: ICommandService, chatEntitlementService: IChatEntitlementService, keybindingService: IKeybindingService, telemetryService: ITelemetryService, productService: IProductService);
+    protected getHoverContents(): IManagedHoverContent | undefined;
     protected renderLabel(element: HTMLElement): IDisposable | null;
     render(container: HTMLElement): void;
 }