@codingame/monaco-vscode-api 17.2.0 → 18.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(4209, "Show Next in Accessible View"))
+            title: ( localize(4237, "Show Next in Accessible View"))
         });
     }
     run(accessor) {
@@ -63,7 +63,7 @@ class AccessibleViewNextCodeBlockAction extends Action2 {
                 ...accessibleViewMenu,
                 when: ( ContextKeyExpr.and(accessibleViewIsShown, accessibleViewContainsCodeBlocks)),
             },
-            title: ( localize(4210, "Accessible View: Next Code Block"))
+            title: ( localize(4238, "Accessible View: Next Code Block"))
         });
     }
     run(accessor) {
@@ -86,7 +86,7 @@ class AccessibleViewPreviousCodeBlockAction extends Action2 {
                 ...accessibleViewMenu,
                 when: ( ContextKeyExpr.and(accessibleViewIsShown, accessibleViewContainsCodeBlocks)),
             },
-            title: ( localize(4211, "Accessible View: Previous Code Block"))
+            title: ( localize(4239, "Accessible View: Previous Code Block"))
         });
     }
     run(accessor) {
@@ -111,7 +111,7 @@ class AccessibleViewPreviousAction extends Action2 {
                     when: ( ContextKeyExpr.and(accessibleViewIsShown, accessibleViewSupportsNavigation)),
                 }
             ],
-            title: ( localize(4212, "Show Previous in Accessible View"))
+            title: ( localize(4240, "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(4213, "Go To Symbol in Accessible View"))
+            title: ( localize(4241, "Go To Symbol in Accessible View"))
         });
     }
     run(accessor) {
@@ -164,7 +164,7 @@ const AccessibilityHelpAction = registerCommand(( new MultiCommand({
     menuOpts: [{
             menuId: MenuId.CommandPalette,
             group: '',
-            title: ( localize(4214, "Open Accessibility Help")),
+            title: ( localize(4242, "Open Accessibility Help")),
             order: 1
         }],
 })));
@@ -182,7 +182,7 @@ const AccessibleViewAction = registerCommand(( new MultiCommand({
     menuOpts: [{
             menuId: MenuId.CommandPalette,
             group: '',
-            title: ( localize(4215, "Open Accessible View")),
+            title: ( localize(4243, "Open Accessible View")),
             order: 1
         }],
 })));
@@ -204,7 +204,7 @@ class AccessibleViewDisableHintAction extends Action2 {
                     when: ( ContextKeyExpr.and(( ContextKeyExpr.or(accessibleViewIsShown, accessibilityHelpIsShown)), accessibleViewVerbosityEnabled)),
                 }
             ],
-            title: ( localize(4216, "Disable Accessible View Hint"))
+            title: ( localize(4244, "Disable Accessible View Hint"))
         });
     }
     run(accessor) {
@@ -230,7 +230,7 @@ class AccessibilityHelpConfigureKeybindingsAction extends Action2 {
                     when: accessibleViewHasUnassignedKeybindings,
                 }
             ],
-            title: ( localize(4217, "Accessibility Help Configure Unassigned Keybindings"))
+            title: ( localize(4245, "Accessibility Help Configure Unassigned Keybindings"))
         });
     }
     async run(accessor) {
@@ -256,7 +256,7 @@ class AccessibilityHelpConfigureAssignedKeybindingsAction extends Action2 {
                     when: accessibleViewHasAssignedKeybindings,
                 }
             ],
-            title: ( localize(4218, "Accessibility Help Configure Assigned Keybindings"))
+            title: ( localize(4246, "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(4219, "Accessibility Help Open Help Link"))
+            title: ( localize(4247, "Accessibility Help Open Help Link"))
         });
     }
     run(accessor) {
@@ -307,7 +307,7 @@ class AccessibleViewAcceptInlineCompletionAction extends Action2 {
                     ))))
                 }
             ],
-            title: ( localize(4220, "Accept Inline Completion"))
+            title: ( localize(4248, "Accept Inline Completion"))
         });
     }
     async run(accessor) {

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

@@ -1,9 +1,9 @@
 import { Event } from "../../../../base/common/event.js";
 import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { URI } from "../../../../base/common/uri.js";
-import { IChatResponseViewModel } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatViewModel";
+import { IChatResponseViewModel } from "@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/common/chatViewModel";
 import { ChatAgentLocation } from "../common/constants.js";
-import { IChatWidget, type ICodeBlockActionContextProvider, type IQuickChatOpenOptions } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chat";
+import { IChatWidget, type ICodeBlockActionContextProvider, type IQuickChatOpenOptions } from "@codingame/monaco-vscode-7adbeffb-8051-54a9-8c9b-b62ce9e5836f-common/vscode/vs/workbench/contrib/chat/browser/chat";
 export declare const IChatWidgetService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatWidgetService>;
 export interface IChatWidgetService {
     readonly _serviceBrand: undefined;

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

@@ -1,6 +1,6 @@
 import { IDisposable } from "../../../../../base/common/lifecycle.js";
-import { ChatTreeItem, IChatCodeBlockInfo } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chat";
-import { IChatRendererContent } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatViewModel";
+import { ChatTreeItem, IChatCodeBlockInfo } from "@codingame/monaco-vscode-7adbeffb-8051-54a9-8c9b-b62ce9e5836f-common/vscode/vs/workbench/contrib/chat/browser/chat";
+import { IChatRendererContent } from "@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/common/chatViewModel";
 export interface IChatContentPart extends IDisposable {
     domNode: HTMLElement | undefined;
     codeblocksPartId?: string;
@@ -10,6 +10,8 @@ export interface IChatContentPart extends IDisposable {
 }
 export interface IChatContentPartRenderContext {
     element: ChatTreeItem;
+    elementIndex: number;
+    container: HTMLElement;
     content: ReadonlyArray<IChatRendererContent>;
     contentIndex: number;
     preceedingContentParts: ReadonlyArray<IChatContentPart>;

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

@@ -0,0 +1,8 @@
+import { IDisposable } from "../../../../base/common/lifecycle.js";
+import { IChatContextValueItem, IChatContextPickerItem } from "@codingame/monaco-vscode-f338ac19-278c-5fe1-bec8-b588de04a788-common/vscode/vs/workbench/contrib/chat/browser/chatContextPickService";
+export interface IChatContextPickService {
+    _serviceBrand: undefined;
+    items: Iterable<IChatContextValueItem | IChatContextPickerItem>;
+    registerChatContextItem(item: IChatContextValueItem | IChatContextPickerItem): IDisposable;
+}
+export declare const IChatContextPickService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatContextPickService>;

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

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

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

@@ -12,18 +12,19 @@ import { IInlineChatSessionService } from '../../../inlineChat/browser/inlineCha
 import { ModifiedFileEntryState } from '../../common/chatEditingService.js';
 import { IChatEditingService } from '../../common/chatEditingService.service.js';
 import { IChatService } from '../../common/chatService.service.js';
-import { observableFromEvent, constObservable } from '../../../../../base/common/observableInternal/utils.js';
-import { derived } from '../../../../../base/common/observableInternal/derived.js';
-import { autorun } from '../../../../../base/common/observableInternal/autorun.js';
+import { observableFromEvent } from '../../../../../base/common/observableInternal/observables/observableFromEvent.js';
+import { derived } from '../../../../../base/common/observableInternal/observables/derived.js';
+import { autorun } from '../../../../../base/common/observableInternal/reactions/autorun.js';
+import { constObservable } from '../../../../../base/common/observableInternal/observables/constObservable.js';
 
-const ctxIsGlobalEditingSession = ( new RawContextKey('chatEdits.isGlobalEditingSession', undefined, ( localize(4734, "The current editor is part of the global edit session"))));
-const ctxHasEditorModification = ( new RawContextKey('chatEdits.hasEditorModifications', undefined, ( localize(4735, "The current editor contains chat modifications"))));
-const ctxReviewModeEnabled = ( new RawContextKey('chatEdits.isReviewModeEnabled', true, ( localize(4736, "Review mode for chat changes is enabled"))));
+const ctxIsGlobalEditingSession = ( new RawContextKey('chatEdits.isGlobalEditingSession', undefined, ( localize(4776, "The current editor is part of the global edit session"))));
+const ctxHasEditorModification = ( new RawContextKey('chatEdits.hasEditorModifications', undefined, ( localize(4777, "The current editor contains chat modifications"))));
+const ctxReviewModeEnabled = ( new RawContextKey('chatEdits.isReviewModeEnabled', true, ( localize(4778, "Review mode for chat changes is enabled"))));
 const ctxHasRequestInProgress = ( new RawContextKey('chatEdits.isRequestInProgress', false, ( localize(
-    4737,
+    4779,
     "The current editor shows a file from an edit session which is still in progress"
 ))));
-const ctxRequestCount = ( new RawContextKey('chatEdits.requestCount', 0, ( localize(4738, "The number of turns the editing session in this editor has"))));
+const ctxRequestCount = ( new RawContextKey('chatEdits.requestCount', 0, ( localize(4780, "The number of turns the editing session in this editor has"))));
 let ChatEditingEditorContextKeys = class ChatEditingEditorContextKeys {
     static { this.ID = 'chat.edits.editorContextKeys'; }
     constructor(instaService, editorGroupsService) {
@@ -75,16 +76,10 @@ let ContextKeyGroup = class ContextKeyGroup {
             }
             const { session, entry } = tuple;
             const chatModel = chatService.getSession(session.chatSessionId);
-            const lastResponse = chatModel
-                ? observableFromEvent(this, chatModel.onDidChange, () => chatModel.getRequests().at(-1)?.response).read(r)
-                : undefined;
-            const isRequestInProgress = lastResponse
-                ? observableFromEvent(this, lastResponse.onDidChange, () => !lastResponse.isPendingConfirmation && !lastResponse.isComplete)
-                : constObservable(false);
             this._ctxHasEditorModification.set(entry?.state.read(r) === ModifiedFileEntryState.Modified);
             this._ctxIsGlobalEditingSession.set(session.isGlobalEditingSession);
             this._ctxReviewModeEnabled.set(entry ? entry.reviewMode.read(r) : false);
-            this._ctxHasRequestInProgress.set(isRequestInProgress.read(r));
+            this._ctxHasRequestInProgress.set(chatModel?.requestInProgressObs.read(r) ?? false);
             const requestCount = chatModel
                 ? observableFromEvent(this, chatModel.onDidChange, () => chatModel.getRequests().length)
                 : constObservable(0);

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

@@ -4,7 +4,7 @@ import { IMarkdownString } from "../../../../base/common/htmlContent.js";
 import { Disposable, IDisposable } from "../../../../base/common/lifecycle.js";
 import { ThemeIcon } from "../../../../base/common/themables.js";
 import { URI } from "../../../../base/common/uri.js";
-import { Command, ProviderResult } from "../../../../editor/common/languages.js";
+import { Command } from "../../../../editor/common/languages.js";
 import { IContextKeyService } from "../../../../platform/contextkey/common/contextkey.service.js";
 import { ExtensionIdentifier } from "../../../../platform/extensions/common/extensions.js";
 import { ILogService } from "../../../../platform/log/common/log.service.js";
@@ -13,7 +13,7 @@ import { IRequestService } from "../../../../platform/request/common/request.ser
 import { IStorageService } from "../../../../platform/storage/common/storage.service.js";
 import { IChatAgentService, type IChatAgentNameService } from "./chatAgents.service.js";
 import { IChatAgentEditedFileEvent, IChatProgressHistoryResponseContent, IChatRequestVariableData, ISerializableChatAgentData } from "./chatModel.js";
-import { IRawChatCommandContribution } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes";
+import { IRawChatCommandContribution } from "@codingame/monaco-vscode-7adbeffb-8051-54a9-8c9b-b62ce9e5836f-common/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes";
 import { IChatFollowup, IChatLocationData, IChatProgress, IChatResponseErrorDetails, IChatTaskDto } from "./chatService.js";
 import { ChatAgentLocation, ChatMode } from "./constants.js";
 export interface IChatAgentHistoryEntry {
@@ -50,11 +50,10 @@ export interface IChatWelcomeMessageContent {
     message: IMarkdownString;
 }
 export interface IChatAgentImplementation {
-    invoke(request: IChatAgentRequest, progress: (part: IChatProgress) => void, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatAgentResult>;
+    invoke(request: IChatAgentRequest, progress: (parts: IChatProgress[]) => void, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatAgentResult>;
     setRequestPaused?(requestId: string, isPaused: boolean): void;
     provideFollowups?(request: IChatAgentRequest, result: IChatAgentResult, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatFollowup[]>;
     provideChatTitle?: (history: IChatAgentHistoryEntry[], token: CancellationToken) => Promise<string | undefined>;
-    provideSampleQuestions?(location: ChatAgentLocation, token: CancellationToken): ProviderResult<IChatFollowup[] | undefined>;
 }
 export interface IChatParticipantDetectionResult {
     participant: string;
@@ -112,8 +111,8 @@ export interface IChatAgentRequest {
     acceptedConfirmationData?: any[];
     rejectedConfirmationData?: any[];
     userSelectedModelId?: string;
-    userSelectedTools?: string[];
-    userSelectedTools2?: Record<string, boolean>;
+    userSelectedTools?: Record<string, boolean>;
+    modeInstructions?: string;
     toolSelectionIsExclusive?: boolean;
     editedFileEvents?: IChatAgentEditedFileEvent[];
 }
@@ -180,7 +179,7 @@ export declare class ChatAgentService extends Disposable implements IChatAgentSe
     getAgentsByName(name: string): IChatAgentData[];
     private _preferExtensionAgents;
     agentHasDupeName(id: string): boolean;
-    invokeAgent(id: string, request: IChatAgentRequest, progress: (part: IChatProgress) => void, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatAgentResult>;
+    invokeAgent(id: string, request: IChatAgentRequest, progress: (parts: IChatProgress[]) => void, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatAgentResult>;
     setRequestPaused(id: string, requestId: string, isPaused: boolean): void;
     getFollowups(id: string, request: IChatAgentRequest, result: IChatAgentResult, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatFollowup[]>;
     getChatTitle(id: string, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<string | undefined>;
@@ -219,10 +218,9 @@ export declare class MergedChatAgent implements IChatAgent {
         description: string;
         examples: string[];
     }[];
-    invoke(request: IChatAgentRequest, progress: (part: IChatProgress) => void, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatAgentResult>;
+    invoke(request: IChatAgentRequest, progress: (parts: IChatProgress[]) => void, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatAgentResult>;
     setRequestPaused(requestId: string, isPaused: boolean): void;
     provideFollowups(request: IChatAgentRequest, result: IChatAgentResult, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatFollowup[]>;
-    provideSampleQuestions(location: ChatAgentLocation, token: CancellationToken): ProviderResult<IChatFollowup[] | undefined>;
     toJSON(): IChatAgentData;
 }
 export declare class ChatAgentNameService implements IChatAgentNameService {

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

@@ -20,7 +20,7 @@ import { StorageScope, StorageTarget } from '../../../../platform/storage/common
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 import { ChatContextKeys } from './chatContextKeys.js';
 import { ChatMode, ChatAgentLocation } from './constants.js';
-import { observableValue } from '../../../../base/common/observableInternal/base.js';
+import { observableValue } from '../../../../base/common/observableInternal/observables/observableValue.js';
 
 var ChatAgentNameService_1;
 let ChatAgentService = class ChatAgentService extends Disposable {
@@ -127,7 +127,7 @@ let ChatAgentService = class ChatAgentService extends Disposable {
             entry.impl = undefined;
             this._onDidChangeAgents.fire(undefined);
             if (entry.data.isDefault) {
-                this._hasDefaultAgent.set(false);
+                this._hasDefaultAgent.set(( Iterable.some(( this._agents.values()), agent => agent.data.isDefault)));
             }
         });
     }
@@ -241,10 +241,7 @@ let ChatAgentService = class ChatAgentService extends Disposable {
     }
     async getChatTitle(id, history, token) {
         const data = this._agents.get(id);
-        if (!data?.impl) {
-            throw ( new Error(`No activated agent with id "${id}"`));
-        }
-        if (!data.impl?.provideChatTitle) {
+        if (!data?.impl?.provideChatTitle) {
             return undefined;
         }
         return data.impl.provideChatTitle(history, token);
@@ -327,12 +324,6 @@ class MergedChatAgent {
         }
         return [];
     }
-    provideSampleQuestions(location, token) {
-        if (this.impl.provideSampleQuestions) {
-            return this.impl.provideSampleQuestions(location, token);
-        }
-        return undefined;
-    }
     toJSON() {
         return this.data;
     }

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

@@ -22,7 +22,7 @@ export interface IChatAgentService {
         command?: IChatAgentCommand;
     } | undefined>;
     hasChatParticipantDetectionProviders(): boolean;
-    invokeAgent(agent: string, request: IChatAgentRequest, progress: (part: IChatProgress) => void, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatAgentResult>;
+    invokeAgent(agent: string, request: IChatAgentRequest, progress: (parts: IChatProgress[]) => void, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatAgentResult>;
     setRequestPaused(agent: string, requestId: string, isPaused: boolean): void;
     getFollowups(id: string, request: IChatAgentRequest, result: IChatAgentResult, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<IChatFollowup[]>;
     getChatTitle(id: string, history: IChatAgentHistoryEntry[], token: CancellationToken): Promise<string | undefined>;

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

@@ -1,4 +1,5 @@
 import { RawContextKey } from "../../../../platform/contextkey/common/contextkey.js";
+import { ViewContainerLocation } from "../../../common/views.js";
 import { ChatAgentLocation, ChatMode } from "./constants.js";
 export declare namespace ChatContextKeys {
     const responseVote: RawContextKey<string>;
@@ -38,11 +39,12 @@ export declare namespace ChatContextKeys {
         hidden: RawContextKey<boolean>;
         installed: RawContextKey<boolean>;
         disabled: RawContextKey<boolean>;
+        later: RawContextKey<boolean>;
     };
     const Entitlement: {
         signedOut: RawContextKey<boolean>;
         canSignUp: RawContextKey<boolean>;
-        limited: RawContextKey<boolean>;
+        free: RawContextKey<boolean>;
         pro: RawContextKey<boolean>;
         proPlus: RawContextKey<boolean>;
         business: RawContextKey<boolean>;
@@ -57,6 +59,10 @@ export declare namespace ChatContextKeys {
     const Tools: {
         toolsCount: RawContextKey<number>;
     };
+    const Modes: {
+        hasCustomChatModes: RawContextKey<boolean>;
+    };
+    const panelLocation: RawContextKey<ViewContainerLocation>;
 }
 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,88 +11,88 @@ var ChatContextKeys;
         'chatSessionResponseVote',
         '',
         { type: 'string', description: ( localize(
-            5005,
+            5108,
             "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(5006, "When the agent or command was automatically detected")) }
+        { type: 'boolean', description: ( localize(5109, "When the agent or command was automatically detected")) }
     ));
     ChatContextKeys.responseSupportsIssueReporting = ( new RawContextKey(
         'chatResponseSupportsIssueReporting',
         false,
-        { type: 'boolean', description: ( localize(5007, "True when the current chat response supports issue reporting.")) }
+        { type: 'boolean', description: ( localize(5110, "True when the current chat response supports issue reporting.")) }
     ));
     ChatContextKeys.responseIsFiltered = ( new RawContextKey(
         'chatSessionResponseFiltered',
         false,
-        { type: 'boolean', description: ( localize(5008, "True when the chat response was filtered out by the server.")) }
+        { type: 'boolean', description: ( localize(5111, "True when the chat response was filtered out by the server.")) }
     ));
     ChatContextKeys.responseHasError = ( new RawContextKey(
         'chatSessionResponseError',
         false,
-        { type: 'boolean', description: ( localize(5009, "True when the chat response resulted in an error.")) }
+        { type: 'boolean', description: ( localize(5112, "True when the chat response resulted in an error.")) }
     ));
     ChatContextKeys.requestInProgress = ( new RawContextKey(
         'chatSessionRequestInProgress',
         false,
-        { type: 'boolean', description: ( localize(5010, "True when the current request is still in progress.")) }
+        { type: 'boolean', description: ( localize(5113, "True when the current request is still in progress.")) }
     ));
     ChatContextKeys.isRequestPaused = ( new RawContextKey(
         'chatRequestIsPaused',
         false,
-        { type: 'boolean', description: ( localize(5011, "True when the current request is paused.")) }
+        { type: 'boolean', description: ( localize(5114, "True when the current request is paused.")) }
     ));
     ChatContextKeys.canRequestBePaused = ( new RawContextKey(
         'chatCanRequestBePaused',
         false,
-        { type: 'boolean', description: ( localize(5012, "True when the current request can be paused.")) }
-    ));
-    ChatContextKeys.isResponse = ( new RawContextKey('chatResponse', false, { type: 'boolean', description: ( localize(5013, "The chat item is a response.")) }));
-    ChatContextKeys.isRequest = ( new RawContextKey('chatRequest', false, { type: 'boolean', description: ( localize(5014, "The chat item is a request")) }));
-    ChatContextKeys.itemId = ( new RawContextKey('chatItemId', '', { type: 'string', description: ( localize(5015, "The id of the chat item.")) }));
-    ChatContextKeys.lastItemId = ( new RawContextKey('chatLastItemId', [], { type: 'string', description: ( localize(5016, "The id of the last chat item.")) }));
-    ChatContextKeys.editApplied = ( new RawContextKey('chatEditApplied', false, { type: 'boolean', description: ( localize(5017, "True when the chat text edits have been applied.")) }));
-    ChatContextKeys.inputHasText = ( new RawContextKey('chatInputHasText', false, { type: 'boolean', description: ( localize(5018, "True when the chat input has text.")) }));
-    ChatContextKeys.inputHasFocus = ( new RawContextKey('chatInputHasFocus', false, { type: 'boolean', description: ( localize(5019, "True when the chat input has focus.")) }));
-    ChatContextKeys.inChatInput = ( new RawContextKey('inChatInput', false, { type: 'boolean', description: ( localize(5020, "True when focus is in the chat input, false otherwise.")) }));
-    ChatContextKeys.inChatSession = ( new RawContextKey('inChat', false, { type: 'boolean', description: ( localize(5021, "True when focus is in the chat widget, false otherwise.")) }));
+        { type: 'boolean', description: ( localize(5115, "True when the current request can be paused.")) }
+    ));
+    ChatContextKeys.isResponse = ( new RawContextKey('chatResponse', false, { type: 'boolean', description: ( localize(5116, "The chat item is a response.")) }));
+    ChatContextKeys.isRequest = ( new RawContextKey('chatRequest', false, { type: 'boolean', description: ( localize(5117, "The chat item is a request")) }));
+    ChatContextKeys.itemId = ( new RawContextKey('chatItemId', '', { type: 'string', description: ( localize(5118, "The id of the chat item.")) }));
+    ChatContextKeys.lastItemId = ( new RawContextKey('chatLastItemId', [], { type: 'string', description: ( localize(5119, "The id of the last chat item.")) }));
+    ChatContextKeys.editApplied = ( new RawContextKey('chatEditApplied', false, { type: 'boolean', description: ( localize(5120, "True when the chat text edits have been applied.")) }));
+    ChatContextKeys.inputHasText = ( new RawContextKey('chatInputHasText', false, { type: 'boolean', description: ( localize(5121, "True when the chat input has text.")) }));
+    ChatContextKeys.inputHasFocus = ( new RawContextKey('chatInputHasFocus', false, { type: 'boolean', description: ( localize(5122, "True when the chat input has focus.")) }));
+    ChatContextKeys.inChatInput = ( new RawContextKey('inChatInput', false, { type: 'boolean', description: ( localize(5123, "True when focus is in the chat input, false otherwise.")) }));
+    ChatContextKeys.inChatSession = ( new RawContextKey('inChat', false, { type: 'boolean', description: ( localize(5124, "True when focus is in the chat widget, false otherwise.")) }));
     ChatContextKeys.hasPromptFile = ( new RawContextKey(
         'chatPromptFileAttached',
         false,
-        { type: 'boolean', description: ( localize(5022, "True when the chat has a prompt file attached.")) }
+        { type: 'boolean', description: ( localize(5125, "True when the chat has a prompt file attached.")) }
     ));
-    ChatContextKeys.chatMode = ( new RawContextKey('chatMode', ChatMode.Ask, { type: 'string', description: ( localize(5023, "The current chat mode.")) }));
-    ChatContextKeys.supported = ( ContextKeyExpr.or(( IsWebContext.negate()), ( RemoteNameContext.notEqualsTo(''))));
+    ChatContextKeys.chatMode = ( new RawContextKey('chatMode', ChatMode.Ask, { type: 'string', description: ( localize(5126, "The current chat mode.")) }));
+    ChatContextKeys.supported = ( ContextKeyExpr.or(( IsWebContext.negate()), ( RemoteNameContext.notEqualsTo('')), ( ContextKeyExpr.has('config.chat.experimental.serverlessWebEnabled'))));
     ChatContextKeys.enabled = ( new RawContextKey('chatIsEnabled', false, { type: 'boolean', description: ( localize(
-        5024,
+        5127,
         "True when chat is enabled because a default chat participant is activated with an implementation."
     )) }));
     ChatContextKeys.extensionParticipantRegistered = ( new RawContextKey(
         'chatPanelExtensionParticipantRegistered',
         false,
         { type: 'boolean', description: ( localize(
-            5025,
+            5128,
             "True when a default chat participant is registered for the panel from an extension."
         )) }
     ));
     ChatContextKeys.panelParticipantRegistered = ( new RawContextKey(
         'chatPanelParticipantRegistered',
         false,
-        { type: 'boolean', description: ( localize(5026, "True when a default chat participant is registered for the panel.")) }
+        { type: 'boolean', description: ( localize(5129, "True when a default chat participant is registered for the panel.")) }
     ));
     ChatContextKeys.editingParticipantRegistered = ( new RawContextKey(
         'chatEditingParticipantRegistered',
         false,
-        { type: 'boolean', description: ( localize(5027, "True when a default chat participant is registered for editing.")) }
+        { type: 'boolean', description: ( localize(5130, "True when a default chat participant is registered for editing.")) }
     ));
     ChatContextKeys.chatEditingCanUndo = ( new RawContextKey(
         'chatEditingCanUndo',
         false,
         { type: 'boolean', description: ( localize(
-            5028,
+            5131,
             "True when it is possible to undo an interaction in the editing panel."
         )) }
     ));
@@ -100,7 +100,7 @@ var ChatContextKeys;
         'chatEditingCanRedo',
         false,
         { type: 'boolean', description: ( localize(
-            5029,
+            5132,
             "True when it is possible to redo an interaction in the editing panel."
         )) }
     ));
@@ -108,33 +108,34 @@ var ChatContextKeys;
         'chatExtensionInvalid',
         false,
         { type: 'boolean', description: ( localize(
-            5030,
+            5133,
             "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(5031, "True when the quick chat UI has focus, false otherwise.")) }));
+    ChatContextKeys.inQuickChat = ( new RawContextKey('quickChatHasFocus', false, { type: 'boolean', description: ( localize(5134, "True when the quick chat UI has focus, false otherwise.")) }));
     ChatContextKeys.hasFileAttachments = ( new RawContextKey(
         'chatHasFileAttachments',
         false,
-        { type: 'boolean', description: ( localize(5032, "True when the chat has file attachments.")) }
+        { type: 'boolean', description: ( localize(5135, "True when the chat has file attachments.")) }
     ));
     ChatContextKeys.languageModelsAreUserSelectable = ( new RawContextKey(
         'chatModelsAreUserSelectable',
         false,
-        { type: 'boolean', description: ( localize(5033, "True when the chat model can be selected manually by the user.")) }
+        { type: 'boolean', description: ( localize(5136, "True when the chat model can be selected manually by the user.")) }
     ));
     ChatContextKeys.Setup = {
         hidden: ( new RawContextKey('chatSetupHidden', false, true)),
         installed: ( new RawContextKey('chatSetupInstalled', false, true)),
-        disabled: ( new RawContextKey('chatSetupDisabled', false, true))
+        disabled: ( new RawContextKey('chatSetupDisabled', false, true)),
+        later: ( new RawContextKey('chatSetupLater', false, true))
     };
     ChatContextKeys.Entitlement = {
-        signedOut: ( new RawContextKey('chatSetupSignedOut', false, true)),
+        signedOut: ( new RawContextKey('chatEntitlementSignedOut', false, true)),
         canSignUp: ( new RawContextKey('chatPlanCanSignUp', false, true)),
-        limited: ( new RawContextKey('chatPlanLimited', 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)),
@@ -146,17 +147,29 @@ var ChatContextKeys;
         agentModeDisallowed: ( new RawContextKey(
             'chatAgentModeDisallowed',
             undefined,
-            { type: 'boolean', description: ( localize(5034, "True when agent mode is not allowed.")) }
+            { type: 'boolean', description: ( localize(5137, "True when agent mode is not allowed.")) }
         )),
         hasToolConfirmation: ( new RawContextKey(
             'chatHasToolConfirmation',
             false,
-            { type: 'boolean', description: ( localize(5035, "True when a tool confirmation is present.")) }
+            { type: 'boolean', description: ( localize(5138, "True when a tool confirmation is present.")) }
         )),
     };
     ChatContextKeys.Tools = {
-        toolsCount: ( new RawContextKey('toolsCount', 0, { type: 'number', description: ( localize(5036, "The count of tools available in the chat.")) }))
+        toolsCount: ( new RawContextKey('toolsCount', 0, { type: 'number', description: ( localize(5139, "The count of tools available in the chat.")) }))
     };
+    ChatContextKeys.Modes = {
+        hasCustomChatModes: ( new RawContextKey(
+            'chatHasCustomChatModes',
+            false,
+            { type: 'boolean', description: ( localize(5140, "True when the chat has custom chat modes available.")) }
+        )),
+    };
+    ChatContextKeys.panelLocation = ( new RawContextKey(
+        'chatPanelLocation',
+        undefined,
+        { type: 'number', description: ( localize(5141, "The location of the chat panel.")) }
+    ));
 })(ChatContextKeys || (ChatContextKeys = {}));
 var ChatContextKeyExprs;
 (function (ChatContextKeyExprs) {

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

@@ -28,9 +28,9 @@ export interface WorkingSetDisplayMetadata {
     description?: string;
 }
 export interface IStreamingEdits {
-    pushText(edits: TextEdit[]): void;
-    pushNotebookCellText(cell: URI, edits: TextEdit[]): void;
-    pushNotebook(edits: ICellEditOperation[]): void;
+    pushText(edits: TextEdit[], isLastEdits: boolean): void;
+    pushNotebookCellText(cell: URI, edits: TextEdit[], isLastEdits: boolean): void;
+    pushNotebook(edits: ICellEditOperation[], isLastEdits: boolean): void;
     complete(): void;
 }
 export declare const chatEditingSnapshotScheme = "chat-editing-snapshot-text-model";
@@ -92,6 +92,7 @@ export interface IModifiedFileEntry {
     readonly isCurrentlyBeingModifiedBy: IObservable<IChatResponseModel | undefined>;
     readonly lastModifyingResponse: IObservable<IChatResponseModel | undefined>;
     readonly rewriteRatio: IObservable<number>;
+    readonly waitsForLastEdits: IObservable<boolean>;
     accept(transaction: ITransaction | undefined): Promise<void>;
     reject(transaction: ITransaction | undefined): Promise<void>;
     reviewMode: IObservable<boolean>;

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

@@ -18,9 +18,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(5037, "The current state of the file in the chat editing widget"))));
+const chatEditingWidgetFileStateContextKey = ( new RawContextKey('chatEditingWidgetFileState', undefined, ( localize(5142, "The current state of the file in the chat editing widget"))));
 const chatEditingAgentSupportsReadonlyReferencesContextKey = ( new RawContextKey('chatEditingAgentSupportsReadonlyReferences', undefined, ( localize(
-    5038,
+    5143,
     "Whether the chat editing agent supports readonly references (temporary)"
 ))));
 const decidedChatEditingResourceContextKey = ( new RawContextKey('decidedChatEditingResource', []));

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

@@ -1,6 +1,6 @@
 import { CancellationToken } from "../../../../base/common/cancellation.js";
 import { Event } from "../../../../base/common/event.js";
-import { ChatEntitlement, IQuotas, ChatSentiment } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatEntitlementService";
+import { ChatEntitlement, IQuotas, IChatSentiment } from "@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/common/chatEntitlementService";
 export declare const IChatEntitlementService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatEntitlementService>;
 export interface IChatEntitlementService {
     _serviceBrand: undefined;
@@ -11,5 +11,5 @@ export interface IChatEntitlementService {
     readonly quotas: IQuotas;
     update(token: CancellationToken): Promise<void>;
     readonly onDidChangeSentiment: Event<void>;
-    readonly sentiment: ChatSentiment;
+    readonly sentiment: IChatSentiment;
 }