@codingame/monaco-vscode-api 17.2.1 → 18.0.0

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

@@ -4,18 +4,19 @@ import { Disposable, IDisposable } from "../../../../base/common/lifecycle.js";
 import { IObservable, ITransaction, ObservablePromise } from "../../../../base/common/observable.js";
 import { ThemeIcon } from "../../../../base/common/themables.js";
 import { URI, UriComponents, UriDto } from "../../../../base/common/uri.js";
-import { IOffsetRange } from "../../../../editor/common/core/offsetRange.js";
 import { IRange } from "../../../../editor/common/core/range.js";
+import { IOffsetRange } from "../../../../editor/common/core/ranges/offsetRange.js";
 import { Location, SymbolKind, TextEdit } from "../../../../editor/common/languages.js";
 import { ILogService } from "../../../../platform/log/common/log.service.js";
 import { IMarker, MarkerSeverity } from "../../../../platform/markers/common/markers.js";
 import { ICellEditOperation } from "../../notebook/common/notebookCommon.js";
+import { ISCMHistoryItem } from "../../scm/common/history.js";
 import { IChatAgentCommand, IChatAgentData, IChatAgentResult } from "./chatAgents.js";
 import { IChatAgentService } from "./chatAgents.service.js";
 import { IChatEditingSession } from "./chatEditingService.js";
 import { IChatEditingService } from "./chatEditingService.service.js";
 import { IParsedChatRequest } from "./chatParserTypes.js";
-import { ChatAgentVoteDirection, ChatAgentVoteDownReason, IChatAgentMarkdownContentWithVulnerability, IChatCodeCitation, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatEditingSessionAction, IChatExtensionsContent, IChatFollowup, IChatLocationData, IChatMarkdownContent, IChatNotebookEdit, IChatProgress, IChatProgressMessage, IChatResponseCodeblockUriPart, IChatResponseProgressFileTreeData, IChatTask, IChatTextEdit, IChatToolInvocation, IChatToolInvocationSerialized, IChatTreeData, IChatUndoStop, IChatUsedContext, IChatWarningMessage } from "./chatService.js";
+import { ChatAgentVoteDirection, ChatAgentVoteDownReason, IChatAgentMarkdownContentWithVulnerability, IChatCodeCitation, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatEditingSessionAction, IChatExtensionsContent, IChatFollowup, IChatLocationData, IChatMarkdownContent, IChatNotebookEdit, IChatPrepareToolInvocationPart, IChatProgress, IChatProgressMessage, IChatResponseCodeblockUriPart, IChatResponseProgressFileTreeData, IChatTask, IChatTaskSerialized, IChatTextEdit, IChatToolInvocation, IChatToolInvocationSerialized, IChatTreeData, IChatUndoStop, IChatUsedContext, IChatWarningMessage } from "./chatService.js";
 import { IChatRequestVariableValue } from "./chatVariables.js";
 import { ChatAgentLocation } from "./constants.js";
 interface IBaseChatRequestVariableEntry {
@@ -46,6 +47,10 @@ export declare enum OmittedState {
 export interface IChatRequestToolEntry extends IBaseChatRequestVariableEntry {
     readonly kind: "tool";
 }
+export interface IChatRequestToolSetEntry extends IBaseChatRequestVariableEntry {
+    readonly kind: "toolset";
+    readonly value: IChatRequestToolEntry[];
+}
 export interface IChatRequestImplicitVariableEntry extends IBaseChatRequestVariableEntry {
     readonly kind: "implicit";
     readonly isFile: true;
@@ -110,7 +115,18 @@ export interface IDiagnosticVariableEntry extends IBaseChatRequestVariableEntry,
 export interface IElementVariableEntry extends IBaseChatRequestVariableEntry {
     readonly kind: "element";
 }
-export type IChatRequestVariableEntry = IGenericChatRequestVariableEntry | IChatRequestImplicitVariableEntry | IChatRequestPasteVariableEntry | ISymbolVariableEntry | ICommandResultVariableEntry | IDiagnosticVariableEntry | IImageVariableEntry | IChatRequestToolEntry | IChatRequestDirectoryEntry | IChatRequestFileEntry | INotebookOutputVariableEntry | IElementVariableEntry;
+export interface IPromptFileVariableEntry extends IBaseChatRequestVariableEntry {
+    readonly kind: "promptFile";
+}
+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 | ISCMHistoryItemVariableEntry;
+export declare namespace IChatRequestVariableEntry {
+    function toUri(entry: IChatRequestVariableEntry): URI | undefined;
+}
 export declare function isImplicitVariableEntry(obj: IChatRequestVariableEntry): obj is IChatRequestImplicitVariableEntry;
 export declare function isPasteVariableEntry(obj: IChatRequestVariableEntry): obj is IChatRequestPasteVariableEntry;
 export declare function isImageVariableEntry(obj: IChatRequestVariableEntry): obj is IImageVariableEntry;
@@ -119,6 +135,9 @@ export declare function isElementVariableEntry(obj: IChatRequestVariableEntry):
 export declare function isDiagnosticsVariableEntry(obj: IChatRequestVariableEntry): obj is IDiagnosticVariableEntry;
 export declare function isChatRequestFileEntry(obj: IChatRequestVariableEntry): obj is IChatRequestFileEntry;
 export declare function isChatRequestVariableEntry(obj: unknown): obj is IChatRequestVariableEntry;
+export declare function isSCMHistoryItemVariableEntry(obj: IChatRequestVariableEntry): obj is ISCMHistoryItemVariableEntry;
+export declare const CHAT_ATTACHABLE_IMAGE_MIME_TYPES: Record<string, string>;
+export declare function getAttachableImageExtension(mimeType: string): string | undefined;
 export interface IChatRequestVariableData {
     variables: IChatRequestVariableEntry[];
 }
@@ -162,8 +181,8 @@ export interface IChatNotebookEditGroup {
     kind: "notebookEditGroup";
     done: boolean | undefined;
 }
-export type IChatProgressHistoryResponseContent = IChatMarkdownContent | IChatAgentMarkdownContentWithVulnerability | IChatResponseCodeblockUriPart | IChatTreeData | IChatContentInlineReference | IChatProgressMessage | IChatCommandButton | IChatWarningMessage | IChatTask | IChatTextEditGroup | IChatNotebookEditGroup | IChatConfirmation | IChatExtensionsContent;
-export type IChatProgressResponseContent = IChatProgressHistoryResponseContent | IChatToolInvocation | IChatToolInvocationSerialized | IChatUndoStop;
+export type IChatProgressHistoryResponseContent = IChatMarkdownContent | IChatAgentMarkdownContentWithVulnerability | IChatResponseCodeblockUriPart | IChatTreeData | IChatContentInlineReference | IChatProgressMessage | IChatCommandButton | IChatWarningMessage | IChatTask | IChatTaskSerialized | IChatTextEditGroup | IChatNotebookEditGroup | IChatConfirmation | IChatExtensionsContent;
+export type IChatProgressResponseContent = IChatProgressHistoryResponseContent | IChatToolInvocation | IChatToolInvocationSerialized | IChatUndoStop | IChatPrepareToolInvocationPart;
 export declare function toChatHistoryContent(content: ReadonlyArray<IChatProgressResponseContent>): IChatProgressHistoryResponseContent[];
 export type IChatProgressRenderableResponseContent = Exclude<IChatProgressResponseContent, IChatContentInlineReference | IChatAgentMarkdownContentWithVulnerability | IChatResponseCodeblockUriPart>;
 export interface IResponse {
@@ -190,7 +209,8 @@ export interface IChatResponseModel {
     readonly isComplete: boolean;
     readonly isCanceled: boolean;
     readonly isPaused: IObservable<boolean>;
-    readonly isPendingConfirmation: boolean;
+    readonly isPendingConfirmation: IObservable<boolean>;
+    readonly isInProgress: IObservable<boolean>;
     readonly shouldBeRemovedOnSend: IChatRequestDisablement | undefined;
     readonly isCompleteAddedRequest: boolean;
     readonly isStale: boolean;
@@ -273,7 +293,7 @@ export declare class Response extends AbstractResponse implements IDisposable {
     constructor(value: IMarkdownString | ReadonlyArray<IMarkdownString | IChatResponseProgressFileTreeData | IChatContentInlineReference | IChatAgentMarkdownContentWithVulnerability | IChatResponseCodeblockUriPart>);
     dispose(): void;
     clear(): void;
-    updateContent(progress: IChatProgressResponseContent | IChatTextEdit | IChatNotebookEdit | IChatTask | IChatUndoStop, quiet?: boolean): void;
+    updateContent(progress: IChatProgressResponseContent | IChatTextEdit | IChatNotebookEdit | IChatTask, quiet?: boolean): void;
     addCitation(citation: IChatCodeCitation): void;
     protected _updateRepr(quiet?: boolean): void;
 }
@@ -337,9 +357,10 @@ export declare class ChatResponseModel extends Disposable implements IChatRespon
     get progressMessages(): ReadonlyArray<IChatProgressMessage>;
     private _isStale;
     get isStale(): boolean;
-    private _isPaused;
+    private readonly _isPaused;
     get isPaused(): IObservable<boolean>;
-    get isPendingConfirmation(): boolean;
+    readonly isPendingConfirmation: IObservable<boolean>;
+    readonly isInProgress: IObservable<boolean>;
     private _responseView?;
     get response(): IResponse;
     private bufferedPauseContent?;
@@ -374,11 +395,10 @@ export interface IChatModel {
     readonly onDidDispose: Event<void>;
     readonly onDidChange: Event<IChatChangeEvent>;
     readonly sessionId: string;
-    readonly initState: ChatModelInitState;
     readonly initialLocation: ChatAgentLocation;
     readonly title: string;
-    readonly sampleQuestions: IChatFollowup[] | undefined;
     readonly requestInProgress: boolean;
+    readonly requestInProgressObs: IObservable<boolean>;
     readonly requestPausibility: ChatPauseState;
     readonly inputPlaceholder?: string;
     readonly editingSessionObs?: ObservablePromise<IChatEditingSession> | undefined;
@@ -489,11 +509,6 @@ export interface IChatSetAgentEvent {
 export interface IChatInitEvent {
     kind: "initialize";
 }
-export declare enum ChatModelInitState {
-    Created = 0,
-    Initializing = 1,
-    Initialized = 2
-}
 export declare class ChatModel extends Disposable implements IChatModel {
     private readonly initialData;
     private readonly _initialLocation;
@@ -506,13 +521,10 @@ export declare class ChatModel extends Disposable implements IChatModel {
     private readonly _onDidChange;
     readonly onDidChange: Event<IChatChangeEvent>;
     private _requests;
-    private _initState;
-    private _isInitializedDeferred;
-    private _sampleQuestions;
-    get sampleQuestions(): IChatFollowup[] | undefined;
     private _sessionId;
     get sessionId(): string;
     get requestInProgress(): boolean;
+    readonly requestInProgressObs: IObservable<boolean>;
     get requestPausibility(): ChatPauseState;
     get hasRequests(): boolean;
     get lastRequest(): ChatRequestModel | undefined;
@@ -527,7 +539,6 @@ export declare class ChatModel extends Disposable implements IChatModel {
     get requesterAvatarIconUri(): URI | undefined;
     private readonly _initialResponderAvatarIconUri;
     get responderAvatarIcon(): ThemeIcon | URI | undefined;
-    get initState(): ChatModelInitState;
     private _isImported;
     get isImported(): boolean;
     private _customTitle;
@@ -545,11 +556,6 @@ export declare class ChatModel extends Disposable implements IChatModel {
     private reviveVariableData;
     private getParsedRequestFromString;
     toggleLastRequestPaused(isPaused?: boolean): void;
-    startInitialize(): void;
-    deinitialize(): void;
-    initialize(sampleQuestions?: IChatFollowup[]): void;
-    setInitializationError(error: Error): void;
-    waitForInitialization(): Promise<void>;
     getRequests(): ChatRequestModel[];
     private _checkpoint;
     get checkpoint(): ChatRequestModel | undefined;
@@ -582,4 +588,14 @@ export interface IChatAgentEditedFileEvent {
     readonly uri: URI;
     readonly eventKind: ChatRequestEditedFileEventKind;
 }
+export declare namespace ChatResponseResource {
+    const scheme = "vscode-chat-response-resource";
+    function createUri(sessionId: string, requestId: string, toolCallId: string, index: number, basename?: string): URI;
+    function parseUri(uri: URI): undefined | {
+        sessionId: string;
+        requestId: string;
+        toolCallId: string;
+        index: number;
+    };
+}
 export {};

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

@@ -1,7 +1,6 @@
 
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { asArray } from '../../../../base/common/arrays.js';
-import { DeferredPromise } from '../../../../base/common/async.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { isMarkdownString, MarkdownString } from '../../../../base/common/htmlContent.js';
@@ -14,8 +13,8 @@ import '../../../../base/common/observableInternal/index.js';
 import { basename, isEqual } from '../../../../base/common/resources.js';
 import { URI, isUriComponents } from '../../../../base/common/uri.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
-import { OffsetRange } from '../../../../editor/common/core/offsetRange.js';
-import { TextEdit } from '../../../../editor/common/languages.js';
+import { OffsetRange } from '../../../../editor/common/core/ranges/offsetRange.js';
+import { isLocation, TextEdit } from '../../../../editor/common/languages.js';
 import { localize } from '../../../../nls.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { CellUri } from '../../notebook/common/notebookCommon.js';
@@ -25,8 +24,10 @@ import { IChatEditingService } from './chatEditingService.service.js';
 import { reviveParsedChatRequest, ChatRequestTextPart } from './chatParserTypes.js';
 import { isIUsedContext } from './chatService.js';
 import { ChatAgentLocation, ChatMode } from './constants.js';
-import { ObservablePromise } from '../../../../base/common/observableInternal/promise.js';
-import { observableValue } from '../../../../base/common/observableInternal/base.js';
+import { observableSignalFromEvent } from '../../../../base/common/observableInternal/observables/observableSignalFromEvent.js';
+import { observableFromEvent } from '../../../../base/common/observableInternal/observables/observableFromEvent.js';
+import { ObservablePromise } from '../../../../base/common/observableInternal/utils/promise.js';
+import { observableValue } from '../../../../base/common/observableInternal/observables/observableValue.js';
 
 var ChatModel_1;
 var OmittedState;
@@ -78,14 +79,25 @@ var IDiagnosticVariableEntryFilterData;
             }
             return data.problemMessage.substring(0, lastSpace) + '…';
         }
-        let labelStr = ( localize(5048, "All Problems"));
+        let labelStr = ( localize(5153, "All Problems"));
         if (data.filterUri) {
-            labelStr = ( localize(5049, "Problems in {0}", basename(data.filterUri)));
+            labelStr = ( localize(5154, "Problems in {0}", basename(data.filterUri)));
         }
         return labelStr;
     }
     IDiagnosticVariableEntryFilterData.label = label;
 })(IDiagnosticVariableEntryFilterData || (IDiagnosticVariableEntryFilterData = {}));
+var IChatRequestVariableEntry;
+(function (IChatRequestVariableEntry) {
+    function toUri(entry) {
+        return URI.isUri(entry.value)
+            ? entry.value
+            : isLocation(entry.value)
+                ? entry.value.uri
+                : undefined;
+    }
+    IChatRequestVariableEntry.toUri = toUri;
+})(IChatRequestVariableEntry || (IChatRequestVariableEntry = {}));
 function isPasteVariableEntry(obj) {
     return obj.kind === 'paste';
 }
@@ -101,11 +113,26 @@ function isElementVariableEntry(obj) {
 function isChatRequestFileEntry(obj) {
     return obj.kind === 'file';
 }
+function isSCMHistoryItemVariableEntry(obj) {
+    return obj.kind === 'scmHistoryItem';
+}
+const CHAT_ATTACHABLE_IMAGE_MIME_TYPES = {
+    png: 'image/png',
+    jpg: 'image/jpeg',
+    jpeg: 'image/jpeg',
+    gif: 'image/gif',
+    webp: 'image/webp',
+};
+function getAttachableImageExtension(mimeType) {
+    return Object.entries(CHAT_ATTACHABLE_IMAGE_MIME_TYPES).find(([_, value]) => value === mimeType)?.[0];
+}
 function isCellTextEditOperation(value) {
     const candidate = value;
     return !!candidate && !!candidate.edit && !!candidate.uri && URI.isUri(candidate.uri);
 }
-const nonHistoryKinds = ( new Set(['toolInvocation', 'toolInvocationSerialized']));
+const nonHistoryKinds = ( new Set(
+    ['toolInvocation', 'toolInvocationSerialized', 'undoStop', 'prepareToolInvocation']
+));
 function isChatProgressHistoryResponseContent(content) {
     return !( nonHistoryKinds.has(content.kind));
 }
@@ -207,6 +234,7 @@ class AbstractResponse {
                 case 'toolInvocationSerialized':
                 case 'extensions':
                 case 'undoStop':
+                case 'prepareToolInvocation':
                     continue;
                 case 'inlineReference':
                     segment = { text: this.inlineRefToRepr(part) };
@@ -216,7 +244,7 @@ class AbstractResponse {
                     break;
                 case 'textEditGroup':
                 case 'notebookEditGroup':
-                    segment = { text: ( localize(5050, "Made changes.")), isBlock: true };
+                    segment = { text: ( localize(5155, "Made changes.")), isBlock: true };
                     break;
                 case 'confirmation':
                     segment = { text: `${part.title}\n${part.message}`, isBlock: true };
@@ -258,7 +286,10 @@ class AbstractResponse {
 }
 class ResponseView extends AbstractResponse {
     constructor(_response, undoStop) {
-        const idx = _response.value.findIndex(v => v.kind === 'undoStop' && v.id === undoStop);
+        let idx = _response.value.findIndex(v => v.kind === 'undoStop' && v.id === undoStop);
+        if (_response.value[idx + 1]?.kind === 'codeblockUri' && _response.value[idx - 1]?.kind === 'markdownContent') {
+            idx--;
+        }
         super(idx === -1 ? _response.value.slice() : _response.value.slice(0, idx));
         this.undoStop = undoStop;
     }
@@ -431,10 +462,6 @@ class ChatResponseModel extends Disposable {
     get isPaused() {
         return this._isPaused;
     }
-    get isPendingConfirmation() {
-        return ( this._response.value.some(part => part.kind === 'toolInvocation' && part.isConfirmed === undefined
-            || part.kind === 'confirmation' && part.isUsed === false));
-    }
     get response() {
         const undoStop = this._shouldBeRemovedOnSend?.afterUndoStop;
         if (!undoStop) {
@@ -468,6 +495,18 @@ class ChatResponseModel extends Disposable {
         this._shouldBeRemovedOnSend = params.shouldBeRemovedOnSend;
         this._isStale = Array.isArray(params.responseContent) && (params.responseContent.length !== 0 || isMarkdownString(params.responseContent) && params.responseContent.value.length !== 0);
         this._response = this._register(( new Response(params.responseContent)));
+        const signal = observableSignalFromEvent(this, this.onDidChange);
+        this.isPendingConfirmation = ( signal.map((_value, r) => {
+            signal.read(r);
+            return ( this._response.value.some(part => part.kind === 'toolInvocation' && part.isConfirmed === undefined
+                || part.kind === 'confirmation' && part.isUsed === false));
+        }));
+        this.isInProgress = ( signal.map((_value, r) => {
+            signal.read(r);
+            return !this.isPendingConfirmation.read(r)
+                && !this.shouldBeRemovedOnSend
+                && !this._isComplete;
+        }));
         this._register(this._response.onDidChangeValue(() => this._onDidChange.fire(defaultChatResponseModelChangeReason)));
         this.id = params.restoredId ?? 'response_' + generateUuid();
     }
@@ -628,12 +667,6 @@ var ChatRequestRemovalReason;
     ChatRequestRemovalReason[ChatRequestRemovalReason["Resend"] = 1] = "Resend";
     ChatRequestRemovalReason[ChatRequestRemovalReason["Adoption"] = 2] = "Adoption";
 })(ChatRequestRemovalReason || (ChatRequestRemovalReason = {}));
-var ChatModelInitState;
-(function (ChatModelInitState) {
-    ChatModelInitState[ChatModelInitState["Created"] = 0] = "Created";
-    ChatModelInitState[ChatModelInitState["Initializing"] = 1] = "Initializing";
-    ChatModelInitState[ChatModelInitState["Initialized"] = 2] = "Initialized";
-})(ChatModelInitState || (ChatModelInitState = {}));
 let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
     static getDefaultTitle(requests) {
         const firstRequestMessage = requests.at(0)?.message ?? '';
@@ -642,25 +675,15 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
             firstRequestMessage.text;
         return message.split('\n')[0].substring(0, 50);
     }
-    get sampleQuestions() {
-        return this._sampleQuestions;
-    }
     get sessionId() {
         return this._sessionId;
     }
     get requestInProgress() {
-        const lastRequest = this.lastRequest;
-        if (!lastRequest?.response) {
-            return false;
-        }
-        if (lastRequest.response.isPendingConfirmation) {
-            return false;
-        }
-        return !lastRequest.response.isComplete;
+        return this.requestInProgressObs.get();
     }
     get requestPausibility() {
         const lastRequest = this.lastRequest;
-        if (!lastRequest?.response?.agent || lastRequest.response.isComplete || lastRequest.response.isPendingConfirmation) {
+        if (!lastRequest?.response?.agent || lastRequest.response.isComplete || lastRequest.response.isPendingConfirmation.get()) {
             return ChatPauseState.NotPausable;
         }
         return lastRequest.response.isPaused.get() ? ChatPauseState.Paused : ChatPauseState.Unpaused;
@@ -696,9 +719,6 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
         return this._defaultAgent?.metadata.themeIcon ??
             this._initialResponderAvatarIconUri;
     }
-    get initState() {
-        return this._initState;
-    }
     get isImported() {
         return this._isImported;
     }
@@ -728,8 +748,6 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
         this.onDidDispose = this._onDidDispose.event;
         this._onDidChange = this._register(( new Emitter()));
         this.onDidChange = this._onDidChange.event;
-        this._initState = ChatModelInitState.Created;
-        this._isInitializedDeferred = ( new DeferredPromise());
         this._isImported = false;
         this.currentEditedFileEvents = ( new ResourceMap());
         this._checkpoint = undefined;
@@ -745,6 +763,10 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
         this._customTitle = isValid ? initialData.customTitle : undefined;
         this._initialRequesterAvatarIconUri = initialData?.requesterAvatarIconUri && URI.revive(initialData.requesterAvatarIconUri);
         this._initialResponderAvatarIconUri = isUriComponents(initialData?.responderAvatarIconUri) ? URI.revive(initialData.responderAvatarIconUri) : initialData?.responderAvatarIconUri;
+        const lastResponse = observableFromEvent(this, this.onDidChange, () => this._requests.at(-1)?.response);
+        this.requestInProgressObs = ( lastResponse.map((response, r) => {
+            return response?.isInProgress.read(r) ?? false;
+        }));
     }
     startEditingSession(isGlobalEditingSession) {
         const editingSessionPromise = isGlobalEditingSession ?
@@ -859,42 +881,6 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
             this._onDidChange.fire({ kind: 'changedRequest', request: this.lastRequest });
         }
     }
-    startInitialize() {
-        if (this.initState !== ChatModelInitState.Created) {
-            throw ( new Error(
-                `ChatModel is in the wrong state for startInitialize: ${ChatModelInitState[this.initState]}`
-            ));
-        }
-        this._initState = ChatModelInitState.Initializing;
-    }
-    deinitialize() {
-        this._initState = ChatModelInitState.Created;
-        this._isInitializedDeferred = ( new DeferredPromise());
-    }
-    initialize(sampleQuestions) {
-        if (this.initState !== ChatModelInitState.Initializing) {
-            throw ( new Error(
-                `ChatModel is in the wrong state for initialize: ${ChatModelInitState[this.initState]}`
-            ));
-        }
-        this._initState = ChatModelInitState.Initialized;
-        this._sampleQuestions = sampleQuestions;
-        this._isInitializedDeferred.complete();
-        this._onDidChange.fire({ kind: 'initialize' });
-    }
-    setInitializationError(error) {
-        if (this.initState !== ChatModelInitState.Initializing) {
-            throw ( new Error(
-                `ChatModel is in the wrong state for setInitializationError: ${ChatModelInitState[this.initState]}`
-            ));
-        }
-        if (!this._isInitializedDeferred.isSettled) {
-            this._isInitializedDeferred.error(error);
-        }
-    }
-    waitForInitialization() {
-        return this._isInitializedDeferred.p;
-    }
     getRequests() {
         return this._requests;
     }
@@ -974,23 +960,7 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
         if (request.response.isComplete) {
             throw ( new Error('acceptResponseProgress: Adding progress to a completed response'));
         }
-        if (progress.kind === 'markdownContent' ||
-            progress.kind === 'treeData' ||
-            progress.kind === 'inlineReference' ||
-            progress.kind === 'codeblockUri' ||
-            progress.kind === 'markdownVuln' ||
-            progress.kind === 'progressMessage' ||
-            progress.kind === 'command' ||
-            progress.kind === 'textEdit' ||
-            progress.kind === 'notebookEdit' ||
-            progress.kind === 'warning' ||
-            progress.kind === 'progressTask' ||
-            progress.kind === 'confirmation' ||
-            progress.kind === 'extensions' ||
-            progress.kind === 'toolInvocation') {
-            request.response.updateContent(progress, quiet);
-        }
-        else if (progress.kind === 'usedContext' || progress.kind === 'reference') {
+        if (progress.kind === 'usedContext' || progress.kind === 'reference') {
             request.response.applyReference(progress);
         }
         else if (progress.kind === 'codeCitation') {
@@ -999,12 +969,16 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
         else if (progress.kind === 'move') {
             this._onDidChange.fire({ kind: 'move', target: progress.uri, range: progress.range });
         }
-        else if (progress.kind === 'undoStop') {
-            request.response.addUndoStop(progress);
+        else if (progress.kind === 'codeblockUri' && progress.isEdit) {
+            request.response.addUndoStop({ id: generateUuid(), kind: 'undoStop' });
+            request.response.updateContent(progress, quiet);
         }
-        else {
+        else if (progress.kind === 'progressTaskResult') {
             this.logService.error(`Couldn't handle progress: ${JSON.stringify(progress)}`);
         }
+        else {
+            request.response.updateContent(progress, quiet);
+        }
     }
     removeRequest(id, reason = ChatRequestRemovalReason.Removal) {
         const index = this._requests.findIndex(request => request.id === id);
@@ -1165,8 +1139,8 @@ function getCodeCitationsMessage(citations) {
     }
     const licenseTypes = citations.reduce((set, c) => set.add(c.license), ( new Set()));
     const label = licenseTypes.size === 1 ?
-        ( localize(5051, "Similar code found with 1 license type", licenseTypes.size)) :
-        ( localize(5052, "Similar code found with {0} license types", licenseTypes.size));
+        ( localize(5156, "Similar code found with 1 license type", licenseTypes.size)) :
+        ( localize(5157, "Similar code found with {0} license types", licenseTypes.size));
     return label;
 }
 var ChatRequestEditedFileEventKind;
@@ -1175,5 +1149,37 @@ var ChatRequestEditedFileEventKind;
     ChatRequestEditedFileEventKind[ChatRequestEditedFileEventKind["Undo"] = 2] = "Undo";
     ChatRequestEditedFileEventKind[ChatRequestEditedFileEventKind["UserModification"] = 3] = "UserModification";
 })(ChatRequestEditedFileEventKind || (ChatRequestEditedFileEventKind = {}));
+var ChatResponseResource;
+(function (ChatResponseResource) {
+    ChatResponseResource.scheme = 'vscode-chat-response-resource';
+    function createUri(sessionId, requestId, toolCallId, index, basename) {
+        return ( URI.from({
+            scheme: ChatResponseResource.scheme,
+            authority: sessionId,
+            path: `/tool/${requestId}/${toolCallId}/${index}` + (basename ? `/${basename}` : ''),
+        }));
+    }
+    ChatResponseResource.createUri = createUri;
+    function parseUri(uri) {
+        if (uri.scheme !== ChatResponseResource.scheme) {
+            return undefined;
+        }
+        const parts = uri.path.split('/');
+        if (parts.length < 5) {
+            return undefined;
+        }
+        const [, kind, requestId, toolCallId, index] = parts;
+        if (kind !== 'tool') {
+            return undefined;
+        }
+        return {
+            sessionId: uri.authority,
+            requestId: requestId,
+            toolCallId: toolCallId,
+            index: Number(index),
+        };
+    }
+    ChatResponseResource.parseUri = parseUri;
+})(ChatResponseResource || (ChatResponseResource = {}));
 
-export { ChatModel, ChatModelInitState, ChatPauseState, ChatRequestEditedFileEventKind, ChatRequestModel, ChatRequestRemovalReason, ChatResponseModel, IDiagnosticVariableEntryFilterData, OmittedState, Response, appendMarkdownString, canMergeMarkdownStrings, getCodeCitationsMessage, isCellTextEditOperation, isChatRequestFileEntry, isElementVariableEntry, isExportableSessionData, isImageVariableEntry, isNotebookOutputVariableEntry, isPasteVariableEntry, isSerializableSessionData, normalizeSerializableChatData, toChatHistoryContent, updateRanges };
+export { CHAT_ATTACHABLE_IMAGE_MIME_TYPES, ChatModel, ChatPauseState, ChatRequestEditedFileEventKind, ChatRequestModel, ChatRequestRemovalReason, ChatResponseModel, ChatResponseResource, IChatRequestVariableEntry, IDiagnosticVariableEntryFilterData, OmittedState, Response, appendMarkdownString, canMergeMarkdownStrings, getAttachableImageExtension, getCodeCitationsMessage, isCellTextEditOperation, isChatRequestFileEntry, isElementVariableEntry, isExportableSessionData, isImageVariableEntry, isNotebookOutputVariableEntry, isPasteVariableEntry, isSCMHistoryItemVariableEntry, isSerializableSessionData, normalizeSerializableChatData, toChatHistoryContent, updateRanges };

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

@@ -1,9 +1,9 @@
 import { ThemeIcon } from "../../../../base/common/themables.js";
-import { IOffsetRange, OffsetRange } from "../../../../editor/common/core/offsetRange.js";
+import { IOffsetRange, OffsetRange } from "../../../../editor/common/core/ranges/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 { IChatRequestToolEntry, IChatRequestToolSetEntry, 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";
@@ -48,7 +48,21 @@ export declare class ChatRequestToolPart implements IParsedChatRequestPart {
     constructor(range: OffsetRange, editorRange: IRange, toolName: string, toolId: string, displayName?: string | undefined, icon?: IToolData["icon"]);
     get text(): string;
     get promptText(): string;
-    toVariableEntry(): IChatRequestVariableEntry;
+    toVariableEntry(): IChatRequestToolEntry;
+}
+export declare class ChatRequestToolSetPart implements IParsedChatRequestPart {
+    readonly range: OffsetRange;
+    readonly editorRange: IRange;
+    readonly id: string;
+    readonly name: string;
+    readonly icon: ThemeIcon;
+    readonly tools: IChatRequestToolEntry[];
+    static readonly Kind = "toolset";
+    readonly kind = "toolset";
+    constructor(range: OffsetRange, editorRange: IRange, id: string, name: string, icon: ThemeIcon, tools: IChatRequestToolEntry[]);
+    get text(): string;
+    get promptText(): string;
+    toVariableEntry(): IChatRequestToolSetEntry;
 }
 export declare class ChatRequestAgentPart implements IParsedChatRequestPart {
     readonly range: OffsetRange;

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

@@ -1,7 +1,7 @@
 
 import { revive } from '../../../../base/common/marshalling.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
-import { OffsetRange } from '../../../../editor/common/core/offsetRange.js';
+import { OffsetRange } from '../../../../editor/common/core/ranges/offsetRange.js';
 import { reviveSerializedAgent } from './chatAgents.js';
 import { IDiagnosticVariableEntryFilterData } from './chatModel.js';
 
@@ -64,6 +64,27 @@ class ChatRequestToolPart {
         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 ChatRequestToolSetPart {
+    static { this.Kind = 'toolset'; }
+    constructor(range, editorRange, id, name, icon, tools) {
+        this.range = range;
+        this.editorRange = editorRange;
+        this.id = id;
+        this.name = name;
+        this.icon = icon;
+        this.tools = tools;
+        this.kind = ChatRequestToolSetPart.Kind;
+    }
+    get text() {
+        return `${chatVariableLeader}${this.name}`;
+    }
+    get promptText() {
+        return this.text;
+    }
+    toVariableEntry() {
+        return { kind: 'toolset', id: this.id, name: this.name, range: this.range, icon: this.icon, value: this.tools };
+    }
+}
 class ChatRequestAgentPart {
     static { this.Kind = 'agent'; }
     constructor(range, editorRange, agent) {
@@ -165,6 +186,9 @@ function reviveParsedChatRequest(serialized) {
             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 === ChatRequestToolSetPart.Kind) {
+                return ( new ChatRequestToolSetPart(( new OffsetRange(part.range.start, part.range.endExclusive)), part.editorRange, part.id, part.name, part.icon, part.tools ?? []));
+            }
             else if (part.kind === ChatRequestAgentPart.Kind) {
                 let agent = part.agent;
                 agent = reviveSerializedAgent(agent);
@@ -208,4 +232,4 @@ function formatChatQuestion(chatAgentService, location, prompt, participant = nu
     return question + prompt;
 }
 
-export { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestDynamicVariablePart, ChatRequestSlashCommandPart, ChatRequestSlashPromptPart, ChatRequestTextPart, ChatRequestToolPart, chatAgentLeader, chatSubcommandLeader, chatVariableLeader, extractAgentAndCommand, formatChatQuestion, getPromptText, reviveParsedChatRequest };
+export { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestDynamicVariablePart, ChatRequestSlashCommandPart, ChatRequestSlashPromptPart, ChatRequestTextPart, ChatRequestToolPart, ChatRequestToolSetPart, chatAgentLeader, chatSubcommandLeader, chatVariableLeader, extractAgentAndCommand, formatChatQuestion, getPromptText, reviveParsedChatRequest };