@codingame/monaco-vscode-katex-common 30.0.1 → 31.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatListWidget.d.ts

@@ -15,7 +15,6 @@ import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/c
 import { ChatAgentLocation, ChatModeKind } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants";
 import { IChatRequestModeInfo } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
 import { IChatRequestViewModel, IChatResponseViewModel, IChatViewModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
-import { CodeBlockModelCollection } from "../../common/widget/codeBlockModelCollection.js";
 import { ChatTreeItem, IChatCodeBlockInfo, IChatFileTreeInfo, IChatListItemRendererOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
 import { IChatAccessibilityService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
 import { CodeBlockPart } from "./chatContentParts/codeBlockPart.js";
@@ -62,11 +61,6 @@ export interface IChatListWidgetOptions {
      * Optional filter for the tree.
      */
     readonly filter?: ITreeFilter<ChatTreeItem, FuzzyScore>;
-    /**
-     * Optional code block model collection to use.
-     * If not provided, one will be created.
-     */
-    readonly codeBlockModelCollection?: CodeBlockModelCollection;
     /**
      * Initial view model.
      */
@@ -138,7 +132,6 @@ export declare class ChatListWidget extends Disposable {
     get onDidFocusOutside(): Event<void>;
     private readonly _tree;
     private readonly _renderer;
-    private readonly _codeBlockModelCollection;
     private _viewModel;
     private _visible;
     private _lastItem;

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatListWidget.js

@@ -29,7 +29,6 @@ import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbenc
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { ChatConfiguration, ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { isRequestVM, isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
-import { CodeBlockModelCollection } from '../../common/widget/codeBlockModelCollection.js';
 import { ChatAccessibilityProvider } from '../accessibility/chatAccessibilityProvider.js';
 import { IChatAccessibilityService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatListDelegate, ChatListItemRenderer } from './chatListRenderer.js';
@@ -111,9 +110,6 @@ let ChatListWidget = class ChatListWidget extends Disposable {
         this._bodyDimension = null;
         this._previousLastItemMinHeight = null;
         this._viewModel = options.viewModel;
-        this._codeBlockModelCollection = options.codeBlockModelCollection ?? this._register(
-            this.instantiationService.createInstance(CodeBlockModelCollection, "chatListWidget")
-        );
         this._location = options.location;
         this._getCurrentLanguageModelId = options.getCurrentLanguageModelId;
         this._getCurrentModeInfo = options.getCurrentModeInfo;
@@ -156,7 +152,6 @@ let ChatListWidget = class ChatListWidget extends Disposable {
             editorOptions,
             options.rendererOptions ?? {},
             rendererDelegate,
-            this._codeBlockModelCollection,
             overflowWidgetsContainer,
             this._viewModel
         ));
@@ -267,6 +262,7 @@ let ChatListWidget = class ChatListWidget extends Disposable {
             this._onDidScroll.fire(e);
             this.updateScrollDownButtonVisibility();
         }));
+        this.updateScrollDownButtonVisibility();
         this._register(this._tree.onContextMenu(e => {
             this.handleContextMenu(e);
         }));
@@ -278,8 +274,9 @@ let ChatListWidget = class ChatListWidget extends Disposable {
         }));
     }
     updateScrollDownButtonVisibility() {
-        const show = !this.isScrolledToBottom && !this._scrollLock;
-        this._scrollDownButton.element.style.display = show ? "" : "none";
+        const atBottom = this.isScrolledToBottom || this._scrollLock;
+        this._scrollDownButton.element.style.display = atBottom ? "none" : "";
+        this._container.classList.toggle("chat-list-at-bottom", atBottom);
     }
     handleContextMenu(e) {
         e.browserEvent.preventDefault();

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatWidget.d.ts

@@ -133,7 +133,6 @@ export declare class ChatWidget extends Disposable implements IChatWidget {
     private container;
     get domNode(): HTMLElement;
     private listWidget;
-    private readonly _codeBlockModelCollection;
     private inputPartMaxHeightOverride;
     private readonly visibilityTimeoutDisposable;
     private readonly visibilityAnimationFrameDisposable;
@@ -151,6 +150,7 @@ export declare class ChatWidget extends Disposable implements IChatWidget {
     private bodyDimension;
     private visibleChangeCount;
     private requestInProgress;
+    private hasActiveRequest;
     private agentInInput;
     private _visible;
     get visible(): boolean;
@@ -304,12 +304,5 @@ export declare class ChatWidget extends Disposable implements IChatWidget {
     private updateChatInputContext;
     private _switchToAgentByName;
     private _applyPromptMetadata;
-    /**
-     * Adds additional instructions to the context
-     * - instructions that have a 'applyTo' pattern that matches the current input
-     * - instructions referenced in the copilot settings 'copilot-instructions'
-     * - instructions referenced in an already included instruction file
-     */
-    private _autoAttachInstructions;
     delegateScrollFromMouseWheelEvent(browserEvent: IMouseWheelEvent): void;
 }

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatWidget.js

@@ -60,12 +60,9 @@ import { IChatSlashCommandService } from '@codingame/monaco-vscode-api/vscode/vs
 import { IChatTodoListService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/chatTodoListService.service';
 import { isWorkspaceVariableEntry, isPromptFileVariableEntry, isPromptTextVariableEntry, toPromptFileVariableEntry, PromptFileVariableKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
 import { isResponseVM, isRequestVM, ChatViewModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
-import { CodeBlockModelCollection } from '../../common/widget/codeBlockModelCollection.js';
 import { ChatModeKind, ChatPermissionLevel, ChatConfiguration, ThinkingDisplayMode, ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { isToolSet } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
-import { ComputeAutomaticInstructions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/computeAutomaticInstructions';
-import { PromptsStorage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
 import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
 import { GENERATE_AGENT_INSTRUCTIONS_COMMAND_ID, handleModeSwitch } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { isIChatResourceViewContext, isIChatViewViewContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
@@ -110,9 +107,10 @@ const supportsAllAttachments = {
     supportsSymbolAttachments: true,
     supportsTerminalAttachments: true,
     supportsPromptAttachments: true,
-    supportsHandOffs: true
+    supportsHandOffs: true,
+    supportsCheckpoints: true
 };
-const DISCLAIMER = ( localize(7016, "AI responses may be inaccurate"));
+const DISCLAIMER = ( localize(7140, "AI responses may be inaccurate"));
 let ChatWidget = class ChatWidget extends Disposable {
     static {
         ChatWidget_1 = this;
@@ -316,6 +314,7 @@ let ChatWidget = class ChatWidget extends Disposable {
         ChatContextKeys.inQuickChat.bindTo(contextKeyService).set(isQuickChat(this));
         this.agentInInput = ChatContextKeys.inputHasAgent.bindTo(contextKeyService);
         this.requestInProgress = ChatContextKeys.requestInProgress.bindTo(contextKeyService);
+        this.hasActiveRequest = ChatContextKeys.hasActiveRequest.bindTo(contextKeyService);
         this._register(
             this.chatEntitlementService.onDidChangeAnonymous(() => this.renderWelcomeViewContentIfNeeded())
         );
@@ -393,7 +392,6 @@ let ChatWidget = class ChatWidget extends Disposable {
                 return lastResponse?.result?.errorDetails && !lastResponse?.result?.errorDetails.responseIsIncomplete;
             })
         );
-        this._codeBlockModelCollection = this._register(instantiationService.createInstance(CodeBlockModelCollection, undefined));
         this.chatSuggestNextWidget = this._register(this.instantiationService.createInstance(ChatSuggestNextWidget));
         this._register(autorun(r => {
             const viewModel = viewModelObs.read(r);
@@ -798,7 +796,7 @@ let ChatWidget = class ChatWidget extends Disposable {
         }
         this.container.classList.toggle(
             "chat-view-getting-started-disabled",
-            this.chatEntitlementService.sentiment.installed
+            this.chatEntitlementService.sentiment.completed
         );
         this._onDidChangeEmptyState.fire();
     }
@@ -809,6 +807,9 @@ let ChatWidget = class ChatWidget extends Disposable {
         if (this._isRenderingWelcome) {
             return;
         }
+        if (!this.inputPartDisposable.value) {
+            return;
+        }
         this._isRenderingWelcome = true;
         try {
             if (this.viewOptions.renderStyle === "compact" || this.viewOptions.renderStyle === "minimal" || this.lifecycleService.willShutdown) {
@@ -818,10 +819,10 @@ let ChatWidget = class ChatWidget extends Disposable {
             if (!numItems) {
                 const defaultAgent = this.chatAgentService.getDefaultAgent(this.location, this.input.currentModeKind);
                 let additionalMessage;
-                if (this.chatEntitlementService.anonymous && !this.chatEntitlementService.sentiment.installed) {
+                if (this.chatEntitlementService.anonymous && !this.chatEntitlementService.sentiment.completed) {
                     const providers = product.defaultChatAgent.provider;
                     additionalMessage = ( new MarkdownString(( localize(
-                        7017,
+                        7141,
                         "By continuing with {0} Copilot, you agree to {1}'s [Terms]({2}) and [Privacy Statement]({3}).",
                         providers.default.name,
                         providers.default.name,
@@ -903,7 +904,7 @@ let ChatWidget = class ChatWidget extends Disposable {
             return ( new MarkdownString(""));
         } else if (this._instructionFilesExist === false) {
             return (new MarkdownString(localize(
-                7018,
+                7142,
                 "[Generate Agent Instructions]({0}) to onboard AI onto your codebase.",
                 `command:${GENERATE_AGENT_INSTRUCTIONS_COMMAND_ID}`
             ), {
@@ -929,19 +930,19 @@ let ChatWidget = class ChatWidget extends Disposable {
             const providerTitle = contribution?.welcomeTitle;
             const providerMessage = contribution?.welcomeMessage;
             const message = providerMessage ? ( new MarkdownString(providerMessage)) : (this._lockedAgent?.prefix === "@copilot " ? ( new MarkdownString(( localize(
-                7019,
+                7143,
                 "This chat session will be forwarded to the {0} [coding agent]({1}) where work is completed in the background. ",
                 this._lockedAgent.prefix,
                 "https://aka.ms/coding-agent-docs"
             )) + DISCLAIMER, {
                 isTrusted: true
             })) : ( new MarkdownString(( localize(
-                7020,
+                7144,
                 "This chat session will be forwarded to the {0} coding agent where work is completed in the background. ",
                 this._lockedAgent?.prefix
             )) + DISCLAIMER)));
             return {
-                title: providerTitle ?? ( localize(7021, "Delegate to {0}", this._lockedAgent?.prefix)),
+                title: providerTitle ?? ( localize(7145, "Delegate to {0}", this._lockedAgent?.prefix)),
                 message,
                 icon: providerIcon ?? Codicon.sendToRemoteAgent,
                 additionalMessage,
@@ -950,11 +951,11 @@ let ChatWidget = class ChatWidget extends Disposable {
         }
         let title;
         if (this.input.currentModeKind === ChatModeKind.Ask) {
-            title = ( localize(7022, "Ask about your code"));
+            title = ( localize(7146, "Ask about your code"));
         } else if (this.input.currentModeKind === ChatModeKind.Edit) {
-            title = ( localize(7023, "Edit in context"));
+            title = ( localize(7147, "Edit in context"));
         } else {
-            title = ( localize(7024, "Build with Agent"));
+            title = ( localize(7148, "Build with Agent"));
         }
         return {
             title,
@@ -1229,7 +1230,6 @@ let ChatWidget = class ChatWidget extends Disposable {
             filter: this.viewOptions.filter ? {
                 filter: this.viewOptions.filter.bind(this.viewOptions)
             } : undefined,
-            codeBlockModelCollection: this._codeBlockModelCollection,
             viewModel: this.viewModel,
             editorOptions: this.editorOptions,
             location: this.location,
@@ -1615,15 +1615,14 @@ let ChatWidget = class ChatWidget extends Disposable {
         const tipContainer = this.inputPart.gettingStartedTipContainerElement;
         clearNode(tipContainer);
         setVisibility(false, tipContainer);
-        this._codeBlockModelCollection.clear();
         this.inputPart.setInputModel(model.inputModel, model.getRequests().length === 0);
-        this.viewModel = this.instantiationService.createInstance(ChatViewModel, model, this._codeBlockModelCollection, undefined);
+        this.viewModel = this.instantiationService.createInstance(ChatViewModel, model, undefined);
         this.listWidget.setViewModel(this.viewModel);
         if (this._lockedAgent) {
             let placeholder = this.chatSessionsService.getChatSessionContribution(this._lockedAgent.id)?.inputPlaceholder;
             if (!placeholder) {
                 placeholder = ( localize(
-                    7025,
+                    7149,
                     "Chat with {0}",
                     this._lockedAgent.displayName || this._lockedAgent.name
                 ));
@@ -1645,6 +1644,7 @@ let ChatWidget = class ChatWidget extends Disposable {
                     return;
                 }
                 this.requestInProgress.set(this.viewModel.model.requestInProgress.get());
+                this.hasActiveRequest.set(this.viewModel.model.hasActiveRequest.get());
                 if (events?.some(e => e?.kind === "changePlaceholder")) {
                     this.inputEditor.updateOptions({
                         placeholder: this.viewModel.inputPlaceholder
@@ -1677,7 +1677,7 @@ let ChatWidget = class ChatWidget extends Disposable {
             this._hasPendingRequestsContextKey.set(pendingCount > 0);
             const steeringCount = pendingRequests.filter(pending => pending.kind === ChatRequestQueueKind.Steering).length;
             if (announceSteering && steeringCount > 0 && lastSteeringCount === 0) {
-                status(( localize(7026, "Steering")));
+                status(( localize(7150, "Steering")));
             }
             lastSteeringCount = steeringCount;
         };
@@ -1763,10 +1763,11 @@ let ChatWidget = class ChatWidget extends Disposable {
         this.renderWelcomeViewContentIfNeeded();
         const agent = this.chatAgentService.getAgent(agentId);
         this._updateAgentCapabilitiesContextKeys(agent);
+        const supportsCheckpoints = this._attachmentCapabilities.supportsCheckpoints ?? false;
         this.listWidget?.updateRendererOptions({
-            restorable: false,
-            editable: false,
-            noFooter: true,
+            restorable: supportsCheckpoints,
+            editable: supportsCheckpoints,
+            noFooter: false,
             progressMessageAtBottomOfResponse: true
         });
         if (this.visible) {
@@ -1789,7 +1790,6 @@ let ChatWidget = class ChatWidget extends Disposable {
         this.listWidget?.updateRendererOptions({
             restorable: true,
             editable: true,
-            noFooter: false,
             progressMessageAtBottomOfResponse: mode => mode !== ChatModeKind.Ask
         });
         if (this.visible) {
@@ -1864,11 +1864,12 @@ let ChatWidget = class ChatWidget extends Disposable {
         const refs = parseResult.body?.variableReferences.map((
             {
                 name,
-                offset
+                offset,
+                fullLength
             }
         ) => ({
             name,
-            range: ( new OffsetRange(offset, offset + name.length + 1))
+            range: ( new OffsetRange(offset, offset + fullLength))
         })) ?? [];
         const toolReferences = this.toolsService.toToolReferences(refs);
         requestInput.attachedContext.insertFirst(toPromptFileVariableEntry(
@@ -1878,12 +1879,11 @@ let ChatWidget = class ChatWidget extends Disposable {
             true,
             toolReferences
         ));
-        const promptPath = slashCommand.promptPath;
         const promptRunEvent = {
-            storage: promptPath.storage
+            storage: slashCommand.storage
         };
-        if (promptPath.storage === PromptsStorage.extension) {
-            promptRunEvent.extensionId = promptPath.extension.identifier.value;
+        if (slashCommand.extension) {
+            promptRunEvent.extensionId = slashCommand.extension.identifier.value;
             promptRunEvent.promptName = slashCommand.name;
         } else {
             promptRunEvent.promptNameHash = ( hash(slashCommand.name).toString(16));
@@ -1927,6 +1927,7 @@ let ChatWidget = class ChatWidget extends Disposable {
         const isUserQuery = !query;
         const isEditing = this.viewModel?.editing;
         if (isEditing) {
+            this.inputPart?.clearToolConfirmationCarousel();
             const editingPendingRequest = this.viewModel.editing.pendingKind;
             if (editingPendingRequest !== undefined) {
                 const editingRequestId = this.viewModel.editing.id;
@@ -1936,8 +1937,14 @@ let ChatWidget = class ChatWidget extends Disposable {
                 await this.chatService.cancelCurrentRequestForSession(this.viewModel.sessionResource, "acceptInput-editing");
                 options.queue = undefined;
             }
+            const preserveCheckpoint = this._lockedAgent && !!this._attachmentCapabilities.supportsCheckpoints;
+            if (preserveCheckpoint) {
+                this.recentlyRestoredCheckpoint = true;
+            }
             this.finishedEditing(true);
-            this.viewModel.model?.setCheckpoint(undefined);
+            if (!preserveCheckpoint) {
+                this.viewModel.model?.setCheckpoint(undefined);
+            }
         }
         const model = this.viewModel.model;
         const requestInProgress = model.requestInProgress.get();
@@ -1952,9 +1959,6 @@ let ChatWidget = class ChatWidget extends Disposable {
             return;
         }
         await this._applyPromptFileIfSet(requestInputs);
-        markChat(this.viewModel.sessionResource, ChatPerfMark.WillCollectInstructions);
-        await this._autoAttachInstructions(requestInputs);
-        markChat(this.viewModel.sessionResource, ChatPerfMark.DidCollectInstructions);
         if (this.viewOptions.enableWorkingSet !== undefined && this.input.currentModeKind === ChatModeKind.Edit) {
             const uniqueWorkingSetEntries = ( new ResourceSet());
             const editingSessionAttachedContext = requestInputs.attachedContext;
@@ -1981,13 +1985,18 @@ let ChatWidget = class ChatWidget extends Disposable {
             const requests = this.viewModel.model.getRequests();
             for (let i = requests.length - 1; i >= 0; i -= 1) {
                 const request = requests[i];
-                if (request.shouldBeBlocked) {
+                if (request.shouldBeBlocked.get() || request === this.viewModel.model.checkpoint) {
                     this.chatService.removeRequest(this.viewModel.sessionResource, request.id);
                 }
             }
+            this.viewModel.model.setCheckpoint(undefined);
         }
+        const enabledTools = this.input.currentModeKind === ChatModeKind.Agent ? this.input.selectedToolsModel.userSelectedTools.get() : undefined;
+        const enabledSubAgents = this.input.currentModeKind === ChatModeKind.Agent ? this.input.currentModeObs.get().agents?.get() : undefined;
         const resolvedImageVariables = await this._resolveDirectoryImageAttachments(requestInputs.attachedContext.asArray());
         const submittedSessionResource = this.viewModel.sessionResource;
+        const contribution = this._lockedAgent ? this.chatSessionsService.getChatSessionContribution(this._lockedAgent.id) : undefined;
+        const autoAttachEnabled = contribution ? contribution.autoAttachReferences === true : true;
         const result = await this.chatService.sendRequest(this.viewModel.sessionResource, requestInputs.input, {
             userSelectedModelId: this.input.currentLanguageModel,
             location: this.location,
@@ -2003,7 +2012,12 @@ let ChatWidget = class ChatWidget extends Disposable {
             ...this.getModeRequestOptions(),
             modeInfo: this.input.currentModeInfo,
             agentIdSilent: this._lockedAgent?.id,
-            queue: options?.queue
+            queue: options?.queue,
+            instructionContext: autoAttachEnabled ? {
+                modeKind: this.input.currentModeKind,
+                enabledTools,
+                enabledSubAgents
+            } : undefined
         });
         if (ChatSendResult.isRejected(result)) {
             return;
@@ -2076,16 +2090,16 @@ let ChatWidget = class ChatWidget extends Disposable {
         }
         const promptResult = await this.dialogService.prompt({
             type: "question",
-            message: ( localize(7027, "You already have pending requests.")),
+            message: ( localize(7151, "You already have pending requests.")),
             detail: ( localize(
-                7028,
+                7152,
                 "Do you want to keep them in the queue or remove them before sending this message?"
             )),
             buttons: [{
-                label: ( localize(7029, "Keep Pending Requests")),
+                label: ( localize(7153, "Keep Pending Requests")),
                 run: () => "keep"
             }, {
-                label: ( localize(7030, "Remove Pending Requests")),
+                label: ( localize(7154, "Remove Pending Requests")),
                 run: () => "remove"
             }],
             cancelButton: true
@@ -2106,6 +2120,9 @@ let ChatWidget = class ChatWidget extends Disposable {
         const userSelectedTools = this.input.selectedToolsModel.userSelectedTools;
         let lastToolsSnapshot = userSelectedTools.get();
         const scopedTools = derived(reader => {
+            if (this._store.isDisposed) {
+                return lastToolsSnapshot;
+            }
             const activeSession = this._viewModelObs.read(reader)?.sessionResource;
             const currentModeId = this.input.currentModeObs.read(reader).id;
             if (isEqual(activeSession, sessionResource) && currentModeId === capturedModeId) {
@@ -2316,40 +2333,6 @@ let ChatWidget = class ChatWidget extends Disposable {
             this.input.switchModelByQualifiedName(model);
         }
     }
-    async _autoAttachInstructions(
-        {
-            attachedContext
-        }
-    ) {
-        const contribution = this._lockedAgent ? this.chatSessionsService.getChatSessionContribution(this._lockedAgent.id) : undefined;
-        const isContributedSession = !!contribution;
-        const autoAttachEnabled = isContributedSession ? contribution.autoAttachReferences === true : true;
-        if (!autoAttachEnabled) {
-            this.logService.debug(
-                `ChatWidget#_autoAttachInstructions: skipped, autoAttachReferences is disabled`
-            );
-            return;
-        }
-        try {
-            this.logService.debug(`ChatWidget#_autoAttachInstructions: prompt files are enabled`);
-            const enabledTools = this.input.currentModeKind === ChatModeKind.Agent ? this.input.selectedToolsModel.userSelectedTools.get() : undefined;
-            const enabledSubAgents = this.input.currentModeKind === ChatModeKind.Agent ? this.input.currentModeObs.get().agents?.get() : undefined;
-            const sessionResource = this._viewModel?.model.sessionResource;
-            const computer = this.instantiationService.createInstance(
-                ComputeAutomaticInstructions,
-                this.input.currentModeKind,
-                enabledTools,
-                enabledSubAgents,
-                sessionResource
-            );
-            await computer.collect(attachedContext, CancellationToken.None);
-        } catch (err) {
-            this.logService.error(
-                `ChatWidget#_autoAttachInstructions: failed to compute automatic instructions`,
-                err
-            );
-        }
-    }
     delegateScrollFromMouseWheelEvent(browserEvent) {
         this.listWidget.delegateScrollFromMouseWheelEvent(browserEvent);
     }

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/chatFollowups.js

@@ -45,7 +45,7 @@ let ChatFollowups = class ChatFollowups extends Disposable {
         } else if (followup.kind === "command") {
             button.element.classList.add("interactive-followup-command");
         }
-        button.element.ariaLabel = ( localize(7031, "Follow up question: {0}", baseTitle));
+        button.element.ariaLabel = ( localize(7155, "Follow up question: {0}", baseTitle));
         button.label = ( new MarkdownString(baseTitle));
         this._register(button.onDidClick(() => this.clickHandler(followup)));
     }

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/chatInputPart.d.ts

@@ -18,17 +18,16 @@ import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform
 import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
 import { ISharedWebContentExtractorService } from "@codingame/monaco-vscode-api/vscode/vs/platform/webContentExtractor/common/webContentExtractor.service";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
+import { ISCMService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service";
 import { IWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service";
 import { IViewDescriptorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service";
-import { IWorkbenchAssignmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/assignment/common/assignmentService.service";
 import { IChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { ChatContextKeys } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys";
 import { ChatRequestVariableSet, IChatRequestVariableEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries";
 import { IChatMode } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes";
 import { IChatModeService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes.service";
-import { IChatFollowup, IChatQuestionCarousel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
-import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
+import { IChatFollowup, IChatPlanReview, IChatQuestionCarousel, IChatToolInvocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 import { IChatSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service";
 import { ChatAgentLocation, ChatModeKind, ChatPermissionLevel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants";
 import { IChatEditingSession } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
@@ -45,7 +44,10 @@ import { IChatAttachmentWidgetRegistry } from "@codingame/monaco-vscode-api/vsco
 import { ChatImplicitContexts } from "../../attachments/chatImplicitContext.js";
 import { IChatWidget, ISessionTypePickerDelegate, IWorkspacePickerDelegate } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
 import { IChatContextService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/contextContrib/chatContextService.service";
+import { ChatPlanReviewPart, IChatPlanReviewPartOptions } from "../chatContentParts/chatPlanReviewPart.js";
 import { ChatQuestionCarouselPart, IChatQuestionCarouselOptions } from "../chatContentParts/chatQuestionCarouselPart.js";
+import { ChatToolConfirmationCarouselPart, ToolInvocationPartFactory, ScrollToSubagentCallback } from "../chatContentParts/toolInvocationParts/chatToolConfirmationCarouselPart.js";
+import { ChatToolInvocationPart } from "../chatContentParts/toolInvocationParts/chatToolInvocationPart.js";
 import { IChatContentPartRenderContext } from "../chatContentParts/chatContentParts.js";
 import { ChatDragAndDrop } from "../chatDragAndDrop.js";
 import { ChatSelectedTools } from "./chatSelectedTools.js";
@@ -120,15 +122,14 @@ export declare class ChatInputPart extends Disposable implements IHistoryNavigat
     private readonly storageService;
     private readonly agentService;
     private readonly sharedWebExtracterService;
-    private readonly experimentService;
     private readonly entitlementService;
     private readonly chatModeService;
     private readonly toolService;
-    private readonly chatService;
     private readonly chatSessionsService;
     private readonly chatContextService;
     private readonly agentSessionsService;
     private readonly workspaceContextService;
+    private readonly scmService;
     private readonly layoutService;
     private readonly viewDescriptorService;
     private readonly _chatAttachmentWidgetRegistry;
@@ -141,6 +142,10 @@ export declare class ChatInputPart extends Disposable implements IHistoryNavigat
     private readonly _questionCarouselResponseIds;
     private readonly _questionCarouselSessionResources;
     private _hasQuestionCarouselContextKey;
+    private readonly _chatPlanReviewWidgets;
+    private readonly _planReviewResponseIds;
+    private readonly _planReviewSessionResources;
+    private readonly _chatToolConfirmationCarousels;
     private readonly _chatEditingTodosDisposables;
     private _lastEditingSessionResource;
     private _onDidLoadInputState;
@@ -195,6 +200,8 @@ export declare class ChatInputPart extends Disposable implements IHistoryNavigat
     private chatArtifactsWidgetContainer;
     private chatGettingStartedTipContainer;
     private chatQuestionCarouselContainer;
+    private chatPlanReviewContainer;
+    private chatToolConfirmationCarouselContainer;
     private chatInputWidgetsContainer;
     private inputContainer;
     private readonly _widgetController;
@@ -300,7 +307,7 @@ export declare class ChatInputPart extends Disposable implements IHistoryNavigat
     private _chatSessionIsEmpty;
     private _pendingDelegationTarget;
     private _currentSessionType;
-    constructor(location: ChatAgentLocation, options: IChatInputPartOptions, styles: IChatInputStyles, inline: boolean, modelService: IModelService, instantiationService: IInstantiationService, contextKeyService: IContextKeyService, configurationService: IConfigurationService, keybindingService: IKeybindingService, accessibilityService: IAccessibilityService, languageModelsService: ILanguageModelsService, logService: ILogService, fileService: IFileService, editorService: IEditorService, themeService: IThemeService, textModelResolverService: ITextModelService, storageService: IStorageService, agentService: IChatAgentService, sharedWebExtracterService: ISharedWebContentExtractorService, experimentService: IWorkbenchAssignmentService, entitlementService: IChatEntitlementService, chatModeService: IChatModeService, toolService: ILanguageModelToolsService, chatService: IChatService, chatSessionsService: IChatSessionsService, chatContextService: IChatContextService, agentSessionsService: IAgentSessionsService, workspaceContextService: IWorkspaceContextService, layoutService: IWorkbenchLayoutService, viewDescriptorService: IViewDescriptorService, _chatAttachmentWidgetRegistry: IChatAttachmentWidgetRegistry);
+    constructor(location: ChatAgentLocation, options: IChatInputPartOptions, styles: IChatInputStyles, inline: boolean, modelService: IModelService, instantiationService: IInstantiationService, contextKeyService: IContextKeyService, configurationService: IConfigurationService, keybindingService: IKeybindingService, accessibilityService: IAccessibilityService, languageModelsService: ILanguageModelsService, logService: ILogService, fileService: IFileService, editorService: IEditorService, themeService: IThemeService, textModelResolverService: ITextModelService, storageService: IStorageService, agentService: IChatAgentService, sharedWebExtracterService: ISharedWebContentExtractorService, entitlementService: IChatEntitlementService, chatModeService: IChatModeService, toolService: ILanguageModelToolsService, chatSessionsService: IChatSessionsService, chatContextService: IChatContextService, agentSessionsService: IAgentSessionsService, workspaceContextService: IWorkspaceContextService, scmService: ISCMService, layoutService: IWorkbenchLayoutService, viewDescriptorService: IViewDescriptorService, _chatAttachmentWidgetRegistry: IChatAttachmentWidgetRegistry);
     private setImplicitContextEnablement;
     setIsWithinEditSession(inInsideDiff: boolean, isFilePartOfEditSession: boolean): void;
     private getSelectedModelStorageKey;
@@ -314,6 +321,8 @@ export declare class ChatInputPart extends Disposable implements IHistoryNavigat
     openModePicker(): void;
     openPermissionPicker(): void;
     setPermissionLevel(level: ChatPermissionLevel): void;
+    private getDefaultPermissionLevel;
+    private getPermittedPermissionLevel;
     openSessionTargetPicker(): void;
     openDelegationPicker(): void;
     openChatSessionPicker(): void;
@@ -350,7 +359,6 @@ export declare class ChatInputPart extends Disposable implements IHistoryNavigat
     private getModels;
     /**
      * Get the chat session type for the current session, if any.
-     * Uses the delegate or `getChatSessionFromInternalUri` to determine the session type.
      */
     private getCurrentSessionType;
     /**
@@ -364,6 +372,10 @@ export declare class ChatInputPart extends Disposable implements IHistoryNavigat
      * Called when switching sessions to prevent cross-contamination.
      */
     private checkModelInSessionPool;
+    /**
+     * Reset the current mode when it is not valid for the current session type.
+     */
+    private checkModeInSessionPool;
     /**
      * Pre-select the model in the model picker based on the `modelId` from the
      * last request in the current session's history. This ensures that when a
@@ -378,7 +390,6 @@ export declare class ChatInputPart extends Disposable implements IHistoryNavigat
     getCurrentInputState(): IChatModelInputState;
     private _getAriaLabel;
     private validateCurrentChatMode;
-    private getDefaultModeExperimentStorageKey;
     logInputHistory(): void;
     setVisible(visible: boolean): void;
     /** If consumers are busy generating the chat input, returns the promise resolved when they finish */
@@ -434,11 +445,12 @@ export declare class ChatInputPart extends Disposable implements IHistoryNavigat
      *
      * This method also updates the `chatSessionHasOptions` context key, which controls
      * whether the picker action is shown in the toolbar via its `when` clause.
-     *
-     * @returns The result containing visible group IDs and related context, or undefined
-     *          if there are no visible option groups
      */
-    private computeVisibleOptionGroups;
+    private getVisibleOptionGroupsModeAndUpdateContextKeys;
+    private getCurrentSessionResource;
+    private areAllOptionsValid;
+    private getAllOptionsGroups;
+    private getVisibleOptionGroups;
     /**
      * Refresh all registered option groups for the current chat session.
      * Fires events for each option group with their current selection.
@@ -450,6 +462,7 @@ export declare class ChatInputPart extends Disposable implements IHistoryNavigat
      * Returns undefined if the session doesn't have this option configured.
      */
     private getCurrentOptionForGroup;
+    private hasWorkspaceScmRepository;
     private getEffectiveSessionType;
     /**
      * Updates the agentSessionType context key based on delegate or actual session.
@@ -490,6 +503,24 @@ export declare class ChatInputPart extends Disposable implements IHistoryNavigat
     isQuestionCarouselFocused(): boolean;
     navigateToPreviousQuestion(): boolean;
     navigateToNextQuestion(): boolean;
+    renderPlanReview(review: IChatPlanReview, context: IChatContentPartRenderContext, options: IChatPlanReviewPartOptions): ChatPlanReviewPart;
+    clearPlanReview(responseId?: string, resolveId?: string): void;
+    get planReview(): ChatPlanReviewPart | undefined;
+    private get _currentSessionKey();
+    private get _currentToolConfirmationCarousel();
+    renderToolConfirmationCarousel(tool: IChatToolInvocation, factory: ToolInvocationPartFactory, subAgentInvocationId?: string, agentName?: string, scrollToSubagent?: ScrollToSubagentCallback, toolPart?: ChatToolInvocationPart): ChatToolConfirmationCarouselPart;
+    addToolToConfirmationCarousel(tool: IChatToolInvocation, factory: ToolInvocationPartFactory, subAgentInvocationId?: string, agentName?: string, scrollToSubagent?: ScrollToSubagentCallback, toolPart?: ChatToolInvocationPart): void;
+    /**
+     * Navigates the carousel to the first pending tool from the given subagent.
+     */
+    activateCarouselForSubagent(subAgentInvocationId: string): void;
+    hasToolInConfirmationCarousel(toolCallId: string): boolean;
+    get hasActiveToolConfirmationCarousel(): boolean;
+    clearToolConfirmationCarousel(): void;
+    /**
+     * Swaps the visible tool confirmation carousel when switching sessions.
+     */
+    private _syncToolConfirmationCarouselForSession;
     setWorkingSetCollapsed(collapsed: boolean): void;
     renderChatEditingSessionState(chatEditingSession: IChatEditingSession | null): void;
     private renderChatEditingSessionWithEntries;
@@ -500,6 +531,7 @@ export declare class ChatInputPart extends Disposable implements IHistoryNavigat
      * for non-editor chrome such as attachments, toolbars, and widgets.
      */
     setMaxHeight(maxHeight: number | undefined): void;
+    private updateToolConfirmationCarouselMaxHeight;
     /**
      * Layout the input part with the given width. Height is intrinsic - determined by content
      * and detected via ResizeObserver, which updates `inputPartHeight` for the parent to observe.