@codingame/monaco-vscode-api 37.6.0 → 38.0.0

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

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import { asArray } from '../../../../../base/common/arrays.js';
+import { asArray, equals as equals$1 } from '../../../../../base/common/arrays.js';
 import { BugIndicatingError } from '../../../../../base/common/errors.js';
 import { encodeHex, VSBuffer, decodeHex } from '../../../../../base/common/buffer.js';
 import { Emitter } from '../../../../../base/common/event.js';
@@ -8,12 +8,13 @@ import { MarkdownString, appendEscapedMarkdownInlineCode, isMarkdownString } fro
 import { DisposableStore, Disposable, MutableDisposable } from '../../../../../base/common/lifecycle.js';
 import { ResourceMap } from '../../../../../base/common/map.js';
 import { revive } from '../../../../../base/common/marshalling.js';
+import { MarshalledId } from '../../../../../base/common/marshallingIds.js';
 import { Schemas } from '../../../../../base/common/network.js';
 import { equals } from '../../../../../base/common/objects.js';
 import '../../../../../base/common/observableInternal/index.js';
 import { basename, isEqual } from '../../../../../base/common/resources.js';
 import { hasKey } from '../../../../../base/common/types.js';
-import { URI } from '../../../../../base/common/uri.js';
+import { URI, isUriComponents } from '../../../../../base/common/uri.js';
 import { generateUuid } from '../../../../../base/common/uuid.js';
 import { OffsetRange } from '../../../../../editor/common/core/ranges/offsetRange.js';
 import { localize } from '../../../../../nls.js';
@@ -23,15 +24,16 @@ import { ILogService } from '../../../../../platform/log/common/log.service.js';
 import { CellUri } from '../../../notebook/common/notebookCommon.js';
 import { IChatRequestVariableEntry, isStringVariableEntry, isImplicitVariableEntry, isStringImplicitContextValue } from '../attachments/chatVariableEntries.js';
 import { migrateLegacyTerminalToolSpecificData } from '../chat.js';
+import { formatChatToolError } from '../chatProgressFormatting.js';
 import { reviveChatRequestOrigin, serializeChatRequestOrigin } from '../chatRequestOrigin.js';
 import { markChat, ChatPerfMark } from '../chatPerf.js';
-import { IChatToolInvocation, ChatResponseClearToPreviousToolInvocationReason, ResponseModelState, ElicitationState, ToolConfirmKind, isIUsedContext, ChatRequestQueueKind } from '../chatService/chatService.js';
+import { IChatToolInvocation, ElicitationState, ChatResponseClearToPreviousToolInvocationReason, ResponseModelState, ToolConfirmKind, isIUsedContext, ChatRequestQueueKind } from '../chatService/chatService.js';
 import { IChatService } from '../chatService/chatService.service.js';
 import { ChatAgentLocation, ChatModeKind } from '../constants.js';
 import { ChatToolInvocation } from './chatProgressTypes/chatToolInvocation.js';
 import { ChatPlanReviewData } from './chatProgressTypes/chatPlanReviewData.js';
 import { ChatQuestionCarouselData } from './chatProgressTypes/chatQuestionCarouselData.js';
-import { ToolDataSource } from '../tools/languageModelToolsService.js';
+import { isToolResultInputOutputDetails, ToolDataSource } from '../tools/languageModelToolsService.js';
 import { ModifiedFileEntryState } from '../editing/chatEditingService.js';
 import { IChatEditingService } from '../editing/chatEditingService.service.js';
 import { reviveSerializedAgent } from '../participants/chatAgents.js';
@@ -40,12 +42,13 @@ import { reviveParsedChatRequest, ChatRequestTextPart } from '../requestParser/c
 import { chatSessionResourceToId, LocalChatSessionUri } from './chatUri.js';
 import { constObservable } from '../../../../../base/common/observableInternal/observables/constObservable.js';
 import { observableFromEvent } from '../../../../../base/common/observableInternal/observables/observableFromEvent.js';
-import { registerAutorunSelfDisposable, autorun } from '../../../../../base/common/observableInternal/reactions/autorun.js';
+import { autorun, registerAutorunSelfDisposable } from '../../../../../base/common/observableInternal/reactions/autorun.js';
 import { observableValueOpts } from '../../../../../base/common/observableInternal/observables/observableValueOpts.js';
 import { observableValue } from '../../../../../base/common/observableInternal/observables/observableValue.js';
 import { observableSignal } from '../../../../../base/common/observableInternal/observables/observableSignal.js';
 import { observableSignalFromEvent } from '../../../../../base/common/observableInternal/observables/observableSignalFromEvent.js';
-import { derived } from '../../../../../base/common/observableInternal/observables/derived.js';
+import { derivedOpts, derived } from '../../../../../base/common/observableInternal/observables/derived.js';
+import { transaction } from '../../../../../base/common/observableInternal/transaction.js';
 
 var ChatModel_1;
 const CHAT_ATTACHABLE_IMAGE_MIME_TYPES = {
@@ -115,6 +118,20 @@ class ChatRequestModel {
         this._version++;
         this._variableData = v;
     }
+    get modelId() {
+        return this._modelId;
+    }
+    set modelId(modelId) {
+        this._version++;
+        this._modelId = modelId;
+    }
+    get agentHostMetadata() {
+        return this._agentHostMetadata;
+    }
+    set agentHostMetadata(metadata) {
+        this._version++;
+        this._agentHostMetadata = metadata;
+    }
     get confirmation() {
         return this._confirmation;
     }
@@ -133,6 +150,7 @@ class ChatRequestModel {
     constructor(params) {
         this._shouldBeBlocked = observableValue(this, false);
         this._version = 0;
+        this._agentHostMetadata = params.agentHostMetadata;
         this._session = params.session;
         this.message = params.message;
         this._variableData = params.variableData;
@@ -144,7 +162,8 @@ class ChatRequestModel {
         this._locationData = params.locationData;
         this._attachedContext = params.attachedContext;
         this.isCompleteAddedRequest = params.isCompleteAddedRequest ?? false;
-        this.modelId = params.modelId;
+        this._modelId = params.modelId;
+        this.modelConfiguration = params.modelConfiguration;
         this.id = params.restoredId ?? "request_" + generateUuid();
         this._editedFileEvents = params.editedFileEvents;
         this.userSelectedTools = params.userSelectedTools;
@@ -339,7 +358,7 @@ class AbstractResponse {
             blocks.push(currentBlockSegments.join(""));
         }
         if (hasEditGroupsAfterLastClear) {
-            blocks.push(( localize(12605, "Made changes.")));
+            blocks.push(( localize(14976, "Made changes.")));
         }
         return blocks.join("\n\n");
     }
@@ -350,9 +369,15 @@ class AbstractResponse {
         return "name" in part.inlineReference ? appendEscapedMarkdownInlineCode(part.inlineReference.name) : this.uriToRepr(part.inlineReference);
     }
     getToolInvocationText(toolInvocation) {
+        if (IChatToolInvocation.isStreaming(toolInvocation) && IChatToolInvocation.isImageGeneration(toolInvocation)) {
+            return {
+                text: ""
+            };
+        }
         const getTerminalDisplayInput = terminalData => terminalData.presentationOverrides?.commandLine ?? terminalData.commandLine.forDisplay ?? terminalData.commandLine.userEdited ?? terminalData.commandLine.toolEdited ?? terminalData.commandLine.original;
         let message = "";
         let input = "";
+        let exitCode;
         if (toolInvocation.pastTenseMessage) {
             message = typeof toolInvocation.pastTenseMessage === "string" ? toolInvocation.pastTenseMessage : toolInvocation.pastTenseMessage.value;
         } else {
@@ -363,20 +388,28 @@ class AbstractResponse {
                 message = "Ran terminal command";
                 const terminalData = migrateLegacyTerminalToolSpecificData(toolInvocation.toolSpecificData);
                 input = getTerminalDisplayInput(terminalData);
+                exitCode = terminalData.terminalCommandState?.exitCode;
             }
         }
         let text = message;
         if (input) {
             text += `: ${input}`;
         }
+        const resultDetails = IChatToolInvocation.resultDetails(toolInvocation);
         if (toolInvocation.kind === "toolInvocationSerialized" || (toolInvocation.kind === "toolInvocation" && IChatToolInvocation.isComplete(toolInvocation))) {
-            const resultDetails = IChatToolInvocation.resultDetails(toolInvocation);
             if (resultDetails && "input" in resultDetails) {
                 const resultPrefix = toolInvocation.kind === "toolInvocationSerialized" || IChatToolInvocation.isComplete(toolInvocation) ? "Completed" : "Errored";
                 const resultInput = toolInvocation.toolSpecificData?.kind === "terminal" ? getTerminalDisplayInput(migrateLegacyTerminalToolSpecificData(toolInvocation.toolSpecificData)) : resultDetails.input;
                 text += `\n${resultPrefix} with input: ${resultInput}`;
             }
         }
+        const error = formatChatToolError(
+            IChatToolInvocation.resultError(toolInvocation) || (isToolResultInputOutputDetails(resultDetails) && resultDetails.isError),
+            exitCode
+        );
+        if (error) {
+            text += "\n" + error;
+        }
         return {
             text,
             isBlock: true
@@ -400,6 +433,9 @@ class ResponseView extends AbstractResponse {
         this.undoStop = undoStop;
     }
 }
+function isChatResponseConfirmationPart(part) {
+    return part.kind === "toolInvocation" || part.kind === "confirmation" || part.kind === "questionCarousel" || part.kind === "planReview" || part.kind === "elicitation2";
+}
 class Response extends AbstractResponse {
     get onDidChangeValue() {
         return this._onDidChangeValue.event;
@@ -413,14 +449,47 @@ class Response extends AbstractResponse {
             treeData: v
         })));
         this._store = ( new DisposableStore());
+        this._toolInvocationDisposables = this._store.add(( new DisposableStore()));
+        this._pendingConfirmationCandidates = ( new Set());
         this._onDidChangeValue = this._store.add(( new Emitter()));
         this._citations = [];
+        for (const part of this._responseParts) {
+            if (isChatResponseConfirmationPart(part)) {
+                this._pendingConfirmationCandidates.add(part);
+            }
+        }
     }
     dispose() {
         this._store.dispose();
     }
+    getPendingConfirmations(reader) {
+        const pending = [];
+        for (const part of this._pendingConfirmationCandidates) {
+            if (part.kind === "toolInvocation") {
+                const state = part.state.read(reader);
+                if (state.type === IChatToolInvocation.StateKind.Completed || state.type === IChatToolInvocation.StateKind.Cancelled) {
+                    this._pendingConfirmationCandidates.delete(part);
+                } else if (state.type === IChatToolInvocation.StateKind.WaitingForConfirmation || state.type === IChatToolInvocation.StateKind.WaitingForPostApproval || state.type === IChatToolInvocation.StateKind.WaitingForAuthentication) {
+                    pending.push(part);
+                }
+            } else if (part.kind === "elicitation2") {
+                if (part.state.read(reader) === ElicitationState.Pending) {
+                    pending.push(part);
+                } else {
+                    this._pendingConfirmationCandidates.delete(part);
+                }
+            } else if (part.isUsed) {
+                this._pendingConfirmationCandidates.delete(part);
+            } else {
+                pending.push(part);
+            }
+        }
+        return pending;
+    }
     clear() {
         this.finalizeReasoningDuration();
+        this._toolInvocationDisposables.clear();
+        this._pendingConfirmationCandidates.clear();
         this._responseParts = [];
         this._contentChanged(true);
     }
@@ -434,6 +503,12 @@ class Response extends AbstractResponse {
                 break;
             }
         }
+        for (let i = lastToolInvocationIndex + 1; i < this._responseParts.length; i++) {
+            const part = this._responseParts[i];
+            if (isChatResponseConfirmationPart(part)) {
+                this._pendingConfirmationCandidates.delete(part);
+            }
+        }
         if (lastToolInvocationIndex !== -1) {
             this._responseParts = this._responseParts.slice(0, lastToolInvocationIndex + 1);
         } else {
@@ -448,18 +523,18 @@ class Response extends AbstractResponse {
         this._contentChanged(true);
     }
     updateContent(progress, quiet) {
-        if (progress.kind !== "thinking") {
+        if (progress.kind !== "thinking" && !isNestedSubagentResponsePart(progress)) {
             this.finalizeReasoningDuration();
         }
         if (progress.kind === "clearToPreviousToolInvocation") {
             if (progress.reason === ChatResponseClearToPreviousToolInvocationReason.CopyrightContentRetry) {
                 this.clearToPreviousToolInvocation(( localize(
-                    12606,
+                    14977,
                     "Response cleared due to possible match to public code, retrying with modified prompt."
                 )));
             } else if (progress.reason === ChatResponseClearToPreviousToolInvocationReason.FilteredContentRetry) {
                 this.clearToPreviousToolInvocation(( localize(
-                    12607,
+                    14978,
                     "Response cleared due to content safety filters, retrying with modified prompt."
                 )));
             } else {
@@ -487,7 +562,7 @@ class Response extends AbstractResponse {
             }
             this._contentChanged(quiet);
         } else if (progress.kind === "thinking") {
-            const lastResponsePart = this._responseParts.filter(p => p.kind !== "textEditGroup").at(-1);
+            const lastResponsePart = this._responseParts.filter(p => p.kind !== "textEditGroup" && !isNestedSubagentResponsePart(p)).at(-1);
             const lastText = lastResponsePart && lastResponsePart.kind === "thinking" ? (Array.isArray(lastResponsePart.value) ? lastResponsePart.value.join("") : (lastResponsePart.value || "")) : "";
             const currText = Array.isArray(progress.value) ? progress.value.join("") : (progress.value || "");
             const isEmpty = s => s.length === 0;
@@ -517,16 +592,19 @@ class Response extends AbstractResponse {
             const notebookUri = CellUri.parse(progress.uri)?.notebook;
             const uri = notebookUri ?? progress.uri;
             const isExternalEdit = progress.isExternalEdit;
+            const editMetadata = progress.autoTier !== undefined ? {
+                autoTier: progress.autoTier
+            } : undefined;
             if (progress.kind === "textEdit" && !notebookUri) {
-                this._mergeOrPushTextEditGroup(uri, progress.edits, progress.done, isExternalEdit);
+                this._mergeOrPushTextEditGroup(uri, progress.edits, progress.done, isExternalEdit, editMetadata);
             } else if (progress.kind === "textEdit") {
                 const cellEdits = progress.edits.map(edit => ({
                     uri: progress.uri,
                     edit
                 }));
-                this._mergeOrPushNotebookEditGroup(uri, cellEdits, progress.done, isExternalEdit);
+                this._mergeOrPushNotebookEditGroup(uri, cellEdits, progress.done, isExternalEdit, editMetadata);
             } else {
-                this._mergeOrPushNotebookEditGroup(uri, progress.edits, progress.done, isExternalEdit);
+                this._mergeOrPushNotebookEditGroup(uri, progress.edits, progress.done, isExternalEdit, editMetadata);
             }
             this._contentChanged(quiet);
         } else if (progress.kind === "progressTask") {
@@ -543,15 +621,27 @@ class Response extends AbstractResponse {
                 this._contentChanged(false);
             });
         } else if (progress.kind === "toolInvocation") {
-            registerAutorunSelfDisposable(this._store, reader => {
-                progress.state.read(reader);
+            this._toolInvocationDisposables.add(autorun(reader => {
+                if (!IChatToolInvocation.isComplete(progress)) {
+                    progress.state.read(reader);
+                }
+                progress.toolSpecificDataKind.read(reader);
                 this._contentChanged(false);
-                if (IChatToolInvocation.isComplete(progress, reader)) {
+            }));
+            this._responseParts.push(progress);
+            this._pendingConfirmationCandidates.add(progress);
+            this._contentChanged(quiet);
+        } else if (progress.kind === "mcpAuthenticationRequired") {
+            this._responseParts.push(progress);
+            let initialUpdate = true;
+            registerAutorunSelfDisposable(this._store, reader => {
+                progress.servers.read(reader);
+                this._contentChanged(initialUpdate ? quiet : false);
+                initialUpdate = false;
+                if (progress.isUsed) {
                     reader.dispose();
                 }
             });
-            this._responseParts.push(progress);
-            this._contentChanged(quiet);
         } else if (progress.kind === "externalToolInvocationUpdate") {
             this._handleExternalToolInvocationUpdate(progress);
             this._contentChanged(quiet);
@@ -573,9 +663,25 @@ class Response extends AbstractResponse {
             this._contentChanged(quiet);
         } else {
             this._responseParts.push(progress);
+            if (isChatResponseConfirmationPart(progress)) {
+                this._pendingConfirmationCandidates.add(progress);
+            }
             this._contentChanged(quiet);
         }
     }
+    replaceAutoModeResolutions(parts) {
+        if (equals(
+            this._responseParts.filter(part => part.kind === "autoModeResolution"),
+            parts
+        )) {
+            return;
+        }
+        this._responseParts = [
+            ...parts,
+            ...this._responseParts.filter(part => part.kind !== "autoModeResolution")
+        ];
+        this._contentChanged();
+    }
     finalizeReasoningDuration() {
         if (!this._activeReasoning) {
             return;
@@ -603,9 +709,13 @@ class Response extends AbstractResponse {
         }
         return false;
     }
-    _mergeOrPushTextEditGroup(uri, edits, done, isExternalEdit) {
+    _mergeOrPushTextEditGroup(uri, edits, done, isExternalEdit, editMetadata) {
         for (const candidate of this._responseParts) {
             if (candidate.kind === "textEditGroup" && !candidate.done && isEqual(candidate.uri, uri)) {
+                if (editMetadata) {
+                    candidate.editMetadata ??= candidate.edits.map(() => ({}));
+                }
+                candidate.editMetadata?.push(editMetadata ?? {});
                 candidate.edits.push(edits);
                 candidate.done = done;
                 return;
@@ -616,12 +726,19 @@ class Response extends AbstractResponse {
             uri,
             edits: [edits],
             done,
-            isExternalEdit
+            isExternalEdit,
+            ...(editMetadata ? {
+                editMetadata: [editMetadata]
+            } : {})
         });
     }
-    _mergeOrPushNotebookEditGroup(uri, edits, done, isExternalEdit) {
+    _mergeOrPushNotebookEditGroup(uri, edits, done, isExternalEdit, editMetadata) {
         for (const candidate of this._responseParts) {
             if (candidate.kind === "notebookEditGroup" && !candidate.done && isEqual(candidate.uri, uri)) {
+                if (editMetadata) {
+                    candidate.editMetadata ??= candidate.edits.map(() => ({}));
+                }
+                candidate.editMetadata?.push(editMetadata ?? {});
                 candidate.edits.push(edits);
                 candidate.done = done;
                 return;
@@ -632,7 +749,10 @@ class Response extends AbstractResponse {
             uri,
             edits: [edits],
             done,
-            isExternalEdit
+            isExternalEdit,
+            ...(editMetadata ? {
+                editMetadata: [editMetadata]
+            } : {})
         });
     }
     _handleExternalToolInvocationUpdate(progress) {
@@ -678,6 +798,7 @@ class Response extends AbstractResponse {
             });
         }
         this._responseParts.push(invocation);
+        this._pendingConfirmationCandidates.add(invocation);
     }
     computeRepr() {
         let repr = super.computeRepr();
@@ -852,32 +973,59 @@ class ChatResponseModel extends Disposable {
         this._response = this._register(( new Response(params.responseContent)));
         this._codeBlockInfos = params.codeBlockInfos ? [...params.codeBlockInfos] : undefined;
         const signal = observableSignalFromEvent(this, this.onDidChange);
+        const pendingConfirmations = derivedOpts({
+            owner: this,
+            equalsFn: equals$1
+        }, reader => {
+            signal.read(reader);
+            return this._response.getPendingConfirmations(reader);
+        });
+        const visibleParts = ( new WeakMap());
+        this.pendingToolInvocations = derivedOpts({
+            owner: this,
+            equalsFn: equals$1
+        }, reader => {
+            signal.read(reader);
+            const pending = pendingConfirmations.read(reader);
+            const response = this.response;
+            let includedParts;
+            if (response !== this._response && pending.length) {
+                includedParts = visibleParts.get(response);
+                if (!includedParts) {
+                    includedParts = ( new Set(response.value));
+                    visibleParts.set(response, includedParts);
+                }
+            }
+            return pending.filter(
+                part => part.kind === "toolInvocation" && (!includedParts || ( includedParts.has(part)))
+            );
+        });
         const _pendingInfo = signal.map((_value, r) => {
-            signal.read(r);
-            for (const part of this._response.value) {
-                if (part.kind === "toolInvocation") {
+            const part = pendingConfirmations.read(r).at(0);
+            switch (part?.kind) {
+            case "toolInvocation":
+                {
                     const state = part.state.read(r);
                     if (state.type === IChatToolInvocation.StateKind.WaitingForConfirmation) {
                         const title = state.confirmationMessages?.title;
                         return title ? (isMarkdownString(title) ? title.value : title) : undefined;
                     }
                     if (state.type === IChatToolInvocation.StateKind.WaitingForPostApproval) {
-                        return localize(12608, "Approve tool result?");
+                        return localize(14979, "Approve tool result?");
                     }
                     if (state.type === IChatToolInvocation.StateKind.WaitingForAuthentication) {
-                        return localize(12609, "Authenticate {0} to continue...", state.server.name);
+                        return localize(14980, "Authenticate {0} to continue...", state.server.name);
                     }
+                    return undefined;
                 }
-                if (part.kind === "confirmation" && !part.isUsed) {
-                    return part.title;
-                }
-                if (part.kind === "questionCarousel" && !part.isUsed) {
-                    return localize(12610, "Answer questions to continue...");
-                }
-                if (part.kind === "planReview" && !part.isUsed) {
-                    return localize(12611, "Review the plan to continue...");
-                }
-                if (part.kind === "elicitation2" && part.state.read(r) === ElicitationState.Pending) {
+            case "confirmation":
+                return part.title;
+            case "questionCarousel":
+                return localize(14981, "Answer questions to continue...");
+            case "planReview":
+                return localize(14982, "Review the plan to continue...");
+            case "elicitation2":
+                {
                     const title = part.title;
                     return isMarkdownString(title) ? title.value : title;
                 }
@@ -980,6 +1128,23 @@ class ChatResponseModel extends Disposable {
         this._parentUsage = usage;
         this._setUsage(this._withSubagentCopilotCredits(usage), true);
     }
+    updateHistoryMetadata(details, parts) {
+        transaction(tx => {
+            this._parentUsage = undefined;
+            this._usageObs.set(undefined, tx);
+            this._completionTokenCountObs.set(undefined, tx);
+            for (const part of parts) {
+                if (part.kind === "usage") {
+                    this.setUsage(part);
+                }
+            }
+            this._response.replaceAutoModeResolutions(parts.filter(part => part.kind === "autoModeResolution"));
+            this.setResult({
+                ...this._result,
+                details
+            });
+        });
+    }
     setSubagentCopilotCredits(subagentCallId, copilotCredits) {
         const currentCredits = this._subagentCopilotCredits.get(subagentCallId);
         if (!Number.isFinite(copilotCredits) || copilotCredits < 0 || (currentCredits !== undefined && copilotCredits <= currentCredits)) {
@@ -1023,7 +1188,7 @@ class ChatResponseModel extends Disposable {
         this._elapsedMs = Math.max(0, elapsedMs);
     }
     isSameUsage(currentUsage, usage) {
-        return currentUsage.promptTokens === usage.promptTokens && currentUsage.completionTokens === usage.completionTokens && currentUsage.outputBuffer === usage.outputBuffer && currentUsage.copilotCredits === usage.copilotCredits && currentUsage.sessionCopilotCredits === usage.sessionCopilotCredits && equals(currentUsage.promptTokenDetails, usage.promptTokenDetails) && equals(currentUsage.modelTotals, usage.modelTotals);
+        return currentUsage.promptTokens === usage.promptTokens && currentUsage.completionTokens === usage.completionTokens && currentUsage.outputBuffer === usage.outputBuffer && currentUsage.copilotCredits === usage.copilotCredits && currentUsage.sessionCopilotCredits === usage.sessionCopilotCredits && equals(currentUsage.promptTokenDetails, usage.promptTokenDetails) && equals(currentUsage.contextUsage, usage.contextUsage) && equals(currentUsage.latestModelCall, usage.latestModelCall) && equals(currentUsage.modelTotals, usage.modelTotals);
     }
     complete(completedAt = Date.now()) {
         this._complete(completedAt, completedAt);
@@ -1077,7 +1242,9 @@ class ChatResponseModel extends Disposable {
         this._response.finalizeReasoningDuration();
         for (const part of this._response.value) {
             if (part.kind === "toolInvocation" && part instanceof ChatToolInvocation) {
-                part.cancelFromStreaming(ToolConfirmKind.Skipped);
+                part.cancelFromStreaming({
+                    type: ToolConfirmKind.Skipped
+                });
             } else if (part instanceof ChatPlanReviewData) {
                 part.dismiss();
             } else if (part instanceof ChatQuestionCarouselData) {
@@ -1155,6 +1322,12 @@ class ChatResponseModel extends Disposable {
             completionTokens: this.completionTokenCount,
             outputBuffer: this.usage?.outputBuffer,
             promptTokenDetails: this.usage?.promptTokenDetails,
+            ...(this.usage?.latestModelCall ? {
+                latestModelCall: this.usage.latestModelCall
+            } : {}),
+            ...(this.usage?.contextUsage ? {
+                contextUsage: this.usage.contextUsage
+            } : {}),
             copilotCredits: this.usage?.copilotCredits,
             modelTotals: this.usage?.modelTotals,
             sessionCopilotCredits: this.usage?.sessionCopilotCredits,
@@ -1223,13 +1396,37 @@ function getLastYearDate() {
 function isExportableSessionData(obj) {
     return !!obj && Array.isArray(obj.requests) && typeof obj.responderUsername === "string";
 }
-function extractExportableSessionData(data) {
+function parseChatImport(content) {
+    const data = revive(JSON.parse(content, (_key, value) => {
+        if (value && typeof value === "object" && "$mid" in value && value.$mid === MarshalledId.Uri) {
+            if (!isUriComponents(value)) {
+                throw ( new Error("Invalid chat session data"));
+            }
+            return ( URI.from(value, true)).toJSON();
+        }
+        return value;
+    }));
+    if (!isExportableSessionData(data)) {
+        throw ( new Error("Invalid chat session data"));
+    }
+    removeImportedMarkdownTrust(data.requests);
     return {
         initialLocation: data.initialLocation,
         requests: data.requests,
         responderUsername: data.responderUsername
     };
 }
+function removeImportedMarkdownTrust(value) {
+    if (!value || typeof value !== "object") {
+        return;
+    }
+    if ("value" in value && typeof value.value === "string" && "isTrusted" in value) {
+        value.isTrusted = false;
+    }
+    for (const child of ( Object.values(value))) {
+        removeImportedMarkdownTrust(child);
+    }
+}
 function isSerializableSessionData(obj) {
     const data = obj;
     return isExportableSessionData(obj) && typeof data.creationDate === "number" && typeof data.sessionId === "string" && obj.requests.every(
@@ -1556,6 +1753,10 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
         this.sessionTypeSelectionReason = initialModelProps.sessionTypeSelectionReason;
         this._canUseTools = initialModelProps.canUseTools;
         this.isReadOnly = initialModelProps.isReadOnly ?? constObservable(false);
+        this.isInputBlocked = initialModelProps.isInputBlocked ?? constObservable(false);
+        this.historyStatus = initialModelProps.historyStatus ?? constObservable(undefined);
+        this.backgroundShellCount = initialModelProps.backgroundShellCount;
+        this.canvasContext = initialModelProps.canvasContext;
         this.lastRequestObs = observableFromEvent(this, this.onDidChange, () => this._requests.at(-1));
         this._register(autorun(reader => {
             const request = this.lastRequestObs.read(reader);
@@ -1659,9 +1860,11 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
             timestamp: requestTimestamp,
             fallbackTimestamp: this._timestamp,
             restoredId: raw.requestId,
+            agentHostMetadata: raw.agentHostMetadata,
             confirmation: raw.confirmation,
             editedFileEvents: raw.editedFileEvents,
             modelId: raw.modelId,
+            modelConfiguration: raw.modelConfiguration,
             modeInfo: raw.modeInfo,
             isSystemInitiated: raw.isSystemInitiated,
             requestSource: getRestoredChatRequestSource(raw, parsedRequest.text),
@@ -1730,6 +1933,8 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
                     completionTokens: raw.completionTokens ?? 0,
                     outputBuffer: raw.outputBuffer,
                     promptTokenDetails: raw.promptTokenDetails,
+                    latestModelCall: raw.latestModelCall,
+                    contextUsage: raw.contextUsage,
                     copilotCredits: raw.copilotCredits,
                     modelTotals: raw.modelTotals,
                     sessionCopilotCredits: raw.sessionCopilotCredits
@@ -1862,8 +2067,16 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
         hideFromTranscript,
         origin,
         isRequestHiddenFromTranscript,
-        requestSource
+        requestSource,
+        modelConfiguration,
+        agentHostMetadata,
+        insertion
     ) {
+        const index = insertion?.index ?? this._requests.length;
+        if (!Number.isInteger(index) || index < 0 || index > this._requests.length || (insertion?.replace && index === this._requests.length)) {
+            throw ( new BugIndicatingError("Invalid chat request insertion index"));
+        }
+        const replacedRequest = insertion?.replace ? this._requests[index] : undefined;
         const editedFileEvents = [...( this.currentEditedFileEvents.values())];
         this.currentEditedFileEvents.clear();
         const requestTimestamp = timestamp === undefined ? Date.now() : typeof timestamp === "number" && Number.isFinite(timestamp) && timestamp > 0 ? timestamp : undefined;
@@ -1881,6 +2094,8 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
             attachedContext: attachments,
             isCompleteAddedRequest,
             modelId,
+            modelConfiguration,
+            agentHostMetadata,
             editedFileEvents: editedFileEvents.length ? editedFileEvents : undefined,
             userSelectedTools,
             isSystemInitiated,
@@ -1901,12 +2116,17 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
             isCompleteAddedRequest,
             codeBlockInfos: undefined
         }));
-        this._requests.push(request);
+        this._requests.splice(index, replacedRequest ? 1 : 0, request);
         markChat(this.sessionResource, ChatPerfMark.RequestUiUpdated);
         this._onDidChange.fire({
             kind: "addRequest",
-            request
+            request,
+            ...(insertion ? {
+                index,
+                replacedRequest
+            } : {})
         });
+        replacedRequest?.response?.dispose();
         return request;
     }
     setCustomTitle(title) {
@@ -1916,13 +2136,25 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
             title
         });
     }
-    updateRequest(request, variableData) {
+    updateRequest(request, variableData, agentHostMetadata) {
         request.variableData = variableData;
+        if (agentHostMetadata !== undefined) {
+            request.agentHostMetadata = agentHostMetadata;
+        }
         this._onDidChange.fire({
             kind: "changedRequest",
             request
         });
     }
+    updateRequestModelId(request, modelId) {
+        if (request.modelId !== modelId) {
+            request.modelId = modelId;
+            this._onDidChange.fire({
+                kind: "changedRequest",
+                request
+            });
+        }
+    }
     adoptRequest(request) {
         const oldOwner = request.session;
         const index = oldOwner._requests.findIndex(candidate => candidate.id === request.id);
@@ -1984,13 +2216,13 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
         const index = this._requests.findIndex(request => request.id === id);
         const request = this._requests[index];
         if (index !== -1) {
+            this._requests.splice(index, 1);
             this._onDidChange.fire({
                 kind: "removeRequest",
                 requestId: request.id,
                 responseId: request.response?.id,
                 reason
             });
-            this._requests.splice(index, 1);
             request.response?.dispose();
         }
     }
@@ -2055,6 +2287,10 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
                     confirmation: r.confirmation,
                     editedFileEvents: r.editedFileEvents,
                     modelId: r.modelId,
+                    modelConfiguration: r.modelConfiguration,
+                    ...(r.agentHostMetadata ? {
+                        agentHostMetadata: r.agentHostMetadata
+                    } : {}),
                     modeInfo: r.modeInfo,
                     isSystemInitiated: r.isSystemInitiated || undefined,
                     ...(r.requestSource !== undefined ? {
@@ -2093,13 +2329,32 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
     }
 };
 ChatModel = ChatModel_1 = ( __decorate([( __param(2, ILogService)), ( __param(3, IChatAgentService)), ( __param(4, IChatEditingService)), ( __param(5, IChatService))], ChatModel));
-function updateRanges(variableData, diff) {
+function updateRanges(variableData, promptText) {
+    const mapOffset = offset => {
+        if (!promptText.rangeEdits) {
+            return offset - promptText.diff;
+        }
+        const leadingTrim = promptText.leadingTrim ?? 0;
+        let mappedOffset = offset - leadingTrim;
+        for (const edit of promptText.rangeEdits) {
+            const oldLength = edit.range.endExclusive - edit.range.start;
+            if (offset >= edit.range.endExclusive) {
+                mappedOffset += edit.newLength - oldLength;
+            } else if (offset > edit.range.start) {
+                return Math.max(
+                    0,
+                    mappedOffset - (offset - edit.range.start) + Math.min(offset - edit.range.start, edit.newLength)
+                );
+            }
+        }
+        return Math.max(0, mappedOffset);
+    };
     return {
         variables: variableData.variables.map(v => ({
             ...v,
             range: v.range && {
-                start: v.range.start - diff,
-                endExclusive: v.range.endExclusive - diff
+                start: mapOffset(v.range.start),
+                endExclusive: mapOffset(v.range.endExclusive)
             }
         }))
     };
@@ -2133,11 +2388,13 @@ function getCodeCitationsMessage(citations) {
         return "";
     }
     const licenseTypes = citations.reduce((set, c) => set.add(c.license), ( new Set()));
-    const label = licenseTypes.size === 1 ? ( localize(12612, "Similar code found with 1 license type", licenseTypes.size)) : ( localize(12613, "Similar code found with {0} license types", licenseTypes.size));
+    const label = licenseTypes.size === 1 ? ( localize(14983, "Similar code found with 1 license type", licenseTypes.size)) : ( localize(14984, "Similar code found with {0} license types", licenseTypes.size));
     return label;
 }
 function serializeSendOptions(options) {
     return {
+        agentHostMessageOrigin: options.agentHostMessageOrigin,
+        metadata: options.metadata,
         modeInfo: options.modeInfo,
         userSelectedModelId: options.userSelectedModelId,
         userSelectedModelConfiguration: options.userSelectedModelConfiguration,
@@ -2168,13 +2425,20 @@ var ChatResponseResource;
 (function(ChatResponseResource) {
     ChatResponseResource.scheme = Schemas.vscodeChatResponseResource;
     function createUri(sessionResource, toolCallId, index, basename) {
+        return createScopedUri(
+            sessionResource,
+            `/tool/${toolCallId}/${index}` + (basename ? `/${basename}` : "")
+        );
+    }
+    ChatResponseResource.createUri = createUri;
+    function createScopedUri(sessionResource, path, query) {
         return ( URI.from({
             scheme: ChatResponseResource.scheme,
             authority: encodeHex(VSBuffer.fromString(( sessionResource.toString()))),
-            path: `/tool/${toolCallId}/${index}` + (basename ? `/${basename}` : "")
+            path,
+            query
         }));
     }
-    ChatResponseResource.createUri = createUri;
     function parseUri(uri) {
         if (uri.scheme !== ChatResponseResource.scheme) {
             return undefined;
@@ -2187,23 +2451,24 @@ var ChatResponseResource;
         if (kind !== "tool") {
             return undefined;
         }
-        let sessionResource;
+        return {
+            sessionResource: parseSessionResource(uri),
+            toolCallId: toolCallId,
+            index: Number(index)
+        };
+    }
+    ChatResponseResource.parseUri = parseUri;
+    function parseSessionResource(uri) {
         try {
-            sessionResource = ( URI.parse(( decodeHex(uri.authority).toString())));
+            return ( URI.parse(( decodeHex(uri.authority).toString())));
         } catch (e) {
             if (e instanceof SyntaxError) {
-                sessionResource = LocalChatSessionUri.forSession(uri.authority);
+                return LocalChatSessionUri.forSession(uri.authority);
             } else {
                 throw e;
             }
         }
-        return {
-            sessionResource,
-            toolCallId: toolCallId,
-            index: Number(index)
-        };
     }
-    ChatResponseResource.parseUri = parseUri;
 })(ChatResponseResource || (ChatResponseResource = {}));
 function _logChangesToStateModel(newState, oldState, logger, sessionId) {
     if (!canLog(logger.getLevel(), LogLevel.Debug) || newState?.selectedModel?.identifier === oldState?.selectedModel?.identifier) {
@@ -2227,4 +2492,4 @@ function logChangesToStateModel(model, message, newState, oldState, logger) {
     logger.debug(`[ChatModelChanged] Chat Model Changed,${message}`);
 }
 
-export { CHAT_ATTACHABLE_IMAGE_MIME_TYPES, ChatInputStateOrigin, ChatModel, ChatRequestEditedFileEventKind, ChatRequestModel, ChatRequestRemovalReason, ChatResponseModel, ChatResponseResource, IChatRequestVariableData, IntendedModelSlot, Response, appendMarkdownString, canMergeMarkdownStrings, defaultChatResponseModelChangeReason, extractExportableSessionData, getAttachableImageExtension, getCodeCitationsMessage, getRestoredChatRequestSource, isCellTextEditOperation, isCellTextEditOperationArray, isExportableSessionData, isSerializableSessionData, logChangesToStateModel, normalizeSerializableChatData, reviveSerializableInputState, serializeSendOptions, toChatHistoryContent, updateRanges };
+export { CHAT_ATTACHABLE_IMAGE_MIME_TYPES, ChatInputStateOrigin, ChatModel, ChatRequestEditedFileEventKind, ChatRequestModel, ChatRequestRemovalReason, ChatResponseModel, ChatResponseResource, IChatRequestVariableData, IntendedModelSlot, Response, appendMarkdownString, canMergeMarkdownStrings, defaultChatResponseModelChangeReason, getAttachableImageExtension, getCodeCitationsMessage, getRestoredChatRequestSource, isCellTextEditOperation, isCellTextEditOperationArray, isExportableSessionData, isSerializableSessionData, logChangesToStateModel, normalizeSerializableChatData, parseChatImport, reviveSerializableInputState, serializeSendOptions, toChatHistoryContent, updateRanges };