@codingame/monaco-vscode-api 30.0.1 → 31.0.1

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

@@ -77,34 +77,6 @@ var ILanguageModelChatMetadata;
     }
     ILanguageModelChatMetadata.matchesQualifiedName = matchesQualifiedName;
 })(ILanguageModelChatMetadata || (ILanguageModelChatMetadata = {}));
-async function getTextResponseFromStream(response) {
-    let responseText = "";
-    const streaming = (async () => {
-        if (!response?.stream) {
-            return;
-        }
-        for await (const part of response.stream) {
-            if (Array.isArray(part)) {
-                for (const item of part) {
-                    if (item.type === "text") {
-                        responseText += item.value;
-                    }
-                }
-            } else if (part.type === "text") {
-                responseText += part.value;
-            }
-        }
-    })();
-    try {
-        await Promise.all([response.result, streaming]);
-        return responseText;
-    } catch (err) {
-        if (responseText) {
-            return responseText;
-        }
-        throw err;
-    }
-}
 function isILanguageModelChatSelector(value) {
     if (typeof value !== "object" || value === null) {
         return false;
@@ -118,15 +90,15 @@ const languageModelChatProviderType = {
     properties: {
         vendor: {
             type: "string",
-            description: ( localize(7271, "A globally unique vendor of language model chat provider."))
+            description: ( localize(7388, "A globally unique vendor of language model chat provider."))
         },
         displayName: {
             type: "string",
-            description: ( localize(7272, "The display name of the language model chat provider."))
+            description: ( localize(7389, "The display name of the language model chat provider."))
         },
         configuration: {
             type: "object",
-            description: ( localize(7273, "Configuration options for the language model chat provider.")),
+            description: ( localize(7390, "Configuration options for the language model chat provider.")),
             anyOf: [{
                 $ref: "http://json-schema.org/draft-07/schema#"
             }, {
@@ -138,7 +110,7 @@ const languageModelChatProviderType = {
                             properties: {
                                 secret: {
                                     type: "boolean",
-                                    description: ( localize(7274, "Whether the property is a secret."))
+                                    description: ( localize(7391, "Whether the property is a secret."))
                                 }
                             }
                         }
@@ -148,7 +120,7 @@ const languageModelChatProviderType = {
                         properties: {
                             secret: {
                                 type: "boolean",
-                                description: ( localize(7274, "Whether the property is a secret."))
+                                description: ( localize(7391, "Whether the property is a secret."))
                             }
                         }
                     }
@@ -158,19 +130,19 @@ const languageModelChatProviderType = {
         managementCommand: {
             type: "string",
             description: ( localize(
-                7275,
+                7392,
                 "A command to manage the language model chat provider, e.g. 'Manage Copilot models'. This is used in the chat model picker. If not provided, a gear icon is not rendered during vendor selection."
             )),
             deprecated: true,
             deprecationMessage: ( localize(
-                7276,
+                7393,
                 "The managementCommand property is deprecated and will be removed in a future release. Use the new configuration property instead."
             ))
         },
         when: {
             type: "string",
             description: ( localize(
-                7277,
+                7394,
                 "Condition which must be true to show this language model chat provider in the Manage Models list."
             ))
         }
@@ -179,7 +151,7 @@ const languageModelChatProviderType = {
 const languageModelChatProviderExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "languageModelChatProviders",
     jsonSchema: {
-        description: ( localize(7278, "Contribute language model chat providers of a specific vendor.")),
+        description: ( localize(7395, "Contribute language model chat providers of a specific vendor.")),
         oneOf: [languageModelChatProviderType, {
             type: "array",
             items: languageModelChatProviderType
@@ -276,18 +248,18 @@ let LanguageModelsService = class LanguageModelsService {
                 for (const item of Iterable.wrap(extension.value)) {
                     if (( this._vendors.has(item.vendor))) {
                         extension.collector.error(( localize(
-                            7279,
+                            7396,
                             "The vendor '{0}' is already registered and cannot be registered twice",
                             item.vendor
                         )));
                         continue;
                     }
                     if (isFalsyOrWhitespace(item.vendor)) {
-                        extension.collector.error(( localize(7280, "The vendor field cannot be empty.")));
+                        extension.collector.error(( localize(7397, "The vendor field cannot be empty.")));
                         continue;
                     }
                     if (item.vendor.trim() !== item.vendor) {
-                        extension.collector.error(( localize(7281, "The vendor field cannot start or end with whitespace.")));
+                        extension.collector.error(( localize(7398, "The vendor field cannot start or end with whitespace.")));
                         continue;
                     }
                     addedVendors.push(item);
@@ -462,8 +434,11 @@ let LanguageModelsService = class LanguageModelsService {
         if (!vendor) {
             return;
         }
-        await this._extensionService.activateByEvent(`onLanguageModelChatProvider:${vendorId}`);
-        const provider = this._providers.get(vendorId);
+        let provider = this._providers.get(vendorId);
+        if (!provider) {
+            await this._extensionService.activateByEvent(`onLanguageModelChatProvider:${vendorId}`);
+            provider = this._providers.get(vendorId);
+        }
         if (!provider) {
             this._logService.warn(`[LM] No provider registered for vendor ${vendorId}`);
             return;
@@ -510,7 +485,7 @@ let LanguageModelsService = class LanguageModelsService {
                 if (group.vendor !== vendorId) {
                     continue;
                 }
-                if (vendor.isDefault && !vendor.configuration) {
+                if (!vendor.configuration && allModels.length > 0) {
                     if (group.settings) {
                         for (const model of allModels) {
                             const modelConfig = group.settings[model.metadata.id];
@@ -562,6 +537,7 @@ let LanguageModelsService = class LanguageModelsService {
                     });
                 }
             }
+            const oldGroups = this._modelsGroups.get(vendorId) ?? [];
             this._modelsGroups.set(vendorId, languageModelsGroups);
             const oldModels = this._clearModelCache(vendorId);
             let hasChanges = false;
@@ -576,6 +552,9 @@ let LanguageModelsService = class LanguageModelsService {
             }
             this._logService.trace(`[LM] Resolved language models for vendor ${vendorId}`, allModels);
             hasChanges = hasChanges || oldModels.size > 0;
+            if (!hasChanges) {
+                hasChanges = this._hasGroupStructureChanged(oldGroups, languageModelsGroups);
+            }
             this._clearModelConfigurations(vendorId);
             for (const [identifier, config] of perModelConfigurations) {
                 if (( this._modelCache.has(identifier))) {
@@ -589,6 +568,19 @@ let LanguageModelsService = class LanguageModelsService {
             }
         });
     }
+    _hasGroupStructureChanged(oldGroups, newGroups) {
+        if (oldGroups.length !== newGroups.length) {
+            return true;
+        }
+        for (let i = 0; i < oldGroups.length; i++) {
+            const oldGroup = oldGroups[i];
+            const newGroup = newGroups[i];
+            if (oldGroup.group?.name !== newGroup.group?.name || oldGroup.group?.vendor !== newGroup.group?.vendor || oldGroup.status?.message !== newGroup.status?.message || oldGroup.status?.severity !== newGroup.status?.severity || oldGroup.modelIdentifiers.length !== newGroup.modelIdentifiers.length) {
+                return true;
+            }
+        }
+        return false;
+    }
     getLanguageModelGroups(vendor) {
         return this._modelsGroups.get(vendor) ?? [];
     }
@@ -734,7 +726,7 @@ let LanguageModelsService = class LanguageModelsService {
                 await this._languageModelsConfigurationService.updateLanguageModelsProviderGroup(group, updatedGroup);
             }
         } else if (( Object.keys(updatedConfig)).length > 0) {
-            const vendor = this.getVendors().find(v => v.vendor === metadata.vendor);
+            const vendor = this._vendors.get(metadata.vendor);
             if (!vendor) {
                 return;
             }
@@ -763,7 +755,7 @@ let LanguageModelsService = class LanguageModelsService {
         const actions = [];
         const currentConfig = this._modelConfigurations.get(modelId) ?? {};
         for (const [key, propSchema] of Object.entries(schema.properties)) {
-            if (!propSchema.enum || !Array.isArray(propSchema.enum)) {
+            if (!propSchema.enum || !Array.isArray(propSchema.enum) || propSchema.enum.length < 2) {
                 continue;
             }
             const currentValue = currentConfig[key] ?? propSchema.default;
@@ -773,7 +765,7 @@ let LanguageModelsService = class LanguageModelsService {
             const enumDescriptions = propSchema.enumDescriptions;
             const enumActions = ( propSchema.enum.map((value, index) => {
                 const itemLabel = enumItemLabels?.[index] ?? String(value);
-                const displayLabel = value === defaultValue ? ( localize(7282, "{0} (default)", itemLabel)) : itemLabel;
+                const displayLabel = value === defaultValue ? ( localize(7399, "{0} (default)", itemLabel)) : itemLabel;
                 const tooltip = enumDescriptions?.[index] ?? "";
                 return {
                     id: `configureModel.${key}.${value}`,
@@ -965,18 +957,18 @@ let LanguageModelsService = class LanguageModelsService {
         try {
             await ( new Promise(resolve => {
                 const inputBox = disposables.add(this._quickInputService.createInputBox());
-                inputBox.title = ( localize(7283, "Group Name"));
-                inputBox.placeholder = ( localize(7284, "Enter a name for the group"));
+                inputBox.title = ( localize(7400, "Group Name"));
+                inputBox.placeholder = ( localize(7401, "Enter a name for the group"));
                 inputBox.value = providerGroupName;
                 inputBox.ignoreFocusOut = true;
                 disposables.add(inputBox.onDidChangeValue(value => {
                     if (!value) {
-                        inputBox.validationMessage = ( localize(7285, "Please enter a name"));
+                        inputBox.validationMessage = ( localize(7402, "Please enter a name"));
                         inputBox.severity = Severity$1.Error;
                         return;
                     }
                     if (!existing && ( languageModelProviderGroups.some(g => g.name === value))) {
-                        inputBox.validationMessage = ( localize(7286, "A language models group with this name already exists"));
+                        inputBox.validationMessage = ( localize(7403, "A language models group with this name already exists"));
                         inputBox.severity = Severity$1.Error;
                         return;
                     }
@@ -1057,7 +1049,7 @@ let LanguageModelsService = class LanguageModelsService {
                 quickPick.items = ( items.map(item => ({
                     label: item
                 })));
-                quickPick.placeholder = propertySchema.description ?? ( localize(7287, "Select value for {0}", property));
+                quickPick.placeholder = propertySchema.description ?? ( localize(7404, "Select value for {0}", property));
                 quickPick.canSelectMany = true;
                 quickPick.ignoreFocusOut = true;
                 disposables.add(quickPick.onDidAccept(() => {
@@ -1079,7 +1071,7 @@ let LanguageModelsService = class LanguageModelsService {
             const value = await ( new Promise((resolve, reject) => {
                 const inputBox = disposables.add(this._quickInputService.createInputBox());
                 inputBox.title = `${groupName}: ${propertySchema.title ?? property}`;
-                inputBox.placeholder = ( localize(7288, "Enter value for {0}", property));
+                inputBox.placeholder = ( localize(7405, "Enter value for {0}", property));
                 inputBox.password = !!propertySchema.secret;
                 inputBox.ignoreFocusOut = true;
                 if (existing?.[property]) {
@@ -1092,20 +1084,20 @@ let LanguageModelsService = class LanguageModelsService {
                 }
                 disposables.add(inputBox.onDidChangeValue(value => {
                     if (!value && required) {
-                        inputBox.validationMessage = ( localize(7289, "Value is required"));
+                        inputBox.validationMessage = ( localize(7406, "Value is required"));
                         inputBox.severity = Severity$1.Error;
                         return;
                     }
                     if (propertySchema.type === "number" || propertySchema.type === "integer") {
                         if (isNaN(Number(value))) {
-                            inputBox.validationMessage = ( localize(7290, "Please enter a number"));
+                            inputBox.validationMessage = ( localize(7407, "Please enter a number"));
                             inputBox.severity = Severity$1.Error;
                             return;
                         }
                     }
                     if (propertySchema.type === "boolean") {
                         if (value !== "true" && value !== "false") {
-                            inputBox.validationMessage = ( localize(7291, "Please enter true or false"));
+                            inputBox.validationMessage = ( localize(7408, "Please enter true or false"));
                             inputBox.severity = Severity$1.Error;
                             return;
                         }
@@ -1115,7 +1107,7 @@ let LanguageModelsService = class LanguageModelsService {
                 }));
                 disposables.add(inputBox.onDidAccept(() => {
                     if (!inputBox.value && required) {
-                        inputBox.validationMessage = ( localize(7289, "Value is required"));
+                        inputBox.validationMessage = ( localize(7406, "Value is required"));
                         inputBox.severity = Severity$1.Error;
                         return;
                     }
@@ -1426,4 +1418,4 @@ let LanguageModelsService = class LanguageModelsService {
 };
 LanguageModelsService = LanguageModelsService_1 = ( __decorate([( __param(0, IExtensionService)), ( __param(1, ILogService)), ( __param(2, IStorageService)), ( __param(3, IContextKeyService)), ( __param(4, ILanguageModelsConfigurationService)), ( __param(5, IQuickInputService)), ( __param(6, ISecretStorageService)), ( __param(7, IProductService)), ( __param(8, IRequestService))], LanguageModelsService));
 
-export { ChatImageMimeType, ChatMessageRole, ILanguageModelChatMetadata, ImageDetailLevel, LanguageModelPartAudience, LanguageModelsService, getTextResponseFromStream, isILanguageModelChatSelector, languageModelChatProviderExtensionPoint };
+export { ChatImageMimeType, ChatMessageRole, ILanguageModelChatMetadata, ImageDetailLevel, LanguageModelPartAudience, LanguageModelsService, isILanguageModelChatSelector, languageModelChatProviderExtensionPoint };

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

@@ -10,7 +10,7 @@ import { EditSuggestionId } from "../../../../../editor/common/textModelEditSour
 import { ILogService } from "../../../../../platform/log/common/log.service.js";
 import { ICellEditOperation } from "../../../notebook/common/notebookCommon.js";
 import { ChatRequestToolReferenceEntry, IChatRequestVariableEntry } from "../attachments/chatVariableEntries.js";
-import { ChatAgentVoteDirection, ChatRequestQueueKind, IChatAgentMarkdownContentWithVulnerability, IChatClearToPreviousToolInvocation, IChatCodeCitation, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatDisabledClaudeHooksPart, IChatEditingSessionAction, IChatElicitationRequest, IChatElicitationRequestSerialized, IChatExternalToolInvocationUpdate, IChatExtensionsContent, IChatFollowup, IChatHookPart, IChatLocationData, IChatMarkdownContent, IChatMcpServersStarting, IChatMcpServersStartingSerialized, IChatMultiDiffData, IChatMultiDiffDataSerialized, IChatNotebookEdit, IChatProgress, IChatProgressMessage, IChatPullRequestContent, IChatQuestionCarousel, IChatResponseCodeblockUriPart, IChatResponseProgressFileTreeData, IChatSendRequestOptions, IChatSessionContext, IChatSessionTiming, IChatTask, IChatTaskSerialized, IChatTextEdit, IChatThinkingPart, IChatToolInvocation, IChatToolInvocationSerialized, IChatTreeData, IChatUndoStop, IChatUsage, IChatUsedContext, IChatWarningMessage, IChatWorkspaceEdit, ResponseModelState } from "../chatService/chatService.js";
+import { ChatAgentVoteDirection, ChatRequestQueueKind, IChatAgentMarkdownContentWithVulnerability, IChatClearToPreviousToolInvocation, IChatCodeCitation, IChatCommandButton, IChatConfirmation, IChatContentInlineReference, IChatContentReference, IChatDisabledClaudeHooksPart, IChatEditingSessionAction, IChatElicitationRequest, IChatElicitationRequestSerialized, IChatExternalToolInvocationUpdate, IChatExtensionsContent, IChatFollowup, IChatHookPart, IChatLocationData, IChatMarkdownContent, IChatMcpServersStarting, IChatMcpServersStartingSerialized, IChatMultiDiffData, IChatMultiDiffDataSerialized, IChatNotebookEdit, IChatProgress, IChatPlanReview, IChatProgressMessage, IChatPullRequestContent, IChatQuestionCarousel, IChatResponseCodeblockUriPart, IChatResponseProgressFileTreeData, IChatSendRequestOptions, IChatSessionTiming, IChatTask, IChatTaskSerialized, IChatTextEdit, IChatThinkingPart, IChatToolInvocation, IChatToolInvocationSerialized, IChatTreeData, IChatUndoStop, IChatUsage, IChatUsedContext, IChatWarningMessage, IChatWorkspaceEdit, ResponseModelState } from "../chatService/chatService.js";
 import { IChatService } from "../chatService/chatService.service.js";
 import { ChatAgentLocation, ChatModeKind, ChatPermissionLevel } from "../constants.js";
 import { IChatEditingSession } from "../editing/chatEditingService.js";
@@ -49,6 +49,9 @@ export interface ISerializableSendOptions {
     agentIdSilent?: string;
     slashCommand?: string;
     confirmation?: string;
+    isSystemInitiated?: boolean;
+    systemInitiatedLabel?: string;
+    terminalExecutionId?: string;
 }
 /**
  * Serializable representation of a pending chat request.
@@ -87,6 +90,9 @@ export interface IChatRequestModel {
     setShouldBeBlocked(value: boolean): void;
     readonly modelId?: string;
     readonly userSelectedTools?: UserSelectedTools;
+    readonly isSystemInitiated?: boolean;
+    readonly systemInitiatedLabel?: string;
+    readonly terminalExecutionId?: string;
 }
 export interface ICodeBlockInfo {
     readonly suggestionId: EditSuggestionId;
@@ -121,7 +127,7 @@ export interface IChatNotebookEditGroup {
  * Progress kinds that are included in the history of a response.
  * Excludes "internal" types that are included in history.
  */
-export type IChatProgressHistoryResponseContent = IChatMarkdownContent | IChatAgentMarkdownContentWithVulnerability | IChatResponseCodeblockUriPart | IChatTreeData | IChatMultiDiffDataSerialized | IChatContentInlineReference | IChatProgressMessage | IChatCommandButton | IChatWarningMessage | IChatTask | IChatTaskSerialized | IChatTextEditGroup | IChatNotebookEditGroup | IChatConfirmation | IChatQuestionCarousel | IChatExtensionsContent | IChatThinkingPart | IChatHookPart | IChatPullRequestContent | IChatWorkspaceEdit;
+export type IChatProgressHistoryResponseContent = IChatMarkdownContent | IChatAgentMarkdownContentWithVulnerability | IChatResponseCodeblockUriPart | IChatTreeData | IChatMultiDiffDataSerialized | IChatContentInlineReference | IChatProgressMessage | IChatCommandButton | IChatWarningMessage | IChatTask | IChatTaskSerialized | IChatTextEditGroup | IChatNotebookEditGroup | IChatConfirmation | IChatQuestionCarousel | IChatPlanReview | IChatExtensionsContent | IChatThinkingPart | IChatHookPart | IChatPullRequestContent | IChatWorkspaceEdit;
 /**
  * "Normal" progress kinds that are rendered as parts of the stream of content.
  */
@@ -175,6 +181,12 @@ export interface IChatResponseModel {
         detail?: string;
     } | undefined>;
     readonly isInProgress: IObservable<boolean>;
+    /**
+     * True whenever this response has not reached a terminal state yet.
+     * Unlike {@link isInProgress}, this remains true during tool confirmations,
+     * elicitations, and any other intermediate state.
+     */
+    readonly isIncomplete: IObservable<boolean>;
     readonly shouldBeRemovedOnSend: IChatRequestDisablement | undefined;
     readonly shouldBeBlocked: IObservable<boolean>;
     readonly isCompleteAddedRequest: boolean;
@@ -184,6 +196,11 @@ export interface IChatResponseModel {
     readonly followups?: IChatFollowup[] | undefined;
     readonly result?: IChatAgentResult;
     readonly usage?: IChatUsage;
+    readonly usageObs: IObservable<IChatUsage | undefined>;
+    readonly completionTokenCount: number | undefined;
+    readonly completionTokenCountObs: IObservable<number | undefined>;
+    /** Elapsed generation time in ms (excluding confirmation waits). Set on completion and serialized. */
+    readonly elapsedMs: number | undefined;
     readonly codeBlockInfos: ICodeBlockInfo[] | undefined;
     initializeCodeBlockInfos(codeBlockInfo: ICodeBlockInfo[]): void;
     addUndoStop(undoStop: IChatUndoStop): void;
@@ -240,6 +257,9 @@ export interface IChatRequestModelParameters {
     restoredId?: string;
     editedFileEvents?: IChatAgentEditedFileEvent[];
     userSelectedTools?: UserSelectedTools;
+    isSystemInitiated?: boolean;
+    systemInitiatedLabel?: string;
+    terminalExecutionId?: string;
 }
 export declare class ChatRequestModel implements IChatRequestModel {
     readonly id: string;
@@ -251,6 +271,9 @@ export declare class ChatRequestModel implements IChatRequestModel {
     readonly modelId?: string;
     readonly modeInfo?: IChatRequestModeInfo;
     readonly userSelectedTools?: UserSelectedTools;
+    readonly isSystemInitiated?: boolean;
+    readonly systemInitiatedLabel?: string;
+    readonly terminalExecutionId?: string;
     private readonly _shouldBeBlocked;
     get shouldBeBlocked(): IObservable<boolean>;
     setShouldBeBlocked(value: boolean): void;
@@ -341,6 +364,7 @@ export interface IChatResponseModelParameters {
     restoredId?: string;
     modelState?: ResponseModelStateT;
     timeSpentWaiting?: number;
+    elapsedMs?: number;
     /**
      * undefined means it will be set later.
     */
@@ -365,12 +389,14 @@ export declare class ChatResponseModel extends Disposable implements IChatRespon
     private _modelState;
     private _vote?;
     private _result?;
-    private _usage?;
+    private readonly _usageObs;
+    private readonly _completionTokenCountObs;
     private _shouldBeRemovedOnSend;
     readonly isCompleteAddedRequest: boolean;
     private readonly _shouldBeBlocked;
     private readonly _timestamp;
     private _timeSpentWaitingAccumulator;
+    private _elapsedMs;
     confirmationAdjustedTimestamp: IObservable<number>;
     get shouldBeBlocked(): IObservable<boolean>;
     get request(): IChatRequestModel | undefined;
@@ -390,6 +416,10 @@ export declare class ChatResponseModel extends Disposable implements IChatRespon
     get entireResponse(): IResponse;
     get result(): IChatAgentResult | undefined;
     get usage(): IChatUsage | undefined;
+    get usageObs(): IObservable<IChatUsage | undefined>;
+    get completionTokenCount(): number | undefined;
+    get completionTokenCountObs(): IObservable<number | undefined>;
+    get elapsedMs(): number | undefined;
     get username(): string;
     private _followups?;
     get agent(): IChatAgentData | undefined;
@@ -411,6 +441,13 @@ export declare class ChatResponseModel extends Disposable implements IChatRespon
         detail?: string;
     } | undefined>;
     readonly isInProgress: IObservable<boolean>;
+    /**
+     * True whenever this response has not reached a terminal state yet.
+     * Unlike {@link isInProgress}, this remains true during tool confirmations,
+     * elicitations, and any other intermediate state. It only becomes false when
+     * the response completes, is cancelled, or fails.
+     */
+    readonly isIncomplete: IObservable<boolean>;
     private _responseView?;
     get response(): IResponse;
     private _codeBlockInfos;
@@ -434,6 +471,7 @@ export declare class ChatResponseModel extends Disposable implements IChatRespon
     setAgent(agent: IChatAgentData, slashCommand?: IChatAgentCommand): void;
     setResult(result: IChatAgentResult): void;
     setUsage(usage: IChatUsage): void;
+    private isSameUsage;
     complete(): void;
     cancel(): void;
     setFollowups(followups: IChatFollowup[] | undefined): void;
@@ -441,6 +479,7 @@ export declare class ChatResponseModel extends Disposable implements IChatRespon
     setEditApplied(edit: IChatTextEditGroup, editCount: number): boolean;
     adoptTo(session: ChatModel): void;
     finalizeUndoState(): void;
+    dispose(): void;
     toJSON(): ISerializableChatResponseData;
 }
 export interface IChatRequestDisablement {
@@ -459,19 +498,21 @@ export interface IChatRequestNeedsInputInfo {
 export interface IChatModel extends IDisposable {
     readonly onDidDispose: Event<void>;
     readonly onDidChange: Event<IChatChangeEvent>;
+    readonly sessionResource: URI;
     /** @deprecated Use {@link sessionResource} instead */
     readonly sessionId: string;
     /** Milliseconds timestamp this chat model was created. */
     readonly timestamp: number;
     readonly lastMessageDate: number;
     readonly timing: IChatSessionTiming;
-    readonly sessionResource: URI;
     readonly initialLocation: ChatAgentLocation;
     readonly title: string;
     readonly hasCustomTitle: boolean;
     readonly responderUsername: string;
     /** True whenever a request is currently running */
     readonly requestInProgress: IObservable<boolean>;
+    /** True whenever the last request has not reached a terminal state, regardless of intermediate states like tool calls or elicitations */
+    readonly hasActiveRequest: IObservable<boolean>;
     /** Provides session information when a request needs user interaction to continue */
     readonly requestNeedsInput: IObservable<IChatRequestNeedsInputInfo | undefined>;
     readonly inputPlaceholder?: string;
@@ -489,8 +530,6 @@ export interface IChatModel extends IDisposable {
     setCheckpoint(requestId: string | undefined): void;
     toExport(): IExportableChatData;
     toJSON(): ISerializableChatData;
-    readonly contributedChatSession: IChatSessionContext | undefined;
-    setContributedChatSession(session: IChatSessionContext | undefined): void;
     readonly repoData: IExportableRepoData | undefined;
     setRepoData(data: IExportableRepoData | undefined): void;
     readonly onDidChangePendingRequests: Event<void>;
@@ -514,8 +553,10 @@ interface ISerializableChatResponseData {
     contentReferences?: ReadonlyArray<IChatContentReference>;
     codeCitations?: ReadonlyArray<IChatCodeCitation>;
     timeSpentWaiting?: number;
+    completionTokens?: number;
+    elapsedMs?: number;
 }
-export type SerializedChatResponsePart = IMarkdownString | IChatResponseProgressFileTreeData | IChatContentInlineReference | IChatAgentMarkdownContentWithVulnerability | IChatThinkingPart | IChatProgressResponseContentSerialized | IChatQuestionCarousel | IChatDisabledClaudeHooksPart;
+export type SerializedChatResponsePart = IMarkdownString | IChatResponseProgressFileTreeData | IChatContentInlineReference | IChatAgentMarkdownContentWithVulnerability | IChatThinkingPart | IChatProgressResponseContentSerialized | IChatQuestionCarousel | IChatPlanReview | IChatDisabledClaudeHooksPart;
 export interface ISerializableChatRequestData extends ISerializableChatResponseData {
     requestId: string;
     message: string | IParsedChatRequest;
@@ -533,6 +574,9 @@ export interface ISerializableChatRequestData extends ISerializableChatResponseD
     editedFileEvents?: IChatAgentEditedFileEvent[];
     modelId?: string;
     modeInfo?: IChatRequestModeInfo;
+    isSystemInitiated?: boolean;
+    systemInitiatedLabel?: string;
+    terminalExecutionId?: string;
 }
 export interface ISerializableMarkdownInfo {
     readonly suggestionId: EditSuggestionId;
@@ -636,10 +680,7 @@ export interface ISerializableChatData2 extends ISerializableChatData1 {
 export interface ISerializableChatData3 extends Omit<ISerializableChatData2, "version" | "computedTitle"> {
     version: 3;
     customTitle: string | undefined;
-    /**
-     * Whether the session had pending edits when it was stored.
-     * todo@connor4312 This will be cleaned up with the globalization of edits.
-     */
+    /** Whether the session had pending edits when it was stored. */
     hasPendingEdits?: boolean;
     /** Current draft input state (added later, fully backwards compatible) */
     inputState?: ISerializableChatModelInputState;
@@ -819,9 +860,6 @@ export declare class ChatModel extends Disposable implements IChatModel {
     private readonly _onDidChangePendingRequests;
     readonly onDidChangePendingRequests: Event<void>;
     private _requests;
-    private _contributedChatSession;
-    get contributedChatSession(): IChatSessionContext | undefined;
-    setContributedChatSession(session: IChatSessionContext | undefined): void;
     private _repoData;
     get repoData(): IExportableRepoData | undefined;
     setRepoData(data: IExportableRepoData | undefined): void;
@@ -859,6 +897,7 @@ export declare class ChatModel extends Disposable implements IChatModel {
     private readonly _sessionResource;
     get sessionResource(): URI;
     readonly requestInProgress: IObservable<boolean>;
+    readonly hasActiveRequest: IObservable<boolean>;
     readonly requestNeedsInput: IObservable<IChatRequestNeedsInputInfo | undefined>;
     /** Input model for managing input state */
     readonly inputModel: InputModel;
@@ -911,7 +950,7 @@ export declare class ChatModel extends Disposable implements IChatModel {
     private _checkpoint;
     get checkpoint(): ChatRequestModel | undefined;
     private _setDisabledRequests;
-    addRequest(message: IParsedChatRequest, variableData: IChatRequestVariableData, attempt: number, modeInfo?: IChatRequestModeInfo, chatAgent?: IChatAgentData, slashCommand?: IChatAgentCommand, confirmation?: string, locationData?: IChatLocationData, attachments?: IChatRequestVariableEntry[], isCompleteAddedRequest?: boolean, modelId?: string, userSelectedTools?: UserSelectedTools, id?: string): ChatRequestModel;
+    addRequest(message: IParsedChatRequest, variableData: IChatRequestVariableData, attempt: number, modeInfo?: IChatRequestModeInfo, chatAgent?: IChatAgentData, slashCommand?: IChatAgentCommand, confirmation?: string, locationData?: IChatLocationData, attachments?: IChatRequestVariableEntry[], isCompleteAddedRequest?: boolean, modelId?: string, userSelectedTools?: UserSelectedTools, id?: string, isSystemInitiated?: boolean, systemInitiatedLabel?: string, terminalExecutionId?: string): ChatRequestModel;
     setCustomTitle(title: string): void;
     updateRequest(request: ChatRequestModel, variableData: IChatRequestVariableData): void;
     adoptRequest(request: ChatRequestModel): void;