@codingame/monaco-vscode-api 36.2.6 → 37.0.0

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

@@ -4,7 +4,7 @@ import { asArray } 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';
-import { MarkdownString, isMarkdownString } from '../../../../../base/common/htmlContent.js';
+import { MarkdownString, appendEscapedMarkdownInlineCode, isMarkdownString } from '../../../../../base/common/htmlContent.js';
 import { DisposableStore, Disposable, MutableDisposable } from '../../../../../base/common/lifecycle.js';
 import { ResourceMap } from '../../../../../base/common/map.js';
 import { revive } from '../../../../../base/common/marshalling.js';
@@ -17,11 +17,13 @@ import { URI } 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';
+import { parseAgentMergePrompt } from '../../../../../platform/agentHost/common/agentMergePrompt.js';
 import { canLog, LogLevel } from '../../../../../platform/log/common/log.js';
 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 { reviveChatRequestOrigin, serializeChatRequestOrigin } from '../chatRequestOrigin.js';
 import { markChat, ChatPerfMark } from '../chatPerf.js';
 import { IChatToolInvocation, ChatResponseClearToPreviousToolInvocationReason, ResponseModelState, ElicitationState, ToolConfirmKind, isIUsedContext, ChatRequestQueueKind } from '../chatService/chatService.js';
 import { IChatService } from '../chatService/chatService.service.js';
@@ -36,11 +38,12 @@ import { reviveSerializedAgent } from '../participants/chatAgents.js';
 import { IChatAgentService } from '../participants/chatAgents.service.js';
 import { reviveParsedChatRequest, ChatRequestTextPart } from '../requestParser/chatParserTypes.js';
 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 { constObservable } from '../../../../../base/common/observableInternal/observables/constObservable.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';
 
@@ -64,6 +67,15 @@ var IChatRequestVariableData;
     }
     IChatRequestVariableData.toExport = toExport;
 })(IChatRequestVariableData || (IChatRequestVariableData = {}));
+function getRestoredChatRequestSource(request, messageText) {
+    if (request.requestSource !== undefined) {
+        return request.requestSource;
+    }
+    if (request.isSystemInitiated && request.systemInitiatedLabel === undefined && parseAgentMergePrompt(messageText)) {
+        return "agentMerge";
+    }
+    return undefined;
+}
 function isCellTextEditOperation(value) {
     const candidate = value;
     return !!candidate && !!candidate.edit && !!candidate.uri && URI.isUri(candidate.uri);
@@ -71,7 +83,9 @@ function isCellTextEditOperation(value) {
 function isCellTextEditOperationArray(value) {
     return ( value.some(isCellTextEditOperation));
 }
-const nonHistoryKinds = ( new Set(["toolInvocation", "toolInvocationSerialized", "undoStop"]));
+const nonHistoryKinds = ( new Set(
+    ["toolInvocation", "toolInvocationSerialized", "undoStop", "voiceProgress"]
+));
 function isChatProgressHistoryResponseContent(content) {
     return !( nonHistoryKinds.has(content.kind));
 }
@@ -122,7 +136,8 @@ class ChatRequestModel {
         this._session = params.session;
         this.message = params.message;
         this._variableData = params.variableData;
-        this.timestamp = params.timestamp;
+        this.requestTimestamp = params.timestamp;
+        this.timestamp = params.timestamp ?? params.fallbackTimestamp ?? Date.now();
         this._attempt = params.attempt ?? 0;
         this.modeInfo = params.modeInfo;
         this._confirmation = params.confirmation;
@@ -134,8 +149,13 @@ class ChatRequestModel {
         this._editedFileEvents = params.editedFileEvents;
         this.userSelectedTools = params.userSelectedTools;
         this.isSystemInitiated = params.isSystemInitiated;
+        this.requestSource = params.requestSource;
+        this.isHiddenFromTranscript = params.isHiddenFromTranscript ?? false;
+        this.isRequestHiddenFromTranscript = this.isHiddenFromTranscript || params.isRequestHiddenFromTranscript === true;
         this.systemInitiatedLabel = params.systemInitiatedLabel;
         this.terminalExecutionId = params.terminalExecutionId;
+        this.isTerminalCommand = params.isTerminalCommand ?? false;
+        this.origin = params.origin;
     }
     adoptTo(session) {
         this._session = session;
@@ -244,6 +264,7 @@ class AbstractResponse {
             case "elicitationSerialized":
             case "thinking":
             case "hook":
+            case "voiceProgress":
             case "multiDiffData":
             case "mcpServersStarting":
             case "mcpAuthenticationRequired":
@@ -318,15 +339,15 @@ class AbstractResponse {
             blocks.push(currentBlockSegments.join(""));
         }
         if (hasEditGroupsAfterLastClear) {
-            blocks.push(( localize(8573, "Made changes.")));
+            blocks.push(( localize(10289, "Made changes.")));
         }
         return blocks.join("\n\n");
     }
     inlineRefToRepr(part) {
         if ("uri" in part.inlineReference) {
-            return this.uriToRepr(part.inlineReference.uri);
+            return this.uriToRepr(part.inlineReference.uri, part.inlineReference.range);
         }
-        return "name" in part.inlineReference ? "`" + part.inlineReference.name + "`" : this.uriToRepr(part.inlineReference);
+        return "name" in part.inlineReference ? appendEscapedMarkdownInlineCode(part.inlineReference.name) : this.uriToRepr(part.inlineReference);
     }
     getToolInvocationText(toolInvocation) {
         const getTerminalDisplayInput = terminalData => terminalData.presentationOverrides?.commandLine ?? terminalData.commandLine.forDisplay ?? terminalData.commandLine.userEdited ?? terminalData.commandLine.toolEdited ?? terminalData.commandLine.original;
@@ -361,11 +382,12 @@ class AbstractResponse {
             isBlock: true
         };
     }
-    uriToRepr(uri) {
+    uriToRepr(uri, range) {
         if (uri.scheme === Schemas.http || uri.scheme === Schemas.https) {
             return ( uri.toString(false));
         }
-        return basename(uri);
+        const suffix = !range ? "" : range.startLineNumber === range.endLineNumber ? `:${range.startLineNumber}` : `:${range.startLineNumber}-${range.endLineNumber}`;
+        return appendEscapedMarkdownInlineCode(basename(uri) + suffix);
     }
 }
 class ResponseView extends AbstractResponse {
@@ -398,10 +420,12 @@ class Response extends AbstractResponse {
         this._store.dispose();
     }
     clear() {
+        this.finalizeReasoningDuration();
         this._responseParts = [];
         this._contentChanged(true);
     }
     clearToPreviousToolInvocation(message) {
+        this.finalizeReasoningDuration();
         let lastToolInvocationIndex = -1;
         for (let i = this._responseParts.length - 1; i >= 0; i--) {
             const part = this._responseParts[i];
@@ -424,15 +448,18 @@ class Response extends AbstractResponse {
         this._contentChanged(true);
     }
     updateContent(progress, quiet) {
+        if (progress.kind !== "thinking") {
+            this.finalizeReasoningDuration();
+        }
         if (progress.kind === "clearToPreviousToolInvocation") {
             if (progress.reason === ChatResponseClearToPreviousToolInvocationReason.CopyrightContentRetry) {
                 this.clearToPreviousToolInvocation(( localize(
-                    8574,
+                    10290,
                     "Response cleared due to possible match to public code, retrying with modified prompt."
                 )));
             } else if (progress.reason === ChatResponseClearToPreviousToolInvocationReason.FilteredContentRetry) {
                 this.clearToPreviousToolInvocation(( localize(
-                    8575,
+                    10291,
                     "Response cleared due to content safety filters, retrying with modified prompt."
                 )));
             } else {
@@ -440,7 +467,7 @@ class Response extends AbstractResponse {
             }
             return;
         } else if (progress.kind === "markdownContent") {
-            const lastResponsePart = this._responseParts.filter(p => p.kind !== "textEditGroup").at(-1);
+            const lastResponsePart = this._responseParts.filter(p => p.kind !== "textEditGroup" && !isNestedSubagentResponsePart(p)).at(-1);
             if (!lastResponsePart || lastResponsePart.kind !== "markdownContent" || !canMergeMarkdownStrings(lastResponsePart.content, progress.content)) {
                 this._responseParts.push(progress);
             } else {
@@ -451,19 +478,39 @@ class Response extends AbstractResponse {
                 };
             }
             this._contentChanged(quiet);
+        } else if (progress.kind === "systemNotification") {
+            const lastResponsePart = this._responseParts.at(-1);
+            if (lastResponsePart?.kind === "toolInvocation" && IChatToolInvocation.isStreaming(lastResponsePart) && !IChatToolInvocation.isEffectivelyHidden(lastResponsePart)) {
+                this._responseParts.splice(this._responseParts.length - 1, 0, progress);
+            } else {
+                this._responseParts.push(progress);
+            }
+            this._contentChanged(quiet);
         } else if (progress.kind === "thinking") {
             const lastResponsePart = this._responseParts.filter(p => p.kind !== "textEditGroup").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;
+            if (isEmpty(currText)) {
+                this.finalizeReasoningDuration();
+            } else if (!this._activeReasoning) {
+                this._activeReasoning = {
+                    part: progress,
+                    startedAt: Date.now()
+                };
+            }
             if (!lastResponsePart || lastResponsePart.kind !== "thinking" || isEmpty(currText) || isEmpty(lastText) || !canMergeMarkdownStrings(( new MarkdownString(lastText)), ( new MarkdownString(currText)))) {
                 this._responseParts.push(progress);
             } else {
                 const idx = this._responseParts.indexOf(lastResponsePart);
-                this._responseParts[idx] = {
+                const mergedPart = {
                     ...lastResponsePart,
                     value: appendMarkdownString(( new MarkdownString(lastText)), ( new MarkdownString(currText))).value
                 };
+                this._responseParts[idx] = mergedPart;
+                if (this._activeReasoning?.part === lastResponsePart) {
+                    this._activeReasoning.part = mergedPart;
+                }
             }
             this._contentChanged(quiet);
         } else if (progress.kind === "textEdit" || progress.kind === "notebookEdit") {
@@ -508,11 +555,34 @@ class Response extends AbstractResponse {
         } else if (progress.kind === "externalToolInvocationUpdate") {
             this._handleExternalToolInvocationUpdate(progress);
             this._contentChanged(quiet);
+        } else if (progress.kind === "progressMessage" && progress.id !== undefined) {
+            const idx = this._responseParts.findIndex(p => p.kind === "progressMessage" && p.id === progress.id);
+            if (idx === -1) {
+                this._responseParts.push(progress);
+            } else {
+                this._responseParts[idx] = progress;
+            }
+            this._contentChanged(quiet);
+        } else if (progress.kind === "autoModeResolution") {
+            const idx = this._responseParts.findIndex(p => p.kind === "autoModeResolution" && !p.resolved);
+            if (idx === -1) {
+                this._responseParts.push(progress);
+            } else {
+                this._responseParts[idx] = progress;
+            }
+            this._contentChanged(quiet);
         } else {
             this._responseParts.push(progress);
             this._contentChanged(quiet);
         }
     }
+    finalizeReasoningDuration() {
+        if (!this._activeReasoning) {
+            return;
+        }
+        this._activeReasoning.part.reasoningDurationMs = Math.max(0, Date.now() - this._activeReasoning.startedAt);
+        this._activeReasoning = undefined;
+    }
     addCitation(citation) {
         this._citations.push(citation);
         this._contentChanged();
@@ -623,6 +693,9 @@ class Response extends AbstractResponse {
         }
     }
 }
+function sumModelOutputTokens(modelTotals) {
+    return modelTotals?.reduce((total, entry) => total + entry.outputTokens, 0);
+}
 class ChatResponseModel extends Disposable {
     get shouldBeBlocked() {
         return this._shouldBeBlocked;
@@ -636,6 +709,9 @@ class ChatResponseModel extends Disposable {
     get shouldBeRemovedOnSend() {
         return this._shouldBeRemovedOnSend;
     }
+    get isHiddenFromTranscript() {
+        return this.request?.isHiddenFromTranscript ?? false;
+    }
     get isComplete() {
         return this._modelState.get().value !== ResponseModelState.Pending && this._modelState.get().value !== ResponseModelState.NeedsInput;
     }
@@ -659,6 +735,9 @@ class ChatResponseModel extends Disposable {
         }
         return undefined;
     }
+    get completionTimestamp() {
+        return this._completionTimestamp;
+    }
     get state() {
         const state = this._modelState.get().value;
         if (state === ResponseModelState.Complete && !!this._result?.errorDetails && this.result?.errorDetails?.code !== "canceled") {
@@ -744,8 +823,10 @@ class ChatResponseModel extends Disposable {
             value: ResponseModelState.Pending
         });
         this._usageObs = observableValue(this, undefined);
+        this._subagentCopilotCredits = ( new Map());
         this._completionTokenCountObs = observableValue(this, undefined);
         this._shouldBeBlocked = observableValue(this, false);
+        this._timingChanged = observableSignal(this);
         this._contentReferences = [];
         this._codeCitations = [];
         this._progressMessages = [];
@@ -758,6 +839,7 @@ class ChatResponseModel extends Disposable {
         if (params.modelState) {
             this._modelState.set(params.modelState, undefined);
         }
+        this._completionTimestamp = params.completionTimestamp === null ? undefined : params.completionTimestamp ?? (params.modelState && "completedAt" in params.modelState ? params.modelState.completedAt : undefined);
         this._timeSpentWaitingAccumulator = params.timeSpentWaiting || 0;
         this._elapsedMs = params.elapsedMs;
         this._vote = params.vote;
@@ -780,17 +862,20 @@ class ChatResponseModel extends Disposable {
                         return title ? (isMarkdownString(title) ? title.value : title) : undefined;
                     }
                     if (state.type === IChatToolInvocation.StateKind.WaitingForPostApproval) {
-                        return localize(8576, "Approve tool result?");
+                        return localize(10292, "Approve tool result?");
+                    }
+                    if (state.type === IChatToolInvocation.StateKind.WaitingForAuthentication) {
+                        return localize(10293, "Authenticate {0} to continue...", state.server.name);
                     }
                 }
                 if (part.kind === "confirmation" && !part.isUsed) {
                     return part.title;
                 }
                 if (part.kind === "questionCarousel" && !part.isUsed) {
-                    return localize(8577, "Answer questions to continue...");
+                    return localize(10294, "Answer questions to continue...");
                 }
                 if (part.kind === "planReview" && !part.isUsed) {
-                    return localize(8578, "Review the plan to continue...");
+                    return localize(10295, "Review the plan to continue...");
                 }
                 if (part.kind === "elicitation2" && part.state.read(r) === ElicitationState.Pending) {
                     const title = part.title;
@@ -817,6 +902,7 @@ class ChatResponseModel extends Disposable {
         this.id = params.restoredId ?? "response_" + generateUuid();
         let lastStartedWaitingAt = undefined;
         this.confirmationAdjustedTimestamp = derived(reader => {
+            this._timingChanged.read(reader);
             const pending = this.isPendingConfirmation.read(reader);
             if (pending) {
                 this._modelState.set({
@@ -891,36 +977,104 @@ class ChatResponseModel extends Disposable {
         this._onDidChange.fire(defaultChatResponseModelChangeReason);
     }
     setUsage(usage) {
-        if (this.isSameUsage(usage)) {
+        this._parentUsage = usage;
+        this._setUsage(this._withSubagentCopilotCredits(usage), true);
+    }
+    setSubagentCopilotCredits(subagentCallId, copilotCredits) {
+        const currentCredits = this._subagentCopilotCredits.get(subagentCallId);
+        if (!Number.isFinite(copilotCredits) || copilotCredits < 0 || (currentCredits !== undefined && copilotCredits <= currentCredits)) {
+            return;
+        }
+        this._subagentCopilotCredits.set(subagentCallId, copilotCredits);
+        const usage = this._parentUsage ?? {
+            kind: "usage",
+            promptTokens: 0,
+            completionTokens: 0
+        };
+        this._setUsage(this._withSubagentCopilotCredits(usage), false);
+    }
+    _withSubagentCopilotCredits(usage) {
+        let subagentCopilotCredits = 0;
+        for (const credits of ( this._subagentCopilotCredits.values())) {
+            subagentCopilotCredits += credits;
+        }
+        return subagentCopilotCredits === 0 ? usage : {
+            ...usage,
+            copilotCredits: (usage.copilotCredits ?? 0) + subagentCopilotCredits
+        };
+    }
+    _setUsage(usage, countCompletionTokens) {
+        const currentUsage = this._usageObs.get();
+        if (currentUsage && this.isSameUsage(currentUsage, usage)) {
             return;
         }
+        const isNewCall = !currentUsage || currentUsage.promptTokens !== usage.promptTokens || currentUsage.completionTokens !== usage.completionTokens || currentUsage.outputBuffer !== usage.outputBuffer;
         this._usageObs.set(usage, undefined);
-        const previousCompletionTokens = this._completionTokenCountObs.get() ?? 0;
-        this._completionTokenCountObs.set(previousCompletionTokens + usage.completionTokens, undefined);
+        const reportedOutputTokens = sumModelOutputTokens(usage.modelTotals);
+        if (reportedOutputTokens !== undefined) {
+            this._completionTokenCountObs.set(reportedOutputTokens, undefined);
+        } else if (countCompletionTokens && isNewCall) {
+            const previousCompletionTokens = this._completionTokenCountObs.get() ?? 0;
+            this._completionTokenCountObs.set(previousCompletionTokens + usage.completionTokens, undefined);
+        }
         this._onDidChange.fire(defaultChatResponseModelChangeReason);
     }
-    isSameUsage(usage) {
-        const currentUsage = this._usageObs.get();
-        return !!currentUsage && currentUsage.promptTokens === usage.promptTokens && currentUsage.completionTokens === usage.completionTokens && currentUsage.outputBuffer === usage.outputBuffer && currentUsage.copilotCredits === usage.copilotCredits && equals(currentUsage.promptTokenDetails, usage.promptTokenDetails);
+    setElapsedMs(elapsedMs) {
+        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);
+    }
+    complete(completedAt = Date.now()) {
+        this._complete(completedAt, completedAt);
+    }
+    completeWithoutTimestamp() {
+        this._complete(Date.now(), undefined);
+    }
+    reopen() {
+        if (!this.isComplete) {
+            return;
+        }
+        this._response.clear();
+        if (this._result?.errorDetails) {
+            const {
+                errorDetails: _errorDetails,
+                ...result
+            } = this._result;
+            this._result = result;
+        }
+        if (this.completedAt !== undefined) {
+            this._timeSpentWaitingAccumulator += Math.max(0, Date.now() - this.completedAt);
+            this._timingChanged.trigger(undefined);
+        }
+        this._completionTimestamp = undefined;
+        this._elapsedMs = undefined;
+        this._modelState.set({
+            value: ResponseModelState.Pending
+        }, undefined);
+        this._onDidChange.fire(defaultChatResponseModelChangeReason);
     }
-    complete() {
+    _complete(completedAt, completionTimestamp) {
         if (this.isComplete) {
             return;
         }
         if (this._result?.errorDetails?.responseIsRedacted) {
             this._response.clear();
         }
-        this._elapsedMs = Math.max(0, Date.now() - this.confirmationAdjustedTimestamp.get());
+        this._response.finalizeReasoningDuration();
+        this._elapsedMs ??= Math.max(0, completedAt - this.confirmationAdjustedTimestamp.get());
         const state = !!this._result?.errorDetails && this._result.errorDetails.code !== "canceled" ? ResponseModelState.Failed : ResponseModelState.Complete;
+        this._completionTimestamp = completionTimestamp;
         this._modelState.set({
             value: state,
-            completedAt: Date.now()
+            completedAt
         }, undefined);
         this._onDidChange.fire({
             reason: "completedRequest"
         });
     }
     cancel() {
+        this._response.finalizeReasoningDuration();
         for (const part of this._response.value) {
             if (part.kind === "toolInvocation" && part instanceof ChatToolInvocation) {
                 part.cancelFromStreaming(ToolConfirmKind.Skipped);
@@ -930,9 +1084,12 @@ class ChatResponseModel extends Disposable {
                 part.dismiss(undefined);
             }
         }
+        const completedAt = Date.now();
+        this._elapsedMs ??= Math.max(0, completedAt - this.confirmationAdjustedTimestamp.get());
+        this._completionTimestamp = completedAt;
         this._modelState.set({
             value: ResponseModelState.Cancelled,
-            completedAt: Date.now()
+            completedAt
         }, undefined);
         this._onDidChange.fire({
             reason: "completedRequest"
@@ -992,17 +1149,43 @@ class ChatResponseModel extends Disposable {
             usedContext: this.usedContext,
             contentReferences: this.contentReferences,
             codeCitations: this.codeCitations,
-            timestamp: this._timestamp,
+            responseTimestamp: this._timestamp,
             timeSpentWaiting: (pendingConfirmation ? Date.now() - pendingConfirmation.startedWaitingAt : 0) + this._timeSpentWaitingAccumulator,
             promptTokens: this.usage?.promptTokens,
             completionTokens: this.completionTokenCount,
             outputBuffer: this.usage?.outputBuffer,
             promptTokenDetails: this.usage?.promptTokenDetails,
             copilotCredits: this.usage?.copilotCredits,
+            modelTotals: this.usage?.modelTotals,
+            sessionCopilotCredits: this.usage?.sessionCopilotCredits,
             elapsedMs: this.elapsedMs ?? (this.completedAt ? Math.max(0, this.completedAt - this.confirmationAdjustedTimestamp.get()) : undefined)
         };
     }
 }
+class IntendedModelSlot {
+    setIntendedModel(selection) {
+        this.intendedModel = selection;
+    }
+}
+var ChatInputStateOrigin;
+(function(ChatInputStateOrigin) {
+    ChatInputStateOrigin["Remote"] = "remote";
+})(ChatInputStateOrigin || (ChatInputStateOrigin = {}));
+function reviveSerializableInputState(state) {
+    return {
+        attachments: ( (state.attachments ?? []).map(IChatRequestVariableEntry.fromExport)),
+        mode: state.mode,
+        selectedModel: state.selectedModel && {
+            identifier: state.selectedModel.identifier,
+            metadata: state.selectedModel.metadata
+        },
+        modelConfiguration: state.selectedModel ? (state.selectedModel.modelConfiguration ?? state.modelConfiguration) : undefined,
+        contrib: state.contrib,
+        inputText: state.inputText,
+        selections: state.selections,
+        permissionLevel: state.permissionLevel
+    };
+}
 function normalizeSerializableChatData(raw) {
     normalizeOldFields(raw);
     if (!("version" in raw)) {
@@ -1040,6 +1223,13 @@ function getLastYearDate() {
 function isExportableSessionData(obj) {
     return !!obj && Array.isArray(obj.requests) && typeof obj.responderUsername === "string";
 }
+function extractExportableSessionData(data) {
+    return {
+        initialLocation: data.initialLocation,
+        requests: data.requests,
+        responderUsername: data.responderUsername
+    };
+}
 function isSerializableSessionData(obj) {
     const data = obj;
     return isExportableSessionData(obj) && typeof data.creationDate === "number" && typeof data.sessionId === "string" && obj.requests.every(
@@ -1062,6 +1252,12 @@ class InputModel {
         }, initialState);
         this.state = this._state;
     }
+    get intendedModel() {
+        return this._intendedModel;
+    }
+    setIntendedModel(selection) {
+        this._intendedModel = selection;
+    }
     setState(state) {
         const current = this._state.get();
         _logChangesToStateModel(state, current, this.logger, this.sessionId);
@@ -1074,9 +1270,13 @@ class InputModel {
             selectedModel: undefined,
             inputText: "",
             selections: [],
-            contrib: {},
             ...current,
-            ...state
+            ...state,
+            contrib: {
+                ...current?.contrib,
+                ...state.contrib
+            },
+            origin: state.origin
         }, undefined);
     }
     clearState() {
@@ -1152,6 +1352,14 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
         this._pendingRequests.push(...newPending);
         this._onDidChangePendingRequests.fire();
     }
+    replacePendingRequests(requests) {
+        if (this._pendingRequests.length === requests.length && requests.every((request, index) => this._pendingRequests[index] === request)) {
+            return;
+        }
+        this._pendingRequests.length = 0;
+        this._pendingRequests.push(...requests);
+        this._onDidChangePendingRequests.fire();
+    }
     addPendingRequest(request, kind, sendOptions) {
         const pendingRequest = {
             request,
@@ -1217,14 +1425,18 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
         return this._requests.at(-1);
     }
     get sessionCost() {
-        let totalCredits = 0;
+        let summedCredits = 0;
+        let reportedSessionCredits = 0;
         for (const request of this._requests) {
-            const credits = request.response?.usage?.copilotCredits;
-            if (typeof credits === "number") {
-                totalCredits += credits;
+            const usage = request.response?.usage;
+            if (typeof usage?.copilotCredits === "number") {
+                summedCredits += usage.copilotCredits;
+            }
+            if (typeof usage?.sessionCopilotCredits === "number") {
+                reportedSessionCredits = Math.max(reportedSessionCredits, usage.sessionCopilotCredits);
             }
         }
-        return totalCredits;
+        return Math.max(summedCredits, reportedSessionCredits);
     }
     get timestamp() {
         return this._timestamp;
@@ -1324,23 +1536,15 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
             this._sessionResource = LocalChatSessionUri.forSession(this._sessionId);
         }
         this._disableBackgroundKeepAlive = initialModelProps.disableBackgroundKeepAlive ?? false;
-        this._requests = initialData ? this._deserialize(initialData) : [];
         this._timestamp = (isValidFullData && initialData.creationDate) || Date.now();
+        this._requests = initialData ? this._deserialize(initialData) : [];
         this._customTitle = isValidFullData ? initialData.customTitle : undefined;
         const serializedInputState = initialModelProps.inputState || (isValidFullData && initialData.inputState ? initialData.inputState : undefined);
-        this.inputModel = ( new InputModel(serializedInputState && {
-            attachments: ( (serializedInputState.attachments ?? []).map(IChatRequestVariableEntry.fromExport)),
-            mode: serializedInputState.mode,
-            selectedModel: serializedInputState.selectedModel && {
-                identifier: serializedInputState.selectedModel.identifier,
-                metadata: serializedInputState.selectedModel.metadata
-            },
-            modelConfiguration: serializedInputState.selectedModel ? (serializedInputState.selectedModel.modelConfiguration ?? serializedInputState.modelConfiguration) : undefined,
-            contrib: serializedInputState.contrib,
-            inputText: serializedInputState.inputText,
-            selections: serializedInputState.selections,
-            permissionLevel: serializedInputState.permissionLevel
-        }, this.logService, this._sessionId));
+        this.inputModel = ( new InputModel(
+            serializedInputState && reviveSerializableInputState(serializedInputState),
+            this.logService,
+            this._sessionId
+        ));
         this.dataSerializer = dataRef?.serializer;
         this._initialResponderUsername = initialData?.responderUsername;
         this._repoData = isValidFullData && initialData.repoData ? initialData.repoData : undefined;
@@ -1349,7 +1553,9 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
             this._pendingRequests = this._deserializePendingRequests(initialData.pendingRequests);
         }
         this._initialLocation = initialData?.initialLocation ?? initialModelProps.initialLocation;
+        this.sessionTypeSelectionReason = initialModelProps.sessionTypeSelectionReason;
         this._canUseTools = initialModelProps.canUseTools;
+        this.isReadOnly = initialModelProps.isReadOnly ?? constObservable(false);
         this.lastRequestObs = observableFromEvent(this, this.onDidChange, () => this._requests.at(-1));
         this._register(autorun(reader => {
             const request = this.lastRequestObs.read(reader);
@@ -1445,19 +1651,25 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
     _deserializeRequest(raw) {
         const parsedRequest = typeof raw.message === "string" ? this.getParsedRequestFromString(raw.message) : reviveParsedChatRequest(raw.message);
         const variableData = this.reviveVariableData(raw.variableData);
+        const requestTimestamp = typeof raw.timestamp === "number" && raw.timestamp > 0 ? raw.timestamp : undefined;
         const request = ( new ChatRequestModel({
             session: this,
             message: parsedRequest,
             variableData,
-            timestamp: raw.timestamp ?? -1,
+            timestamp: requestTimestamp,
+            fallbackTimestamp: this._timestamp,
             restoredId: raw.requestId,
             confirmation: raw.confirmation,
             editedFileEvents: raw.editedFileEvents,
             modelId: raw.modelId,
             modeInfo: raw.modeInfo,
             isSystemInitiated: raw.isSystemInitiated,
+            requestSource: getRestoredChatRequestSource(raw, parsedRequest.text),
+            isHiddenFromTranscript: raw.hiddenFromTranscript,
+            isRequestHiddenFromTranscript: raw.requestHiddenFromTranscript,
             systemInitiatedLabel: raw.systemInitiatedLabel,
-            terminalExecutionId: raw.terminalExecutionId
+            terminalExecutionId: raw.terminalExecutionId,
+            origin: reviveChatRequestOrigin(raw.origin)
         }));
         request.shouldBeRemovedOnSend = raw.isHidden ? {
             requestId: raw.requestId
@@ -1495,8 +1707,9 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
                 slashCommand: raw.slashCommand,
                 requestId: request.id,
                 modelState,
+                completionTimestamp: raw.modelState && "completedAt" in raw.modelState && Number.isFinite(raw.modelState.completedAt) && raw.modelState.completedAt > 0 ? raw.modelState.completedAt : null,
                 vote: raw.vote,
-                timestamp: raw.timestamp,
+                timestamp: typeof raw.responseTimestamp === "number" && raw.responseTimestamp > 0 ? raw.responseTimestamp : requestTimestamp,
                 result,
                 followups: raw.followups,
                 restoredId: raw.responseId,
@@ -1510,14 +1723,16 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
             request.response.shouldBeRemovedOnSend = raw.isHidden ? {
                 requestId: raw.requestId
             } : raw.shouldBeRemovedOnSend;
-            if (typeof raw.completionTokens === "number") {
+            if (typeof raw.completionTokens === "number" || typeof raw.promptTokens === "number" || typeof raw.copilotCredits === "number" || typeof raw.sessionCopilotCredits === "number") {
                 request.response.setUsage({
                     kind: "usage",
                     promptTokens: raw.promptTokens ?? 0,
-                    completionTokens: raw.completionTokens,
+                    completionTokens: raw.completionTokens ?? 0,
                     outputBuffer: raw.outputBuffer,
                     promptTokenDetails: raw.promptTokenDetails,
-                    copilotCredits: raw.copilotCredits
+                    copilotCredits: raw.copilotCredits,
+                    modelTotals: raw.modelTotals,
+                    sessionCopilotCredits: raw.sessionCopilotCredits
                 });
             }
             if (raw.usedContext) {
@@ -1641,16 +1856,24 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
         id,
         isSystemInitiated,
         systemInitiatedLabel,
-        terminalExecutionId
+        terminalExecutionId,
+        isTerminalCommand,
+        timestamp,
+        hideFromTranscript,
+        origin,
+        isRequestHiddenFromTranscript,
+        requestSource
     ) {
         const editedFileEvents = [...( this.currentEditedFileEvents.values())];
         this.currentEditedFileEvents.clear();
+        const requestTimestamp = timestamp === undefined ? Date.now() : typeof timestamp === "number" && Number.isFinite(timestamp) && timestamp > 0 ? timestamp : undefined;
         const request = ( new ChatRequestModel({
             restoredId: id,
             session: this,
             message,
             variableData,
-            timestamp: Date.now(),
+            timestamp: requestTimestamp,
+            fallbackTimestamp: this._timestamp,
             attempt,
             modeInfo,
             confirmation,
@@ -1661,8 +1884,13 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
             editedFileEvents: editedFileEvents.length ? editedFileEvents : undefined,
             userSelectedTools,
             isSystemInitiated,
+            requestSource,
+            isHiddenFromTranscript: hideFromTranscript,
+            isRequestHiddenFromTranscript,
             systemInitiatedLabel,
-            terminalExecutionId
+            terminalExecutionId,
+            isTerminalCommand,
+            origin
         }));
         request.response = ( new ChatResponseModel({
             responseContent: [],
@@ -1812,7 +2040,7 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
                     requestId: r.id,
                     message,
                     variableData: IChatRequestVariableData.toExport(r.variableData),
-                    response: r.response ? ( r.response.entireResponse.value.map(item => {
+                    response: r.response ? ( r.response.entireResponse.value.filter(item => item.kind !== "voiceProgress").map(item => {
                         if (item.kind === "treeData") {
                             return item.treeData;
                         } else if (item.kind === "markdownContent") {
@@ -1823,14 +2051,22 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
                     })) : undefined,
                     shouldBeRemovedOnSend: r.shouldBeRemovedOnSend,
                     agent: agentJson,
-                    timestamp: r.timestamp,
+                    timestamp: r.requestTimestamp,
                     confirmation: r.confirmation,
                     editedFileEvents: r.editedFileEvents,
                     modelId: r.modelId,
                     modeInfo: r.modeInfo,
                     isSystemInitiated: r.isSystemInitiated || undefined,
+                    ...(r.requestSource !== undefined ? {
+                        requestSource: r.requestSource
+                    } : {}),
+                    hiddenFromTranscript: r.isHiddenFromTranscript || undefined,
+                    ...(r.isRequestHiddenFromTranscript && !r.isHiddenFromTranscript ? {
+                        requestHiddenFromTranscript: true
+                    } : {}),
                     systemInitiatedLabel: r.systemInitiatedLabel,
                     terminalExecutionId: r.terminalExecutionId,
+                    origin: r.origin ? serializeChatRequestOrigin(r.origin) : undefined,
                     ...r.response?.toJSON()
                 };
             }))
@@ -1879,6 +2115,9 @@ function canMergeMarkdownStrings(md1, md2) {
     }
     return equals(md1.isTrusted, md2.isTrusted) && md1.supportHtml === md2.supportHtml && md1.supportThemeIcons === md2.supportThemeIcons;
 }
+function isNestedSubagentResponsePart(part) {
+    return "subAgentInvocationId" in part && !!part.subAgentInvocationId;
+}
 function appendMarkdownString(md1, md2) {
     const appendedValue = typeof md2 === "string" ? md2 : md2.value;
     return {
@@ -1894,7 +2133,7 @@ function getCodeCitationsMessage(citations) {
         return "";
     }
     const licenseTypes = citations.reduce((set, c) => set.add(c.license), ( new Set()));
-    const label = licenseTypes.size === 1 ? ( localize(8579, "Similar code found with 1 license type", licenseTypes.size)) : ( localize(8580, "Similar code found with {0} license types", licenseTypes.size));
+    const label = licenseTypes.size === 1 ? ( localize(10296, "Similar code found with 1 license type", licenseTypes.size)) : ( localize(10297, "Similar code found with {0} license types", licenseTypes.size));
     return label;
 }
 function serializeSendOptions(options) {
@@ -1903,15 +2142,18 @@ function serializeSendOptions(options) {
         userSelectedModelId: options.userSelectedModelId,
         userSelectedModelConfiguration: options.userSelectedModelConfiguration,
         userSelectedTools: options.userSelectedTools?.get(),
+        instructionContext: options.instructionContext,
         location: options.location,
         locationData: options.locationData,
         attempt: options.attempt,
         noCommandDetection: options.noCommandDetection,
+        isVoiceModeInput: options.isVoiceModeInput,
         agentId: options.agentId,
         agentIdSilent: options.agentIdSilent,
         slashCommand: options.slashCommand,
         confirmation: options.confirmation,
         isSystemInitiated: options.isSystemInitiated,
+        hideFromTranscript: options.hideFromTranscript,
         systemInitiatedLabel: options.systemInitiatedLabel,
         terminalExecutionId: options.terminalExecutionId
     };
@@ -1924,7 +2166,7 @@ var ChatRequestEditedFileEventKind;
 })(ChatRequestEditedFileEventKind || (ChatRequestEditedFileEventKind = {}));
 var ChatResponseResource;
 (function(ChatResponseResource) {
-    ChatResponseResource.scheme = "vscode-chat-response-resource";
+    ChatResponseResource.scheme = Schemas.vscodeChatResponseResource;
     function createUri(sessionResource, toolCallId, index, basename) {
         return ( URI.from({
             scheme: ChatResponseResource.scheme,
@@ -1985,4 +2227,4 @@ function logChangesToStateModel(model, message, newState, oldState, logger) {
     logger.debug(`[ChatModelChanged] Chat Model Changed,${message}`);
 }
 
-export { CHAT_ATTACHABLE_IMAGE_MIME_TYPES, ChatModel, ChatRequestEditedFileEventKind, ChatRequestModel, ChatRequestRemovalReason, ChatResponseModel, ChatResponseResource, IChatRequestVariableData, Response, appendMarkdownString, canMergeMarkdownStrings, defaultChatResponseModelChangeReason, getAttachableImageExtension, getCodeCitationsMessage, isCellTextEditOperation, isCellTextEditOperationArray, isExportableSessionData, isSerializableSessionData, logChangesToStateModel, normalizeSerializableChatData, serializeSendOptions, toChatHistoryContent, updateRanges };
+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 };