@codingame/monaco-vscode-chat-service-override 33.0.9 → 34.0.1

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

@@ -41,7 +41,7 @@ let ChatQueuePickerActionItem = class ChatQueuePickerActionItem extends BaseActi
         this.contextKeyService = contextKeyService;
         this._altKeyPressed = false;
         const isSteerDefault = this._isSteerDefault();
-        this._primaryActionAction = this._register(( new Action("chat.queuePickerPrimary", isSteerDefault ? ( localize(7592, "Steer with Message")) : ( localize(7593, "Add to Queue")), ThemeIcon.asClassName(isSteerDefault ? Codicon.arrowUp : Codicon.add), !!this.contextKeyService.getContextKeyValue(ChatContextKeys.inputHasText.key), () => this._runDefaultAction())));
+        this._primaryActionAction = this._register(( new Action("chat.queuePickerPrimary", isSteerDefault ? ( localize(7737, "Steer with Message")) : ( localize(7738, "Add to Queue")), ThemeIcon.asClassName(isSteerDefault ? Codicon.arrowUp : Codicon.add), !!this.contextKeyService.getContextKeyValue(ChatContextKeys.inputHasText.key), () => this._runDefaultAction())));
         this._primaryAction = this._register(( new ActionViewItem(undefined, this._primaryActionAction, {
             icon: true,
             label: false
@@ -49,7 +49,7 @@ let ChatQueuePickerActionItem = class ChatQueuePickerActionItem extends BaseActi
         this._register(this.contextKeyService.onDidChangeContext(e => {
             this._primaryActionAction.enabled = !!this.contextKeyService.getContextKeyValue(ChatContextKeys.inputHasText.key);
         }));
-        const dropdownAction = this._register(( new Action("chat.queuePickerDropdown", ( localize(7594, "More Actions...")))));
+        const dropdownAction = this._register(( new Action("chat.queuePickerDropdown", ( localize(7739, "More Actions...")))));
         this._dropdown = this._register(( new ChevronActionWidgetDropdown(dropdownAction, {
             actionProvider: {
                 getActions: () => this._getDropdownActions()
@@ -77,7 +77,7 @@ let ChatQueuePickerActionItem = class ChatQueuePickerActionItem extends BaseActi
     }
     _updatePrimaryAction() {
         const isSteer = this._isEffectiveSteer();
-        this._primaryActionAction.label = isSteer ? ( localize(7592, "Steer with Message")) : ( localize(7593, "Add to Queue"));
+        this._primaryActionAction.label = isSteer ? ( localize(7737, "Steer with Message")) : ( localize(7738, "Add to Queue"));
         this._primaryActionAction.class = ThemeIcon.asClassName(isSteer ? Codicon.arrowUp : Codicon.add);
     }
     _runDefaultAction() {
@@ -134,7 +134,7 @@ let ChatQueuePickerActionItem = class ChatQueuePickerActionItem extends BaseActi
         const steerKeybinding = this.keybindingService.lookupKeybinding(ChatSteerWithMessageAction.ID, lookupContext, true);
         const queueAction = {
             id: ChatQueueMessageAction.ID,
-            label: ( localize(7593, "Add to Queue")),
+            label: ( localize(7738, "Add to Queue")),
             tooltip: "",
             enabled: true,
             checked: !isSteerDefault,
@@ -143,7 +143,7 @@ let ChatQueuePickerActionItem = class ChatQueuePickerActionItem extends BaseActi
             keybinding: queueKeybinding,
             hover: {
                 content: ( localize(
-                    7595,
+                    7740,
                     "Queue this message to send after the current request completes. The current response will finish uninterrupted before the queued message is sent."
                 ))
             },
@@ -153,7 +153,7 @@ let ChatQueuePickerActionItem = class ChatQueuePickerActionItem extends BaseActi
         };
         const steerAction = {
             id: ChatSteerWithMessageAction.ID,
-            label: ( localize(7592, "Steer with Message")),
+            label: ( localize(7737, "Steer with Message")),
             tooltip: "",
             enabled: true,
             checked: isSteerDefault,
@@ -162,7 +162,7 @@ let ChatQueuePickerActionItem = class ChatQueuePickerActionItem extends BaseActi
             keybinding: steerKeybinding,
             hover: {
                 content: ( localize(
-                    7596,
+                    7741,
                     "Send this message at the next opportunity, signaling the current request to yield. The current response will stop and the new message will be sent immediately."
                 ))
             },
@@ -172,13 +172,13 @@ let ChatQueuePickerActionItem = class ChatQueuePickerActionItem extends BaseActi
         };
         const sendAction = {
             id: "_" + ChatSubmitAction.ID,
-            label: ( localize(7597, "Stop and Send")),
+            label: ( localize(7742, "Stop and Send")),
             tooltip: "",
             enabled: true,
             icon: Codicon.arrowRight,
             class: undefined,
             hover: {
-                content: ( localize(7598, "Cancel the current request and send this message immediately."))
+                content: ( localize(7743, "Cancel the current request and send this message immediately."))
             },
             run: () => {
                 this.commandService.executeCommand(ChatSubmitAction.ID);

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

@@ -217,6 +217,9 @@ let SlashCommandCompletions = class SlashCommandCompletions extends Disposable {
                 if (!widget || !widget.viewModel) {
                     return null;
                 }
+                if (isAgentHostBackedWidget(widget)) {
+                    return;
+                }
                 const range = computeCompletionRanges(model, position, SlashCommandWord);
                 if (!range) {
                     return null;
@@ -230,7 +233,7 @@ let SlashCommandCompletions = class SlashCommandCompletions extends Disposable {
                     return;
                 }
                 const currentSessionType = getChatSessionType(widget.viewModel.model.sessionResource);
-                const promptCommands = await this.harnessService.getSlashCommands(currentSessionType, token);
+                const promptCommands = await this.harnessService.getSlashCommands(widget.viewModel.model.sessionResource, token);
                 if (promptCommands.length === 0) {
                     return null;
                 }
@@ -243,16 +246,19 @@ let SlashCommandCompletions = class SlashCommandCompletions extends Disposable {
                 }
                 return {
                     suggestions: ( userInvocableCommands.map((c, i) => {
-                        const label = `/${c.name}`;
+                        const colonLabel = `/${c.name}`;
+                        const hasSubcommand = c.name.includes(":");
+                        const displayLabel = hasSubcommand ? `/${c.name.replace(/:/g, " ")}` : colonLabel;
                         const description = c.description;
                         return {
                             label: {
-                                label,
+                                label: displayLabel,
                                 description
                             },
-                            insertText: `${label} `,
+                            insertText: `${displayLabel} `,
                             documentation: c.description,
                             range,
+                            filterText: hasSubcommand ? `${colonLabel} ${displayLabel}` : undefined,
                             sortText: "a".repeat(i + 1),
                             kind: CompletionItemKind.Text
                         };
@@ -271,6 +277,9 @@ let SlashCommandCompletions = class SlashCommandCompletions extends Disposable {
                 if (!widget || !widget.viewModel) {
                     return null;
                 }
+                if (isAgentHostBackedWidget(widget)) {
+                    return;
+                }
                 const range = computeCompletionRanges(model, position, /\/[\p{L}0-9_.-]*/gu);
                 if (!range) {
                     return null;
@@ -561,7 +570,7 @@ let AgentCompletions = class AgentCompletions extends Disposable {
                 if (!isEmptyUpToCompletionWord(model, range)) {
                     return;
                 }
-                const label = ( localize(7604, "Install Chat Extensions..."));
+                const label = ( localize(7749, "Install Chat Extensions..."));
                 const item = {
                     label,
                     insertText: "",
@@ -709,7 +718,7 @@ class StartParameterizedPromptAction extends Action2 {
                 messages = await prompt.resolve(args, cts.token);
             } catch (e) {
                 if (!cts.token.isCancellationRequested) {
-                    notificationService.error(( localize(7605, "Error resolving prompt: {0}", String(e))));
+                    notificationService.error(( localize(7750, "Error resolving prompt: {0}", String(e))));
                 }
                 replaceTextWith("");
                 return;
@@ -737,15 +746,15 @@ class StartParameterizedPromptAction extends Action2 {
                             id: generateUuid(),
                             kind: "generic",
                             value: contents,
-                            name: ( localize(7606, "Prompt Resource"))
+                            name: ( localize(7751, "Prompt Resource"))
                         });
                     }
                 } else if (mimeType && getAttachableImageExtension(mimeType)) {
                     const resized = await resizeImage(contents).catch(() => decodeBase64(contents).buffer);
                     chatWidget.attachmentModel.addContext({
                         id: generateUuid(),
-                        name: ( localize(7607, "Prompt Image")),
-                        fullName: ( localize(7607, "Prompt Image")),
+                        name: ( localize(7752, "Prompt Image")),
+                        fullName: ( localize(7752, "Prompt Image")),
                         value: resized,
                         kind: "image",
                         references: validURI && [{
@@ -1042,7 +1051,7 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
                 result.suggestions.push({
                     label: {
                         label: sessionPrefix,
-                        description: ( localize(7608, "Attach a chat session"))
+                        description: ( localize(7753, "Attach a chat session"))
                     },
                     filterText: sessionPrefix,
                     insertText: `${sessionPrefix}:`,
@@ -1128,7 +1137,7 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
             const uriLabel = this.labelService.getUriLabel(resource, {
                 relative: true
             });
-            const labelDescription = description ? ( localize(7609, "{0} ({1})", uriLabel, description)) : uriLabel;
+            const labelDescription = description ? ( localize(7754, "{0} ({1})", uriLabel, description)) : uriLabel;
             const sortText = boostPriority ? " " : "!";
             return {
                 label: {
@@ -1180,7 +1189,7 @@ let BuiltinDynamicCompletions = class BuiltinDynamicCompletions extends Disposab
                 }
             }
             seen.add(resource);
-            const newLen = result.suggestions.push(makeCompletionItem(resource, FileKind.FILE, i === 0 ? ( localize(7610, "Active file")) : undefined, i === 0));
+            const newLen = result.suggestions.push(makeCompletionItem(resource, FileKind.FILE, i === 0 ? ( localize(7755, "Active file")) : undefined, i === 0));
             if (newLen - len >= 5) {
                 break;
             }
@@ -1369,7 +1378,7 @@ let ToolCompletions = class ToolCompletions extends Disposable {
                         name = item.referenceName;
                     } else {
                         const source = item.source;
-                        detail = ( localize(7611, "{0}: {1}", source.label, item.displayName));
+                        detail = ( localize(7756, "{0}: {1}", source.label, item.displayName));
                         name = item.toolReferenceName ?? item.displayName;
                         documentation = item.userDescription ?? item.modelDescription;
                     }

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

@@ -316,7 +316,7 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
         const agentSubcommandPart = parsedRequest.find(p => p instanceof ChatRequestAgentSubcommandPart);
         const slashCommandPart = parsedRequest.find(p => p instanceof ChatRequestSlashCommandPart);
         const slashPromptPart = parsedRequest.find(p => p instanceof ChatRequestSlashPromptPart);
-        const promptSlashCommand = slashPromptPart ? await this.customizationHarnessService.resolvePromptSlashCommand(slashPromptPart.name, getChatSessionType(viewModel.sessionResource), token) : undefined;
+        const promptSlashCommand = slashPromptPart ? await this.customizationHarnessService.resolvePromptSlashCommand(slashPromptPart.name, viewModel.sessionResource, token) : undefined;
         if (token.isCancellationRequested) {
             return;
         }
@@ -366,7 +366,7 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
                 promptHoverMessage.appendText("\n");
             }
             promptHoverMessage.appendText(( localize(
-                7612,
+                7757,
                 "Click to open {0}",
                 this.labelService.getUriLabel(promptSlashCommand.uri, {
                     relative: true

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

@@ -62,7 +62,7 @@ let ChatAgentHoverParticipant = class ChatAgentHoverParticipant {
         return ( new RenderedHoverParts([renderedHoverPart]));
     }
     getAccessibleContent(hoverPart) {
-        return localize(7613, "There is a chat agent hover part here.");
+        return localize(7758, "There is a chat agent hover part here.");
     }
 };
 ChatAgentHoverParticipant = ( __decorate([( __param(1, IInstantiationService)), ( __param(2, IChatWidgetService)), ( __param(3, ICommandService))], ChatAgentHoverParticipant));

package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/chatQuick.js

@@ -253,7 +253,7 @@ let QuickChat = class QuickChat extends Disposable {
             disclaimerElement.classList.toggle("hidden", !showDisclaimer);
             if (showDisclaimer) {
                 const renderedMarkdown = disposables.add(this.markdownRendererService.render(( new MarkdownString(( localize(
-                    7654,
+                    7802,
                     "By continuing with {0} Copilot, you agree to {1}'s [Terms]({2}) and [Privacy Statement]({3})",
                     product.defaultChatAgent?.provider?.default?.name ?? "",
                     product.defaultChatAgent?.provider?.default?.name ?? "",

package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditor.js

@@ -182,7 +182,7 @@ let ChatEditor = class ChatEditor extends AbstractEditorWithViewState {
         let isContributedChatSession = false;
         const chatSessionType = input.getSessionType();
         if (chatSessionType !== localChatSessionType) {
-            const loadingMessage = ( localize(7655, "Loading..."));
+            const loadingMessage = ( localize(7803, "Loading..."));
             this.showLoadingInChatWidget(loadingMessage);
         }
         await super.setInput(input, options, context, token);

package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatViewPane.d.ts

@@ -31,7 +31,6 @@ import { IActivityService } from "@codingame/monaco-vscode-api/vscode/vs/workben
 import { IAgentSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service";
 import { IAgentSession } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel";
 import { IChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service";
-import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
 import { IHostService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service";
 export declare class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
     private readonly storageService;
@@ -47,7 +46,6 @@ export declare class ChatViewPane extends ViewPane implements IViewWelcomeDelega
     private readonly chatEntitlementService;
     private readonly commandService;
     private readonly activityService;
-    private readonly workbenchEnvironmentService;
     private readonly hostService;
     private readonly memento;
     private readonly viewState;
@@ -60,7 +58,7 @@ export declare class ChatViewPane extends ViewPane implements IViewWelcomeDelega
     private readonly loadSessionCts;
     private readonly modelRef;
     private readonly activityBadge;
-    constructor(options: IViewPaneOptions, keybindingService: IKeybindingService, contextMenuService: IContextMenuService, configurationService: IConfigurationService, contextKeyService: IContextKeyService, viewDescriptorService: IViewDescriptorService, instantiationService: IInstantiationService, openerService: IOpenerService, themeService: IThemeService, hoverService: IHoverService, storageService: IStorageService, chatService: IChatService, chatAgentService: IChatAgentService, logService: ILogService, notificationService: INotificationService, layoutService: IWorkbenchLayoutService, chatSessionsService: IChatSessionsService, telemetryService: ITelemetryService, lifecycleService: ILifecycleService, progressService: IProgressService, agentSessionsService: IAgentSessionsService, chatEntitlementService: IChatEntitlementService, commandService: ICommandService, activityService: IActivityService, workbenchEnvironmentService: IWorkbenchEnvironmentService, hostService: IHostService);
+    constructor(options: IViewPaneOptions, keybindingService: IKeybindingService, contextMenuService: IContextMenuService, configurationService: IConfigurationService, contextKeyService: IContextKeyService, viewDescriptorService: IViewDescriptorService, instantiationService: IInstantiationService, openerService: IOpenerService, themeService: IThemeService, hoverService: IHoverService, storageService: IStorageService, chatService: IChatService, chatAgentService: IChatAgentService, logService: ILogService, notificationService: INotificationService, layoutService: IWorkbenchLayoutService, chatSessionsService: IChatSessionsService, telemetryService: ITelemetryService, lifecycleService: ILifecycleService, progressService: IProgressService, agentSessionsService: IAgentSessionsService, chatEntitlementService: IChatEntitlementService, commandService: ICommandService, activityService: IActivityService, hostService: IHostService);
     private updateContextKeys;
     private getViewPositionAndLocation;
     private getSessionHoverPosition;
@@ -107,6 +105,19 @@ export declare class ChatViewPane extends ViewPane implements IViewWelcomeDelega
     private setupContextMenu;
     private applyModel;
     private _applyModel;
+    /**
+     * Force-start a new local chat session in the view, bypassing the
+     * default-provider override applied by `showModel()`. Used by the
+     * picker when the user explicitly selects "Local".
+     */
+    startNewLocalSession(): Promise<IChatModel | undefined>;
+    /**
+     * When the experimental `chat.agentHost.defaultChatProvider` setting is
+     * enabled and an agent-host contribution is registered, return a new
+     * session reference for the agent host instead of the built-in local
+     * provider. Returns `undefined` to fall back to `startNewLocalSession`.
+     */
+    private acquireDefaultNewSession;
     private showModel;
     private updateWidgetLockState;
     private clear;

package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatViewPane.js

@@ -7,11 +7,13 @@ import { StandardMouseEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/
 import { Button } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/button/button';
 import { Sash, Orientation } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/sash/sash';
 import { CancellationToken, CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
+import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { MutableDisposable, toDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { MarshalledId } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshallingIds';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { MenuWorkbenchToolBar } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/toolbar';
 import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
@@ -57,7 +59,7 @@ import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/c
 import { localChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
 import { LocalChatSessionUri, getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
-import { ChatConfiguration, ChatAgentLocation, ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { ChatConfiguration, ChatAgentLocation, ChatModeKind, getDefaultNewChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { AgentSessionsControl } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsControl';
 import { ACTION_ID_NEW_CHAT } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { ChatWidget } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatWidget';
@@ -76,7 +78,6 @@ import { HoverPosition } from '@codingame/monaco-vscode-api/vscode/vs/base/brows
 import { ChatEntitlementContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService';
 import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
 import { toErrorMessage } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errorMessage';
-import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
@@ -111,7 +112,6 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         chatEntitlementService,
         commandService,
         activityService,
-        workbenchEnvironmentService,
         hostService
     ) {
         super(
@@ -139,7 +139,6 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         this.chatEntitlementService = chatEntitlementService;
         this.commandService = commandService;
         this.activityService = activityService;
-        this.workbenchEnvironmentService = workbenchEnvironmentService;
         this.hostService = hostService;
         this.lastDimensionsPerOrientation = ( new Map());
         this.loadSessionCts = this._register(( new MutableDisposable()));
@@ -339,7 +338,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         const sessionsContainer = this.sessionsContainer = parent.appendChild($(".agent-sessions-container"));
         const sessionsTitleContainer = this.sessionsTitleContainer = append(sessionsContainer, $(".agent-sessions-title-container"));
         const sessionsTitle = this.sessionsTitle = append(sessionsTitleContainer, $("span.agent-sessions-title"));
-        sessionsTitle.textContent = ( localize(7674, "Sessions"));
+        sessionsTitle.textContent = ( localize(7822, "Sessions"));
         this._register(addDisposableListener(sessionsTitle, EventType.CLICK, () => {
             this.sessionsControl?.scrollToTop();
             this.sessionsControl?.focus();
@@ -367,7 +366,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
             ...defaultButtonStyles,
             secondary: true
         })));
-        newSessionButton.label = ( localize(7675, "New Session"));
+        newSessionButton.label = ( localize(7823, "New Session"));
         this._register(
             newSessionButton.onDidClick(() => this.commandService.executeCommand(ACTION_ID_NEW_CHAT))
         );
@@ -488,9 +487,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         const locationBasedColors = this.getLocationBasedColors();
         const editorOverflowWidgetsDomNode = this.layoutService.getContainer(getWindow(chatControlsContainer)).appendChild($(".chat-editor-overflow.monaco-editor"));
         this._register(toDisposable(() => editorOverflowWidgetsDomNode.remove()));
-        if (this.viewDescriptorService.getViewLocationById(this.id) !== ViewContainerLocation.ChatBar) {
-            this.createChatTitleControl(chatControlsContainer);
-        }
+        this.createChatTitleControl(chatControlsContainer);
         const scopedInstantiationService = this._register(this.instantiationService.createChild(( new ServiceCollection([IContextKeyService, this.scopedContextKeyService]))));
         this._widget = this._register(
             scopedInstantiationService.createInstance(ChatWidget, ChatAgentLocation.Chat, {
@@ -509,11 +506,9 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
                 },
                 editorOverflowWidgetsDomNode,
                 enableImplicitContext: true,
-                enableWorkingSet: this.workbenchEnvironmentService.isSessionsWindow ? "implicit" : "explicit",
+                enableWorkingSet: "explicit",
                 supportsChangingModes: true,
-                dndContainer: parent,
-                inputEditorMinLines: this.workbenchEnvironmentService.isSessionsWindow ? 2 : undefined,
-                isSessionsWindow: this.workbenchEnvironmentService.isSessionsWindow
+                dndContainer: parent
             }, {
                 listForeground: SIDE_BAR_FOREGROUND,
                 listBackground: locationBasedColors.background,
@@ -614,7 +609,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
                 progressBadgeDisposables.value.add(autorun(reader => {
                     if (model.requestInProgress.read(reader)) {
                         this.activityBadge.value = this.activityService.showViewActivity(this.id, {
-                            badge: ( new ProgressBadge(() => ( localize(7676, "Agent Session in Progress"))))
+                            badge: ( new ProgressBadge(() => ( localize(7824, "Agent Session in Progress"))))
                         });
                     } else {
                         this.activityBadge.clear();
@@ -655,19 +650,55 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         ) : undefined;
         await this.showModel(CancellationToken.None, modelRef);
     }
+    async startNewLocalSession() {
+        const ref = this.chatService.startNewLocalSession(ChatAgentLocation.Chat, {
+            debugOwner: "ChatViewPane#startNewLocalSession"
+        });
+        return this.showModel(CancellationToken.None, ref);
+    }
+    async acquireDefaultNewSession(token) {
+        const defaultType = getDefaultNewChatSessionType(this.configurationService, this.chatSessionsService);
+        if (defaultType === localChatSessionType) {
+            return undefined;
+        }
+        const resource = ( URI.from({
+            scheme: defaultType,
+            path: `/untitled-${generateUuid()}`
+        }));
+        try {
+            return await this.chatService.acquireOrLoadSession(
+                resource,
+                ChatAgentLocation.Chat,
+                token,
+                "ChatViewPane#acquireDefaultNewSession"
+            );
+        } catch (error) {
+            this.logService.warn(
+                `[ChatViewPane] Failed to acquire default agent-host session, falling back to local`,
+                error
+            );
+            return undefined;
+        }
+    }
     async showModel(token, modelRef, startNewSession = true) {
         const oldModelResource = this.modelRef.value?.object.sessionResource;
         this.modelRef.value = undefined;
         let ref;
         if (startNewSession) {
-            ref = modelRef ?? (this.chatService.transferredSessionResource ? await this.chatService.acquireOrLoadSession(
-                this.chatService.transferredSessionResource,
-                ChatAgentLocation.Chat,
-                token,
-                "ChatViewPane#showModel"
-            ) : this.chatService.startNewLocalSession(ChatAgentLocation.Chat, {
-                debugOwner: "ChatViewPane#showModel"
-            }));
+            if (modelRef) {
+                ref = modelRef;
+            } else if (this.chatService.transferredSessionResource) {
+                ref = await this.chatService.acquireOrLoadSession(
+                    this.chatService.transferredSessionResource,
+                    ChatAgentLocation.Chat,
+                    token,
+                    "ChatViewPane#showModel"
+                );
+            } else {
+                ref = (await this.acquireDefaultNewSession(token)) ?? this.chatService.startNewLocalSession(ChatAgentLocation.Chat, {
+                    debugOwner: "ChatViewPane#showModel"
+                });
+            }
             if (!ref) {
                 throw ( new Error("Could not start chat session"));
             }
@@ -781,7 +812,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
                     return undefined;
                 }
                 this.logService.error(`Failed to load chat session '${( sessionResource.toString())}'`, err);
-                this.notificationService.error(( localize(7677, "Failed to open chat session: {0}", toErrorMessage(err))));
+                this.notificationService.error(( localize(7825, "Failed to open chat session: {0}", toErrorMessage(err))));
                 const result = await this.showModel(token, undefined);
                 this.logService.trace(
                     `[ChatViewPane] loadSession done total=${Date.now() - t0}ms uri=${( sessionResource.toString())} error=true`
@@ -1021,6 +1052,6 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         } : undefined;
     }
 };
-ChatViewPane = ChatViewPane_1 = ( __decorate([( __param(1, IKeybindingService)), ( __param(2, IContextMenuService)), ( __param(3, IConfigurationService)), ( __param(4, IContextKeyService)), ( __param(5, IViewDescriptorService)), ( __param(6, IInstantiationService)), ( __param(7, IOpenerService)), ( __param(8, IThemeService)), ( __param(9, IHoverService)), ( __param(10, IStorageService)), ( __param(11, IChatService)), ( __param(12, IChatAgentService)), ( __param(13, ILogService)), ( __param(14, INotificationService)), ( __param(15, IWorkbenchLayoutService)), ( __param(16, IChatSessionsService)), ( __param(17, ITelemetryService)), ( __param(18, ILifecycleService)), ( __param(19, IProgressService)), ( __param(20, IAgentSessionsService)), ( __param(21, IChatEntitlementService)), ( __param(22, ICommandService)), ( __param(23, IActivityService)), ( __param(24, IWorkbenchEnvironmentService)), ( __param(25, IHostService))], ChatViewPane));
+ChatViewPane = ChatViewPane_1 = ( __decorate([( __param(1, IKeybindingService)), ( __param(2, IContextMenuService)), ( __param(3, IConfigurationService)), ( __param(4, IContextKeyService)), ( __param(5, IViewDescriptorService)), ( __param(6, IInstantiationService)), ( __param(7, IOpenerService)), ( __param(8, IThemeService)), ( __param(9, IHoverService)), ( __param(10, IStorageService)), ( __param(11, IChatService)), ( __param(12, IChatAgentService)), ( __param(13, ILogService)), ( __param(14, INotificationService)), ( __param(15, IWorkbenchLayoutService)), ( __param(16, IChatSessionsService)), ( __param(17, ITelemetryService)), ( __param(18, ILifecycleService)), ( __param(19, IProgressService)), ( __param(20, IAgentSessionsService)), ( __param(21, IChatEntitlementService)), ( __param(22, ICommandService)), ( __param(23, IActivityService)), ( __param(24, IHostService))], ChatViewPane));
 
 export { ChatViewPane };

package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatViewTitleControl.js

@@ -23,7 +23,7 @@ let ChatViewTitleControl = class ChatViewTitleControl extends Disposable {
         ChatViewTitleControl_1 = this;
     }
     static {
-        this.DEFAULT_TITLE = ( localize(7678, "Chat"));
+        this.DEFAULT_TITLE = ( localize(7826, "Chat"));
     }
     static {
         this.PICK_AGENT_SESSION_ACTION_ID = "workbench.action.chat.pickAgentSession";
@@ -48,7 +48,7 @@ let ChatViewTitleControl = class ChatViewTitleControl extends Disposable {
             constructor() {
                 super({
                     id: ChatViewTitleControl_1.PICK_AGENT_SESSION_ACTION_ID,
-                    title: ( localize(7679, "Pick Agent Session")),
+                    title: ( localize(7827, "Pick Agent Session")),
                     f1: false,
                     menu: [{
                         id: MenuId.ChatViewSessionTitleNavigationToolbar,

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

@@ -0,0 +1,38 @@
+import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
+import { ILanguageModelsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service";
+/**
+ * Storage key prefix for persisted model selections.
+ * Full key format: `chat.currentLanguageModel.{location}[.{sessionType}]`
+ */
+export declare const SELECTED_MODEL_STORAGE_KEY_PREFIX = "chat.currentLanguageModel.";
+/**
+ * Builds the storage key used to persist the selected language model for a
+ * given chat location and optional session type.
+ *
+ * Matches the keys written by `chatInputPart.ts` so that other consumers
+ * can read the persisted model selection without depending on widget internals.
+ */
+export declare function getSelectedModelStorageKey(location: string, sessionType?: string): string;
+/**
+ * Resolves the currently selected chat model identifier using a two-step
+ * strategy:
+ *
+ * 1. Read the `chatModelId` context key (set when a chat widget is active).
+ * 2. Fall back to the persisted storage value written by `chatInputPart`.
+ *
+ * Returns the raw model identifier string (may include a vendor prefix like
+ * `"copilot/gpt-4.1"` from storage, or a short id like `"gpt-4.1"` from
+ * the context key), or `undefined` if no selection is available.
+ */
+export declare function getSelectedModelIdentifier(contextKeyService: IContextKeyService, storageService: IStorageService): string | undefined;
+/**
+ * Resolves the vendor of the currently selected chat model.
+ *
+ * Tries the language model registry first (authoritative when models are
+ * registered), then falls back to extracting the vendor prefix from the
+ * persisted model identifier (e.g. `"copilot/gpt-4.1"` → `"copilot"`).
+ *
+ * Returns `undefined` if no model selection is available.
+ */
+export declare function getSelectedModelVendor(contextKeyService: IContextKeyService, storageService: IStorageService, languageModelsService: ILanguageModelsService): string | undefined;

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

@@ -0,0 +1,47 @@
+
+import { StorageScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+
+const SELECTED_MODEL_STORAGE_KEY_PREFIX = 'chat.currentLanguageModel.';
+function getSelectedModelStorageKey(location, sessionType) {
+    if (sessionType) {
+        return `${SELECTED_MODEL_STORAGE_KEY_PREFIX}${location}.${sessionType}`;
+    }
+    return `${SELECTED_MODEL_STORAGE_KEY_PREFIX}${location}`;
+}
+function getSelectedModelIdentifier(contextKeyService, storageService) {
+    const contextKeyModelId = contextKeyService.getContextKeyValue(ChatContextKeys.chatModelId.key);
+    if (contextKeyModelId) {
+        return contextKeyModelId;
+    }
+    const location = contextKeyService.getContextKeyValue(ChatContextKeys.location.key) ?? 'panel';
+    const sessionType = contextKeyService.getContextKeyValue(ChatContextKeys.chatSessionType.key) ?? '';
+    const candidateKeys = sessionType
+        ? [getSelectedModelStorageKey(location, sessionType), getSelectedModelStorageKey(location)]
+        : [getSelectedModelStorageKey(location)];
+    for (const key of candidateKeys) {
+        const persisted = storageService.get(key, StorageScope.APPLICATION);
+        if (persisted) {
+            return persisted;
+        }
+    }
+    return undefined;
+}
+function getSelectedModelVendor(contextKeyService, storageService, languageModelsService) {
+    const modelId = getSelectedModelIdentifier(contextKeyService, storageService);
+    if (!modelId) {
+        return undefined;
+    }
+    const shortId = modelId.includes('/') ? modelId.split('/').pop() : modelId;
+    const metadata = languageModelsService.lookupLanguageModel(shortId)
+        ?? languageModelsService.lookupLanguageModel(modelId);
+    if (metadata) {
+        return metadata.vendor;
+    }
+    if (modelId.includes('/')) {
+        return modelId.split('/')[0];
+    }
+    return undefined;
+}
+
+export { SELECTED_MODEL_STORAGE_KEY_PREFIX, getSelectedModelIdentifier, getSelectedModelStorageKey, getSelectedModelVendor };