@codingame/monaco-vscode-api 30.0.1 → 31.0.0

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

@@ -22,7 +22,7 @@ import { CellUri } from '../../../notebook/common/notebookCommon.js';
 import { IChatRequestVariableEntry, isStringVariableEntry, isImplicitVariableEntry, isStringImplicitContextValue } from '../attachments/chatVariableEntries.js';
 import { migrateLegacyTerminalToolSpecificData } from '../chat.js';
 import { markChat, ChatPerfMark } from '../chatPerf.js';
-import { IChatToolInvocation, ChatResponseClearToPreviousToolInvocationReason, ResponseModelState, ElicitationState, isIUsedContext, ChatRequestQueueKind } from '../chatService/chatService.js';
+import { IChatToolInvocation, ChatResponseClearToPreviousToolInvocationReason, ResponseModelState, ElicitationState, 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';
@@ -130,6 +130,9 @@ class ChatRequestModel {
         this.id = params.restoredId ?? "request_" + generateUuid();
         this._editedFileEvents = params.editedFileEvents;
         this.userSelectedTools = params.userSelectedTools;
+        this.isSystemInitiated = params.isSystemInitiated;
+        this.systemInitiatedLabel = params.systemInitiatedLabel;
+        this.terminalExecutionId = params.terminalExecutionId;
     }
     adoptTo(session) {
         this._session = session;
@@ -240,6 +243,7 @@ class AbstractResponse {
             case "multiDiffData":
             case "mcpServersStarting":
             case "questionCarousel":
+            case "planReview":
             case "disabledClaudeHooks":
                 continue;
             case "toolInvocation":
@@ -300,7 +304,7 @@ class AbstractResponse {
             blocks.push(currentBlockSegments.join(""));
         }
         if (hasEditGroupsAfterLastClear) {
-            blocks.push(( localize(7292, "Made changes.")));
+            blocks.push(( localize(7409, "Made changes.")));
         }
         return blocks.join("\n\n");
     }
@@ -311,6 +315,7 @@ class AbstractResponse {
         return "name" in part.inlineReference ? "`" + 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;
         let message = "";
         let input = "";
         if (toolInvocation.pastTenseMessage) {
@@ -322,7 +327,7 @@ class AbstractResponse {
             if (toolInvocation.toolSpecificData.kind === "terminal") {
                 message = "Ran terminal command";
                 const terminalData = migrateLegacyTerminalToolSpecificData(toolInvocation.toolSpecificData);
-                input = terminalData.commandLine.userEdited ?? terminalData.commandLine.toolEdited ?? terminalData.commandLine.original;
+                input = getTerminalDisplayInput(terminalData);
             }
         }
         let text = message;
@@ -333,7 +338,8 @@ class AbstractResponse {
             const resultDetails = IChatToolInvocation.resultDetails(toolInvocation);
             if (resultDetails && "input" in resultDetails) {
                 const resultPrefix = toolInvocation.kind === "toolInvocationSerialized" || IChatToolInvocation.isComplete(toolInvocation) ? "Completed" : "Errored";
-                text += `\n${resultPrefix} with input: ${resultDetails.input}`;
+                const resultInput = toolInvocation.toolSpecificData?.kind === "terminal" ? getTerminalDisplayInput(migrateLegacyTerminalToolSpecificData(toolInvocation.toolSpecificData)) : resultDetails.input;
+                text += `\n${resultPrefix} with input: ${resultInput}`;
             }
         }
         return {
@@ -406,12 +412,12 @@ class Response extends AbstractResponse {
         if (progress.kind === "clearToPreviousToolInvocation") {
             if (progress.reason === ChatResponseClearToPreviousToolInvocationReason.CopyrightContentRetry) {
                 this.clearToPreviousToolInvocation(( localize(
-                    7293,
+                    7410,
                     "Response cleared due to possible match to public code, retrying with modified prompt."
                 )));
             } else if (progress.reason === ChatResponseClearToPreviousToolInvocationReason.FilteredContentRetry) {
                 this.clearToPreviousToolInvocation(( localize(
-                    7294,
+                    7411,
                     "Response cleared due to content safety filters, retrying with modified prompt."
                 )));
             } else {
@@ -645,7 +651,19 @@ class ChatResponseModel extends Disposable {
         return this._result;
     }
     get usage() {
-        return this._usage;
+        return this._usageObs.get();
+    }
+    get usageObs() {
+        return this._usageObs;
+    }
+    get completionTokenCount() {
+        return this._completionTokenCountObs.get();
+    }
+    get completionTokenCountObs() {
+        return this._completionTokenCountObs;
+    }
+    get elapsedMs() {
+        return this._elapsedMs;
     }
     get username() {
         return this.session.responderUsername;
@@ -694,6 +712,8 @@ class ChatResponseModel extends Disposable {
         this._modelState = observableValue(this, {
             value: ResponseModelState.Pending
         });
+        this._usageObs = observableValue(this, undefined);
+        this._completionTokenCountObs = observableValue(this, undefined);
         this._shouldBeBlocked = observableValue(this, false);
         this._contentReferences = [];
         this._codeCitations = [];
@@ -708,6 +728,7 @@ class ChatResponseModel extends Disposable {
             this._modelState.set(params.modelState, undefined);
         }
         this._timeSpentWaitingAccumulator = params.timeSpentWaiting || 0;
+        this._elapsedMs = params.elapsedMs;
         this._vote = params.vote;
         this._result = params.result;
         this._followups = params.followups ? [...params.followups] : undefined;
@@ -728,14 +749,17 @@ class ChatResponseModel extends Disposable {
                         return title ? (isMarkdownString(title) ? title.value : title) : undefined;
                     }
                     if (state.type === IChatToolInvocation.StateKind.WaitingForPostApproval) {
-                        return localize(7295, "Approve tool result?");
+                        return localize(7412, "Approve tool result?");
                     }
                 }
                 if (part.kind === "confirmation" && !part.isUsed) {
                     return part.title;
                 }
                 if (part.kind === "questionCarousel" && !part.isUsed) {
-                    return localize(7296, "Answer questions to continue...");
+                    return localize(7413, "Answer questions to continue...");
+                }
+                if (part.kind === "planReview" && !part.isUsed) {
+                    return localize(7414, "Review the plan to continue...");
                 }
                 if (part.kind === "elicitation2" && part.state.read(r) === ElicitationState.Pending) {
                     const title = part.title;
@@ -753,6 +777,9 @@ class ChatResponseModel extends Disposable {
             signal.read(r);
             return !_pendingInfo.read(r) && !this.shouldBeRemovedOnSend && (this._modelState.read(r).value === ResponseModelState.Pending || this._modelState.read(r).value === ResponseModelState.NeedsInput);
         }));
+        this.isIncomplete = ( this._modelState.map(state => {
+            return state.value === ResponseModelState.Pending || state.value === ResponseModelState.NeedsInput;
+        }));
         this._register(
             this._response.onDidChangeValue(() => this._onDidChange.fire(defaultChatResponseModelChangeReason))
         );
@@ -822,9 +849,18 @@ class ChatResponseModel extends Disposable {
         this._onDidChange.fire(defaultChatResponseModelChangeReason);
     }
     setUsage(usage) {
-        this._usage = usage;
+        if (this.isSameUsage(usage)) {
+            return;
+        }
+        this._usageObs.set(usage, undefined);
+        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 && equals(currentUsage.promptTokenDetails, usage.promptTokenDetails);
+    }
     complete() {
         if (this.isComplete) {
             return;
@@ -832,6 +868,7 @@ class ChatResponseModel extends Disposable {
         if (this._result?.errorDetails?.responseIsRedacted) {
             this._response.clear();
         }
+        this._elapsedMs = Math.max(0, Date.now() - this.confirmationAdjustedTimestamp.get());
         const state = !!this._result?.errorDetails && this._result.errorDetails.code !== "canceled" ? ResponseModelState.Failed : ResponseModelState.Complete;
         this._modelState.set({
             value: state,
@@ -842,6 +879,11 @@ class ChatResponseModel extends Disposable {
         });
     }
     cancel() {
+        for (const part of this._response.value) {
+            if (part.kind === "toolInvocation" && part instanceof ChatToolInvocation) {
+                part.cancelFromStreaming(ToolConfirmKind.Skipped);
+            }
+        }
         this._modelState.set({
             value: ResponseModelState.Cancelled,
             completedAt: Date.now()
@@ -878,6 +920,13 @@ class ChatResponseModel extends Disposable {
         this._responseView = undefined;
         this._shouldBeRemovedOnSend = undefined;
     }
+    dispose() {
+        super.dispose();
+        this._response.clear();
+        if (this._codeBlockInfos) {
+            this._codeBlockInfos.length = 0;
+        }
+    }
     toJSON() {
         const modelState = this._modelState.get();
         const pendingConfirmation = this.isPendingConfirmation.get();
@@ -898,7 +947,9 @@ class ChatResponseModel extends Disposable {
             contentReferences: this.contentReferences,
             codeCitations: this.codeCitations,
             timestamp: this._timestamp,
-            timeSpentWaiting: (pendingConfirmation ? Date.now() - pendingConfirmation.startedWaitingAt : 0) + this._timeSpentWaitingAccumulator
+            timeSpentWaiting: (pendingConfirmation ? Date.now() - pendingConfirmation.startedWaitingAt : 0) + this._timeSpentWaitingAccumulator,
+            completionTokens: this.completionTokenCount,
+            elapsedMs: this.elapsedMs ?? (this.completedAt ? Math.max(0, this.completedAt - this.confirmationAdjustedTimestamp.get()) : undefined)
         };
     }
 }
@@ -1012,12 +1063,6 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
         const message = typeof firstRequestMessage === "string" ? firstRequestMessage : firstRequestMessage.text;
         return message.split("\n")[0].substring(0, 200);
     }
-    get contributedChatSession() {
-        return this._contributedChatSession;
-    }
-    setContributedChatSession(session) {
-        this._contributedChatSession = session;
-    }
     get repoData() {
         return this._repoData;
     }
@@ -1245,6 +1290,9 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
         this.requestInProgress = ( this.lastRequestObs.map((request, r) => {
             return request?.response?.isInProgress.read(r) ?? false;
         }));
+        this.hasActiveRequest = ( this.lastRequestObs.map((request, r) => {
+            return request?.response?.isIncomplete.read(r) ?? false;
+        }));
         this.requestNeedsInput = ( this.lastRequestObs.map((request, r) => {
             const pendingInfo = request?.response?.isPendingConfirmation.read(r);
             if (!pendingInfo) {
@@ -1262,7 +1310,7 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
                 const needsInput = this.requestNeedsInput.read(r);
                 const shouldStayAlive = inProgress || !!needsInput;
                 if (shouldStayAlive && !selfRef.value) {
-                    selfRef.value = chatService.acquireExistingSession(this._sessionResource);
+                    selfRef.value = chatService.acquireExistingSession(this._sessionResource, "ChatModel#requestInProgressKeepAlive");
                 } else if (!shouldStayAlive && selfRef.value) {
                     selfRef.clear();
                 }
@@ -1278,7 +1326,7 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
             this._register(autorun(r => {
                 const hasModified = ( session.entries.read(r).some(e => e.state.read(r) === ModifiedFileEntryState.Modified));
                 if (hasModified && !selfRef.value) {
-                    selfRef.value = this.chatService.acquireExistingSession(this._sessionResource);
+                    selfRef.value = this.chatService.acquireExistingSession(this._sessionResource, "ChatModel#modifiedEditsKeepAlive");
                 } else if (!hasModified && selfRef.value) {
                     selfRef.clear();
                 }
@@ -1327,7 +1375,10 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
             confirmation: raw.confirmation,
             editedFileEvents: raw.editedFileEvents,
             modelId: raw.modelId,
-            modeInfo: raw.modeInfo
+            modeInfo: raw.modeInfo,
+            isSystemInitiated: raw.isSystemInitiated,
+            systemInitiatedLabel: raw.systemInitiatedLabel,
+            terminalExecutionId: raw.terminalExecutionId
         }));
         request.shouldBeRemovedOnSend = raw.isHidden ? {
             requestId: raw.requestId
@@ -1353,7 +1404,7 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
                 for (const part of raw.response) {
                     if (hasKey(part, {
                         kind: true
-                    }) && (part.kind === "questionCarousel")) {
+                    }) && (part.kind === "questionCarousel" || part.kind === "planReview")) {
                         part.isUsed = true;
                     }
                 }
@@ -1371,6 +1422,7 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
                 followups: raw.followups,
                 restoredId: raw.responseId,
                 timeSpentWaiting: raw.timeSpentWaiting,
+                elapsedMs: raw.elapsedMs,
                 shouldBeBlocked: request.shouldBeBlocked.get(),
                 codeBlockInfos: raw.responseMarkdownInfo?.map(info => ({
                     suggestionId: info.suggestionId
@@ -1379,6 +1431,13 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
             request.response.shouldBeRemovedOnSend = raw.isHidden ? {
                 requestId: raw.requestId
             } : raw.shouldBeRemovedOnSend;
+            if (typeof raw.completionTokens === "number") {
+                request.response.setUsage({
+                    kind: "usage",
+                    promptTokens: 0,
+                    completionTokens: raw.completionTokens
+                });
+            }
             if (raw.usedContext) {
                 request.response.applyReference(revive(raw.usedContext));
             }
@@ -1497,7 +1556,10 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
         isCompleteAddedRequest,
         modelId,
         userSelectedTools,
-        id
+        id,
+        isSystemInitiated,
+        systemInitiatedLabel,
+        terminalExecutionId
     ) {
         const editedFileEvents = [...( this.currentEditedFileEvents.values())];
         this.currentEditedFileEvents.clear();
@@ -1515,7 +1577,10 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
             isCompleteAddedRequest,
             modelId,
             editedFileEvents: editedFileEvents.length ? editedFileEvents : undefined,
-            userSelectedTools
+            userSelectedTools,
+            isSystemInitiated,
+            systemInitiatedLabel,
+            terminalExecutionId
         }));
         request.response = ( new ChatResponseModel({
             responseContent: [],
@@ -1679,6 +1744,9 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
                     editedFileEvents: r.editedFileEvents,
                     modelId: r.modelId,
                     modeInfo: r.modeInfo,
+                    isSystemInitiated: r.isSystemInitiated || undefined,
+                    systemInitiatedLabel: r.systemInitiatedLabel,
+                    terminalExecutionId: r.terminalExecutionId,
                     ...r.response?.toJSON()
                 };
             }))
@@ -1698,6 +1766,9 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
         this._requests.forEach(r => r.response?.dispose());
         this._onDidDispose.fire();
         super.dispose();
+        this._requests.length = 0;
+        this.dataSerializer = undefined;
+        this._editingSession = undefined;
     }
 };
 ChatModel = ChatModel_1 = ( __decorate([( __param(2, ILogService)), ( __param(3, IChatAgentService)), ( __param(4, IChatEditingService)), ( __param(5, IChatService))], ChatModel));
@@ -1738,7 +1809,7 @@ function getCodeCitationsMessage(citations) {
         return "";
     }
     const licenseTypes = citations.reduce((set, c) => set.add(c.license), ( new Set()));
-    const label = licenseTypes.size === 1 ? ( localize(7297, "Similar code found with 1 license type", licenseTypes.size)) : ( localize(7298, "Similar code found with {0} license types", licenseTypes.size));
+    const label = licenseTypes.size === 1 ? ( localize(7415, "Similar code found with 1 license type", licenseTypes.size)) : ( localize(7416, "Similar code found with {0} license types", licenseTypes.size));
     return label;
 }
 function serializeSendOptions(options) {
@@ -1753,7 +1824,10 @@ function serializeSendOptions(options) {
         agentId: options.agentId,
         agentIdSilent: options.agentIdSilent,
         slashCommand: options.slashCommand,
-        confirmation: options.confirmation
+        confirmation: options.confirmation,
+        isSystemInitiated: options.isSystemInitiated,
+        systemInitiatedLabel: options.systemInitiatedLabel,
+        terminalExecutionId: options.terminalExecutionId
     };
 }
 var ChatRequestEditedFileEventKind;

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

@@ -0,0 +1,26 @@
+import { DeferredPromise } from "../../../../../../base/common/async.js";
+import { UriComponents } from "../../../../../../base/common/uri.js";
+import { IChatPlanApprovalAction, IChatPlanReview, IChatPlanReviewResult } from "../../chatService/chatService.js";
+import { ToolDataSource } from "../../tools/languageModelToolsService.js";
+/**
+ * Runtime representation of a plan review widget with a {@link DeferredPromise}
+ * that is resolved when the user approves or rejects the plan. {@link toJSON}
+ * strips the completion so only serialisable data is persisted.
+ */
+export declare class ChatPlanReviewData implements IChatPlanReview {
+    title: string;
+    content: string;
+    actions: IChatPlanApprovalAction[];
+    canProvideFeedback: boolean;
+    planUri?: UriComponents | undefined;
+    resolveId?: string | undefined;
+    data?: IChatPlanReviewResult | undefined;
+    isUsed?: boolean | undefined;
+    source?: ToolDataSource | undefined;
+    readonly kind: "planReview";
+    readonly completion: DeferredPromise<IChatPlanReviewResult | undefined>;
+    draftFeedback: string | undefined;
+    draftCollapsed: boolean | undefined;
+    constructor(title: string, content: string, actions: IChatPlanApprovalAction[], canProvideFeedback: boolean, planUri?: UriComponents | undefined, resolveId?: string | undefined, data?: IChatPlanReviewResult | undefined, isUsed?: boolean | undefined, source?: ToolDataSource | undefined);
+    toJSON(): IChatPlanReview;
+}

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

@@ -0,0 +1,44 @@
+
+import { DeferredPromise } from '../../../../../../base/common/async.js';
+
+class ChatPlanReviewData {
+    constructor(
+        title,
+        content,
+        actions,
+        canProvideFeedback,
+        planUri,
+        resolveId,
+        data,
+        isUsed,
+        source
+    ) {
+        this.title = title;
+        this.content = content;
+        this.actions = actions;
+        this.canProvideFeedback = canProvideFeedback;
+        this.planUri = planUri;
+        this.resolveId = resolveId;
+        this.data = data;
+        this.isUsed = isUsed;
+        this.source = source;
+        this.kind = "planReview";
+        this.completion = ( new DeferredPromise());
+    }
+    toJSON() {
+        return {
+            kind: this.kind,
+            title: this.title,
+            content: this.content,
+            actions: this.actions,
+            canProvideFeedback: this.canProvideFeedback,
+            planUri: this.planUri,
+            resolveId: this.resolveId,
+            data: this.data,
+            isUsed: this.isUsed,
+            source: this.source
+        };
+    }
+}
+
+export { ChatPlanReviewData };

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

@@ -15,6 +15,7 @@ export declare class ChatQuestionCarouselData implements IChatQuestionCarousel {
     isUsed?: boolean | undefined;
     message?: (string | IMarkdownString) | undefined;
     source?: ToolDataSource | undefined;
+    terminalId?: string | undefined;
     readonly kind: "questionCarousel";
     readonly completion: DeferredPromise<{
         answers: IChatQuestionAnswers | undefined;
@@ -22,6 +23,11 @@ export declare class ChatQuestionCarouselData implements IChatQuestionCarousel {
     draftAnswers: IChatQuestionAnswers | undefined;
     draftCurrentIndex: number | undefined;
     draftCollapsed: boolean | undefined;
-    constructor(questions: IChatQuestion[], allowSkip: boolean, resolveId?: string | undefined, data?: IChatQuestionAnswers | undefined, isUsed?: boolean | undefined, message?: (string | IMarkdownString) | undefined, source?: ToolDataSource | undefined);
+    /**
+     * Set to `true` when the carousel was dismissed because the user typed
+     * directly in the associated terminal instead of using the carousel UI.
+     */
+    dismissedByTerminalInput?: boolean;
+    constructor(questions: IChatQuestion[], allowSkip: boolean, resolveId?: string | undefined, data?: IChatQuestionAnswers | undefined, isUsed?: boolean | undefined, message?: (string | IMarkdownString) | undefined, source?: ToolDataSource | undefined, terminalId?: string | undefined);
     toJSON(): IChatQuestionCarousel;
 }

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

@@ -2,7 +2,7 @@
 import { DeferredPromise } from '../../../../../../base/common/async.js';
 
 class ChatQuestionCarouselData {
-    constructor(questions, allowSkip, resolveId, data, isUsed, message, source) {
+    constructor(questions, allowSkip, resolveId, data, isUsed, message, source, terminalId) {
         this.questions = questions;
         this.allowSkip = allowSkip;
         this.resolveId = resolveId;
@@ -10,6 +10,7 @@ class ChatQuestionCarouselData {
         this.isUsed = isUsed;
         this.message = message;
         this.source = source;
+        this.terminalId = terminalId;
         this.kind = "questionCarousel";
         this.completion = ( new DeferredPromise());
     }
@@ -22,7 +23,8 @@ class ChatQuestionCarouselData {
             data: this.data,
             isUsed: this.isUsed,
             message: this.message,
-            source: this.source
+            source: this.source,
+            terminalId: this.terminalId
         };
     }
 }

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

@@ -1,7 +1,7 @@
 import { IMarkdownString } from "../../../../../../base/common/htmlContent.js";
 import { IObservable } from "../../../../../../base/common/observable.js";
 import { ThemeIcon } from "../../../../../../base/common/themables.js";
-import { ConfirmedReason, IChatExtensionsContent, IChatModifiedFilesConfirmationData, IChatSimpleToolInvocationData, IChatSubagentToolInvocationData, IChatTodoListContent, IChatToolInputInvocationData, IChatToolInvocation, IChatToolInvocationSerialized, ToolConfirmKind, type IChatTerminalToolInvocationData } from "../../chatService/chatService.js";
+import { ConfirmedReason, IChatToolInvocation, IChatToolInvocationSerialized, ToolConfirmKind } from "../../chatService/chatService.js";
 import { IPreparedToolInvocation, IToolConfirmationMessages, IToolData, IToolProgressStep, IToolResult, ToolDataSource } from "../../tools/languageModelToolsService.js";
 export interface IStreamingToolCallOptions {
     toolCallId: string;
@@ -26,7 +26,11 @@ export declare class ChatToolInvocation implements IChatToolInvocation {
     generatedTitle?: string;
     readonly chatRequestId?: string;
     isAttachedToThinking: boolean;
-    toolSpecificData?: IChatTerminalToolInvocationData | IChatToolInputInvocationData | IChatExtensionsContent | IChatTodoListContent | IChatSubagentToolInvocationData | IChatSimpleToolInvocationData | IChatModifiedFilesConfirmationData;
+    private _toolSpecificData?;
+    private readonly _toolSpecificDataKind;
+    readonly toolSpecificDataKind: IObservable<string | undefined>;
+    get toolSpecificData(): typeof this._toolSpecificData;
+    set toolSpecificData(value: typeof this._toolSpecificData);
     private readonly _progress;
     private readonly _state;
     private readonly _partialInput;
@@ -56,6 +60,12 @@ export declare class ChatToolInvocation implements IChatToolInvocation {
      * Update the streaming message (from handleToolStream).
      */
     updateStreamingMessage(message: string | IMarkdownString): void;
+    /**
+     * Notifies state observers that `toolSpecificData` has been mutated.
+     * Since `toolSpecificData` isn't observable, this re-sets the internal
+     * state to trigger autoruns that need to re-read tool metadata.
+     */
+    notifyToolSpecificDataChanged(): void;
     /**
      * Cancel a streaming invocation directly (e.g., when preToolUse hook denies).
      * Only works when in Streaming state.

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

@@ -8,6 +8,13 @@ import { isToolResultOutputDetails } from '../../tools/languageModelToolsService
 import { observableValue } from '../../../../../../base/common/observableInternal/observables/observableValue.js';
 
 class ChatToolInvocation {
+    get toolSpecificData() {
+        return this._toolSpecificData;
+    }
+    set toolSpecificData(value) {
+        this._toolSpecificData = value;
+        this._toolSpecificDataKind.set(value?.kind, undefined);
+    }
     get state() {
         return this._state;
     }
@@ -51,6 +58,8 @@ class ChatToolInvocation {
         this.toolCallId = toolCallId;
         this.kind = "toolInvocation";
         this.isAttachedToThinking = false;
+        this._toolSpecificDataKind = observableValue(this, undefined);
+        this.toolSpecificDataKind = this._toolSpecificDataKind;
         this._progress = observableValue(this, {
             progress: 0
         });
@@ -60,7 +69,7 @@ class ChatToolInvocation {
         if (startOptions.startInStreaming) {
             defaultMessage = toolData.displayName;
         } else if (startOptions.startInCancelled) {
-            defaultMessage = startOptions.cancelReasonMessage ?? ( localize(7299, "Tool \"{0}\" was denied", toolData.displayName));
+            defaultMessage = startOptions.cancelReasonMessage ?? ( localize(7417, "Tool \"{0}\" was denied", toolData.displayName));
         }
         this.invocationMessage = preparedInvocation?.invocationMessage ?? defaultMessage;
         this.pastTenseMessage = preparedInvocation?.pastTenseMessage;
@@ -138,6 +147,12 @@ class ChatToolInvocation {
         }
         this._streamingMessage.set(message, undefined);
     }
+    notifyToolSpecificDataChanged() {
+        const current = this._state.get();
+        this._state.set({
+            ...current
+        }, undefined);
+    }
     cancelFromStreaming(reason, reasonMessage) {
         const currentState = this._state.get();
         if (currentState.type !== IChatToolInvocation.StateKind.Streaming) {

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

@@ -6,11 +6,10 @@ import { ThemeIcon } from "../../../../../base/common/themables.js";
 import { URI } from "../../../../../base/common/uri.js";
 import { IInstantiationService } from "../../../../../platform/instantiation/common/instantiation.js";
 import { IChatRequestVariableEntry } from "../attachments/chatVariableEntries.js";
-import { ChatAgentVoteDirection, ChatRequestQueueKind, IChatCodeCitation, IChatContentReference, IChatDisabledClaudeHooksPart, IChatFollowup, IChatMcpServersStarting, IChatProgressMessage, IChatQuestionCarousel, IChatResponseErrorDetails, IChatTask, IChatUsedContext } from "../chatService/chatService.js";
+import { ChatAgentVoteDirection, ChatRequestQueueKind, IChatCodeCitation, IChatContentReference, IChatDisabledClaudeHooksPart, IChatFollowup, IChatMcpServersStarting, IChatPlanReview, IChatProgressMessage, IChatQuestionCarousel, IChatResponseErrorDetails, IChatTask, IChatUsage, IChatUsedContext } from "../chatService/chatService.js";
 import { IChatAgentCommand, IChatAgentData, IChatAgentResult } from "../participants/chatAgents.js";
 import { IChatAgentNameService } from "../participants/chatAgents.service.js";
 import { IParsedChatRequest } from "../requestParser/chatParserTypes.js";
-import { CodeBlockModelCollection } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/common/widget/codeBlockModelCollection";
 import { IChatModel, IChatProgressRenderableResponseContent, IChatRequestDisablement, IChatRequestModel, IChatResponseModel, IChatTextEditGroup, IResponse } from "./chatModel.js";
 import { IChatStreamStats } from "./chatStreamStats.js";
 export declare function isRequestVM(item: unknown): item is IChatRequestViewModel;
@@ -68,6 +67,8 @@ export interface IChatRequestViewModel {
     readonly timestamp: number;
     /** The kind of pending request, or undefined if not pending */
     readonly pendingKind?: ChatRequestQueueKind;
+    readonly isSystemInitiated?: boolean;
+    readonly systemInitiatedLabel?: string;
 }
 export interface IChatResponseMarkdownRenderData {
     renderedWordCount: number;
@@ -117,6 +118,23 @@ export interface IChatReferences {
  */
 export interface IChatWorkingProgress {
     kind: "working";
+    content?: IMarkdownString;
+    /**
+     * When present, the working progress will show elapsed time and token usage.
+     */
+    state?: IChatWorkingProgressState;
+}
+export interface IChatWorkingProgressState {
+    /** The confirmation-adjusted timestamp observable for computing elapsed time */
+    readonly confirmationAdjustedTimestamp: IObservable<number>;
+    /** Observable for tracking completion token count as it arrives */
+    readonly completionTokenCountObs: IObservable<number | undefined>;
+    /** Whether the response is complete (for past-tense display) */
+    readonly isComplete: boolean;
+    /** The completedAt timestamp for completed responses */
+    readonly completedAt?: number;
+    /** Pre-computed elapsed generation time in ms (reliable for restored sessions) */
+    readonly elapsedMs?: number;
 }
 /**
  * Content type for citations used during rendering, not in the model
@@ -138,7 +156,7 @@ export interface IChatChangesSummaryPart {
 /**
  * Type for content parts rendered by IChatListRenderer (not necessarily in the model)
  */
-export type IChatRendererContent = IChatProgressRenderableResponseContent | IChatReferences | IChatCodeCitations | IChatErrorDetailsPart | IChatChangesSummaryPart | IChatWorkingProgress | IChatMcpServersStarting | IChatQuestionCarousel | IChatDisabledClaudeHooksPart;
+export type IChatRendererContent = IChatProgressRenderableResponseContent | IChatReferences | IChatCodeCitations | IChatErrorDetailsPart | IChatChangesSummaryPart | IChatWorkingProgress | IChatMcpServersStarting | IChatQuestionCarousel | IChatPlanReview | IChatDisabledClaudeHooksPart;
 export interface IChatResponseViewModel {
     readonly model: IChatResponseModel;
     readonly id: string;
@@ -165,6 +183,9 @@ export interface IChatResponseViewModel {
     readonly errorDetails?: IChatResponseErrorDetails;
     readonly result?: IChatAgentResult;
     readonly contentUpdateTimings?: IChatStreamStats;
+    readonly confirmationAdjustedTimestamp: IObservable<number>;
+    readonly usageObs: IObservable<IChatUsage | undefined>;
+    readonly completionTokenCountObs: IObservable<number | undefined>;
     readonly shouldBeRemovedOnSend: IChatRequestDisablement | undefined;
     readonly isCompleteAddedRequest: boolean;
     renderData?: IChatResponseRenderData;
@@ -181,6 +202,7 @@ export interface IChatPendingDividerViewModel {
     readonly sessionResource: URI;
     readonly isComplete: true;
     readonly dividerKind: ChatRequestQueueKind;
+    readonly isSystemInitiated?: boolean;
     currentRenderedHeight: number | undefined;
 }
 export interface IChatViewModelOptions {
@@ -192,7 +214,6 @@ export interface IChatViewModelOptions {
 }
 export declare class ChatViewModel extends Disposable implements IChatViewModel {
     private readonly _model;
-    readonly codeBlockModelCollection: CodeBlockModelCollection;
     private readonly _options;
     private readonly instantiationService;
     private readonly _onDidDisposeModel;
@@ -206,7 +227,7 @@ export declare class ChatViewModel extends Disposable implements IChatViewModel
     setInputPlaceholder(text: string): void;
     resetInputPlaceholder(): void;
     get sessionResource(): URI;
-    constructor(_model: IChatModel, codeBlockModelCollection: CodeBlockModelCollection, _options: IChatViewModelOptions | undefined, instantiationService: IInstantiationService);
+    constructor(_model: IChatModel, _options: IChatViewModelOptions | undefined, instantiationService: IInstantiationService);
     private onAddResponse;
     getItems(): (IChatRequestViewModel | IChatResponseViewModel | IChatPendingDividerViewModel)[];
     private _editing;
@@ -242,6 +263,8 @@ export declare class ChatRequestViewModel implements IChatRequestViewModel {
     get modelId(): string | undefined;
     get timestamp(): number;
     get pendingKind(): ChatRequestQueueKind | undefined;
+    get isSystemInitiated(): boolean | undefined;
+    get systemInitiatedLabel(): string | undefined;
     constructor(_model: IChatRequestModel, _pendingKind?: ChatRequestQueueKind | undefined);
 }
 export declare class ChatResponseViewModel extends Disposable implements IChatResponseViewModel {
@@ -287,6 +310,9 @@ export declare class ChatResponseViewModel extends Disposable implements IChatRe
     set vulnerabilitiesListExpanded(v: boolean);
     private readonly liveUpdateTracker;
     get contentUpdateTimings(): IChatStreamStats | undefined;
+    get confirmationAdjustedTimestamp(): IObservable<number>;
+    get usageObs(): IObservable<IChatUsage | undefined>;
+    get completionTokenCountObs(): IObservable<number | undefined>;
     constructor(_model: IChatResponseModel, session: IChatViewModel, instantiationService: IInstantiationService, chatAgentNameService: IChatAgentNameService);
     setVote(vote: ChatAgentVoteDirection): void;
     setEditApplied(edit: IChatTextEditGroup, editCount: number): void;