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

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

@@ -2,15 +2,15 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { $, reset } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
-import { renderLabelWithIcons } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/iconLabel/iconLabels';
-import { ActionWidgetDropdownActionViewItem } from '../../../../../platform/actions/browser/actionWidgetDropdownActionViewItem.js';
+import { renderIcon, renderLabelWithIcons } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/iconLabel/iconLabels';
+import { ActionWidgetDropdownActionViewItem } from '../../../../../../platform/actions/browser/actionWidgetDropdownActionViewItem.js';
 import { IActionWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/platform/actionWidget/browser/actionWidget.service';
 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 { ChatEntitlement } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService';
 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 { DEFAULT_MODEL_PICKER_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/modelPicker/modelPickerWidget';
+import { DEFAULT_MODEL_PICKER_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/widget/input/modelPickerWidget';
 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 { MANAGE_CHAT_COMMAND_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
@@ -27,8 +27,8 @@ function modelDelegateToWidgetActionsProvider(delegate, telemetryService) {
                         checked: true,
                         category: DEFAULT_MODEL_PICKER_CATEGORY,
                         class: undefined,
-                        tooltip: ( localize(5742, "Auto")),
-                        label: ( localize(5742, "Auto")),
+                        tooltip: ( localize(5855, "Auto")),
+                        label: ( localize(5855, "Auto")),
                         run: () => { }
                     }];
             }
@@ -66,9 +66,9 @@ function getModelPickerActionBarActionProvider(commandService, chatEntitlementSe
                 chatEntitlementService.isInternal) {
                 additionalActions.push({
                     id: 'manageModels',
-                    label: ( localize(5743, "Manage Models...")),
+                    label: ( localize(5856, "Manage Models...")),
                     enabled: true,
-                    tooltip: ( localize(5744, "Manage Language Models")),
+                    tooltip: ( localize(5857, "Manage Language Models")),
                     class: undefined,
                     run: () => {
                         commandService.executeCommand(MANAGE_CHAT_COMMAND_ID);
@@ -82,9 +82,9 @@ function getModelPickerActionBarActionProvider(commandService, chatEntitlementSe
             if (isNewOrAnonymousUser || chatEntitlementService.entitlement === ChatEntitlement.Free) {
                 additionalActions.push({
                     id: 'moreModels',
-                    label: isNewOrAnonymousUser ? ( localize(5745, "Add Language Models")) : ( localize(5746, "Add Premium Models")),
+                    label: isNewOrAnonymousUser ? ( localize(5858, "Add Language Models")) : ( localize(5859, "Add Premium Models")),
                     enabled: true,
-                    tooltip: isNewOrAnonymousUser ? ( localize(5747, "Add Language Models")) : ( localize(5748, "Add Premium Models")),
+                    tooltip: isNewOrAnonymousUser ? ( localize(5860, "Add Language Models")) : ( localize(5861, "Add Premium Models")),
                     class: undefined,
                     run: () => {
                         const commandId = isNewOrAnonymousUser ? 'workbench.action.chat.triggerSetup' : 'workbench.action.chat.upgradePlan';
@@ -101,8 +101,7 @@ let ModelPickerActionItem = class ModelPickerActionItem extends ActionWidgetDrop
     constructor(action, currentModel, widgetOptions, delegate, actionWidgetService, contextKeyService, commandService, chatEntitlementService, keybindingService, telemetryService, productService) {
         const actionWithLabel = {
             ...action,
-            label: currentModel?.metadata.name ?? ( localize(5742, "Auto")),
-            tooltip: ( localize(5749, "Pick Model")),
+            label: currentModel?.metadata.name ?? ( localize(5855, "Auto")),
             run: () => { }
         };
         const modelPickerActionWidgetOptions = {
@@ -113,17 +112,25 @@ let ModelPickerActionItem = class ModelPickerActionItem extends ActionWidgetDrop
         this.currentModel = currentModel;
         this._register(delegate.onDidChangeModel(model => {
             this.currentModel = model;
+            this.updateTooltip();
             if (this.element) {
                 this.renderLabel(this.element);
             }
         }));
     }
+    getHoverContents() {
+        const label = `${( localize(5862, "Pick Model"))}${super.getHoverContents()}`;
+        const { statusIcon, tooltip } = this.currentModel?.metadata || {};
+        return statusIcon && tooltip ? `${label} • ${tooltip}` : label;
+    }
     renderLabel(element) {
+        const { name, statusIcon } = this.currentModel?.metadata || {};
         const domChildren = [];
-        if (this.currentModel?.metadata.statusIcon) {
-            domChildren.push(...renderLabelWithIcons(`\$(${this.currentModel.metadata.statusIcon.id})`));
+        if (statusIcon) {
+            const iconElement = renderIcon(statusIcon);
+            domChildren.push(iconElement);
         }
-        domChildren.push($('span.chat-model-label', undefined, this.currentModel?.metadata.name ?? ( localize(5742, "Auto"))));
+        domChildren.push($('span.chat-model-label', undefined, name ?? ( localize(5855, "Auto"))));
         domChildren.push(...renderLabelWithIcons(`$(chevron-down)`));
         reset(element, ...domChildren);
         this.setAriaLabelAttributes(element);

package/vscode/src/vs/workbench/contrib/chat/browser/{media → widget/media}/chat.css

@@ -627,6 +627,7 @@ have to be updated for changes to the rules above, or to support more deeply nes
 		background-color: var(--vscode-textPreformat-background);
 		padding: 1px 3px;
 		border-radius: 4px;
+		border: 1px solid var(--vscode-textPreformat-border);
 		white-space: pre-wrap;
 	}
 }
@@ -797,9 +798,9 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	display: none;
 }
 
-.interactive-session .chat-editing-session .monaco-list-row:hover .chat-collapsible-list-action-bar,
-.interactive-session .chat-editing-session .monaco-list-row.focused .chat-collapsible-list-action-bar,
-.interactive-session .chat-editing-session .monaco-list-row.selected .chat-collapsible-list-action-bar {
+.interactive-session .chat-editing-session .monaco-list-row:hover .chat-collapsible-list-action-bar:not(.has-no-actions),
+.interactive-session .chat-editing-session .monaco-list-row.focused .chat-collapsible-list-action-bar:not(.has-no-actions),
+.interactive-session .chat-editing-session .monaco-list-row.selected .chat-collapsible-list-action-bar:not(.has-no-actions) {
 	display: inherit;
 }
 
@@ -1582,10 +1583,9 @@ have to be updated for changes to the rules above, or to support more deeply nes
 .action-item.chat-attachment-button .action-label,
 .interactive-session .chat-attached-context .chat-attached-context-attachment {
 	display: flex;
-	gap: 2px;
 	overflow: hidden;
 	font-size: 11px;
-	padding: 0 4px;
+	padding: 0 4px 0 0;
 	border: 1px solid var(--vscode-chat-requestBorder, var(--vscode-input-background, transparent));
 	border-radius: 4px;
 	height: 18px;
@@ -1593,6 +1593,10 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	width: fit-content;
 }
 
+.action-item.chat-attachment-button .action-label {
+	padding: 0 4px;
+}
+
 .interactive-session .interactive-list .chat-attached-context .chat-attached-context-attachment {
 	font-family: var(--vscode-chat-font-family, inherit);
 	font-size: var(--vscode-chat-font-size-body-xs);
@@ -1657,16 +1661,16 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	display: flex;
 	align-items: center;
 	margin-top: -2px;
-	margin-right: -4px;
-	padding-right: 4px;
-	padding-left: 2px;
+	padding-right: 2px;
+	padding-left: 3px;
 	height: calc(100% + 4px);
 	outline-offset: -4px;
+	font-size: 12px;
 }
 
 .interactive-session .chat-attached-context .chat-attached-context-attachment .monaco-button.codicon.codicon-plus {
-	padding: 0 5px 0 3px;
-	font-size: 12px;
+	padding-left: 4px;
+	font-size: 11px;
 }
 
 .chat-related-files .monaco-button.codicon.codicon-add:hover,
@@ -1699,7 +1703,9 @@ have to be updated for changes to the rules above, or to support more deeply nes
 }
 
 .interactive-session .chat-attached-context .chat-attached-context-attachment .monaco-icon-label .monaco-button.codicon.codicon-close,
-.interactive-session .chat-attached-context .chat-attached-context-attachment .monaco-button.codicon.codicon-close {
+.interactive-session .chat-attached-context .chat-attached-context-attachment .monaco-button.codicon.codicon-close,
+.interactive-session .chat-attached-context .chat-attached-context-attachment .monaco-icon-label .monaco-button.codicon.codicon-plus,
+.interactive-session .chat-attached-context .chat-attached-context-attachment .monaco-button.codicon.codicon-plus {
 	color: var(--vscode-descriptionForeground);
 	cursor: pointer;
 }
@@ -1734,11 +1740,6 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	flex-wrap: wrap;
 }
 
-.interactive-session .chat-attached-context .chat-attached-context-attachment.implicit {
-	display: flex;
-	gap: 4px;
-}
-
 .interactive-session .chat-attached-context .chat-attached-context-attachment.implicit .chat-implicit-hint {
 	opacity: 0.7;
 	font-size: .9em;

package/vscode/src/vs/workbench/contrib/chat/browser/{media → widget/media}/chatViewWelcome.css

@@ -156,8 +156,10 @@ div.chat-welcome-view {
 	flex-wrap: wrap;
 	justify-content: flex-start;
 	gap: 8px;
-	padding: 32px 16px 8px 16px;
 	/* Extra top padding for title */
+	padding: 32px 16px 8px 16px;
+	/* Avoids bleeding into other content since we use absolute positioning */
+	background: var(--vscode-chat-list-background);
 
 	.chat-welcome-view-suggested-prompts-title {
 		position: absolute;

package/vscode/src/vs/workbench/contrib/chat/common/{chatColors.js → widget/chatColors.js}

@@ -13,26 +13,26 @@ import { badgeBackground, badgeForeground } from '@codingame/monaco-vscode-api/v
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
 
-registerColor('chat.requestBorder', { dark: ( new Color(( new RGBA(255, 255, 255, 0.10)))), light: ( new Color(( new RGBA(0, 0, 0, 0.10)))), hcDark: contrastBorder, hcLight: contrastBorder, }, ( localize(5863, 'The border color of a chat request.')));
-const chatRequestBackground = registerColor('chat.requestBackground', { dark: ( transparent(editorBackground, 0.62)), light: ( transparent(editorBackground, 0.62)), hcDark: editorWidgetBackground, hcLight: null }, ( localize(5864, 'The background color of a chat request.')));
-const chatSlashCommandBackground = registerColor('chat.slashCommandBackground', { dark: '#26477866', light: '#adceff7a', hcDark: Color.white, hcLight: badgeBackground }, ( localize(5865, 'The background color of a chat slash command.')));
-const chatSlashCommandForeground = registerColor('chat.slashCommandForeground', { dark: '#85b6ff', light: '#26569e', hcDark: Color.black, hcLight: badgeForeground }, ( localize(5866, 'The foreground color of a chat slash command.')));
-registerColor('chat.avatarBackground', { dark: '#1f1f1f', light: '#f2f2f2', hcDark: Color.black, hcLight: Color.white, }, ( localize(5867, 'The background color of a chat avatar.')));
-registerColor('chat.avatarForeground', foreground, ( localize(5868, 'The foreground color of a chat avatar.')));
+registerColor('chat.requestBorder', { dark: ( new Color(( new RGBA(255, 255, 255, 0.10)))), light: ( new Color(( new RGBA(0, 0, 0, 0.10)))), hcDark: contrastBorder, hcLight: contrastBorder, }, ( localize(6115, 'The border color of a chat request.')));
+const chatRequestBackground = registerColor('chat.requestBackground', { dark: ( transparent(editorBackground, 0.62)), light: ( transparent(editorBackground, 0.62)), hcDark: editorWidgetBackground, hcLight: null }, ( localize(6116, 'The background color of a chat request.')));
+const chatSlashCommandBackground = registerColor('chat.slashCommandBackground', { dark: '#26477866', light: '#adceff7a', hcDark: Color.white, hcLight: badgeBackground }, ( localize(6117, 'The background color of a chat slash command.')));
+const chatSlashCommandForeground = registerColor('chat.slashCommandForeground', { dark: '#85b6ff', light: '#26569e', hcDark: Color.black, hcLight: badgeForeground }, ( localize(6118, 'The foreground color of a chat slash command.')));
+registerColor('chat.avatarBackground', { dark: '#1f1f1f', light: '#f2f2f2', hcDark: Color.black, hcLight: Color.white, }, ( localize(6119, 'The background color of a chat avatar.')));
+registerColor('chat.avatarForeground', foreground, ( localize(6120, 'The foreground color of a chat avatar.')));
 registerColor('chat.editedFileForeground', {
     light: '#895503',
     dark: '#E2C08D',
     hcDark: '#E2C08D',
     hcLight: '#895503'
 }, ( localize(
- 5869,
+ 6121,
  'The foreground color of a chat edited file in the edited file list.'
 )));
-registerColor('chat.requestCodeBorder', { dark: '#004972B8', light: '#0e639c40', hcDark: null, hcLight: null }, ( localize(5870, 'Border color of code blocks within the chat request bubble.')), true);
-registerColor('chat.requestBubbleBackground', { light: ( transparent(editorSelectionBackground, 0.3)), dark: ( transparent(editorSelectionBackground, 0.3)), hcDark: null, hcLight: null }, ( localize(5871, "Background color of the chat request bubble.")), true);
-registerColor('chat.requestBubbleHoverBackground', { dark: ( transparent(editorSelectionBackground, 0.6)), light: ( transparent(editorSelectionBackground, 0.6)), hcDark: null, hcLight: null }, ( localize(5872, 'Background color of the chat request bubble on hover.')), true);
-registerColor('chat.checkpointSeparator', { dark: '#585858', light: '#a9a9a9', hcDark: '#a9a9a9', hcLight: '#a5a5a5' }, ( localize(5873, "Chat checkpoint separator color.")));
-registerColor('chat.linesAddedForeground', { dark: '#54B054', light: '#107C10', hcDark: '#54B054', hcLight: '#107C10' }, ( localize(5874, 'Foreground color of lines added in chat code block pill.')), true);
-registerColor('chat.linesRemovedForeground', { dark: '#FC6A6A', light: '#BC2F32', hcDark: '#F48771', hcLight: '#B5200D' }, ( localize(5875, 'Foreground color of lines removed in chat code block pill.')), true);
+registerColor('chat.requestCodeBorder', { dark: '#004972B8', light: '#0e639c40', hcDark: null, hcLight: null }, ( localize(6122, 'Border color of code blocks within the chat request bubble.')), true);
+registerColor('chat.requestBubbleBackground', { light: ( transparent(editorSelectionBackground, 0.3)), dark: ( transparent(editorSelectionBackground, 0.3)), hcDark: null, hcLight: null }, ( localize(6123, "Background color of the chat request bubble.")), true);
+registerColor('chat.requestBubbleHoverBackground', { dark: ( transparent(editorSelectionBackground, 0.6)), light: ( transparent(editorSelectionBackground, 0.6)), hcDark: null, hcLight: null }, ( localize(6124, 'Background color of the chat request bubble on hover.')), true);
+registerColor('chat.checkpointSeparator', { dark: '#585858', light: '#a9a9a9', hcDark: '#a9a9a9', hcLight: '#a5a5a5' }, ( localize(6125, "Chat checkpoint separator color.")));
+registerColor('chat.linesAddedForeground', { dark: '#54B054', light: '#107C10', hcDark: '#54B054', hcLight: '#107C10' }, ( localize(6126, 'Foreground color of lines added in chat code block pill.')), true);
+registerColor('chat.linesRemovedForeground', { dark: '#FC6A6A', light: '#BC2F32', hcDark: '#F48771', hcLight: '#B5200D' }, ( localize(6127, 'Foreground color of lines removed in chat code block pill.')), true);
 
 export { chatRequestBackground, chatSlashCommandBackground, chatSlashCommandForeground };

package/vscode/src/vs/workbench/contrib/chat/common/{chatWidgetHistoryService.d.ts → widget/chatWidgetHistoryService.d.ts}

@@ -1,8 +1,8 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
-import { IChatModelInputState } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IChatWidgetHistoryService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatWidgetHistoryService.service";
+import { IChatModelInputState } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
 import { ChatAgentLocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants";
+import { IChatWidgetHistoryService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/widget/chatWidgetHistoryService.service";
 export type ChatHistoryChange = {
     kind: "append";
     entry: IChatModelInputState;

package/vscode/src/vs/workbench/contrib/chat/common/{chatWidgetHistoryService.js → widget/chatWidgetHistoryService.js}

@@ -6,9 +6,9 @@ import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/l
 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 { Memento } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/memento';
-import { CHAT_PROVIDER_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes';
-import { IChatWidgetHistoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatWidgetHistoryService.service';
+import { CHAT_PROVIDER_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatParticipantContribTypes';
 import { ChatModeKind, ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { IChatWidgetHistoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/widget/chatWidgetHistoryService.service';
 
 let ChatWidgetHistoryService = class ChatWidgetHistoryService extends Disposable {
     constructor(storageService) {

package/vscode/src/vs/workbench/contrib/chat/common/{codeBlockModelCollection.d.ts → widget/codeBlockModelCollection.d.ts}

@@ -3,8 +3,8 @@ import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
 import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
 import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
-import { IMarkdownVulnerability } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/annotations";
-import { IChatRequestViewModel, IChatResponseViewModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel";
+import { IMarkdownVulnerability } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/widget/annotations";
+import { IChatRequestViewModel, IChatResponseViewModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
 interface CodeBlockContent {
     readonly text: string;
     readonly languageId?: string;

package/vscode/src/vs/workbench/contrib/chat/common/{codeBlockModelCollection.js → widget/codeBlockModelCollection.js}

@@ -10,8 +10,9 @@ import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/
 import { PLAINTEXT_LANGUAGE_ID } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/modesRegistry';
 import { EndOfLinePreference } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
 import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
-import { extractVulnerabilitiesFromText, extractCodeblockUrisFromText } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/annotations';
-import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { extractVulnerabilitiesFromText, extractCodeblockUrisFromText } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/widget/annotations';
+import { isChatContentVariableReference } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
+import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
 
 let CodeBlockModelCollection = class CodeBlockModelCollection extends Disposable {
     constructor(tag, languageService, textModelService) {
@@ -172,7 +173,7 @@ let CodeBlockModelCollection = class CodeBlockModelCollection extends Disposable
                 if (typeof ref.reference === 'string') {
                     return;
                 }
-                const uriOrLocation = 'variableName' in ref.reference ?
+                const uriOrLocation = isChatContentVariableReference(ref.reference) ?
                     ref.reference.value :
                     ref.reference;
                 if (!uriOrLocation) {

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.d.ts

@@ -19,9 +19,9 @@ import { IInstantiationService, ServicesAccessor } from "@codingame/monaco-vscod
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { ISharedWebContentExtractorService } from "@codingame/monaco-vscode-api/vscode/vs/platform/webContentExtractor/common/webContentExtractor.service";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
-import { IChatAttachmentResolveService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatAttachmentResolveService.service";
-import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
-import { IChatRequestVariableEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries";
+import { IChatAttachmentResolveService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatAttachmentResolveService.service";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
+import { IChatRequestVariableEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries";
 import { ILanguageModelChatSelector } 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 { INotebookEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service";
@@ -51,18 +51,17 @@ export declare abstract class InlineChatRunOptions {
     static isInlineChatRunOptions(options: unknown): options is InlineChatRunOptions;
 }
 export declare class InlineChatController implements IEditorContribution {
-    private readonly _notebookEditorService;
     static ID: string;
     static get(editor: ICodeEditor): InlineChatController | null;
     private readonly _delegate;
-    constructor(editor: ICodeEditor, configurationService: IConfigurationService, _notebookEditorService: INotebookEditorService);
+    constructor(editor: ICodeEditor);
     dispose(): void;
     get isActive(): boolean;
     run(arg?: InlineChatRunOptions): Promise<boolean>;
     focus(): void;
     get widget(): EditorBasedInlineChatWidget;
     getWidgetPosition(): Position | undefined;
-    acceptSession(): void | Promise<void>;
+    acceptSession(): Promise<void>;
 }
 /**
  * @deprecated
@@ -91,7 +90,7 @@ export declare class InlineChatController1 implements IEditorContribution {
     private readonly _ctxResponse;
     private readonly _messages;
     protected readonly _onDidEnterState: Emitter<State>;
-    get chatWidget(): import("../../chat/browser/chatWidget.js").ChatWidget;
+    get chatWidget(): import("../../chat/browser/widget/chatWidget.js").ChatWidget;
     private readonly _sessionStore;
     private readonly _stashedSession;
     private _delegateSession?;
@@ -155,7 +154,7 @@ export declare class InlineChatController2 implements IEditorContribution {
     private readonly _currentSession;
     get widget(): EditorBasedInlineChatWidget;
     get isActive(): boolean;
-    constructor(_editor: ICodeEditor, _instaService: IInstantiationService, _notebookEditorService: INotebookEditorService, _inlineChatSessionService: IInlineChatSessionService, codeEditorService: ICodeEditorService, contextKeyService: IContextKeyService, _webContentExtractorService: ISharedWebContentExtractorService, _fileService: IFileService, _chatAttachmentResolveService: IChatAttachmentResolveService, _editorService: IEditorService, _markerDecorationsService: IMarkerDecorationsService, _languageModelService: ILanguageModelsService, chatService: IChatService);
+    constructor(_editor: ICodeEditor, _instaService: IInstantiationService, _notebookEditorService: INotebookEditorService, _inlineChatSessionService: IInlineChatSessionService, codeEditorService: ICodeEditorService, contextKeyService: IContextKeyService, configurationService: IConfigurationService, _webContentExtractorService: ISharedWebContentExtractorService, _fileService: IFileService, _chatAttachmentResolveService: IChatAttachmentResolveService, _editorService: IEditorService, _markerDecorationsService: IMarkerDecorationsService, _languageModelService: ILanguageModelsService, chatService: IChatService);
     dispose(): void;
     getWidgetPosition(): Position | undefined;
     focus(): void;