@codingame/monaco-vscode-chat-service-override 20.4.1 → 21.0.0

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/promptFileContributions.js

@@ -6,20 +6,19 @@ import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/com
 import { PromptLinkProvider } from './languageProviders/promptLinkProvider.js';
 import { PromptLinkDiagnosticsInstanceManager } from './languageProviders/promptLinkDiagnosticsProvider.js';
 import { PromptHeaderDiagnosticsInstanceManager } from './languageProviders/promptHeaderDiagnosticsProvider.js';
-import { isWindows } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
-import { PromptPathAutocompletion } from './languageProviders/promptPathAutocompletion.js';
+import { PromptBodyAutocompletion } from './languageProviders/promptBodyAutocompletion.js';
 import { PromptHeaderAutocompletion } from './languageProviders/promptHeaderAutocompletion.js';
 import { PromptHeaderHoverProvider } from './languageProviders/promptHeaderHovers.js';
+import { PromptHeaderDefinitionProvider } from './languageProviders/PromptHeaderDefinitionProvider.js';
 
 function registerPromptFileContributions() {
     registerContribution(PromptLinkProvider);
     registerContribution(PromptLinkDiagnosticsInstanceManager);
     registerContribution(PromptHeaderDiagnosticsInstanceManager);
-    if (!isWindows) {
-        registerContribution(PromptPathAutocompletion);
-    }
+    registerContribution(PromptBodyAutocompletion);
     registerContribution(PromptHeaderAutocompletion);
     registerContribution(PromptHeaderHoverProvider);
+    registerContribution(PromptHeaderDefinitionProvider);
     registerContribution(ConfigMigration);
 }
 function registerContribution(contribution) {

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/service/promptsServiceImpl.js

@@ -82,7 +82,7 @@ let PromptsService = class PromptsService extends Disposable {
     }
     asPromptSlashCommand(command) {
         if (command.match(/^[\p{L}\d_\-\.]+$/u)) {
-            return { command, detail: ( localize(5481, 'Prompt file: {0}', command)) };
+            return { command, detail: ( localize(5613, 'Prompt file: {0}', command)) };
         }
         return undefined;
     }
@@ -91,7 +91,13 @@ let PromptsService = class PromptsService extends Disposable {
         if (!promptUri) {
             return undefined;
         }
-        return await this.parse(promptUri, PromptsType.prompt, token);
+        try {
+            return await this.parse(promptUri, PromptsType.prompt, token);
+        }
+        catch (error) {
+            this.logger.error(`[resolvePromptSlashCommand] Failed to parse prompt file: ${promptUri}`, error);
+            return undefined;
+        }
     }
     async getPromptPath(data) {
         if (data.promptPath) {
@@ -116,7 +122,7 @@ let PromptsService = class PromptsService extends Disposable {
             return {
                 command,
                 detail: ( localize(
-                    5481,
+                    5613,
                     'Prompt file: {0}',
                     this.labelService.getUriLabel(promptPath.uri, { relative: true })
                 )),
@@ -142,7 +148,7 @@ let PromptsService = class PromptsService extends Disposable {
                 parser = this.instantiationService.createInstance(PromptParser, uri, { allowNonPromptFiles: true, languageId: MODE_LANGUAGE_ID, updateOnChange: false }).start(token);
                 const completed = await parser.settled();
                 if (!completed) {
-                    throw ( new Error(( localize(5482, "Prompt parser for {0} did not complete.", (uri.toString())))));
+                    throw ( new Error(( localize(5614, "Prompt parser for {0} did not complete.", (uri.toString())))));
                 }
                 const body = await parser.getBody();
                 const name = getCleanPromptName(uri);
@@ -166,7 +172,7 @@ let PromptsService = class PromptsService extends Disposable {
             parser = this.instantiationService.createInstance(PromptParser, uri, { allowNonPromptFiles: true, languageId, updateOnChange: false }).start(token);
             const completed = await parser.settled();
             if (!completed) {
-                throw ( new Error(( localize(5482, "Prompt parser for {0} did not complete.", (uri.toString())))));
+                throw ( new Error(( localize(5614, "Prompt parser for {0} did not complete.", (uri.toString())))));
             }
             return {
                 uri: parser.uri,

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

@@ -30,7 +30,7 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
     },
     jsonSchema: {
         description: ( localize(
-            5483,
+            5615,
             '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(
-                        5484,
+                        5616,
                         "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(
-                        5485,
+                        5617,
                         "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(
-                        5486,
+                        5618,
                         "A human-readable name for this tool that may be used to describe it in the UI."
                     )),
                     type: 'string'
                 },
                 userDescription: {
-                    description: ( localize(5487, "A description of this tool that may be shown to the user.")),
+                    description: ( localize(5619, "A description of this tool that may be shown to the user.")),
                     type: 'string'
                 },
                 modelDescription: {
                     description: ( localize(
-                        5488,
+                        5620,
                         "A description of this tool that may be used by a language model to select it."
                     )),
                     type: 'string'
                 },
                 inputSchema: {
                     description: ( localize(
-                        5489,
+                        5621,
                         "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(
-                        5490,
+                        5622,
                         "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,8 +106,8 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                 },
                 icon: {
                     markdownDescription: ( localize(
-                        5491,
-                        "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)`"
+                        5623,
+                        '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: [{
                             type: 'string'
@@ -116,11 +116,11 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                             type: 'object',
                             properties: {
                                 light: {
-                                    description: ( localize(5492, 'Icon path when a light theme is used')),
+                                    description: ( localize(5624, 'Icon path when a light theme is used')),
                                     type: 'string'
                                 },
                                 dark: {
-                                    description: ( localize(5493, 'Icon path when a dark theme is used')),
+                                    description: ( localize(5625, 'Icon path when a dark theme is used')),
                                     type: 'string'
                                 }
                             }
@@ -128,14 +128,14 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                 },
                 when: {
                     markdownDescription: ( localize(
-                        5494,
+                        5626,
                         "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(
-                        5495,
+                        5627,
                         "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(
-            5496,
+            5628,
             '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(
-                        5497,
+                        5629,
                         "A name for this tool set. Used as reference and should not contain whitespace."
                     )),
                     type: 'string',
                     pattern: '^[\\w-]+$'
                 },
                 description: {
-                    description: ( localize(5498, "A description of this tool set.")),
+                    description: ( localize(5630, "A description of this tool set.")),
                     type: 'string'
                 },
                 icon: {
-                    markdownDescription: ( localize(5499, "An icon that represents this tool set, like `$(zap)`")),
+                    markdownDescription: ( localize(5631, "An icon that represents this tool set, like `$(zap)`")),
                     type: 'string'
                 },
                 tools: {
                     markdownDescription: ( localize(
-                        5500,
+                        5632,
                         "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(5501, "Name")),
-            ( localize(5502, "Display Name")),
-            ( localize(5503, "Description")),
+            ( localize(5633, "Name")),
+            ( localize(5634, "Display Name")),
+            ( localize(5635, "Description")),
         ];
         const rows = ( contribs.map(t => {
             return [
@@ -374,7 +374,7 @@ class LanguageModelToolDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'languageModelTools',
-    label: ( localize(5504, "Language Model Tools")),
+    label: ( localize(5636, "Language Model Tools")),
     access: {
         canToggle: false
     },
@@ -394,10 +394,10 @@ class LanguageModelToolSetDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localize(5505, "Name")),
-            ( localize(5506, "Reference Name")),
-            ( localize(5507, "Tools")),
-            ( localize(5508, "Description")),
+            ( localize(5637, "Name")),
+            ( localize(5638, "Reference Name")),
+            ( localize(5639, "Tools")),
+            ( localize(5640, "Description")),
         ];
         const rows = ( contribs.map(t => {
             return [
@@ -418,7 +418,7 @@ class LanguageModelToolSetDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'languageModelToolSets',
-    label: ( localize(5509, "Language Model Tool Sets")),
+    label: ( localize(5641, "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(5510, "A speech-to-text session is in progress for chat.")) }
+    { type: 'boolean', description: ( localize(5653, "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.d.ts

@@ -0,0 +1,12 @@
+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 { IEditTelemetryCodeAcceptedData, IEditTelemetryCodeSuggestedData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService";
+import { IAiEditTelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service";
+export declare class AiEditTelemetryServiceImpl implements IAiEditTelemetryService {
+    private readonly instantiationService;
+    readonly _serviceBrand: undefined;
+    private readonly _telemetryService;
+    constructor(instantiationService: IInstantiationService);
+    createSuggestionId(data: Omit<IEditTelemetryCodeSuggestedData, "suggestionId">): EditSuggestionId;
+    handleCodeAccepted(data: IEditTelemetryCodeAcceptedData): void;
+}

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

@@ -0,0 +1,54 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { prefixedUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
+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';
+
+let AiEditTelemetryServiceImpl = class AiEditTelemetryServiceImpl {
+    constructor(instantiationService) {
+        this.instantiationService = instantiationService;
+        this._telemetryService = this.instantiationService.createInstance(DataChannelForwardingTelemetryService);
+    }
+    createSuggestionId(data) {
+        const suggestionId = EditSuggestionId.newId();
+        this._telemetryService.publicLog2('editTelemetry.codeSuggested', {
+            eventId: prefixedUuid('evt'),
+            suggestionId: suggestionId,
+            presentation: data.presentation,
+            feature: data.feature,
+            languageId: data.languageId,
+            editCharsInserted: data.editDeltaInfo?.charsAdded,
+            editCharsDeleted: data.editDeltaInfo?.charsRemoved,
+            editLinesInserted: data.editDeltaInfo?.linesAdded,
+            editLinesDeleted: data.editDeltaInfo?.linesRemoved,
+            modeId: data.modeId,
+            modelId: ( new TelemetryTrustedValue(data.modelId)),
+            applyCodeBlockSuggestionId: data.applyCodeBlockSuggestionId,
+        });
+        return suggestionId;
+    }
+    handleCodeAccepted(data) {
+        this._telemetryService.publicLog2('editTelemetry.codeAccepted', {
+            eventId: prefixedUuid('evt'),
+            suggestionId: data.suggestionId,
+            presentation: data.presentation,
+            feature: data.feature,
+            editCharsInserted: data.editDeltaInfo?.charsAdded,
+            editCharsDeleted: data.editDeltaInfo?.charsRemoved,
+            editLinesInserted: data.editDeltaInfo?.linesAdded,
+            editLinesDeleted: data.editDeltaInfo?.linesRemoved,
+            modeId: data.modeId,
+            modelId: ( new TelemetryTrustedValue(data.modelId)),
+            applyCodeBlockSuggestionId: data.applyCodeBlockSuggestionId,
+            languageId: data.languageId,
+            acceptanceMethod: data.acceptanceMethod,
+        });
+    }
+};
+AiEditTelemetryServiceImpl = ( __decorate([
+    ( __param(0, IInstantiationService))
+], AiEditTelemetryServiceImpl));
+
+export { AiEditTelemetryServiceImpl };

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(7652, "Edit Code")),
+        title: ( localize(7798, "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(7653, "Generate")),
+        title: ( localize(7799, "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(7654, "Cancel Request")),
-        shortTitle: ( localize(7655, "Cancel")),
+        title: ( localize(7800, "Cancel Request")),
+        shortTitle: ( localize(7801, "Cancel")),
     },
     when: ( ContextKeyExpr.and(CTX_INLINE_CHAT_REQUEST_IN_PROGRESS)),
 };

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

@@ -29,15 +29,16 @@ 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(7656, 'Icon which spawns the inline chat from the editor toolbar.')));
+const START_INLINE_CHAT = registerIcon('start-inline-chat', Codicon.sparkle, ( localize(7802, '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(7657, 'Editor Inline Chat')),
+            title: ( localize2(7803, 'Open Inline Chat')),
             category: AbstractInline1ChatAction.category,
             f1: true,
-            precondition: ( ContextKeyExpr.and(( ContextKeyExpr.or(CTX_INLINE_CHAT_HAS_AGENT, CTX_INLINE_CHAT_HAS_AGENT2)), CTX_INLINE_CHAT_POSSIBLE, EditorContextKeys.writable, ( EditorContextKeys.editorSimpleInput.negate()))),
+            precondition: inlineChatContextKey,
             keybinding: {
                 when: EditorContextKeys.focus,
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -45,13 +46,14 @@ class StartSessionAction extends Action2 {
             },
             icon: START_INLINE_CHAT,
             menu: [{
-                    id: MenuId.ChatTitleBarMenu,
-                    group: 'a_open',
+                    id: MenuId.EditorContext,
+                    group: '1_chat',
                     order: 3,
+                    when: inlineChatContextKey
                 }, {
-                    id: MenuId.ChatTextEditorMenu,
+                    id: MenuId.ChatTitleBarMenu,
                     group: 'a_open',
-                    order: 1
+                    order: 3,
                 }]
         });
     }
@@ -89,7 +91,7 @@ class FocusInlineChat extends EditorAction2 {
     constructor() {
         super({
             id: 'inlineChat.focus',
-            title: ( localize2(7658, "Focus Input")),
+            title: ( localize2(7804, "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()))),
@@ -112,7 +114,7 @@ class UnstashSessionAction extends EditorAction2 {
     constructor() {
         super({
             id: 'inlineChat.unstash',
-            title: ( localize2(7659, "Resume Last Dismissed Inline Chat")),
+            title: ( localize2(7805, "Resume Last Dismissed Inline Chat")),
             category: AbstractInline1ChatAction.category,
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_HAS_STASHED_SESSION, EditorContextKeys.writable)),
             keybinding: {
@@ -134,7 +136,7 @@ class UnstashSessionAction extends EditorAction2 {
     }
 }
 class AbstractInline1ChatAction extends EditorAction2 {
-    static { this.category = ( localize2(7660, "Inline Chat")); }
+    static { this.category = ( localize2(7806, "Inline Chat")); }
     constructor(desc) {
         const massageMenu = (menu) => {
             if (Array.isArray(menu)) {
@@ -196,7 +198,7 @@ class ArrowOutUpAction extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: 'inlineChat.arrowOutUp',
-            title: ( localize(7661, 'Cursor Up')),
+            title: ( localize(7807, 'Cursor Up')),
             precondition: ( ContextKeyExpr.and(
                 CTX_INLINE_CHAT_FOCUSED,
                 CTX_INLINE_CHAT_INNER_CURSOR_FIRST,
@@ -217,7 +219,7 @@ class ArrowOutDownAction extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: 'inlineChat.arrowOutDown',
-            title: ( localize(7662, 'Cursor Down')),
+            title: ( localize(7808, '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,
@@ -233,8 +235,8 @@ class AcceptChanges extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: ACTION_ACCEPT_CHANGES,
-            title: ( localize2(7663, "Accept Changes")),
-            shortTitle: ( localize(7664, 'Accept')),
+            title: ( localize2(7809, "Accept Changes")),
+            shortTitle: ( localize(7810, 'Accept')),
             icon: Codicon.check,
             f1: true,
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE)),
@@ -262,7 +264,7 @@ class DiscardHunkAction extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: ACTION_DISCARD_CHANGES,
-            title: ( localize(7665, 'Discard')),
+            title: ( localize(7811, 'Discard')),
             icon: Codicon.chromeClose,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             menu: [{
@@ -285,8 +287,8 @@ class RerunAction extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: ACTION_REGENERATE_RESPONSE,
-            title: ( localize2(7666, "Rerun Request")),
-            shortTitle: ( localize(7667, 'Rerun')),
+            title: ( localize2(7812, "Rerun Request")),
+            shortTitle: ( localize(7813, 'Rerun')),
             f1: false,
             icon: Codicon.refresh,
             precondition: CTX_INLINE_CHAT_VISIBLE,
@@ -325,7 +327,7 @@ class CloseAction extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: 'inlineChat.close',
-            title: ( localize(7668, 'Close')),
+            title: ( localize(7814, 'Close')),
             icon: Codicon.close,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             keybinding: {
@@ -352,7 +354,7 @@ class ConfigureInlineChatAction extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: 'inlineChat.configure',
-            title: ( localize2(7669, 'Configure Inline Chat')),
+            title: ( localize2(7815, 'Configure Inline Chat')),
             icon: Codicon.settingsGear,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             f1: true,
@@ -371,7 +373,7 @@ class MoveToNextHunk extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: 'inlineChat.moveToNextHunk',
-            title: ( localize2(7670, 'Move to Next Change')),
+            title: ( localize2(7816, 'Move to Next Change')),
             precondition: CTX_INLINE_CHAT_VISIBLE,
             f1: true,
             keybinding: {
@@ -388,7 +390,7 @@ class MoveToPreviousHunk extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: 'inlineChat.moveToPreviousHunk',
-            title: ( localize2(7671, 'Move to Previous Change')),
+            title: ( localize2(7817, 'Move to Previous Change')),
             f1: true,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             keybinding: {
@@ -405,8 +407,8 @@ class ViewInChatAction extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: ACTION_VIEW_IN_CHAT,
-            title: ( localize(7672, 'View in Chat')),
-            icon: Codicon.commentDiscussion,
+            title: ( localize(7818, 'View in Chat')),
+            icon: Codicon.chatSparkle,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             menu: [{
                     id: MENU_INLINE_CHAT_WIDGET_STATUS,
@@ -435,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(7673, 'Toggle Changes')),
+            title: ( localize2(7819, 'Toggle Changes')),
             icon: Codicon.diffSingle,
             toggled: {
                 condition: CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF,
@@ -457,7 +459,7 @@ class ToggleDiffForChange extends AbstractInline1ChatAction {
     }
 }
 class AbstractInline2ChatAction extends EditorAction2 {
-    static { this.category = ( localize2(7660, "Inline Chat")); }
+    static { this.category = ( localize2(7806, "Inline Chat")); }
     constructor(desc) {
         const massageMenu = (menu) => {
             if (Array.isArray(menu)) {
@@ -520,8 +522,8 @@ class KeepOrUndoSessionAction extends AbstractInline2ChatAction {
         super({
             id,
             title: _keep
-                ? ( localize2(7674, "Keep"))
-                : ( localize2(7675, "Undo")),
+                ? ( localize2(7820, "Keep"))
+                : ( localize2(7821, "Undo")),
             f1: true,
             icon: _keep ? Codicon.check : Codicon.discard,
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, ( ctxHasRequestInProgress.negate()))),
@@ -576,7 +578,7 @@ class CloseSessionAction2 extends AbstractInline2ChatAction {
     constructor() {
         super({
             id: 'inlineChat2.close',
-            title: ( localize2(7676, "Close")),
+            title: ( localize2(7822, "Close")),
             f1: true,
             icon: Codicon.close,
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, ( ctxHasRequestInProgress.negate()), ( ContextKeyExpr.or(( ctxRequestCount.isEqualTo(0)), ( ctxHasEditorModification.negate()))))),
@@ -612,9 +614,9 @@ class RevealWidget extends AbstractInline2ChatAction {
     constructor() {
         super({
             id: 'inlineChat2.reveal',
-            title: ( localize2(7677, "Toggle Inline Chat")),
+            title: ( localize2(7823, "Toggle Inline Chat")),
             f1: true,
-            icon: Codicon.copilot,
+            icon: Codicon.chatSparkle,
             precondition: ( ContextKeyExpr.and(( ctxIsGlobalEditingSession.negate()), ContextKeyExpr.greaterEquals(ctxRequestCount.key, 1))),
             toggled: {
                 condition: CTX_INLINE_CHAT_VISIBLE,
@@ -640,7 +642,7 @@ class CancelRequestAction extends AbstractInline2ChatAction {
     constructor() {
         super({
             id: 'inlineChat2.cancelRequest',
-            title: ( localize2(7678, "Cancel Request")),
+            title: ( localize2(7824, "Cancel Request")),
             f1: true,
             icon: Codicon.stopCircle,
             precondition: ( ContextKeyExpr.and(( ctxIsGlobalEditingSession.negate()), ctxHasRequestInProgress)),