@codingame/monaco-vscode-api 16.1.1 → 17.1.0

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

@@ -0,0 +1,116 @@
+import { ThemeIcon } from "../../../../base/common/themables.js";
+import { IOffsetRange, OffsetRange } from "../../../../editor/common/core/offsetRange.js";
+import { IRange } from "../../../../editor/common/core/range.js";
+import { IChatAgentCommand, IChatAgentData } from "./chatAgents.js";
+import { IChatAgentService } from "./chatAgents.service.js";
+import { IChatRequestVariableEntry } from "./chatModel.js";
+import { IChatSlashData } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/common/chatSlashCommands";
+import { IChatRequestVariableValue } from "./chatVariables.js";
+import { ChatAgentLocation } from "./constants.js";
+import { IToolData } from "./languageModelToolsService.js";
+import { IChatPromptSlashCommand } from "./promptSyntax/service/types.js";
+export interface IParsedChatRequest {
+    readonly parts: ReadonlyArray<IParsedChatRequestPart>;
+    readonly text: string;
+}
+export interface IParsedChatRequestPart {
+    readonly kind: string;
+    readonly range: IOffsetRange;
+    readonly editorRange: IRange;
+    readonly text: string;
+    readonly promptText: string;
+}
+export declare function getPromptText(request: IParsedChatRequest): {
+    message: string;
+    diff: number;
+};
+export declare class ChatRequestTextPart implements IParsedChatRequestPart {
+    readonly range: OffsetRange;
+    readonly editorRange: IRange;
+    readonly text: string;
+    static readonly Kind = "text";
+    readonly kind = "text";
+    constructor(range: OffsetRange, editorRange: IRange, text: string);
+    get promptText(): string;
+}
+export declare const chatVariableLeader = "#";
+export declare const chatAgentLeader = "@";
+export declare const chatSubcommandLeader = "/";
+export declare class ChatRequestToolPart implements IParsedChatRequestPart {
+    readonly range: OffsetRange;
+    readonly editorRange: IRange;
+    readonly toolName: string;
+    readonly toolId: string;
+    readonly displayName?: string | undefined;
+    readonly icon?: IToolData["icon"];
+    static readonly Kind = "tool";
+    readonly kind = "tool";
+    constructor(range: OffsetRange, editorRange: IRange, toolName: string, toolId: string, displayName?: string | undefined, icon?: IToolData["icon"]);
+    get text(): string;
+    get promptText(): string;
+    toVariableEntry(): IChatRequestVariableEntry;
+}
+export declare class ChatRequestAgentPart implements IParsedChatRequestPart {
+    readonly range: OffsetRange;
+    readonly editorRange: IRange;
+    readonly agent: IChatAgentData;
+    static readonly Kind = "agent";
+    readonly kind = "agent";
+    constructor(range: OffsetRange, editorRange: IRange, agent: IChatAgentData);
+    get text(): string;
+    get promptText(): string;
+}
+export declare class ChatRequestAgentSubcommandPart implements IParsedChatRequestPart {
+    readonly range: OffsetRange;
+    readonly editorRange: IRange;
+    readonly command: IChatAgentCommand;
+    static readonly Kind = "subcommand";
+    readonly kind = "subcommand";
+    constructor(range: OffsetRange, editorRange: IRange, command: IChatAgentCommand);
+    get text(): string;
+    get promptText(): string;
+}
+export declare class ChatRequestSlashCommandPart implements IParsedChatRequestPart {
+    readonly range: OffsetRange;
+    readonly editorRange: IRange;
+    readonly slashCommand: IChatSlashData;
+    static readonly Kind = "slash";
+    readonly kind = "slash";
+    constructor(range: OffsetRange, editorRange: IRange, slashCommand: IChatSlashData);
+    get text(): string;
+    get promptText(): string;
+}
+export declare class ChatRequestSlashPromptPart implements IParsedChatRequestPart {
+    readonly range: OffsetRange;
+    readonly editorRange: IRange;
+    readonly slashPromptCommand: IChatPromptSlashCommand;
+    static readonly Kind = "prompt";
+    readonly kind = "prompt";
+    constructor(range: OffsetRange, editorRange: IRange, slashPromptCommand: IChatPromptSlashCommand);
+    get text(): string;
+    get promptText(): string;
+}
+export declare class ChatRequestDynamicVariablePart implements IParsedChatRequestPart {
+    readonly range: OffsetRange;
+    readonly editorRange: IRange;
+    readonly text: string;
+    readonly id: string;
+    readonly modelDescription: string | undefined;
+    readonly data: IChatRequestVariableValue;
+    readonly fullName?: string | undefined;
+    readonly icon?: ThemeIcon | undefined;
+    readonly isFile?: boolean | undefined;
+    readonly isDirectory?: boolean | undefined;
+    static readonly Kind = "dynamic";
+    readonly kind = "dynamic";
+    constructor(range: OffsetRange, editorRange: IRange, text: string, id: string, modelDescription: string | undefined, data: IChatRequestVariableValue, fullName?: string | undefined, icon?: ThemeIcon | undefined, isFile?: boolean | undefined, isDirectory?: boolean | undefined);
+    get referenceText(): string;
+    get promptText(): string;
+    toVariableEntry(): IChatRequestVariableEntry;
+}
+export declare function reviveParsedChatRequest(serialized: IParsedChatRequest): IParsedChatRequest;
+export declare function extractAgentAndCommand(parsed: IParsedChatRequest): {
+    agentPart: ChatRequestAgentPart | undefined;
+    commandPart: ChatRequestAgentSubcommandPart | undefined;
+};
+export declare function formatChatQuestion(chatAgentService: IChatAgentService, location: ChatAgentLocation, prompt: string, participant?: string | null, command?: string | null): string | undefined;

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

@@ -0,0 +1,211 @@
+
+import { revive } from '../../../../base/common/marshalling.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { OffsetRange } from '../../../../editor/common/core/offsetRange.js';
+import { reviveSerializedAgent } from './chatAgents.js';
+import { IDiagnosticVariableEntryFilterData } from './chatModel.js';
+
+function getPromptText(request) {
+    const message = ( request.parts.map(r => r.promptText)).join('').trimStart();
+    const diff = request.text.length - message.length;
+    return { message, diff };
+}
+class ChatRequestTextPart {
+    static { this.Kind = 'text'; }
+    constructor(range, editorRange, text) {
+        this.range = range;
+        this.editorRange = editorRange;
+        this.text = text;
+        this.kind = ChatRequestTextPart.Kind;
+    }
+    get promptText() {
+        return this.text;
+    }
+}
+const chatVariableLeader = '#';
+const chatAgentLeader = '@';
+const chatSubcommandLeader = '/';
+class ChatRequestVariablePart {
+    static { this.Kind = 'var'; }
+    constructor(range, editorRange, variableName, variableArg, variableId) {
+        this.range = range;
+        this.editorRange = editorRange;
+        this.variableName = variableName;
+        this.variableArg = variableArg;
+        this.variableId = variableId;
+        this.kind = ChatRequestVariablePart.Kind;
+    }
+    get text() {
+        const argPart = this.variableArg ? `:${this.variableArg}` : '';
+        return `${chatVariableLeader}${this.variableName}${argPart}`;
+    }
+    get promptText() {
+        return this.text;
+    }
+}
+class ChatRequestToolPart {
+    static { this.Kind = 'tool'; }
+    constructor(range, editorRange, toolName, toolId, displayName, icon) {
+        this.range = range;
+        this.editorRange = editorRange;
+        this.toolName = toolName;
+        this.toolId = toolId;
+        this.displayName = displayName;
+        this.icon = icon;
+        this.kind = ChatRequestToolPart.Kind;
+    }
+    get text() {
+        return `${chatVariableLeader}${this.toolName}`;
+    }
+    get promptText() {
+        return this.text;
+    }
+    toVariableEntry() {
+        return { kind: 'tool', id: this.toolId, name: this.toolName, range: this.range, value: undefined, icon: ThemeIcon.isThemeIcon(this.icon) ? this.icon : undefined, fullName: this.displayName };
+    }
+}
+class ChatRequestAgentPart {
+    static { this.Kind = 'agent'; }
+    constructor(range, editorRange, agent) {
+        this.range = range;
+        this.editorRange = editorRange;
+        this.agent = agent;
+        this.kind = ChatRequestAgentPart.Kind;
+    }
+    get text() {
+        return `${chatAgentLeader}${this.agent.name}`;
+    }
+    get promptText() {
+        return '';
+    }
+}
+class ChatRequestAgentSubcommandPart {
+    static { this.Kind = 'subcommand'; }
+    constructor(range, editorRange, command) {
+        this.range = range;
+        this.editorRange = editorRange;
+        this.command = command;
+        this.kind = ChatRequestAgentSubcommandPart.Kind;
+    }
+    get text() {
+        return `${chatSubcommandLeader}${this.command.name}`;
+    }
+    get promptText() {
+        return '';
+    }
+}
+class ChatRequestSlashCommandPart {
+    static { this.Kind = 'slash'; }
+    constructor(range, editorRange, slashCommand) {
+        this.range = range;
+        this.editorRange = editorRange;
+        this.slashCommand = slashCommand;
+        this.kind = ChatRequestSlashCommandPart.Kind;
+    }
+    get text() {
+        return `${chatSubcommandLeader}${this.slashCommand.command}`;
+    }
+    get promptText() {
+        return `${chatSubcommandLeader}${this.slashCommand.command}`;
+    }
+}
+class ChatRequestSlashPromptPart {
+    static { this.Kind = 'prompt'; }
+    constructor(range, editorRange, slashPromptCommand) {
+        this.range = range;
+        this.editorRange = editorRange;
+        this.slashPromptCommand = slashPromptCommand;
+        this.kind = ChatRequestSlashPromptPart.Kind;
+    }
+    get text() {
+        return `${chatSubcommandLeader}${this.slashPromptCommand.command}`;
+    }
+    get promptText() {
+        return `${chatSubcommandLeader}${this.slashPromptCommand.command}`;
+    }
+}
+class ChatRequestDynamicVariablePart {
+    static { this.Kind = 'dynamic'; }
+    constructor(range, editorRange, text, id, modelDescription, data, fullName, icon, isFile, isDirectory) {
+        this.range = range;
+        this.editorRange = editorRange;
+        this.text = text;
+        this.id = id;
+        this.modelDescription = modelDescription;
+        this.data = data;
+        this.fullName = fullName;
+        this.icon = icon;
+        this.isFile = isFile;
+        this.isDirectory = isDirectory;
+        this.kind = ChatRequestDynamicVariablePart.Kind;
+    }
+    get referenceText() {
+        return this.text.replace(chatVariableLeader, '');
+    }
+    get promptText() {
+        return this.text;
+    }
+    toVariableEntry() {
+        if (this.id === 'vscode.problems') {
+            return IDiagnosticVariableEntryFilterData.toEntry(this.data.filter);
+        }
+        return { kind: this.isDirectory ? 'directory' : this.isFile ? 'file' : 'generic', id: this.id, name: this.referenceText, range: this.range, value: this.data, fullName: this.fullName, icon: this.icon };
+    }
+}
+function reviveParsedChatRequest(serialized) {
+    return {
+        text: serialized.text,
+        parts: ( serialized.parts.map(part => {
+            if (part.kind === ChatRequestTextPart.Kind) {
+                return ( new ChatRequestTextPart(( new OffsetRange(part.range.start, part.range.endExclusive)), part.editorRange, part.text));
+            }
+            else if (part.kind === ChatRequestVariablePart.Kind) {
+                return ( new ChatRequestVariablePart(( new OffsetRange(part.range.start, part.range.endExclusive)), part.editorRange, part.variableName, part.variableArg, part.variableId || ''));
+            }
+            else if (part.kind === ChatRequestToolPart.Kind) {
+                return ( new ChatRequestToolPart(( new OffsetRange(part.range.start, part.range.endExclusive)), part.editorRange, part.toolName, part.toolId, part.displayName, part.icon));
+            }
+            else if (part.kind === ChatRequestAgentPart.Kind) {
+                let agent = part.agent;
+                agent = reviveSerializedAgent(agent);
+                return ( new ChatRequestAgentPart(( new OffsetRange(part.range.start, part.range.endExclusive)), part.editorRange, agent));
+            }
+            else if (part.kind === ChatRequestAgentSubcommandPart.Kind) {
+                return ( new ChatRequestAgentSubcommandPart(( new OffsetRange(part.range.start, part.range.endExclusive)), part.editorRange, part.command));
+            }
+            else if (part.kind === ChatRequestSlashCommandPart.Kind) {
+                return ( new ChatRequestSlashCommandPart(( new OffsetRange(part.range.start, part.range.endExclusive)), part.editorRange, part.slashCommand));
+            }
+            else if (part.kind === ChatRequestSlashPromptPart.Kind) {
+                return ( new ChatRequestSlashPromptPart(( new OffsetRange(part.range.start, part.range.endExclusive)), part.editorRange, part.slashPromptCommand));
+            }
+            else if (part.kind === ChatRequestDynamicVariablePart.Kind) {
+                return ( new ChatRequestDynamicVariablePart(( new OffsetRange(part.range.start, part.range.endExclusive)), part.editorRange, part.text, part.id, part.modelDescription, revive(part.data), part.fullName, part.icon, part.isFile, part.isDirectory));
+            }
+            else {
+                throw ( new Error(`Unknown chat request part: ${part.kind}`));
+            }
+        }))
+    };
+}
+function extractAgentAndCommand(parsed) {
+    const agentPart = parsed.parts.find((r) => r instanceof ChatRequestAgentPart);
+    const commandPart = parsed.parts.find((r) => r instanceof ChatRequestAgentSubcommandPart);
+    return { agentPart, commandPart };
+}
+function formatChatQuestion(chatAgentService, location, prompt, participant = null, command = null) {
+    let question = '';
+    if (participant && participant !== chatAgentService.getDefaultAgent(location)?.id) {
+        const agent = chatAgentService.getAgent(participant);
+        if (!agent) {
+            return undefined;
+        }
+        question += `${chatAgentLeader}${agent.name} `;
+        if (command) {
+            question += `${chatSubcommandLeader}${command} `;
+        }
+    }
+    return question + prompt;
+}
+
+export { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestDynamicVariablePart, ChatRequestSlashCommandPart, ChatRequestSlashPromptPart, ChatRequestTextPart, ChatRequestToolPart, chatAgentLeader, chatSubcommandLeader, chatVariableLeader, extractAgentAndCommand, formatChatQuestion, getPromptText, reviveParsedChatRequest };

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

@@ -1,6 +1,7 @@
 import { DeferredPromise } from "../../../../base/common/async.js";
 import { Event } from "../../../../base/common/event.js";
 import { IMarkdownString } from "../../../../base/common/htmlContent.js";
+import { IObservable } from "../../../../base/common/observable.js";
 import { ThemeIcon } from "../../../../base/common/themables.js";
 import { URI } from "../../../../base/common/uri.js";
 import { IRange } from "../../../../editor/common/core/range.js";
@@ -9,9 +10,9 @@ import { Command, Location, TextEdit } from "../../../../editor/common/languages
 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 { IChatAgentCommand, IChatAgentData, IChatAgentResult } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatAgents";
-import { IChatRequestVariableEntry, IChatResponseModel } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IChatParserContext } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser";
+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";
 import { IChatRequestVariableValue } from "./chatVariables.js";
 import { ChatAgentLocation, ChatMode } from "./constants.js";
 import { IPreparedToolInvocation, IToolConfirmationMessages, IToolResult } from "./languageModelToolsService.js";
@@ -180,9 +181,14 @@ export interface IChatToolInvocation {
     confirmationMessages?: IToolConfirmationMessages;
     confirmed: DeferredPromise<boolean>;
     isConfirmed: boolean | undefined;
+    originMessage: string | IMarkdownString | undefined;
     invocationMessage: string | IMarkdownString;
     pastTenseMessage: string | IMarkdownString | undefined;
     resultDetails: IToolResult["toolResultDetails"];
+    progress: IObservable<{
+        message?: string | IMarkdownString;
+        progress: number;
+    }>;
     readonly toolId: string;
     readonly toolCallId: string;
     isCompletePromise: Promise<void>;
@@ -194,14 +200,20 @@ export interface IChatToolInvocationSerialized {
     presentation: IPreparedToolInvocation["presentation"];
     toolSpecificData?: IChatTerminalToolInvocationData | IChatToolInputInvocationData;
     invocationMessage: string | IMarkdownString;
+    originMessage: string | IMarkdownString | undefined;
     pastTenseMessage: string | IMarkdownString | undefined;
     resultDetails: IToolResult["toolResultDetails"];
     isConfirmed: boolean | undefined;
     isComplete: boolean;
     toolCallId: string;
+    toolId: string;
     kind: "toolInvocationSerialized";
 }
-export type IChatProgress = IChatMarkdownContent | IChatAgentMarkdownContentWithVulnerability | IChatTreeData | IChatUsedContext | IChatContentReference | IChatContentInlineReference | IChatCodeCitation | IChatProgressMessage | IChatTask | IChatTaskResult | IChatCommandButton | IChatWarningMessage | IChatTextEdit | IChatNotebookEdit | IChatMoveMessage | IChatResponseCodeblockUriPart | IChatConfirmation | IChatToolInvocation | IChatToolInvocationSerialized | IChatUndoStop;
+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 IChatFollowup {
     kind: "reply";
     message: string;
@@ -280,7 +292,7 @@ export interface IChatEditingSessionAction {
     kind: "chatEditingSessionAction";
     uri: URI;
     hasRemainingEdits: boolean;
-    outcome: "accepted" | "rejected" | "saved";
+    outcome: "accepted" | "rejected" | "userModified";
 }
 export type ChatUserAction = IChatVoteAction | IChatCopyAction | IChatInsertAction | IChatApplyAction | IChatTerminalAction | IChatCommandAction | IChatFollowupAction | IChatBugReportAction | IChatInlineChatCodeAction | IChatEditingSessionAction;
 export interface IChatUserActionEvent {
@@ -341,6 +353,8 @@ export interface IChatSendRequestOptions {
     mode?: ChatMode;
     userSelectedModelId?: string;
     userSelectedTools?: string[];
+    userSelectedTools2?: Record<string, boolean>;
+    toolSelectionIsExclusive?: boolean;
     location?: ChatAgentLocation;
     locationData?: IChatLocationData;
     parserContext?: IChatParserContext;
@@ -352,6 +366,5 @@ export interface IChatSendRequestOptions {
     agentId?: string;
     slashCommand?: string;
     confirmation?: string;
-    hasInstructionAttachments?: boolean;
 }
 export declare const KEYWORD_ACTIVIATION_SETTING_ID = "accessibility.voice.keywordActivation";

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

@@ -1,8 +1,8 @@
 import { CancellationToken } from "../../../../base/common/cancellation.js";
 import { Event } from "../../../../base/common/event.js";
 import { URI } from "../../../../base/common/uri.js";
-import { ChatModel, IChatModel, IExportableChatData, ISerializableChatData, IChatRequestModel, IChatRequestVariableData } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IParsedChatRequest } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes";
+import { ChatModel, IChatModel, IExportableChatData, ISerializableChatData, IChatRequestModel, IChatRequestVariableData } from "./chatModel.js";
+import { IParsedChatRequest } from "./chatParserTypes.js";
 import { IChatTransferredSessionData, IChatSendRequestOptions, IChatSendRequestData, IChatCompleteResponse, IChatDetail, IChatUserActionEvent } from "./chatService.js";
 import { ChatAgentLocation } from "./constants.js";
 export declare const IChatService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatService>;
@@ -39,6 +39,6 @@ export interface IChatService {
         reason: "initializationFailed" | "cleared";
     }>;
     transferChatSession(transferredSessionData: IChatTransferredSessionData, toWorkspace: URI): void;
-    readonly unifiedViewEnabled: boolean;
-    isEditingLocation(location: ChatAgentLocation): boolean;
+    activateDefaultAgent(location: ChatAgentLocation): Promise<void>;
+    readonly edits2Enabled: boolean;
 }

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

@@ -1,5 +1,7 @@
+import { URI } from "../../../../base/common/uri.js";
 export declare const IChatTransferService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatTransferService>;
 export interface IChatTransferService {
     readonly _serviceBrand: undefined;
-    checkAndSetWorkspaceTrust(): Promise<void>;
+    checkAndSetTransferredWorkspaceTrust(): Promise<void>;
+    addWorkspaceToTransferred(workspace: URI): void;
 }

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

@@ -3,7 +3,7 @@ import { ThemeIcon } from "../../../../base/common/themables.js";
 import { URI } from "../../../../base/common/uri.js";
 import { IRange } from "../../../../editor/common/core/range.js";
 import { Location } from "../../../../editor/common/languages.js";
-import { IChatModel, IDiagnosticVariableEntryFilterData } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IChatModel, IDiagnosticVariableEntryFilterData } from "./chatModel.js";
 import { IChatContentReference, IChatProgressMessage } from "./chatService.js";
 export interface IChatVariableData {
     id: string;
@@ -29,7 +29,6 @@ export interface IDynamicVariable {
     id: string;
     fullName?: string;
     icon?: ThemeIcon;
-    prefix?: string;
     modelDescription?: string;
     isFile?: boolean;
     isDirectory?: boolean;

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

@@ -1,13 +1,8 @@
-import { URI } from "../../../../base/common/uri.js";
-import { Location } from "../../../../editor/common/languages.js";
-import { IChatRequestVariableEntry, IChatRequestVariableData } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IParsedChatRequest } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes";
 import { IDynamicVariable } from "./chatVariables.js";
-import { ChatAgentLocation } from "./constants.js";
+import { IToolData } 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>;
-    attachContext(name: string, value: string | URI | Location | unknown, location: ChatAgentLocation): void;
-    resolveVariables(prompt: IParsedChatRequest, attachedContextVariables: IChatRequestVariableEntry[] | undefined): IChatRequestVariableData;
+    getSelectedTools(sessionId: string): ReadonlyArray<IToolData>;
 }

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

@@ -1,5 +1,5 @@
 import { Event } from "../../../../base/common/event.js";
-import { IChatHistoryEntry } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatWidgetHistoryService";
+import { IChatHistoryEntry } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatWidgetHistoryService";
 import { ChatAgentLocation } from "./constants.js";
 export declare const IChatWidgetHistoryService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatWidgetHistoryService>;
 export interface IChatWidgetHistoryService {

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

@@ -1,5 +1,4 @@
 export declare enum ChatConfiguration {
-    UnifiedChatView = "chat.unifiedChatView",
     UseFileStorage = "chat.useFileStorage",
     AgentEnabled = "chat.agent.enabled",
     Edits2Enabled = "chat.edits2.enabled",
@@ -10,14 +9,14 @@ export declare enum ChatMode {
     Edit = "edit",
     Agent = "agent"
 }
+export declare function modeToString(mode: ChatMode): "Edit" | "Agent" | "Ask";
 export declare function validateChatMode(mode: unknown): ChatMode | undefined;
 export type RawChatParticipantLocation = "panel" | "terminal" | "notebook" | "editing-session";
 export declare enum ChatAgentLocation {
     Panel = "panel",
     Terminal = "terminal",
     Notebook = "notebook",
-    Editor = "editor",
-    EditingSession = "editing-session"
+    Editor = "editor"
 }
 export declare namespace ChatAgentLocation {
     function fromRaw(value: RawChatParticipantLocation | string): ChatAgentLocation;

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

@@ -2,7 +2,6 @@
 
 var ChatConfiguration;
 (function (ChatConfiguration) {
-    ChatConfiguration["UnifiedChatView"] = "chat.unifiedChatView";
     ChatConfiguration["UseFileStorage"] = "chat.useFileStorage";
     ChatConfiguration["AgentEnabled"] = "chat.agent.enabled";
     ChatConfiguration["Edits2Enabled"] = "chat.edits2.enabled";
@@ -14,6 +13,17 @@ var ChatMode;
     ChatMode["Edit"] = "edit";
     ChatMode["Agent"] = "agent";
 })(ChatMode || (ChatMode = {}));
+function modeToString(mode) {
+    switch (mode) {
+        case ChatMode.Agent:
+            return 'Agent';
+        case ChatMode.Edit:
+            return 'Edit';
+        case ChatMode.Ask:
+        default:
+            return 'Ask';
+    }
+}
 function validateChatMode(mode) {
     switch (mode) {
         case ChatMode.Ask:
@@ -30,7 +40,6 @@ var ChatAgentLocation;
     ChatAgentLocation["Terminal"] = "terminal";
     ChatAgentLocation["Notebook"] = "notebook";
     ChatAgentLocation["Editor"] = "editor";
-    ChatAgentLocation["EditingSession"] = "editing-session";
 })(ChatAgentLocation || (ChatAgentLocation = {}));
 (function (ChatAgentLocation) {
     function fromRaw(value) {
@@ -39,11 +48,10 @@ var ChatAgentLocation;
             case 'terminal': return ChatAgentLocation.Terminal;
             case 'notebook': return ChatAgentLocation.Notebook;
             case 'editor': return ChatAgentLocation.Editor;
-            case 'editing-session': return ChatAgentLocation.EditingSession;
         }
         return ChatAgentLocation.Panel;
     }
     ChatAgentLocation.fromRaw = fromRaw;
 })(ChatAgentLocation || (ChatAgentLocation = {}));
 
-export { ChatAgentLocation, ChatConfiguration, ChatMode, validateChatMode };
+export { ChatAgentLocation, ChatConfiguration, ChatMode, modeToString, validateChatMode };

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

@@ -3,10 +3,12 @@ import { IMarkdownString } from "../../../../base/common/htmlContent.js";
 import { IJSONSchema } from "../../../../base/common/jsonSchema.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 { Location } from "../../../../editor/common/languages.js";
+import { IProgress } from "../../../../platform/progress/common/progress.js";
 import { IChatTerminalToolInvocationData, IChatToolInputInvocationData } from "./chatService.js";
+import { VSBuffer } from "../../../../base/common/buffer.js";
 export interface IToolData {
     id: string;
     source: ToolDataSource;
@@ -23,16 +25,23 @@ export interface IToolData {
     inputSchema?: IJSONSchema;
     canBeReferencedInPrompt?: boolean;
     runsInWorkspace?: boolean;
-    requiresConfirmation?: boolean;
     alwaysDisplayInputOutput?: boolean;
     supportsToolPicker?: boolean;
 }
+export interface IToolProgressStep {
+    readonly message: string | IMarkdownString | undefined;
+    readonly increment: number | undefined;
+    readonly total: number | undefined;
+}
+export type ToolProgress = IProgress<IToolProgressStep>;
 export type ToolDataSource = {
     type: "extension";
+    label: string;
     extensionId: ExtensionIdentifier;
     isExternalTool: boolean;
 } | {
     type: "mcp";
+    label: string;
     collectionId: string;
     definitionId: string;
 } | {
@@ -58,14 +67,24 @@ export interface IToolInvocationContext {
 export declare function isToolInvocationContext(obj: any): obj is IToolInvocationContext;
 export interface IToolResultInputOutputDetails {
     readonly input: string;
-    readonly output: string;
+    readonly output: ({
+        type: "text";
+        value: string;
+    } | {
+        type: "data";
+        mimeType: string;
+        value64: string;
+    })[];
+    readonly isError?: boolean;
 }
 export declare function isToolResultInputOutputDetails(obj: any): obj is IToolResultInputOutputDetails;
 export interface IToolResult {
-    content: (IToolResultPromptTsxPart | IToolResultTextPart)[];
+    content: (IToolResultPromptTsxPart | IToolResultTextPart | IToolResultDataPart)[];
     toolResultMessage?: string | IMarkdownString;
     toolResultDetails?: Array<URI | Location> | IToolResultInputOutputDetails;
+    toolResultError?: string;
 }
+export declare function toolResultHasBuffers(result: IToolResult): boolean;
 export interface IToolResultPromptTsxPart {
     kind: "promptTsx";
     value: unknown;
@@ -75,6 +94,13 @@ export interface IToolResultTextPart {
     kind: "text";
     value: string;
 }
+export interface IToolResultDataPart {
+    kind: "data";
+    value: {
+        mimeType: string;
+        data: VSBuffer;
+    };
+}
 export interface IToolConfirmationMessages {
     title: string;
     message: string | IMarkdownString;
@@ -83,13 +109,15 @@ export interface IToolConfirmationMessages {
 export interface IPreparedToolInvocation {
     invocationMessage?: string | IMarkdownString;
     pastTenseMessage?: string | IMarkdownString;
+    originMessage?: string | IMarkdownString;
     confirmationMessages?: IToolConfirmationMessages;
     presentation?: "hidden" | undefined;
     toolSpecificData?: IChatTerminalToolInvocationData | IChatToolInputInvocationData;
 }
 export interface IToolImpl {
-    invoke(invocation: IToolInvocation, countTokens: CountTokensCallback, token: CancellationToken): Promise<IToolResult>;
+    invoke(invocation: IToolInvocation, countTokens: CountTokensCallback, progress: ToolProgress, token: CancellationToken): Promise<IToolResult>;
     prepareToolInvocation?(parameters: any, token: CancellationToken): Promise<IPreparedToolInvocation | undefined>;
 }
 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;