@codingame/monaco-vscode-chat-service-override 15.0.2 → 16.0.0

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

@@ -7,9 +7,9 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 
 let TextModelPromptParser = class TextModelPromptParser extends BasePromptParser {
     constructor(model, seenReferences = [], initService, logService) {
-        const contentsProvider = initService.createInstance(TextModelContentsProvider, model)
-            .onDispose(() => this.dispose());
+        const contentsProvider = initService.createInstance(TextModelContentsProvider, model);
         super(contentsProvider, seenReferences, initService, logService);
+        this._register(contentsProvider);
     }
     toString() {
         return `text-model-prompt:${this.uri.path}`;

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

@@ -28,9 +28,9 @@ let PromptsService = class PromptsService extends Disposable {
     async listPromptFiles() {
         const userLocations = [this.userDataService.currentProfile.promptsHome];
         const prompts = await Promise.all([
-            this.fileLocator.listFilesIn(userLocations, [])
+            this.fileLocator.listFilesIn(userLocations)
                 .then(withType('user')),
-            this.fileLocator.listFiles([])
+            this.fileLocator.listFiles()
                 .then(withType('local')),
         ]);
         return prompts.flat();

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

@@ -4,11 +4,13 @@ import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 export declare class PromptFilesLocator {
     private readonly fileService;
-    private readonly workspaceService;
     private readonly configService;
-    constructor(fileService: IFileService, workspaceService: IWorkspaceContextService, configService: IConfigurationService);
-    listFiles(exclude: readonly URI[]): Promise<readonly URI[]>;
-    listFilesIn(folders: readonly URI[], exclude: readonly URI[]): Promise<readonly URI[]>;
+    private readonly workspaceService;
+    constructor(fileService: IFileService, configService: IConfigurationService, workspaceService: IWorkspaceContextService);
+    listFiles(): Promise<readonly URI[]>;
+    listFilesIn(folders: readonly URI[]): Promise<readonly URI[]>;
     getConfigBasedSourceFolders(): readonly URI[];
     private findInstructionFiles;
 }
+export declare const isValidGlob: (pattern: string) => boolean;
+export declare const firstNonGlobParent: (location: URI) => URI;

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

@@ -1,101 +1,193 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { match } from '@codingame/monaco-vscode-api/vscode/vs/base/common/glob';
+import { assert } from '@codingame/monaco-vscode-api/vscode/vs/base/common/assert';
+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 { extUri, dirname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
-import { PromptsConfig } from '@codingame/monaco-vscode-52bb4d5b-ba1a-57fd-9bee-b28824214eac-common/vscode/vs/platform/prompts/common/config';
-import { isPromptFile } from '@codingame/monaco-vscode-52bb4d5b-ba1a-57fd-9bee-b28824214eac-common/vscode/vs/platform/prompts/common/constants';
+import { PromptsConfig } from '@codingame/monaco-vscode-a1eb43d5-da63-5f76-8ad4-acf0d6c3b749-common/vscode/vs/platform/prompts/common/config';
+import { basename, extUri, dirname } 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 { PROMPT_FILE_EXTENSION, isPromptFile } from '@codingame/monaco-vscode-a1eb43d5-da63-5f76-8ad4-acf0d6c3b749-common/vscode/vs/platform/prompts/common/constants';
 
 let PromptFilesLocator = class PromptFilesLocator {
-    constructor(fileService, workspaceService, configService) {
+    constructor(fileService, configService, workspaceService) {
         this.fileService = fileService;
-        this.workspaceService = workspaceService;
         this.configService = configService;
+        this.workspaceService = workspaceService;
     }
-    async listFiles(exclude) {
-        return await this.listFilesIn(this.getConfigBasedSourceFolders(), exclude);
+    async listFiles() {
+        const configuredLocations = PromptsConfig.promptSourceFolders(this.configService);
+        const absoluteLocations = toAbsoluteLocations(configuredLocations, this.workspaceService);
+        return await this.listFilesIn(absoluteLocations);
     }
-    async listFilesIn(folders, exclude) {
-        const excludeSet = ( new Set());
-        for (const excludeUri of exclude) {
-            excludeSet.add(excludeUri.path);
-        }
-        const cleanFolders = folders
-            .filter((folder) => {
-            return !( excludeSet.has(folder.path));
-        });
-        return await this.findInstructionFiles(cleanFolders, excludeSet);
+    async listFilesIn(folders) {
+        return await this.findInstructionFiles(folders);
     }
     getConfigBasedSourceFolders() {
-        const paths = ( new ResourceSet());
-        const sourceFolders = PromptsConfig.promptSourceFolders(this.configService);
-        for (const sourceFolderName of sourceFolders) {
-            const sourceFolderUri = URI.file(sourceFolderName);
-            if (sourceFolderUri.path === sourceFolderName) {
-                if (( paths.has(sourceFolderUri))) {
+        const configuredLocations = PromptsConfig.promptSourceFolders(this.configService);
+        const absoluteLocations = toAbsoluteLocations(configuredLocations, this.workspaceService);
+        const result = ( new ResourceSet());
+        for (const absoluteLocation of absoluteLocations) {
+            let { path } = absoluteLocation;
+            const baseName = basename(absoluteLocation);
+            const filePatterns = ['*.md', `*${PROMPT_FILE_EXTENSION}`];
+            for (const filePattern of filePatterns) {
+                if (baseName === filePattern) {
+                    path = URI.joinPath(absoluteLocation, '..').path;
                     continue;
                 }
-                paths.add(sourceFolderUri);
+            }
+            if (baseName === '*') {
+                path = URI.joinPath(absoluteLocation, '..').path;
+            }
+            if (isValidGlob(path) === true) {
                 continue;
             }
-            const { folders } = this.workspaceService.getWorkspace();
-            for (const folder of folders) {
-                const relativeFolderUri = extUri.resolvePath(folder.uri, sourceFolderName);
-                if (!( paths.has(relativeFolderUri))) {
-                    paths.add(relativeFolderUri);
+            result.add(URI.file(path));
+        }
+        return [...result];
+    }
+    async findInstructionFiles(absoluteLocations) {
+        const paths = ( new ResourceSet());
+        for (const absoluteLocation of absoluteLocations) {
+            assert(isAbsolute(absoluteLocation.path), `Provided location must be an absolute path, got '${absoluteLocation.path}'.`);
+            const location = (isValidGlob(basename(absoluteLocation)) || absoluteLocation.path.endsWith(PROMPT_FILE_EXTENSION))
+                ? absoluteLocation
+                : extUri.joinPath(absoluteLocation, `*${PROMPT_FILE_EXTENSION}`);
+            const promptFiles = await findAllPromptFiles(firstNonGlobParent(location), this.fileService);
+            for (const file of promptFiles) {
+                if (match(location.path, file.path)) {
+                    paths.add(file);
                 }
-                if (folders.length <= 1) {
+            }
+        }
+        return [...paths];
+    }
+};
+PromptFilesLocator = ( __decorate([
+    ( __param(0, IFileService)),
+    ( __param(1, IConfigurationService)),
+    ( __param(2, IWorkspaceContextService))
+], PromptFilesLocator));
+const isValidGlob = (pattern) => {
+    let squareBrackets = false;
+    let squareBracketsCount = 0;
+    let curlyBrackets = false;
+    let curlyBracketsCount = 0;
+    let previousCharacter;
+    for (const char of pattern) {
+        if (previousCharacter === '\\') {
+            previousCharacter = char;
+            continue;
+        }
+        if (char === '*') {
+            return true;
+        }
+        if (char === '?') {
+            return true;
+        }
+        if (char === '[') {
+            squareBrackets = true;
+            squareBracketsCount++;
+            previousCharacter = char;
+            continue;
+        }
+        if (char === ']') {
+            squareBrackets = true;
+            squareBracketsCount--;
+            previousCharacter = char;
+            continue;
+        }
+        if (char === '{') {
+            curlyBrackets = true;
+            curlyBracketsCount++;
+            continue;
+        }
+        if (char === '}') {
+            curlyBrackets = true;
+            curlyBracketsCount--;
+            previousCharacter = char;
+            continue;
+        }
+        previousCharacter = char;
+    }
+    if (squareBrackets && (squareBracketsCount === 0)) {
+        return true;
+    }
+    if (curlyBrackets && (curlyBracketsCount === 0)) {
+        return true;
+    }
+    return false;
+};
+const firstNonGlobParent = (location) => {
+    assert(isAbsolute(location.path), `Provided location must be an absolute path, got '${location.path}'.`);
+    if (isValidGlob(location.path) === false) {
+        return location;
+    }
+    const parent = dirname(location);
+    if (extUri.isEqual(parent, location)) {
+        return location;
+    }
+    return firstNonGlobParent(parent);
+};
+const findAllPromptFiles = async (location, fileService) => {
+    const result = [];
+    try {
+        const info = await fileService.resolve(location);
+        if (info.isFile && isPromptFile(info.resource)) {
+            result.push(info.resource);
+            return result;
+        }
+        if (info.isDirectory && info.children) {
+            for (const child of info.children) {
+                if (child.isFile && isPromptFile(child.resource)) {
+                    result.push(child.resource);
                     continue;
                 }
-                const workspaceRootUri = dirname(folder.uri);
-                const workspaceFolderUri = extUri.resolvePath(workspaceRootUri, sourceFolderName);
-                if (( paths.has(workspaceFolderUri))) {
+                if (child.isDirectory) {
+                    const promptFiles = await findAllPromptFiles(child.resource, fileService);
+                    result.push(...promptFiles);
                     continue;
                 }
-                if (workspaceFolderUri.fsPath.startsWith(folder.uri.fsPath)) {
-                    paths.add(workspaceFolderUri);
-                }
             }
+            return result;
         }
-        return [...paths];
     }
-    async findInstructionFiles(folders, exclude) {
-        const results = await this.fileService.resolveAll(( folders.map((resource) => {
-            return { resource };
-        })));
-        const files = [];
-        for (const result of results) {
-            const { stat, success } = result;
-            if (!success) {
+    catch (error) {
+    }
+    return result;
+};
+const toAbsoluteLocations = (configuredLocations, workspaceService) => {
+    const result = ( new ResourceSet());
+    const { folders } = workspaceService.getWorkspace();
+    for (const configuredLocation of configuredLocations) {
+        if (isAbsolute(configuredLocation)) {
+            result.add(URI.file(configuredLocation));
+            continue;
+        }
+        for (const workspaceFolder of folders) {
+            const absolutePath = extUri.resolvePath(workspaceFolder.uri, configuredLocation);
+            assert(isAbsolute(absolutePath.path), `Provided location must be an absolute path, got '${absolutePath.path}'.`);
+            if (( result.has(absolutePath)) === false) {
+                result.add(absolutePath);
+            }
+            if (folders.length <= 1) {
                 continue;
             }
-            if (!stat || !stat.children) {
+            const workspaceRootUri = dirname(workspaceFolder.uri);
+            const workspaceFolderUri = extUri.resolvePath(workspaceRootUri, configuredLocation);
+            if (( result.has(workspaceFolderUri)) === true) {
                 continue;
             }
-            for (const child of stat.children) {
-                const { resource, isDirectory } = child;
-                if (isDirectory) {
-                    continue;
-                }
-                if (!isPromptFile(resource)) {
-                    continue;
-                }
-                if (( exclude.has(resource.path))) {
-                    continue;
-                }
-                files.push(resource);
+            if (workspaceFolderUri.fsPath.startsWith(workspaceFolder.uri.fsPath)) {
+                result.add(workspaceFolderUri);
             }
         }
-        return files;
     }
+    return [...result];
 };
-PromptFilesLocator = ( __decorate([
-    ( __param(0, IFileService)),
-    ( __param(1, IWorkspaceContextService)),
-    ( __param(2, IConfigurationService))
-], PromptFilesLocator));
 
-export { PromptFilesLocator };
+export { PromptFilesLocator, firstNonGlobParent, isValidGlob };

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

@@ -1,5 +1,6 @@
 import { IJSONSchema } from "@codingame/monaco-vscode-api/vscode/vs/base/common/jsonSchema";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+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";
 export interface IRawToolContribution {
@@ -20,5 +21,5 @@ export interface IRawToolContribution {
 export declare class LanguageModelToolsExtensionPointHandler implements IWorkbenchContribution {
     static readonly ID = "workbench.contrib.toolsExtensionPointHandler";
     private _registrationDisposables;
-    constructor(languageModelToolsService: ILanguageModelToolsService, logService: ILogService);
+    constructor(languageModelToolsService: ILanguageModelToolsService, logService: ILogService, productService: IProductService);
 }

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

@@ -6,8 +6,10 @@ import { joinPath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/res
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
+import { ExtensionIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
 import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 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';
@@ -24,7 +26,7 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
     },
     jsonSchema: {
         description: ( localize(
-            4873,
+            5007,
             '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',
@@ -50,7 +52,7 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
             properties: {
                 name: {
                     description: ( localize(
-                        4874,
+                        5008,
                         "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',
@@ -58,7 +60,7 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                 },
                 toolReferenceName: {
                     markdownDescription: ( localize(
-                        4875,
+                        5009,
                         "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`'
                     )),
@@ -67,32 +69,32 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                 },
                 displayName: {
                     description: ( localize(
-                        4876,
+                        5010,
                         "A human-readable name for this tool that may be used to describe it in the UI."
                     )),
                     type: 'string'
                 },
                 userDescription: {
-                    description: ( localize(4877, "A description of this tool that may be shown to the user.")),
+                    description: ( localize(5011, "A description of this tool that may be shown to the user.")),
                     type: 'string'
                 },
                 modelDescription: {
                     description: ( localize(
-                        4878,
+                        5012,
                         "A description of this tool that may be used by a language model to select it."
                     )),
                     type: 'string'
                 },
                 inputSchema: {
                     description: ( localize(
-                        4879,
+                        5013,
                         "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(
-                        4880,
+                        5014,
                         "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`'
                     )),
@@ -100,7 +102,7 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                 },
                 icon: {
                     markdownDescription: ( localize(
-                        4881,
+                        5015,
                         "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: [{
@@ -110,11 +112,11 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                             type: 'object',
                             properties: {
                                 light: {
-                                    description: ( localize(4882, 'Icon path when a light theme is used')),
+                                    description: ( localize(5016, 'Icon path when a light theme is used')),
                                     type: 'string'
                                 },
                                 dark: {
-                                    description: ( localize(4883, 'Icon path when a dark theme is used')),
+                                    description: ( localize(5017, 'Icon path when a dark theme is used')),
                                     type: 'string'
                                 }
                             }
@@ -122,14 +124,14 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                 },
                 when: {
                     markdownDescription: ( localize(
-                        4884,
+                        5018,
                         "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(
-                        4885,
+                        5019,
                         "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',
@@ -145,9 +147,10 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
 function toToolKey(extensionIdentifier, toolName) {
     return `${extensionIdentifier.value}/${toolName}`;
 }
+const CopilotAgentModeTag = 'vscode_editing';
 let LanguageModelToolsExtensionPointHandler = class LanguageModelToolsExtensionPointHandler {
     static { this.ID = 'workbench.contrib.toolsExtensionPointHandler'; }
-    constructor(languageModelToolsService, logService) {
+    constructor(languageModelToolsService, logService, productService) {
         this._registrationDisposables = ( new DisposableMap());
         languageModelToolsExtensionPoint.setHandler((extensions, delta) => {
             for (const extension of delta.added) {
@@ -168,7 +171,13 @@ let LanguageModelToolsExtensionPointHandler = class LanguageModelToolsExtensionP
                         logService.error(`Extension '${extension.description.identifier.value}' CANNOT register tool with name starting with "vscode_" or "copilot_"`);
                         continue;
                     }
-                    if (rawTool.tags?.some(tag => tag.startsWith('copilot_') || tag.startsWith('vscode_')) && !isProposedApiEnabled(extension.description, 'chatParticipantPrivate')) {
+                    if (rawTool.tags?.includes(CopilotAgentModeTag)) {
+                        if (!isProposedApiEnabled(extension.description, 'languageModelToolsForAgent') && !isProposedApiEnabled(extension.description, 'chatParticipantPrivate')) {
+                            logService.error(`Extension '${extension.description.identifier.value}' CANNOT register tool with tag "${CopilotAgentModeTag}" without enabling 'languageModelToolsForAgent' proposal`);
+                            continue;
+                        }
+                    }
+                    if (rawTool.tags?.some(tag => tag !== CopilotAgentModeTag && (tag.startsWith('copilot_') || tag.startsWith('vscode_'))) && !isProposedApiEnabled(extension.description, 'chatParticipantPrivate')) {
                         logService.error(`Extension '${extension.description.identifier.value}' CANNOT register tool with tags starting with "vscode_" or "copilot_"`);
                         continue;
                     }
@@ -186,13 +195,21 @@ let LanguageModelToolsExtensionPointHandler = class LanguageModelToolsExtensionP
                             light: joinPath(extension.description.extensionLocation, rawIcon.light)
                         };
                     }
+                    const isBuiltinTool = productService.defaultChatAgent?.chatExtensionId ?
+                        ExtensionIdentifier.equals(extension.description.identifier, productService.defaultChatAgent.chatExtensionId) :
+                        isProposedApiEnabled(extension.description, 'chatParticipantPrivate');
                     const tool = {
                         ...rawTool,
-                        extensionId: extension.description.identifier,
+                        source: { type: 'extension', extensionId: extension.description.identifier, isExternalTool: !isBuiltinTool },
                         inputSchema: rawTool.inputSchema,
                         id: rawTool.name,
                         icon,
                         when: rawTool.when ? ContextKeyExpr.deserialize(rawTool.when) : undefined,
+                        requiresConfirmation: !isBuiltinTool,
+                        alwaysDisplayInputOutput: !isBuiltinTool,
+                        supportsToolPicker: isBuiltinTool ?
+                            false :
+                            rawTool.canBeReferencedInPrompt
                     };
                     const disposable = languageModelToolsService.registerToolData(tool);
                     this._registrationDisposables.set(toToolKey(extension.description.identifier, rawTool.name), disposable);
@@ -208,7 +225,8 @@ let LanguageModelToolsExtensionPointHandler = class LanguageModelToolsExtensionP
 };
 LanguageModelToolsExtensionPointHandler = ( __decorate([
     ( __param(0, ILanguageModelToolsService)),
-    ( __param(1, ILogService))
+    ( __param(1, ILogService)),
+    ( __param(2, IProductService))
 ], LanguageModelToolsExtensionPointHandler));
 class LanguageModelToolDataRenderer extends Disposable {
     constructor() {
@@ -224,9 +242,9 @@ class LanguageModelToolDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localize(4886, "Name")),
-            ( localize(4887, "Display Name")),
-            ( localize(4888, "Description")),
+            ( localize(5020, "Name")),
+            ( localize(5021, "Display Name")),
+            ( localize(5022, "Description")),
         ];
         const rows = ( contribs.map(t => {
             return [
@@ -246,7 +264,7 @@ class LanguageModelToolDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'languageModelTools',
-    label: ( localize(4889, "Language Model Tools")),
+    label: ( localize(5023, "Language Model Tools")),
     access: {
         canToggle: false
     },

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

@@ -22,7 +22,6 @@ export declare const VoiceChatInProgress: RawContextKey<boolean>;
 export declare class VoiceChatService extends Disposable implements IVoiceChatService {
     private readonly speechService;
     private readonly chatAgentService;
-    private readonly contextKeyService;
     readonly _serviceBrand: undefined;
     private static readonly AGENT_PREFIX;
     private static readonly COMMAND_PREFIX;

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

@@ -21,7 +21,7 @@ var PhraseTextType;
 const VoiceChatInProgress = ( new RawContextKey(
     'voiceChatInProgress',
     false,
-    { type: 'boolean', description: ( localize(4890, "A speech-to-text session is in progress for chat.")) }
+    { type: 'boolean', description: ( localize(5024, "A speech-to-text session is in progress for chat.")) }
 ));
 let VoiceChatService = class VoiceChatService extends Disposable {
     static { VoiceChatService_1 = this; }
@@ -40,9 +40,8 @@ let VoiceChatService = class VoiceChatService extends Disposable {
         super();
         this.speechService = speechService;
         this.chatAgentService = chatAgentService;
-        this.contextKeyService = contextKeyService;
-        this.voiceChatInProgress = VoiceChatInProgress.bindTo(this.contextKeyService);
         this.activeVoiceChatSessions = 0;
+        this.voiceChatInProgress = VoiceChatInProgress.bindTo(contextKeyService);
     }
     createPhrases(model) {
         const phrases = ( new Map());

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

@@ -34,7 +34,7 @@ const editActionMenuItem = {
     order: 0,
     command: {
         id: ChatSubmitAction.ID,
-        title: ( localize(7005, "Edit Code")),
+        title: ( localize(7151, "Edit Code")),
     },
     when: ( ContextKeyExpr.and(ChatContextKeys.inputHasText, ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()), CTX_INLINE_CHAT_EDITING)),
 };
@@ -43,7 +43,7 @@ const generateActionMenuItem = {
     order: 0,
     command: {
         id: ChatSubmitAction.ID,
-        title: ( localize(7006, "Generate")),
+        title: ( localize(7152, "Generate")),
     },
     when: ( ContextKeyExpr.and(ChatContextKeys.inputHasText, ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()), ( CTX_INLINE_CHAT_EDITING.toNegated()))),
 };
@@ -54,8 +54,8 @@ const cancelActionMenuItem = {
     order: 0,
     command: {
         id: CancelAction.ID,
-        title: ( localize(7007, "Cancel Request")),
-        shortTitle: ( localize(7008, "Cancel")),
+        title: ( localize(7153, "Cancel Request")),
+        shortTitle: ( localize(7154, "Cancel")),
     },
     when: ( ContextKeyExpr.and(CTX_INLINE_CHAT_REQUEST_IN_PROGRESS)),
 };