@codingame/monaco-vscode-api 24.2.0 → 25.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys.js

@@ -9,24 +9,24 @@ import { IInstantiationService } from '../../../../../platform/instantiation/com
 import { EditorResourceAccessor, SideBySideEditor } from '../../../../common/editor.js';
 import { IEditorGroupsService } from '../../../../services/editor/common/editorGroupsService.service.js';
 import { IInlineChatSessionService } from '../../../inlineChat/browser/inlineChatSessionService.service.js';
-import { ModifiedFileEntryState } from '../../common/chatEditingService.js';
-import { IChatEditingService } from '../../common/chatEditingService.service.js';
-import { IChatService } from '../../common/chatService.service.js';
+import { ModifiedFileEntryState } from '../../common/editing/chatEditingService.js';
+import { IChatEditingService } from '../../common/editing/chatEditingService.service.js';
+import { IChatService } from '../../common/chatService/chatService.service.js';
 import { observableFromEvent } from '../../../../../base/common/observableInternal/observables/observableFromEvent.js';
 import { autorun } from '../../../../../base/common/observableInternal/reactions/autorun.js';
 import { derived } from '../../../../../base/common/observableInternal/observables/derived.js';
 import { constObservable } from '../../../../../base/common/observableInternal/observables/constObservable.js';
 
-const ctxIsGlobalEditingSession = ( new RawContextKey('chatEdits.isGlobalEditingSession', undefined, ( localize(5239, "The current editor is part of the global edit session"))));
-const ctxHasEditorModification = ( new RawContextKey('chatEdits.hasEditorModifications', undefined, ( localize(5240, "The current editor contains chat modifications"))));
-const ctxIsCurrentlyBeingModified = ( new RawContextKey('chatEdits.isCurrentlyBeingModified', undefined, ( localize(5241, "The current editor is currently being modified"))));
-const ctxReviewModeEnabled = ( new RawContextKey('chatEdits.isReviewModeEnabled', true, ( localize(5242, "Review mode for chat changes is enabled"))));
+const ctxIsGlobalEditingSession = ( new RawContextKey('chatEdits.isGlobalEditingSession', undefined, ( localize(5150, "The current editor is part of the global edit session"))));
+const ctxHasEditorModification = ( new RawContextKey('chatEdits.hasEditorModifications', undefined, ( localize(5151, "The current editor contains chat modifications"))));
+const ctxIsCurrentlyBeingModified = ( new RawContextKey('chatEdits.isCurrentlyBeingModified', undefined, ( localize(5152, "The current editor is currently being modified"))));
+const ctxReviewModeEnabled = ( new RawContextKey('chatEdits.isReviewModeEnabled', true, ( localize(5153, "Review mode for chat changes is enabled"))));
 const ctxHasRequestInProgress = ( new RawContextKey('chatEdits.isRequestInProgress', false, ( localize(
-    5243,
+    5154,
     "The current editor shows a file from an edit session which is still in progress"
 ))));
-const ctxRequestCount = ( new RawContextKey('chatEdits.requestCount', 0, ( localize(5244, "The number of turns the editing session in this editor has"))));
-const ctxCursorInChangeRange = ( new RawContextKey('chatEdits.cursorInChangeRange', false, ( localize(5245, "The cursor is inside a change range made by chat editing."))));
+const ctxRequestCount = ( new RawContextKey('chatEdits.requestCount', 0, ( localize(5155, "The number of turns the editing session in this editor has"))));
+const ctxCursorInChangeRange = ( new RawContextKey('chatEdits.cursorInChangeRange', false, ( localize(5156, "The cursor is inside a change range made by chat editing."))));
 let ChatEditingEditorContextKeys = class ChatEditingEditorContextKeys {
     static { this.ID = 'chat.edits.editorContextKeys'; }
     constructor(instaService, editorGroupsService) {

package/vscode/src/vs/workbench/contrib/chat/browser/contextContrib/chatContextService.service.d.ts

@@ -0,0 +1,4 @@
+import { ChatContextService } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/browser/contextContrib/chatContextService";
+export declare const IChatContextService: import("../../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatContextService>;
+export interface IChatContextService extends ChatContextService {
+}

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContextService.service.js → contextContrib/chatContextService.service.js}

@@ -1,5 +1,5 @@
 
-import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
 
 const IChatContextService = ( createDecorator('chatContextService'));
 

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/promptFileRewriter.d.ts

@@ -3,8 +3,8 @@ import { URI } from "../../../../../base/common/uri.js";
 import { ICodeEditorService } from "../../../../../editor/browser/services/codeEditorService.service.js";
 import { Range } from "../../../../../editor/common/core/range.js";
 import { ITextModel } from "../../../../../editor/common/model.js";
-import { IToolAndToolSetEnablementMap } from "../../common/languageModelToolsService.js";
-import { ILanguageModelToolsService } from "../../common/languageModelToolsService.service.js";
+import { IToolAndToolSetEnablementMap } from "../../common/tools/languageModelToolsService.js";
+import { ILanguageModelToolsService } from "../../common/tools/languageModelToolsService.service.js";
 import { IPromptsService } from "../../common/promptSyntax/service/promptsService.service.js";
 export declare class PromptFileRewriter {
     private readonly _codeEditorService;

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/promptFileRewriter.js

@@ -2,7 +2,7 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import { ICodeEditorService } from '../../../../../editor/browser/services/codeEditorService.service.js';
 import { EditOperation } from '../../../../../editor/common/core/editOperation.js';
-import { ILanguageModelToolsService } from '../../common/languageModelToolsService.service.js';
+import { ILanguageModelToolsService } from '../../common/tools/languageModelToolsService.service.js';
 import { PromptHeaderAttributes } from '../../common/promptSyntax/promptFileParser.js';
 import { IPromptsService } from '../../common/promptSyntax/service/promptsService.service.js';
 

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContentParts → widget/chatContentParts}/chatContentParts.d.ts

@@ -1,8 +1,8 @@
-import { IDisposable } from "../../../../../base/common/lifecycle.js";
-import { ChatTreeItem, IChatCodeBlockInfo } from "../chat.js";
-import { IChatRendererContent } from "../../common/chatViewModel.js";
-import { CodeBlockModelCollection } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/common/codeBlockModelCollection";
-import { DiffEditorPool, EditorPool } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatContentParts/chatContentCodePools";
+import { IDisposable } from "../../../../../../base/common/lifecycle.js";
+import { ChatTreeItem, IChatCodeBlockInfo } from "../../chat.js";
+import { IChatRendererContent } from "../../../common/model/chatViewModel.js";
+import { CodeBlockModelCollection } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/common/widget/codeBlockModelCollection";
+import { DiffEditorPool, EditorPool } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatContentCodePools";
 export interface IChatContentPart extends IDisposable {
     domNode: HTMLElement | undefined;
     /**

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContentParts → widget/chatContentParts}/chatMarkdownAnchorService.service.d.ts

@@ -1,6 +1,6 @@
-import { IDisposable } from "../../../../../base/common/lifecycle.js";
-import { InlineAnchorWidget } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatInlineAnchorWidget";
-export declare const IChatMarkdownAnchorService: import("../../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatMarkdownAnchorService>;
+import { IDisposable } from "../../../../../../base/common/lifecycle.js";
+import { InlineAnchorWidget } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatInlineAnchorWidget";
+export declare const IChatMarkdownAnchorService: import("../../../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatMarkdownAnchorService>;
 export interface IChatMarkdownAnchorService {
     readonly _serviceBrand: undefined;
     /**

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContentParts → widget/chatContentParts}/chatMarkdownAnchorService.service.js

@@ -1,5 +1,5 @@
 
-import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
+import { createDecorator } from '../../../../../../platform/instantiation/common/instantiation.js';
 
 const IChatMarkdownAnchorService = ( createDecorator('chatMarkdownAnchorService'));
 

package/vscode/src/vs/workbench/contrib/chat/browser/{chatEditorInput.d.ts → widgetHosts/editor/chatEditorInput.d.ts}

@@ -1,30 +1,25 @@
-import { Disposable } from "../../../../base/common/lifecycle.js";
-import { ThemeIcon } from "../../../../base/common/themables.js";
-import { URI } from "../../../../base/common/uri.js";
-import { ConfirmResult } from "../../../../platform/dialogs/common/dialogs.js";
-import { IDialogService } from "../../../../platform/dialogs/common/dialogs.service.js";
-import { IInstantiationService } from "../../../../platform/instantiation/common/instantiation.js";
-import { EditorInputCapabilities, IEditorIdentifier, IEditorSerializer, IUntypedEditorInput, Verbosity } from "../../../common/editor.js";
-import { EditorInput, IEditorCloseHandler } from "../../../common/editor/editorInput.js";
-import { IChatEditingSession } from "../common/chatEditingService.js";
-import { IChatModel } from "../common/chatModel.js";
-import { IChatService } from "../common/chatService.service.js";
-import { IChatSessionsService } from "../common/chatSessionsService.service.js";
-import { IClearEditingSessionConfirmationOptions } from "./actions/chatActions.js";
-import type { IChatEditorOptions } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/browser/chatEditor";
+import { Disposable } from "../../../../../../base/common/lifecycle.js";
+import { ThemeIcon } from "../../../../../../base/common/themables.js";
+import { URI } from "../../../../../../base/common/uri.js";
+import { ConfirmResult } from "../../../../../../platform/dialogs/common/dialogs.js";
+import { IDialogService } from "../../../../../../platform/dialogs/common/dialogs.service.js";
+import { IInstantiationService } from "../../../../../../platform/instantiation/common/instantiation.js";
+import { EditorInputCapabilities, IEditorIdentifier, IEditorSerializer, IUntypedEditorInput, Verbosity } from "../../../../../common/editor.js";
+import { EditorInput, IEditorCloseHandler } from "../../../../../common/editor/editorInput.js";
+import { IChatService } from "../../../common/chatService/chatService.service.js";
+import { IChatSessionsService } from "../../../common/chatSessionsService.service.js";
+import { IChatEditingSession } from "../../../common/editing/chatEditingService.js";
+import { IChatModel } from "../../../common/model/chatModel.js";
+import { IClearEditingSessionConfirmationOptions } from "../../actions/chatActions.js";
+import type { IChatEditorOptions } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditor";
 export declare class ChatEditorInput extends EditorInput implements IEditorCloseHandler {
     readonly resource: URI;
     readonly options: IChatEditorOptions;
     private readonly chatService;
     private readonly dialogService;
     private readonly chatSessionsService;
-    private readonly instantiationService;
-    /** Maps input name strings to sets of active editor counts */
-    static readonly countsInUseMap: Map<string, Set<number>>;
     static readonly TypeID: string;
     static readonly EditorID: string;
-    private readonly inputCount;
-    private readonly inputName;
     private _sessionResource;
     /**
      * Get the uri of the session this editor input is associated with.
@@ -32,14 +27,12 @@ export declare class ChatEditorInput extends EditorInput implements IEditorClose
      * This should be preferred over using `resource` directly, as it handles cases where a chat editor becomes a session
      */
     get sessionResource(): URI | undefined;
-    private hasCustomTitle;
     private didTransferOutEditingSession;
     private cachedIcon;
     private readonly modelRef;
     private get model();
     static getNewEditorUri(): URI;
-    private static getNextCount;
-    constructor(resource: URI, options: IChatEditorOptions, chatService: IChatService, dialogService: IDialogService, chatSessionsService: IChatSessionsService, instantiationService: IInstantiationService);
+    constructor(resource: URI, options: IChatEditorOptions, chatService: IChatService, dialogService: IDialogService, chatSessionsService: IChatSessionsService);
     closeHandler: this;
     showConfirm(): boolean;
     transferOutEditingSession(): IChatEditingSession | undefined;
@@ -59,7 +52,6 @@ export declare class ChatEditorInput extends EditorInput implements IEditorClose
     getSessionType(): string;
     resolve(): Promise<ChatEditorModel | null>;
     private iconsEqual;
-    dispose(): void;
 }
 export declare class ChatEditorModel extends Disposable {
     readonly model: IChatModel;
@@ -75,4 +67,5 @@ export declare class ChatEditorInputSerializer implements IEditorSerializer {
     deserialize(instantiationService: IInstantiationService, serializedEditor: string): EditorInput | undefined;
 }
 export declare function showClearEditingSessionConfirmation(model: IChatModel, dialogService: IDialogService, options?: IClearEditingSessionConfirmationOptions): Promise<boolean>;
-export declare function shouldShowClearEditingSessionConfirmation(editingSession: IChatEditingSession): boolean;
+/** Returns the number of files in the  model's modifications that need a prompt before saving */
+export declare function shouldShowClearEditingSessionConfirmation(model: IChatModel, options?: IClearEditingSessionConfirmationOptions): number;

package/vscode/src/vs/workbench/contrib/chat/browser/{chatEditorInput.js → widgetHosts/editor/chatEditorInput.js}

@@ -1,33 +1,30 @@
 
-import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { CancellationToken } from '../../../../base/common/cancellation.js';
-import { Codicon } from '../../../../base/common/codicons.js';
-import { MutableDisposable, toDisposable, Disposable } from '../../../../base/common/lifecycle.js';
-import { Schemas } from '../../../../base/common/network.js';
-import { isEqual } from '../../../../base/common/resources.js';
-import { truncate } from '../../../../base/common/strings.js';
-import { ThemeIcon } from '../../../../base/common/themables.js';
-import { URI } from '../../../../base/common/uri.js';
-import { localize } from '../../../../nls.js';
-import { ConfirmResult } from '../../../../platform/dialogs/common/dialogs.js';
-import { IDialogService } from '../../../../platform/dialogs/common/dialogs.service.js';
-import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
-import { EditorInputCapabilities, Verbosity } from '../../../common/editor.js';
-import { EditorInput } from '../../../common/editor/editorInput.js';
-import { ModifiedFileEntryState } from '../common/chatEditingService.js';
-import { IChatService } from '../common/chatService.service.js';
-import { localChatSessionType } from '../common/chatSessionsService.js';
-import { IChatSessionsService } from '../common/chatSessionsService.service.js';
-import { LocalChatSessionUri, getChatSessionType } from '../common/chatUri.js';
-import { ChatEditorTitleMaxLength, ChatAgentLocation } from '../common/constants.js';
-import { showCloseActiveChatNotification } from './actions/chatCloseNotification.js';
+import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
+import { CancellationToken } from '../../../../../../base/common/cancellation.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { MutableDisposable, Disposable } from '../../../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../../../base/common/network.js';
+import { isEqual } from '../../../../../../base/common/resources.js';
+import { truncate } from '../../../../../../base/common/strings.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { URI } from '../../../../../../base/common/uri.js';
+import { localize } from '../../../../../../nls.js';
+import { ConfirmResult } from '../../../../../../platform/dialogs/common/dialogs.js';
+import { IDialogService } from '../../../../../../platform/dialogs/common/dialogs.service.js';
+import { registerIcon } from '../../../../../../platform/theme/common/iconRegistry.js';
+import { EditorInputCapabilities, Verbosity } from '../../../../../common/editor.js';
+import { EditorInput } from '../../../../../common/editor/editorInput.js';
+import { IChatService } from '../../../common/chatService/chatService.service.js';
+import { localChatSessionType } from '../../../common/chatSessionsService.js';
+import { IChatSessionsService } from '../../../common/chatSessionsService.service.js';
+import { ChatEditorTitleMaxLength, ChatAgentLocation } from '../../../common/constants.js';
+import { ModifiedFileEntryState } from '../../../common/editing/chatEditingService.js';
+import { LocalChatSessionUri, getChatSessionType } from '../../../common/model/chatUri.js';
 
 var ChatEditorInput_1;
-const ChatEditorIcon = registerIcon('chat-editor-label-icon', Codicon.chatSparkle, ( localize(5284, 'Icon of the chat editor label.')));
+const ChatEditorIcon = registerIcon('chat-editor-label-icon', Codicon.chatSparkle, ( localize(5865, 'Icon of the chat editor label.')));
 let ChatEditorInput = class ChatEditorInput extends EditorInput {
     static { ChatEditorInput_1 = this; }
-    static { this.countsInUseMap = ( new Map()); }
     static { this.TypeID = 'workbench.input.chatSession'; }
     static { this.EditorID = 'workbench.editor.chatSession'; }
     get sessionResource() { return this._sessionResource; }
@@ -37,22 +34,13 @@ let ChatEditorInput = class ChatEditorInput extends EditorInput {
     static getNewEditorUri() {
         return ChatEditorUri.getNewEditorUri();
     }
-    static getNextCount(inputName) {
-        let count = 0;
-        while (ChatEditorInput_1.countsInUseMap.get(inputName)?.has(count)) {
-            count++;
-        }
-        return count;
-    }
-    constructor(resource, options, chatService, dialogService, chatSessionsService, instantiationService) {
+    constructor(resource, options, chatService, dialogService, chatSessionsService) {
         super();
         this.resource = resource;
         this.options = options;
         this.chatService = chatService;
         this.dialogService = dialogService;
         this.chatSessionsService = chatSessionsService;
-        this.instantiationService = instantiationService;
-        this.hasCustomTitle = false;
         this.didTransferOutEditingSession = false;
         this.modelRef = this._register(( new MutableDisposable()));
         this.closeHandler = this;
@@ -72,31 +60,9 @@ let ChatEditorInput = class ChatEditorInput extends EditorInput {
         else {
             this._sessionResource = resource;
         }
-        const hasExistingCustomTitle = this._sessionResource && (this.chatService.getSession(this._sessionResource)?.title ||
-            this.chatService.getPersistedSessionTitle(this._sessionResource)?.trim());
-        this.hasCustomTitle = Boolean(hasExistingCustomTitle);
-        this.inputName = options.title?.fallback ?? '';
-        if (!( ChatEditorInput_1.countsInUseMap.has(this.inputName))) {
-            ChatEditorInput_1.countsInUseMap.set(this.inputName, ( new Set()));
-        }
-        if (!this.hasCustomTitle) {
-            this.inputCount = ChatEditorInput_1.getNextCount(this.inputName);
-            ChatEditorInput_1.countsInUseMap.get(this.inputName)?.add(this.inputCount);
-            this._register(toDisposable(() => {
-                if (!this.hasCustomTitle) {
-                    ChatEditorInput_1.countsInUseMap.get(this.inputName)?.delete(this.inputCount);
-                    if (ChatEditorInput_1.countsInUseMap.get(this.inputName)?.size === 0) {
-                        ChatEditorInput_1.countsInUseMap.delete(this.inputName);
-                    }
-                }
-            }));
-        }
-        else {
-            this.inputCount = 0;
-        }
     }
     showConfirm() {
-        return this.model?.editingSession ? shouldShowClearEditingSessionConfirmation(this.model.editingSession) : false;
+        return !!(this.model && shouldShowClearEditingSessionConfirmation(this.model));
     }
     transferOutEditingSession() {
         this.didTransferOutEditingSession = true;
@@ -106,8 +72,8 @@ let ChatEditorInput = class ChatEditorInput extends EditorInput {
         if (!this.model?.editingSession || this.didTransferOutEditingSession || this.getSessionType() !== localChatSessionType) {
             return ConfirmResult.SAVE;
         }
-        const titleOverride = ( localize(5285, "Close Chat Editor"));
-        const messageOverride = ( localize(5286, "Closing the chat editor will end your current edit session."));
+        const titleOverride = ( localize(5866, "Close Chat Editor"));
+        const messageOverride = ( localize(5867, "Closing the chat editor will end your current edit session."));
         const result = await showClearEditingSessionConfirmation(this.model, this.dialogService, { titleOverride, messageOverride });
         return result ? ConfirmResult.SAVE : ConfirmResult.CANCEL;
     }
@@ -135,7 +101,7 @@ let ChatEditorInput = class ChatEditorInput extends EditorInput {
             if (existingSession?.title) {
                 return existingSession.title;
             }
-            const persistedTitle = this.chatService.getPersistedSessionTitle(this._sessionResource);
+            const persistedTitle = this.chatService.getSessionTitle(this._sessionResource);
             if (persistedTitle && persistedTitle.trim()) {
                 return persistedTitle;
             }
@@ -143,9 +109,7 @@ let ChatEditorInput = class ChatEditorInput extends EditorInput {
         if (this.options.title?.preferred) {
             return this.options.title.preferred;
         }
-        const inputCountSuffix = (this.inputCount > 0 ? ` ${this.inputCount + 1}` : '');
-        const defaultName = this.options.title?.fallback ?? ( localize(5287, "Chat"));
-        return defaultName + inputCountSuffix;
+        return this.options.title?.fallback ?? ( localize(5868, "Chat"));
     }
     getTitle(verbosity) {
         const name = this.getName();
@@ -208,13 +172,6 @@ let ChatEditorInput = class ChatEditorInput extends EditorInput {
         }
         this._sessionResource = this.model.sessionResource;
         this._register(this.model.onDidChange((e) => {
-            if (e && e.kind === 'setCustomTitle' && !this.hasCustomTitle) {
-                this.hasCustomTitle = true;
-                ChatEditorInput_1.countsInUseMap.get(this.inputName)?.delete(this.inputCount);
-                if (ChatEditorInput_1.countsInUseMap.get(this.inputName)?.size === 0) {
-                    ChatEditorInput_1.countsInUseMap.delete(this.inputName);
-                }
-            }
             this.cachedIcon = undefined;
             this._onDidChangeLabel.fire();
         }));
@@ -234,19 +191,11 @@ let ChatEditorInput = class ChatEditorInput extends EditorInput {
         }
         return false;
     }
-    dispose() {
-        if (this.modelRef.value?.object.requestInProgress.get()) {
-            const closingSessionResource = this.modelRef.value.object.sessionResource;
-            this.instantiationService.invokeFunction(showCloseActiveChatNotification, closingSessionResource);
-        }
-        super.dispose();
-    }
 };
 ChatEditorInput = ChatEditorInput_1 = ( __decorate([
     ( __param(2, IChatService)),
     ( __param(3, IDialogService)),
-    ( __param(4, IChatSessionsService)),
-    ( __param(5, IInstantiationService))
+    ( __param(4, IChatSessionsService))
 ], ChatEditorInput));
 class ChatEditorModel extends Disposable {
     constructor(model) {
@@ -323,40 +272,31 @@ class ChatEditorInputSerializer {
     }
 }
 async function showClearEditingSessionConfirmation(model, dialogService, options) {
-    if (!model.editingSession || (model.willKeepAlive && !options?.isArchiveAction)) {
+    const undecidedEdits = shouldShowClearEditingSessionConfirmation(model, options);
+    if (!undecidedEdits) {
         return true;
     }
-    const editingSession = model.editingSession;
-    const defaultPhrase = ( localize(5288, "Starting a new chat will end your current edit session."));
-    const defaultTitle = ( localize(5289, "Start new chat?"));
+    const defaultPhrase = ( localize(5869, "Starting a new chat will end your current edit session."));
+    const defaultTitle = ( localize(5870, "Start new chat?"));
     const phrase = options?.messageOverride ?? defaultPhrase;
     const title = options?.titleOverride ?? defaultTitle;
-    const currentEdits = editingSession.entries.get();
-    const undecidedEdits = currentEdits.filter((edit) => edit.state.get() === ModifiedFileEntryState.Modified);
-    if (!undecidedEdits.length) {
-        return true;
-    }
     const { result } = await dialogService.prompt({
         title,
-        message: phrase + ' ' + ( localize(
-            5290,
-            "Do you want to keep pending edits to {0} files?",
-            undecidedEdits.length
-        )),
+        message: phrase + ' ' + ( localize(5871, "Do you want to keep pending edits to {0} files?", undecidedEdits)),
         type: 'info',
         cancelButton: true,
         buttons: [
             {
-                label: ( localize(5291, "Keep & Continue")),
+                label: ( localize(5872, "Keep & Continue")),
                 run: async () => {
-                    await editingSession.accept();
+                    await model.editingSession.accept();
                     return true;
                 }
             },
             {
-                label: ( localize(5292, "Undo & Continue")),
+                label: ( localize(5873, "Undo & Continue")),
                 run: async () => {
-                    await editingSession.reject();
+                    await model.editingSession.reject();
                     return true;
                 }
             }
@@ -364,14 +304,13 @@ async function showClearEditingSessionConfirmation(model, dialogService, options
     });
     return Boolean(result);
 }
-function shouldShowClearEditingSessionConfirmation(editingSession) {
-    const currentEdits = editingSession.entries.get();
-    const currentEditCount = currentEdits.length;
-    if (currentEditCount) {
-        const undecidedEdits = currentEdits.filter((edit) => edit.state.get() === ModifiedFileEntryState.Modified);
-        return !!undecidedEdits.length;
+function shouldShowClearEditingSessionConfirmation(model, options) {
+    if (!model.editingSession || (model.willKeepAlive && !options?.isArchiveAction)) {
+        return 0;
     }
-    return false;
+    const currentEdits = model.editingSession.entries.get();
+    const undecidedEdits = currentEdits.filter((edit) => edit.state.get() === ModifiedFileEntryState.Modified);
+    return undecidedEdits.length;
 }
 
 export { ChatEditorInput, ChatEditorInputSerializer, ChatEditorModel, shouldShowClearEditingSessionConfirmation, showClearEditingSessionConfirmation };

package/vscode/src/vs/workbench/contrib/chat/common/{chatActions.d.ts → actions/chatActions.d.ts}

@@ -1,5 +1,5 @@
-import { MarshalledId } from "../../../../base/common/marshallingIds.js";
-import { URI } from "../../../../base/common/uri.js";
+import { MarshalledId } from "../../../../../base/common/marshallingIds.js";
+import { URI } from "../../../../../base/common/uri.js";
 export interface IChatViewTitleActionContext {
     readonly $mid: MarshalledId.ChatViewContext;
     readonly sessionResource: URI;

package/vscode/src/vs/workbench/contrib/chat/common/{chatActions.js → actions/chatActions.js}

@@ -1,6 +1,6 @@
 
-import { MarshalledId } from '../../../../base/common/marshallingIds.js';
-import { URI } from '../../../../base/common/uri.js';
+import { MarshalledId } from '../../../../../base/common/marshallingIds.js';
+import { URI } from '../../../../../base/common/uri.js';
 
 function isChatViewTitleActionContext(obj) {
     return !!obj &&

package/vscode/src/vs/workbench/contrib/chat/common/{chatContextKeys.d.ts → actions/chatContextKeys.d.ts}

@@ -1,6 +1,6 @@
-import { RawContextKey } from "../../../../platform/contextkey/common/contextkey.js";
-import { ViewContainerLocation } from "../../../common/views.js";
-import { ChatAgentLocation, ChatModeKind } from "./constants.js";
+import { RawContextKey } from "../../../../../platform/contextkey/common/contextkey.js";
+import { ViewContainerLocation } from "../../../../common/views.js";
+import { ChatAgentLocation, ChatModeKind } from "../constants.js";
 export declare namespace ChatContextKeys {
     const responseVote: RawContextKey<string>;
     const responseDetectedAgentCommand: RawContextKey<boolean>;
@@ -24,7 +24,7 @@ export declare namespace ChatContextKeys {
     const chatModeKind: RawContextKey<ChatModeKind>;
     const chatToolCount: RawContextKey<number>;
     const chatToolGroupingThreshold: RawContextKey<number>;
-    const supported: import("../../../../platform/contextkey/common/contextkey.js").ContextKeyExpression | undefined;
+    const supported: import("../../../../../platform/contextkey/common/contextkey.js").ContextKeyExpression | undefined;
     const enabled: RawContextKey<boolean>;
     /**
      * True when the chat widget is locked to the coding agent session.
@@ -48,6 +48,7 @@ export declare namespace ChatContextKeys {
     const chatSessionIsEmpty: RawContextKey<boolean>;
     const remoteJobCreating: RawContextKey<boolean>;
     const hasRemoteCodingAgent: RawContextKey<boolean>;
+    const hasCanDelegateProviders: RawContextKey<boolean>;
     const enableRemoteCodingAgentPromptFileOverlay: RawContextKey<boolean>;
     /** Used by the extension to skip the quit confirmation when #new wants to open a new folder */
     const skipChatRequestInProgressMessage: RawContextKey<boolean>;
@@ -85,22 +86,22 @@ export declare namespace ChatContextKeys {
         agentModeDisabledByPolicy: RawContextKey<boolean>;
     };
     const panelLocation: RawContextKey<ViewContainerLocation>;
-    const isCombinedAgentSessionsViewer: RawContextKey<boolean>;
+    const agentSessionsViewerFocused: RawContextKey<boolean>;
     const agentSessionsViewerLimited: RawContextKey<boolean>;
     const agentSessionsViewerOrientation: RawContextKey<number>;
     const agentSessionsViewerPosition: RawContextKey<number>;
+    const agentSessionsViewerVisible: RawContextKey<boolean>;
     const agentSessionType: RawContextKey<string>;
-    const hasAgentSessionChanges: RawContextKey<boolean>;
+    const agentSessionSection: RawContextKey<string>;
     const isArchivedAgentSession: RawContextKey<boolean>;
     const isReadAgentSession: RawContextKey<boolean>;
-    const isActiveAgentSession: RawContextKey<boolean>;
+    const hasAgentSessionChanges: RawContextKey<boolean>;
     const isKatexMathElement: RawContextKey<boolean>;
 }
 export declare namespace ChatContextKeyExprs {
-    const inEditingMode: import("../../../../platform/contextkey/common/contextkey.js").ContextKeyExpression | undefined;
+    const inEditingMode: import("../../../../../platform/contextkey/common/contextkey.js").ContextKeyExpression | undefined;
     /**
      * Context expression that indicates when the welcome/setup view should be shown
      */
-    const chatSetupTriggerContext: import("../../../../platform/contextkey/common/contextkey.js").ContextKeyExpression | undefined;
-    const agentViewWhen: import("../../../../platform/contextkey/common/contextkey.js").ContextKeyExpression | undefined;
+    const chatSetupTriggerContext: import("../../../../../platform/contextkey/common/contextkey.js").ContextKeyExpression | undefined;
 }