@codingame/monaco-vscode-chat-service-override 21.6.0 → 22.0.0

package/vscode/src/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution.js

@@ -23,14 +23,14 @@ import { transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/
 
 const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'languageModelTools',
-    activationEventsGenerator: (contributions, result) => {
+    activationEventsGenerator: function* (contributions) {
         for (const contrib of contributions) {
-            result.push(`onLanguageModelTool:${contrib.name}`);
+            yield `onLanguageModelTool:${contrib.name}`;
         }
     },
     jsonSchema: {
         description: ( localize(
-            5615,
+            5684,
             'Contributes a tool that can be invoked by a language model in a chat session, or from a standalone command. Registered tools can be used by all extensions.'
         )),
         type: 'array',
@@ -56,7 +56,7 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
             properties: {
                 name: {
                     description: ( localize(
-                        5616,
+                        5685,
                         "A unique name for this tool. This name must be a globally unique identifier, and is also used as a name when presenting this tool to a language model."
                     )),
                     type: 'string',
@@ -64,7 +64,7 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                 },
                 toolReferenceName: {
                     markdownDescription: ( localize(
-                        5617,
+                        5686,
                         "If {0} is enabled for this tool, the user may use '#' with this name to invoke the tool in a query. Otherwise, the name is not required. Name must not contain whitespace.",
                         '`canBeReferencedInPrompt`'
                     )),
@@ -73,32 +73,32 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                 },
                 displayName: {
                     description: ( localize(
-                        5618,
+                        5687,
                         "A human-readable name for this tool that may be used to describe it in the UI."
                     )),
                     type: 'string'
                 },
                 userDescription: {
-                    description: ( localize(5619, "A description of this tool that may be shown to the user.")),
+                    description: ( localize(5688, "A description of this tool that may be shown to the user.")),
                     type: 'string'
                 },
                 modelDescription: {
                     description: ( localize(
-                        5620,
+                        5689,
                         "A description of this tool that may be used by a language model to select it."
                     )),
                     type: 'string'
                 },
                 inputSchema: {
                     description: ( localize(
-                        5621,
+                        5690,
                         "A JSON schema for the input this tool accepts. The input must be an object at the top level. A particular language model may not support all JSON schema features. See the documentation for the language model family you are using for more information."
                     )),
                     $ref: toolsParametersSchemaSchemaId
                 },
                 canBeReferencedInPrompt: {
                     markdownDescription: ( localize(
-                        5622,
+                        5691,
                         "If true, this tool shows up as an attachment that the user can add manually to their request. Chat participants will receive the tool in {0}.",
                         '`ChatRequest#toolReferences`'
                     )),
@@ -106,7 +106,7 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                 },
                 icon: {
                     markdownDescription: ( localize(
-                        5623,
+                        5692,
                         'An icon that represents this tool. Either a file path, an object with file paths for dark and light themes, or a theme icon reference, like "\\$(zap)"'
                     )),
                     anyOf: [{
@@ -116,11 +116,11 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                             type: 'object',
                             properties: {
                                 light: {
-                                    description: ( localize(5624, 'Icon path when a light theme is used')),
+                                    description: ( localize(5693, 'Icon path when a light theme is used')),
                                     type: 'string'
                                 },
                                 dark: {
-                                    description: ( localize(5625, 'Icon path when a dark theme is used')),
+                                    description: ( localize(5694, 'Icon path when a dark theme is used')),
                                     type: 'string'
                                 }
                             }
@@ -128,14 +128,14 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                 },
                 when: {
                     markdownDescription: ( localize(
-                        5626,
+                        5695,
                         "Condition which must be true for this tool to be enabled. Note that a tool may still be invoked by another extension even when its `when` condition is false."
                     )),
                     type: 'string'
                 },
                 tags: {
                     description: ( localize(
-                        5627,
+                        5696,
                         "A set of tags that roughly describe the tool's capabilities. A tool user may use these to filter the set of tools to just ones that are relevant for the task at hand, or they may want to pick a tag that can be used to identify just the tools contributed by this extension."
                     )),
                     type: 'array',
@@ -153,7 +153,7 @@ const languageModelToolSetsExtensionPoint = ExtensionsRegistry.registerExtension
     deps: [languageModelToolsExtensionPoint],
     jsonSchema: {
         description: ( localize(
-            5628,
+            5697,
             'Contributes a set of language model tools that can be used together.'
         )),
         type: 'array',
@@ -171,23 +171,23 @@ const languageModelToolSetsExtensionPoint = ExtensionsRegistry.registerExtension
             properties: {
                 name: {
                     description: ( localize(
-                        5629,
+                        5698,
                         "A name for this tool set. Used as reference and should not contain whitespace."
                     )),
                     type: 'string',
                     pattern: '^[\\w-]+$'
                 },
                 description: {
-                    description: ( localize(5630, "A description of this tool set.")),
+                    description: ( localize(5699, "A description of this tool set.")),
                     type: 'string'
                 },
                 icon: {
-                    markdownDescription: ( localize(5631, "An icon that represents this tool set, like `$(zap)`")),
+                    markdownDescription: ( localize(5700, "An icon that represents this tool set, like `$(zap)`")),
                     type: 'string'
                 },
                 tools: {
                     markdownDescription: ( localize(
-                        5632,
+                        5701,
                         "A list of tools or tool sets to include in this tool set. Cannot be empty and must reference tools by their `toolReferenceName`."
                     )),
                     type: 'array',
@@ -352,9 +352,9 @@ class LanguageModelToolDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localize(5633, "Name")),
-            ( localize(5634, "Display Name")),
-            ( localize(5635, "Description")),
+            ( localize(5702, "Name")),
+            ( localize(5703, "Display Name")),
+            ( localize(5704, "Description")),
         ];
         const rows = ( contribs.map(t => {
             return [
@@ -374,7 +374,7 @@ class LanguageModelToolDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'languageModelTools',
-    label: ( localize(5636, "Language Model Tools")),
+    label: ( localize(5705, "Language Model Tools")),
     access: {
         canToggle: false
     },
@@ -394,10 +394,10 @@ class LanguageModelToolSetDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localize(5637, "Name")),
-            ( localize(5638, "Reference Name")),
-            ( localize(5639, "Tools")),
-            ( localize(5640, "Description")),
+            ( localize(5706, "Name")),
+            ( localize(5707, "Reference Name")),
+            ( localize(5708, "Tools")),
+            ( localize(5709, "Description")),
         ];
         const rows = ( contribs.map(t => {
             return [
@@ -418,7 +418,7 @@ class LanguageModelToolSetDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'languageModelToolSets',
-    label: ( localize(5641, "Language Model Tool Sets")),
+    label: ( localize(5710, "Language Model Tool Sets")),
     access: {
         canToggle: false
     },

package/vscode/src/vs/workbench/contrib/chat/common/voiceChatService.js

@@ -21,7 +21,7 @@ var PhraseTextType;
 const VoiceChatInProgress = ( new RawContextKey(
     'voiceChatInProgress',
     false,
-    { type: 'boolean', description: ( localize(5653, "A speech-to-text session is in progress for chat.")) }
+    { type: 'boolean', description: ( localize(5722, "A speech-to-text session is in progress for chat.")) }
 ));
 let VoiceChatService = class VoiceChatService extends Disposable {
     static { VoiceChatService_1 = this; }

package/vscode/src/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryServiceImpl.js

@@ -4,7 +4,7 @@ import { prefixedUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common
 import { EditSuggestionId } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/textModelEditSource';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { TelemetryTrustedValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetryUtils';
-import { DataChannelForwardingTelemetryService } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/forwardingTelemetryService';
+import { DataChannelForwardingTelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dataChannel/browser/forwardingTelemetryService';
 
 let AiEditTelemetryServiceImpl = class AiEditTelemetryServiceImpl {
     constructor(instantiationService) {
@@ -18,6 +18,9 @@ let AiEditTelemetryServiceImpl = class AiEditTelemetryServiceImpl {
             suggestionId: suggestionId,
             presentation: data.presentation,
             feature: data.feature,
+            sourceExtensionId: data.source?.extensionId,
+            sourceExtensionVersion: data.source?.extensionVersion,
+            sourceProviderId: data.source?.providerId,
             languageId: data.languageId,
             editCharsInserted: data.editDeltaInfo?.charsAdded,
             editCharsDeleted: data.editDeltaInfo?.charsRemoved,
@@ -35,6 +38,10 @@ let AiEditTelemetryServiceImpl = class AiEditTelemetryServiceImpl {
             suggestionId: data.suggestionId,
             presentation: data.presentation,
             feature: data.feature,
+            sourceExtensionId: data.source?.extensionId,
+            sourceExtensionVersion: data.source?.extensionVersion,
+            sourceProviderId: data.source?.providerId,
+            languageId: data.languageId,
             editCharsInserted: data.editDeltaInfo?.charsAdded,
             editCharsDeleted: data.editDeltaInfo?.charsRemoved,
             editLinesInserted: data.editDeltaInfo?.linesAdded,
@@ -42,7 +49,6 @@ let AiEditTelemetryServiceImpl = class AiEditTelemetryServiceImpl {
             modeId: data.modeId,
             modelId: ( new TelemetryTrustedValue(data.modelId)),
             applyCodeBlockSuggestionId: data.applyCodeBlockSuggestionId,
-            languageId: data.languageId,
             acceptanceMethod: data.acceptanceMethod,
         });
     }

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChat.contribution.js

@@ -37,7 +37,7 @@ const editActionMenuItem = {
     order: 0,
     command: {
         id: ChatSubmitAction.ID,
-        title: ( localize(7804, "Edit Code")),
+        title: ( localize(7873, "Edit Code")),
     },
     when: ( ContextKeyExpr.and(ChatContextKeys.inputHasText, ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()), CTX_INLINE_CHAT_EDITING, CTX_INLINE_CHAT_HAS_AGENT)),
 };
@@ -46,7 +46,7 @@ const generateActionMenuItem = {
     order: 0,
     command: {
         id: ChatSubmitAction.ID,
-        title: ( localize(7805, "Generate")),
+        title: ( localize(7874, "Generate")),
     },
     when: ( ContextKeyExpr.and(ChatContextKeys.inputHasText, ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()), ( CTX_INLINE_CHAT_EDITING.toNegated()), CTX_INLINE_CHAT_HAS_AGENT)),
 };
@@ -57,8 +57,8 @@ const cancelActionMenuItem = {
     order: 0,
     command: {
         id: CancelAction.ID,
-        title: ( localize(7806, "Cancel Request")),
-        shortTitle: ( localize(7807, "Cancel")),
+        title: ( localize(7875, "Cancel Request")),
+        shortTitle: ( localize(7876, "Cancel")),
     },
     when: ( ContextKeyExpr.and(CTX_INLINE_CHAT_REQUEST_IN_PROGRESS)),
 };

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.js

@@ -29,13 +29,13 @@ import { IInlineChatSessionService } from '@codingame/monaco-vscode-api/vscode/v
 
 CommandsRegistry.registerCommandAlias('interactiveEditor.start', 'inlineChat.start');
 CommandsRegistry.registerCommandAlias('interactive.acceptChanges', ACTION_ACCEPT_CHANGES);
-const START_INLINE_CHAT = registerIcon('start-inline-chat', Codicon.sparkle, ( localize(7808, 'Icon which spawns the inline chat from the editor toolbar.')));
+const START_INLINE_CHAT = registerIcon('start-inline-chat', Codicon.sparkle, ( localize(7877, 'Icon which spawns the inline chat from the editor toolbar.')));
 const inlineChatContextKey = ( ContextKeyExpr.and(( ContextKeyExpr.or(CTX_INLINE_CHAT_HAS_AGENT, CTX_INLINE_CHAT_HAS_AGENT2)), CTX_INLINE_CHAT_POSSIBLE, EditorContextKeys.writable, ( EditorContextKeys.editorSimpleInput.negate())));
 class StartSessionAction extends Action2 {
     constructor() {
         super({
             id: ACTION_START,
-            title: ( localize2(7809, 'Open Inline Chat')),
+            title: ( localize2(7878, 'Open Inline Chat')),
             category: AbstractInline1ChatAction.category,
             f1: true,
             precondition: inlineChatContextKey,
@@ -91,7 +91,7 @@ class FocusInlineChat extends EditorAction2 {
     constructor() {
         super({
             id: 'inlineChat.focus',
-            title: ( localize2(7810, "Focus Input")),
+            title: ( localize2(7879, "Focus Input")),
             f1: true,
             category: AbstractInline1ChatAction.category,
             precondition: ( ContextKeyExpr.and(EditorContextKeys.editorTextFocus, CTX_INLINE_CHAT_VISIBLE, ( CTX_INLINE_CHAT_FOCUSED.negate()), ( CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()))),
@@ -114,7 +114,7 @@ class UnstashSessionAction extends EditorAction2 {
     constructor() {
         super({
             id: 'inlineChat.unstash',
-            title: ( localize2(7811, "Resume Last Dismissed Inline Chat")),
+            title: ( localize2(7880, "Resume Last Dismissed Inline Chat")),
             category: AbstractInline1ChatAction.category,
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_HAS_STASHED_SESSION, EditorContextKeys.writable)),
             keybinding: {
@@ -136,7 +136,7 @@ class UnstashSessionAction extends EditorAction2 {
     }
 }
 class AbstractInline1ChatAction extends EditorAction2 {
-    static { this.category = ( localize2(7812, "Inline Chat")); }
+    static { this.category = ( localize2(7881, "Inline Chat")); }
     constructor(desc) {
         const massageMenu = (menu) => {
             if (Array.isArray(menu)) {
@@ -198,7 +198,7 @@ class ArrowOutUpAction extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: 'inlineChat.arrowOutUp',
-            title: ( localize(7813, 'Cursor Up')),
+            title: ( localize(7882, 'Cursor Up')),
             precondition: ( ContextKeyExpr.and(
                 CTX_INLINE_CHAT_FOCUSED,
                 CTX_INLINE_CHAT_INNER_CURSOR_FIRST,
@@ -219,7 +219,7 @@ class ArrowOutDownAction extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: 'inlineChat.arrowOutDown',
-            title: ( localize(7814, 'Cursor Down')),
+            title: ( localize(7883, 'Cursor Down')),
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_INNER_CURSOR_LAST, ( EditorContextKeys.isEmbeddedDiffEditor.negate()), ( CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()))),
             keybinding: {
                 weight: KeybindingWeight.EditorCore,
@@ -235,8 +235,8 @@ class AcceptChanges extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: ACTION_ACCEPT_CHANGES,
-            title: ( localize2(7815, "Accept Changes")),
-            shortTitle: ( localize(7816, 'Accept')),
+            title: ( localize2(7884, "Accept Changes")),
+            shortTitle: ( localize(7885, 'Accept')),
             icon: Codicon.check,
             f1: true,
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE)),
@@ -264,7 +264,7 @@ class DiscardHunkAction extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: ACTION_DISCARD_CHANGES,
-            title: ( localize(7817, 'Discard')),
+            title: ( localize(7886, 'Discard')),
             icon: Codicon.chromeClose,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             menu: [{
@@ -287,8 +287,8 @@ class RerunAction extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: ACTION_REGENERATE_RESPONSE,
-            title: ( localize2(7818, "Rerun Request")),
-            shortTitle: ( localize(7819, 'Rerun')),
+            title: ( localize2(7887, "Rerun Request")),
+            shortTitle: ( localize(7888, 'Rerun')),
             f1: false,
             icon: Codicon.refresh,
             precondition: CTX_INLINE_CHAT_VISIBLE,
@@ -327,7 +327,7 @@ class CloseAction extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: 'inlineChat.close',
-            title: ( localize(7820, 'Close')),
+            title: ( localize(7889, 'Close')),
             icon: Codicon.close,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             keybinding: {
@@ -354,7 +354,7 @@ class ConfigureInlineChatAction extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: 'inlineChat.configure',
-            title: ( localize2(7821, 'Configure Inline Chat')),
+            title: ( localize2(7890, 'Configure Inline Chat')),
             icon: Codicon.settingsGear,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             f1: true,
@@ -373,7 +373,7 @@ class MoveToNextHunk extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: 'inlineChat.moveToNextHunk',
-            title: ( localize2(7822, 'Move to Next Change')),
+            title: ( localize2(7891, 'Move to Next Change')),
             precondition: CTX_INLINE_CHAT_VISIBLE,
             f1: true,
             keybinding: {
@@ -390,7 +390,7 @@ class MoveToPreviousHunk extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: 'inlineChat.moveToPreviousHunk',
-            title: ( localize2(7823, 'Move to Previous Change')),
+            title: ( localize2(7892, 'Move to Previous Change')),
             f1: true,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             keybinding: {
@@ -407,7 +407,7 @@ class ViewInChatAction extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: ACTION_VIEW_IN_CHAT,
-            title: ( localize(7824, 'View in Chat')),
+            title: ( localize(7893, 'View in Chat')),
             icon: Codicon.chatSparkle,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             menu: [{
@@ -437,7 +437,7 @@ class ToggleDiffForChange extends AbstractInline1ChatAction {
         super({
             id: ACTION_TOGGLE_DIFF,
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_CHANGE_HAS_DIFF)),
-            title: ( localize2(7825, 'Toggle Changes')),
+            title: ( localize2(7894, 'Toggle Changes')),
             icon: Codicon.diffSingle,
             toggled: {
                 condition: CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF,
@@ -459,7 +459,7 @@ class ToggleDiffForChange extends AbstractInline1ChatAction {
     }
 }
 class AbstractInline2ChatAction extends EditorAction2 {
-    static { this.category = ( localize2(7812, "Inline Chat")); }
+    static { this.category = ( localize2(7881, "Inline Chat")); }
     constructor(desc) {
         const massageMenu = (menu) => {
             if (Array.isArray(menu)) {
@@ -522,8 +522,8 @@ class KeepOrUndoSessionAction extends AbstractInline2ChatAction {
         super({
             id,
             title: _keep
-                ? ( localize2(7826, "Keep"))
-                : ( localize2(7827, "Undo")),
+                ? ( localize2(7895, "Keep"))
+                : ( localize2(7896, "Undo")),
             f1: true,
             icon: _keep ? Codicon.check : Codicon.discard,
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, ( ctxHasRequestInProgress.negate()))),
@@ -578,7 +578,7 @@ class CloseSessionAction2 extends AbstractInline2ChatAction {
     constructor() {
         super({
             id: 'inlineChat2.close',
-            title: ( localize2(7828, "Close")),
+            title: ( localize2(7897, "Close")),
             f1: true,
             icon: Codicon.close,
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, ( ctxHasRequestInProgress.negate()), ( ContextKeyExpr.or(( ctxRequestCount.isEqualTo(0)), ( ctxHasEditorModification.negate()))))),
@@ -614,7 +614,7 @@ class RevealWidget extends AbstractInline2ChatAction {
     constructor() {
         super({
             id: 'inlineChat2.reveal',
-            title: ( localize2(7829, "Toggle Inline Chat")),
+            title: ( localize2(7898, "Toggle Inline Chat")),
             f1: true,
             icon: Codicon.chatSparkle,
             precondition: ( ContextKeyExpr.and(( ctxIsGlobalEditingSession.negate()), ContextKeyExpr.greaterEquals(ctxRequestCount.key, 1))),
@@ -642,7 +642,7 @@ class CancelRequestAction extends AbstractInline2ChatAction {
     constructor() {
         super({
             id: 'inlineChat2.cancelRequest',
-            title: ( localize2(7830, "Cancel Request")),
+            title: ( localize2(7899, "Cancel Request")),
             f1: true,
             icon: Codicon.stopCircle,
             precondition: ( ContextKeyExpr.and(( ctxIsGlobalEditingSession.negate()), ctxHasRequestInProgress)),

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

@@ -1,17 +1,17 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { ICodeEditor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser";
+import { EditorAction2, ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions";
+import { IPosition } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/position";
 import { IEditorContribution } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/editorCommon";
+import { IMarkerDecorationsService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/markerDecorations.service";
+import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { RawContextKey } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
-import { EditorAction2, ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions";
-import { IPosition } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/position";
-import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { IContextMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service";
 import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
-import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service";
-import { IMarkerDecorationsService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/markerDecorations.service";
-import { IContextMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service";
-import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 export declare const CTX_INLINE_CHAT_SHOWING_HINT: RawContextKey<boolean>;
 export declare class InlineChatExpandLineAction extends EditorAction2 {
     constructor();

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.js

@@ -1,43 +1,43 @@
 
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { stringValue } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/cssValue';
+import { createStyleSheet2 } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/domStylesheets';
+import { toAction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
+import { KeyChord, KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { Disposable, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { MouseTargetType } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
-import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { RawContextKey, ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
-import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
-import { InlineChatController } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_HAS_AGENT, ACTION_START, InlineChatConfigKeys } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { EditorAction2 } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions';
+import { observableCodeEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/observableCodeEditor';
 import { EditOperation } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/editOperation';
-import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { Position } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/position';
-import { AbstractInline1ChatAction } from './inlineChatActions.js';
+import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { EditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorContextKeys';
-import { TrackedRangeStickiness } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
-import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { StandardTokenType } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/encodedTokenAttributes';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
-import { KeyChord, KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
-import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
-import * as inlineChat from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/inlineChat/browser/media/inlineChat.css';
-import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
-import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
-import { InlineCompletionsController } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController';
-import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
+import { PLAINTEXT_LANGUAGE_ID } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/modesRegistry';
+import { TrackedRangeStickiness } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
 import { IMarkerDecorationsService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/markerDecorations.service';
-import { IContextMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
-import { toAction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
+import { InlineCompletionsController } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController';
+import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import { observableCodeEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/observableCodeEditor';
-import { PLAINTEXT_LANGUAGE_ID } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/modesRegistry';
-import { createStyleSheet2 } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/domStylesheets';
-import { stringValue } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/cssValue';
+import { RawContextKey, ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
+import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
+import { IContextMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
+import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
+import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
+import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { INSTRUCTIONS_LANGUAGE_ID, PROMPT_LANGUAGE_ID } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { MODE_FILE_EXTENSION } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
+import { INSTRUCTIONS_LANGUAGE_ID, PROMPT_LANGUAGE_ID } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_HAS_AGENT, ACTION_START, InlineChatConfigKeys } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { AbstractInline1ChatAction } from './inlineChatActions.js';
+import { InlineChatController } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import * as inlineChat from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/inlineChat/browser/media/inlineChat.css';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
@@ -53,14 +53,14 @@ const IGNORED_LANGUAGE_IDS = ( new Set([
     PROMPT_LANGUAGE_ID,
     MODE_FILE_EXTENSION
 ]));
-const CTX_INLINE_CHAT_SHOWING_HINT = ( new RawContextKey('inlineChatShowingHint', false, ( localize(7837, "Whether inline chat shows a contextual hint"))));
+const CTX_INLINE_CHAT_SHOWING_HINT = ( new RawContextKey('inlineChatShowingHint', false, ( localize(7907, "Whether inline chat shows a contextual hint"))));
 const _inlineChatActionId = 'inlineChat.startWithCurrentLine';
 class InlineChatExpandLineAction extends EditorAction2 {
     constructor() {
         super({
             id: _inlineChatActionId,
             category: AbstractInline1ChatAction.category,
-            title: ( localize2(7838, "Start in Editor with Current Line")),
+            title: ( localize2(7908, "Start in Editor with Current Line")),
             f1: true,
             precondition: ( ContextKeyExpr.and(( CTX_INLINE_CHAT_VISIBLE.negate()), CTX_INLINE_CHAT_HAS_AGENT, EditorContextKeys.writable)),
             keybinding: [{
@@ -103,7 +103,7 @@ class ShowInlineChatHintAction extends EditorAction2 {
         super({
             id: 'inlineChat.showHint',
             category: AbstractInline1ChatAction.category,
-            title: ( localize2(7839, "Show Inline Chat Hint")),
+            title: ( localize2(7909, "Show Inline Chat Hint")),
             f1: false,
             precondition: ( ContextKeyExpr.and(( CTX_INLINE_CHAT_VISIBLE.negate()), CTX_INLINE_CHAT_HAS_AGENT, EditorContextKeys.writable)),
         });
@@ -231,15 +231,15 @@ let InlineChatHintsController = class InlineChatHintsController extends Disposab
                 this._ctxShowingHint.reset();
                 return;
             }
-            const agentName = chatAgentService.getDefaultAgent(ChatAgentLocation.Editor)?.name ?? ( localize(7840, "Chat"));
+            const agentName = chatAgentService.getDefaultAgent(ChatAgentLocation.EditorInline)?.name ?? ( localize(7910, "Chat"));
             const { position, isEol, isWhitespace, kb, model } = showData;
             const inlineClassName = ['a' , 'inline-chat-hint', 'inline-chat-hint-text'];
             let content;
             if (isWhitespace) {
-                content = '\u00a0' + ( localize(7841, "{0} to edit with {1}", kb, agentName));
+                content = '\u00a0' + ( localize(7911, "{0} to edit with {1}", kb, agentName));
             }
             else if (isEol) {
-                content = '\u00a0' + ( localize(7842, "{0} to continue with {1}", kb, agentName));
+                content = '\u00a0' + ( localize(7912, "{0} to continue with {1}", kb, agentName));
             }
             else {
                 content = '\u200a' + kb + '\u200a';
@@ -268,7 +268,7 @@ let InlineChatHintsController = class InlineChatHintsController extends Disposab
             getActions: () => [
                 toAction({
                     id: 'inlineChat.disableHint',
-                    label: ( localize(7843, "Disable Inline Chat Hint")),
+                    label: ( localize(7913, "Disable Inline Chat Hint")),
                     run: async () => {
                         await this._configurationService.updateValue(setting, false);
                     }
@@ -296,7 +296,7 @@ class HideInlineChatHintAction extends EditorAction2 {
     constructor() {
         super({
             id: 'inlineChat.hideHint',
-            title: ( localize2(7844, "Hide Inline Chat Hint")),
+            title: ( localize2(7914, "Hide Inline Chat Hint")),
             precondition: CTX_INLINE_CHAT_SHOWING_HINT,
             keybinding: {
                 weight: KeybindingWeight.EditorContrib - 10,