@codingame/monaco-vscode-katex-common 34.1.2 → 35.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/attachments/implicitContextAttachment.js

@@ -97,12 +97,12 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
         contextNode.tabIndex = 0;
         contextNode.classList.toggle("disabled", !context.enabled);
         const file = context.uri;
-        const attachmentTypeName = file?.scheme === Schemas.vscodeNotebookCell ? ( localize(5865, "cell")) : ( localize(5866, "file"));
-        const contextLabel = context.name ?? (file ? basename(file) : ( localize(5867, "context")));
+        const attachmentTypeName = file?.scheme === Schemas.vscodeNotebookCell ? ( localize(6231, "cell")) : ( localize(6232, "file"));
+        const contextLabel = context.name ?? (file ? basename(file) : ( localize(6233, "context")));
         const isSuggestedEnabled = this.configService.getValue("chat.implicitContext.suggestedContext");
         if (isSuggestedEnabled) {
             if (!isSelection) {
-                const buttonMsg = context.enabled ? ( localize(5868, "Disable {0} context {1}", attachmentTypeName, contextLabel)) : ( localize(5869, "Add {0} to context", contextLabel));
+                const buttonMsg = context.enabled ? ( localize(6234, "Disable {0} context {1}", attachmentTypeName, contextLabel)) : ( localize(6235, "Add {0} to context", contextLabel));
                 const toggleButton = this.renderDisposables.add(( new Button(contextNode, {
                     supportIcons: true,
                     title: buttonMsg
@@ -117,7 +117,7 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
                     context.enabled = false;
                 }));
             } else {
-                const pinButtonMsg = ( localize(5870, "Pin selection"));
+                const pinButtonMsg = ( localize(6236, "Pin selection"));
                 const pinButton = this.renderDisposables.add(( new Button(contextNode, {
                     supportIcons: true,
                     title: pinButtonMsg
@@ -150,7 +150,7 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
                 })
             );
         } else {
-            const buttonMsg = context.enabled ? ( localize(5871, "Disable current {0} context", attachmentTypeName)) : ( localize(5872, "Enable current {0} context", attachmentTypeName));
+            const buttonMsg = context.enabled ? ( localize(6237, "Disable current {0} context", attachmentTypeName)) : ( localize(6238, "Enable current {0} context", attachmentTypeName));
             const toggleButton = this.renderDisposables.add(( new Button(contextNode, {
                 supportIcons: true,
                 title: buttonMsg
@@ -174,9 +174,9 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
                 context.icon,
                 context.value.resourceUri,
                 markdownTooltip,
-                ( localize(5873, "Current file context"))
+                ( localize(6239, "Current file context"))
             );
-            contextNode.ariaLabel = ( localize(5874, "Suggested context, {0}", context.name));
+            contextNode.ariaLabel = ( localize(6240, "Suggested context, {0}", context.name));
         } else {
             title = this.renderResource(context.value, context.isSelection, context.enabled, label, contextNode);
         }
@@ -236,23 +236,23 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
         if (file.scheme === Schemas.vscodeBrowser) {
             return this.renderBrowserResource(file, label, contextNode);
         }
-        const attachmentTypeName = file.scheme === Schemas.vscodeNotebookCell ? ( localize(5865, "cell")) : ( localize(5866, "file"));
+        const attachmentTypeName = file.scheme === Schemas.vscodeNotebookCell ? ( localize(6231, "cell")) : ( localize(6232, "file"));
         const fileBasename = basename(file);
         const fileDirname = dirname(file);
         const friendlyName = `${fileBasename} ${fileDirname}`;
         const ariaLabel = range ? ( localize(
-            5875,
+            6241,
             "Suggested context, {0}, {1}, line {2} to line {3}",
             attachmentTypeName,
             friendlyName,
             range.startLineNumber,
             range.endLineNumber
-        )) : ( localize(5876, "Suggested context, {0}, {1}", attachmentTypeName, friendlyName));
+        )) : ( localize(6242, "Suggested context, {0}, {1}", attachmentTypeName, friendlyName));
         const uriLabel = this.labelService.getUriLabel(file, {
             relative: true
         });
-        const currentFile = ( localize(5877, "Current {0} context", attachmentTypeName));
-        const inactive = ( localize(5878, "Enable current {0} context", attachmentTypeName));
+        const currentFile = ( localize(6243, "Current {0} context", attachmentTypeName));
+        const inactive = ( localize(6244, "Enable current {0} context", attachmentTypeName));
         const currentFileHint = enabled || isSelection ? currentFile : inactive;
         const title = `${currentFileHint}\n${uriLabel}`;
         label.setFile(file, {
@@ -274,7 +274,7 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
             label.setLabel(input.getName(), undefined, {
                 iconPath: Codicon.globe
             });
-            contextNode.ariaLabel = ( localize(5879, "Suggested browser context, {0}", input.getName()));
+            contextNode.ariaLabel = ( localize(6245, "Suggested browser context, {0}", input.getName()));
         };
         update();
         this.renderDisposables.add(input.onDidChangeLabel(() => update()));

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

@@ -36,6 +36,7 @@ export declare class ChatEditingShowChangesAction extends EditingSessionAction {
     constructor();
     runEditingSessionAction(accessor: ServicesAccessor, editingSession: IChatEditingSession, chatWidget: IChatWidget, ...args: unknown[]): Promise<void>;
 }
+export declare const RestoreCheckpointActionId = "workbench.action.chat.restoreCheckpoint";
 export interface ChatEditingActionContext {
     readonly sessionResource: URI;
     readonly requestId: string;

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

@@ -82,7 +82,7 @@ registerAction2(class OpenFileInDiffAction extends WorkingSetAction {
     constructor() {
         super({
             id: "chatEditing.openFileInDiff",
-            title: ( localize2(6442, "Open Changes in Diff Editor")),
+            title: ( localize2(6933, "Open Changes in Diff Editor")),
             icon: Codicon.diffSingle,
             menu: [{
                 id: MenuId.ChatEditingWidgetModifiedFilesToolbar,
@@ -95,12 +95,9 @@ registerAction2(class OpenFileInDiffAction extends WorkingSetAction {
     async runWorkingSetAction(accessor, currentEditingSession, _chatWidget, ...uris) {
         const editorService = accessor.get(IEditorService);
         for (const uri of uris) {
-            let pane = editorService.activeEditorPane;
-            if (!pane) {
-                pane = await editorService.openEditor({
-                    resource: uri
-                });
-            }
+            const pane = await editorService.openEditor({
+                resource: uri
+            });
             if (!pane) {
                 return;
             }
@@ -113,7 +110,7 @@ registerAction2(class AcceptAction extends WorkingSetAction {
     constructor() {
         super({
             id: "chatEditing.acceptFile",
-            title: ( localize2(6443, "Keep")),
+            title: ( localize2(6934, "Keep")),
             icon: Codicon.check,
             menu: [{
                 when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("resourceScheme", CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME)), ContextKeyExpr.notIn(
@@ -139,7 +136,7 @@ registerAction2(class DiscardAction extends WorkingSetAction {
     constructor() {
         super({
             id: "chatEditing.discardFile",
-            title: ( localize2(6444, "Undo")),
+            title: ( localize2(6935, "Undo")),
             icon: Codicon.discard,
             menu: [{
                 when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("resourceScheme", CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME)), ContextKeyExpr.notIn(
@@ -165,9 +162,9 @@ class ChatEditingAcceptAllAction extends EditingSessionAction {
     constructor() {
         super({
             id: "chatEditing.acceptAllFiles",
-            title: ( localize(6445, "Keep")),
+            title: ( localize(6936, "Keep")),
             icon: Codicon.check,
-            tooltip: ( localize(6446, "Keep All Edits")),
+            tooltip: ( localize(6937, "Keep All Edits")),
             precondition: hasUndecidedChatEditingResourceContextKey,
             keybinding: {
                 primary: KeyMod.CtrlCmd | KeyCode.Enter,
@@ -191,9 +188,9 @@ class ChatEditingDiscardAllAction extends EditingSessionAction {
     constructor() {
         super({
             id: "chatEditing.discardAllFiles",
-            title: ( localize(6447, "Undo")),
+            title: ( localize(6938, "Undo")),
             icon: Codicon.discard,
-            tooltip: ( localize(6448, "Undo All Edits")),
+            tooltip: ( localize(6939, "Undo All Edits")),
             precondition: hasUndecidedChatEditingResourceContextKey,
             menu: [{
                 id: MenuId.ChatEditingWidgetToolbar,
@@ -224,8 +221,8 @@ class ToggleExplanationWidgetAction extends EditingSessionAction {
     constructor() {
         super({
             id: ToggleExplanationWidgetAction.ID,
-            title: ( localize(6449, "Explain")),
-            tooltip: ( localize(6450, "Toggle Change Explanations")),
+            title: ( localize(6940, "Explain")),
+            tooltip: ( localize(6941, "Toggle Change Explanations")),
             precondition: hasUndecidedChatEditingResourceContextKey,
             menu: [{
                 id: MenuId.ChatEditingWidgetToolbar,
@@ -249,17 +246,17 @@ async function discardAllEditsWithConfirmation(accessor, currentEditingSession)
     const entries = currentEditingSession.entries.get().filter(e => e.state.get() === ModifiedFileEntryState.Modified);
     if (entries.length > 0) {
         const confirmation = await dialogService.confirm({
-            title: ( localize(6451, "Undo all edits?")),
+            title: ( localize(6942, "Undo all edits?")),
             message: entries.length === 1 ? ( localize(
-                6452,
+                6943,
                 "This will undo changes made in {0}. Do you want to proceed?",
                 basename(entries[0].modifiedURI)
             )) : ( localize(
-                6453,
+                6944,
                 "This will undo changes made in {0} files. Do you want to proceed?",
                 entries.length
             )),
-            primaryButton: ( localize(6454, "Yes")),
+            primaryButton: ( localize(6945, "Yes")),
             type: "info"
         });
         if (!confirmation.confirmed) {
@@ -274,7 +271,7 @@ class ChatEditingShowChangesAction extends EditingSessionAction {
         this.ID = "chatEditing.viewChanges";
     }
     static {
-        this.LABEL = ( localize(6455, "View All Edits"));
+        this.LABEL = ( localize(6946, "View All Edits"));
     }
     constructor() {
         super({
@@ -336,13 +333,13 @@ async function restoreSnapshotWithConfirmationByRequestId(accessor, sessionResou
     if (editsToUndo === 1) {
         if (entriesModifiedInRequestsToRemove.length === 1) {
             message = ( localize(
-                6456,
+                6947,
                 "This will remove your last request and undo the edits made to {0}. Do you want to proceed?",
                 basename(entriesModifiedInRequestsToRemove[0].modifiedURI)
             ));
         } else {
             message = ( localize(
-                6457,
+                6948,
                 "This will remove your last request and undo edits made to {0} files in your working set. Do you want to proceed?",
                 entriesModifiedInRequestsToRemove.length
             ));
@@ -350,24 +347,24 @@ async function restoreSnapshotWithConfirmationByRequestId(accessor, sessionResou
     } else {
         if (entriesModifiedInRequestsToRemove.length === 1) {
             message = ( localize(
-                6458,
+                6949,
                 "This will remove all subsequent requests and undo edits made to {0}. Do you want to proceed?",
                 basename(entriesModifiedInRequestsToRemove[0].modifiedURI)
             ));
         } else {
             message = ( localize(
-                6459,
+                6950,
                 "This will remove all subsequent requests and undo edits made to {0} files in your working set. Do you want to proceed?",
                 entriesModifiedInRequestsToRemove.length
             ));
         }
     }
     const confirmation = shouldPrompt ? await dialogService.confirm({
-        title: editsToUndo === 1 ? ( localize(6460, "Do you want to undo your last edit?")) : ( localize(6461, "Do you want to undo {0} edits?", editsToUndo)),
+        title: editsToUndo === 1 ? ( localize(6951, "Do you want to undo your last edit?")) : ( localize(6952, "Do you want to undo {0} edits?", editsToUndo)),
         message: message,
-        primaryButton: ( localize(6462, "Yes")),
+        primaryButton: ( localize(6953, "Yes")),
         checkbox: {
-            label: ( localize(6463, "Don't ask again")),
+            label: ( localize(6954, "Don't ask again")),
             checked: false
         },
         type: "info"
@@ -397,7 +394,7 @@ registerAction2(class RemoveAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.undoEdits",
-            title: ( localize2(6464, "Undo Requests")),
+            title: ( localize2(6955, "Undo Requests")),
             f1: false,
             category: CHAT_CATEGORY,
             icon: Codicon.discard,
@@ -406,14 +403,14 @@ registerAction2(class RemoveAction extends Action2 {
                 mac: {
                     primary: KeyMod.CtrlCmd | KeyCode.Backspace
                 },
-                when: ( ContextKeyExpr.and(ChatContextKeys.inChatSession, ( EditorContextKeys.textInputFocus.negate()), ( ChatContextKeys.inChatQuestionCarousel.negate()))),
+                when: ( ContextKeyExpr.and(ChatContextKeys.inChatSession, ( EditorContextKeys.textInputFocus.negate()), ( ChatContextKeys.inChatQuestionCarousel.negate()), ( ChatContextKeys.readOnly.negate()))),
                 weight: KeybindingWeight.WorkbenchContrib
             },
             menu: [{
                 id: MenuId.ChatMessageTitle,
                 group: "navigation",
                 order: 2,
-                when: ( ContextKeyExpr.and(( ( ContextKeyExpr.equals(`config.${ChatConfiguration.EditRequests}`, "input")).negate()), ( ContextKeyExpr.equals(`config.${ChatConfiguration.CheckpointsEnabled}`, false)), ( ContextKeyExpr.or(( ChatContextKeys.lockedToCodingAgent.negate()), ChatContextKeyExprs.isAgentHostSession))))
+                when: ( ContextKeyExpr.and(( ( ContextKeyExpr.equals(`config.${ChatConfiguration.EditRequests}`, "input")).negate()), ( ContextKeyExpr.equals(`config.${ChatConfiguration.CheckpointsEnabled}`, false)), ( ContextKeyExpr.or(( ChatContextKeys.lockedToCodingAgent.negate()), ChatContextKeyExprs.isAgentHostSession)), ( ChatContextKeys.readOnly.negate())))
             }]
         });
     }
@@ -439,12 +436,13 @@ registerAction2(class RemoveAction extends Action2 {
         }
     }
 });
+const RestoreCheckpointActionId = "workbench.action.chat.restoreCheckpoint";
 registerAction2(class RestoreCheckpointAction extends Action2 {
     constructor() {
         super({
-            id: "workbench.action.chat.restoreCheckpoint",
-            title: ( localize2(6465, "Restore Checkpoint")),
-            tooltip: ( localize2(6466, "Restores workspace and chat to this point")),
+            id: RestoreCheckpointActionId,
+            title: ( localize2(6956, "Restore Checkpoint")),
+            tooltip: ( localize2(6957, "Restores workspace and chat to this point")),
             f1: false,
             category: CHAT_CATEGORY,
             keybinding: {
@@ -452,14 +450,14 @@ registerAction2(class RestoreCheckpointAction extends Action2 {
                 mac: {
                     primary: KeyMod.CtrlCmd | KeyCode.Backspace
                 },
-                when: ( ContextKeyExpr.and(ChatContextKeys.inChatSession, ( EditorContextKeys.textInputFocus.negate()), ( ChatContextKeys.inChatQuestionCarousel.negate()))),
+                when: ( ContextKeyExpr.and(ChatContextKeys.inChatSession, ( EditorContextKeys.textInputFocus.negate()), ( ChatContextKeys.inChatQuestionCarousel.negate()), ( ChatContextKeys.readOnly.negate()))),
                 weight: KeybindingWeight.WorkbenchContrib
             },
             menu: [{
                 id: MenuId.ChatMessageCheckpoint,
                 group: "navigation",
                 order: 2,
-                when: ( ContextKeyExpr.and(ChatContextKeys.isRequest, ( ContextKeyExpr.or(( ChatContextKeys.lockedToCodingAgent.negate()), ChatContextKeyExprs.isAgentHostSession)), ( ChatContextKeys.isFirstRequest.negate())))
+                when: ( ContextKeyExpr.and(ChatContextKeys.isRequest, ( ContextKeyExpr.or(( ChatContextKeys.lockedToCodingAgent.negate()), ChatContextKeyExprs.isAgentHostSession)), ( ChatContextKeys.isFirstRequest.negate()), ( ChatContextKeys.readOnly.negate())))
             }]
         });
     }
@@ -489,15 +487,15 @@ registerAction2(class StartOverAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.startOver",
-            title: ( localize2(6467, "Start Over")),
-            tooltip: ( localize2(6468, "Clears the chat and undoes all changes")),
+            title: ( localize2(6958, "Start Over")),
+            tooltip: ( localize2(6959, "Clears the chat and undoes all changes")),
             f1: false,
             category: CHAT_CATEGORY,
             menu: [{
                 id: MenuId.ChatMessageCheckpoint,
                 group: "navigation",
                 order: 2,
-                when: ( ContextKeyExpr.and(ChatContextKeys.isRequest, ( ContextKeyExpr.or(( ChatContextKeys.lockedToCodingAgent.negate()), ChatContextKeyExprs.isAgentHostSession)), ChatContextKeys.isFirstRequest))
+                when: ( ContextKeyExpr.and(ChatContextKeys.isRequest, ( ContextKeyExpr.or(( ChatContextKeys.lockedToCodingAgent.negate()), ChatContextKeyExprs.isAgentHostSession)), ChatContextKeys.isFirstRequest, ( ChatContextKeys.readOnly.negate())))
             }]
         });
     }
@@ -519,11 +517,11 @@ registerAction2(class RestoreLastCheckpoint extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.restoreLastCheckpoint",
-            title: ( localize2(6469, "Restore to Last Checkpoint")),
+            title: ( localize2(6960, "Restore to Last Checkpoint")),
             f1: true,
             category: CHAT_CATEGORY,
             icon: Codicon.discard,
-            precondition: ( ContextKeyExpr.and(ChatContextKeys.inChatSession, ( ContextKeyExpr.equals(`config.${ChatConfiguration.CheckpointsEnabled}`, true)), ( ContextKeyExpr.or(( ChatContextKeys.lockedToCodingAgent.negate()), ChatContextKeyExprs.isAgentHostSession))))
+            precondition: ( ContextKeyExpr.and(ChatContextKeys.inChatSession, ( ContextKeyExpr.equals(`config.${ChatConfiguration.CheckpointsEnabled}`, true)), ( ContextKeyExpr.or(( ChatContextKeys.lockedToCodingAgent.negate()), ChatContextKeyExprs.isAgentHostSession)), ( ChatContextKeys.readOnly.negate())))
         });
     }
     async run(accessor, ...args) {
@@ -544,7 +542,7 @@ registerAction2(class RestoreLastCheckpoint extends Action2 {
         }
         const checkpointRequest = chatModel.checkpoint;
         if (!checkpointRequest) {
-            alert(( localize(6470, "There is no checkpoint to restore.")));
+            alert(( localize(6961, "There is no checkpoint to restore.")));
             return;
         }
         widget?.viewModel?.model.setCheckpoint(checkpointRequest.id);
@@ -557,7 +555,7 @@ registerAction2(class EditAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.editRequests",
-            title: ( localize2(6471, "Edit Request")),
+            title: ( localize2(6962, "Edit Request")),
             f1: false,
             category: CHAT_CATEGORY,
             icon: Codicon.edit,
@@ -596,7 +594,7 @@ registerAction2(class OpenWorkingSetHistoryAction extends Action2 {
     constructor() {
         super({
             id: OpenWorkingSetHistoryAction.id,
-            title: ( localize(6472, "Open File")),
+            title: ( localize(6963, "Open File")),
             menu: [{
                 id: MenuId.ChatEditingCodeBlockContext,
                 group: "navigation",
@@ -622,7 +620,7 @@ registerAction2(class OpenWorkingSetHistoryAction extends Action2 {
     constructor() {
         super({
             id: OpenWorkingSetHistoryAction.id,
-            title: ( localize(6473, "Open File Snapshot")),
+            title: ( localize(6964, "Open File Snapshot")),
             menu: [{
                 id: MenuId.ChatEditingCodeBlockContext,
                 group: "navigation",
@@ -646,7 +644,7 @@ registerAction2(class OpenWorkingSetHistoryAction extends Action2 {
         if (snapshot) {
             const editor = await editorService.openEditor({
                 resource: snapshot,
-                label: ( localize(6474, "{0} (Snapshot)", basename(context.uri))),
+                label: ( localize(6965, "{0} (Snapshot)", basename(context.uri))),
                 options: {
                     activation: EditorActivation.ACTIVATE
                 }
@@ -663,7 +661,7 @@ registerAction2(class ResolveSymbolsContextAction extends EditingSessionAction {
     constructor() {
         super({
             id: "workbench.action.edits.addFilesFromReferences",
-            title: ( localize2(6475, "Add Files From References")),
+            title: ( localize2(6966, "Add Files From References")),
             f1: false,
             category: CHAT_CATEGORY,
             menu: {
@@ -731,7 +729,7 @@ class ViewPreviousEditsAction extends EditingSessionAction {
         this.Id = "chatEditing.viewPreviousEdits";
     }
     static {
-        this.Label = ( localize(6476, "View Previous Edits"));
+        this.Label = ( localize(6967, "View Previous Edits"));
     }
     constructor() {
         super({
@@ -768,4 +766,4 @@ CommandsRegistry.registerCommand("_chat.editSessions.accept", async (accessor, r
     }
 });
 
-export { ChatEditingAcceptAllAction, ChatEditingDiscardAllAction, ChatEditingShowChangesAction, EditingSessionAction, ToggleExplanationWidgetAction, ViewPreviousEditsAction, discardAllEditsWithConfirmation, getEditingSessionContext };
+export { ChatEditingAcceptAllAction, ChatEditingDiscardAllAction, ChatEditingShowChangesAction, EditingSessionAction, RestoreCheckpointActionId, ToggleExplanationWidgetAction, ViewPreviousEditsAction, discardAllEditsWithConfirmation, getEditingSessionContext };

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

@@ -0,0 +1,28 @@
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
+import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
+import { ITextModelContentProvider } from "@codingame/monaco-vscode-model-service-override/vscode/vs/editor/common/services/resolverService";
+import { IChatEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService.service";
+export declare class ChatEditingTextModelContentProvider implements ITextModelContentProvider {
+    private readonly _chatEditingService;
+    private readonly _modelService;
+    static readonly scheme = "chat-editing-text-model";
+    static getFileURI(chatSessionResource: URI, documentId: string, path: string): URI;
+    constructor(_chatEditingService: IChatEditingService, _modelService: IModelService);
+    provideTextContent(resource: URI): Promise<ITextModel | null>;
+}
+export declare class ChatEditingSnapshotTextModelContentProvider implements ITextModelContentProvider {
+    private readonly _chatEditingService;
+    private readonly _modelService;
+    static getSnapshotFileURI(chatSessionResource: URI, requestId: string | undefined, undoStop: string | undefined, path: string, scheme: string, authority: string): URI;
+    /**
+     * Recovers the URI of the real file that a snapshot URI (as produced by
+     * {@link getSnapshotFileURI}) was taken from, so callers can open the file
+     * itself instead of a read-only snapshot. Returns the resource unchanged if
+     * it is not a snapshot URI, or `undefined` if the origin cannot be recovered
+     * (e.g. snapshot URIs persisted before the origin was recorded).
+     */
+    static getOriginalFileURI(resource: URI): URI | undefined;
+    constructor(_chatEditingService: IChatEditingService, _modelService: IModelService);
+    provideTextContent(resource: URI): Promise<ITextModel | null>;
+}

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

@@ -0,0 +1,98 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
+
+var ChatEditingTextModelContentProvider_1;
+let ChatEditingTextModelContentProvider = class ChatEditingTextModelContentProvider {
+    static {
+        ChatEditingTextModelContentProvider_1 = this;
+    }
+    static {
+        this.scheme = Schemas.chatEditingModel;
+    }
+    static getFileURI(chatSessionResource, documentId, path) {
+        return ( URI.from({
+            scheme: ChatEditingTextModelContentProvider_1.scheme,
+            path,
+            query: JSON.stringify({
+                kind: "doc",
+                documentId,
+                chatSessionResource
+            })
+        }));
+    }
+    constructor(_chatEditingService, _modelService) {
+        this._chatEditingService = _chatEditingService;
+        this._modelService = _modelService;
+    }
+    async provideTextContent(resource) {
+        const existing = this._modelService.getModel(resource);
+        if (existing && !existing.isDisposed()) {
+            return existing;
+        }
+        const data = JSON.parse(resource.query);
+        const session = this._chatEditingService.getEditingSession(URI.revive(data.chatSessionResource));
+        const entry = session?.entries.get().find(candidate => candidate.entryId === data.documentId);
+        if (!entry) {
+            return null;
+        }
+        return this._modelService.getModel(entry.originalURI);
+    }
+};
+ChatEditingTextModelContentProvider = ChatEditingTextModelContentProvider_1 = ( __decorate([( __param(1, IModelService))], ChatEditingTextModelContentProvider));
+let ChatEditingSnapshotTextModelContentProvider = class ChatEditingSnapshotTextModelContentProvider {
+    static getSnapshotFileURI(chatSessionResource, requestId, undoStop, path, scheme, authority) {
+        return ( URI.from({
+            scheme: Schemas.chatEditingSnapshotScheme,
+            path,
+            query: JSON.stringify({
+                session: chatSessionResource,
+                requestId: requestId ?? "",
+                undoStop: undoStop ?? "",
+                scheme,
+                authority
+            })
+        }));
+    }
+    static getOriginalFileURI(resource) {
+        if (resource.scheme !== Schemas.chatEditingSnapshotScheme) {
+            return resource;
+        }
+        let data;
+        try {
+            data = JSON.parse(resource.query);
+        } catch {
+            return undefined;
+        }
+        if (typeof data.scheme !== "string" || !data.scheme || typeof data.authority !== "string") {
+            return undefined;
+        }
+        return resource.with({
+            scheme: data.scheme,
+            authority: data.authority,
+            query: "",
+            fragment: ""
+        });
+    }
+    constructor(_chatEditingService, _modelService) {
+        this._chatEditingService = _chatEditingService;
+        this._modelService = _modelService;
+    }
+    async provideTextContent(resource) {
+        const existing = this._modelService.getModel(resource);
+        if (existing && !existing.isDisposed()) {
+            return existing;
+        }
+        const data = JSON.parse(resource.query);
+        const session = this._chatEditingService.getEditingSession(URI.revive(data.session));
+        if (!session || !data.requestId) {
+            return null;
+        }
+        return session.getSnapshotModel(data.requestId, data.undoStop || undefined, resource);
+    }
+};
+ChatEditingSnapshotTextModelContentProvider = ( __decorate([( __param(1, IModelService))], ChatEditingSnapshotTextModelContentProvider));
+
+export { ChatEditingSnapshotTextModelContentProvider, ChatEditingTextModelContentProvider };

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

@@ -7,11 +7,11 @@ import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platf
 import { ActionWidgetDropdownActionViewItem } from "../../../../../platform/actions/browser/actionWidgetDropdownActionViewItem.js";
 import { IChatSessionProviderOptionGroup, IChatSessionProviderOptionItem } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService";
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
+import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IChatInputPickerOptions } from "../widget/input/chatInputPickerActionItem.js";
-import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
 import { IChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service";
 export interface IChatSessionPickerDelegate {
     readonly onDidChangeOption: Event<IChatSessionProviderOptionItem>;
@@ -28,14 +28,14 @@ export declare class ChatSessionPickerActionItem extends ActionWidgetDropdownAct
     protected readonly delegate: IChatSessionPickerDelegate;
     protected readonly _pickerOptions: IChatInputPickerOptions | undefined;
     protected readonly commandService: ICommandService;
-    private readonly openerService;
     private readonly chatEntitlementService;
+    private readonly openerService;
     protected currentOption: IChatSessionProviderOptionItem | undefined;
     protected container: HTMLElement | undefined;
     constructor(action: IAction, initialState: {
         group: IChatSessionProviderOptionGroup;
         item: IChatSessionProviderOptionItem | undefined;
-    }, delegate: IChatSessionPickerDelegate, _pickerOptions: IChatInputPickerOptions | undefined, actionWidgetService: IActionWidgetService, contextKeyService: IContextKeyService, keybindingService: IKeybindingService, commandService: ICommandService, telemetryService: ITelemetryService, openerService: IOpenerService, chatEntitlementService: IChatEntitlementService);
+    }, delegate: IChatSessionPickerDelegate, _pickerOptions: IChatInputPickerOptions | undefined, actionWidgetService: IActionWidgetService, contextKeyService: IContextKeyService, keybindingService: IKeybindingService, commandService: ICommandService, telemetryService: ITelemetryService, chatEntitlementService: IChatEntitlementService, openerService: IOpenerService);
     /**
      * Returns the actions to show in the dropdown. Can be overridden by subclasses.
      */

package/vscode/src/vs/workbench/contrib/chat/browser/chatSessions/chatSessionPickerActionItem.js

@@ -8,11 +8,11 @@ import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
 import { ActionWidgetDropdownActionViewItem } from '../../../../../platform/actions/browser/actionWidgetDropdownActionViewItem.js';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
+import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { renderIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/iconLabel/iconLabels';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
-import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
 import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
 import { getModelHoverContent } from '../widget/input/chatModelPicker.js';
 import { ExtensionIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
@@ -30,8 +30,8 @@ let ChatSessionPickerActionItem = class ChatSessionPickerActionItem extends Acti
         keybindingService,
         commandService,
         telemetryService,
-        openerService,
-        chatEntitlementService
+        chatEntitlementService,
+        openerService
     ) {
         const {
             group,
@@ -66,8 +66,8 @@ let ChatSessionPickerActionItem = class ChatSessionPickerActionItem extends Acti
         this.delegate = delegate;
         this._pickerOptions = _pickerOptions;
         this.commandService = commandService;
-        this.openerService = openerService;
         this.chatEntitlementService = chatEntitlementService;
+        this.openerService = openerService;
         this.currentOption = item;
         this._register(this.delegate.onDidChangeOption(newOption => {
             this.currentOption = newOption;
@@ -157,9 +157,11 @@ let ChatSessionPickerActionItem = class ChatSessionPickerActionItem extends Acti
                     inputCost: optionItem.modelMetadata.inputCost,
                     outputCost: optionItem.modelMetadata.outputCost,
                     cacheCost: optionItem.modelMetadata.cacheCost,
+                    cacheWriteCost: optionItem.modelMetadata.cacheWriteCost,
                     longContextInputCost: optionItem.modelMetadata.longContextInputCost,
                     longContextOutputCost: optionItem.modelMetadata.longContextOutputCost,
                     longContextCacheCost: optionItem.modelMetadata.longContextCacheCost,
+                    longContextCacheWriteCost: optionItem.modelMetadata.longContextCacheWriteCost,
                     priceCategory: optionItem.modelMetadata.priceCategory,
                     maxInputTokens: optionItem.modelMetadata.maxInputTokens ?? 0,
                     maxOutputTokens: optionItem.modelMetadata.maxOutputTokens ?? 0,
@@ -170,7 +172,7 @@ let ChatSessionPickerActionItem = class ChatSessionPickerActionItem extends Acti
                     isDefaultForLocation: {}
                 }
             };
-            const hover = getModelHoverContent(syntheticModel, this.openerService, isUBB);
+            const hover = getModelHoverContent(syntheticModel, isUBB, undefined, this.openerService);
             if (hover) {
                 return {
                     content: hover.element,
@@ -216,7 +218,7 @@ let ChatSessionPickerActionItem = class ChatSessionPickerActionItem extends Acti
             domChildren.push($(
                 "span.chat-session-option-label",
                 undefined,
-                this.currentOption?.name ?? group?.description ?? ( localize(6676, "Pick Option"))
+                this.currentOption?.name ?? group?.description ?? ( localize(7179, "Pick Option"))
             ));
         }
         reset(element, ...domChildren);
@@ -246,6 +248,6 @@ let ChatSessionPickerActionItem = class ChatSessionPickerActionItem extends Acti
         }
     }
 };
-ChatSessionPickerActionItem = ( __decorate([( __param(4, IActionWidgetService)), ( __param(5, IContextKeyService)), ( __param(6, IKeybindingService)), ( __param(7, ICommandService)), ( __param(8, ITelemetryService)), ( __param(9, IOpenerService)), ( __param(10, IChatEntitlementService))], ChatSessionPickerActionItem));
+ChatSessionPickerActionItem = ( __decorate([( __param(4, IActionWidgetService)), ( __param(5, IContextKeyService)), ( __param(6, IKeybindingService)), ( __param(7, ICommandService)), ( __param(8, ITelemetryService)), ( __param(9, IChatEntitlementService)), ( __param(10, IOpenerService))], ChatSessionPickerActionItem));
 
 export { ChatSessionPickerActionItem };