@codingame/monaco-vscode-katex-common 28.4.0 → 29.0.0

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

@@ -27,7 +27,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/sear
 import { katexContainerClassName } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/markdown/common/markedKatexExtension';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
-import { ChatModeKind, ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+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';
@@ -119,6 +119,16 @@ let ChatListWidget = class ChatListWidget extends Disposable {
         this._getCurrentModeInfo = options.getCurrentModeInfo;
         this._lastItemIdContextKey = ChatContextKeys.lastItemId.bindTo(this.contextKeyService);
         this._container = container;
+        const updateInlineReferencesStyle = () => {
+            const style = this.configurationService.getValue(ChatConfiguration.InlineReferencesStyle);
+            this._container.classList.toggle("chat-inline-references-link-style", style === "link");
+        };
+        updateInlineReferencesStyle();
+        this._register(this.configurationService.onDidChangeConfiguration(e => {
+            if (e.affectsConfiguration(ChatConfiguration.InlineReferencesStyle)) {
+                updateInlineReferencesStyle();
+            }
+        }));
         const scopedInstantiationService = this._register(this.instantiationService.createChild(( new ServiceCollection([IContextKeyService, this.contextKeyService]))));
         this._renderStyle = options.renderStyle;
         const overflowWidgetsContainer = options.overflowWidgetsDomNode ?? createElement("div");

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

@@ -24,10 +24,12 @@ import { IChatLocationData, IChatSendRequestOptions } from "@codingame/monaco-vs
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
 import { IChatSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service";
 import { IChatSlashCommandService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatSlashCommands.service";
+import { IChatArtifactsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/chatArtifactsService.service";
 import { IChatTodoListService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/chatTodoListService.service";
 import { ChatViewModel, IChatResponseViewModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel";
 import { ChatAgentLocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants";
 import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service";
+import { IHandOff } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptFileParser";
 import { IPromptsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service";
 import { ChatTreeItem, IChatAcceptInputOptions, IChatCodeBlockInfo, IChatFileTreeInfo, IChatWidget, IChatWidgetViewContext, IChatWidgetViewModelChangeEvent, IChatWidgetViewOptions } 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";
@@ -83,6 +85,7 @@ export declare class ChatWidget extends Disposable implements IChatWidget {
     private readonly chatSessionsService;
     private readonly agentSessionsService;
     private readonly chatTodoListService;
+    private readonly chatArtifactsService;
     private readonly lifecycleService;
     private readonly chatAttachmentResolveService;
     private readonly chatTipService;
@@ -157,6 +160,8 @@ export declare class ChatWidget extends Disposable implements IChatWidget {
     private _isRenderingWelcome;
     private _lockedAgent?;
     private readonly _lockedToCodingAgentContextKey;
+    private readonly _lockedCodingAgentIdContextKey;
+    private readonly _chatSessionSupportsForkContextKey;
     private readonly _agentSupportsAttachmentsContextKey;
     private readonly _sessionIsEmptyContextKey;
     private readonly _hasPendingRequestsContextKey;
@@ -176,7 +181,7 @@ export declare class ChatWidget extends Disposable implements IChatWidget {
     readonly viewContext: IChatWidgetViewContext;
     get supportsChangingModes(): boolean;
     get locationData(): IChatLocationData | undefined;
-    constructor(location: ChatAgentLocation | IChatWidgetLocationOptions, viewContext: IChatWidgetViewContext | undefined, viewOptions: IChatWidgetViewOptions, styles: IChatWidgetStyles, codeEditorService: ICodeEditorService, configurationService: IConfigurationService, dialogService: IDialogService, contextKeyService: IContextKeyService, instantiationService: IInstantiationService, chatService: IChatService, chatAgentService: IChatAgentService, chatWidgetService: IChatWidgetService, chatAccessibilityService: IChatAccessibilityService, logService: ILogService, themeService: IThemeService, chatSlashCommandService: IChatSlashCommandService, chatEditingService: IChatEditingService, telemetryService: ITelemetryService, promptsService: IPromptsService, toolsService: ILanguageModelToolsService, chatModeService: IChatModeService, chatLayoutService: IChatLayoutService, chatEntitlementService: IChatEntitlementService, chatSessionsService: IChatSessionsService, agentSessionsService: IAgentSessionsService, chatTodoListService: IChatTodoListService, lifecycleService: ILifecycleService, chatAttachmentResolveService: IChatAttachmentResolveService, chatTipService: IChatTipService, chatDebugService: IChatDebugService);
+    constructor(location: ChatAgentLocation | IChatWidgetLocationOptions, viewContext: IChatWidgetViewContext | undefined, viewOptions: IChatWidgetViewOptions, styles: IChatWidgetStyles, codeEditorService: ICodeEditorService, configurationService: IConfigurationService, dialogService: IDialogService, contextKeyService: IContextKeyService, instantiationService: IInstantiationService, chatService: IChatService, chatAgentService: IChatAgentService, chatWidgetService: IChatWidgetService, chatAccessibilityService: IChatAccessibilityService, logService: ILogService, themeService: IThemeService, chatSlashCommandService: IChatSlashCommandService, chatEditingService: IChatEditingService, telemetryService: ITelemetryService, promptsService: IPromptsService, toolsService: ILanguageModelToolsService, chatModeService: IChatModeService, chatLayoutService: IChatLayoutService, chatEntitlementService: IChatEntitlementService, chatSessionsService: IChatSessionsService, agentSessionsService: IAgentSessionsService, chatTodoListService: IChatTodoListService, chatArtifactsService: IChatArtifactsService, lifecycleService: ILifecycleService, chatAttachmentResolveService: IChatAttachmentResolveService, chatTipService: IChatTipService, chatDebugService: IChatDebugService);
     private _lastSelectedAgent;
     set lastSelectedAgent(agent: IChatAgentData | undefined);
     get lastSelectedAgent(): IChatAgentData | undefined;
@@ -234,6 +239,7 @@ export declare class ChatWidget extends Disposable implements IChatWidget {
     private renderFollowups;
     private renderChatSuggestNextWidget;
     private handleNextPromptSelection;
+    executeHandoff(handoff: IHandOff, agentId?: string): Promise<void>;
     handleDelegationExitIfNeeded(sourceAgent: Pick<IChatAgentData, "id" | "name"> | undefined, targetAgent: IChatAgentData | undefined): Promise<void>;
     private _shouldExitAfterDelegation;
     /**
@@ -267,6 +273,8 @@ export declare class ChatWidget extends Disposable implements IChatWidget {
     logInputHistory(): void;
     acceptInput(query?: string, options?: IChatAcceptInputOptions): Promise<IChatResponseModel | undefined>;
     rerunLastRequest(): Promise<void>;
+    private getConfiguredThinkingStyle;
+    private logThinkingStyleUsage;
     private _applyPromptFileIfSet;
     private _acceptInput;
     private _resolveDirectoryImageAttachments;

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

@@ -20,7 +20,7 @@ import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/netw
 import { IsSessionsWindowContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 import { filter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
-import { isEqual, extUri, basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { isEqual, extUri } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { MicrotaskDelay } from '@codingame/monaco-vscode-api/vscode/vs/base/common/symbols';
 import { isDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
@@ -56,11 +56,12 @@ import { ChatRequestQueueKind, ChatSendResult } from '@codingame/monaco-vscode-a
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
 import { IChatSlashCommandService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatSlashCommands.service';
+import { IChatArtifactsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/chatArtifactsService.service';
 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, ChatConfiguration, ChatPermissionLevel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { ChatModeKind, ChatPermissionLevel, ChatConfiguration, ThinkingDisplayMode } 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';
@@ -111,7 +112,7 @@ const supportsAllAttachments = {
     supportsPromptAttachments: true,
     supportsHandOffs: true
 };
-const DISCLAIMER = ( localize(6760, "AI responses may be inaccurate"));
+const DISCLAIMER = ( localize(6962, "AI responses may be inaccurate"));
 let ChatWidget = class ChatWidget extends Disposable {
     static {
         ChatWidget_1 = this;
@@ -212,6 +213,7 @@ let ChatWidget = class ChatWidget extends Disposable {
         chatSessionsService,
         agentSessionsService,
         chatTodoListService,
+        chatArtifactsService,
         lifecycleService,
         chatAttachmentResolveService,
         chatTipService,
@@ -241,6 +243,7 @@ let ChatWidget = class ChatWidget extends Disposable {
         this.chatSessionsService = chatSessionsService;
         this.agentSessionsService = agentSessionsService;
         this.chatTodoListService = chatTodoListService;
+        this.chatArtifactsService = chatArtifactsService;
         this.lifecycleService = lifecycleService;
         this.chatAttachmentResolveService = chatAttachmentResolveService;
         this.chatTipService = chatTipService;
@@ -289,6 +292,8 @@ let ChatWidget = class ChatWidget extends Disposable {
         this._editingSession = observableValue(this, undefined);
         this._viewModelObs = observableFromEvent(this, this.onDidChangeViewModel, () => this.viewModel);
         this._lockedToCodingAgentContextKey = ChatContextKeys.lockedToCodingAgent.bindTo(this.contextKeyService);
+        this._lockedCodingAgentIdContextKey = ChatContextKeys.lockedCodingAgentId.bindTo(this.contextKeyService);
+        this._chatSessionSupportsForkContextKey = ChatContextKeys.chatSessionSupportsFork.bindTo(this.contextKeyService);
         this._agentSupportsAttachmentsContextKey = ChatContextKeys.agentSupportsAttachments.bindTo(this.contextKeyService);
         this._sessionIsEmptyContextKey = ChatContextKeys.chatSessionIsEmpty.bindTo(this.contextKeyService);
         this._hasPendingRequestsContextKey = ChatContextKeys.hasPendingRequests.bindTo(this.contextKeyService);
@@ -473,6 +478,11 @@ let ChatWidget = class ChatWidget extends Disposable {
                 this.inputPart.renderChatTodoListWidget(sessionResource);
             }
         }));
+        this._register(this.chatArtifactsService.onDidUpdateArtifacts(sessionResource => {
+            if (isEqual(this.viewModel?.sessionResource, sessionResource)) {
+                this.inputPart.renderArtifactsWidget(sessionResource);
+            }
+        }));
     }
     set lastSelectedAgent(agent) {
         this.parsedChatRequest = undefined;
@@ -547,10 +557,11 @@ let ChatWidget = class ChatWidget extends Disposable {
         this._register(this.chatSuggestNextWidget.onDidSelectPrompt((
             {
                 handoff,
-                agentId
+                agentId,
+                withAutopilot
             }
         ) => {
-            this.handleNextPromptSelection(handoff, agentId);
+            this.handleNextPromptSelection(handoff, agentId, withAutopilot);
         }));
         if (renderInputOnTop) {
             this.createInput(this.container, {
@@ -816,7 +827,7 @@ let ChatWidget = class ChatWidget extends Disposable {
                 if (this.chatEntitlementService.anonymous && !this.chatEntitlementService.sentiment.installed) {
                     const providers = product.defaultChatAgent.provider;
                     additionalMessage = ( new MarkdownString(( localize(
-                        6761,
+                        6963,
                         "By continuing with {0} Copilot, you agree to {1}'s [Terms]({2}) and [Privacy Statement]({3}).",
                         providers.default.name,
                         providers.default.name,
@@ -870,7 +881,6 @@ let ChatWidget = class ChatWidget extends Disposable {
         const tipPart = store.add(
             this.instantiationService.createInstance(ChatTipContentPart, tip, renderer)
         );
-        tipContainer.appendChild(tipPart.domNode);
         this._gettingStartedTipPartRef = tipPart;
         store.add(tipPart.onDidHide(() => {
             tipPart.domNode.remove();
@@ -880,6 +890,8 @@ let ChatWidget = class ChatWidget extends Disposable {
             this.focusInput();
         }));
         this._gettingStartedTipPart.value = store;
+        clearNode(tipContainer);
+        tipContainer.appendChild(tipPart.domNode);
         setVisibility(true, tipContainer);
     }
     _getGenerateInstructionsMessage() {
@@ -897,7 +909,7 @@ let ChatWidget = class ChatWidget extends Disposable {
             return ( new MarkdownString(""));
         } else if (this._instructionFilesExist === false) {
             return (new MarkdownString(localize(
-                6762,
+                6964,
                 "[Generate Agent Instructions]({0}) to onboard AI onto your codebase.",
                 `command:${GENERATE_AGENT_INSTRUCTIONS_COMMAND_ID}`
             ), {
@@ -918,23 +930,24 @@ let ChatWidget = class ChatWidget extends Disposable {
     }
     getWelcomeViewContent(additionalMessage) {
         if (this.isLockedToCodingAgent) {
-            const providerIcon = this._lockedAgent ? this.chatSessionsService.getIconForSessionType(this._lockedAgent.id) : undefined;
-            const providerTitle = this._lockedAgent ? this.chatSessionsService.getWelcomeTitleForSessionType(this._lockedAgent.id) : undefined;
-            const providerMessage = this._lockedAgent ? this.chatSessionsService.getWelcomeMessageForSessionType(this._lockedAgent.id) : undefined;
+            const contribution = this._lockedAgent ? this.chatSessionsService.getChatSessionContribution(this._lockedAgent.id) : undefined;
+            const providerIcon = contribution?.icon;
+            const providerTitle = contribution?.welcomeTitle;
+            const providerMessage = contribution?.welcomeMessage;
             const message = providerMessage ? ( new MarkdownString(providerMessage)) : (this._lockedAgent?.prefix === "@copilot " ? ( new MarkdownString(( localize(
-                6763,
+                6965,
                 "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(
-                6764,
+                6966,
                 "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(6765, "Delegate to {0}", this._lockedAgent?.prefix)),
+                title: providerTitle ?? ( localize(6967, "Delegate to {0}", this._lockedAgent?.prefix)),
                 message,
                 icon: providerIcon ?? Codicon.sendToRemoteAgent,
                 additionalMessage,
@@ -943,11 +956,11 @@ let ChatWidget = class ChatWidget extends Disposable {
         }
         let title;
         if (this.input.currentModeKind === ChatModeKind.Ask) {
-            title = ( localize(6766, "Ask about your code"));
+            title = ( localize(6968, "Ask about your code"));
         } else if (this.input.currentModeKind === ChatModeKind.Edit) {
-            title = ( localize(6767, "Edit in context"));
+            title = ( localize(6969, "Edit in context"));
         } else {
-            title = ( localize(6768, "Build with Agent"));
+            title = ( localize(6970, "Build with Agent"));
         }
         return {
             title,
@@ -984,18 +997,34 @@ let ChatWidget = class ChatWidget extends Disposable {
         }
         const lastItem = items[items.length - 1];
         const lastResponseComplete = lastItem && isResponseVM(lastItem) && lastItem.isComplete;
-        if (!lastResponseComplete) {
+        if (!lastResponseComplete || lastItem.isCanceled) {
+            this.chatSuggestNextWidget.hide();
             return;
         }
-        const currentMode = this.input.currentModeObs.get();
-        const handoffs = currentMode?.handOffs?.get();
-        const shouldShow = currentMode && handoffs && handoffs.length > 0;
-        if (shouldShow) {
+        const modeInfo = lastItem.model.request?.modeInfo;
+        let responseMode;
+        if (modeInfo?.modeInstructions?.name) {
+            responseMode = this.chatModeService.findModeByName(modeInfo.modeInstructions.name);
+        } else if (modeInfo?.modeId) {
+            responseMode = this.chatModeService.findModeById(modeInfo.modeId);
+        } else {
+            responseMode = this.input.currentModeObs.get();
+        }
+        const handoffs = responseMode?.handOffs?.get();
+        if (responseMode && handoffs && handoffs.length > 0) {
+            const permissionLevel = this.inputPart.currentModeInfo.permissionLevel;
+            if (permissionLevel === ChatPermissionLevel.Autopilot) {
+                const autoSendHandoff = handoffs.find(h => h.send);
+                if (autoSendHandoff) {
+                    this.handleNextPromptSelection(autoSendHandoff);
+                    return;
+                }
+            }
             const wasHidden = this.chatSuggestNextWidget.domNode.style.display === "none";
-            this.chatSuggestNextWidget.render(currentMode);
+            this.chatSuggestNextWidget.render(responseMode);
             if (wasHidden) {
                 this.telemetryService.publicLog2("chat.handoffWidgetShown", {
-                    agent: getModeNameForTelemetry(currentMode),
+                    agent: getModeNameForTelemetry(responseMode),
                     handoffCount: handoffs.length
                 });
             }
@@ -1006,8 +1035,11 @@ let ChatWidget = class ChatWidget extends Disposable {
             this.layout(this.bodyDimension.height, this.bodyDimension.width);
         }
     }
-    handleNextPromptSelection(handoff, agentId) {
+    handleNextPromptSelection(handoff, agentId, withAutopilot) {
         this.chatSuggestNextWidget.hide();
+        if (withAutopilot) {
+            this.inputPart.setPermissionLevel(ChatPermissionLevel.Autopilot);
+        }
         const promptToUse = handoff.prompt;
         const currentMode = this.input.currentModeObs.get();
         const toMode = handoff.agent ? this.chatModeService.findModeByName(handoff.agent) : undefined;
@@ -1017,10 +1049,20 @@ let ChatWidget = class ChatWidget extends Disposable {
             hasPrompt: Boolean(promptToUse),
             autoSend: Boolean(handoff.send)
         });
+        this.executeHandoff(handoff, agentId).catch(e => {
+            const target = agentId ?? handoff.agent ?? "unknown";
+            this.logService.error(`[Handoff] Failed to execute handoff '${handoff.label}' to '${target}'`, e);
+        });
+    }
+    async executeHandoff(handoff, agentId) {
+        this.chatSuggestNextWidget.hide();
+        const promptToUse = handoff.prompt;
         if (agentId) {
             this.input.setValue(`@${agentId} ${promptToUse}`, false);
             this.input.focus();
-            this.acceptInput().catch(e => this.logService.error("Failed to handle handoff continueOn", e));
+            this.acceptInput().catch(
+                e => this.logService.error(`[Handoff] Failed to submit delegated handoff to '@${agentId}'`, e)
+            );
         } else if (handoff.agent) {
             this._switchToAgentByName(handoff.agent);
             if (handoff.model) {
@@ -1273,7 +1315,7 @@ let ChatWidget = class ChatWidget extends Disposable {
             if (item?.contextKeyService) {
                 ChatContextKeys.currentlyEditing.bindTo(item.contextKeyService).set(true);
             }
-            const isEditingSentRequest = currentElement.pendingKind === undefined ? ChatContextKeys.EditingRequestType.Sent : ChatContextKeys.EditingRequestType.QueueOrSteer;
+            const isEditingSentRequest = currentElement.pendingKind === undefined ? ChatContextKeys.EditingRequestType.Sent : currentElement.pendingKind === ChatRequestQueueKind.Queued ? ChatContextKeys.EditingRequestType.Queue : ChatContextKeys.EditingRequestType.Steer;
             const isInput = this.configurationService.getValue("chat.editRequests") === "input";
             this.inputPart?.setEditing(!!this.viewModel?.editing && isInput, isEditingSentRequest);
             if (!isInput) {
@@ -1583,9 +1625,13 @@ let ChatWidget = class ChatWidget extends Disposable {
         this.viewModel = this.instantiationService.createInstance(ChatViewModel, model, this._codeBlockModelCollection, undefined);
         this.listWidget.setViewModel(this.viewModel);
         if (this._lockedAgent) {
-            let placeholder = this.chatSessionsService.getInputPlaceholderForSessionType(this._lockedAgent.id);
+            let placeholder = this.chatSessionsService.getChatSessionContribution(this._lockedAgent.id)?.inputPlaceholder;
             if (!placeholder) {
-                placeholder = ( localize(6769, "Chat with {0}", this._lockedAgent.id));
+                placeholder = ( localize(
+                    6971,
+                    "Chat with {0}",
+                    this._lockedAgent.displayName || this._lockedAgent.name
+                ));
             }
             this.viewModel.setInputPlaceholder(placeholder);
             this.inputEditor.updateOptions({
@@ -1623,6 +1669,11 @@ let ChatWidget = class ChatWidget extends Disposable {
             this.onDidChangeItems();
         }));
         this._sessionIsEmptyContextKey.set(model.getRequests().length === 0);
+        const supportsFork = this.chatSessionsService.sessionSupportsFork(model.sessionResource);
+        this._chatSessionSupportsForkContextKey.set(supportsFork);
+        this.listWidget?.updateRendererOptions({
+            supportsFork
+        });
         this._sessionHasDebugDataContextKey.set(this.chatDebugService.getEvents(model.sessionResource).length > 0);
         let lastSteeringCount = 0;
         const updatePendingRequestKeys = announceSteering => {
@@ -1631,7 +1682,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(6770, "Steering")));
+                status(( localize(6972, "Steering")));
             }
             lastSteeringCount = steeringCount;
         };
@@ -1649,6 +1700,7 @@ let ChatWidget = class ChatWidget extends Disposable {
             if (e.kind === "addRequest") {
                 this.inputPart.clearTodoListWidget(this.viewModel?.sessionResource, false);
                 this._sessionIsEmptyContextKey.set(false);
+                this.chatSuggestNextWidget.hide();
             }
             if (e.kind === "removeRequest") {
                 this.inputPart.clearTodoListWidget(this.viewModel?.sessionResource, true);
@@ -1671,8 +1723,10 @@ let ChatWidget = class ChatWidget extends Disposable {
             this.onDidChangeItems();
             this.listWidget.scrollToEnd();
         }
+        this.renderChatSuggestNextWidget();
         this.updateChatInputContext();
         this.input.renderChatTodoListWidget(this.viewModel.sessionResource);
+        this.input.renderArtifactsWidget(this.viewModel.sessionResource);
     }
     getFocus() {
         return this.listWidget.getFocus()[0] ?? undefined;
@@ -1710,6 +1764,7 @@ let ChatWidget = class ChatWidget extends Disposable {
             displayName
         };
         this._lockedToCodingAgentContextKey.set(true);
+        this._lockedCodingAgentIdContextKey.set(agentId);
         this.renderWelcomeViewContentIfNeeded();
         const agent = this.chatAgentService.getAgent(agentId);
         this._updateAgentCapabilitiesContextKeys(agent);
@@ -1726,6 +1781,8 @@ let ChatWidget = class ChatWidget extends Disposable {
     unlockFromCodingAgent() {
         this._lockedAgent = undefined;
         this._lockedToCodingAgentContextKey.set(false);
+        this._lockedCodingAgentIdContextKey.set("");
+        this._chatSessionSupportsForkContextKey.set(false);
         this._updateAgentCapabilitiesContextKeys(undefined);
         this.renderWelcomeViewContentIfNeeded();
         if (this.viewModel) {
@@ -1773,7 +1830,27 @@ let ChatWidget = class ChatWidget extends Disposable {
             userSelectedModelId: this.input.currentLanguageModel,
             modeInfo: this.input.currentModeInfo
         };
-        return await this.chatService.resendRequest(lastRequest, options);
+        const result = await this.chatService.resendRequest(lastRequest, options);
+        this.logThinkingStyleUsage("rerun");
+        return result;
+    }
+    getConfiguredThinkingStyle() {
+        const thinkingStyle = this.configurationService.getValue(ChatConfiguration.ThinkingStyle);
+        switch (thinkingStyle) {
+        case ThinkingDisplayMode.Collapsed:
+        case ThinkingDisplayMode.CollapsedPreview:
+        case ThinkingDisplayMode.FixedScrolling:
+            return thinkingStyle;
+        default:
+            return ThinkingDisplayMode.FixedScrolling;
+        }
+    }
+    logThinkingStyleUsage(requestKind) {
+        this.telemetryService.publicLog2("chat.thinkingStyleUsage", {
+            thinkingStyle: this.getConfiguredThinkingStyle(),
+            location: this.location,
+            requestKind
+        });
     }
     async _applyPromptFileIfSet(requestInput) {
         const agentSlashPromptPart = this.parsedInput.parts.find(r => r instanceof ChatRequestSlashPromptPart);
@@ -1803,7 +1880,6 @@ let ChatWidget = class ChatWidget extends Disposable {
             true,
             toolReferences
         ));
-        requestInput.input = ( this.parsedInput.parts.filter(part => !(part instanceof ChatRequestSlashPromptPart)).map(part => part.text)).join("").trim();
         const promptPath = slashCommand.promptPath;
         const promptRunEvent = {
             storage: promptPath.storage
@@ -1815,11 +1891,6 @@ let ChatWidget = class ChatWidget extends Disposable {
             promptRunEvent.promptNameHash = ( hash(slashCommand.name).toString(16));
         }
         this.telemetryService.publicLog2("chat.promptRun", promptRunEvent);
-        const input = requestInput.input.trim();
-        requestInput.input = `Follow instructions in [${basename(parseResult.uri)}](${( parseResult.uri.toString())}).`;
-        if (input) {
-            requestInput.input += `\n${input}`;
-        }
         if (parseResult.header) {
             await this._applyPromptMetadata(parseResult.header, requestInput);
         }
@@ -1864,7 +1935,7 @@ let ChatWidget = class ChatWidget extends Disposable {
                 this.chatService.removePendingRequest(this.viewModel.sessionResource, editingRequestId);
                 options.queue ??= editingPendingRequest;
             } else {
-                this.chatService.cancelCurrentRequestForSession(this.viewModel.sessionResource, "acceptInput-editing");
+                await this.chatService.cancelCurrentRequestForSession(this.viewModel.sessionResource, "acceptInput-editing");
                 options.queue = undefined;
             }
             this.finishedEditing(true);
@@ -1872,17 +1943,14 @@ let ChatWidget = class ChatWidget extends Disposable {
         }
         const model = this.viewModel.model;
         const requestInProgress = model.requestInProgress.get();
-        if (options.alwaysQueue) {
-            options.queue ??= ChatRequestQueueKind.Queued;
-        }
         if (model.requestNeedsInput.get() && !model.getPendingRequests().length) {
-            this.chatService.cancelCurrentRequestForSession(this.viewModel.sessionResource, "acceptInput-needsInput");
+            await this.chatService.cancelCurrentRequestForSession(this.viewModel.sessionResource, "acceptInput-needsInput");
             options.queue ??= ChatRequestQueueKind.Queued;
         }
         if (requestInProgress) {
             options.queue ??= ChatRequestQueueKind.Queued;
         }
-        if (!options.alwaysQueue && !requestInProgress && !isEditing && !(await this.confirmPendingRequestsBeforeSend(model, options))) {
+        if (!requestInProgress && !isEditing && !(await this.confirmPendingRequestsBeforeSend(model, options))) {
             return;
         }
         await this._applyPromptFileIfSet(requestInputs);
@@ -1935,12 +2003,12 @@ let ChatWidget = class ChatWidget extends Disposable {
             ...this.getModeRequestOptions(),
             modeInfo: this.input.currentModeInfo,
             agentIdSilent: this._lockedAgent?.id,
-            queue: options?.queue,
-            pauseQueue: options?.alwaysQueue
+            queue: options?.queue
         });
         if (ChatSendResult.isRejected(result)) {
             return;
         }
+        this.logThinkingStyleUsage("submit");
         this.updateChatViewVisibility();
         this.input.acceptInput(options?.storeToHistory ?? isUserQuery);
         const sent = ChatSendResult.isQueued(result) ? await result.deferred : result;
@@ -1952,6 +2020,12 @@ let ChatWidget = class ChatWidget extends Disposable {
             slashCommand: sent.data.slashCommand
         });
         this.handleDelegationExitIfNeeded(this._lockedAgent, sent.data.agent);
+        if (sent.newSessionResource) {
+            const newModel = this.chatService.getSession(sent.newSessionResource);
+            if (newModel) {
+                this.setModel(newModel);
+            }
+        }
         sent.data.responseCreatedPromise.then(() => {
             this.chatAccessibilityService.acceptRequest(submittedSessionResource);
             sent.data.responseCompletePromise.then(() => {
@@ -2002,16 +2076,16 @@ let ChatWidget = class ChatWidget extends Disposable {
         }
         const promptResult = await this.dialogService.prompt({
             type: "question",
-            message: ( localize(6771, "You already have pending requests.")),
+            message: ( localize(6973, "You already have pending requests.")),
             detail: ( localize(
-                6772,
+                6974,
                 "Do you want to keep them in the queue or remove them before sending this message?"
             )),
             buttons: [{
-                label: ( localize(6773, "Keep Pending Requests")),
+                label: ( localize(6975, "Keep Pending Requests")),
                 run: () => "keep"
             }, {
-                label: ( localize(6774, "Remove Pending Requests")),
+                label: ( localize(6976, "Remove Pending Requests")),
                 run: () => "remove"
             }],
             cancelButton: true
@@ -2028,11 +2102,13 @@ let ChatWidget = class ChatWidget extends Disposable {
     }
     getModeRequestOptions() {
         const sessionResource = this.viewModel?.sessionResource;
+        const capturedModeId = this.input.currentModeObs.get().id;
         const userSelectedTools = this.input.selectedToolsModel.userSelectedTools;
         let lastToolsSnapshot = userSelectedTools.get();
         const scopedTools = derived(reader => {
             const activeSession = this._viewModelObs.read(reader)?.sessionResource;
-            if (isEqual(activeSession, sessionResource)) {
+            const currentModeId = this.input.currentModeObs.read(reader).id;
+            if (isEqual(activeSession, sessionResource) && currentModeId === capturedModeId) {
                 const tools = userSelectedTools.read(reader);
                 lastToolsSnapshot = tools;
                 return tools;
@@ -2226,7 +2302,16 @@ let ChatWidget = class ChatWidget extends Disposable {
             attachedContext
         }
     ) {
-        this.logService.debug(`ChatWidget#_autoAttachInstructions: prompt files are always enabled`);
+        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;
+        }
+        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;
@@ -2243,6 +2328,6 @@ let ChatWidget = class ChatWidget extends Disposable {
         this.listWidget.delegateScrollFromMouseWheelEvent(browserEvent);
     }
 };
-ChatWidget = ChatWidget_1 = ( __decorate([( __param(4, ICodeEditorService)), ( __param(5, IConfigurationService)), ( __param(6, IDialogService)), ( __param(7, IContextKeyService)), ( __param(8, IInstantiationService)), ( __param(9, IChatService)), ( __param(10, IChatAgentService)), ( __param(11, IChatWidgetService)), ( __param(12, IChatAccessibilityService)), ( __param(13, ILogService)), ( __param(14, IThemeService)), ( __param(15, IChatSlashCommandService)), ( __param(16, IChatEditingService)), ( __param(17, ITelemetryService)), ( __param(18, IPromptsService)), ( __param(19, ILanguageModelToolsService)), ( __param(20, IChatModeService)), ( __param(21, IChatLayoutService)), ( __param(22, IChatEntitlementService)), ( __param(23, IChatSessionsService)), ( __param(24, IAgentSessionsService)), ( __param(25, IChatTodoListService)), ( __param(26, ILifecycleService)), ( __param(27, IChatAttachmentResolveService)), ( __param(28, IChatTipService)), ( __param(29, IChatDebugService))], ChatWidget));
+ChatWidget = ChatWidget_1 = ( __decorate([( __param(4, ICodeEditorService)), ( __param(5, IConfigurationService)), ( __param(6, IDialogService)), ( __param(7, IContextKeyService)), ( __param(8, IInstantiationService)), ( __param(9, IChatService)), ( __param(10, IChatAgentService)), ( __param(11, IChatWidgetService)), ( __param(12, IChatAccessibilityService)), ( __param(13, ILogService)), ( __param(14, IThemeService)), ( __param(15, IChatSlashCommandService)), ( __param(16, IChatEditingService)), ( __param(17, ITelemetryService)), ( __param(18, IPromptsService)), ( __param(19, ILanguageModelToolsService)), ( __param(20, IChatModeService)), ( __param(21, IChatLayoutService)), ( __param(22, IChatEntitlementService)), ( __param(23, IChatSessionsService)), ( __param(24, IAgentSessionsService)), ( __param(25, IChatTodoListService)), ( __param(26, IChatArtifactsService)), ( __param(27, ILifecycleService)), ( __param(28, IChatAttachmentResolveService)), ( __param(29, IChatTipService)), ( __param(30, IChatDebugService))], ChatWidget));
 
 export { ChatWidget, isQuickChat };

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(6775, "Follow up question: {0}", baseTitle));
+        button.element.ariaLabel = ( localize(6977, "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

@@ -136,6 +136,7 @@ export declare class ChatInputPart extends Disposable implements IHistoryNavigat
     private _workingSetCollapsed;
     private _stableInputPartWidth;
     private readonly _chatInputTodoListWidget;
+    private readonly _chatArtifactsWidget;
     private readonly _chatQuestionCarouselWidgets;
     private readonly _questionCarouselResponseIds;
     private readonly _questionCarouselSessionResources;
@@ -190,6 +191,7 @@ export declare class ChatInputPart extends Disposable implements IHistoryNavigat
     private readonly attachedContextDisposables;
     private chatEditingSessionWidgetContainer;
     private chatInputTodoListWidgetContainer;
+    private chatArtifactsWidgetContainer;
     private chatGettingStartedTipContainer;
     private chatQuestionCarouselContainer;
     private chatInputWidgetsContainer;
@@ -203,6 +205,7 @@ export declare class ChatInputPart extends Disposable implements IHistoryNavigat
     readonly height: ISettableObservable<number, void>;
     private _inputEditor;
     private _inputEditorElement;
+    private _forceVisibleScrollbarUntilAccept;
     private _inputModel;
     private readonly _modelSyncDisposables;
     private _isSyncingToOrFromInputModel;
@@ -228,6 +231,7 @@ export declare class ChatInputPart extends Disposable implements IHistoryNavigat
     private chatSessionHasOptions;
     private chatSessionOptionsValid;
     private agentSessionTypeKey;
+    private chatSessionSupportsDelegationKey;
     private chatSessionHasCustomAgentTarget;
     private chatSessionHasTargetedModels;
     private modelWidget;
@@ -238,6 +242,7 @@ export declare class ChatInputPart extends Disposable implements IHistoryNavigat
     private chatSessionPickerWidgets;
     private chatSessionPickerContainer;
     private _lastSessionPickerAction;
+    private _lastSessionPickerOptions;
     private readonly _waitForPersistedLanguageModel;
     private readonly _chatSessionOptionEmitters;
     /**
@@ -472,6 +477,8 @@ export declare class ChatInputPart extends Disposable implements IHistoryNavigat
     private handleAttachmentNavigation;
     renderChatTodoListWidget(chatSessionResource: URI): Promise<void>;
     clearTodoListWidget(sessionResource: URI | undefined, force: boolean): void;
+    renderArtifactsWidget(chatSessionResource: URI): void;
+    clearArtifactsWidget(): void;
     renderQuestionCarousel(carousel: IChatQuestionCarousel, context: IChatContentPartRenderContext, options: IChatQuestionCarouselOptions): ChatQuestionCarouselPart;
     clearQuestionCarousel(responseId?: string, resolveId?: string): void;
     get questionCarousel(): ChatQuestionCarouselPart | undefined;
@@ -495,4 +502,9 @@ export declare class ChatInputPart extends Disposable implements IHistoryNavigat
      * Gets the location of the chat widget and whether that location is maximized.
      */
     private getWidgetLocationInfo;
+    private getDefaultScrollbarOptions;
+    private getVisibleScrollbarOptions;
+    private updateInputEditorScrollbarOptions;
+    showScrollbarUntilAccept(): void;
+    private resetScrollbarVisibilityAfterAccept;
 }