@codingame/monaco-vscode-api 21.6.0 → 22.0.0

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

@@ -10,10 +10,10 @@ 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-4dda7789-5a25-5e8b-b2de-c2f11b1b96e5-common/vscode/vs/workbench/contrib/search/common/search";
+import { IWorkspaceSymbol } from "@codingame/monaco-vscode-5084de40-f866-5cb5-9d9b-33a10f6f235d-common/vscode/vs/workbench/contrib/search/common/search";
 import { IChatAgentCommand, IChatAgentData, IChatAgentResult, UserSelectedTools } from "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatAgents";
 import { IChatRequestModeInfo, IChatResponseModel } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IChatParserContext } from "@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser";
+import { IChatParserContext } from "@codingame/monaco-vscode-5084de40-f866-5cb5-9d9b-33a10f6f235d-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser";
 import { IChatRequestVariableEntry } from "./chatVariableEntries.js";
 import { IChatRequestVariableValue } from "./chatVariables.js";
 import { ChatAgentLocation, ChatModeKind } from "./constants.js";
@@ -38,6 +38,7 @@ export interface IChatResponseErrorDetails {
     responseIsFiltered?: boolean;
     responseIsRedacted?: boolean;
     isQuotaExceeded?: boolean;
+    isRateLimited?: boolean;
     level?: ChatErrorLevel;
     confirmationButtons?: IChatResponseErrorDetailsConfirmationButton[];
     code?: string;
@@ -217,15 +218,16 @@ export interface IChatElicitationRequest {
     title: string | IMarkdownString;
     message: string | IMarkdownString;
     acceptButtonLabel: string;
-    rejectButtonLabel: string;
+    rejectButtonLabel: string | undefined;
     subtitle?: string | IMarkdownString;
     source?: ToolDataSource;
     state: "pending" | "accepted" | "rejected";
     acceptedResult?: Record<string, unknown>;
     moreActions?: IAction[];
     accept(value: IAction | true): Promise<void>;
-    reject(): Promise<void>;
-    onDidRequestHide?: Event<void>;
+    reject?: () => Promise<void>;
+    isHidden?: IObservable<boolean>;
+    hide?(): void;
 }
 export interface IChatThinkingPart {
     kind: "thinking";
@@ -299,10 +301,11 @@ export interface IChatToolInvocation {
     source: ToolDataSource;
     progress: IObservable<{
         message?: string | IMarkdownString;
-        progress: number;
+        progress: number | undefined;
     }>;
     readonly toolId: string;
     readonly toolCallId: string;
+    readonly fromSubAgent?: boolean;
     isCompletePromise: Promise<void>;
     isComplete: boolean;
     complete(result: IToolResult): void;
@@ -331,6 +334,7 @@ export interface IChatToolInvocationSerialized {
     toolCallId: string;
     toolId: string;
     source: ToolDataSource;
+    readonly fromSubAgent?: boolean;
     kind: "toolInvocationSerialized";
 }
 export interface IChatExtensionsContent {
@@ -355,11 +359,21 @@ export interface IChatTodoListContent {
         status: "not-started" | "in-progress" | "completed";
     }>;
 }
+export interface IChatMcpServersInteractionRequired {
+    kind: "mcpServersInteractionRequired";
+    isDone?: boolean;
+    servers: Array<{
+        serverId: string;
+        serverLabel: string;
+        errorMessage?: string;
+    }>;
+    startCommand: Command;
+}
 export interface IChatPrepareToolInvocationPart {
     readonly kind: "prepareToolInvocation";
     readonly toolName: string;
 }
-export type IChatProgress = IChatMarkdownContent | IChatAgentMarkdownContentWithVulnerability | IChatTreeData | IChatMultiDiffData | IChatUsedContext | IChatContentReference | IChatContentInlineReference | IChatCodeCitation | IChatProgressMessage | IChatTask | IChatTaskResult | IChatCommandButton | IChatWarningMessage | IChatTextEdit | IChatNotebookEdit | IChatMoveMessage | IChatResponseCodeblockUriPart | IChatConfirmation | IChatClearToPreviousToolInvocation | IChatToolInvocation | IChatToolInvocationSerialized | IChatExtensionsContent | IChatPullRequestContent | IChatUndoStop | IChatPrepareToolInvocationPart | IChatThinkingPart | IChatTaskSerialized | IChatElicitationRequest;
+export type IChatProgress = IChatMarkdownContent | IChatAgentMarkdownContentWithVulnerability | IChatTreeData | IChatMultiDiffData | IChatUsedContext | IChatContentReference | IChatContentInlineReference | IChatCodeCitation | IChatProgressMessage | IChatTask | IChatTaskResult | IChatCommandButton | IChatWarningMessage | IChatTextEdit | IChatNotebookEdit | IChatMoveMessage | IChatResponseCodeblockUriPart | IChatConfirmation | IChatClearToPreviousToolInvocation | IChatToolInvocation | IChatToolInvocationSerialized | IChatExtensionsContent | IChatPullRequestContent | IChatUndoStop | IChatPrepareToolInvocationPart | IChatThinkingPart | IChatTaskSerialized | IChatElicitationRequest | IChatMcpServersInteractionRequired;
 export interface IChatFollowup {
     kind: "reply";
     message: string;
@@ -512,10 +526,12 @@ export interface IChatSendRequestData extends IChatSendRequestResponseState {
     slashCommand?: IChatAgentCommand;
 }
 export interface IChatEditorLocationData {
-    type: ChatAgentLocation.Editor;
+    type: ChatAgentLocation.EditorInline;
     document: URI;
     selection: ISelection;
     wholeRange: IRange;
+    close: () => void;
+    delegateSessionId: string | undefined;
 }
 export interface IChatNotebookLocationData {
     type: ChatAgentLocation.Notebook;

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

@@ -2,6 +2,7 @@ import { CancellationToken } from "../../../../base/common/cancellation.js";
 import { Event } from "../../../../base/common/event.js";
 import { IObservable } from "../../../../base/common/observable.js";
 import { URI } from "../../../../base/common/uri.js";
+import { IChatEditingSession } from "./chatEditingService.js";
 import { ChatModel, IChatModel, IExportableChatData, ISerializableChatData, IChatRequestModel, IChatRequestVariableData } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel";
 import { IParsedChatRequest } from "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes";
 import { IChatTransferredSessionData, IChatSendRequestOptions, IChatSendRequestData, IChatCompleteResponse, IChatDetail, IChatUserActionEvent } from "./chatService.js";
@@ -22,8 +23,14 @@ export interface IChatService {
     isPersistedSessionEmpty(sessionId: string): boolean;
     loadSessionFromContent(data: IExportableChatData | ISerializableChatData | URI): IChatModel | undefined;
     loadSessionForResource(resource: URI, location: ChatAgentLocation, token: CancellationToken): Promise<IChatModel | undefined>;
+    readonly editingSessions: IChatEditingSession[];
+    getChatSessionFromInternalId(sessionId: string): {
+        chatSessionType: string;
+        chatSessionId: string;
+        isUntitled: boolean;
+    } | undefined;
     /**
-    * Returns whether the request was accepted.
+    * Returns whether the request was accepted.`
     */
     sendRequest(sessionId: string, message: string, options?: IChatSendRequestOptions): Promise<IChatSendRequestData | undefined>;
     resendRequest(request: IChatRequestModel, options?: IChatSendRequestOptions): Promise<void>;

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

@@ -12,6 +12,11 @@ export declare enum ChatSessionStatus {
     Completed = 1,
     InProgress = 2
 }
+export interface IChatSessionCommandContribution {
+    name: string;
+    description: string;
+    when?: string;
+}
 export interface IChatSessionsExtensionPoint {
     readonly type: string;
     readonly name: string;
@@ -23,6 +28,7 @@ export interface IChatSessionsExtensionPoint {
         supportsFileAttachments?: boolean;
         supportsToolAttachments?: boolean;
     };
+    readonly commands?: IChatSessionCommandContribution[];
 }
 export interface IChatSessionItem {
     id: string;
@@ -65,8 +71,6 @@ export interface IChatSessionItemProvider {
     provideChatSessionItems(token: CancellationToken): Promise<IChatSessionItem[]>;
     provideNewChatSessionItem?(options: {
         request: IChatAgentRequest;
-        prompt?: string;
-        history?: any[];
         metadata?: any;
     }, token: CancellationToken): Promise<IChatSessionItem>;
 }

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

@@ -16,8 +16,6 @@ export interface IChatSessionsService {
     getAllChatSessionItemProviders(): IChatSessionItemProvider[];
     provideNewChatSessionItem(chatSessionType: string, options: {
         request: IChatAgentRequest;
-        prompt?: string;
-        history?: any[];
         metadata?: any;
     }, token: CancellationToken): Promise<IChatSessionItem>;
     provideChatSessionItems(chatSessionType: string, token: CancellationToken): Promise<IChatSessionItem[]>;

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

@@ -7,6 +7,7 @@ import { MarkerSeverity, IMarker } from "../../../../platform/markers/common/mar
 import { ISCMHistoryItem } from "../../scm/common/history.js";
 import { IChatContentReference } from "./chatService.js";
 import { IChatRequestVariableValue } from "./chatVariables.js";
+import { IToolData, ToolSet } from "./languageModelToolsService.js";
 interface IBaseChatRequestVariableEntry {
     readonly id: string;
     readonly fullName?: string;
@@ -43,6 +44,7 @@ export interface IChatRequestToolSetEntry extends IBaseChatRequestVariableEntry
     readonly kind: "toolset";
     readonly value: IChatRequestToolEntry[];
 }
+export type ChatRequestToolReferenceEntry = IChatRequestToolEntry | IChatRequestToolSetEntry;
 export interface IChatRequestImplicitVariableEntry extends IBaseChatRequestVariableEntry {
     readonly kind: "implicit";
     readonly isFile: true;
@@ -107,6 +109,7 @@ export interface IPromptFileVariableEntry extends IBaseChatRequestVariableEntry
     readonly originLabel?: string;
     readonly modelDescription: string;
     readonly automaticallyAdded: boolean;
+    readonly toolReferences?: readonly ChatRequestToolReferenceEntry[];
 }
 export interface IPromptTextVariableEntry extends IBaseChatRequestVariableEntry {
     readonly kind: "promptText";
@@ -114,13 +117,31 @@ export interface IPromptTextVariableEntry extends IBaseChatRequestVariableEntry
     readonly settingId?: string;
     readonly modelDescription: string;
     readonly automaticallyAdded: boolean;
+    readonly toolReferences?: readonly ChatRequestToolReferenceEntry[];
 }
 export interface ISCMHistoryItemVariableEntry extends IBaseChatRequestVariableEntry {
     readonly kind: "scmHistoryItem";
     readonly value: URI;
     readonly historyItem: ISCMHistoryItem;
 }
-export type IChatRequestVariableEntry = IGenericChatRequestVariableEntry | IChatRequestImplicitVariableEntry | IChatRequestPasteVariableEntry | ISymbolVariableEntry | ICommandResultVariableEntry | IDiagnosticVariableEntry | IImageVariableEntry | IChatRequestToolEntry | IChatRequestToolSetEntry | IChatRequestDirectoryEntry | IChatRequestFileEntry | INotebookOutputVariableEntry | IElementVariableEntry | IPromptFileVariableEntry | IPromptTextVariableEntry | ISCMHistoryItemVariableEntry;
+export interface ISCMHistoryItemChangeVariableEntry extends IBaseChatRequestVariableEntry {
+    readonly kind: "scmHistoryItemChange";
+    readonly value: URI;
+    readonly historyItem: ISCMHistoryItem;
+}
+export interface ISCMHistoryItemChangeRangeVariableEntry extends IBaseChatRequestVariableEntry {
+    readonly kind: "scmHistoryItemChangeRange";
+    readonly value: URI;
+    readonly historyItemChangeStart: {
+        readonly uri: URI;
+        readonly historyItem: ISCMHistoryItem;
+    };
+    readonly historyItemChangeEnd: {
+        readonly uri: URI;
+        readonly historyItem: ISCMHistoryItem;
+    };
+}
+export type IChatRequestVariableEntry = IGenericChatRequestVariableEntry | IChatRequestImplicitVariableEntry | IChatRequestPasteVariableEntry | ISymbolVariableEntry | ICommandResultVariableEntry | IDiagnosticVariableEntry | IImageVariableEntry | IChatRequestToolEntry | IChatRequestToolSetEntry | IChatRequestDirectoryEntry | IChatRequestFileEntry | INotebookOutputVariableEntry | IElementVariableEntry | IPromptFileVariableEntry | IPromptTextVariableEntry | ISCMHistoryItemVariableEntry | ISCMHistoryItemChangeVariableEntry | ISCMHistoryItemChangeRangeVariableEntry;
 export declare namespace IChatRequestVariableEntry {
     /**
      * Returns URI of the passed variant entry. Return undefined if not found.
@@ -138,6 +159,8 @@ export declare function isPromptFileVariableEntry(obj: IChatRequestVariableEntry
 export declare function isPromptTextVariableEntry(obj: IChatRequestVariableEntry): obj is IPromptTextVariableEntry;
 export declare function isChatRequestVariableEntry(obj: unknown): obj is IChatRequestVariableEntry;
 export declare function isSCMHistoryItemVariableEntry(obj: IChatRequestVariableEntry): obj is ISCMHistoryItemVariableEntry;
+export declare function isSCMHistoryItemChangeVariableEntry(obj: IChatRequestVariableEntry): obj is ISCMHistoryItemChangeVariableEntry;
+export declare function isSCMHistoryItemChangeRangeVariableEntry(obj: IChatRequestVariableEntry): obj is ISCMHistoryItemChangeRangeVariableEntry;
 export declare enum PromptFileVariableKind {
     Instruction = "vscode.prompt.instructions.root",
     InstructionReference = "vscode.prompt.instructions",
@@ -154,9 +177,11 @@ export declare enum PromptFileVariableKind {
  * @param uri A resource URI that points to a prompt instructions file.
  * @param kind The kind of the prompt file variable entry.
  */
-export declare function toPromptFileVariableEntry(uri: URI, kind: PromptFileVariableKind, originLabel?: string, automaticallyAdded?: boolean): IPromptFileVariableEntry;
-export declare function toPromptTextVariableEntry(content: string, automaticallyAdded?: boolean): IPromptTextVariableEntry;
+export declare function toPromptFileVariableEntry(uri: URI, kind: PromptFileVariableKind, originLabel?: string, automaticallyAdded?: boolean, toolReferences?: ChatRequestToolReferenceEntry[]): IPromptFileVariableEntry;
+export declare function toPromptTextVariableEntry(content: string, automaticallyAdded?: boolean, toolReferences?: ChatRequestToolReferenceEntry[]): IPromptTextVariableEntry;
 export declare function toFileVariableEntry(uri: URI, range?: IRange): IChatRequestFileEntry;
+export declare function toToolVariableEntry(entry: IToolData, range?: IOffsetRange): IChatRequestToolEntry;
+export declare function toToolSetVariableEntry(entry: ToolSet, range?: IOffsetRange): IChatRequestToolSetEntry;
 export declare class ChatRequestVariableSet {
     private _ids;
     private _entries;

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

@@ -1,6 +1,7 @@
 
 import { Codicon } from '../../../../base/common/codicons.js';
 import { basename } from '../../../../base/common/resources.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
 import { URI } from '../../../../base/common/uri.js';
 import { isLocation } from '../../../../editor/common/languages.js';
 import { localize } from '../../../../nls.js';
@@ -54,9 +55,9 @@ var IDiagnosticVariableEntryFilterData;
             }
             return data.problemMessage.substring(0, lastSpace) + '…';
         }
-        let labelStr = ( localize(5547, "All Problems"));
+        let labelStr = ( localize(5603, "All Problems"));
         if (data.filterUri) {
-            labelStr = ( localize(5548, "Problems in {0}", basename(data.filterUri)));
+            labelStr = ( localize(5604, "Problems in {0}", basename(data.filterUri)));
         }
         return labelStr;
     }
@@ -97,13 +98,19 @@ function isPromptTextVariableEntry(obj) {
 function isSCMHistoryItemVariableEntry(obj) {
     return obj.kind === 'scmHistoryItem';
 }
+function isSCMHistoryItemChangeVariableEntry(obj) {
+    return obj.kind === 'scmHistoryItemChange';
+}
+function isSCMHistoryItemChangeRangeVariableEntry(obj) {
+    return obj.kind === 'scmHistoryItemChangeRange';
+}
 var PromptFileVariableKind;
 (function (PromptFileVariableKind) {
     PromptFileVariableKind["Instruction"] = "vscode.prompt.instructions.root";
     PromptFileVariableKind["InstructionReference"] = "vscode.prompt.instructions";
     PromptFileVariableKind["PromptFile"] = "vscode.prompt.file";
 })(PromptFileVariableKind || (PromptFileVariableKind = {}));
-function toPromptFileVariableEntry(uri, kind, originLabel, automaticallyAdded = false) {
+function toPromptFileVariableEntry(uri, kind, originLabel, automaticallyAdded = false, toolReferences) {
     return {
         id: `${kind}__${( uri.toString())}`,
         name: `prompt:${basename(uri)}`,
@@ -112,17 +119,39 @@ function toPromptFileVariableEntry(uri, kind, originLabel, automaticallyAdded =
         modelDescription: 'Prompt instructions file',
         isRoot: kind !== PromptFileVariableKind.InstructionReference,
         originLabel,
+        toolReferences,
         automaticallyAdded
     };
 }
-function toPromptTextVariableEntry(content, automaticallyAdded = false) {
+function toPromptTextVariableEntry(content, automaticallyAdded = false, toolReferences) {
     return {
         id: `vscode.prompt.instructions.text`,
         name: `prompt:instructionsList`,
         value: content,
         kind: 'promptText',
         modelDescription: 'Prompt instructions list',
-        automaticallyAdded
+        automaticallyAdded,
+        toolReferences
+    };
+}
+function toToolVariableEntry(entry, range) {
+    return {
+        kind: 'tool',
+        id: entry.id,
+        icon: ThemeIcon.isThemeIcon(entry.icon) ? entry.icon : undefined,
+        name: entry.displayName,
+        value: undefined,
+        range
+    };
+}
+function toToolSetVariableEntry(entry, range) {
+    return {
+        kind: 'toolset',
+        id: entry.id,
+        icon: entry.icon,
+        name: entry.referenceName,
+        value: ( Array.from(entry.getTools()).map(t => toToolVariableEntry(t))),
+        range
     };
 }
 class ChatRequestVariableSet {
@@ -162,4 +191,4 @@ class ChatRequestVariableSet {
     }
 }
 
-export { ChatRequestVariableSet, IChatRequestVariableEntry, IDiagnosticVariableEntryFilterData, OmittedState, PromptFileVariableKind, isChatRequestFileEntry, isElementVariableEntry, isImageVariableEntry, isNotebookOutputVariableEntry, isPasteVariableEntry, isPromptFileVariableEntry, isPromptTextVariableEntry, isSCMHistoryItemVariableEntry, toPromptFileVariableEntry, toPromptTextVariableEntry };
+export { ChatRequestVariableSet, IChatRequestVariableEntry, IDiagnosticVariableEntryFilterData, OmittedState, PromptFileVariableKind, isChatRequestFileEntry, isElementVariableEntry, isImageVariableEntry, isNotebookOutputVariableEntry, isPasteVariableEntry, isPromptFileVariableEntry, isPromptTextVariableEntry, isSCMHistoryItemChangeRangeVariableEntry, isSCMHistoryItemChangeVariableEntry, isSCMHistoryItemVariableEntry, toPromptFileVariableEntry, toPromptTextVariableEntry, toToolSetVariableEntry, toToolVariableEntry };

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

@@ -1,5 +1,4 @@
 export declare enum ChatConfiguration {
-    UseFileStorage = "chat.useFileStorage",
     AgentEnabled = "chat.agent.enabled",
     Edits2Enabled = "chat.edits2.enabled",
     ExtensionToolsEnabled = "chat.extensionTools.enabled",
@@ -10,9 +9,11 @@ export declare enum ChatConfiguration {
     CheckpointsEnabled = "chat.checkpoints.enabled",
     AgentSessionsViewLocation = "chat.agentSessionsViewLocation",
     ThinkingStyle = "chat.agent.thinkingStyle",
-    UseChatSessionsForCloudButton = "chat.useChatSessionsForCloudButton",
+    TodoList = "chat.agent.todoList",
+    UseCloudButtonV2 = "chat.useCloudButtonV2",
     ShowAgentSessionsViewDescription = "chat.showAgentSessionsViewDescription",
-    EmptyStateHistoryEnabled = "chat.emptyState.history.enabled"
+    EmptyStateHistoryEnabled = "chat.emptyState.history.enabled",
+    NotifyWindowOnResponseReceived = "chat.notifyWindowOnResponseReceived"
 }
 /**
  * The "kind" of the chat mode- "Agent" for custom modes.
@@ -28,16 +29,25 @@ export declare enum ThinkingDisplayMode {
     Collapsed = "collapsed",
     CollapsedPreview = "collapsedPreview",
     Expanded = "expanded",
-    None = "none"
+    None = "none",
+    CollapsedPerItem = "collapsedPerItem"
 }
 export type RawChatParticipantLocation = "panel" | "terminal" | "notebook" | "editing-session";
 export declare enum ChatAgentLocation {
-    Panel = "panel",
+    /**
+     * This is chat, whether it's in the sidebar, a chat editor, or quick chat.
+     * Leaving the values alone as they are in stored data so we don't have to normalize them.
+     */
+    Chat = "panel",
     Terminal = "terminal",
     Notebook = "notebook",
-    Editor = "editor"
+    /**
+     * EditorInline means inline chat in a text editor.
+     */
+    EditorInline = "editor"
 }
 export declare namespace ChatAgentLocation {
     function fromRaw(value: RawChatParticipantLocation | string): ChatAgentLocation;
 }
 export declare const ChatUnsupportedFileSchemes: Set<string>;
+export declare const VIEWLET_ID = "workbench.view.chat.sessions";

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

@@ -3,7 +3,6 @@ import { Schemas } from '../../../../base/common/network.js';
 
 var ChatConfiguration;
 (function (ChatConfiguration) {
-    ChatConfiguration["UseFileStorage"] = "chat.useFileStorage";
     ChatConfiguration["AgentEnabled"] = "chat.agent.enabled";
     ChatConfiguration["Edits2Enabled"] = "chat.edits2.enabled";
     ChatConfiguration["ExtensionToolsEnabled"] = "chat.extensionTools.enabled";
@@ -14,9 +13,11 @@ var ChatConfiguration;
     ChatConfiguration["CheckpointsEnabled"] = "chat.checkpoints.enabled";
     ChatConfiguration["AgentSessionsViewLocation"] = "chat.agentSessionsViewLocation";
     ChatConfiguration["ThinkingStyle"] = "chat.agent.thinkingStyle";
-    ChatConfiguration["UseChatSessionsForCloudButton"] = "chat.useChatSessionsForCloudButton";
+    ChatConfiguration["TodoList"] = "chat.agent.todoList";
+    ChatConfiguration["UseCloudButtonV2"] = "chat.useCloudButtonV2";
     ChatConfiguration["ShowAgentSessionsViewDescription"] = "chat.showAgentSessionsViewDescription";
     ChatConfiguration["EmptyStateHistoryEnabled"] = "chat.emptyState.history.enabled";
+    ChatConfiguration["NotifyWindowOnResponseReceived"] = "chat.notifyWindowOnResponseReceived";
 })(ChatConfiguration || (ChatConfiguration = {}));
 var ChatModeKind;
 (function (ChatModeKind) {
@@ -40,28 +41,30 @@ var ThinkingDisplayMode;
     ThinkingDisplayMode["CollapsedPreview"] = "collapsedPreview";
     ThinkingDisplayMode["Expanded"] = "expanded";
     ThinkingDisplayMode["None"] = "none";
+    ThinkingDisplayMode["CollapsedPerItem"] = "collapsedPerItem";
 })(ThinkingDisplayMode || (ThinkingDisplayMode = {}));
 var ChatAgentLocation;
 (function (ChatAgentLocation) {
-    ChatAgentLocation["Panel"] = "panel";
+    ChatAgentLocation["Chat"] = "panel";
     ChatAgentLocation["Terminal"] = "terminal";
     ChatAgentLocation["Notebook"] = "notebook";
-    ChatAgentLocation["Editor"] = "editor";
+    ChatAgentLocation["EditorInline"] = "editor";
 })(ChatAgentLocation || (ChatAgentLocation = {}));
 (function (ChatAgentLocation) {
     function fromRaw(value) {
         switch (value) {
-            case 'panel': return ChatAgentLocation.Panel;
+            case 'panel': return ChatAgentLocation.Chat;
             case 'terminal': return ChatAgentLocation.Terminal;
             case 'notebook': return ChatAgentLocation.Notebook;
-            case 'editor': return ChatAgentLocation.Editor;
+            case 'editor': return ChatAgentLocation.EditorInline;
         }
-        return ChatAgentLocation.Panel;
+        return ChatAgentLocation.Chat;
     }
     ChatAgentLocation.fromRaw = fromRaw;
 })(ChatAgentLocation || (ChatAgentLocation = {}));
 const ChatUnsupportedFileSchemes = ( new Set(
     [Schemas.vscodeChatEditor, Schemas.walkThrough, Schemas.vscodeChatSession, 'ccreq']
 ));
+const VIEWLET_ID = 'workbench.view.chat.sessions';
 
-export { ChatAgentLocation, ChatConfiguration, ChatModeKind, ChatUnsupportedFileSchemes, ThinkingDisplayMode, validateChatMode };
+export { ChatAgentLocation, ChatConfiguration, ChatModeKind, ChatUnsupportedFileSchemes, ThinkingDisplayMode, VIEWLET_ID, validateChatMode };

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

@@ -37,8 +37,8 @@ export interface IToolData {
 }
 export interface IToolProgressStep {
     readonly message: string | IMarkdownString | undefined;
-    readonly increment?: number;
-    readonly total?: number;
+    /** 0-1 progress of the tool call */
+    readonly progress?: number;
 }
 export type ToolProgress = IProgress<IToolProgressStep>;
 export type ToolDataSource = {
@@ -82,6 +82,10 @@ export interface IToolInvocation {
     context: IToolInvocationContext | undefined;
     chatRequestId?: string;
     chatInteractionId?: string;
+    /**
+     * Lets us add some nicer UI to toolcalls that came from a sub-agent, but in the long run, this should probably just be rendered in a similar way to thinking text + tool call groups
+     */
+    fromSubAgent?: boolean;
     toolSpecificData?: IChatTerminalToolInvocationData | IChatToolInputInvocationData | IChatExtensionsContent | IChatTodoListContent;
     modelId?: string;
 }
@@ -102,6 +106,8 @@ export type ToolInputOutputBase = {
     uri?: URI;
     /** If true, this part came in as a resource reference rather than direct data. */
     asResource?: boolean;
+    /** Audience of the data part */
+    audience?: LanguageModelPartAudience[];
 };
 export type ToolInputOutputEmbedded = ToolInputOutputBase & {
     type: "embed";
@@ -132,6 +138,7 @@ export interface IToolResult {
     toolResultMessage?: string | IMarkdownString;
     toolResultDetails?: Array<URI | Location> | IToolResultInputOutputDetails | IToolResultOutputDetails;
     toolResultError?: string;
+    toolMetadata?: unknown;
 }
 export declare function toolResultHasBuffers(result: IToolResult): boolean;
 export interface IToolResultPromptTsxPart {

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

@@ -29,16 +29,16 @@ var ToolDataSource;
     ToolDataSource.equals = equals;
     function classify(source) {
         if (source.type === 'internal') {
-            return { ordinal: 1, label: ( localize(5552, 'Built-In')) };
+            return { ordinal: 1, label: ( localize(5608, 'Built-In')) };
         }
         else if (source.type === 'mcp') {
-            return { ordinal: 2, label: ( localize(5553, 'MCP Server: {0}', source.label)) };
+            return { ordinal: 2, label: ( localize(5609, 'MCP Server: {0}', source.label)) };
         }
         else if (source.type === 'user') {
-            return { ordinal: 0, label: ( localize(5554, 'User Defined')) };
+            return { ordinal: 0, label: ( localize(5610, 'User Defined')) };
         }
         else {
-            return { ordinal: 3, label: ( localize(5555, 'Extension: {0}', source.label)) };
+            return { ordinal: 3, label: ( localize(5611, 'Extension: {0}', source.label)) };
         }
     }
     ToolDataSource.classify = classify;

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

@@ -3,7 +3,9 @@ import { Event } from "../../../../base/common/event.js";
 import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { IObservable } from "../../../../base/common/observable.js";
 import { ThemeIcon } from "../../../../base/common/themables.js";
-import { IToolData, IToolImpl, IToolInvocation, CountTokensCallback, IToolResult, IToolAndToolSetEnablementMap, ToolSet, ToolDataSource } from "./languageModelToolsService.js";
+import { IVariableReference } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModes";
+import { ChatRequestToolReferenceEntry } from "./chatVariableEntries.js";
+import { IToolData, IToolImpl, IToolInvocation, CountTokensCallback, IToolResult, ToolSet, ToolDataSource, IToolAndToolSetEnablementMap } from "./languageModelToolsService.js";
 export declare const ILanguageModelToolsService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<ILanguageModelToolsService>;
 export interface ILanguageModelToolsService {
     _serviceBrand: undefined;
@@ -19,8 +21,6 @@ export interface ILanguageModelToolsService {
     getToolAutoConfirmation(toolId: string): "workspace" | "profile" | "session" | "never";
     resetToolAutoConfirmation(): void;
     cancelToolCallsForRequest(requestId: string): void;
-    toToolEnablementMap(toolOrToolSetNames: Set<string>): Record<string, boolean>;
-    toToolAndToolSetEnablementMap(toolOrToolSetNames: readonly string[]): IToolAndToolSetEnablementMap;
     readonly toolSets: IObservable<Iterable<ToolSet>>;
     getToolSet(id: string): ToolSet | undefined;
     getToolSetByName(name: string): ToolSet | undefined;
@@ -28,4 +28,11 @@ export interface ILanguageModelToolsService {
         icon?: ThemeIcon;
         description?: string;
     }): ToolSet & IDisposable;
+    getQualifiedToolNames(): Iterable<string>;
+    getToolByQualifiedName(qualifiedName: string): IToolData | ToolSet | undefined;
+    getQualifiedToolName(tool: IToolData, toolSet?: ToolSet): string;
+    getDeprecatedQualifiedToolNames(): Map<string, string>;
+    toToolAndToolSetEnablementMap(qualifiedToolOrToolSetNames: readonly string[]): IToolAndToolSetEnablementMap;
+    toQualifiedToolNames(map: IToolAndToolSetEnablementMap): string[];
+    toToolReferences(variableReferences: readonly IVariableReference[]): ChatRequestToolReferenceEntry[];
 }

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

@@ -8,6 +8,7 @@ import { IContextKeyService } from "../../../../platform/contextkey/common/conte
 import { ExtensionIdentifier } from "../../../../platform/extensions/common/extensions.js";
 import { ILogService } from "../../../../platform/log/common/log.service.js";
 import { IStorageService } from "../../../../platform/storage/common/storage.service.js";
+import { IChatEntitlementService } from "../../../services/chat/common/chatEntitlementService.service.js";
 import { IExtensionService } from "../../../services/extensions/common/extensions.service.js";
 import { ILanguageModelsService } from "./languageModels.service.js";
 export declare enum ChatMessageRole {
@@ -147,6 +148,7 @@ export interface ILanguageModelChatMetadata {
         readonly vision?: boolean;
         readonly toolCalling?: boolean;
         readonly agentMode?: boolean;
+        readonly editTools?: ReadonlyArray<string>;
     };
 }
 export declare namespace ILanguageModelChatMetadata {
@@ -198,24 +200,26 @@ export declare class LanguageModelsService implements ILanguageModelsService {
     private readonly _extensionService;
     private readonly _logService;
     private readonly _storageService;
+    private readonly _chatEntitlementService;
     readonly _serviceBrand: undefined;
     private readonly _store;
     private readonly _providers;
     private readonly _modelCache;
     private readonly _vendors;
-    private readonly _modelPickerUserPreferences;
+    private readonly _resolveLMSequencer;
+    private _modelPickerUserPreferences;
     private readonly _hasUserSelectableModels;
     private readonly _onLanguageModelChange;
     readonly onDidChangeLanguageModels: Event<void>;
-    constructor(_extensionService: IExtensionService, _logService: ILogService, _storageService: IStorageService, _contextKeyService: IContextKeyService);
-    private _hasStoredModelForvendor;
+    constructor(_extensionService: IExtensionService, _logService: ILogService, _storageService: IStorageService, _contextKeyService: IContextKeyService, _chatEntitlementService: IChatEntitlementService);
+    private _hasStoredModelForVendor;
     dispose(): void;
     updateModelPickerPreference(modelIdentifier: string, showInModelPicker: boolean): void;
     getVendors(): IUserFriendlyLanguageModel[];
     getLanguageModelIds(): string[];
     lookupLanguageModel(modelIdentifier: string): ILanguageModelChatMetadata | undefined;
     private _clearModelCache;
-    resolveLanguageModels(vendors: string | string[], silent: boolean): Promise<void>;
+    private _resolveLanguageModels;
     selectLanguageModels(selector: ILanguageModelChatSelector, allowPromptingUser?: boolean): Promise<string[]>;
     registerLanguageModelProvider(vendor: string, provider: ILanguageModelChatProvider): IDisposable;
     sendChatRequest(modelId: string, from: ExtensionIdentifier, messages: IChatMessage[], options: {