@codingame/monaco-vscode-api 16.1.0 → 17.0.0

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

@@ -3,7 +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 { ChatMode, ChatConfiguration, ChatAgentLocation } from './constants.js';
+import { ChatMode } from './constants.js';
 
 var ChatContextKeys;
 (function (ChatContextKeys) {
@@ -11,81 +11,88 @@ var ChatContextKeys;
         'chatSessionResponseVote',
         '',
         { type: 'string', description: ( localize(
-            4934,
+            5005,
             "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(4935, "When the agent or command was automatically detected")) }
+        { type: 'boolean', description: ( localize(5006, "When the agent or command was automatically detected")) }
     ));
     ChatContextKeys.responseSupportsIssueReporting = ( new RawContextKey(
         'chatResponseSupportsIssueReporting',
         false,
-        { type: 'boolean', description: ( localize(4936, "True when the current chat response supports issue reporting.")) }
+        { type: 'boolean', description: ( localize(5007, "True when the current chat response supports issue reporting.")) }
     ));
     ChatContextKeys.responseIsFiltered = ( new RawContextKey(
         'chatSessionResponseFiltered',
         false,
-        { type: 'boolean', description: ( localize(4937, "True when the chat response was filtered out by the server.")) }
+        { type: 'boolean', description: ( localize(5008, "True when the chat response was filtered out by the server.")) }
     ));
     ChatContextKeys.responseHasError = ( new RawContextKey(
         'chatSessionResponseError',
         false,
-        { type: 'boolean', description: ( localize(4938, "True when the chat response resulted in an error.")) }
+        { type: 'boolean', description: ( localize(5009, "True when the chat response resulted in an error.")) }
     ));
     ChatContextKeys.requestInProgress = ( new RawContextKey(
         'chatSessionRequestInProgress',
         false,
-        { type: 'boolean', description: ( localize(4939, "True when the current request is still in progress.")) }
+        { type: 'boolean', description: ( localize(5010, "True when the current request is still in progress.")) }
     ));
     ChatContextKeys.isRequestPaused = ( new RawContextKey(
         'chatRequestIsPaused',
         false,
-        { type: 'boolean', description: ( localize(4940, "True when the current request is paused.")) }
+        { type: 'boolean', description: ( localize(5011, "True when the current request is paused.")) }
     ));
     ChatContextKeys.canRequestBePaused = ( new RawContextKey(
         'chatCanRequestBePaused',
         false,
-        { type: 'boolean', description: ( localize(4941, "True when the current request can be paused.")) }
-    ));
-    ChatContextKeys.isResponse = ( new RawContextKey('chatResponse', false, { type: 'boolean', description: ( localize(4942, "The chat item is a response.")) }));
-    ChatContextKeys.isRequest = ( new RawContextKey('chatRequest', false, { type: 'boolean', description: ( localize(4943, "The chat item is a request")) }));
-    ChatContextKeys.itemId = ( new RawContextKey('chatItemId', '', { type: 'string', description: ( localize(4944, "The id of the chat item.")) }));
-    ChatContextKeys.lastItemId = ( new RawContextKey('chatLastItemId', [], { type: 'string', description: ( localize(4945, "The id of the last chat item.")) }));
-    ChatContextKeys.editApplied = ( new RawContextKey('chatEditApplied', false, { type: 'boolean', description: ( localize(4946, "True when the chat text edits have been applied.")) }));
-    ChatContextKeys.inputHasText = ( new RawContextKey('chatInputHasText', false, { type: 'boolean', description: ( localize(4947, "True when the chat input has text.")) }));
-    ChatContextKeys.inputHasFocus = ( new RawContextKey('chatInputHasFocus', false, { type: 'boolean', description: ( localize(4948, "True when the chat input has focus.")) }));
-    ChatContextKeys.inChatInput = ( new RawContextKey('inChatInput', false, { type: 'boolean', description: ( localize(4949, "True when focus is in the chat input, false otherwise.")) }));
-    ChatContextKeys.inChatSession = ( new RawContextKey('inChat', false, { type: 'boolean', description: ( localize(4950, "True when focus is in the chat widget, false otherwise.")) }));
-    ChatContextKeys.inUnifiedChat = ( new RawContextKey('inUnifiedChat', false, { type: 'boolean', description: ( localize(4951, "True when focus is in the unified chat widget, false otherwise.")) }));
-    ChatContextKeys.instructionsAttached = ( new RawContextKey(
-        'chatInstructionsAttached',
-        false,
-        { type: 'boolean', description: ( localize(4952, "True when the chat has a prompt instructions attached.")) }
-    ));
-    ChatContextKeys.chatMode = ( new RawContextKey('chatMode', ChatMode.Ask, { type: 'string', description: ( localize(4953, "The current chat mode.")) }));
-    ChatContextKeys.supported = ( ContextKeyExpr.or(( IsWebContext.toNegated()), ( RemoteNameContext.notEqualsTo(''))));
+        { 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.")) }));
+    ChatContextKeys.hasPromptFile = ( new RawContextKey(
+        'chatPromptFileAttached',
+        false,
+        { type: 'boolean', description: ( localize(5022, "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.enabled = ( new RawContextKey('chatIsEnabled', false, { type: 'boolean', description: ( localize(
-        4954,
+        5024,
         "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,
+            "True when a default chat participant is registered for the panel from an extension."
+        )) }
+    ));
     ChatContextKeys.panelParticipantRegistered = ( new RawContextKey(
         'chatPanelParticipantRegistered',
         false,
-        { type: 'boolean', description: ( localize(4955, "True when a default chat participant is registered for the panel.")) }
+        { type: 'boolean', description: ( localize(5026, "True when a default chat participant is registered for the panel.")) }
     ));
     ChatContextKeys.editingParticipantRegistered = ( new RawContextKey(
         'chatEditingParticipantRegistered',
         false,
-        { type: 'boolean', description: ( localize(4956, "True when a default chat participant is registered for editing.")) }
+        { type: 'boolean', description: ( localize(5027, "True when a default chat participant is registered for editing.")) }
     ));
     ChatContextKeys.chatEditingCanUndo = ( new RawContextKey(
         'chatEditingCanUndo',
         false,
         { type: 'boolean', description: ( localize(
-            4957,
+            5028,
             "True when it is possible to undo an interaction in the editing panel."
         )) }
     ));
@@ -93,7 +100,7 @@ var ChatContextKeys;
         'chatEditingCanRedo',
         false,
         { type: 'boolean', description: ( localize(
-            4958,
+            5029,
             "True when it is possible to redo an interaction in the editing panel."
         )) }
     ));
@@ -101,63 +108,58 @@ var ChatContextKeys;
         'chatExtensionInvalid',
         false,
         { type: 'boolean', description: ( localize(
-            4959,
+            5030,
             "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(4960, "True when the quick chat UI has focus, false otherwise.")) }));
+    ChatContextKeys.inQuickChat = ( new RawContextKey('quickChatHasFocus', false, { type: 'boolean', description: ( localize(5031, "True when the quick chat UI has focus, false otherwise.")) }));
     ChatContextKeys.hasFileAttachments = ( new RawContextKey(
         'chatHasFileAttachments',
         false,
-        { type: 'boolean', description: ( localize(4961, "True when the chat has file attachments.")) }
+        { type: 'boolean', description: ( localize(5032, "True when the chat has file attachments.")) }
     ));
     ChatContextKeys.languageModelsAreUserSelectable = ( new RawContextKey(
         'chatModelsAreUserSelectable',
         false,
-        { type: 'boolean', description: ( localize(4962, "True when the chat model can be selected manually by the user.")) }
+        { type: 'boolean', description: ( localize(5033, "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)),
-        fromDialog: ( ContextKeyExpr.has('config.chat.setupFromDialog')),
+        disabled: ( new RawContextKey('chatSetupDisabled', false, true))
     };
     ChatContextKeys.Entitlement = {
         signedOut: ( new RawContextKey('chatSetupSignedOut', false, true)),
         canSignUp: ( new RawContextKey('chatPlanCanSignUp', false, true)),
         limited: ( new RawContextKey('chatPlanLimited', false, true)),
-        pro: ( new RawContextKey('chatPlanPro', 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))
     };
-    ChatContextKeys.SetupViewKeys = ( new Set(
-        [ChatContextKeys.Setup.hidden.key, ChatContextKeys.Setup.installed.key, ChatContextKeys.Entitlement.signedOut.key, ChatContextKeys.Entitlement.canSignUp.key, ...( ChatContextKeys.Setup.fromDialog.keys())]
-    ));
-    ChatContextKeys.SetupViewCondition = ( ContextKeyExpr.and(( ChatContextKeys.Setup.fromDialog.negate()), ( ContextKeyExpr.or(( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.installed.negate()))), ( ContextKeyExpr.and(ChatContextKeys.Entitlement.canSignUp, ChatContextKeys.Setup.installed)), ( ContextKeyExpr.and(ChatContextKeys.Entitlement.signedOut, ChatContextKeys.Setup.installed))))));
     ChatContextKeys.chatQuotaExceeded = ( new RawContextKey('chatQuotaExceeded', false, true));
     ChatContextKeys.completionsQuotaExceeded = ( new RawContextKey('completionsQuotaExceeded', false, true));
     ChatContextKeys.Editing = {
-        hasToolsAgent: ( new RawContextKey('chatHasToolsAgent', false, { type: 'boolean', description: ( localize(4963, "True when a tools agent is registered.")) })),
         agentModeDisallowed: ( new RawContextKey(
             'chatAgentModeDisallowed',
             undefined,
-            { type: 'boolean', description: ( localize(4964, "True when agent mode is not allowed.")) }
+            { type: 'boolean', description: ( localize(5034, "True when agent mode is not allowed.")) }
         )),
         hasToolConfirmation: ( new RawContextKey(
             'chatHasToolConfirmation',
             false,
-            { type: 'boolean', description: ( localize(4965, "True when a tool confirmation is present.")) }
+            { type: 'boolean', description: ( localize(5035, "True when a tool confirmation is present.")) }
         )),
     };
     ChatContextKeys.Tools = {
-        toolsCount: ( new RawContextKey('toolsCount', 0, { type: 'number', description: ( localize(4966, "The count of tools available in the chat.")) }))
+        toolsCount: ( new RawContextKey('toolsCount', 0, { type: 'number', description: ( localize(5036, "The count of tools available in the chat.")) }))
     };
 })(ChatContextKeys || (ChatContextKeys = {}));
 var ChatContextKeyExprs;
 (function (ChatContextKeyExprs) {
-    ChatContextKeyExprs.unifiedChatEnabled = ( ContextKeyExpr.has(`config.${ChatConfiguration.UnifiedChatView}`));
-    ChatContextKeyExprs.inEditsOrUnified = ( ContextKeyExpr.or(( ChatContextKeys.location.isEqualTo(ChatAgentLocation.EditingSession)), ChatContextKeys.inUnifiedChat));
-    ChatContextKeyExprs.inNonUnifiedPanel = ( ContextKeyExpr.and(( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Panel)), ( ChatContextKeys.inUnifiedChat.negate())));
     ChatContextKeyExprs.inEditingMode = ( ContextKeyExpr.or(( ChatContextKeys.chatMode.isEqualTo(ChatMode.Edit)), ( ChatContextKeys.chatMode.isEqualTo(ChatMode.Agent))));
 })(ChatContextKeyExprs || (ChatContextKeyExprs = {}));
 

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

@@ -7,7 +7,7 @@ import { TextEdit } from "../../../../editor/common/languages.js";
 import { RawContextKey } from "../../../../platform/contextkey/common/contextkey.js";
 import { IEditorPane } from "../../../common/editor.js";
 import { ICellEditOperation } from "../../notebook/common/notebookCommon.js";
-import { IChatResponseModel } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IChatResponseModel } from "./chatModel.js";
 export interface IChatRequestDraft {
     readonly prompt: string;
     readonly files: readonly URI[];
@@ -24,7 +24,7 @@ export interface IChatRelatedFilesProvider {
     provideRelatedFiles(chatRequest: IChatRequestDraft, token: CancellationToken): Promise<IChatRelatedFile[] | undefined>;
 }
 export interface WorkingSetDisplayMetadata {
-    state: WorkingSetEntryState;
+    state: ModifiedFileEntryState;
     description?: string;
 }
 export interface IStreamingEdits {
@@ -37,12 +37,11 @@ export declare const chatEditingSnapshotScheme = "chat-editing-snapshot-text-mod
 export interface IChatEditingSession extends IDisposable {
     readonly isGlobalEditingSession: boolean;
     readonly chatSessionId: string;
-    readonly onDidChange: Event<ChatEditingSessionChangeType>;
     readonly onDidDispose: Event<void>;
     readonly state: IObservable<ChatEditingSessionState>;
     readonly entries: IObservable<readonly IModifiedFileEntry[]>;
-    show(): Promise<void>;
-    remove(reason: WorkingSetEntryRemovalReason, ...uris: URI[]): void;
+    show(previousChanges?: boolean): Promise<void>;
+    remove(...uris: URI[]): void;
     accept(...uris: URI[]): Promise<void>;
     reject(...uris: URI[]): Promise<void>;
     getEntry(uri: URI): IModifiedFileEntry | undefined;
@@ -51,7 +50,7 @@ export interface IChatEditingSession extends IDisposable {
     getSnapshotUri(requestId: string, uri: URI, stopId: string | undefined): URI | undefined;
     stop(clearState?: boolean): Promise<void>;
     startStreamingEdits(resource: URI, responseModel: IChatResponseModel, inUndoStop: string | undefined): IStreamingEdits;
-    getEntryDiffBetweenStops(uri: URI, requestId: string, stopId: string | undefined): IObservable<IEditSessionEntryDiff | undefined> | undefined;
+    getEntryDiffBetweenStops(uri: URI, requestId: string | undefined, stopId: string | undefined): IObservable<IEditSessionEntryDiff | undefined> | undefined;
     readonly canUndo: IObservable<boolean>;
     readonly canRedo: IObservable<boolean>;
     undoInteraction(): Promise<void>;
@@ -65,21 +64,10 @@ export interface IEditSessionEntryDiff {
     added: number;
     removed: number;
 }
-export declare enum WorkingSetEntryRemovalReason {
-    User = 0,
-    Programmatic = 1
-}
-export declare enum WorkingSetEntryState {
+export declare enum ModifiedFileEntryState {
     Modified = 0,
     Accepted = 1,
-    Rejected = 2,
-    Transient = 3,
-    Attached = 4,
-    Sent = 5
-}
-export declare enum ChatEditingSessionChangeType {
-    WorkingSet = 0,
-    Other = 1
+    Rejected = 2
 }
 export interface IModifiedFileEntryChangeHunk {
     accept(): Promise<boolean>;
@@ -87,21 +75,22 @@ export interface IModifiedFileEntryChangeHunk {
 }
 export interface IModifiedFileEntryEditorIntegration extends IDisposable {
     currentIndex: IObservable<number>;
-    reveal(firstOrLast: boolean): void;
+    reveal(firstOrLast: boolean, preserveFocus?: boolean): void;
     next(wrap: boolean): boolean;
     previous(wrap: boolean): boolean;
     enableAccessibleDiffView(): void;
-    acceptNearestChange(change: IModifiedFileEntryChangeHunk): void;
-    rejectNearestChange(change: IModifiedFileEntryChangeHunk): void;
-    toggleDiff(change: IModifiedFileEntryChangeHunk | undefined): Promise<void>;
+    acceptNearestChange(change?: IModifiedFileEntryChangeHunk): Promise<void>;
+    rejectNearestChange(change?: IModifiedFileEntryChangeHunk): Promise<void>;
+    toggleDiff(change: IModifiedFileEntryChangeHunk | undefined, show?: boolean): Promise<void>;
 }
 export interface IModifiedFileEntry {
     readonly entryId: string;
     readonly originalURI: URI;
     readonly modifiedURI: URI;
     readonly lastModifyingRequestId: string;
-    readonly state: IObservable<WorkingSetEntryState>;
+    readonly state: IObservable<ModifiedFileEntryState>;
     readonly isCurrentlyBeingModifiedBy: IObservable<IChatResponseModel | undefined>;
+    readonly lastModifyingResponse: IObservable<IChatResponseModel | undefined>;
     readonly rewriteRatio: IObservable<number>;
     accept(transaction: ITransaction | undefined): Promise<void>;
     reject(transaction: ITransaction | undefined): Promise<void>;
@@ -126,7 +115,7 @@ export declare enum ChatEditingSessionState {
     Disposed = 3
 }
 export declare const CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME = "chat-editing-multi-diff-source";
-export declare const chatEditingWidgetFileStateContextKey: RawContextKey<WorkingSetEntryState>;
+export declare const chatEditingWidgetFileStateContextKey: RawContextKey<ModifiedFileEntryState>;
 export declare const chatEditingAgentSupportsReadonlyReferencesContextKey: RawContextKey<boolean>;
 export declare const decidedChatEditingResourceContextKey: RawContextKey<string[]>;
 export declare const chatEditingResourceContextKey: RawContextKey<string | undefined>;
@@ -144,4 +133,8 @@ export interface IChatEditingActionContext {
     sessionId: string;
 }
 export declare function isChatEditingActionContext(thing: unknown): thing is IChatEditingActionContext;
-export declare function getMultiDiffSourceUri(session: IChatEditingSession): URI;
+export declare function getMultiDiffSourceUri(session: IChatEditingSession, showPreviousChanges?: boolean): URI;
+export declare function parseChatMultiDiffUri(uri: URI): {
+    chatSessionId: string;
+    showPreviousChanges: boolean;
+};

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

@@ -4,25 +4,12 @@ import { localize } from '../../../../nls.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 
 const chatEditingSnapshotScheme = 'chat-editing-snapshot-text-model';
-var WorkingSetEntryRemovalReason;
-(function (WorkingSetEntryRemovalReason) {
-    WorkingSetEntryRemovalReason[WorkingSetEntryRemovalReason["User"] = 0] = "User";
-    WorkingSetEntryRemovalReason[WorkingSetEntryRemovalReason["Programmatic"] = 1] = "Programmatic";
-})(WorkingSetEntryRemovalReason || (WorkingSetEntryRemovalReason = {}));
-var WorkingSetEntryState;
-(function (WorkingSetEntryState) {
-    WorkingSetEntryState[WorkingSetEntryState["Modified"] = 0] = "Modified";
-    WorkingSetEntryState[WorkingSetEntryState["Accepted"] = 1] = "Accepted";
-    WorkingSetEntryState[WorkingSetEntryState["Rejected"] = 2] = "Rejected";
-    WorkingSetEntryState[WorkingSetEntryState["Transient"] = 3] = "Transient";
-    WorkingSetEntryState[WorkingSetEntryState["Attached"] = 4] = "Attached";
-    WorkingSetEntryState[WorkingSetEntryState["Sent"] = 5] = "Sent";
-})(WorkingSetEntryState || (WorkingSetEntryState = {}));
-var ChatEditingSessionChangeType;
-(function (ChatEditingSessionChangeType) {
-    ChatEditingSessionChangeType[ChatEditingSessionChangeType["WorkingSet"] = 0] = "WorkingSet";
-    ChatEditingSessionChangeType[ChatEditingSessionChangeType["Other"] = 1] = "Other";
-})(ChatEditingSessionChangeType || (ChatEditingSessionChangeType = {}));
+var ModifiedFileEntryState;
+(function (ModifiedFileEntryState) {
+    ModifiedFileEntryState[ModifiedFileEntryState["Modified"] = 0] = "Modified";
+    ModifiedFileEntryState[ModifiedFileEntryState["Accepted"] = 1] = "Accepted";
+    ModifiedFileEntryState[ModifiedFileEntryState["Rejected"] = 2] = "Rejected";
+})(ModifiedFileEntryState || (ModifiedFileEntryState = {}));
 var ChatEditingSessionState;
 (function (ChatEditingSessionState) {
     ChatEditingSessionState[ChatEditingSessionState["Initial"] = 0] = "Initial";
@@ -31,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(4967, "The current state of the file in the chat editing widget"))));
+const chatEditingWidgetFileStateContextKey = ( new RawContextKey('chatEditingWidgetFileState', undefined, ( localize(5037, "The current state of the file in the chat editing widget"))));
 const chatEditingAgentSupportsReadonlyReferencesContextKey = ( new RawContextKey('chatEditingAgentSupportsReadonlyReferences', undefined, ( localize(
-    4968,
+    5038,
     "Whether the chat editing agent supports readonly references (temporary)"
 ))));
 const decidedChatEditingResourceContextKey = ( new RawContextKey('decidedChatEditingResource', []));
@@ -50,11 +37,17 @@ var ChatEditKind;
 function isChatEditingActionContext(thing) {
     return typeof thing === 'object' && !!thing && 'sessionId' in thing;
 }
-function getMultiDiffSourceUri(session) {
+function getMultiDiffSourceUri(session, showPreviousChanges) {
     return ( URI.from({
         scheme: CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME,
         authority: session.chatSessionId,
+        query: showPreviousChanges ? 'previous' : undefined,
     }));
 }
+function parseChatMultiDiffUri(uri) {
+    const chatSessionId = uri.authority;
+    const showPreviousChanges = uri.query === 'previous';
+    return { chatSessionId, showPreviousChanges };
+}
 
-export { CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME, ChatEditKind, ChatEditingSessionChangeType, ChatEditingSessionState, WorkingSetEntryRemovalReason, WorkingSetEntryState, applyingChatEditsFailedContextKey, chatEditingAgentSupportsReadonlyReferencesContextKey, chatEditingResourceContextKey, chatEditingSnapshotScheme, chatEditingWidgetFileStateContextKey, decidedChatEditingResourceContextKey, getMultiDiffSourceUri, hasAppliedChatEditsContextKey, hasUndecidedChatEditingResourceContextKey, inChatEditingSessionContextKey, isChatEditingActionContext };
+export { CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME, ChatEditKind, ChatEditingSessionState, ModifiedFileEntryState, applyingChatEditsFailedContextKey, chatEditingAgentSupportsReadonlyReferencesContextKey, chatEditingResourceContextKey, chatEditingSnapshotScheme, chatEditingWidgetFileStateContextKey, decidedChatEditingResourceContextKey, getMultiDiffSourceUri, hasAppliedChatEditsContextKey, hasUndecidedChatEditingResourceContextKey, inChatEditingSessionContextKey, isChatEditingActionContext, parseChatMultiDiffUri };

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

@@ -3,7 +3,7 @@ import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { IObservable } from "../../../../base/common/observable.js";
 import { URI } from "../../../../base/common/uri.js";
 import { IChatEditingSession, IChatRelatedFilesProvider, IChatRelatedFile } from "./chatEditingService.js";
-import { ChatModel } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { ChatModel } from "./chatModel.js";
 export declare const IChatEditingService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatEditingService>;
 export interface IChatEditingService {
     _serviceBrand: undefined;

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, IChatQuotas, ChatSentiment } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatEntitlementService";
+import { ChatEntitlement, IQuotas, ChatSentiment } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-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;
@@ -8,7 +8,7 @@ export interface IChatEntitlementService {
     readonly entitlement: ChatEntitlement;
     readonly onDidChangeQuotaExceeded: Event<void>;
     readonly onDidChangeQuotaRemaining: Event<void>;
-    readonly quotas: IChatQuotas;
+    readonly quotas: IQuotas;
     update(token: CancellationToken): Promise<void>;
     readonly onDidChangeSentiment: Event<void>;
     readonly sentiment: ChatSentiment;