@codingame/monaco-vscode-api 17.2.1 → 18.0.0

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

@@ -9,7 +9,7 @@ import { ISelection } from "../../../../editor/common/core/selection.js";
 import { Command, Location, TextEdit } from "../../../../editor/common/languages.js";
 import { FileType } from "../../../../platform/files/common/files.js";
 import { ICellEditOperation } from "../../notebook/common/notebookCommon.js";
-import { IWorkspaceSymbol } from "@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common/vscode/vs/workbench/contrib/search/common/search";
+import { IWorkspaceSymbol } from "@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/workbench/contrib/search/common/search";
 import { IChatAgentCommand, IChatAgentData, IChatAgentResult } from "./chatAgents.js";
 import { IChatRequestVariableEntry, IChatResponseModel } from "./chatModel.js";
 import { IChatParserContext } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser";
@@ -25,6 +25,11 @@ export declare enum ChatErrorLevel {
     Warning = 1,
     Error = 2
 }
+export interface IChatResponseErrorDetailsConfirmationButton {
+    data: any;
+    label: string;
+    isSecondary?: boolean;
+}
 export interface IChatResponseErrorDetails {
     message: string;
     responseIsIncomplete?: boolean;
@@ -32,6 +37,7 @@ export interface IChatResponseErrorDetails {
     responseIsRedacted?: boolean;
     isQuotaExceeded?: boolean;
     level?: ChatErrorLevel;
+    confirmationButtons?: IChatResponseErrorDetailsConfirmationButton[];
 }
 export interface IChatResponseProgressFileTreeData {
     label: string;
@@ -115,6 +121,11 @@ export interface IChatTaskDto {
     content: IMarkdownString;
     kind: "progressTask";
 }
+export interface IChatTaskSerialized {
+    content: IMarkdownString;
+    progress: (IChatWarningMessage | IChatContentReference)[];
+    kind: "progressTaskSerialized";
+}
 export interface IChatTaskResult {
     content: IMarkdownString | void;
     kind: "progressTaskResult";
@@ -177,7 +188,7 @@ export interface IChatToolInputInvocationData {
 }
 export interface IChatToolInvocation {
     presentation: IPreparedToolInvocation["presentation"];
-    toolSpecificData?: IChatTerminalToolInvocationData | IChatToolInputInvocationData;
+    toolSpecificData?: IChatTerminalToolInvocationData | IChatToolInputInvocationData | IChatExtensionsContent;
     confirmationMessages?: IToolConfirmationMessages;
     confirmed: DeferredPromise<boolean>;
     isConfirmed: boolean | undefined;
@@ -198,7 +209,7 @@ export interface IChatToolInvocation {
 }
 export interface IChatToolInvocationSerialized {
     presentation: IPreparedToolInvocation["presentation"];
-    toolSpecificData?: IChatTerminalToolInvocationData | IChatToolInputInvocationData;
+    toolSpecificData?: IChatTerminalToolInvocationData | IChatToolInputInvocationData | IChatExtensionsContent;
     invocationMessage: string | IMarkdownString;
     originMessage: string | IMarkdownString | undefined;
     pastTenseMessage: string | IMarkdownString | undefined;
@@ -213,7 +224,11 @@ export interface IChatExtensionsContent {
     extensions: string[];
     kind: "extensions";
 }
-export type IChatProgress = IChatMarkdownContent | IChatAgentMarkdownContentWithVulnerability | IChatTreeData | IChatUsedContext | IChatContentReference | IChatContentInlineReference | IChatCodeCitation | IChatProgressMessage | IChatTask | IChatTaskResult | IChatCommandButton | IChatWarningMessage | IChatTextEdit | IChatNotebookEdit | IChatMoveMessage | IChatResponseCodeblockUriPart | IChatConfirmation | IChatToolInvocation | IChatToolInvocationSerialized | IChatExtensionsContent | IChatUndoStop;
+export interface IChatPrepareToolInvocationPart {
+    readonly kind: "prepareToolInvocation";
+    readonly toolName: string;
+}
+export type IChatProgress = IChatMarkdownContent | IChatAgentMarkdownContentWithVulnerability | IChatTreeData | IChatUsedContext | IChatContentReference | IChatContentInlineReference | IChatCodeCitation | IChatProgressMessage | IChatTask | IChatTaskResult | IChatCommandButton | IChatWarningMessage | IChatTextEdit | IChatNotebookEdit | IChatMoveMessage | IChatResponseCodeblockUriPart | IChatConfirmation | IChatToolInvocation | IChatToolInvocationSerialized | IChatExtensionsContent | IChatUndoStop | IChatPrepareToolInvocationPart | IChatTaskSerialized;
 export interface IChatFollowup {
     kind: "reply";
     message: string;
@@ -352,8 +367,8 @@ export type IChatLocationData = IChatEditorLocationData | IChatNotebookLocationD
 export interface IChatSendRequestOptions {
     mode?: ChatMode;
     userSelectedModelId?: string;
-    userSelectedTools?: string[];
-    userSelectedTools2?: Record<string, boolean>;
+    userSelectedTools?: Record<string, boolean>;
+    modeInstructions?: string;
     toolSelectionIsExclusive?: boolean;
     location?: ChatAgentLocation;
     locationData?: IChatLocationData;

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

@@ -36,7 +36,7 @@ export interface IChatService {
     notifyUserAction(event: IChatUserActionEvent): void;
     onDidDisposeSession: Event<{
         sessionId: string;
-        reason: "initializationFailed" | "cleared";
+        reason: "cleared";
     }>;
     transferChatSession(transferredSessionData: IChatTransferredSessionData, toWorkspace: URI): void;
     activateDefaultAgent(location: ChatAgentLocation): Promise<void>;

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

@@ -19,7 +19,7 @@ export interface IChatRequestProblemsVariable {
     filter: IDiagnosticVariableEntryFilterData;
 }
 export declare const isIChatRequestProblemsVariable: (obj: unknown) => obj is IChatRequestProblemsVariable;
-export type IChatRequestVariableValue = string | URI | Location | unknown | Uint8Array | IChatRequestProblemsVariable;
+export type IChatRequestVariableValue = string | URI | Location | Uint8Array | IChatRequestProblemsVariable | unknown;
 export type IChatVariableResolverProgress = IChatContentReference | IChatProgressMessage;
 export interface IChatVariableResolver {
     (messageText: string, arg: string | undefined, model: IChatModel, progress: (part: IChatVariableResolverProgress) => void, token: CancellationToken): Promise<IChatRequestVariableValue | undefined>;

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

@@ -1,8 +1,9 @@
 import { IDynamicVariable } from "./chatVariables.js";
-import { IToolData } from "./languageModelToolsService.js";
+import { IToolData, ToolSet } from "./languageModelToolsService.js";
 export declare const IChatVariablesService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatVariablesService>;
 export interface IChatVariablesService {
     _serviceBrand: undefined;
     getDynamicVariables(sessionId: string): ReadonlyArray<IDynamicVariable>;
     getSelectedTools(sessionId: string): ReadonlyArray<IToolData>;
+    getSelectedToolSets(sessionId: string): ReadonlyArray<ToolSet>;
 }

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

@@ -11,6 +11,7 @@ export declare enum ChatMode {
 }
 export declare function modeToString(mode: ChatMode): "Edit" | "Agent" | "Ask";
 export declare function validateChatMode(mode: unknown): ChatMode | undefined;
+export declare function isChatMode(mode: unknown): mode is ChatMode;
 export type RawChatParticipantLocation = "panel" | "terminal" | "notebook" | "editing-session";
 export declare enum ChatAgentLocation {
     Panel = "panel",

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

@@ -34,6 +34,9 @@ function validateChatMode(mode) {
             return undefined;
     }
 }
+function isChatMode(mode) {
+    return !!validateChatMode(mode);
+}
 var ChatAgentLocation;
 (function (ChatAgentLocation) {
     ChatAgentLocation["Panel"] = "panel";
@@ -54,4 +57,4 @@ var ChatAgentLocation;
     ChatAgentLocation.fromRaw = fromRaw;
 })(ChatAgentLocation || (ChatAgentLocation = {}));
 
-export { ChatAgentLocation, ChatConfiguration, ChatMode, modeToString, validateChatMode };
+export { ChatAgentLocation, ChatConfiguration, ChatMode, isChatMode, modeToString, validateChatMode };

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

@@ -1,14 +1,16 @@
 import { CancellationToken } from "../../../../base/common/cancellation.js";
 import { IMarkdownString } from "../../../../base/common/htmlContent.js";
 import { IJSONSchema } from "../../../../base/common/jsonSchema.js";
+import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { ThemeIcon } from "../../../../base/common/themables.js";
 import { URI } from "../../../../base/common/uri.js";
 import { Location } from "../../../../editor/common/languages.js";
 import { ContextKeyExpression } from "../../../../platform/contextkey/common/contextkey.js";
 import { ExtensionIdentifier } from "../../../../platform/extensions/common/extensions.js";
 import { IProgress } from "../../../../platform/progress/common/progress.js";
-import { IChatTerminalToolInvocationData, IChatToolInputInvocationData } from "./chatService.js";
+import { IChatExtensionsContent, IChatTerminalToolInvocationData, IChatToolInputInvocationData } from "./chatService.js";
 import { VSBuffer } from "../../../../base/common/buffer.js";
+import { IObservable, IReader, ITransaction, ObservableSet } from "../../../../base/common/observable.js";
 export interface IToolData {
     id: string;
     source: ToolDataSource;
@@ -26,29 +28,38 @@ export interface IToolData {
     canBeReferencedInPrompt?: boolean;
     runsInWorkspace?: boolean;
     alwaysDisplayInputOutput?: boolean;
-    supportsToolPicker?: boolean;
 }
 export interface IToolProgressStep {
     readonly message: string | IMarkdownString | undefined;
-    readonly increment: number | undefined;
-    readonly total: number | undefined;
+    readonly increment?: number;
+    readonly total?: number;
 }
 export type ToolProgress = IProgress<IToolProgressStep>;
 export type ToolDataSource = {
     type: "extension";
     label: string;
     extensionId: ExtensionIdentifier;
-    isExternalTool: boolean;
 } | {
     type: "mcp";
     label: string;
     collectionId: string;
     definitionId: string;
+} | {
+    type: "user";
+    label: string;
+    file: URI;
 } | {
     type: "internal";
+    label: string;
 };
 export declare namespace ToolDataSource {
+    const Internal: ToolDataSource;
     function toKey(source: ToolDataSource): string;
+    function equals(a: ToolDataSource, b: ToolDataSource): boolean;
+    function classify(source: ToolDataSource): {
+        readonly ordinal: number;
+        readonly label: string;
+    };
 }
 export interface IToolInvocation {
     callId: string;
@@ -58,7 +69,7 @@ export interface IToolInvocation {
     context: IToolInvocationContext | undefined;
     chatRequestId?: string;
     chatInteractionId?: string;
-    toolSpecificData?: IChatTerminalToolInvocationData | IChatToolInputInvocationData;
+    toolSpecificData?: IChatTerminalToolInvocationData | IChatToolInputInvocationData | IChatExtensionsContent;
     modelId?: string;
 }
 export interface IToolInvocationContext {
@@ -68,12 +79,11 @@ export declare function isToolInvocationContext(obj: any): obj is IToolInvocatio
 export interface IToolResultInputOutputDetails {
     readonly input: string;
     readonly output: ({
-        type: "text";
         value: string;
-    } | {
-        type: "data";
-        mimeType: string;
-        value64: string;
+        isText?: boolean;
+        mimeType?: string;
+        uri?: URI;
+        asResource?: boolean;
     })[];
     readonly isError?: boolean;
 }
@@ -102,8 +112,9 @@ export interface IToolResultDataPart {
     };
 }
 export interface IToolConfirmationMessages {
-    title: string;
+    title: string | IMarkdownString;
     message: string | IMarkdownString;
+    disclaimer?: string | IMarkdownString;
     allowAutoConfirm?: boolean;
 }
 export interface IPreparedToolInvocation {
@@ -112,12 +123,26 @@ export interface IPreparedToolInvocation {
     originMessage?: string | IMarkdownString;
     confirmationMessages?: IToolConfirmationMessages;
     presentation?: "hidden" | undefined;
-    toolSpecificData?: IChatTerminalToolInvocationData | IChatToolInputInvocationData;
+    toolSpecificData?: IChatTerminalToolInvocationData | IChatToolInputInvocationData | IChatExtensionsContent;
 }
 export interface IToolImpl {
     invoke(invocation: IToolInvocation, countTokens: CountTokensCallback, progress: ToolProgress, token: CancellationToken): Promise<IToolResult>;
     prepareToolInvocation?(parameters: any, token: CancellationToken): Promise<IPreparedToolInvocation | undefined>;
 }
+export declare class ToolSet {
+    readonly id: string;
+    readonly referenceName: string;
+    readonly icon: ThemeIcon;
+    readonly source: ToolDataSource;
+    readonly description?: string | undefined;
+    protected readonly _tools: ObservableSet<IToolData>;
+    protected readonly _toolSets: ObservableSet<ToolSet>;
+    readonly isHomogenous: IObservable<boolean>;
+    constructor(id: string, referenceName: string, icon: ThemeIcon, source: ToolDataSource, description?: string | undefined);
+    addTool(data: IToolData, tx?: ITransaction): IDisposable;
+    addToolSet(toolSet: ToolSet, tx?: ITransaction): IDisposable;
+    getTools(r?: IReader): Iterable<IToolData>;
+}
 export type CountTokensCallback = (input: string, token: CancellationToken) => Promise<number>;
 export declare function createToolInputUri(toolOrId: IToolData | string): URI;
 export declare function createToolSchemaUri(toolOrId: IToolData | string): URI;

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

@@ -1,18 +1,45 @@
 
+import { toDisposable, Disposable } from '../../../../base/common/lifecycle.js';
 import { Schemas } from '../../../../base/common/network.js';
 import { URI } from '../../../../base/common/uri.js';
 import { stringifyPromptElementJSON } from './tools/promptTsxTypes.js';
+import '../../../../base/common/observableInternal/index.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { localize } from '../../../../nls.js';
+import { ObservableSet } from '../../../../base/common/observableInternal/set.js';
+import { derived } from '../../../../base/common/observableInternal/observables/derived.js';
 
 var ToolDataSource;
 (function (ToolDataSource) {
+    ToolDataSource.Internal = { type: 'internal', label: 'Built-In' };
     function toKey(source) {
         switch (source.type) {
             case 'extension': return `extension:${source.extensionId.value}`;
             case 'mcp': return `mcp:${source.collectionId}:${source.definitionId}`;
+            case 'user': return `user:${( source.file.toString())}`;
             case 'internal': return 'internal';
         }
     }
     ToolDataSource.toKey = toKey;
+    function equals(a, b) {
+        return toKey(a) === toKey(b);
+    }
+    ToolDataSource.equals = equals;
+    function classify(source) {
+        if (source.type === 'internal') {
+            return { ordinal: 1, label: ( localize(5169, 'Built-In')) };
+        }
+        else if (source.type === 'mcp') {
+            return { ordinal: 2, label: ( localize(5170, 'MCP Server: {0}', source.label)) };
+        }
+        else if (source.type === 'user') {
+            return { ordinal: 0, label: ( localize(5171, 'User Defined')) };
+        }
+        else {
+            return { ordinal: 3, label: ( localize(5172, 'Extension: {0}', source.label)) };
+        }
+    }
+    ToolDataSource.classify = classify;
 })(ToolDataSource || (ToolDataSource = {}));
 function isToolInvocationContext(obj) {
     return typeof obj === 'object' && typeof obj.sessionId === 'string';
@@ -26,6 +53,45 @@ function toolResultHasBuffers(result) {
 function stringifyPromptTsxPart(part) {
     return stringifyPromptElementJSON(part.value);
 }
+class ToolSet {
+    constructor(id, referenceName, icon, source, description) {
+        this.id = id;
+        this.referenceName = referenceName;
+        this.icon = icon;
+        this.source = source;
+        this.description = description;
+        this._tools = ( new ObservableSet());
+        this._toolSets = ( new ObservableSet());
+        this.isHomogenous = derived(r => {
+            return !( Iterable.some(
+                this._tools.observable.read(r),
+                tool => !ToolDataSource.equals(tool.source, this.source)
+            ))
+                && !( Iterable.some(
+                this._toolSets.observable.read(r),
+                toolSet => !ToolDataSource.equals(toolSet.source, this.source)
+            ));
+        });
+    }
+    addTool(data, tx) {
+        this._tools.add(data, tx);
+        return toDisposable(() => {
+            this._tools.delete(data);
+        });
+    }
+    addToolSet(toolSet, tx) {
+        if (toolSet === this) {
+            return Disposable.None;
+        }
+        this._toolSets.add(toolSet, tx);
+        return toDisposable(() => {
+            this._toolSets.delete(toolSet);
+        });
+    }
+    getTools(r) {
+        return Iterable.concat(this._tools.observable.read(r), ...( Iterable.map(this._toolSets.observable.read(r), toolSet => toolSet.getTools(r))));
+    }
+}
 function createToolInputUri(toolOrId) {
     if (typeof toolOrId !== 'string') {
         toolOrId = toolOrId.id;
@@ -41,4 +107,4 @@ function createToolSchemaUri(toolOrId) {
     ));
 }
 
-export { ToolDataSource, createToolInputUri, createToolSchemaUri, isToolInvocationContext, isToolResultInputOutputDetails, stringifyPromptTsxPart, toolResultHasBuffers };
+export { ToolDataSource, ToolSet, createToolInputUri, createToolSchemaUri, isToolInvocationContext, isToolResultInputOutputDetails, stringifyPromptTsxPart, toolResultHasBuffers };

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

@@ -1,7 +1,9 @@
 import { CancellationToken } from "../../../../base/common/cancellation.js";
 import { Event } from "../../../../base/common/event.js";
 import { IDisposable } from "../../../../base/common/lifecycle.js";
-import { IToolData, IToolImpl, IToolInvocation, CountTokensCallback, IToolResult } from "./languageModelToolsService.js";
+import { IObservable } from "../../../../base/common/observable.js";
+import { ThemeIcon } from "../../../../base/common/themables.js";
+import { IToolData, IToolImpl, IToolInvocation, CountTokensCallback, IToolResult, ToolSet, ToolDataSource } from "./languageModelToolsService.js";
 export declare const ILanguageModelToolsService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<ILanguageModelToolsService>;
 export interface ILanguageModelToolsService {
     _serviceBrand: undefined;
@@ -10,9 +12,16 @@ export interface ILanguageModelToolsService {
     registerToolImplementation(id: string, tool: IToolImpl): IDisposable;
     getTools(): Iterable<Readonly<IToolData>>;
     getTool(id: string): IToolData | undefined;
-    getToolByName(name: string): IToolData | undefined;
+    getToolByName(name: string, includeDisabled?: boolean): IToolData | undefined;
     invokeTool(invocation: IToolInvocation, countTokens: CountTokensCallback, token: CancellationToken): Promise<IToolResult>;
     setToolAutoConfirmation(toolId: string, scope: "workspace" | "profile" | "memory", autoConfirm?: boolean): void;
     resetToolAutoConfirmation(): void;
     cancelToolCallsForRequest(requestId: string): void;
+    toEnablementMap(toolOrToolSetNames: Iterable<string>): Record<string, boolean>;
+    readonly toolSets: IObservable<Iterable<ToolSet>>;
+    getToolSetByName(name: string): ToolSet | undefined;
+    createToolSet(source: ToolDataSource, id: string, referenceName: string, options?: {
+        icon?: ThemeIcon;
+        description?: string;
+    }): ToolSet & IDisposable;
 }

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

@@ -20,10 +20,10 @@ export interface IChatMessageImagePart {
     type: "image_url";
     value: IChatImageURLPart;
 }
-export interface IChatMessageExtraDataPart {
-    type: "extra_data";
-    kind: string;
-    data: any;
+export interface IChatMessageDataPart {
+    type: "data";
+    mimeType: string;
+    data: VSBuffer;
 }
 export interface IChatImageURLPart {
     mimeType: ChatImageMimeType;
@@ -46,7 +46,7 @@ export interface IChatMessageToolResultPart {
     value: (IChatResponseTextPart | IChatResponsePromptTsxPart | IChatResponseDataPart)[];
     isError?: boolean;
 }
-export type IChatMessagePart = IChatMessageTextPart | IChatMessageToolResultPart | IChatResponseToolUsePart | IChatMessageImagePart | IChatMessageExtraDataPart;
+export type IChatMessagePart = IChatMessageTextPart | IChatMessageToolResultPart | IChatResponseToolUsePart | IChatMessageImagePart | IChatMessageDataPart;
 export interface IChatMessage {
     readonly name?: string | undefined;
     readonly role: ChatMessageRole;
@@ -104,7 +104,7 @@ export interface ILanguageModelChatMetadata {
     };
 }
 export interface ILanguageModelChatResponse {
-    stream: AsyncIterable<IChatResponseFragment>;
+    stream: AsyncIterable<IChatResponseFragment | IChatResponseFragment[]>;
     result: Promise<any>;
 }
 export interface ILanguageModelChat {

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

@@ -37,14 +37,14 @@ const languageModelType = {
     properties: {
         vendor: {
             type: 'string',
-            description: ( localize(5061, "A globally unique vendor of language models."))
+            description: ( localize(5173, "A globally unique vendor of language models."))
         }
     }
 };
 const languageModelExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'languageModels',
     jsonSchema: {
-        description: ( localize(5062, "Contribute language models of a specific vendor.")),
+        description: ( localize(5174, "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(5063, "This contribution point requires the 'chatProvider' proposal.")));
+                    extension.collector.error(( localize(5175, "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(
-                            5064,
+                            5176,
                             "The vendor '{0}' is already registered and cannot be registered twice",
                             item.vendor
                         )));
                         continue;
                     }
                     if (isFalsyOrWhitespace(item.vendor)) {
-                        extension.collector.error(( localize(5065, "The vendor field cannot be empty.")));
+                        extension.collector.error(( localize(5177, "The vendor field cannot be empty.")));
                         continue;
                     }
                     if (item.vendor.trim() !== item.vendor) {
-                        extension.collector.error(( localize(5066, "The vendor field cannot start or end with whitespace.")));
+                        extension.collector.error(( localize(5178, "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.js

@@ -1,6 +1,6 @@
 
 import { localize } from '../../../../../nls.js';
 
-const DEFAULT_MODEL_PICKER_CATEGORY = { label: ( localize(5067, "Other Models")), order: Number.MAX_SAFE_INTEGER };
+const DEFAULT_MODEL_PICKER_CATEGORY = { label: ( localize(5179, "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,14 +1,18 @@
 import { URI } from "../../../../../../base/common/uri.js";
+import { Event } from "../../../../../../base/common/event.js";
 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";
+import { PromptsType } from "@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/platform/prompts/common/prompts";
 export interface IPromptContentsProvider extends IDisposable {
     readonly uri: URI;
     readonly languageId: string;
+    readonly promptType: PromptsType | "non-prompt";
+    readonly contents: Promise<VSBufferReadableStream>;
     readonly sourceName: string;
+    readonly onContentChanged: Event<VSBufferReadableStream | ResolveError>;
+    readonly onDispose: Event<void>;
     start(): this;
-    onContentChanged(callback: (streamOrError: VSBufferReadableStream | ResolveError) => void): IDisposable;
-    onDispose(callback: () => void): this;
     createNew(promptContentsSource: {
         uri: URI;
     }): IPromptContentsProvider;

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

@@ -1,4 +1,4 @@
-import { ChatMode } from "../../constants.js";
+import { TMetadata } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/parsers/promptHeader/headerBase";
 import { URI } from "../../../../../../base/common/uri.js";
 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";
@@ -12,12 +12,6 @@ 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;
@@ -32,11 +26,11 @@ interface IPromptReferenceBase extends IDisposable {
     readonly errors: readonly ResolveError[];
     readonly allErrors: readonly IResolveError[];
     readonly topError: ITopError | undefined;
-    readonly references: readonly IPromptReference[];
-    readonly allReferences: readonly IPromptReference[];
-    readonly allValidReferences: readonly IPromptReference[];
+    readonly references: readonly TPromptReference[];
+    readonly allReferences: readonly TPromptReference[];
+    readonly allValidReferences: readonly TPromptReference[];
     readonly allToolsMetadata: readonly string[] | null;
-    readonly metadata: IPromptMetadata;
+    readonly metadata: TMetadata | null;
     settled(): Promise<this>;
     allSettled(): Promise<this>;
 }
@@ -44,5 +38,5 @@ export interface IPromptFileReference extends IPromptReferenceBase {
     readonly type: "file";
     readonly subtype: "prompt" | "markdown";
 }
-export type IPromptReference = IPromptFileReference;
+export type TPromptReference = IPromptFileReference;
 export {};

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

@@ -1,20 +1,27 @@
 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";
+import { TMetadata } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/parsers/promptHeader/headerBase";
 import { TextModelPromptParser } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/common/promptSyntax/parsers/textModelPromptParser";
+import { PromptsType } from "@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/platform/prompts/common/prompts";
 export type TPromptsStorage = "local" | "user";
-export type TPromptsType = "instructions" | "prompt";
 export interface IPromptPath {
     readonly uri: URI;
     readonly storage: TPromptsStorage;
-    readonly type: TPromptsType;
+    readonly type: PromptsType;
 }
 export type TSharedPrompt = Omit<TextModelPromptParser, "dispose">;
 export interface IMetadata {
     readonly uri: URI;
-    readonly metadata: IPromptMetadata;
-    readonly children?: readonly TTree<IMetadata>[];
+    readonly metadata: TMetadata | null;
+    readonly children?: readonly TTree<IMetadata | null>[];
+}
+export interface ICustomChatMode {
+    readonly uri: URI;
+    readonly name: string;
+    readonly description?: string;
+    readonly tools?: readonly string[];
+    readonly body: string;
 }
 interface ICombinedAgentToolsMetadata {
     readonly tools: readonly string[] | undefined;

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

@@ -1,19 +1,24 @@
+import { CancellationToken } from "../../../../../../base/common/cancellation.js";
+import { Event } from "../../../../../../base/common/event.js";
 import { IDisposable } from "../../../../../../base/common/lifecycle.js";
 import { URI } from "../../../../../../base/common/uri.js";
 import { ITextModel } from "../../../../../../editor/common/model.js";
-import { TSharedPrompt, TPromptsType, IPromptPath, IChatPromptSlashCommand, IMetadata, TCombinedToolsMetadata } from "./types.js";
+import { PromptsType } from "@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/platform/prompts/common/prompts";
+import { TSharedPrompt, IPromptPath, IChatPromptSlashCommand, IMetadata, ICustomChatMode } 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): TSharedPrompt & {
-        disposed: false;
+        isDisposed: false;
     };
-    listPromptFiles(type: TPromptsType): Promise<readonly IPromptPath[]>;
-    getSourceFolders(type: TPromptsType): readonly IPromptPath[];
+    listPromptFiles(type: PromptsType, token: CancellationToken): Promise<readonly IPromptPath[]>;
+    getSourceFolders(type: PromptsType): readonly IPromptPath[];
     asPromptSlashCommand(name: string): IChatPromptSlashCommand | undefined;
-    resolvePromptSlashCommand(data: IChatPromptSlashCommand): Promise<IPromptPath | undefined>;
+    resolvePromptSlashCommand(data: IChatPromptSlashCommand): Promise<IMetadata | undefined>;
     findPromptSlashCommands(): Promise<IChatPromptSlashCommand[]>;
     findInstructionFilesFor(fileUris: readonly URI[]): Promise<readonly URI[]>;
+    readonly onDidChangeCustomChatModes: Event<void>;
+    getCustomChatModes(): Promise<readonly ICustomChatMode[]>;
+    getMetadata(promptFileUri: URI): Promise<IMetadata>;
     getAllMetadata(promptUris: readonly URI[]): Promise<readonly IMetadata[]>;
-    getCombinedToolsMetadata(promptUris: readonly URI[]): Promise<TCombinedToolsMetadata | null>;
 }

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

@@ -3,12 +3,12 @@ import { __decorate, __param } from '../../../../../../../../external/tslib/tsli
 import { MarkdownString } from '../../../../../base/common/htmlContent.js';
 import '../../../../../base/common/observableInternal/index.js';
 import { URI } from '../../../../../base/common/uri.js';
-import { generateUuid } from '../../../../../base/common/uuid.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 { autorun } from '../../../../../base/common/observableInternal/autorun.js';
+import { ToolDataSource } from '../languageModelToolsService.js';
+import { autorun } from '../../../../../base/common/observableInternal/reactions/autorun.js';
 
 const ExtensionEditToolId = 'vscode_editFile';
 const InternalEditToolId = 'vscode_editFile_internal';
@@ -16,7 +16,7 @@ const EditToolData = {
     id: InternalEditToolId,
     displayName: '',
     modelDescription: '',
-    source: { type: 'internal' },
+    source: ToolDataSource.Internal,
 };
 let EditTool = class EditTool {
     constructor(chatService, codeMapperService, notebookService) {
@@ -33,12 +33,6 @@ let EditTool = class EditTool {
         const uri = CellUri.parse(fileUri)?.notebook || fileUri;
         const model = this.chatService.getSession(invocation.context?.sessionId);
         const request = model.getRequests().at(-1);
-        if (request.response?.response.getMarkdown().length) {
-            model.acceptResponseProgress(request, {
-                kind: 'undoStop',
-                id: generateUuid(),
-            });
-        }
         model.acceptResponseProgress(request, {
             kind: 'markdownContent',
             content: ( new MarkdownString('\n````\n'))