@codingame/monaco-vscode-api 20.5.0 → 21.0.1

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

@@ -40,7 +40,7 @@ class AccessibleViewNextAction extends Action2 {
                 }
             ],
             icon: Codicon.arrowDown,
-            title: ( localize(4299, "Show Next in Accessible View"))
+            title: ( localize(4315, "Show Next in Accessible View"))
         });
     }
     run(accessor) {
@@ -63,7 +63,7 @@ class AccessibleViewNextCodeBlockAction extends Action2 {
                 ...accessibleViewMenu,
                 when: ( ContextKeyExpr.and(accessibleViewIsShown, accessibleViewContainsCodeBlocks)),
             },
-            title: ( localize(4300, "Accessible View: Next Code Block"))
+            title: ( localize(4316, "Accessible View: Next Code Block"))
         });
     }
     run(accessor) {
@@ -86,7 +86,7 @@ class AccessibleViewPreviousCodeBlockAction extends Action2 {
                 ...accessibleViewMenu,
                 when: ( ContextKeyExpr.and(accessibleViewIsShown, accessibleViewContainsCodeBlocks)),
             },
-            title: ( localize(4301, "Accessible View: Previous Code Block"))
+            title: ( localize(4317, "Accessible View: Previous Code Block"))
         });
     }
     run(accessor) {
@@ -111,7 +111,7 @@ class AccessibleViewPreviousAction extends Action2 {
                     when: ( ContextKeyExpr.and(accessibleViewIsShown, accessibleViewSupportsNavigation)),
                 }
             ],
-            title: ( localize(4302, "Show Previous in Accessible View"))
+            title: ( localize(4318, "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(4303, "Go To Symbol in Accessible View"))
+            title: ( localize(4319, "Go To Symbol in Accessible View"))
         });
     }
     run(accessor) {
@@ -164,7 +164,7 @@ const AccessibilityHelpAction = registerCommand(( new MultiCommand({
     menuOpts: [{
             menuId: MenuId.CommandPalette,
             group: '',
-            title: ( localize(4304, "Open Accessibility Help")),
+            title: ( localize(4320, "Open Accessibility Help")),
             order: 1
         }],
 })));
@@ -182,7 +182,7 @@ const AccessibleViewAction = registerCommand(( new MultiCommand({
     menuOpts: [{
             menuId: MenuId.CommandPalette,
             group: '',
-            title: ( localize(4305, "Open Accessible View")),
+            title: ( localize(4321, "Open Accessible View")),
             order: 1
         }],
 })));
@@ -204,7 +204,7 @@ class AccessibleViewDisableHintAction extends Action2 {
                     when: ( ContextKeyExpr.and(( ContextKeyExpr.or(accessibleViewIsShown, accessibilityHelpIsShown)), accessibleViewVerbosityEnabled)),
                 }
             ],
-            title: ( localize(4306, "Disable Accessible View Hint"))
+            title: ( localize(4322, "Disable Accessible View Hint"))
         });
     }
     run(accessor) {
@@ -230,7 +230,7 @@ class AccessibilityHelpConfigureKeybindingsAction extends Action2 {
                     when: accessibleViewHasUnassignedKeybindings,
                 }
             ],
-            title: ( localize(4307, "Accessibility Help Configure Unassigned Keybindings"))
+            title: ( localize(4323, "Accessibility Help Configure Unassigned Keybindings"))
         });
     }
     async run(accessor) {
@@ -256,7 +256,7 @@ class AccessibilityHelpConfigureAssignedKeybindingsAction extends Action2 {
                     when: accessibleViewHasAssignedKeybindings,
                 }
             ],
-            title: ( localize(4308, "Accessibility Help Configure Assigned Keybindings"))
+            title: ( localize(4324, "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(4309, "Accessibility Help Open Help Link"))
+            title: ( localize(4325, "Accessibility Help Open Help Link"))
         });
     }
     run(accessor) {
@@ -307,7 +307,7 @@ class AccessibleViewAcceptInlineCompletionAction extends Action2 {
                     ))))
                 }
             ],
-            title: ( localize(4310, "Accept Inline Completion"))
+            title: ( localize(4326, "Accept Inline Completion"))
         });
     }
     async run(accessor) {

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

@@ -17,14 +17,14 @@ import { autorun } from '../../../../../base/common/observableInternal/reactions
 import { constObservable } from '../../../../../base/common/observableInternal/observables/constObservable.js';
 import { derived } from '../../../../../base/common/observableInternal/observables/derived.js';
 
-const ctxIsGlobalEditingSession = ( new RawContextKey('chatEdits.isGlobalEditingSession', undefined, ( localize(4940, "The current editor is part of the global edit session"))));
-const ctxHasEditorModification = ( new RawContextKey('chatEdits.hasEditorModifications', undefined, ( localize(4941, "The current editor contains chat modifications"))));
-const ctxReviewModeEnabled = ( new RawContextKey('chatEdits.isReviewModeEnabled', true, ( localize(4942, "Review mode for chat changes is enabled"))));
+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 ctxHasRequestInProgress = ( new RawContextKey('chatEdits.isRequestInProgress', false, ( localize(
-    4943,
+    5036,
     "The current editor shows a file from an edit session which is still in progress"
 ))));
-const ctxRequestCount = ( new RawContextKey('chatEdits.requestCount', 0, ( localize(4944, "The number of turns the editing session in this editor has"))));
+const ctxRequestCount = ( new RawContextKey('chatEdits.requestCount', 0, ( localize(5037, "The number of turns the editing session in this editor has"))));
 let ChatEditingEditorContextKeys = class ChatEditingEditorContextKeys {
     static { this.ID = 'chat.edits.editorContextKeys'; }
     constructor(instaService, editorGroupsService) {

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

@@ -1,7 +1,7 @@
 import { CancellationToken } from "../../../../base/common/cancellation.js";
 import { Event } from "../../../../base/common/event.js";
 import { IDisposable } from "../../../../base/common/lifecycle.js";
-import { IChatAgent, IChatAgentCommand, IChatAgentCompletionItem, IChatAgentData, IChatAgentHistoryEntry, IChatAgentImplementation, IChatAgentMetadata, IChatAgentRequest, IChatAgentResult, IChatParticipantDetectionProvider } from "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatAgents";
+import { IChatAgent, IChatAgentCommand, IChatAgentCompletionItem, IChatAgentData, IChatAgentHistoryEntry, IChatAgentImplementation, IChatAgentMetadata, IChatAgentRequest, IChatAgentResult, IChatParticipantDetectionProvider, UserSelectedTools } from "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatAgents";
 import { IChatFollowup, IChatProgress } from "./chatService.js";
 import { ChatAgentLocation, ChatModeKind } from "./constants.js";
 export declare const IChatAgentService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatAgentService>;
@@ -26,8 +26,7 @@ export interface IChatAgentService {
     } | undefined>;
     hasChatParticipantDetectionProviders(): boolean;
     invokeAgent(agent: string, request: IChatAgentRequest, progress: (parts: IChatProgress[]) => void, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatAgentResult>;
-    setRequestTools(agent: string, requestId: string, tools: Pick<IChatAgentRequest, "userSelectedTools">): void;
-    setRequestPaused(agent: string, requestId: string, isPaused: boolean): void;
+    setRequestTools(agent: string, requestId: string, tools: UserSelectedTools): void;
     getFollowups(id: string, request: IChatAgentRequest, result: IChatAgentResult, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatFollowup[]>;
     getChatTitle(id: string, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<string | undefined>;
     getChatSummary(id: string, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<string | undefined>;

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

@@ -10,8 +10,6 @@ export declare namespace ChatContextKeys {
     const requestInProgress: RawContextKey<boolean>;
     const currentlyEditing: RawContextKey<boolean>;
     const currentlyEditingInput: RawContextKey<boolean>;
-    const isRequestPaused: RawContextKey<boolean>;
-    const canRequestBePaused: RawContextKey<boolean>;
     const isResponse: RawContextKey<boolean>;
     const isRequest: RawContextKey<boolean>;
     const itemId: RawContextKey<string>;
@@ -46,6 +44,7 @@ export declare namespace ChatContextKeys {
     const remoteJobCreating: RawContextKey<boolean>;
     const hasRemoteCodingAgent: 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>;
     const Setup: {
         hidden: RawContextKey<boolean>;
@@ -57,11 +56,14 @@ export declare namespace ChatContextKeys {
     const Entitlement: {
         signedOut: RawContextKey<boolean>;
         canSignUp: RawContextKey<boolean>;
-        free: RawContextKey<boolean>;
-        pro: RawContextKey<boolean>;
-        proPlus: RawContextKey<boolean>;
-        business: RawContextKey<boolean>;
-        enterprise: RawContextKey<boolean>;
+        planFree: RawContextKey<boolean>;
+        planPro: RawContextKey<boolean>;
+        planProPlus: RawContextKey<boolean>;
+        planBusiness: RawContextKey<boolean>;
+        planEnterprise: RawContextKey<boolean>;
+        organisations: RawContextKey<string[]>;
+        internal: RawContextKey<boolean>;
+        sku: RawContextKey<string>;
     };
     const chatQuotaExceeded: RawContextKey<boolean>;
     const completionsQuotaExceeded: RawContextKey<boolean>;
@@ -75,6 +77,10 @@ export declare namespace ChatContextKeys {
         hasCustomChatModes: RawContextKey<boolean>;
     };
     const panelLocation: RawContextKey<ViewContainerLocation>;
+    const inEmptyStateWithHistoryEnabled: RawContextKey<boolean>;
+    const sessionType: RawContextKey<string>;
+    const isHistoryItem: RawContextKey<boolean>;
+    const isActiveSession: RawContextKey<boolean>;
 }
 export declare namespace ChatContextKeyExprs {
     const inEditingMode: import("../../../../platform/contextkey/common/contextkey.js").ContextKeyExpression | undefined;

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

@@ -11,109 +11,99 @@ var ChatContextKeys;
         'chatSessionResponseVote',
         '',
         { type: 'string', description: ( localize(
-            5354,
+            5480,
             "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(5355, "When the agent or command was automatically detected")) }
+        { type: 'boolean', description: ( localize(5481, "When the agent or command was automatically detected")) }
     ));
     ChatContextKeys.responseSupportsIssueReporting = ( new RawContextKey(
         'chatResponseSupportsIssueReporting',
         false,
-        { type: 'boolean', description: ( localize(5356, "True when the current chat response supports issue reporting.")) }
+        { type: 'boolean', description: ( localize(5482, "True when the current chat response supports issue reporting.")) }
     ));
     ChatContextKeys.responseIsFiltered = ( new RawContextKey(
         'chatSessionResponseFiltered',
         false,
-        { type: 'boolean', description: ( localize(5357, "True when the chat response was filtered out by the server.")) }
+        { type: 'boolean', description: ( localize(5483, "True when the chat response was filtered out by the server.")) }
     ));
     ChatContextKeys.responseHasError = ( new RawContextKey(
         'chatSessionResponseError',
         false,
-        { type: 'boolean', description: ( localize(5358, "True when the chat response resulted in an error.")) }
+        { type: 'boolean', description: ( localize(5484, "True when the chat response resulted in an error.")) }
     ));
     ChatContextKeys.requestInProgress = ( new RawContextKey(
         'chatSessionRequestInProgress',
         false,
-        { type: 'boolean', description: ( localize(5359, "True when the current request is still in progress.")) }
+        { type: 'boolean', description: ( localize(5485, "True when the current request is still in progress.")) }
     ));
     ChatContextKeys.currentlyEditing = ( new RawContextKey(
         'chatSessionCurrentlyEditing',
         false,
-        { type: 'boolean', description: ( localize(5360, "True when the current request is being edited.")) }
+        { type: 'boolean', description: ( localize(5486, "True when the current request is being edited.")) }
     ));
     ChatContextKeys.currentlyEditingInput = ( new RawContextKey(
         'chatSessionCurrentlyEditingInput',
         false,
-        { type: 'boolean', description: ( localize(5361, "True when the current request input at the bottom is being edited.")) }
-    ));
-    ChatContextKeys.isRequestPaused = ( new RawContextKey(
-        'chatRequestIsPaused',
-        false,
-        { type: 'boolean', description: ( localize(5362, "True when the current request is paused.")) }
-    ));
-    ChatContextKeys.canRequestBePaused = ( new RawContextKey(
-        'chatCanRequestBePaused',
-        false,
-        { type: 'boolean', description: ( localize(5363, "True when the current request can be paused.")) }
-    ));
-    ChatContextKeys.isResponse = ( new RawContextKey('chatResponse', false, { type: 'boolean', description: ( localize(5364, "The chat item is a response.")) }));
-    ChatContextKeys.isRequest = ( new RawContextKey('chatRequest', false, { type: 'boolean', description: ( localize(5365, "The chat item is a request")) }));
-    ChatContextKeys.itemId = ( new RawContextKey('chatItemId', '', { type: 'string', description: ( localize(5366, "The id of the chat item.")) }));
-    ChatContextKeys.lastItemId = ( new RawContextKey('chatLastItemId', [], { type: 'string', description: ( localize(5367, "The id of the last chat item.")) }));
-    ChatContextKeys.editApplied = ( new RawContextKey('chatEditApplied', false, { type: 'boolean', description: ( localize(5368, "True when the chat text edits have been applied.")) }));
-    ChatContextKeys.inputHasText = ( new RawContextKey('chatInputHasText', false, { type: 'boolean', description: ( localize(5369, "True when the chat input has text.")) }));
-    ChatContextKeys.inputHasFocus = ( new RawContextKey('chatInputHasFocus', false, { type: 'boolean', description: ( localize(5370, "True when the chat input has focus.")) }));
-    ChatContextKeys.inChatInput = ( new RawContextKey('inChatInput', false, { type: 'boolean', description: ( localize(5371, "True when focus is in the chat input, false otherwise.")) }));
-    ChatContextKeys.inChatSession = ( new RawContextKey('inChat', false, { type: 'boolean', description: ( localize(5372, "True when focus is in the chat widget, false otherwise.")) }));
-    ChatContextKeys.inChatEditor = ( new RawContextKey('inChatEditor', false, { type: 'boolean', description: ( localize(5373, "Whether focus is in a chat editor.")) }));
+        { 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.")) }));
     ChatContextKeys.hasPromptFile = ( new RawContextKey(
         'chatPromptFileAttached',
         false,
-        { type: 'boolean', description: ( localize(5374, "True when the chat has a prompt file attached.")) }
+        { type: 'boolean', description: ( localize(5498, "True when the chat has a prompt file attached.")) }
     ));
     ChatContextKeys.chatModeKind = ( new RawContextKey(
         'chatMode',
         ChatModeKind.Ask,
-        { type: 'string', description: ( localize(5375, "The 'kind' of the current chat mode- Agent for custom modes.")) }
+        { type: 'string', description: ( localize(5499, "The 'kind' of the current chat mode- Agent for custom modes.")) }
     ));
-    ChatContextKeys.chatToolCount = ( new RawContextKey('chatToolCount', 0, { type: 'number', description: ( localize(5376, "The number of tools available in the current chat mode.")) }));
+    ChatContextKeys.chatToolCount = ( new RawContextKey('chatToolCount', 0, { type: 'number', description: ( localize(5500, "The number of tools available in the current chat mode.")) }));
     ChatContextKeys.chatToolGroupingThreshold = ( new RawContextKey(
         'chat.toolGroupingThreshold',
         0,
-        { type: 'number', description: ( localize(5377, "The number of tools at which we start doing virtual grouping.")) }
+        { type: 'number', description: ( localize(5501, "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(
-        5378,
+        5502,
         "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(5379, "True when the chat widget is locked to the coding agent session.")) }
+        { type: 'boolean', description: ( localize(5503, "True when the chat widget is locked to the coding agent session.")) }
     ));
     ChatContextKeys.extensionParticipantRegistered = ( new RawContextKey(
         'chatPanelExtensionParticipantRegistered',
         false,
         { type: 'boolean', description: ( localize(
-            5380,
+            5504,
             "True when a default chat participant is registered for the panel from an extension."
         )) }
     ));
     ChatContextKeys.panelParticipantRegistered = ( new RawContextKey(
         'chatPanelParticipantRegistered',
         false,
-        { type: 'boolean', description: ( localize(5381, "True when a default chat participant is registered for the panel.")) }
+        { type: 'boolean', description: ( localize(5505, "True when a default chat participant is registered for the panel.")) }
     ));
     ChatContextKeys.chatEditingCanUndo = ( new RawContextKey(
         'chatEditingCanUndo',
         false,
         { type: 'boolean', description: ( localize(
-            5382,
+            5506,
             "True when it is possible to undo an interaction in the editing panel."
         )) }
     ));
@@ -121,46 +111,46 @@ var ChatContextKeys;
         'chatEditingCanRedo',
         false,
         { type: 'boolean', description: ( localize(
-            5383,
+            5507,
             "True when it is possible to redo an interaction in the editing panel."
         )) }
     ));
     ChatContextKeys.languageModelsAreUserSelectable = ( new RawContextKey(
         'chatModelsAreUserSelectable',
         false,
-        { type: 'boolean', description: ( localize(5384, "True when the chat model can be selected manually by the user.")) }
+        { type: 'boolean', description: ( localize(5508, "True when the chat model can be selected manually by the user.")) }
     ));
     ChatContextKeys.extensionInvalid = ( new RawContextKey(
         'chatExtensionInvalid',
         false,
         { type: 'boolean', description: ( localize(
-            5385,
+            5509,
             "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(5386, "True when the quick chat UI has focus, false otherwise.")) }));
+    ChatContextKeys.inQuickChat = ( new RawContextKey('quickChatHasFocus', false, { type: 'boolean', description: ( localize(5510, "True when the quick chat UI has focus, false otherwise.")) }));
     ChatContextKeys.hasFileAttachments = ( new RawContextKey(
         'chatHasFileAttachments',
         false,
-        { type: 'boolean', description: ( localize(5387, "True when the chat has file attachments.")) }
+        { type: 'boolean', description: ( localize(5511, "True when the chat has file attachments.")) }
     ));
     ChatContextKeys.remoteJobCreating = ( new RawContextKey(
         'chatRemoteJobCreating',
         false,
-        { type: 'boolean', description: ( localize(5388, "True when a remote coding agent job is being created.")) }
+        { type: 'boolean', description: ( localize(5512, "True when a remote coding agent job is being created.")) }
     ));
-    ChatContextKeys.hasRemoteCodingAgent = ( new RawContextKey('hasRemoteCodingAgent', false, ( localize(5389, "Whether any remote coding agent is available"))));
+    ChatContextKeys.hasRemoteCodingAgent = ( new RawContextKey('hasRemoteCodingAgent', false, ( localize(5513, "Whether any remote coding agent is available"))));
     ChatContextKeys.enableRemoteCodingAgentPromptFileOverlay = ( new RawContextKey('enableRemoteCodingAgentPromptFileOverlay', false, ( localize(
-        5390,
+        5514,
         "Whether the remote coding agent prompt file overlay feature is enabled"
     ))));
     ChatContextKeys.skipChatRequestInProgressMessage = ( new RawContextKey(
         'chatSkipRequestInProgressMessage',
         false,
-        { type: 'boolean', description: ( localize(5391, "True when the chat request in progress message should be skipped.")) }
+        { type: 'boolean', description: ( localize(5515, "True when the chat request in progress message should be skipped.")) }
     ));
     ChatContextKeys.Setup = {
         hidden: ( new RawContextKey('chatSetupHidden', false, true)),
@@ -172,11 +162,14 @@ var ChatContextKeys;
     ChatContextKeys.Entitlement = {
         signedOut: ( new RawContextKey('chatEntitlementSignedOut', false, true)),
         canSignUp: ( new RawContextKey('chatPlanCanSignUp', false, true)),
-        free: ( new RawContextKey('chatPlanFree', false, true)),
-        pro: ( new RawContextKey('chatPlanPro', false, true)),
-        proPlus: ( new RawContextKey('chatPlanProPlus', false, true)),
-        business: ( new RawContextKey('chatPlanBusiness', false, true)),
-        enterprise: ( new RawContextKey('chatPlanEnterprise', 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));
@@ -184,23 +177,38 @@ var ChatContextKeys;
         hasToolConfirmation: ( new RawContextKey(
             'chatHasToolConfirmation',
             false,
-            { type: 'boolean', description: ( localize(5392, "True when a tool confirmation is present.")) }
+            { type: 'boolean', description: ( localize(5516, "True when a tool confirmation is present.")) }
         )),
     };
     ChatContextKeys.Tools = {
-        toolsCount: ( new RawContextKey('toolsCount', 0, { type: 'number', description: ( localize(5393, "The count of tools available in the chat.")) }))
+        toolsCount: ( new RawContextKey('toolsCount', 0, { type: 'number', description: ( localize(5517, "The count of tools available in the chat.")) }))
     };
     ChatContextKeys.Modes = {
         hasCustomChatModes: ( new RawContextKey(
             'chatHasCustomChatModes',
             false,
-            { type: 'boolean', description: ( localize(5394, "True when the chat has custom chat modes available.")) }
+            { type: 'boolean', description: ( localize(5518, "True when the chat has custom chat modes available.")) }
         )),
     };
     ChatContextKeys.panelLocation = ( new RawContextKey(
         'chatPanelLocation',
         undefined,
-        { type: 'number', description: ( localize(5395, "The location of the chat panel.")) }
+        { type: 'number', description: ( localize(5519, "The location of the chat panel.")) }
+    ));
+    ChatContextKeys.inEmptyStateWithHistoryEnabled = ( new RawContextKey(
+        'chatInEmptyStateWithHistoryEnabled',
+        false,
+        { type: 'boolean', description: ( localize(
+            5520,
+            "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.isActiveSession = ( new RawContextKey(
+        'chatIsActiveSession',
+        false,
+        { type: 'boolean', description: ( localize(5523, "True when the chat session is currently active (not deletable).")) }
     ));
 })(ChatContextKeys || (ChatContextKeys = {}));
 var ChatContextKeyExprs;

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

@@ -7,6 +7,7 @@ import { 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";
+import { EditSuggestionId } from "../../../../editor/common/textModelEditSource.js";
 import { ICellEditOperation } from "../../notebook/common/notebookCommon.js";
 import { IChatAgentResult } from "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatAgents";
 import { IChatResponseModel } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel";
@@ -36,13 +37,16 @@ export interface IStreamingEdits {
     /** Marks edits as done, idempotent */
     complete(): void;
 }
-export declare const chatEditingSnapshotScheme = "chat-editing-snapshot-text-model";
 export interface IModifiedEntryTelemetryInfo {
     readonly agentId: string | undefined;
     readonly command: string | undefined;
     readonly sessionId: string;
     readonly requestId: string;
     readonly result: IChatAgentResult | undefined;
+    readonly modelId: string | undefined;
+    readonly modeId: "ask" | "edit" | "agent" | "custom" | "applyCodeBlock" | undefined;
+    readonly applyCodeBlockSuggestionId: EditSuggestionId | undefined;
+    readonly feature: "sideBarChat" | "inlineChat" | string | undefined;
 }
 export interface ISnapshotEntry {
     readonly resource: URI;
@@ -89,6 +93,11 @@ export interface IChatEditingSession extends IDisposable {
      * @returns The observable or undefined if there is no diff between the stops.
      */
     getEntryDiffBetweenStops(uri: URI, requestId: string | undefined, stopId: string | undefined): IObservable<IEditSessionEntryDiff | undefined> | undefined;
+    /**
+     * Gets the document diff of a change made to a URI between one request to another one.
+     * @returns The observable or undefined if there is no diff between the requests.
+     */
+    getEntryDiffBetweenRequests(uri: URI, startRequestIs: string, stopRequestId: string): IObservable<IEditSessionEntryDiff | undefined>;
     readonly canUndo: IObservable<boolean>;
     readonly canRedo: IObservable<boolean>;
     undoInteraction(): Promise<void>;
@@ -180,6 +189,14 @@ export interface IModifiedFileEntry {
      * Number of changes for this file
      */
     readonly changesCount: IObservable<number>;
+    /**
+     * Number of lines added in this entry.
+     */
+    readonly linesAdded?: IObservable<number>;
+    /**
+     * Number of lines removed in this entry
+     */
+    readonly linesRemoved?: IObservable<number>;
     getEditorIntegration(editor: IEditorPane): IModifiedFileEntryEditorIntegration;
 }
 export interface IChatEditingSessionStream {

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

@@ -3,7 +3,6 @@ import { URI } from '../../../../base/common/uri.js';
 import { localize } from '../../../../nls.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 
-const chatEditingSnapshotScheme = 'chat-editing-snapshot-text-model';
 var ModifiedFileEntryState;
 (function (ModifiedFileEntryState) {
     ModifiedFileEntryState[ModifiedFileEntryState["Modified"] = 0] = "Modified";
@@ -18,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(5396, "The current state of the file in the chat editing widget"))));
+const chatEditingWidgetFileStateContextKey = ( new RawContextKey('chatEditingWidgetFileState', undefined, ( localize(5524, "The current state of the file in the chat editing widget"))));
 const chatEditingAgentSupportsReadonlyReferencesContextKey = ( new RawContextKey('chatEditingAgentSupportsReadonlyReferences', undefined, ( localize(
-    5397,
+    5525,
     "Whether the chat editing agent supports readonly references (temporary)"
 ))));
 const decidedChatEditingResourceContextKey = ( new RawContextKey('decidedChatEditingResource', []));
@@ -50,4 +49,4 @@ function parseChatMultiDiffUri(uri) {
     return { chatSessionId, showPreviousChanges };
 }
 
-export { CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME, ChatEditKind, ChatEditingSessionState, ModifiedFileEntryState, applyingChatEditsFailedContextKey, chatEditingAgentSupportsReadonlyReferencesContextKey, chatEditingResourceContextKey, chatEditingSnapshotScheme, chatEditingWidgetFileStateContextKey, decidedChatEditingResourceContextKey, getMultiDiffSourceUri, hasAppliedChatEditsContextKey, hasUndecidedChatEditingResourceContextKey, inChatEditingSessionContextKey, isChatEditingActionContext, parseChatMultiDiffUri };
+export { CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME, ChatEditKind, ChatEditingSessionState, ModifiedFileEntryState, applyingChatEditsFailedContextKey, chatEditingAgentSupportsReadonlyReferencesContextKey, chatEditingResourceContextKey, chatEditingWidgetFileStateContextKey, decidedChatEditingResourceContextKey, getMultiDiffSourceUri, hasAppliedChatEditsContextKey, hasUndecidedChatEditingResourceContextKey, inChatEditingSessionContextKey, isChatEditingActionContext, parseChatMultiDiffUri };

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

@@ -6,6 +6,9 @@ export interface IChatEntitlementService {
     _serviceBrand: undefined;
     readonly onDidChangeEntitlement: Event<void>;
     readonly entitlement: ChatEntitlement;
+    readonly organisations: string[] | undefined;
+    readonly isInternal: boolean;
+    readonly sku: string | undefined;
     readonly onDidChangeQuotaExceeded: Event<void>;
     readonly onDidChangeQuotaRemaining: Event<void>;
     readonly quotas: IQuotas;

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

@@ -0,0 +1,8 @@
+export interface ChatFontSize {
+    readonly xs: number;
+    readonly s: number;
+    readonly m: number;
+    readonly l: number;
+    readonly xl: number;
+    readonly xxl: number;
+}

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

@@ -0,0 +1,8 @@
+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>;
+}

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

@@ -0,0 +1,6 @@
+
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+
+const IChatLayoutService = ( createDecorator('chatLayoutService'));
+
+export { IChatLayoutService };

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

@@ -0,0 +1,13 @@
+import { Event } from "../../../../base/common/event.js";
+import { IChatMode } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModes";
+export declare const IChatModeService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatModeService>;
+export interface IChatModeService {
+    readonly _serviceBrand: undefined;
+    onDidChangeChatModes: Event<void>;
+    getModes(): {
+        builtin: readonly IChatMode[];
+        custom: readonly IChatMode[];
+    };
+    findModeById(id: string): IChatMode | undefined;
+    findModeByName(name: string): IChatMode | undefined;
+}

package/vscode/src/vs/workbench/contrib/chat/common/chatModes.service.js

@@ -0,0 +1,6 @@
+
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+
+const IChatModeService = ( createDecorator('chatModeService'));
+
+export { IChatModeService };