@codingame/monaco-vscode-chat-service-override 24.2.0 → 25.0.0

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

@@ -81,17 +81,23 @@ export declare class PromptFilesLocator {
      */
     findAgentMDsInWorkspaceRoots(token: CancellationToken): Promise<URI[]>;
     getAgentFileURIFromModeFile(oldURI: URI): URI | undefined;
-    private findClaudeSkillsInFolder;
+    private findAgentSkillsInFolder;
     /**
-     * Searches for skills in `.claude/skills/` directories in the workspace.
+     * Searches for skills in all default directories in the workspace.
      * Each skill is stored in its own subdirectory with a SKILL.md file.
      */
-    findClaudeSkillsInWorkspace(token: CancellationToken): Promise<URI[]>;
+    findAgentSkillsInWorkspace(token: CancellationToken): Promise<Array<{
+        uri: URI;
+        type: string;
+    }>>;
     /**
-     * Searches for skills in `.claude/skills/` directories  in the home folder.
+     * Searches for skills in all default directories in the home folder.
      * Each skill is stored in its own subdirectory with a SKILL.md file.
      */
-    findClaudeSkillsInUserHome(token: CancellationToken): Promise<URI[]>;
+    findAgentSkillsInUserHome(token: CancellationToken): Promise<Array<{
+        uri: URI;
+        type: string;
+    }>>;
 }
 /**
  * Checks if the provided `pattern` could be a valid glob pattern.

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

@@ -8,7 +8,7 @@ import { getPromptFileLocationsConfigKey, PromptsConfig } from '@codingame/monac
 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, AGENTS_SOURCE_FOLDER, getPromptFileExtension, COPILOT_CUSTOM_INSTRUCTIONS_FILENAME, LEGACY_MODE_FILE_EXTENSION, getCleanPromptName, AGENT_FILE_EXTENSION } from '@codingame/monaco-vscode-api/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, DEFAULT_AGENT_SKILLS_WORKSPACE_FOLDERS, DEFAULT_AGENT_SKILLS_USER_HOME_FOLDERS } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
 import { PromptsType } from '@codingame/monaco-vscode-api/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';
@@ -211,8 +211,14 @@ let PromptFilesLocator = class PromptFilesLocator {
         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);
+            try {
+                const stat = await this.fileService.stat(file);
+                if (stat.isFile) {
+                    result.push(file);
+                }
+            }
+            catch (error) {
+                this.logService.trace(`[PromptFilesLocator] Skipping copilot-instructions.md at ${( file.toString())}: ${error}`);
             }
         }
         return result;
@@ -273,10 +279,10 @@ let PromptFilesLocator = class PromptFilesLocator {
         }
         return undefined;
     }
-    async findClaudeSkillsInFolder(uri, token) {
+    async findAgentSkillsInFolder(uri, relativePath, token) {
         const result = [];
         try {
-            const stat = await this.fileService.resolve(joinPath(uri, '.claude/skills'));
+            const stat = await this.fileService.resolve(joinPath(uri, relativePath));
             if (token.isCancellationRequested) {
                 return [];
             }
@@ -296,14 +302,25 @@ let PromptFilesLocator = class PromptFilesLocator {
         }
         return result;
     }
-    async findClaudeSkillsInWorkspace(token) {
+    async findAgentSkillsInWorkspace(token) {
         const workspace = this.workspaceService.getWorkspace();
-        const results = await Promise.all(( workspace.folders.map(f => this.findClaudeSkillsInFolder(f.uri, token))));
-        return results.flat();
+        const allResults = [];
+        for (const folder of workspace.folders) {
+            for (const { path, type } of DEFAULT_AGENT_SKILLS_WORKSPACE_FOLDERS) {
+                const results = await this.findAgentSkillsInFolder(folder.uri, path, token);
+                allResults.push(...( results.map(uri => ({ uri, type }))));
+            }
+        }
+        return allResults;
     }
-    async findClaudeSkillsInUserHome(token) {
+    async findAgentSkillsInUserHome(token) {
         const userHome = await this.pathService.userHome();
-        return this.findClaudeSkillsInFolder(userHome, token);
+        const allResults = [];
+        for (const { path, type } of DEFAULT_AGENT_SKILLS_USER_HOME_FOLDERS) {
+            const results = await this.findAgentSkillsInFolder(userHome, path, token);
+            allResults.push(...( results.map(uri => ({ uri, type }))));
+        }
+        return allResults;
     }
 };
 PromptFilesLocator = ( __decorate([

package/vscode/src/vs/workbench/contrib/chat/common/{chatTodoListService.d.ts → tools/chatTodoListService.d.ts}

@@ -1,7 +1,7 @@
 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 { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
-import { IChatTodoListService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatTodoListService.service";
+import { IChatTodoListService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/chatTodoListService.service";
 export interface IChatTodo {
     id: number;
     title: string;

package/vscode/src/vs/workbench/contrib/chat/common/{chatTodoListService.js → tools/chatTodoListService.js}

@@ -5,7 +5,7 @@ import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { Memento } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/memento';
-import { chatSessionResourceToId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatUri';
+import { chatSessionResourceToId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 
 let ChatTodoListStorage = class ChatTodoListStorage {
     constructor(storageService) {

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

@@ -1,7 +1,7 @@
 import { IJSONSchema } from "@codingame/monaco-vscode-api/vscode/vs/base/common/jsonSchema";
 import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
-import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service";
+import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service";
 export interface IRawToolContribution {
     name: string;
     displayName: string;

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

@@ -16,8 +16,8 @@ import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/regist
 import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionFeatures';
 import { isProposedApiEnabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions';
 import { ExtensionsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
-import { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
-import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
+import { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
+import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
 import { toolsParametersSchemaSchemaId } from './languageModelToolsParametersSchema.js';
 import { transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/transaction';
 
@@ -30,7 +30,7 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
     },
     jsonSchema: {
         description: ( localize(
-            6068,
+            6084,
             '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(
-                        6069,
+                        6085,
                         "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(
-                        6070,
+                        6086,
                         "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(
-                        6071,
+                        6087,
                         "A human-readable name for this tool that may be used to describe it in the UI."
                     )),
                     type: 'string'
                 },
                 userDescription: {
-                    description: ( localize(6072, "A description of this tool that may be shown to the user.")),
+                    description: ( localize(6088, "A description of this tool that may be shown to the user.")),
                     type: 'string'
                 },
                 modelDescription: {
                     description: ( localize(
-                        6073,
+                        6089,
                         "A description of this tool that may be used by a language model to select it."
                     )),
                     type: 'string'
                 },
                 inputSchema: {
                     description: ( localize(
-                        6074,
+                        6090,
                         "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(
-                        6075,
+                        6091,
                         "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(
-                        6076,
+                        6092,
                         '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(6077, 'Icon path when a light theme is used')),
+                                    description: ( localize(6093, 'Icon path when a light theme is used')),
                                     type: 'string'
                                 },
                                 dark: {
-                                    description: ( localize(6078, 'Icon path when a dark theme is used')),
+                                    description: ( localize(6094, 'Icon path when a dark theme is used')),
                                     type: 'string'
                                 }
                             }
@@ -128,14 +128,14 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                 },
                 when: {
                     markdownDescription: ( localize(
-                        6079,
+                        6095,
                         "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(
-                        6080,
+                        6096,
                         "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(
-            6081,
+            6097,
             '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(
-                        6082,
+                        6098,
                         "A name for this tool set. Used as reference and should not contain whitespace."
                     )),
                     type: 'string',
                     pattern: '^[\\w-]+$'
                 },
                 description: {
-                    description: ( localize(6083, "A description of this tool set.")),
+                    description: ( localize(6099, "A description of this tool set.")),
                     type: 'string'
                 },
                 icon: {
-                    markdownDescription: ( localize(6084, "An icon that represents this tool set, like `$(zap)`")),
+                    markdownDescription: ( localize(6100, "An icon that represents this tool set, like `$(zap)`")),
                     type: 'string'
                 },
                 tools: {
                     markdownDescription: ( localize(
-                        6085,
+                        6101,
                         "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',
@@ -371,9 +371,9 @@ class LanguageModelToolDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localize(6086, "Name")),
-            ( localize(6087, "Display Name")),
-            ( localize(6088, "Description")),
+            ( localize(6102, "Name")),
+            ( localize(6103, "Display Name")),
+            ( localize(6104, "Description")),
         ];
         const rows = ( contribs.map(t => {
             return [
@@ -393,7 +393,7 @@ class LanguageModelToolDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'languageModelTools',
-    label: ( localize(6089, "Language Model Tools")),
+    label: ( localize(6105, "Language Model Tools")),
     access: {
         canToggle: false
     },
@@ -413,10 +413,10 @@ class LanguageModelToolSetDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localize(6090, "Name")),
-            ( localize(6091, "Reference Name")),
-            ( localize(6092, "Tools")),
-            ( localize(6093, "Description")),
+            ( localize(6106, "Name")),
+            ( localize(6107, "Reference Name")),
+            ( localize(6108, "Tools")),
+            ( localize(6109, "Description")),
         ];
         const rows = ( contribs.map(t => {
             return [
@@ -437,7 +437,7 @@ class LanguageModelToolSetDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'languageModelToolSets',
-    label: ( localize(6094, "Language Model Tool Sets")),
+    label: ( localize(6110, "Language Model Tool Sets")),
     access: {
         canToggle: false
     },

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

@@ -3,8 +3,8 @@ import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event"
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 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-api/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service";
+import { IChatModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/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

@@ -6,8 +6,8 @@ import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode
 import { rtrim } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
 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-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service';
+import { chatAgentLeader, chatSubcommandLeader } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/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(6109, "A speech-to-text session is in progress for chat.")) }
+    { type: 'boolean', description: ( localize(6114, "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/chat/common/{chatResponseResourceFileSystemProvider.d.ts → widget/chatResponseResourceFileSystemProvider.d.ts}

@@ -5,7 +5,7 @@ import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { FileSystemProviderCapabilities, FileType, IFileSystemProviderWithFileAtomicReadCapability, IFileSystemProviderWithFileReadStreamCapability, IFileSystemProviderWithFileReadWriteCapability, IStat } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
-import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
 export declare class ChatResponseResourceFileSystemProvider extends Disposable implements IWorkbenchContribution, IFileSystemProviderWithFileReadWriteCapability, IFileSystemProviderWithFileAtomicReadCapability, IFileSystemProviderWithFileReadStreamCapability {
     private readonly chatService;
     private readonly _fileService;

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

@@ -6,10 +6,10 @@ import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { newWriteableStream } from '@codingame/monaco-vscode-api/vscode/vs/base/common/stream';
 import { FileSystemProviderCapabilities, FileType, createFileSystemProviderError, FileSystemProviderErrorCode } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
-import { ChatResponseResource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel';
-import { IChatToolInvocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { isToolResultInputOutputDetails } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
+import { ChatResponseResource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
+import { IChatToolInvocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
+import { isToolResultInputOutputDetails } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
 
 let ChatResponseResourceFileSystemProvider = class ChatResponseResourceFileSystemProvider extends Disposable {
     static { this.ID = 'workbench.contrib.chatResponseResourceFileSystemProvider'; }

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

@@ -15,7 +15,7 @@ import { InlineChatEnabler, InlineChatEscapeToolContribution } from '@codingame/
 import { AccessibleViewRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleViewRegistry';
 import { ChatSubmitAction, CancelAction } from '@codingame/monaco-vscode-katex-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 { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { InlineChatAccessibilityHelp } from './inlineChatAccessibilityHelp.js';
 
@@ -29,7 +29,7 @@ const editActionMenuItem = {
     order: 0,
     command: {
         id: ChatSubmitAction.ID,
-        title: ( localize(8276, "Edit Code")),
+        title: ( localize(8306, "Edit Code")),
     },
     when: ( ContextKeyExpr.and(ChatContextKeys.inputHasText, ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()), CTX_INLINE_CHAT_EDITING, CTX_INLINE_CHAT_V1_ENABLED)),
 };
@@ -38,7 +38,7 @@ const generateActionMenuItem = {
     order: 0,
     command: {
         id: ChatSubmitAction.ID,
-        title: ( localize(8277, "Generate")),
+        title: ( localize(8307, "Generate")),
     },
     when: ( ContextKeyExpr.and(ChatContextKeys.inputHasText, ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()), ( CTX_INLINE_CHAT_EDITING.toNegated()), CTX_INLINE_CHAT_V1_ENABLED)),
 };
@@ -49,8 +49,8 @@ const cancelActionMenuItem = {
     order: 0,
     command: {
         id: CancelAction.ID,
-        title: ( localize(8278, "Cancel Request")),
-        shortTitle: ( localize(8279, "Cancel")),
+        title: ( localize(8308, "Cancel Request")),
+        shortTitle: ( localize(8309, "Cancel")),
     },
     when: ( ContextKeyExpr.and(CTX_INLINE_CHAT_REQUEST_IN_PROGRESS)),
 };

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

@@ -3,7 +3,7 @@ import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/edito
 import { AccessibleViewType } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleView';
 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 { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { CTX_INLINE_CHAT_RESPONSE_FOCUSED } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 
 class InlineChatAccessibilityHelp {

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

@@ -22,19 +22,19 @@ import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { registerIcon } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/iconRegistry';
 import { IPreferencesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/preferences/common/preferences.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 
 CommandsRegistry.registerCommandAlias('interactiveEditor.start', 'inlineChat.start');
 CommandsRegistry.registerCommandAlias('interactive.acceptChanges', ACTION_ACCEPT_CHANGES);
-const START_INLINE_CHAT = registerIcon('start-inline-chat', Codicon.sparkle, ( localize(8280, 'Icon which spawns the inline chat from the editor toolbar.')));
+const START_INLINE_CHAT = registerIcon('start-inline-chat', Codicon.sparkle, ( localize(8310, 'Icon which spawns the inline chat from the editor toolbar.')));
 const inlineChatContextKey = ( ContextKeyExpr.and(( ContextKeyExpr.or(CTX_INLINE_CHAT_V1_ENABLED, CTX_INLINE_CHAT_V2_ENABLED)), CTX_INLINE_CHAT_POSSIBLE, EditorContextKeys.writable, ( EditorContextKeys.editorSimpleInput.negate())));
 class StartSessionAction extends Action2 {
     constructor() {
         super({
             id: ACTION_START,
-            title: ( localize2(8281, 'Open Inline Chat')),
+            title: ( localize2(8311, 'Open Inline Chat')),
             category: AbstractInline1ChatAction.category,
             f1: true,
             precondition: inlineChatContextKey,
@@ -93,7 +93,7 @@ class FocusInlineChat extends EditorAction2 {
     constructor() {
         super({
             id: 'inlineChat.focus',
-            title: ( localize2(8282, "Focus Input")),
+            title: ( localize2(8312, "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()))),
@@ -116,7 +116,7 @@ class UnstashSessionAction extends EditorAction2 {
     constructor() {
         super({
             id: 'inlineChat.unstash',
-            title: ( localize2(8283, "Resume Last Dismissed Inline Chat")),
+            title: ( localize2(8313, "Resume Last Dismissed Inline Chat")),
             category: AbstractInline1ChatAction.category,
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_HAS_STASHED_SESSION, EditorContextKeys.writable)),
             keybinding: {
@@ -138,7 +138,7 @@ class UnstashSessionAction extends EditorAction2 {
     }
 }
 class AbstractInline1ChatAction extends EditorAction2 {
-    static { this.category = ( localize2(8284, "Inline Chat")); }
+    static { this.category = ( localize2(8314, "Inline Chat")); }
     constructor(desc) {
         const massageMenu = (menu) => {
             if (Array.isArray(menu)) {
@@ -200,7 +200,7 @@ class ArrowOutUpAction extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: 'inlineChat.arrowOutUp',
-            title: ( localize(8285, 'Cursor Up')),
+            title: ( localize(8315, 'Cursor Up')),
             precondition: ( ContextKeyExpr.and(
                 CTX_INLINE_CHAT_FOCUSED,
                 CTX_INLINE_CHAT_INNER_CURSOR_FIRST,
@@ -221,7 +221,7 @@ class ArrowOutDownAction extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: 'inlineChat.arrowOutDown',
-            title: ( localize(8286, 'Cursor Down')),
+            title: ( localize(8316, '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,
@@ -237,8 +237,8 @@ class AcceptChanges extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: ACTION_ACCEPT_CHANGES,
-            title: ( localize2(8287, "Accept Changes")),
-            shortTitle: ( localize(8288, 'Accept')),
+            title: ( localize2(8317, "Accept Changes")),
+            shortTitle: ( localize(8318, 'Accept')),
             icon: Codicon.check,
             f1: true,
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE)),
@@ -266,7 +266,7 @@ class DiscardHunkAction extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: ACTION_DISCARD_CHANGES,
-            title: ( localize(8289, 'Discard')),
+            title: ( localize(8319, 'Discard')),
             icon: Codicon.chromeClose,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             menu: [{
@@ -289,8 +289,8 @@ class RerunAction extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: ACTION_REGENERATE_RESPONSE,
-            title: ( localize2(8290, "Rerun Request")),
-            shortTitle: ( localize(8291, 'Rerun')),
+            title: ( localize2(8320, "Rerun Request")),
+            shortTitle: ( localize(8321, 'Rerun')),
             f1: false,
             icon: Codicon.refresh,
             precondition: CTX_INLINE_CHAT_VISIBLE,
@@ -329,7 +329,7 @@ class CloseAction extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: 'inlineChat.close',
-            title: ( localize(8292, 'Close')),
+            title: ( localize(8322, 'Close')),
             icon: Codicon.close,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             keybinding: {
@@ -356,7 +356,7 @@ class ConfigureInlineChatAction extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: 'inlineChat.configure',
-            title: ( localize2(8293, 'Configure Inline Chat')),
+            title: ( localize2(8323, 'Configure Inline Chat')),
             icon: Codicon.settingsGear,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             f1: true,
@@ -375,7 +375,7 @@ class MoveToNextHunk extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: 'inlineChat.moveToNextHunk',
-            title: ( localize2(8294, 'Move to Next Change')),
+            title: ( localize2(8324, 'Move to Next Change')),
             precondition: CTX_INLINE_CHAT_VISIBLE,
             f1: true,
             keybinding: {
@@ -392,7 +392,7 @@ class MoveToPreviousHunk extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: 'inlineChat.moveToPreviousHunk',
-            title: ( localize2(8295, 'Move to Previous Change')),
+            title: ( localize2(8325, 'Move to Previous Change')),
             f1: true,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             keybinding: {
@@ -409,7 +409,7 @@ class ViewInChatAction extends AbstractInline1ChatAction {
     constructor() {
         super({
             id: ACTION_VIEW_IN_CHAT,
-            title: ( localize(8296, 'View in Chat')),
+            title: ( localize(8326, 'View in Chat')),
             icon: Codicon.chatSparkle,
             precondition: CTX_INLINE_CHAT_VISIBLE,
             menu: [{
@@ -439,7 +439,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(8297, 'Toggle Changes')),
+            title: ( localize2(8327, 'Toggle Changes')),
             icon: Codicon.diffSingle,
             toggled: {
                 condition: CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF,
@@ -461,7 +461,7 @@ class ToggleDiffForChange extends AbstractInline1ChatAction {
     }
 }
 class AbstractInline2ChatAction extends EditorAction2 {
-    static { this.category = ( localize2(8284, "Inline Chat")); }
+    static { this.category = ( localize2(8314, "Inline Chat")); }
     constructor(desc) {
         const massageMenu = (menu) => {
             if (Array.isArray(menu)) {
@@ -540,7 +540,7 @@ class KeepSessionAction2 extends KeepOrUndoSessionAction {
     constructor() {
         super(true, {
             id: 'inlineChat2.keep',
-            title: ( localize2(8298, "Keep")),
+            title: ( localize2(8328, "Keep")),
             f1: true,
             icon: Codicon.check,
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, ( ctxHasRequestInProgress.negate()), ctxHasEditorModification)),
@@ -565,7 +565,7 @@ class UndoAndCloseSessionAction2 extends KeepOrUndoSessionAction {
     constructor() {
         super(false, {
             id: 'inlineChat2.close',
-            title: ( localize2(8299, "Close")),
+            title: ( localize2(8329, "Close")),
             f1: true,
             icon: Codicon.close,
             precondition: CTX_INLINE_CHAT_VISIBLE,