@codingame/monaco-vscode-chat-service-override 23.3.0 → 24.1.0

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

@@ -2,19 +2,19 @@ import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 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 { PromptsType } from "@codingame/monaco-vscode-8d4ef243-d8c1-540d-9f11-38df46f54c9f-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes";
+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 { ISearchService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/search/common/search.service";
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
-import { PromptsStorage } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService";
+import { PromptsStorage } from "@codingame/monaco-vscode-api/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 { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
-import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { IPathService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service";
 /**
  * Utility class to locate prompt files.
  */
-export declare class PromptFilesLocator extends Disposable {
+export declare class PromptFilesLocator {
     private readonly fileService;
     private readonly configService;
     private readonly workspaceService;
@@ -22,7 +22,8 @@ export declare class PromptFilesLocator extends Disposable {
     private readonly searchService;
     private readonly userDataService;
     private readonly logService;
-    constructor(fileService: IFileService, configService: IConfigurationService, workspaceService: IWorkspaceContextService, environmentService: IWorkbenchEnvironmentService, searchService: ISearchService, userDataService: IUserDataProfileService, logService: ILogService);
+    private readonly pathService;
+    constructor(fileService: IFileService, configService: IConfigurationService, workspaceService: IWorkspaceContextService, environmentService: IWorkbenchEnvironmentService, searchService: ISearchService, userDataService: IUserDataProfileService, logService: ILogService, pathService: IPathService);
     /**
      * List all prompt files from the filesystem.
      *
@@ -80,6 +81,17 @@ export declare class PromptFilesLocator extends Disposable {
      */
     findAgentMDsInWorkspaceRoots(token: CancellationToken): Promise<URI[]>;
     getAgentFileURIFromModeFile(oldURI: URI): URI | undefined;
+    private findClaudeSkillsInFolder;
+    /**
+     * Searches for skills in `.claude/skills/` directories in the workspace.
+     * Each skill is stored in its own subdirectory with a SKILL.md file.
+     */
+    findClaudeSkillsInWorkspace(token: CancellationToken): Promise<URI[]>;
+    /**
+     * Searches for skills in `.claude/skills/` directories  in the home folder.
+     * Each skill is stored in its own subdirectory with a SKILL.md file.
+     */
+    findClaudeSkillsInUserHome(token: CancellationToken): Promise<URI[]>;
 }
 /**
  * Checks if the provided `pattern` could be a valid glob pattern.

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

@@ -4,26 +4,26 @@ 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-8d4ef243-d8c1-540d-9f11-38df46f54c9f-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/config';
+import { getPromptFileLocationsConfigKey, PromptsConfig } from '@codingame/monaco-vscode-api/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, 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 { 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 { 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';
 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 '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
+import { PromptsStorage } from '@codingame/monaco-vscode-api/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';
+import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { IPathService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service';
 
-let PromptFilesLocator = class PromptFilesLocator extends Disposable {
-    constructor(fileService, configService, workspaceService, environmentService, searchService, userDataService, logService) {
-        super();
+let PromptFilesLocator = class PromptFilesLocator {
+    constructor(fileService, configService, workspaceService, environmentService, searchService, userDataService, logService, pathService) {
         this.fileService = fileService;
         this.configService = configService;
         this.workspaceService = workspaceService;
@@ -31,6 +31,7 @@ let PromptFilesLocator = class PromptFilesLocator extends Disposable {
         this.searchService = searchService;
         this.userDataService = userDataService;
         this.logService = logService;
+        this.pathService = pathService;
     }
     async listFiles(type, storage, token) {
         if (storage === PromptsStorage.local) {
@@ -272,6 +273,38 @@ let PromptFilesLocator = class PromptFilesLocator extends Disposable {
         }
         return undefined;
     }
+    async findClaudeSkillsInFolder(uri, token) {
+        const result = [];
+        try {
+            const stat = await this.fileService.resolve(joinPath(uri, '.claude/skills'));
+            if (token.isCancellationRequested) {
+                return [];
+            }
+            if (stat.isDirectory && stat.children) {
+                for (const skillDir of stat.children) {
+                    if (skillDir.isDirectory) {
+                        const skillFile = joinPath(skillDir.resource, 'SKILL.md');
+                        if (await this.fileService.exists(skillFile)) {
+                            result.push(skillFile);
+                        }
+                    }
+                }
+            }
+        }
+        catch (error) {
+            return [];
+        }
+        return result;
+    }
+    async findClaudeSkillsInWorkspace(token) {
+        const workspace = this.workspaceService.getWorkspace();
+        const results = await Promise.all(( workspace.folders.map(f => this.findClaudeSkillsInFolder(f.uri, token))));
+        return results.flat();
+    }
+    async findClaudeSkillsInUserHome(token) {
+        const userHome = await this.pathService.userHome();
+        return this.findClaudeSkillsInFolder(userHome, token);
+    }
 };
 PromptFilesLocator = ( __decorate([
     ( __param(0, IFileService)),
@@ -280,7 +313,8 @@ PromptFilesLocator = ( __decorate([
     ( __param(3, IWorkbenchEnvironmentService)),
     ( __param(4, ISearchService)),
     ( __param(5, IUserDataProfileService)),
-    ( __param(6, ILogService))
+    ( __param(6, ILogService)),
+    ( __param(7, IPathService))
 ], PromptFilesLocator));
 function isValidGlob(pattern) {
     let squareBrackets = false;

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

@@ -7,6 +7,7 @@ export interface IRawToolContribution {
     displayName: string;
     modelDescription: string;
     toolReferenceName?: string;
+    legacyToolReferenceFullNames?: string[];
     icon?: string | {
         light: string;
         dark: string;
@@ -23,6 +24,7 @@ export interface IRawToolSetContribution {
      * @deprecated
      */
     referenceName?: string;
+    legacyFullNames?: string[];
     description: string;
     icon?: string;
     tools: string[];

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

@@ -30,7 +30,7 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
     },
     jsonSchema: {
         description: ( localize(
-            5948,
+            6068,
             '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(
-                        5949,
+                        6069,
                         "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(
-                        5950,
+                        6070,
                         "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(
-                        5951,
+                        6071,
                         "A human-readable name for this tool that may be used to describe it in the UI."
                     )),
                     type: 'string'
                 },
                 userDescription: {
-                    description: ( localize(5952, "A description of this tool that may be shown to the user.")),
+                    description: ( localize(6072, "A description of this tool that may be shown to the user.")),
                     type: 'string'
                 },
                 modelDescription: {
                     description: ( localize(
-                        5953,
+                        6073,
                         "A description of this tool that may be used by a language model to select it."
                     )),
                     type: 'string'
                 },
                 inputSchema: {
                     description: ( localize(
-                        5954,
+                        6074,
                         "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(
-                        5955,
+                        6075,
                         "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(
-                        5956,
+                        6076,
                         '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(5957, 'Icon path when a light theme is used')),
+                                    description: ( localize(6077, 'Icon path when a light theme is used')),
                                     type: 'string'
                                 },
                                 dark: {
-                                    description: ( localize(5958, 'Icon path when a dark theme is used')),
+                                    description: ( localize(6078, 'Icon path when a dark theme is used')),
                                     type: 'string'
                                 }
                             }
@@ -128,14 +128,14 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                 },
                 when: {
                     markdownDescription: ( localize(
-                        5959,
+                        6079,
                         "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(
-                        5960,
+                        6080,
                         "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(
-            5961,
+            6081,
             '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(
-                        5962,
+                        6082,
                         "A name for this tool set. Used as reference and should not contain whitespace."
                     )),
                     type: 'string',
                     pattern: '^[\\w-]+$'
                 },
                 description: {
-                    description: ( localize(5963, "A description of this tool set.")),
+                    description: ( localize(6083, "A description of this tool set.")),
                     type: 'string'
                 },
                 icon: {
-                    markdownDescription: ( localize(5964, "An icon that represents this tool set, like `$(zap)`")),
+                    markdownDescription: ( localize(6084, "An icon that represents this tool set, like `$(zap)`")),
                     type: 'string'
                 },
                 tools: {
                     markdownDescription: ( localize(
-                        5965,
+                        6085,
                         "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',
@@ -232,6 +232,10 @@ let LanguageModelToolsExtensionPointHandler = class LanguageModelToolsExtensionP
                     if (rawTool.tags?.some(tag => tag.startsWith('copilot_') || tag.startsWith('vscode_')) && !isProposedApiEnabled(extension.description, 'chatParticipantPrivate')) {
                         extension.collector.error(`Extension '${extension.description.identifier.value}' CANNOT register tool with tags starting with "vscode_" or "copilot_"`);
                     }
+                    if (rawTool.legacyToolReferenceFullNames && !isProposedApiEnabled(extension.description, 'chatParticipantPrivate')) {
+                        extension.collector.error(`Extension '${extension.description.identifier.value}' CANNOT use 'legacyToolReferenceFullNames' without the 'chatParticipantPrivate' API proposal enabled`);
+                        continue;
+                    }
                     const rawIcon = rawTool.icon;
                     let icon;
                     if (typeof rawIcon === 'string') {
@@ -293,6 +297,10 @@ let LanguageModelToolsExtensionPointHandler = class LanguageModelToolsExtensionP
                         extension.collector.error(`Tool set '${toolSet.name}' CANNOT have an empty name`);
                         continue;
                     }
+                    if (toolSet.legacyFullNames && !isProposedApiEnabled(extension.description, 'contribLanguageModelToolSets')) {
+                        extension.collector.error(`Tool set '${toolSet.name}' CANNOT use 'legacyFullNames' without the 'contribLanguageModelToolSets' API proposal enabled`);
+                        continue;
+                    }
                     if (isFalsyOrEmpty(toolSet.tools)) {
                         extension.collector.error(`Tool set '${toolSet.name}' CANNOT have an empty tools array`);
                         continue;
@@ -317,9 +325,20 @@ let LanguageModelToolsExtensionPointHandler = class LanguageModelToolsExtensionP
                         continue;
                     }
                     const store = ( new DisposableStore());
-                    const obj = languageModelToolsService.createToolSet(source, toToolSetKey(extension.description.identifier, toolSet.name), toolSet.referenceName ?? toolSet.name, { icon: toolSet.icon ? ThemeIcon.fromString(toolSet.icon) : undefined, description: toolSet.description });
+                    const referenceName = toolSet.referenceName ?? toolSet.name;
+                    const existingToolSet = languageModelToolsService.getToolSetByName(referenceName);
+                    const mergeExisting = isBuiltinTool && existingToolSet?.source === ToolDataSource.Internal;
+                    let obj;
+                    if (mergeExisting) {
+                        obj = existingToolSet;
+                    }
+                    else {
+                        obj = languageModelToolsService.createToolSet(source, toToolSetKey(extension.description.identifier, toolSet.name), referenceName, { icon: toolSet.icon ? ThemeIcon.fromString(toolSet.icon) : undefined, description: toolSet.description, legacyFullNames: toolSet.legacyFullNames });
+                    }
                     transaction(tx => {
-                        store.add(obj);
+                        if (!mergeExisting) {
+                            store.add(obj);
+                        }
                         tools.forEach(tool => store.add(obj.addTool(tool, tx)));
                         toolSets.forEach(toolSet => store.add(obj.addToolSet(toolSet, tx)));
                     });
@@ -352,9 +371,9 @@ class LanguageModelToolDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localize(5966, "Name")),
-            ( localize(5967, "Display Name")),
-            ( localize(5968, "Description")),
+            ( localize(6086, "Name")),
+            ( localize(6087, "Display Name")),
+            ( localize(6088, "Description")),
         ];
         const rows = ( contribs.map(t => {
             return [
@@ -374,7 +393,7 @@ class LanguageModelToolDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'languageModelTools',
-    label: ( localize(5969, "Language Model Tools")),
+    label: ( localize(6089, "Language Model Tools")),
     access: {
         canToggle: false
     },
@@ -394,10 +413,10 @@ class LanguageModelToolSetDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localize(5970, "Name")),
-            ( localize(5971, "Reference Name")),
-            ( localize(5972, "Tools")),
-            ( localize(5973, "Description")),
+            ( localize(6090, "Name")),
+            ( localize(6091, "Reference Name")),
+            ( localize(6092, "Tools")),
+            ( localize(6093, "Description")),
         ];
         const rows = ( contribs.map(t => {
             return [
@@ -418,7 +437,7 @@ class LanguageModelToolSetDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'languageModelToolSets',
-    label: ( localize(5974, "Language Model Tool Sets")),
+    label: ( localize(6094, "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-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IChatModel } from "@codingame/monaco-vscode-api/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-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { chatAgentLeader, chatSubcommandLeader } from '@codingame/monaco-vscode-api/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(5988, "A speech-to-text session is in progress for chat.")) }
+    { type: 'boolean', description: ( localize(6109, "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/inlineChat/browser/inlineChat.contribution.js

@@ -1,9 +1,9 @@
 
 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 { InlineChatController2, InlineChatController1, InlineChatController } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
 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 { 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-katex-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,30 +11,25 @@ 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, InlineChatEscapeToolContribution } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl';
+import { InlineChatEnabler, InlineChatEscapeToolContribution } from '@codingame/monaco-vscode-katex-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-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
+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 { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { InlineChatAccessibilityHelp } from './inlineChatAccessibilityHelp.js';
-import { InlineChatExpandLineAction, ShowInlineChatHintAction, HideInlineChatHintAction, InlineChatHintsController } from './inlineChatCurrentLine.js';
 
 registerEditorContribution(InlineChatController2.ID, InlineChatController2, EditorContributionInstantiation.Eager);
 registerEditorContribution(INLINE_CHAT_ID, InlineChatController1, EditorContributionInstantiation.Eager);
 registerEditorContribution(InlineChatController.ID, InlineChatController, EditorContributionInstantiation.Eager);
 registerAction2(KeepSessionAction2);
 registerAction2(UndoAndCloseSessionAction2);
-registerAction2(InlineChatExpandLineAction);
-registerAction2(ShowInlineChatHintAction);
-registerAction2(HideInlineChatHintAction);
-registerEditorContribution(InlineChatHintsController.ID, InlineChatHintsController, EditorContributionInstantiation.Eventually);
 const editActionMenuItem = {
     group: '0_main',
     order: 0,
     command: {
         id: ChatSubmitAction.ID,
-        title: ( localize(8141, "Edit Code")),
+        title: ( localize(8276, "Edit Code")),
     },
     when: ( ContextKeyExpr.and(ChatContextKeys.inputHasText, ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()), CTX_INLINE_CHAT_EDITING, CTX_INLINE_CHAT_V1_ENABLED)),
 };
@@ -43,7 +38,7 @@ const generateActionMenuItem = {
     order: 0,
     command: {
         id: ChatSubmitAction.ID,
-        title: ( localize(8142, "Generate")),
+        title: ( localize(8277, "Generate")),
     },
     when: ( ContextKeyExpr.and(ChatContextKeys.inputHasText, ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()), ( CTX_INLINE_CHAT_EDITING.toNegated()), CTX_INLINE_CHAT_V1_ENABLED)),
 };
@@ -54,8 +49,8 @@ const cancelActionMenuItem = {
     order: 0,
     command: {
         id: CancelAction.ID,
-        title: ( localize(8143, "Cancel Request")),
-        shortTitle: ( localize(8144, "Cancel")),
+        title: ( localize(8278, "Cancel Request")),
+        shortTitle: ( localize(8279, "Cancel")),
     },
     when: ( ContextKeyExpr.and(CTX_INLINE_CHAT_REQUEST_IN_PROGRESS)),
 };

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-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { CTX_INLINE_CHAT_RESPONSE_FOCUSED } from '@codingame/monaco-vscode-katex-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-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { InlineChatController } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_RESPONSE_FOCUSED } from '@codingame/monaco-vscode-katex-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

@@ -1,9 +1,9 @@
 import { ICodeEditor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser";
 import { EditorAction2 } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions";
-import { InlineChatController, InlineChatController1, InlineChatController2 } from "@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController";
+import { InlineChatController, InlineChatController1, InlineChatController2 } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController";
 import { Action2, IAction2Options } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
 import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { HunkInformation } from "@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSession";
+import { HunkInformation } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSession";
 export declare const START_INLINE_CHAT: import("@codingame/monaco-vscode-api/vscode/vs/base/common/themables").ThemeIcon;
 export interface IHoldForSpeech {
     (accessor: ServicesAccessor, controller: InlineChatController, source: Action2): void;
@@ -81,7 +81,7 @@ declare abstract class AbstractInline2ChatAction extends EditorAction2 {
 declare class KeepOrUndoSessionAction extends AbstractInline2ChatAction {
     private readonly _keep;
     constructor(_keep: boolean, desc: IAction2Options);
-    runInlineChatCommand(accessor: ServicesAccessor, _ctrl: InlineChatController2, editor: ICodeEditor, ..._args: unknown[]): Promise<void>;
+    runInlineChatCommand(_accessor: ServicesAccessor, ctrl: InlineChatController2, editor: ICodeEditor, ..._args: unknown[]): Promise<void>;
 }
 export declare class KeepSessionAction2 extends KeepOrUndoSessionAction {
     constructor();