@codingame/monaco-vscode-api 21.6.0 → 22.0.0

package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibleViewActions.js

@@ -40,7 +40,7 @@ class AccessibleViewNextAction extends Action2 {
                 }
             ],
             icon: Codicon.arrowDown,
-            title: ( localize(4315, "Show Next in Accessible View"))
+            title: ( localize(4323, "Show Next in Accessible View"))
         });
     }
     run(accessor) {
@@ -63,7 +63,7 @@ class AccessibleViewNextCodeBlockAction extends Action2 {
                 ...accessibleViewMenu,
                 when: ( ContextKeyExpr.and(accessibleViewIsShown, accessibleViewContainsCodeBlocks)),
             },
-            title: ( localize(4316, "Accessible View: Next Code Block"))
+            title: ( localize(4324, "Accessible View: Next Code Block"))
         });
     }
     run(accessor) {
@@ -86,7 +86,7 @@ class AccessibleViewPreviousCodeBlockAction extends Action2 {
                 ...accessibleViewMenu,
                 when: ( ContextKeyExpr.and(accessibleViewIsShown, accessibleViewContainsCodeBlocks)),
             },
-            title: ( localize(4317, "Accessible View: Previous Code Block"))
+            title: ( localize(4325, "Accessible View: Previous Code Block"))
         });
     }
     run(accessor) {
@@ -111,7 +111,7 @@ class AccessibleViewPreviousAction extends Action2 {
                     when: ( ContextKeyExpr.and(accessibleViewIsShown, accessibleViewSupportsNavigation)),
                 }
             ],
-            title: ( localize(4318, "Show Previous in Accessible View"))
+            title: ( localize(4326, "Show Previous in Accessible View"))
         });
     }
     run(accessor) {
@@ -137,7 +137,7 @@ class AccessibleViewGoToSymbolAction extends Action2 {
                     when: ( ContextKeyExpr.and(( ContextKeyExpr.or(accessibleViewIsShown, accessibilityHelpIsShown)), accessibleViewGoToSymbolSupported)),
                 }
             ],
-            title: ( localize(4319, "Go To Symbol in Accessible View"))
+            title: ( localize(4327, "Go To Symbol in Accessible View"))
         });
     }
     run(accessor) {
@@ -164,7 +164,7 @@ const AccessibilityHelpAction = registerCommand(( new MultiCommand({
     menuOpts: [{
             menuId: MenuId.CommandPalette,
             group: '',
-            title: ( localize(4320, "Open Accessibility Help")),
+            title: ( localize(4328, "Open Accessibility Help")),
             order: 1
         }],
 })));
@@ -182,7 +182,7 @@ const AccessibleViewAction = registerCommand(( new MultiCommand({
     menuOpts: [{
             menuId: MenuId.CommandPalette,
             group: '',
-            title: ( localize(4321, "Open Accessible View")),
+            title: ( localize(4329, "Open Accessible View")),
             order: 1
         }],
 })));
@@ -204,7 +204,7 @@ class AccessibleViewDisableHintAction extends Action2 {
                     when: ( ContextKeyExpr.and(( ContextKeyExpr.or(accessibleViewIsShown, accessibilityHelpIsShown)), accessibleViewVerbosityEnabled)),
                 }
             ],
-            title: ( localize(4322, "Disable Accessible View Hint"))
+            title: ( localize(4330, "Disable Accessible View Hint"))
         });
     }
     run(accessor) {
@@ -230,7 +230,7 @@ class AccessibilityHelpConfigureKeybindingsAction extends Action2 {
                     when: accessibleViewHasUnassignedKeybindings,
                 }
             ],
-            title: ( localize(4323, "Accessibility Help Configure Unassigned Keybindings"))
+            title: ( localize(4331, "Accessibility Help Configure Unassigned Keybindings"))
         });
     }
     async run(accessor) {
@@ -256,7 +256,7 @@ class AccessibilityHelpConfigureAssignedKeybindingsAction extends Action2 {
                     when: accessibleViewHasAssignedKeybindings,
                 }
             ],
-            title: ( localize(4324, "Accessibility Help Configure Assigned Keybindings"))
+            title: ( localize(4332, "Accessibility Help Configure Assigned Keybindings"))
         });
     }
     async run(accessor) {
@@ -273,7 +273,7 @@ class AccessibilityHelpOpenHelpLinkAction extends Action2 {
                 primary: KeyMod$1.Alt | KeyCode.KeyH,
                 weight: KeybindingWeight.WorkbenchContrib
             },
-            title: ( localize(4325, "Accessibility Help Open Help Link"))
+            title: ( localize(4333, "Accessibility Help Open Help Link"))
         });
     }
     run(accessor) {
@@ -307,7 +307,7 @@ class AccessibleViewAcceptInlineCompletionAction extends Action2 {
                     ))))
                 }
             ],
-            title: ( localize(4326, "Accept Inline Completion"))
+            title: ( localize(4334, "Accept Inline Completion"))
         });
     }
     async run(accessor) {

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

@@ -5,6 +5,7 @@ import { IChatElicitationRequest } from "../common/chatService.js";
 import { IChatResponseViewModel } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatViewModel";
 import { ChatAgentLocation } from "../common/constants.js";
 import { IChatWidget, type ICodeBlockActionContextProvider, type IQuickChatOpenOptions } from "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/browser/chat";
+import { ChatWidget } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/chatWidget";
 export declare const IChatWidgetService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatWidgetService>;
 export interface IChatWidgetService {
     readonly _serviceBrand: undefined;
@@ -34,7 +35,7 @@ export declare const IChatAccessibilityService: import("../../../../platform/ins
 export interface IChatAccessibilityService {
     readonly _serviceBrand: undefined;
     acceptRequest(): number;
-    acceptResponse(response: IChatResponseViewModel | string | undefined, requestId: number, isVoiceInput?: boolean): void;
+    acceptResponse(widget: ChatWidget, container: HTMLElement, response: IChatResponseViewModel | string | undefined, requestId: number, isVoiceInput?: boolean): void;
     acceptElicitation(message: IChatElicitationRequest): void;
 }
 export declare const IChatCodeBlockContextProviderService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatCodeBlockContextProviderService>;

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

@@ -2,7 +2,7 @@ import { VSBuffer } from "../../../../base/common/buffer.js";
 import { URI } from "../../../../base/common/uri.js";
 import { IDraggedResourceEditorInput, MarkerTransferData, DocumentSymbolTransferData, NotebookCellOutputTransferData } from "../../../../platform/dnd/browser/dnd.js";
 import { EditorInput } from "../../../common/editor/editorInput.js";
-import { SCMHistoryItemTransferData } from "@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common/vscode/vs/workbench/contrib/scm/browser/scmHistoryChatContext";
+import { SCMHistoryItemTransferData } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/scm/browser/scmHistoryChatContext";
 import { IChatRequestVariableEntry, IDiagnosticVariableEntry, ISymbolVariableEntry, ISCMHistoryItemVariableEntry } from "../common/chatVariableEntries.js";
 import { ImageTransferData } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/browser/chatAttachmentResolveService";
 export declare const IChatAttachmentResolveService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatAttachmentResolveService>;

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

@@ -1,5 +1,5 @@
 import { IDisposable } from "../../../../base/common/lifecycle.js";
-import { IChatContextValueItem, IChatContextPickerItem } from "@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common/vscode/vs/workbench/contrib/chat/browser/chatContextPickService";
+import { IChatContextValueItem, IChatContextPickerItem } from "@codingame/monaco-vscode-51e7513d-a395-525d-b226-639aa8c6cc2d-common/vscode/vs/workbench/contrib/chat/browser/chatContextPickService";
 export interface IChatContextPickService {
     _serviceBrand: undefined;
     items: Iterable<IChatContextValueItem | IChatContextPickerItem>;

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

@@ -9,6 +9,7 @@ import { IChatEditingSession, IModifiedFileEntry } from "../../common/chatEditin
 import { IChatEditingService } from "../../common/chatEditingService.service.js";
 export declare const ctxIsGlobalEditingSession: RawContextKey<boolean>;
 export declare const ctxHasEditorModification: RawContextKey<boolean>;
+export declare const ctxIsCurrentlyBeingModified: RawContextKey<boolean>;
 export declare const ctxReviewModeEnabled: RawContextKey<boolean>;
 export declare const ctxHasRequestInProgress: RawContextKey<boolean>;
 export declare const ctxRequestCount: RawContextKey<number>;

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

@@ -14,17 +14,18 @@ import { IChatEditingService } from '../../common/chatEditingService.service.js'
 import { IChatService } from '../../common/chatService.service.js';
 import { observableFromEvent } from '../../../../../base/common/observableInternal/observables/observableFromEvent.js';
 import { autorun } from '../../../../../base/common/observableInternal/reactions/autorun.js';
-import { constObservable } from '../../../../../base/common/observableInternal/observables/constObservable.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(5033, "The current editor is part of the global edit session"))));
-const ctxHasEditorModification = ( new RawContextKey('chatEdits.hasEditorModifications', undefined, ( localize(5034, "The current editor contains chat modifications"))));
-const ctxReviewModeEnabled = ( new RawContextKey('chatEdits.isReviewModeEnabled', true, ( localize(5035, "Review mode for chat changes is enabled"))));
+const ctxIsGlobalEditingSession = ( new RawContextKey('chatEdits.isGlobalEditingSession', undefined, ( localize(5083, "The current editor is part of the global edit session"))));
+const ctxHasEditorModification = ( new RawContextKey('chatEdits.hasEditorModifications', undefined, ( localize(5084, "The current editor contains chat modifications"))));
+const ctxIsCurrentlyBeingModified = ( new RawContextKey('chatEdits.isCurrentlyBeingModified', undefined, ( localize(5085, "The current editor is currently being modified"))));
+const ctxReviewModeEnabled = ( new RawContextKey('chatEdits.isReviewModeEnabled', true, ( localize(5086, "Review mode for chat changes is enabled"))));
 const ctxHasRequestInProgress = ( new RawContextKey('chatEdits.isRequestInProgress', false, ( localize(
-    5036,
+    5087,
     "The current editor shows a file from an edit session which is still in progress"
 ))));
-const ctxRequestCount = ( new RawContextKey('chatEdits.requestCount', 0, ( localize(5037, "The number of turns the editing session in this editor has"))));
+const ctxRequestCount = ( new RawContextKey('chatEdits.requestCount', 0, ( localize(5088, "The number of turns the editing session in this editor has"))));
 let ChatEditingEditorContextKeys = class ChatEditingEditorContextKeys {
     static { this.ID = 'chat.edits.editorContextKeys'; }
     constructor(instaService, editorGroupsService) {
@@ -58,18 +59,22 @@ let ContextKeyGroup = class ContextKeyGroup {
         this._store = ( new DisposableStore());
         this._ctxIsGlobalEditingSession = ctxIsGlobalEditingSession.bindTo(group.scopedContextKeyService);
         this._ctxHasEditorModification = ctxHasEditorModification.bindTo(group.scopedContextKeyService);
+        this._ctxIsCurrentlyBeingModified = ctxIsCurrentlyBeingModified.bindTo(group.scopedContextKeyService);
         this._ctxHasRequestInProgress = ctxHasRequestInProgress.bindTo(group.scopedContextKeyService);
         this._ctxReviewModeEnabled = ctxReviewModeEnabled.bindTo(group.scopedContextKeyService);
         this._ctxRequestCount = ctxRequestCount.bindTo(group.scopedContextKeyService);
         const editorObs = observableFromEvent(this, group.onDidModelChange, () => group.activeEditor);
-        this._store.add(autorun(r => {
+        const tupleObs = derived(r => {
             const editor = editorObs.read(r);
             const uri = EditorResourceAccessor.getOriginalUri(editor, { supportSideBySide: SideBySideEditor.PRIMARY });
             if (!uri) {
                 this._reset();
                 return;
             }
-            const tuple = ( new ObservableEditorSession(uri, chatEditingService, inlineChatSessionService)).value.read(r);
+            return ( new ObservableEditorSession(uri, chatEditingService, inlineChatSessionService)).value.read(r);
+        });
+        this._store.add(autorun(r => {
+            const tuple = tupleObs.read(r);
             if (!tuple) {
                 this._reset();
                 return;
@@ -80,6 +85,7 @@ let ContextKeyGroup = class ContextKeyGroup {
             this._ctxIsGlobalEditingSession.set(session.isGlobalEditingSession);
             this._ctxReviewModeEnabled.set(entry ? entry.reviewMode.read(r) : false);
             this._ctxHasRequestInProgress.set(chatModel?.requestInProgressObs.read(r) ?? false);
+            this._ctxIsCurrentlyBeingModified.set(!!entry?.isCurrentlyBeingModifiedBy.read(r));
             const requestCount = chatModel
                 ? observableFromEvent(this, chatModel.onDidChange, () => chatModel.getRequests().length)
                 : constObservable(0);
@@ -129,4 +135,4 @@ ObservableEditorSession = ( __decorate([
     ( __param(2, IInlineChatSessionService))
 ], ObservableEditorSession));
 
-export { ChatEditingEditorContextKeys, ObservableEditorSession, ctxHasEditorModification, ctxHasRequestInProgress, ctxIsGlobalEditingSession, ctxRequestCount, ctxReviewModeEnabled };
+export { ChatEditingEditorContextKeys, ObservableEditorSession, ctxHasEditorModification, ctxHasRequestInProgress, ctxIsCurrentlyBeingModified, ctxIsGlobalEditingSession, ctxRequestCount, ctxReviewModeEnabled };

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

@@ -30,6 +30,8 @@ export declare namespace ChatContextKeys {
      * True when the chat widget is locked to the coding agent session.
      */
     const lockedToCodingAgent: RawContextKey<boolean>;
+    const withinEditSessionDiff: RawContextKey<boolean>;
+    const filePartOfEditSession: RawContextKey<boolean>;
     const extensionParticipantRegistered: RawContextKey<boolean>;
     const panelParticipantRegistered: RawContextKey<boolean>;
     const chatEditingCanUndo: RawContextKey<boolean>;
@@ -52,6 +54,7 @@ export declare namespace ChatContextKeys {
         disabled: RawContextKey<boolean>;
         untrusted: RawContextKey<boolean>;
         later: RawContextKey<boolean>;
+        registered: RawContextKey<boolean>;
     };
     const Entitlement: {
         signedOut: RawContextKey<boolean>;
@@ -84,4 +87,8 @@ export declare namespace ChatContextKeys {
 }
 export declare namespace ChatContextKeyExprs {
     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;
 }

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

@@ -3,6 +3,7 @@ import { localize } from '../../../../nls.js';
 import { RawContextKey, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { IsWebContext } from '../../../../platform/contextkey/common/contextkeys.js';
 import { RemoteNameContext } from '../../../common/contextkeys.js';
+import { ChatEntitlementContextKeys } from '../../../services/chat/common/chatEntitlementService.js';
 import { ChatModeKind } from './constants.js';
 
 var ChatContextKeys;
@@ -11,99 +12,109 @@ var ChatContextKeys;
         'chatSessionResponseVote',
         '',
         { type: 'string', description: ( localize(
-            5480,
+            5542,
             "When the response has been voted up, is set to 'up'. When voted down, is set to 'down'. Otherwise an empty string."
         )) }
     ));
     ChatContextKeys.responseDetectedAgentCommand = ( new RawContextKey(
         'chatSessionResponseDetectedAgentOrCommand',
         false,
-        { type: 'boolean', description: ( localize(5481, "When the agent or command was automatically detected")) }
+        { type: 'boolean', description: ( localize(5543, "When the agent or command was automatically detected")) }
     ));
     ChatContextKeys.responseSupportsIssueReporting = ( new RawContextKey(
         'chatResponseSupportsIssueReporting',
         false,
-        { type: 'boolean', description: ( localize(5482, "True when the current chat response supports issue reporting.")) }
+        { type: 'boolean', description: ( localize(5544, "True when the current chat response supports issue reporting.")) }
     ));
     ChatContextKeys.responseIsFiltered = ( new RawContextKey(
         'chatSessionResponseFiltered',
         false,
-        { type: 'boolean', description: ( localize(5483, "True when the chat response was filtered out by the server.")) }
+        { type: 'boolean', description: ( localize(5545, "True when the chat response was filtered out by the server.")) }
     ));
     ChatContextKeys.responseHasError = ( new RawContextKey(
         'chatSessionResponseError',
         false,
-        { type: 'boolean', description: ( localize(5484, "True when the chat response resulted in an error.")) }
+        { type: 'boolean', description: ( localize(5546, "True when the chat response resulted in an error.")) }
     ));
     ChatContextKeys.requestInProgress = ( new RawContextKey(
         'chatSessionRequestInProgress',
         false,
-        { type: 'boolean', description: ( localize(5485, "True when the current request is still in progress.")) }
+        { type: 'boolean', description: ( localize(5547, "True when the current request is still in progress.")) }
     ));
     ChatContextKeys.currentlyEditing = ( new RawContextKey(
         'chatSessionCurrentlyEditing',
         false,
-        { type: 'boolean', description: ( localize(5486, "True when the current request is being edited.")) }
+        { type: 'boolean', description: ( localize(5548, "True when the current request is being edited.")) }
     ));
     ChatContextKeys.currentlyEditingInput = ( new RawContextKey(
         'chatSessionCurrentlyEditingInput',
         false,
-        { type: 'boolean', description: ( localize(5487, "True when the current request input at the bottom is being edited.")) }
-    ));
-    ChatContextKeys.isResponse = ( new RawContextKey('chatResponse', false, { type: 'boolean', description: ( localize(5488, "The chat item is a response.")) }));
-    ChatContextKeys.isRequest = ( new RawContextKey('chatRequest', false, { type: 'boolean', description: ( localize(5489, "The chat item is a request")) }));
-    ChatContextKeys.itemId = ( new RawContextKey('chatItemId', '', { type: 'string', description: ( localize(5490, "The id of the chat item.")) }));
-    ChatContextKeys.lastItemId = ( new RawContextKey('chatLastItemId', [], { type: 'string', description: ( localize(5491, "The id of the last chat item.")) }));
-    ChatContextKeys.editApplied = ( new RawContextKey('chatEditApplied', false, { type: 'boolean', description: ( localize(5492, "True when the chat text edits have been applied.")) }));
-    ChatContextKeys.inputHasText = ( new RawContextKey('chatInputHasText', false, { type: 'boolean', description: ( localize(5493, "True when the chat input has text.")) }));
-    ChatContextKeys.inputHasFocus = ( new RawContextKey('chatInputHasFocus', false, { type: 'boolean', description: ( localize(5494, "True when the chat input has focus.")) }));
-    ChatContextKeys.inChatInput = ( new RawContextKey('inChatInput', false, { type: 'boolean', description: ( localize(5495, "True when focus is in the chat input, false otherwise.")) }));
-    ChatContextKeys.inChatSession = ( new RawContextKey('inChat', false, { type: 'boolean', description: ( localize(5496, "True when focus is in the chat widget, false otherwise.")) }));
-    ChatContextKeys.inChatEditor = ( new RawContextKey('inChatEditor', false, { type: 'boolean', description: ( localize(5497, "Whether focus is in a chat editor.")) }));
+        { type: 'boolean', description: ( localize(5549, "True when the current request input at the bottom is being edited.")) }
+    ));
+    ChatContextKeys.isResponse = ( new RawContextKey('chatResponse', false, { type: 'boolean', description: ( localize(5550, "The chat item is a response.")) }));
+    ChatContextKeys.isRequest = ( new RawContextKey('chatRequest', false, { type: 'boolean', description: ( localize(5551, "The chat item is a request")) }));
+    ChatContextKeys.itemId = ( new RawContextKey('chatItemId', '', { type: 'string', description: ( localize(5552, "The id of the chat item.")) }));
+    ChatContextKeys.lastItemId = ( new RawContextKey('chatLastItemId', [], { type: 'string', description: ( localize(5553, "The id of the last chat item.")) }));
+    ChatContextKeys.editApplied = ( new RawContextKey('chatEditApplied', false, { type: 'boolean', description: ( localize(5554, "True when the chat text edits have been applied.")) }));
+    ChatContextKeys.inputHasText = ( new RawContextKey('chatInputHasText', false, { type: 'boolean', description: ( localize(5555, "True when the chat input has text.")) }));
+    ChatContextKeys.inputHasFocus = ( new RawContextKey('chatInputHasFocus', false, { type: 'boolean', description: ( localize(5556, "True when the chat input has focus.")) }));
+    ChatContextKeys.inChatInput = ( new RawContextKey('inChatInput', false, { type: 'boolean', description: ( localize(5557, "True when focus is in the chat input, false otherwise.")) }));
+    ChatContextKeys.inChatSession = ( new RawContextKey('inChat', false, { type: 'boolean', description: ( localize(5558, "True when focus is in the chat widget, false otherwise.")) }));
+    ChatContextKeys.inChatEditor = ( new RawContextKey('inChatEditor', false, { type: 'boolean', description: ( localize(5559, "Whether focus is in a chat editor.")) }));
     ChatContextKeys.hasPromptFile = ( new RawContextKey(
         'chatPromptFileAttached',
         false,
-        { type: 'boolean', description: ( localize(5498, "True when the chat has a prompt file attached.")) }
+        { type: 'boolean', description: ( localize(5560, "True when the chat has a prompt file attached.")) }
     ));
     ChatContextKeys.chatModeKind = ( new RawContextKey(
         'chatMode',
         ChatModeKind.Ask,
-        { type: 'string', description: ( localize(5499, "The 'kind' of the current chat mode- Agent for custom modes.")) }
+        { type: 'string', description: ( localize(5561, "The 'kind' of the current chat mode- Agent for custom modes.")) }
     ));
-    ChatContextKeys.chatToolCount = ( new RawContextKey('chatToolCount', 0, { type: 'number', description: ( localize(5500, "The number of tools available in the current chat mode.")) }));
+    ChatContextKeys.chatToolCount = ( new RawContextKey('chatToolCount', 0, { type: 'number', description: ( localize(5562, "The number of tools available in the current chat mode.")) }));
     ChatContextKeys.chatToolGroupingThreshold = ( new RawContextKey(
         'chat.toolGroupingThreshold',
         0,
-        { type: 'number', description: ( localize(5501, "The number of tools at which we start doing virtual grouping.")) }
+        { type: 'number', description: ( localize(5563, "The number of tools at which we start doing virtual grouping.")) }
     ));
     ChatContextKeys.supported = ( ContextKeyExpr.or(( IsWebContext.negate()), ( RemoteNameContext.notEqualsTo('')), ( ContextKeyExpr.has('config.chat.experimental.serverlessWebEnabled'))));
     ChatContextKeys.enabled = ( new RawContextKey('chatIsEnabled', false, { type: 'boolean', description: ( localize(
-        5502,
+        5564,
         "True when chat is enabled because a default chat participant is activated with an implementation."
     )) }));
     ChatContextKeys.lockedToCodingAgent = ( new RawContextKey(
         'lockedToCodingAgent',
         false,
-        { type: 'boolean', description: ( localize(5503, "True when the chat widget is locked to the coding agent session.")) }
+        { type: 'boolean', description: ( localize(5565, "True when the chat widget is locked to the coding agent session.")) }
+    ));
+    ChatContextKeys.withinEditSessionDiff = ( new RawContextKey(
+        'withinEditSessionDiff',
+        false,
+        { type: 'boolean', description: ( localize(5566, "True when the chat widget dispatches to the edit session chat.")) }
+    ));
+    ChatContextKeys.filePartOfEditSession = ( new RawContextKey(
+        'filePartOfEditSession',
+        false,
+        { type: 'boolean', description: ( localize(5567, "True when the chat widget is within a file with an edit session.")) }
     ));
     ChatContextKeys.extensionParticipantRegistered = ( new RawContextKey(
         'chatPanelExtensionParticipantRegistered',
         false,
         { type: 'boolean', description: ( localize(
-            5504,
+            5568,
             "True when a default chat participant is registered for the panel from an extension."
         )) }
     ));
     ChatContextKeys.panelParticipantRegistered = ( new RawContextKey(
         'chatPanelParticipantRegistered',
         false,
-        { type: 'boolean', description: ( localize(5505, "True when a default chat participant is registered for the panel.")) }
+        { type: 'boolean', description: ( localize(5569, "True when a default chat participant is registered for the panel.")) }
     ));
     ChatContextKeys.chatEditingCanUndo = ( new RawContextKey(
         'chatEditingCanUndo',
         false,
         { type: 'boolean', description: ( localize(
-            5506,
+            5570,
             "True when it is possible to undo an interaction in the editing panel."
         )) }
     ));
@@ -111,109 +122,93 @@ var ChatContextKeys;
         'chatEditingCanRedo',
         false,
         { type: 'boolean', description: ( localize(
-            5507,
+            5571,
             "True when it is possible to redo an interaction in the editing panel."
         )) }
     ));
     ChatContextKeys.languageModelsAreUserSelectable = ( new RawContextKey(
         'chatModelsAreUserSelectable',
         false,
-        { type: 'boolean', description: ( localize(5508, "True when the chat model can be selected manually by the user.")) }
+        { type: 'boolean', description: ( localize(5572, "True when the chat model can be selected manually by the user.")) }
     ));
     ChatContextKeys.extensionInvalid = ( new RawContextKey(
         'chatExtensionInvalid',
         false,
         { type: 'boolean', description: ( localize(
-            5509,
+            5573,
             "True when the installed chat extension is invalid and needs to be updated."
         )) }
     ));
     ChatContextKeys.inputCursorAtTop = ( new RawContextKey('chatCursorAtTop', false));
     ChatContextKeys.inputHasAgent = ( new RawContextKey('chatInputHasAgent', false));
     ChatContextKeys.location = ( new RawContextKey('chatLocation', undefined));
-    ChatContextKeys.inQuickChat = ( new RawContextKey('quickChatHasFocus', false, { type: 'boolean', description: ( localize(5510, "True when the quick chat UI has focus, false otherwise.")) }));
+    ChatContextKeys.inQuickChat = ( new RawContextKey('quickChatHasFocus', false, { type: 'boolean', description: ( localize(5574, "True when the quick chat UI has focus, false otherwise.")) }));
     ChatContextKeys.hasFileAttachments = ( new RawContextKey(
         'chatHasFileAttachments',
         false,
-        { type: 'boolean', description: ( localize(5511, "True when the chat has file attachments.")) }
+        { type: 'boolean', description: ( localize(5575, "True when the chat has file attachments.")) }
     ));
     ChatContextKeys.remoteJobCreating = ( new RawContextKey(
         'chatRemoteJobCreating',
         false,
-        { type: 'boolean', description: ( localize(5512, "True when a remote coding agent job is being created.")) }
+        { type: 'boolean', description: ( localize(5576, "True when a remote coding agent job is being created.")) }
     ));
-    ChatContextKeys.hasRemoteCodingAgent = ( new RawContextKey('hasRemoteCodingAgent', false, ( localize(5513, "Whether any remote coding agent is available"))));
+    ChatContextKeys.hasRemoteCodingAgent = ( new RawContextKey('hasRemoteCodingAgent', false, ( localize(5577, "Whether any remote coding agent is available"))));
     ChatContextKeys.enableRemoteCodingAgentPromptFileOverlay = ( new RawContextKey('enableRemoteCodingAgentPromptFileOverlay', false, ( localize(
-        5514,
+        5578,
         "Whether the remote coding agent prompt file overlay feature is enabled"
     ))));
     ChatContextKeys.skipChatRequestInProgressMessage = ( new RawContextKey(
         'chatSkipRequestInProgressMessage',
         false,
-        { type: 'boolean', description: ( localize(5515, "True when the chat request in progress message should be skipped.")) }
+        { type: 'boolean', description: ( localize(5579, "True when the chat request in progress message should be skipped.")) }
     ));
-    ChatContextKeys.Setup = {
-        hidden: ( new RawContextKey('chatSetupHidden', false, true)),
-        installed: ( new RawContextKey('chatSetupInstalled', false, true)),
-        disabled: ( new RawContextKey('chatSetupDisabled', false, true)),
-        untrusted: ( new RawContextKey('chatSetupUntrusted', false, true)),
-        later: ( new RawContextKey('chatSetupLater', false, true))
-    };
-    ChatContextKeys.Entitlement = {
-        signedOut: ( new RawContextKey('chatEntitlementSignedOut', false, true)),
-        canSignUp: ( new RawContextKey('chatPlanCanSignUp', false, true)),
-        planFree: ( new RawContextKey('chatPlanFree', false, true)),
-        planPro: ( new RawContextKey('chatPlanPro', false, true)),
-        planProPlus: ( new RawContextKey('chatPlanProPlus', false, true)),
-        planBusiness: ( new RawContextKey('chatPlanBusiness', false, true)),
-        planEnterprise: ( new RawContextKey('chatPlanEnterprise', false, true)),
-        organisations: ( new RawContextKey('chatEntitlementOrganisations', undefined, true)),
-        internal: ( new RawContextKey('chatEntitlementInternal', false, true)),
-        sku: ( new RawContextKey('chatEntitlementSku', undefined, true)),
-    };
-    ChatContextKeys.chatQuotaExceeded = ( new RawContextKey('chatQuotaExceeded', false, true));
-    ChatContextKeys.completionsQuotaExceeded = ( new RawContextKey('completionsQuotaExceeded', false, true));
+    ChatContextKeys.Setup = ChatEntitlementContextKeys.Setup;
+    ChatContextKeys.Entitlement = ChatEntitlementContextKeys.Entitlement;
+    ChatContextKeys.chatQuotaExceeded = ChatEntitlementContextKeys.chatQuotaExceeded;
+    ChatContextKeys.completionsQuotaExceeded = ChatEntitlementContextKeys.completionsQuotaExceeded;
     ChatContextKeys.Editing = {
         hasToolConfirmation: ( new RawContextKey(
             'chatHasToolConfirmation',
             false,
-            { type: 'boolean', description: ( localize(5516, "True when a tool confirmation is present.")) }
+            { type: 'boolean', description: ( localize(5580, "True when a tool confirmation is present.")) }
         )),
     };
     ChatContextKeys.Tools = {
-        toolsCount: ( new RawContextKey('toolsCount', 0, { type: 'number', description: ( localize(5517, "The count of tools available in the chat.")) }))
+        toolsCount: ( new RawContextKey('toolsCount', 0, { type: 'number', description: ( localize(5581, "The count of tools available in the chat.")) }))
     };
     ChatContextKeys.Modes = {
         hasCustomChatModes: ( new RawContextKey(
             'chatHasCustomChatModes',
             false,
-            { type: 'boolean', description: ( localize(5518, "True when the chat has custom chat modes available.")) }
+            { type: 'boolean', description: ( localize(5582, "True when the chat has custom chat modes available.")) }
         )),
     };
     ChatContextKeys.panelLocation = ( new RawContextKey(
         'chatPanelLocation',
         undefined,
-        { type: 'number', description: ( localize(5519, "The location of the chat panel.")) }
+        { type: 'number', description: ( localize(5583, "The location of the chat panel.")) }
     ));
     ChatContextKeys.inEmptyStateWithHistoryEnabled = ( new RawContextKey(
         'chatInEmptyStateWithHistoryEnabled',
         false,
         { type: 'boolean', description: ( localize(
-            5520,
+            5584,
             "True when chat empty state history is enabled AND chat is in empty state."
         )) }
     ));
-    ChatContextKeys.sessionType = ( new RawContextKey('chatSessionType', '', { type: 'string', description: ( localize(5521, "The type of the current chat session item.")) }));
-    ChatContextKeys.isHistoryItem = ( new RawContextKey('chatIsHistoryItem', false, { type: 'boolean', description: ( localize(5522, "True when the chat session item is from history.")) }));
+    ChatContextKeys.sessionType = ( new RawContextKey('chatSessionType', '', { type: 'string', description: ( localize(5585, "The type of the current chat session item.")) }));
+    ChatContextKeys.isHistoryItem = ( new RawContextKey('chatIsHistoryItem', false, { type: 'boolean', description: ( localize(5586, "True when the chat session item is from history.")) }));
     ChatContextKeys.isActiveSession = ( new RawContextKey(
         'chatIsActiveSession',
         false,
-        { type: 'boolean', description: ( localize(5523, "True when the chat session is currently active (not deletable).")) }
+        { type: 'boolean', description: ( localize(5587, "True when the chat session is currently active (not deletable).")) }
     ));
 })(ChatContextKeys || (ChatContextKeys = {}));
 var ChatContextKeyExprs;
 (function (ChatContextKeyExprs) {
     ChatContextKeyExprs.inEditingMode = ( ContextKeyExpr.or(( ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Edit)), ( ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Agent))));
+    ChatContextKeyExprs.chatSetupTriggerContext = ( ContextKeyExpr.or(( ChatContextKeys.Setup.installed.negate()), ChatContextKeys.Entitlement.canSignUp));
 })(ChatContextKeyExprs || (ChatContextKeyExprs = {}));
 
 export { ChatContextKeyExprs, ChatContextKeys };

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

@@ -3,7 +3,7 @@ import { Event } from "../../../../base/common/event.js";
 import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { IObservable, IReader } from "../../../../base/common/observable.js";
 import { URI } from "../../../../base/common/uri.js";
-import { TextEdit } from "../../../../editor/common/languages.js";
+import { Location, TextEdit } from "../../../../editor/common/languages.js";
 import { ITextModel } from "../../../../editor/common/model.js";
 import { RawContextKey } from "../../../../platform/contextkey/common/contextkey.js";
 import { IEditorPane } from "../../../common/editor.js";
@@ -198,6 +198,7 @@ export interface IModifiedFileEntry {
      */
     readonly linesRemoved?: IObservable<number>;
     getEditorIntegration(editor: IEditorPane): IModifiedFileEntryEditorIntegration;
+    hasModificationAt(location: Location): boolean;
 }
 export interface IChatEditingSessionStream {
     textEdits(resource: URI, textEdits: TextEdit[], isLastEdits: boolean, responseModel: IChatResponseModel): void;

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

@@ -17,9 +17,9 @@ var ChatEditingSessionState;
     ChatEditingSessionState[ChatEditingSessionState["Disposed"] = 3] = "Disposed";
 })(ChatEditingSessionState || (ChatEditingSessionState = {}));
 const CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME = 'chat-editing-multi-diff-source';
-const chatEditingWidgetFileStateContextKey = ( new RawContextKey('chatEditingWidgetFileState', undefined, ( localize(5524, "The current state of the file in the chat editing widget"))));
+const chatEditingWidgetFileStateContextKey = ( new RawContextKey('chatEditingWidgetFileState', undefined, ( localize(5588, "The current state of the file in the chat editing widget"))));
 const chatEditingAgentSupportsReadonlyReferencesContextKey = ( new RawContextKey('chatEditingAgentSupportsReadonlyReferences', undefined, ( localize(
-    5525,
+    5589,
     "Whether the chat editing agent supports readonly references (temporary)"
 ))));
 const decidedChatEditingResourceContextKey = ( new RawContextKey('decidedChatEditingResource', []));

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

@@ -1,8 +1,7 @@
 import { IObservable } from "../../../../base/common/observable.js";
-import { ChatFontSize } from "./chatLayoutService.js";
 export declare const IChatLayoutService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatLayoutService>;
 export interface IChatLayoutService {
     readonly _serviceBrand: undefined;
     readonly fontFamily: IObservable<string | null>;
-    readonly fontSize: IObservable<ChatFontSize>;
+    readonly fontSize: IObservable<number>;
 }