@codingame/monaco-vscode-chat-service-override 34.1.3 → 35.0.0

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

@@ -2,21 +2,23 @@
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import * as chatViewPane from './media/chatViewPane.css';
-import { $, append, addDisposableListener, EventType, setVisibility, getWindow, EventHelper } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { append, $, getWindow, addDisposableListener, EventType, setVisibility, EventHelper } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { StandardMouseEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/mouseEvent';
 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 { DomScrollableElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
 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 { MutableDisposable, DisposableStore, toDisposable } 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 { ScrollbarVisibility } from '@codingame/monaco-vscode-api/vscode/vs/base/common/scrollable';
 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';
+import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
@@ -59,7 +61,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, getDefaultNewChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { ChatConfiguration, ChatAgentLocation, ChatModeKind, getDefaultNewChatSessionType, getDefaultNewChatSessionResource } 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';
@@ -69,6 +71,7 @@ import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/
 import { AgentSessionsViewerOrientation, AgentSessionsViewerPosition } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
 import { IProgressService } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service';
 import { ChatViewId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
+import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ProgressBadge } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/activity/common/activity';
 import { IActivityService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/activity/common/activity.service';
 import { disposableTimeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
@@ -79,6 +82,13 @@ import { ChatEntitlementContextKeys } from '@codingame/monaco-vscode-api/vscode/
 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 { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
+import { IMicCaptureService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/voiceClient/micCaptureService.service';
+import { ITtsPlaybackService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/voiceClient/ttsPlaybackService.service';
+import { IVoiceSessionController } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/voiceClient/voiceSessionController.service';
+import { IAgentTitleBarStatusService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentTitleBarStatusService.service';
+import { IVoicePlaybackService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/voicePlaybackService.service';
+import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 var ChatViewPane_1;
@@ -89,7 +99,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
     }
     constructor(
         options,
-        keybindingService,
+        keybindingService2,
         contextMenuService,
         configurationService,
         contextKeyService,
@@ -112,11 +122,18 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         chatEntitlementService,
         commandService,
         activityService,
-        hostService
+        hostService,
+        micCaptureService,
+        ttsPlaybackService,
+        voiceSessionController,
+        chatWidgetService,
+        _agentTitleBarStatusService,
+        _voicePlaybackService,
+        _workbenchEnvironmentService
     ) {
         super(
             options,
-            keybindingService,
+            keybindingService2,
             contextMenuService,
             configurationService,
             contextKeyService,
@@ -140,10 +157,16 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         this.commandService = commandService;
         this.activityService = activityService;
         this.hostService = hostService;
+        this.micCaptureService = micCaptureService;
+        this.ttsPlaybackService = ttsPlaybackService;
+        this.voiceSessionController = voiceSessionController;
+        this.chatWidgetService = chatWidgetService;
         this.lastDimensionsPerOrientation = ( new Map());
         this.loadSessionCts = this._register(( new MutableDisposable()));
         this.modelRef = this._register(( new MutableDisposable()));
         this.activityBadge = this._register(( new MutableDisposable()));
+        this._currentSessionResource = observableValue(this, undefined);
+        this._voiceBarDisposables = this._register(( new DisposableStore()));
         this.sessionsViewerOrientation = AgentSessionsViewerOrientation.Stacked;
         this.sessionsViewerOrientationConfiguration = "sideBySide";
         this.sessionsViewerSashDisposables = this._register(( new MutableDisposable()));
@@ -265,20 +288,14 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
     onDidChangeAgents() {
         if (this.chatAgentService.getDefaultAgent(ChatAgentLocation.Chat)) {
             if (!this._widget?.viewModel && !this.restoringSession) {
-                const sessionResource = this.getTransferredOrPersistedSessionInfo();
-                this.restoringSession = (sessionResource ? this.chatService.acquireOrLoadSession(
-                    sessionResource,
-                    ChatAgentLocation.Chat,
-                    CancellationToken.None,
-                    "ChatViewPane#onDidChangeAgents"
-                ) : Promise.resolve(undefined)).then(async modelRef => {
+                this.restoringSession = this.acquireTransferredOrPersistedSession(CancellationToken.None, "ChatViewPane#onDidChangeAgents").then(async modelRef => {
                     if (!this._widget) {
                         return;
                     }
                     const wasVisible = this._widget.visible;
                     try {
                         this._widget.setVisible(false);
-                        await this.showModel(CancellationToken.None, modelRef);
+                        await this.showModel(CancellationToken.None, modelRef, true, !modelRef);
                     } finally {
                         this._widget.setVisible(wasVisible);
                     }
@@ -303,7 +320,20 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         this.viewPaneContainer = parent;
         this.viewPaneContainer.classList.add("chat-viewpane");
         this.updateViewPaneClasses(false);
-        this.createControls(parent);
+        const controlsWrapper = append(parent, $(".voice-agent-controls-wrapper"));
+        this.createControls(controlsWrapper);
+        this._voiceBarContainer = $(".voice-agent-bar-host");
+        this._voiceBarContainer.style.display = "none";
+        this._updateVoiceBar(this._voiceBarContainer);
+        const inputContainerEl = this._widget.inputPart.inputContainerElement;
+        if (inputContainerEl) {
+            this._setupVoiceTranscriptOverlay(inputContainerEl);
+        }
+        this._register(this.configurationService.onDidChangeConfiguration(e => {
+            if (e.affectsConfiguration("agents.voice.enabled")) {
+                this._updateVoiceBar(this._voiceBarContainer);
+            }
+        }));
         this.setupContextMenu(parent);
         this.applyModel();
     }
@@ -316,6 +346,233 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         this.registerControlsListeners(sessionsControl, chatWidget, welcomeController);
         this.updateSessionsControlVisibility();
     }
+    _updateVoiceBar(container) {
+        this._voiceBarDisposables.clear();
+        container.replaceChildren();
+        container.style.display = "none";
+        if (this.configurationService.getValue("agents.voice.enabled")) {
+            this._voiceBarDisposables.add(
+                CommandsRegistry.registerCommand("_chat.voice.acceptInput", (accessor, text) => {
+                    const chatWidgetService = accessor.get(IChatWidgetService);
+                    const widget = chatWidgetService.lastFocusedWidget ?? this._widget;
+                    if (text && widget?.viewModel) {
+                        if (widget.viewModel.editing) {
+                            widget.input.setValue(text, false);
+                        } else {
+                            widget.acceptInput(text, {
+                                preserveFocus: true
+                            });
+                        }
+                    }
+                })
+            );
+            this._voiceBarDisposables.add(
+                CommandsRegistry.registerCommand("_chat.voice.switchToSession", (_accessor, resourceStr) => {
+                    if (!resourceStr) {
+                        return false;
+                    }
+                    try {
+                        this.viewState.sessionResource = ( URI.parse(resourceStr));
+                        this.applyModel();
+                        return true;
+                    } catch {
+                        return false;
+                    }
+                })
+            );
+            this._voiceBarDisposables.add(
+                CommandsRegistry.registerCommand("_chat.voice.getCurrentSession", _accessor => {
+                    return this._widget?.viewModel?.sessionResource?.toString();
+                })
+            );
+        }
+    }
+    _setupVoiceTranscriptOverlay(inputContainerEl) {
+        inputContainerEl.style.position = "relative";
+        const transcriptOverlay = $(".voice-transcript-overlay");
+        const transcriptScrollable = this._register(( new DomScrollableElement(transcriptOverlay, {
+            horizontal: ScrollbarVisibility.Hidden,
+            vertical: ScrollbarVisibility.Auto
+        })));
+        const transcriptOverlayNode = transcriptScrollable.getDomNode();
+        transcriptOverlayNode.classList.add("voice-transcript-overlay-scrollable");
+        transcriptOverlayNode.style.display = "none";
+        inputContainerEl.append(transcriptOverlayNode);
+        let animFrameId;
+        let glowDataArray;
+        const win = getWindow(inputContainerEl);
+        let lastGlowTarget;
+        let lockedGlowWidget;
+        const getActiveInputContainer = () => {
+            if (lockedGlowWidget) {
+                return lockedGlowWidget;
+            }
+            const focused = this.chatWidgetService.lastFocusedWidget;
+            return focused?.input?.inputContainerElement ?? inputContainerEl;
+        };
+        const startGlowAnimation = () => {
+            if (animFrameId !== undefined) {
+                return;
+            }
+            const animate = () => {
+                animFrameId = win.requestAnimationFrame(animate);
+                const connected = this.voiceSessionController.isConnected.get();
+                const voiceState = this.voiceSessionController.voiceState.get();
+                const glowActive = connected && (voiceState === "listening" || voiceState === "speaking");
+                const target = getActiveInputContainer();
+                if (lastGlowTarget && lastGlowTarget !== target) {
+                    lastGlowTarget.style.borderColor = "";
+                    lastGlowTarget.style.boxShadow = "";
+                    lastGlowTarget.classList.remove("voice-active", "voice-listening");
+                }
+                lastGlowTarget = target;
+                if (!glowActive) {
+                    target.style.borderColor = "";
+                    target.style.boxShadow = "";
+                    target.classList.remove("voice-active", "voice-listening");
+                    return;
+                }
+                const analyser = this.ttsPlaybackService.analyserNode ?? (voiceState === "listening" ? this.micCaptureService.analyserNode : null) ?? null;
+                let intensity;
+                if (!analyser) {
+                    intensity = 0.3;
+                } else {
+                    if (!glowDataArray || glowDataArray.length !== analyser.frequencyBinCount) {
+                        glowDataArray = ( new Uint8Array(analyser.frequencyBinCount));
+                    }
+                    analyser.getByteFrequencyData(glowDataArray);
+                    let sum = 0;
+                    for (let i = 0; i < glowDataArray.length; i++) {
+                        sum += glowDataArray[i];
+                    }
+                    intensity = Math.min(1, (sum / glowDataArray.length) / 80);
+                }
+                const rgb = voiceState === "speaking" ? "163,113,247" : "88,166,255";
+                const transcriptHidden = this.configurationService.getValue("agents.voice.showTranscript") === false;
+                let borderAlpha;
+                let shadowSpread;
+                let shadowAlpha;
+                if (voiceState === "listening" && transcriptHidden) {
+                    borderAlpha = 0.6 + intensity * 0.4;
+                    shadowSpread = 6 + intensity * 20;
+                    shadowAlpha = 0.25 + intensity * 0.55;
+                } else {
+                    borderAlpha = 0.4 + intensity * 0.5;
+                    shadowSpread = 4 + intensity * 12;
+                    shadowAlpha = 0.15 + intensity * 0.35;
+                }
+                target.style.borderColor = `rgba(${rgb},${borderAlpha})`;
+                if (voiceState === "listening" && transcriptHidden) {
+                    target.style.boxShadow = `0 0 ${shadowSpread}px rgba(${rgb},${shadowAlpha}), 0 0 ${shadowSpread * 2}px rgba(${rgb},${shadowAlpha * 0.3}), inset 0 0 ${shadowSpread * 0.5}px rgba(${rgb},${shadowAlpha * 0.4})`;
+                } else {
+                    target.style.boxShadow = `0 0 ${shadowSpread}px rgba(${rgb},${shadowAlpha}), inset 0 0 ${shadowSpread * 0.4}px rgba(${rgb},${shadowAlpha * 0.3})`;
+                }
+                target.classList.add("voice-active");
+                target.classList.toggle("voice-listening", voiceState === "listening");
+            };
+            animFrameId = win.requestAnimationFrame(animate);
+        };
+        const stopGlowAnimation = () => {
+            if (animFrameId !== undefined) {
+                win.cancelAnimationFrame(animFrameId);
+                animFrameId = undefined;
+            }
+            const target = lastGlowTarget ?? inputContainerEl;
+            target.style.borderColor = "";
+            target.style.boxShadow = "";
+            target.classList.remove("voice-active", "voice-listening");
+            lastGlowTarget = undefined;
+        };
+        this._register(autorun(reader => {
+            const connected = this.voiceSessionController.isConnected.read(reader);
+            if (connected && !lockedGlowWidget) {
+                lockedGlowWidget = this.chatWidgetService.lastFocusedWidget?.input?.inputContainerElement ?? inputContainerEl;
+            } else if (!connected) {
+                lockedGlowWidget = undefined;
+            }
+        }));
+        this._register(autorun(reader => {
+            const connected = this.voiceSessionController.isConnected.read(reader);
+            const voiceState = this.voiceSessionController.voiceState.read(reader);
+            if (connected && (voiceState === "listening" || voiceState === "speaking")) {
+                startGlowAnimation();
+            } else {
+                stopGlowAnimation();
+            }
+        }));
+        this._register({
+            dispose: () => stopGlowAnimation()
+        });
+        this._register(autorun(reader => {
+            const turns = this.voiceSessionController.transcriptTurns.read(reader);
+            const connected = this.voiceSessionController.isConnected.read(reader);
+            const voiceState = this.voiceSessionController.voiceState.read(reader);
+            const showTranscript = this.configurationService.getValue("agents.voice.showTranscript") !== false;
+            const visible = turns.filter(t => t.text.length > 0 || (t.speaker === "user" && t.isPartial));
+            if (!connected) {
+                transcriptOverlayNode.style.display = "none";
+                transcriptOverlayNode.classList.remove("has-transcript");
+                return;
+            }
+            const targetSession = this.voiceSessionController.targetSession.read(reader);
+            const currentSession = this._currentSessionResource.read(reader);
+            if (targetSession && currentSession && !isEqual(targetSession, currentSession)) {
+                transcriptOverlayNode.style.display = "none";
+                transcriptOverlayNode.classList.remove("has-transcript");
+                return;
+            }
+            if (visible.length === 0 || !showTranscript) {
+                const autoSendDelay = this.configurationService.getValue("agents.voice.autoSendDelay") ?? 500;
+                if (voiceState === "idle" && visible.length === 0 && showTranscript && autoSendDelay < 0) {
+                    transcriptOverlayNode.style.display = "";
+                    transcriptOverlayNode.classList.remove("has-transcript");
+                    transcriptOverlay.replaceChildren();
+                    const hint = $("span.partial");
+                    const kb = this.keybindingService.lookupKeybinding("agentsVoice.pushToTalk");
+                    const kbLabel = kb?.getLabel();
+                    hint.textContent = kbLabel ? ( localize(8408, "Press {0} to talk", kbLabel)) : ( localize(8409, "Click voice mode to talk"));
+                    transcriptOverlay.append(hint);
+                    transcriptScrollable.scanDomNode();
+                } else {
+                    transcriptOverlayNode.style.display = "none";
+                    transcriptOverlayNode.classList.remove("has-transcript");
+                }
+                return;
+            }
+            transcriptOverlayNode.style.display = "";
+            transcriptOverlayNode.classList.add("has-transcript");
+            const lastTurn = visible[visible.length - 1];
+            const contentElements = [];
+            if (lastTurn.speaker === "user") {
+                const span = $("span");
+                if (lastTurn.isPartial) {
+                    const committedPart = lastTurn.committed || "";
+                    const unsurePart = lastTurn.text.slice(committedPart.length);
+                    if (committedPart) {
+                        const c = $("span.committed");
+                        c.textContent = committedPart;
+                        span.append(c);
+                    }
+                    const u = $("span.partial");
+                    u.textContent = unsurePart + "▉";
+                    span.append(u);
+                } else {
+                    span.className = "committed";
+                    span.textContent = lastTurn.text;
+                }
+                contentElements.push(span);
+            } else {
+                const div = $("div.assistant-text");
+                div.textContent = lastTurn.text;
+                contentElements.push(div);
+            }
+            transcriptOverlay.replaceChildren(...contentElements);
+            transcriptScrollable.scanDomNode();
+            transcriptScrollable.setScrollPosition({
+                scrollTop: 0
+            });
+        }));
+    }
     static {
         this.SESSIONS_SIDEBAR_MIN_WIDTH = 200;
     }
@@ -338,7 +595,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(7822, "Sessions"));
+        sessionsTitle.textContent = ( localize(8410, "Sessions"));
         this._register(addDisposableListener(sessionsTitle, EventType.CLICK, () => {
             this.sessionsControl?.scrollToTop();
             this.sessionsControl?.focus();
@@ -366,10 +623,10 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
             ...defaultButtonStyles,
             secondary: true
         })));
-        newSessionButton.label = ( localize(7823, "New Session"));
-        this._register(
-            newSessionButton.onDidClick(() => this.commandService.executeCommand(ACTION_ID_NEW_CHAT))
-        );
+        newSessionButton.label = ( localize(8411, "New Session"));
+        this._register(newSessionButton.onDidClick(
+            () => this.commandService.executeCommand(ACTION_ID_NEW_CHAT, this.getActionsContext())
+        ));
         this.sessionsControlContainer = append(sessionsContainer, $(".agent-sessions-control-container"));
         const sessionsControl = this.sessionsControl = this._register(
             this.instantiationService.createInstance(AgentSessionsControl, this.sessionsControlContainer, {
@@ -560,6 +817,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         this._register(chatWidget.onDidChangeViewModel(() => {
             const model = chatWidget.viewModel?.model;
             this.titleControl?.update(model);
+            this._currentSessionResource.set(chatWidget.viewModel?.sessionResource, undefined);
             if (this.sessionsViewerOrientation === AgentSessionsViewerOrientation.Stacked) {
                 return;
             }
@@ -609,7 +867,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(7824, "Agent Session in Progress"))))
+                            badge: ( new ProgressBadge(() => ( localize(8412, "Agent Session in Progress"))))
                         });
                     } else {
                         this.activityBadge.clear();
@@ -641,14 +899,8 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         this.restoringSession.finally(() => this.restoringSession = undefined);
     }
     async _applyModel() {
-        const sessionResource = this.getTransferredOrPersistedSessionInfo();
-        const modelRef = sessionResource ? await this.chatService.acquireOrLoadSession(
-            sessionResource,
-            ChatAgentLocation.Chat,
-            CancellationToken.None,
-            "ChatViewPane#applyModel"
-        ) : undefined;
-        await this.showModel(CancellationToken.None, modelRef);
+        const modelRef = await this.acquireTransferredOrPersistedSession(CancellationToken.None, "ChatViewPane#applyModel");
+        await this.showModel(CancellationToken.None, modelRef, true, !modelRef);
     }
     async startNewLocalSession() {
         const ref = this.chatService.startNewLocalSession(ChatAgentLocation.Chat, {
@@ -661,10 +913,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         if (defaultType === localChatSessionType) {
             return undefined;
         }
-        const resource = ( URI.from({
-            scheme: defaultType,
-            path: `/untitled-${generateUuid()}`
-        }));
+        const resource = getDefaultNewChatSessionResource(this.configurationService, this.chatSessionsService);
         try {
             return await this.chatService.acquireOrLoadSession(
                 resource,
@@ -680,14 +929,34 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
             return undefined;
         }
     }
-    async showModel(token, modelRef, startNewSession = true) {
+    async acquireTransferredOrPersistedSession(token, debugOwner) {
+        const sessionResource = this.getTransferredOrPersistedSessionInfo();
+        if (!sessionResource) {
+            return undefined;
+        }
+        const modelRef = await this.chatService.acquireOrLoadSession(sessionResource, ChatAgentLocation.Chat, token, debugOwner);
+        if (!modelRef) {
+            return undefined;
+        }
+        if (this.shouldSkipRestoredLocalSession(sessionResource, modelRef.object)) {
+            modelRef.dispose();
+            return undefined;
+        }
+        return modelRef;
+    }
+    shouldSkipRestoredLocalSession(sessionResource, model) {
+        const defaultType = getDefaultNewChatSessionType(this.configurationService, this.chatSessionsService);
+        const prefersAgentHostCopilot = this.configurationService.getValue(ChatConfiguration.EditorLocalAgentEnabled) === false && this.configurationService.getValue(ChatConfiguration.EditorDefaultProvider) === "copilotAh";
+        return (defaultType !== localChatSessionType || prefersAgentHostCopilot) && getChatSessionType(sessionResource) === localChatSessionType && !model.hasRequests;
+    }
+    async showModel(token, modelRef, startNewSession = true, ignoreTransferredSession = false) {
         const oldModelResource = this.modelRef.value?.object.sessionResource;
         this.modelRef.value = undefined;
         let ref;
         if (startNewSession) {
             if (modelRef) {
                 ref = modelRef;
-            } else if (this.chatService.transferredSessionResource) {
+            } else if (!ignoreTransferredSession && this.chatService.transferredSessionResource) {
                 ref = await this.chatService.acquireOrLoadSession(
                     this.chatService.transferredSessionResource,
                     ChatAgentLocation.Chat,
@@ -748,7 +1017,12 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         }
         const contribution = this.chatSessionsService.getChatSessionContribution(sessionType);
         if (contribution) {
-            this._widget.lockToCodingAgent(contribution.name, contribution.displayName, sessionType);
+            this._widget.lockToCodingAgent(
+                contribution.name,
+                contribution.displayName,
+                sessionType,
+                contribution.agentHostProviderId
+            );
         } else {
             this._widget.unlockFromCodingAgent();
         }
@@ -812,7 +1086,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
                     return undefined;
                 }
                 this.logService.error(`Failed to load chat session '${( sessionResource.toString())}'`, err);
-                this.notificationService.error(( localize(7825, "Failed to open chat session: {0}", toErrorMessage(err))));
+                this.notificationService.error(( localize(8413, "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`
@@ -838,6 +1112,9 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         return true;
     }
     relayout() {
+        if (!this._widget?.visible) {
+            return;
+        }
         if (this.lastDimensions) {
             this.layoutBody(this.lastDimensions.height, this.lastDimensions.width);
         }
@@ -907,7 +1184,10 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         if (oldSessionsViewerOrientation !== this.sessionsViewerOrientation) {
             const updatePromise = this.sessionsControl.update();
             if (this.sessionsViewerOrientation === AgentSessionsViewerOrientation.SideBySide) {
-                updatePromise.then(() => {
+                updatePromise.then(didUpdate => {
+                    if (!didUpdate) {
+                        return;
+                    }
                     const sessionResource = this._widget?.viewModel?.sessionResource;
                     if (sessionResource) {
                         this.sessionsControl?.reveal(sessionResource);
@@ -1052,6 +1332,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, 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)), ( __param(25, IMicCaptureService)), ( __param(26, ITtsPlaybackService)), ( __param(27, IVoiceSessionController)), ( __param(28, IChatWidgetService)), ( __param(29, IAgentTitleBarStatusService)), ( __param(30, IVoicePlaybackService)), ( __param(31, IWorkbenchEnvironmentService))], 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(7826, "Chat"));
+        this.DEFAULT_TITLE = ( localize(8414, "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(7827, "Pick Agent Session")),
+                    title: ( localize(8415, "Pick Agent Session")),
                     f1: false,
                     menu: [{
                         id: MenuId.ChatViewSessionTitleNavigationToolbar,