@codingame/monaco-vscode-chat-service-override 22.1.8 → 23.0.0

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

@@ -4,17 +4,18 @@ import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { isAbsolute } from '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
 import { ResourceSet } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
-import { getPromptFileLocationsConfigKey, PromptsConfig } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/config';
-import { basename, dirname, joinPath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { getPromptFileLocationsConfigKey, PromptsConfig } from '@codingame/monaco-vscode-8d4ef243-d8c1-540d-9f11-38df46f54c9f-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/config';
+import { basename, dirname, joinPath, isEqualOrParent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import { getPromptFileType, getPromptFileExtension } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
+import { getPromptFileType, AGENTS_SOURCE_FOLDER, getPromptFileExtension, COPILOT_CUSTOM_INSTRUCTIONS_FILENAME, LEGACY_MODE_FILE_EXTENSION, getCleanPromptName, AGENT_FILE_EXTENSION } from '@codingame/monaco-vscode-8d4ef243-d8c1-540d-9f11-38df46f54c9f-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
+import { PromptsType } from '@codingame/monaco-vscode-8d4ef243-d8c1-540d-9f11-38df46f54c9f-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { getExcludes, QueryType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/search/common/search';
 import { ISearchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/search/common/search.service';
 import { isCancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
-import { PromptsStorage } from '../service/promptsService.js';
+import { PromptsStorage } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
 import { IUserDataProfileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
@@ -81,6 +82,9 @@ let PromptFilesLocator = class PromptFilesLocator extends Disposable {
         disposables.add(this.fileService.watch(userDataFolder));
         return { event: eventEmitter.event, dispose: () => disposables.dispose() };
     }
+    getAgentSourceFolder() {
+        return this.toAbsoluteLocations([AGENTS_SOURCE_FOLDER]);
+    }
     getConfigBasedSourceFolders(type) {
         const configuredLocations = PromptsConfig.promptSourceFolders(this.configService, type);
         const absoluteLocations = this.toAbsoluteLocations(configuredLocations);
@@ -123,6 +127,9 @@ let PromptFilesLocator = class PromptFilesLocator extends Disposable {
     }
     getLocalParentFolders(type) {
         const configuredLocations = PromptsConfig.promptSourceFolders(this.configService, type);
+        if (type === PromptsType.agent) {
+            configuredLocations.push(AGENTS_SOURCE_FOLDER);
+        }
         const absoluteLocations = this.toAbsoluteLocations(configuredLocations);
         return ( absoluteLocations.map(firstNonGlobParentAndPattern));
     }
@@ -198,6 +205,17 @@ let PromptFilesLocator = class PromptFilesLocator extends Disposable {
         }
         return [];
     }
+    async findCopilotInstructionsMDsInWorkspace(token) {
+        const result = [];
+        const { folders } = this.workspaceService.getWorkspace();
+        for (const folder of folders) {
+            const file = joinPath(folder.uri, `.github/` + COPILOT_CUSTOM_INSTRUCTIONS_FILENAME);
+            if (await this.fileService.exists(file)) {
+                result.push(file);
+            }
+        }
+        return result;
+    }
     async findAgentMDsInWorkspace(token) {
         const result = await Promise.all(( this.workspaceService.getWorkspace().folders.map(folder => this.findAgentMDsInFolder(folder.uri, token))));
         return result.flat(1);
@@ -226,6 +244,34 @@ let PromptFilesLocator = class PromptFilesLocator extends Disposable {
         }
         return [];
     }
+    async findAgentMDsInWorkspaceRoots(token) {
+        const result = [];
+        const { folders } = this.workspaceService.getWorkspace();
+        const resolvedRoots = await this.fileService.resolveAll(( folders.map(f => ({ resource: f.uri }))));
+        for (const root of resolvedRoots) {
+            if (root.success && root.stat?.children) {
+                const agentMd = root.stat.children.find(c => c.isFile && c.name.toLowerCase() === 'agents.md');
+                if (agentMd) {
+                    result.push(agentMd.resource);
+                }
+            }
+        }
+        return result;
+    }
+    getAgentFileURIFromModeFile(oldURI) {
+        if (oldURI.path.endsWith(LEGACY_MODE_FILE_EXTENSION)) {
+            let newLocation;
+            const workspaceFolder = this.workspaceService.getWorkspaceFolder(oldURI);
+            if (workspaceFolder) {
+                newLocation = joinPath(workspaceFolder.uri, AGENTS_SOURCE_FOLDER, getCleanPromptName(oldURI) + AGENT_FILE_EXTENSION);
+            }
+            else if (isEqualOrParent(oldURI, this.userDataService.currentProfile.promptsHome)) {
+                newLocation = joinPath(this.userDataService.currentProfile.promptsHome, getCleanPromptName(oldURI) + AGENT_FILE_EXTENSION);
+            }
+            return newLocation;
+        }
+        return undefined;
+    }
 };
 PromptFilesLocator = ( __decorate([
     ( __param(0, IFileService)),

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

@@ -30,7 +30,7 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
     },
     jsonSchema: {
         description: ( localize(
-            5684,
+            5925,
             '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(
-                        5685,
+                        5926,
                         "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(
-                        5686,
+                        5927,
                         "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(
-                        5687,
+                        5928,
                         "A human-readable name for this tool that may be used to describe it in the UI."
                     )),
                     type: 'string'
                 },
                 userDescription: {
-                    description: ( localize(5688, "A description of this tool that may be shown to the user.")),
+                    description: ( localize(5929, "A description of this tool that may be shown to the user.")),
                     type: 'string'
                 },
                 modelDescription: {
                     description: ( localize(
-                        5689,
+                        5930,
                         "A description of this tool that may be used by a language model to select it."
                     )),
                     type: 'string'
                 },
                 inputSchema: {
                     description: ( localize(
-                        5690,
+                        5931,
                         "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(
-                        5691,
+                        5932,
                         "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(
-                        5692,
+                        5933,
                         '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(5693, 'Icon path when a light theme is used')),
+                                    description: ( localize(5934, 'Icon path when a light theme is used')),
                                     type: 'string'
                                 },
                                 dark: {
-                                    description: ( localize(5694, 'Icon path when a dark theme is used')),
+                                    description: ( localize(5935, 'Icon path when a dark theme is used')),
                                     type: 'string'
                                 }
                             }
@@ -128,14 +128,14 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                 },
                 when: {
                     markdownDescription: ( localize(
-                        5695,
+                        5936,
                         "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(
-                        5696,
+                        5937,
                         "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(
-            5697,
+            5938,
             '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(
-                        5698,
+                        5939,
                         "A name for this tool set. Used as reference and should not contain whitespace."
                     )),
                     type: 'string',
                     pattern: '^[\\w-]+$'
                 },
                 description: {
-                    description: ( localize(5699, "A description of this tool set.")),
+                    description: ( localize(5940, "A description of this tool set.")),
                     type: 'string'
                 },
                 icon: {
-                    markdownDescription: ( localize(5700, "An icon that represents this tool set, like `$(zap)`")),
+                    markdownDescription: ( localize(5941, "An icon that represents this tool set, like `$(zap)`")),
                     type: 'string'
                 },
                 tools: {
                     markdownDescription: ( localize(
-                        5701,
+                        5942,
                         "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(5702, "Name")),
-            ( localize(5703, "Display Name")),
-            ( localize(5704, "Description")),
+            ( localize(5943, "Name")),
+            ( localize(5944, "Display Name")),
+            ( localize(5945, "Description")),
         ];
         const rows = ( contribs.map(t => {
             return [
@@ -374,7 +374,7 @@ class LanguageModelToolDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'languageModelTools',
-    label: ( localize(5705, "Language Model Tools")),
+    label: ( localize(5946, "Language Model Tools")),
     access: {
         canToggle: false
     },
@@ -394,10 +394,10 @@ class LanguageModelToolSetDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localize(5706, "Name")),
-            ( localize(5707, "Reference Name")),
-            ( localize(5708, "Tools")),
-            ( localize(5709, "Description")),
+            ( localize(5947, "Name")),
+            ( localize(5948, "Reference Name")),
+            ( localize(5949, "Tools")),
+            ( localize(5950, "Description")),
         ];
         const rows = ( contribs.map(t => {
             return [
@@ -418,7 +418,7 @@ class LanguageModelToolSetDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'languageModelToolSets',
-    label: ( localize(5710, "Language Model Tool Sets")),
+    label: ( localize(5951, "Language Model Tool Sets")),
     access: {
         canToggle: false
     },

package/vscode/src/vs/workbench/contrib/chat/common/voiceChatService.d.ts

@@ -4,7 +4,7 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 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 { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service";
-import { IChatModel } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IChatModel } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel";
 import { ISpeechToTextEvent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/speech/common/speechService";
 import { ISpeechService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/speech/common/speechService.service";
 import { IVoiceChatService } from "./voiceChatService.service.js";

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

@@ -7,7 +7,7 @@ import { rtrim } from '@codingame/monaco-vscode-api/vscode/vs/base/common/string
 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 { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { chatAgentLeader, chatSubcommandLeader } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { chatAgentLeader, chatSubcommandLeader } from '@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { SpeechToTextStatus } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/speech/common/speechService';
 import { ISpeechService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/speech/common/speechService.service';
 
@@ -21,7 +21,7 @@ var PhraseTextType;
 const VoiceChatInProgress = ( new RawContextKey(
     'voiceChatInProgress',
     false,
-    { type: 'boolean', description: ( localize(5722, "A speech-to-text session is in progress for chat.")) }
+    { type: 'boolean', description: ( localize(5965, "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

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

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

@@ -1,20 +1,21 @@
 
 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-api/vscode/vs/platform/dataChannel/browser/forwardingTelemetryService';
+import { DataChannelForwardingTelemetryService, forwardToChannelIf, isCopilotLikeExtension } from '@codingame/monaco-vscode-api/vscode/vs/platform/dataChannel/browser/forwardingTelemetryService';
+import { IRandomService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/randomService.service';
 
 let AiEditTelemetryServiceImpl = class AiEditTelemetryServiceImpl {
-    constructor(instantiationService) {
+    constructor(instantiationService, _randomService) {
         this.instantiationService = instantiationService;
+        this._randomService = _randomService;
         this._telemetryService = this.instantiationService.createInstance(DataChannelForwardingTelemetryService);
     }
     createSuggestionId(data) {
-        const suggestionId = EditSuggestionId.newId();
+        const suggestionId = EditSuggestionId.newId(ns => this._randomService.generatePrefixedUuid(ns));
         this._telemetryService.publicLog2('editTelemetry.codeSuggested', {
-            eventId: prefixedUuid('evt'),
+            eventId: this._randomService.generatePrefixedUuid('evt'),
             suggestionId: suggestionId,
             presentation: data.presentation,
             feature: data.feature,
@@ -29,12 +30,13 @@ let AiEditTelemetryServiceImpl = class AiEditTelemetryServiceImpl {
             modeId: data.modeId,
             modelId: ( new TelemetryTrustedValue(data.modelId)),
             applyCodeBlockSuggestionId: data.applyCodeBlockSuggestionId,
+            ...forwardToChannelIf(isCopilotLikeExtension(data.source?.extensionId)),
         });
         return suggestionId;
     }
     handleCodeAccepted(data) {
         this._telemetryService.publicLog2('editTelemetry.codeAccepted', {
-            eventId: prefixedUuid('evt'),
+            eventId: this._randomService.generatePrefixedUuid('evt'),
             suggestionId: data.suggestionId,
             presentation: data.presentation,
             feature: data.feature,
@@ -50,11 +52,13 @@ let AiEditTelemetryServiceImpl = class AiEditTelemetryServiceImpl {
             modelId: ( new TelemetryTrustedValue(data.modelId)),
             applyCodeBlockSuggestionId: data.applyCodeBlockSuggestionId,
             acceptanceMethod: data.acceptanceMethod,
+            ...forwardToChannelIf(isCopilotLikeExtension(data.source?.extensionId)),
         });
     }
 };
 AiEditTelemetryServiceImpl = ( __decorate([
-    ( __param(0, IInstantiationService))
+    ( __param(0, IInstantiationService)),
+    ( __param(1, IRandomService))
 ], AiEditTelemetryServiceImpl));
 
 export { AiEditTelemetryServiceImpl };

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

@@ -2,8 +2,8 @@
 import { registerEditorContribution, EditorContributionInstantiation } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions';
 import { registerAction2, MenuRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { InlineChatController2, InlineChatController1, InlineChatController } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { KeepSessionAction2, UndoSessionAction2, CloseSessionAction2, RevealWidget, CancelRequestAction, StartSessionAction, CloseAction, ConfigureInlineChatAction, UnstashSessionAction, DiscardHunkAction, RerunAction, MoveToNextHunk, MoveToPreviousHunk, ArrowOutUpAction, ArrowOutDownAction, FocusInlineChat, ViewInChatAction, ToggleDiffForChange, AcceptChanges } from './inlineChatActions.js';
-import { INLINE_CHAT_ID, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_EDITING, CTX_INLINE_CHAT_HAS_AGENT, MENU_INLINE_CHAT_WIDGET_STATUS } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { KeepSessionAction2, UndoAndCloseSessionAction2, StartSessionAction, CloseAction, ConfigureInlineChatAction, UnstashSessionAction, DiscardHunkAction, RerunAction, MoveToNextHunk, MoveToPreviousHunk, ArrowOutUpAction, ArrowOutDownAction, FocusInlineChat, ViewInChatAction, ToggleDiffForChange, AcceptChanges } from './inlineChatActions.js';
+import { INLINE_CHAT_ID, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_EDITING, CTX_INLINE_CHAT_V1_ENABLED, MENU_INLINE_CHAT_WIDGET_STATUS } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
@@ -11,9 +11,9 @@ import { InlineChatNotebookContribution } from './inlineChatNotebook.js';
 import { Extensions, registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import { InlineChatAccessibleView } from './inlineChatAccessibleView.js';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { InlineChatEnabler } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl';
+import { InlineChatEnabler, InlineChatEscapeToolContribution } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl';
 import { AccessibleViewRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleViewRegistry';
-import { ChatSubmitAction, CancelAction } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
+import { ChatSubmitAction, CancelAction } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
@@ -24,10 +24,7 @@ registerEditorContribution(InlineChatController2.ID, InlineChatController2, Edit
 registerEditorContribution(INLINE_CHAT_ID, InlineChatController1, EditorContributionInstantiation.Eager);
 registerEditorContribution(InlineChatController.ID, InlineChatController, EditorContributionInstantiation.Eager);
 registerAction2(KeepSessionAction2);
-registerAction2(UndoSessionAction2);
-registerAction2(CloseSessionAction2);
-registerAction2(RevealWidget);
-registerAction2(CancelRequestAction);
+registerAction2(UndoAndCloseSessionAction2);
 registerAction2(InlineChatExpandLineAction);
 registerAction2(ShowInlineChatHintAction);
 registerAction2(HideInlineChatHintAction);
@@ -37,18 +34,18 @@ const editActionMenuItem = {
     order: 0,
     command: {
         id: ChatSubmitAction.ID,
-        title: ( localize(7873, "Edit Code")),
+        title: ( localize(8118, "Edit Code")),
     },
-    when: ( ContextKeyExpr.and(ChatContextKeys.inputHasText, ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()), CTX_INLINE_CHAT_EDITING, CTX_INLINE_CHAT_HAS_AGENT)),
+    when: ( ContextKeyExpr.and(ChatContextKeys.inputHasText, ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()), CTX_INLINE_CHAT_EDITING, CTX_INLINE_CHAT_V1_ENABLED)),
 };
 const generateActionMenuItem = {
     group: '0_main',
     order: 0,
     command: {
         id: ChatSubmitAction.ID,
-        title: ( localize(7874, "Generate")),
+        title: ( localize(8119, "Generate")),
     },
-    when: ( ContextKeyExpr.and(ChatContextKeys.inputHasText, ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()), ( CTX_INLINE_CHAT_EDITING.toNegated()), CTX_INLINE_CHAT_HAS_AGENT)),
+    when: ( ContextKeyExpr.and(ChatContextKeys.inputHasText, ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()), ( CTX_INLINE_CHAT_EDITING.toNegated()), CTX_INLINE_CHAT_V1_ENABLED)),
 };
 MenuRegistry.appendMenuItem(MENU_INLINE_CHAT_WIDGET_STATUS, editActionMenuItem);
 MenuRegistry.appendMenuItem(MENU_INLINE_CHAT_WIDGET_STATUS, generateActionMenuItem);
@@ -57,8 +54,8 @@ const cancelActionMenuItem = {
     order: 0,
     command: {
         id: CancelAction.ID,
-        title: ( localize(7875, "Cancel Request")),
-        shortTitle: ( localize(7876, "Cancel")),
+        title: ( localize(8120, "Cancel Request")),
+        shortTitle: ( localize(8121, "Cancel")),
     },
     when: ( ContextKeyExpr.and(CTX_INLINE_CHAT_REQUEST_IN_PROGRESS)),
 };
@@ -80,5 +77,6 @@ registerAction2(AcceptChanges);
 const workbenchContributionsRegistry = ( Registry.as(Extensions.Workbench));
 workbenchContributionsRegistry.registerWorkbenchContribution(InlineChatNotebookContribution, LifecyclePhase.Restored);
 registerWorkbenchContribution2(InlineChatEnabler.Id, InlineChatEnabler, WorkbenchPhase.AfterRestored);
+registerWorkbenchContribution2(InlineChatEscapeToolContribution.Id, InlineChatEscapeToolContribution, WorkbenchPhase.AfterRestored);
 AccessibleViewRegistry.register(( new InlineChatAccessibleView()));
 AccessibleViewRegistry.register(( new InlineChatAccessibilityHelp()));

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

@@ -4,7 +4,7 @@ import { AccessibleViewType } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { getChatAccessibilityHelpProvider } from '../../chat/browser/actions/chatAccessibilityHelp.js';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { CTX_INLINE_CHAT_RESPONSE_FOCUSED } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { CTX_INLINE_CHAT_RESPONSE_FOCUSED } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 
 class InlineChatAccessibilityHelp {
     constructor() {

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

@@ -1,6 +1,6 @@
 
 import { InlineChatController } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_RESPONSE_FOCUSED } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_RESPONSE_FOCUSED } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { AccessibleViewType, AccessibleContentProvider, AccessibleViewProviderId } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleView';

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

@@ -11,30 +11,30 @@ export interface IHoldForSpeech {
 export declare function setHoldForSpeech(holdForSpeech: IHoldForSpeech): void;
 export declare class StartSessionAction extends Action2 {
     constructor();
-    run(accessor: ServicesAccessor, ...args: any[]): any;
+    run(accessor: ServicesAccessor, ...args: unknown[]): any;
     private _runEditorCommand;
 }
 export declare class FocusInlineChat extends EditorAction2 {
     constructor();
-    runEditorCommand(_accessor: ServicesAccessor, editor: ICodeEditor, ..._args: any[]): void;
+    runEditorCommand(_accessor: ServicesAccessor, editor: ICodeEditor, ..._args: unknown[]): void;
 }
 export declare class UnstashSessionAction extends EditorAction2 {
     constructor();
-    runEditorCommand(_accessor: ServicesAccessor, editor: ICodeEditor, ..._args: any[]): Promise<void>;
+    runEditorCommand(_accessor: ServicesAccessor, editor: ICodeEditor, ..._args: unknown[]): Promise<void>;
 }
 export declare abstract class AbstractInline1ChatAction extends EditorAction2 {
     static readonly category: import("@codingame/monaco-vscode-api/vscode/vs/nls").ILocalizedString;
     constructor(desc: IAction2Options);
-    runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor, ..._args: any[]): void;
-    abstract runInlineChatCommand(accessor: ServicesAccessor, ctrl: InlineChatController1, editor: ICodeEditor, ...args: any[]): void;
+    runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor, ..._args: unknown[]): void;
+    abstract runInlineChatCommand(accessor: ServicesAccessor, ctrl: InlineChatController1, editor: ICodeEditor, ...args: unknown[]): void;
 }
 export declare class ArrowOutUpAction extends AbstractInline1ChatAction {
     constructor();
-    runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController1, _editor: ICodeEditor, ..._args: any[]): void;
+    runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController1, _editor: ICodeEditor, ..._args: unknown[]): void;
 }
 export declare class ArrowOutDownAction extends AbstractInline1ChatAction {
     constructor();
-    runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController1, _editor: ICodeEditor, ..._args: any[]): void;
+    runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController1, _editor: ICodeEditor, ..._args: unknown[]): void;
 }
 export declare class AcceptChanges extends AbstractInline1ChatAction {
     constructor();
@@ -46,27 +46,27 @@ export declare class DiscardHunkAction extends AbstractInline1ChatAction {
 }
 export declare class RerunAction extends AbstractInline1ChatAction {
     constructor();
-    runInlineChatCommand(accessor: ServicesAccessor, ctrl: InlineChatController1, _editor: ICodeEditor, ..._args: any[]): Promise<void>;
+    runInlineChatCommand(accessor: ServicesAccessor, ctrl: InlineChatController1, _editor: ICodeEditor, ..._args: unknown[]): Promise<void>;
 }
 export declare class CloseAction extends AbstractInline1ChatAction {
     constructor();
-    runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController1, _editor: ICodeEditor, ..._args: any[]): Promise<void>;
+    runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController1, _editor: ICodeEditor, ..._args: unknown[]): Promise<void>;
 }
 export declare class ConfigureInlineChatAction extends AbstractInline1ChatAction {
     constructor();
-    runInlineChatCommand(accessor: ServicesAccessor, ctrl: InlineChatController1, _editor: ICodeEditor, ..._args: any[]): Promise<void>;
+    runInlineChatCommand(accessor: ServicesAccessor, ctrl: InlineChatController1, _editor: ICodeEditor, ..._args: unknown[]): Promise<void>;
 }
 export declare class MoveToNextHunk extends AbstractInline1ChatAction {
     constructor();
-    runInlineChatCommand(accessor: ServicesAccessor, ctrl: InlineChatController1, editor: ICodeEditor, ...args: any[]): void;
+    runInlineChatCommand(accessor: ServicesAccessor, ctrl: InlineChatController1, editor: ICodeEditor, ...args: unknown[]): void;
 }
 export declare class MoveToPreviousHunk extends AbstractInline1ChatAction {
     constructor();
-    runInlineChatCommand(accessor: ServicesAccessor, ctrl: InlineChatController1, editor: ICodeEditor, ...args: any[]): void;
+    runInlineChatCommand(accessor: ServicesAccessor, ctrl: InlineChatController1, editor: ICodeEditor, ...args: unknown[]): void;
 }
 export declare class ViewInChatAction extends AbstractInline1ChatAction {
     constructor();
-    runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController1, _editor: ICodeEditor, ..._args: any[]): Promise<void>;
+    runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController1, _editor: ICodeEditor, ..._args: unknown[]): Promise<void>;
 }
 export declare class ToggleDiffForChange extends AbstractInline1ChatAction {
     constructor();
@@ -75,30 +75,18 @@ export declare class ToggleDiffForChange extends AbstractInline1ChatAction {
 declare abstract class AbstractInline2ChatAction extends EditorAction2 {
     static readonly category: import("@codingame/monaco-vscode-api/vscode/vs/nls").ILocalizedString;
     constructor(desc: IAction2Options);
-    runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor, ..._args: any[]): void;
-    abstract runInlineChatCommand(accessor: ServicesAccessor, ctrl: InlineChatController2, editor: ICodeEditor, ...args: any[]): void;
+    runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor, ..._args: unknown[]): void;
+    abstract runInlineChatCommand(accessor: ServicesAccessor, ctrl: InlineChatController2, editor: ICodeEditor, ...args: unknown[]): void;
 }
 declare class KeepOrUndoSessionAction extends AbstractInline2ChatAction {
     private readonly _keep;
-    constructor(id: string, _keep: boolean);
-    runInlineChatCommand(accessor: ServicesAccessor, _ctrl: InlineChatController2, editor: ICodeEditor, ..._args: any[]): Promise<void>;
+    constructor(_keep: boolean, desc: IAction2Options);
+    runInlineChatCommand(accessor: ServicesAccessor, _ctrl: InlineChatController2, editor: ICodeEditor, ..._args: unknown[]): Promise<void>;
 }
 export declare class KeepSessionAction2 extends KeepOrUndoSessionAction {
     constructor();
 }
-export declare class UndoSessionAction2 extends KeepOrUndoSessionAction {
+export declare class UndoAndCloseSessionAction2 extends KeepOrUndoSessionAction {
     constructor();
 }
-export declare class CloseSessionAction2 extends AbstractInline2ChatAction {
-    constructor();
-    runInlineChatCommand(accessor: ServicesAccessor, _ctrl: InlineChatController2, editor: ICodeEditor, ...args: any[]): void;
-}
-export declare class RevealWidget extends AbstractInline2ChatAction {
-    constructor();
-    runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController2, _editor: ICodeEditor): void;
-}
-export declare class CancelRequestAction extends AbstractInline2ChatAction {
-    constructor();
-    runInlineChatCommand(accessor: ServicesAccessor, ctrl: InlineChatController2, _editor: ICodeEditor): void;
-}
 export {};