@codingame/monaco-vscode-api 16.1.1 → 17.1.0

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

@@ -1,6 +1,6 @@
 
-import { URI } from '../../../../base/common/uri.js';
 import { Schemas } from '../../../../base/common/network.js';
+import { URI } from '../../../../base/common/uri.js';
 import { stringifyPromptElementJSON } from './tools/promptTsxTypes.js';
 
 var ToolDataSource;
@@ -18,7 +18,10 @@ function isToolInvocationContext(obj) {
     return typeof obj === 'object' && typeof obj.sessionId === 'string';
 }
 function isToolResultInputOutputDetails(obj) {
-    return typeof obj === 'object' && typeof obj?.input === 'string' && typeof obj?.output === 'string';
+    return typeof obj === 'object' && typeof obj?.input === 'string' && (typeof obj?.output === 'string' || Array.isArray(obj?.output));
+}
+function toolResultHasBuffers(result) {
+    return ( result.content.some(part => part.kind === 'data'));
 }
 function stringifyPromptTsxPart(part) {
     return stringifyPromptElementJSON(part.value);
@@ -29,5 +32,13 @@ function createToolInputUri(toolOrId) {
     }
     return ( URI.from({ scheme: Schemas.inMemory, path: `/lm/tool/${toolOrId}/tool_input.json` }));
 }
+function createToolSchemaUri(toolOrId) {
+    if (typeof toolOrId !== 'string') {
+        toolOrId = toolOrId.id;
+    }
+    return ( URI.from(
+        { scheme: Schemas.vscode, authority: 'schemas', path: `/lm/tool/${toolOrId}` }
+    ));
+}
 
-export { ToolDataSource, createToolInputUri, isToolInvocationContext, isToolResultInputOutputDetails, stringifyPromptTsxPart };
+export { ToolDataSource, createToolInputUri, createToolSchemaUri, isToolInvocationContext, isToolResultInputOutputDetails, stringifyPromptTsxPart, toolResultHasBuffers };

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

@@ -20,6 +20,11 @@ export interface IChatMessageImagePart {
     type: "image_url";
     value: IChatImageURLPart;
 }
+export interface IChatMessageExtraDataPart {
+    type: "extra_data";
+    kind: string;
+    data: any;
+}
 export interface IChatImageURLPart {
     mimeType: ChatImageMimeType;
     data: VSBuffer;
@@ -38,10 +43,10 @@ export declare enum ImageDetailLevel {
 export interface IChatMessageToolResultPart {
     type: "tool_result";
     toolCallId: string;
-    value: (IChatResponseTextPart | IChatResponsePromptTsxPart)[];
+    value: (IChatResponseTextPart | IChatResponsePromptTsxPart | IChatResponseDataPart)[];
     isError?: boolean;
 }
-export type IChatMessagePart = IChatMessageTextPart | IChatMessageToolResultPart | IChatResponseToolUsePart | IChatMessageImagePart;
+export type IChatMessagePart = IChatMessageTextPart | IChatMessageToolResultPart | IChatResponseToolUsePart | IChatMessageImagePart | IChatMessageExtraDataPart;
 export interface IChatMessage {
     readonly name?: string | undefined;
     readonly role: ChatMessageRole;
@@ -55,13 +60,17 @@ export interface IChatResponsePromptTsxPart {
     type: "prompt_tsx";
     value: unknown;
 }
+export interface IChatResponseDataPart {
+    type: "data";
+    value: IChatImageURLPart;
+}
 export interface IChatResponseToolUsePart {
     type: "tool_use";
     name: string;
     toolCallId: string;
     parameters: any;
 }
-export type IChatResponsePart = IChatResponseTextPart | IChatResponseToolUsePart;
+export type IChatResponsePart = IChatResponseTextPart | IChatResponseToolUsePart | IChatResponseDataPart;
 export interface IChatResponseFragment {
     index: number;
     part: IChatResponsePart;
@@ -72,12 +81,18 @@ export interface ILanguageModelChatMetadata {
     readonly id: string;
     readonly vendor: string;
     readonly version: string;
+    readonly description?: string;
+    readonly cost?: string;
     readonly family: string;
     readonly maxInputTokens: number;
     readonly maxOutputTokens: number;
     readonly targetExtensions?: string[];
     readonly isDefault?: boolean;
     readonly isUserSelectable?: boolean;
+    readonly modelPickerCategory: {
+        label: string;
+        order: number;
+    };
     readonly auth?: {
         readonly providerLabel: string;
         readonly accountLabel?: string;

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

@@ -37,14 +37,14 @@ const languageModelType = {
     properties: {
         vendor: {
             type: 'string',
-            description: ( localize(4991, "A globally unique vendor of language models."))
+            description: ( localize(5061, "A globally unique vendor of language models."))
         }
     }
 };
 const languageModelExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'languageModels',
     jsonSchema: {
-        description: ( localize(4992, "Contribute language models of a specific vendor.")),
+        description: ( localize(5062, "Contribute language models of a specific vendor.")),
         oneOf: [
             languageModelType,
             {
@@ -74,24 +74,24 @@ let LanguageModelsService = class LanguageModelsService {
             this._vendors.clear();
             for (const extension of extensions) {
                 if (!isProposedApiEnabled(extension.description, 'chatProvider')) {
-                    extension.collector.error(( localize(4993, "This contribution point requires the 'chatProvider' proposal.")));
+                    extension.collector.error(( localize(5063, "This contribution point requires the 'chatProvider' proposal.")));
                     continue;
                 }
                 for (const item of Iterable.wrap(extension.value)) {
                     if (( this._vendors.has(item.vendor))) {
                         extension.collector.error(( localize(
-                            4994,
+                            5064,
                             "The vendor '{0}' is already registered and cannot be registered twice",
                             item.vendor
                         )));
                         continue;
                     }
                     if (isFalsyOrWhitespace(item.vendor)) {
-                        extension.collector.error(( localize(4995, "The vendor field cannot be empty.")));
+                        extension.collector.error(( localize(5065, "The vendor field cannot be empty.")));
                         continue;
                     }
                     if (item.vendor.trim() !== item.vendor) {
-                        extension.collector.error(( localize(4996, "The vendor field cannot start or end with whitespace.")));
+                        extension.collector.error(( localize(5066, "The vendor field cannot start or end with whitespace.")));
                         continue;
                     }
                     this._vendors.add(item.vendor);

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

@@ -0,0 +1,4 @@
+export declare const DEFAULT_MODEL_PICKER_CATEGORY: {
+    label: string;
+    order: number;
+};

package/vscode/src/vs/workbench/contrib/chat/common/modelPicker/modelPickerWidget.js

@@ -0,0 +1,6 @@
+
+import { localize } from '../../../../../nls.js';
+
+const DEFAULT_MODEL_PICKER_CATEGORY = { label: ( localize(5067, "Other Models")), order: Number.MAX_SAFE_INTEGER };
+
+export { DEFAULT_MODEL_PICKER_CATEGORY };

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/contentProviders/types.d.ts

@@ -1,9 +1,11 @@
 import { URI } from "../../../../../../base/common/uri.js";
-import { ResolveError } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/promptFileReferenceErrors";
+import { ResolveError } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptFileReferenceErrors";
 import { IDisposable } from "../../../../../../base/common/lifecycle.js";
 import { VSBufferReadableStream } from "../../../../../../base/common/buffer.js";
 export interface IPromptContentsProvider extends IDisposable {
     readonly uri: URI;
+    readonly languageId: string;
+    readonly sourceName: string;
     start(): this;
     onContentChanged(callback: (streamOrError: VSBufferReadableStream | ResolveError) => void): IDisposable;
     onDispose(callback: () => void): this;

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/promptHeader/metadata/index.d.ts

@@ -0,0 +1,3 @@
+export { PromptModeMetadata } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/parsers/promptHeader/metadata/mode";
+export { PromptToolsMetadata } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/parsers/promptHeader/metadata/tools";
+export { PromptDescriptionMetadata } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/parsers/promptHeader/metadata/description";

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/types.d.ts

@@ -1,5 +1,6 @@
+import { ChatMode } from "../../constants.js";
 import { URI } from "../../../../../../base/common/uri.js";
-import { ResolveError } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/promptFileReferenceErrors";
+import { ResolveError } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptFileReferenceErrors";
 import { IDisposable } from "../../../../../../base/common/lifecycle.js";
 import { IRange, Range } from "../../../../../../editor/common/core/range.js";
 export interface IResolveError {
@@ -11,6 +12,12 @@ export interface ITopError extends IResolveError {
     readonly errorsCount: number;
     readonly localizedMessage: string;
 }
+export interface IPromptMetadata {
+    description?: string;
+    tools?: readonly string[];
+    mode?: ChatMode;
+    applyTo?: string;
+}
 interface IPromptReferenceBase extends IDisposable {
     readonly type: string;
     readonly subtype: string;
@@ -25,9 +32,11 @@ interface IPromptReferenceBase extends IDisposable {
     readonly errors: readonly ResolveError[];
     readonly allErrors: readonly IResolveError[];
     readonly topError: ITopError | undefined;
-    references: readonly IPromptReference[];
-    allReferences: readonly IPromptReference[];
-    allValidReferences: readonly IPromptReference[];
+    readonly references: readonly IPromptReference[];
+    readonly allReferences: readonly IPromptReference[];
+    readonly allValidReferences: readonly IPromptReference[];
+    readonly allToolsMetadata: readonly string[] | null;
+    readonly metadata: IPromptMetadata;
     settled(): Promise<this>;
     allSettled(): Promise<this>;
 }
@@ -36,3 +45,4 @@ export interface IPromptFileReference extends IPromptReferenceBase {
     readonly subtype: "prompt" | "markdown";
 }
 export type IPromptReference = IPromptFileReference;
+export {};

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/service/types.d.ts

@@ -1,6 +1,33 @@
+import { TTree } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/common/promptSyntax/utils/treeUtils";
+import { ChatMode } from "../../constants.js";
+import { IPromptMetadata } from "../parsers/types.js";
 import { URI } from "../../../../../../base/common/uri.js";
-export type TPromptsType = "local" | "user";
+import { TextModelPromptParser } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/common/promptSyntax/parsers/textModelPromptParser";
+export type TPromptsStorage = "local" | "user";
+export type TPromptsType = "instructions" | "prompt";
 export interface IPromptPath {
     readonly uri: URI;
+    readonly storage: TPromptsStorage;
     readonly type: TPromptsType;
 }
+export type TSharedPrompt = Omit<TextModelPromptParser, "dispose">;
+export interface IMetadata {
+    readonly uri: URI;
+    readonly metadata: IPromptMetadata;
+    readonly children?: readonly TTree<IMetadata>[];
+}
+interface ICombinedAgentToolsMetadata {
+    readonly tools: readonly string[] | undefined;
+    readonly mode: ChatMode.Agent;
+}
+interface ICombinedNonAgentToolsMetadata {
+    readonly tools: undefined;
+    readonly mode?: ChatMode.Ask | ChatMode.Edit;
+}
+export type TCombinedToolsMetadata = ICombinedAgentToolsMetadata | ICombinedNonAgentToolsMetadata;
+export interface IChatPromptSlashCommand {
+    readonly command: string;
+    readonly detail: string;
+    readonly promptPath?: IPromptPath;
+}
+export {};

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/service/types.service.d.ts

@@ -1,13 +1,19 @@
 import { IDisposable } from "../../../../../../base/common/lifecycle.js";
+import { URI } from "../../../../../../base/common/uri.js";
 import { ITextModel } from "../../../../../../editor/common/model.js";
-import { TextModelPromptParser } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/common/promptSyntax/parsers/textModelPromptParser";
-import { IPromptPath, TPromptsType } from "./types.js";
+import { TSharedPrompt, TPromptsType, IPromptPath, IChatPromptSlashCommand, IMetadata, TCombinedToolsMetadata } from "./types.js";
 export declare const IPromptsService: import("../../../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IPromptsService>;
 export interface IPromptsService extends IDisposable {
     readonly _serviceBrand: undefined;
-    getSyntaxParserFor(model: ITextModel): TextModelPromptParser & {
+    getSyntaxParserFor(model: ITextModel): TSharedPrompt & {
         disposed: false;
     };
-    listPromptFiles(): Promise<readonly IPromptPath[]>;
+    listPromptFiles(type: TPromptsType): Promise<readonly IPromptPath[]>;
     getSourceFolders(type: TPromptsType): readonly IPromptPath[];
+    asPromptSlashCommand(name: string): IChatPromptSlashCommand | undefined;
+    resolvePromptSlashCommand(data: IChatPromptSlashCommand): Promise<IPromptPath | undefined>;
+    findPromptSlashCommands(): Promise<IChatPromptSlashCommand[]>;
+    findInstructionFilesFor(fileUris: readonly URI[]): Promise<readonly URI[]>;
+    getAllMetadata(promptUris: readonly URI[]): Promise<readonly IMetadata[]>;
+    getCombinedToolsMetadata(promptUris: readonly URI[]): Promise<TCombinedToolsMetadata | null>;
 }

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

@@ -1,39 +1,22 @@
 import { CancellationToken } from "../../../../../base/common/cancellation.js";
 import { UriComponents } from "../../../../../base/common/uri.js";
-import { IWorkspaceContextService } from "../../../../../platform/workspace/common/workspace.service.js";
-import { IEditorGroupsService } from "../../../../services/editor/common/editorGroupsService.service.js";
-import { ITextFileService } from "../../../../services/textfile/common/textfiles.service.js";
 import { INotebookService } from "../../../notebook/common/notebookService.service.js";
 import { ICodeMapperService } from "../chatCodeMapperService.service.js";
 import { IChatService } from "../chatService.service.js";
-import { ILanguageModelIgnoredFilesService } from "../ignoredFiles.service.js";
-import { CountTokensCallback, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolResult } from "../languageModelToolsService.js";
-import { IToolInputProcessor } from "./tools.js";
+import { CountTokensCallback, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolResult, ToolProgress } from "../languageModelToolsService.js";
 export declare const ExtensionEditToolId = "vscode_editFile";
 export declare const InternalEditToolId = "vscode_editFile_internal";
 export declare const EditToolData: IToolData;
+export interface EditToolParams {
+    uri: UriComponents;
+    explanation: string;
+    code: string;
+}
 export declare class EditTool implements IToolImpl {
     private readonly chatService;
     private readonly codeMapperService;
-    private readonly workspaceContextService;
-    private readonly ignoredFilesService;
-    private readonly textFileService;
     private readonly notebookService;
-    private readonly editorGroupsService;
-    constructor(chatService: IChatService, codeMapperService: ICodeMapperService, workspaceContextService: IWorkspaceContextService, ignoredFilesService: ILanguageModelIgnoredFilesService, textFileService: ITextFileService, notebookService: INotebookService, editorGroupsService: IEditorGroupsService);
-    invoke(invocation: IToolInvocation, countTokens: CountTokensCallback, token: CancellationToken): Promise<IToolResult>;
+    constructor(chatService: IChatService, codeMapperService: ICodeMapperService, notebookService: INotebookService);
+    invoke(invocation: IToolInvocation, countTokens: CountTokensCallback, _progress: ToolProgress, token: CancellationToken): Promise<IToolResult>;
     prepareToolInvocation(parameters: any, token: CancellationToken): Promise<IPreparedToolInvocation | undefined>;
 }
-export interface EditToolParams {
-    file: UriComponents;
-    explanation: string;
-    code: string;
-}
-export interface EditToolRawParams {
-    filePath: string;
-    explanation: string;
-    code: string;
-}
-export declare class EditToolInputProcessor implements IToolInputProcessor {
-    processInput(input: EditToolRawParams): EditToolParams;
-}

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

@@ -2,102 +2,35 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import { MarkdownString } from '../../../../../base/common/htmlContent.js';
 import '../../../../../base/common/observableInternal/index.js';
-import { isEqual } from '../../../../../base/common/resources.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { generateUuid } from '../../../../../base/common/uuid.js';
-import { localize } from '../../../../../nls.js';
-import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.service.js';
-import { SaveReason } from '../../../../common/editor.js';
-import { GroupsOrder } from '../../../../services/editor/common/editorGroupsService.js';
-import { IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.service.js';
-import { ITextFileService } from '../../../../services/textfile/common/textfiles.service.js';
 import { CellUri } from '../../../notebook/common/notebookCommon.js';
 import { INotebookService } from '../../../notebook/common/notebookService.service.js';
 import { ICodeMapperService } from '../chatCodeMapperService.service.js';
 import { IChatService } from '../chatService.service.js';
-import { ILanguageModelIgnoredFilesService } from '../ignoredFiles.service.js';
 import { autorun } from '../../../../../base/common/observableInternal/autorun.js';
 
-const codeInstructions = `
-The user is very smart and can understand how to apply your edits to their files, you just need to provide minimal hints.
-Avoid repeating existing code, instead use comments to represent regions of unchanged code. The user prefers that you are as concise as possible. For example:
-// ...existing code...
-{ changed code }
-// ...existing code...
-{ changed code }
-// ...existing code...
-
-Here is an example of how you should use format an edit to an existing Person class:
-class Person {
-	// ...existing code...
-	age: number;
-	// ...existing code...
-	getAge() {
-		return this.age;
-	}
-}
-`;
 const ExtensionEditToolId = 'vscode_editFile';
 const InternalEditToolId = 'vscode_editFile_internal';
 const EditToolData = {
     id: InternalEditToolId,
-    displayName: ( localize(5006, "Edit File")),
-    modelDescription: `Edit a file in the workspace. Use this tool once per file that needs to be modified, even if there are multiple changes for a file. Generate the "explanation" property first. ${codeInstructions}`,
+    displayName: '',
+    modelDescription: '',
     source: { type: 'internal' },
-    inputSchema: {
-        type: 'object',
-        properties: {
-            explanation: {
-                type: 'string',
-                description: 'A short explanation of the edit being made. Can be the same as the explanation you showed to the user.',
-            },
-            filePath: {
-                type: 'string',
-                description: 'An absolute path to the file to edit, or the URI of a untitled, not yet named, file, such as `untitled:Untitled-1.',
-            },
-            code: {
-                type: 'string',
-                description: 'The code change to apply to the file. ' + codeInstructions
-            }
-        },
-        required: ['explanation', 'filePath', 'code']
-    }
 };
 let EditTool = class EditTool {
-    constructor(chatService, codeMapperService, workspaceContextService, ignoredFilesService, textFileService, notebookService, editorGroupsService) {
+    constructor(chatService, codeMapperService, notebookService) {
         this.chatService = chatService;
         this.codeMapperService = codeMapperService;
-        this.workspaceContextService = workspaceContextService;
-        this.ignoredFilesService = ignoredFilesService;
-        this.textFileService = textFileService;
         this.notebookService = notebookService;
-        this.editorGroupsService = editorGroupsService;
     }
-    async invoke(invocation, countTokens, token) {
+    async invoke(invocation, countTokens, _progress, token) {
         if (!invocation.context) {
             throw ( new Error('toolInvocationToken is required for this tool'));
         }
         const parameters = invocation.parameters;
-        const fileUri = URI.revive(parameters.file);
+        const fileUri = URI.revive(parameters.uri);
         const uri = CellUri.parse(fileUri)?.notebook || fileUri;
-        if (!this.workspaceContextService.isInsideWorkspace(uri) && !this.notebookService.getNotebookTextModel(uri)) {
-            const groupsByLastActive = this.editorGroupsService.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE);
-            const uriIsOpenInSomeEditor = ( groupsByLastActive.some((group) => {
-                return ( group.editors.some((editor) => {
-                    return isEqual(editor.resource, uri);
-                }));
-            }));
-            if (!uriIsOpenInSomeEditor) {
-                throw ( new Error(
-                    `File ${uri.fsPath} can't be edited because it's not inside the current workspace`
-                ));
-            }
-        }
-        if (await this.ignoredFilesService.fileIsIgnored(uri, token)) {
-            throw ( new Error(
-                `File ${uri.fsPath} can't be edited because it is configured to be ignored by Copilot`
-            ));
-        }
         const model = this.chatService.getSession(invocation.context?.sessionId);
         const request = model.getRequests().at(-1);
         if (request.response?.response.getMarkdown().length) {
@@ -117,7 +50,7 @@ let EditTool = class EditTool {
         });
         model.acceptResponseProgress(request, {
             kind: 'markdownContent',
-            content: ( new MarkdownString(parameters.code + '\n````\n'))
+            content: ( new MarkdownString('\n````\n'))
         });
         if (this.notebookService.hasSupportedNotebooks(uri) && (this.notebookService.getNotebookTextModel(uri))) {
             model.acceptResponseProgress(request, {
@@ -140,7 +73,9 @@ let EditTool = class EditTool {
         const result = await this.codeMapperService.mapCode({
             codeBlocks: [{ code: parameters.code, resource: uri, markdownBeforeBlock: parameters.explanation }],
             location: 'tool',
-            chatRequestId: invocation.chatRequestId
+            chatRequestId: invocation.chatRequestId,
+            chatRequestModel: invocation.modelId,
+            chatSessionId: invocation.context.sessionId,
         }, {
             textEdit: (target, edits) => {
                 model.acceptResponseProgress(request, { kind: 'textEdit', uri: target, edits });
@@ -176,10 +111,6 @@ let EditTool = class EditTool {
         })).finally(() => {
             dispose.dispose();
         });
-        await this.textFileService.save(uri, {
-            reason: SaveReason.AUTO,
-            skipSaveParticipants: true,
-        });
         return {
             content: [{ kind: 'text', value: 'The file was edited successfully' }]
         };
@@ -193,24 +124,7 @@ let EditTool = class EditTool {
 EditTool = ( __decorate([
     ( __param(0, IChatService)),
     ( __param(1, ICodeMapperService)),
-    ( __param(2, IWorkspaceContextService)),
-    ( __param(3, ILanguageModelIgnoredFilesService)),
-    ( __param(4, ITextFileService)),
-    ( __param(5, INotebookService)),
-    ( __param(6, IEditorGroupsService))
+    ( __param(2, INotebookService))
 ], EditTool));
-class EditToolInputProcessor {
-    processInput(input) {
-        if (!input.filePath) {
-            return input;
-        }
-        const filePath = input.filePath;
-        return {
-            file: filePath.startsWith('untitled:') ? ( URI.parse(filePath)) : URI.file(filePath),
-            explanation: input.explanation,
-            code: input.code,
-        };
-    }
-}
 
-export { EditTool, EditToolData, EditToolInputProcessor, ExtensionEditToolId, InternalEditToolId };
+export { EditTool, EditToolData, ExtensionEditToolId, InternalEditToolId };

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

@@ -6,7 +6,4 @@ export declare class BuiltinToolsContribution extends Disposable implements IWor
     static readonly ID = "chat.builtinTools";
     constructor(toolsService: ILanguageModelToolsService, instantiationService: IInstantiationService);
 }
-export interface IToolInputProcessor {
-    processInput(input: any): any;
-}
 export declare const InternalFetchWebPageToolId = "vscode_fetchWebPage_internal";

package/vscode/src/vs/workbench/contrib/codeActions/browser/codeActionsContribution.js

@@ -18,17 +18,17 @@ const createCodeActionsAutoSave = (description) => {
         enum: ['always', 'explicit', 'never', true, false],
         enumDescriptions: [
             ( localize(
-            5025,
+            5111,
             'Triggers Code Actions on explicit saves and auto saves triggered by window or focus changes.'
         )),
-            ( localize(5026, 'Triggers Code Actions only when explicitly saved')),
-            ( localize(5027, 'Never triggers Code Actions on save')),
+            ( localize(5112, 'Triggers Code Actions only when explicitly saved')),
+            ( localize(5113, 'Never triggers Code Actions on save')),
             ( localize(
-            5028,
+            5114,
             'Triggers Code Actions only when explicitly saved. This value will be deprecated in favor of "explicit".'
         )),
             ( localize(
-            5029,
+            5115,
             'Never triggers Code Actions on save. This value will be deprecated in favor of "never".'
         ))
         ],
@@ -41,14 +41,14 @@ const createNotebookCodeActionsAutoSave = (description) => {
         type: ['string', 'boolean'],
         enum: ['explicit', 'never', true, false],
         enumDescriptions: [
-            ( localize(5030, 'Triggers Code Actions only when explicitly saved.')),
-            ( localize(5031, 'Never triggers Code Actions on save.')),
+            ( localize(5116, 'Triggers Code Actions only when explicitly saved.')),
+            ( localize(5117, 'Never triggers Code Actions on save.')),
             ( localize(
-            5032,
+            5118,
             'Triggers Code Actions only when explicitly saved. This value will be deprecated in favor of "explicit".'
         )),
             ( localize(
-            5033,
+            5119,
             'Triggers Code Actions only when explicitly saved. This value will be deprecated in favor of "never".'
         ))
         ],
@@ -70,7 +70,7 @@ const codeActionsOnSaveSchema = {
         }
     ],
     markdownDescription: ( localize(
-        5034,
+        5120,
         'Run Code Actions for the editor on save. Code Actions must be specified and the editor must not be shutting down. When {0} is set to `afterDelay`, Code Actions will only be run when the file is saved explicitly. Example: `"source.organizeImports": "explicit" `',
         '`#files.autoSave#`'
     )),
@@ -102,7 +102,7 @@ const notebookCodeActionsOnSaveSchema = {
         }
     ],
     markdownDescription: ( localize(
-        5035,
+        5121,
         'Run a series of Code Actions for a notebook on save. Code Actions must be specified and the editor must not be shutting down. When {0} is set to `afterDelay`, Code Actions will only be run when the file is saved explicitly. Example: `"notebook.source.organizeImports": "explicit"`',
         '`#files.autoSave#`'
     )),
@@ -150,12 +150,12 @@ let CodeActionsContribution = class CodeActionsContribution extends Disposable {
         for (const codeActionKind of allProvidedKinds) {
             if (CodeActionKind.Source.contains(codeActionKind) && !properties[codeActionKind.value]) {
                 properties[codeActionKind.value] = createCodeActionsAutoSave(( localize(
-                    5036,
+                    5122,
                     "Controls whether '{0}' actions should be run on file save.",
                     codeActionKind.value
                 )));
                 notebookProperties[codeActionKind.value] = createNotebookCodeActionsAutoSave(( localize(
-                    5036,
+                    5122,
                     "Controls whether '{0}' actions should be run on file save.",
                     codeActionKind.value
                 )));

package/vscode/src/vs/workbench/contrib/codeEditor/browser/dictation/editorDictation.js

@@ -31,12 +31,12 @@ import { isWindows } from '../../../../../base/common/platform.js';
 var EditorDictation_1;
 registerCss(editorDictation);
 const EDITOR_DICTATION_IN_PROGRESS = ( new RawContextKey('editorDictation.inProgress', false));
-const VOICE_CATEGORY = ( localize2(5039, "Voice"));
+const VOICE_CATEGORY = ( localize2(5125, "Voice"));
 class EditorDictationStartAction extends EditorAction2 {
     constructor() {
         super({
             id: 'workbench.action.editorDictation.start',
-            title: ( localize2(5040, "Start Dictation in Editor")),
+            title: ( localize2(5126, "Start Dictation in Editor")),
             category: VOICE_CATEGORY,
             precondition: ( ContextKeyExpr.and(HasSpeechProvider, ( SpeechToTextInProgress.toNegated()), (
             EditorContextKeys.readOnly.toNegated()))),
@@ -73,7 +73,7 @@ class EditorDictationStopAction extends EditorAction2 {
     constructor() {
         super({
             id: EditorDictationStopAction.ID,
-            title: ( localize2(5041, "Stop Dictation in Editor")),
+            title: ( localize2(5127, "Stop Dictation in Editor")),
             category: VOICE_CATEGORY,
             precondition: EDITOR_DICTATION_IN_PROGRESS,
             f1: true,
@@ -98,7 +98,7 @@ class DictationWidget extends Disposable {
         const stopActionKeybinding = keybindingService.lookupKeybinding(EditorDictationStopAction.ID)?.getLabel();
         actionBar.push(toAction({
             id: EditorDictationStopAction.ID,
-            label: stopActionKeybinding ? ( localize(5042, "Stop Dictation ({0})", stopActionKeybinding)) : ( localize(5043, "Stop Dictation")),
+            label: stopActionKeybinding ? ( localize(5128, "Stop Dictation ({0})", stopActionKeybinding)) : ( localize(5129, "Stop Dictation")),
             class: ThemeIcon.asClassName(Codicon.micFilled),
             run: () => EditorDictation.get(editor)?.stop()
         }), { icon: true, label: false, keybinding: stopActionKeybinding });

package/vscode/src/vs/workbench/contrib/codeEditor/browser/diffEditorAccessibilityHelp.js

@@ -31,19 +31,19 @@ class DiffEditorAccessibilityHelp {
             return;
         }
         const switchSides = ( localize(
-            5044,
+            5130,
             "Run the command Diff Editor: Switch Side{0} to toggle between the original and modified editors.",
             '<keybinding:diffEditor.switchSide>'
         ));
         const diffEditorActiveAnnouncement = ( localize(
-            5045,
+            5131,
             "The setting, accessibility.verbosity.diffEditorActive, controls if a diff editor announcement is made when it becomes the active editor."
         ));
         const keys = ['accessibility.signals.diffLineDeleted', 'accessibility.signals.diffLineInserted', 'accessibility.signals.diffLineModified'];
         const content = [
-            ( localize(5046, "You are in a diff editor.")),
+            ( localize(5132, "You are in a diff editor.")),
             ( localize(
-            5047,
+            5133,
             "View the next{0} or previous{1} diff in diff review mode, which is optimized for screen readers.",
             '<keybinding:' + AccessibleDiffViewerNext.id + '>',
             '<keybinding:' + AccessibleDiffViewerPrev.id + '>'
@@ -51,7 +51,7 @@ class DiffEditorAccessibilityHelp {
             switchSides,
             diffEditorActiveAnnouncement,
             ( localize(
-            5048,
+            5134,
             "To control which accessibility signals should be played, the following settings can be configured: {0}.",
             keys.join(', ')
         )),