@codingame/monaco-vscode-chat-service-override 36.2.7 → 37.0.0

package/vscode/src/vs/workbench/contrib/imageCarousel/browser/imageCarousel.contribution.js

@@ -28,14 +28,14 @@ import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/conf
 registerCss(imageCarousel);
 ( Registry.as(Extensions.Configuration)).registerConfiguration({
     id: "imageCarousel",
-    title: ( localize(11288, "Images Preview")),
+    title: ( localize(13034, "Images Preview")),
     type: "object",
     properties: {
         "imageCarousel.explorerContextMenu.enabled": {
             type: "boolean",
             default: true,
             markdownDescription: ( localize(
-                11289,
+                13035,
                 "Controls whether the **Open in Images Preview** option appears in the Explorer context menu."
             )),
             tags: ["experimental"]
@@ -44,14 +44,14 @@ registerCss(imageCarousel);
             type: "boolean",
             default: true,
             description: ( localize(
-                11290,
+                13036,
                 "Controls whether clicking an image attachment in chat opens the Images Preview viewer."
             ))
         }
     }
 });
 ( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(
-    EditorPaneDescriptor.create(ImageCarouselEditor, ImageCarouselEditor.ID, ( localize(11291, "Images Preview"))),
+    EditorPaneDescriptor.create(ImageCarouselEditor, ImageCarouselEditor.ID, ( localize(13037, "Images Preview"))),
     [( new SyncDescriptor(ImageCarouselEditorInput))]
 );
 class ImageCarouselEditorInputSerializer {
@@ -76,7 +76,7 @@ class OpenImageInCarouselAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.openImageInCarousel",
-            title: ( localize2(11292, "Open in Images Preview")),
+            title: ( localize2(13038, "Open in Images Preview")),
             f1: false
         });
     }
@@ -90,7 +90,7 @@ class OpenImageInCarouselAction extends Action2 {
         } else if (isSingleImageArgs(args)) {
             collection = {
                 id: generateUuid(),
-                title: args.title ?? ( localize(11293, "Images Preview")),
+                title: args.title ?? ( localize(13039, "Images Preview")),
                 sections: [{
                     title: "",
                     images: [{
@@ -141,7 +141,7 @@ class OpenImagesInCarouselFromExplorerAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.openImagesInCarousel",
-            title: ( localize2(11294, "Open in Images Preview")),
+            title: ( localize2(13040, "Open in Images Preview")),
             f1: false,
             menu: [{
                 id: MenuId.ExplorerContext,
@@ -204,11 +204,11 @@ class OpenImagesInCarouselFromExplorerAction extends Action2 {
                 }
             }
         } catch {
-            notificationService.error(( localize(11295, "Could not read folder contents.")));
+            notificationService.error(( localize(13041, "Could not read folder contents.")));
             return;
         }
         if (imageUris.length === 0) {
-            notificationService.info(( localize(11296, "No images found in this folder.")));
+            notificationService.info(( localize(13042, "No images found in this folder.")));
             return;
         }
         const images = createImageEntries(imageUris);
@@ -221,7 +221,7 @@ class OpenImagesInCarouselFromExplorerAction extends Action2 {
         }
         const collection = {
             id: generateUuid(),
-            title: ( localize(11297, "Images Preview")),
+            title: ( localize(13043, "Images Preview")),
             sections: [{
                 title: "",
                 images

package/vscode/src/vs/workbench/contrib/imageCarousel/browser/imageCarouselEditor.js

@@ -123,7 +123,7 @@ let ImageCarouselEditor = class ImageCarouselEditor extends EditorPane {
         clearNode(this._container);
         if (this._flatImages.length === 0) {
             const empty = h("div.empty-message");
-            empty.root.textContent = ( localize(11298, "No images to display"));
+            empty.root.textContent = ( localize(13044, "No images to display"));
             this._container.appendChild(empty.root);
             return;
         }
@@ -131,11 +131,11 @@ let ImageCarouselEditor = class ImageCarouselEditor extends EditorPane {
             "div.main-image-container@mainImageContainer",
             [h("img.main-image@mainImage"), h("div.video-container@videoContainer")]
         ), h("button.nav-arrow.prev-arrow@prevBtn", {
-            ariaLabel: ( localize(11299, "Previous image"))
+            ariaLabel: ( localize(13045, "Previous image"))
         }, [h("span.codicon.codicon-chevron-left", {
             ariaHidden: "true"
         })]), h("button.nav-arrow.next-arrow@nextBtn", {
-            ariaLabel: ( localize(11300, "Next image"))
+            ariaLabel: ( localize(13046, "Next image"))
         }, [h("span.codicon.codicon-chevron-right", {
             ariaHidden: "true"
         })])]), h("div.bottom-bar@bottomBar", [h("div.image-info-bar", [
@@ -144,12 +144,12 @@ let ImageCarouselEditor = class ImageCarouselEditor extends EditorPane {
             h("span.image-counter@counter")
         ]), h("div.sections-container@sectionsContainer"), h("span.sr-only@ariaStatus")])]);
         elements.root.setAttribute("role", "group");
-        elements.root.setAttribute("aria-label", ( localize(11301, "Images Preview")));
+        elements.root.setAttribute("aria-label", ( localize(13047, "Images Preview")));
         elements.captionSeparator.setAttribute("aria-hidden", "true");
         elements.ariaStatus.setAttribute("aria-live", "polite");
         elements.ariaStatus.setAttribute("aria-atomic", "true");
         elements.sectionsContainer.setAttribute("role", "group");
-        elements.sectionsContainer.setAttribute("aria-label", ( localize(11302, "Image thumbnails")));
+        elements.sectionsContainer.setAttribute("aria-label", ( localize(13048, "Image thumbnails")));
         this._elements = {
             root: elements.root,
             imageArea: elements.imageArea,
@@ -259,7 +259,7 @@ let ImageCarouselEditor = class ImageCarouselEditor extends EditorPane {
                 const isItemVideo = isVideoMimeType(image.mimeType);
                 const btn = createElement("button");
                 btn.className = isItemVideo ? "thumbnail video-thumbnail" : "thumbnail";
-                btn.ariaLabel = isItemVideo ? ( localize(11303, "Video {0} of {1}", currentFlatIndex + 1, this._flatImages.length)) : ( localize(11304, "Image {0} of {1}", currentFlatIndex + 1, this._flatImages.length));
+                btn.ariaLabel = isItemVideo ? ( localize(13049, "Video {0} of {1}", currentFlatIndex + 1, this._flatImages.length)) : ( localize(13050, "Image {0} of {1}", currentFlatIndex + 1, this._flatImages.length));
                 if (isItemVideo) {
                     const icon = h("span.codicon.codicon-play.thumbnail-play-icon");
                     icon.root.setAttribute("aria-hidden", "true");
@@ -410,17 +410,17 @@ window.addEventListener("message",function(e){var m=e.data;if(m.type==="loadVide
             this._elements.captionText.style.display = "none";
             this._elements.captionSeparator.style.display = "none";
         }
-        this._elements.counter.textContent = ( localize(11305, "{0} / {1}", navigationIndex + 1, this._flatImages.length));
-        const itemKind = isVideo ? ( localize(11306, "Video")) : ( localize(11307, "Image"));
+        this._elements.counter.textContent = ( localize(13051, "{0} / {1}", navigationIndex + 1, this._flatImages.length));
+        const itemKind = isVideo ? ( localize(13052, "Video")) : ( localize(13053, "Image"));
         this._elements.ariaStatus.textContent = currentImage.caption ? ( localize(
-            11308,
+            13054,
             "{0} {1} of {2}: {3}",
             itemKind,
             navigationIndex + 1,
             this._flatImages.length,
             currentImage.caption
         )) : ( localize(
-            11309,
+            13055,
             "{0} {1} of {2}: {3}",
             itemKind,
             navigationIndex + 1,

package/vscode/src/vs/workbench/contrib/imageCarousel/browser/imageCarouselEditorInput.js

@@ -7,7 +7,7 @@ import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/netw
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { registerIcon } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/iconRegistry';
 
-const imageCarouselEditorIcon = registerIcon("image-carousel-editor-label-icon", Codicon.fileMedia, ( localize(11310, "Icon of the image carousel editor label.")));
+const imageCarouselEditorIcon = registerIcon("image-carousel-editor-label-icon", Codicon.fileMedia, ( localize(13056, "Icon of the image carousel editor label.")));
 class ImageCarouselEditorInput extends EditorInput {
     static {
         this.ID = "workbench.input.imageCarousel";

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChat.contribution.js

@@ -8,6 +8,7 @@ import { InlineChatNotebookContribution } from './inlineChatNotebook.js';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { InlineChatEnabler, InlineChatEscapeToolContribution } from './inlineChatSessionServiceImpl.js';
+import './inlineChatSessionResolver.js';
 import { AccessibleViewRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleViewRegistry';
 import { InlineChatAccessibilityHelp } from './inlineChatAccessibilityHelp.js';
 import { InlineChatDefaultModel } from './inlineChatDefaultModel.js';

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.js

@@ -27,15 +27,15 @@ import { ChatEntitlementContextKeys } from '@codingame/monaco-vscode-api/vscode/
 import { NOTEBOOK_IS_ACTIVE_EDITOR } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookContextKeys';
 
 CommandsRegistry.registerCommandAlias("interactiveEditor.start", "inlineChat.start");
-const START_INLINE_CHAT = registerIcon("start-inline-chat", Codicon.sparkle, ( localize(11315, "Icon which spawns the inline chat from the editor toolbar.")));
+const START_INLINE_CHAT = registerIcon("start-inline-chat", Codicon.sparkle, ( localize(13061, "Icon which spawns the inline chat from the editor toolbar.")));
 const inlineChatNotebooksOldEnabled = ( ContextKeyExpr.or(( ContextKeyExpr.and(NOTEBOOK_IS_ACTIVE_EDITOR, CTX_INLINE_CHAT_HAS_NOTEBOOK_INLINE))));
 const inlineChatContextKey = ( ContextKeyExpr.and(( ContextKeyExpr.or(inlineChatNotebooksOldEnabled, CTX_INLINE_CHAT_V2_ENABLED)), CTX_INLINE_CHAT_POSSIBLE, EditorContextKeys.writable, ( EditorContextKeys.editorSimpleInput.negate())));
 class StartSessionAction extends Action2 {
     constructor() {
         super({
             id: ACTION_START,
-            title: ( localize2(11316, "Open Inline Chat")),
-            shortTitle: ( localize2(11317, "Inline Chat")),
+            title: ( localize2(13062, "Open Inline Chat")),
+            shortTitle: ( localize2(13063, "Inline Chat")),
             category: AbstractInlineChatAction.category,
             f1: true,
             precondition: ( ContextKeyExpr.and(inlineChatContextKey, ( ContextKeyExpr.or(( CTX_INLINE_CHAT_FILE_BELONGS_TO_CHAT.negate()), ( CTX_ASK_IN_CHAT_ENABLED.negate()))))),
@@ -104,8 +104,8 @@ MenuRegistry.appendMenuItem(MenuId.InlineChatEditorAffordance, {
     )),
     command: {
         id: ACTION_START,
-        title: ( localize(11318, "Ask for Edits")),
-        shortTitle: ( localize(11319, "Ask for Edits")),
+        title: ( localize(13064, "Ask for Edits")),
+        shortTitle: ( localize(13065, "Ask for Edits")),
         icon: Codicon.sparkle
     }
 });
@@ -113,7 +113,7 @@ class FocusInlineChat extends EditorAction2 {
     constructor() {
         super({
             id: "inlineChat.focus",
-            title: ( localize2(11320, "Focus Input")),
+            title: ( localize2(13066, "Focus Input")),
             f1: true,
             category: AbstractInlineChatAction.category,
             precondition: ( ContextKeyExpr.and(EditorContextKeys.editorTextFocus, CTX_INLINE_CHAT_VISIBLE, ( CTX_INLINE_CHAT_FOCUSED.negate()), ( CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()))),
@@ -134,7 +134,7 @@ class FocusInlineChat extends EditorAction2 {
 }
 class AbstractInlineChatAction extends EditorAction2 {
     static {
-        this.category = ( localize2(11321, "Inline Chat"));
+        this.category = ( localize2(13067, "Inline Chat"));
     }
     constructor(desc) {
         const massageMenu = menu => {
@@ -200,7 +200,7 @@ class FixDiagnosticsAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: "inlineChat.fixDiagnostics",
-            title: ( localize2(11322, "Fix")),
+            title: ( localize2(13068, "Fix")),
             icon: Codicon.editSparkle,
             precondition: ( ContextKeyExpr.and(
                 CTX_FIX_DIAGNOSTICS_ENABLED,
@@ -261,7 +261,7 @@ class KeepSessionAction2 extends KeepOrUndoSessionAction {
     constructor() {
         super(true, {
             id: "inlineChat2.keep",
-            title: ( localize2(11323, "Keep")),
+            title: ( localize2(13069, "Keep")),
             f1: true,
             icon: Codicon.check,
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, ( ctxHasRequestInProgress.negate()), ctxHasEditorModification)),
@@ -286,7 +286,7 @@ class UndoAndCloseSessionAction2 extends KeepOrUndoSessionAction {
     constructor() {
         super(false, {
             id: "inlineChat2.close",
-            title: ( localize2(11324, "Close")),
+            title: ( localize2(13070, "Close")),
             f1: true,
             icon: Codicon.close,
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE)),
@@ -307,7 +307,7 @@ class CancelSessionAction extends KeepOrUndoSessionAction {
     constructor() {
         super(false, {
             id: "inlineChat2.cancel",
-            title: ( localize2(11325, "Cancel")),
+            title: ( localize2(13071, "Cancel")),
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, ctxHasRequestInProgress)),
             keybinding: [{
                 when: ( ContextKeyExpr.or(EditorContextKeys.focus, ChatContextKeys.inputHasFocus)),
@@ -322,7 +322,7 @@ class ContinueInlineChatInChatViewAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: "inlineChat2.continueInChat",
-            title: ( localize2(11326, "Ask in Chat")),
+            title: ( localize2(13072, "Ask in Chat")),
             icon: Codicon.chatSparkle,
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_TERMINATED)),
             menu: [{
@@ -341,7 +341,7 @@ class RephraseInlineChatSessionAction extends AbstractInlineChatAction {
     constructor() {
         super({
             id: "inlineChat2.rephrase",
-            title: ( localize2(11327, "Rephrase")),
+            title: ( localize2(13073, "Rephrase")),
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_TERMINATED)),
             menu: [{
                 id: MenuId.ChatEditorInlineExecute,
@@ -359,7 +359,7 @@ class AskInChatAction extends EditorAction2 {
     constructor() {
         super({
             id: ACTION_ASK_IN_CHAT,
-            title: ( localize2(11328, "Ask in Chat")),
+            title: ( localize2(13074, "Ask in Chat")),
             category: AbstractInlineChatAction.category,
             f1: true,
             precondition: ( ContextKeyExpr.and(
@@ -418,7 +418,7 @@ class DismissEditorAffordanceAction extends EditorAction2 {
     constructor() {
         super({
             id: "inlineChat.dismissEditorAffordance",
-            title: ( localize2(11329, "Dismiss Editor Affordance")),
+            title: ( localize2(13075, "Dismiss Editor Affordance")),
             precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_AFFORDANCE_VISIBLE, ( ContextKeyExpr.equals("config.inlineChat.affordance", "editor")))),
             keybinding: {
                 when: EditorContextKeys.editorTextFocus,

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatDefaultModel.js

@@ -35,14 +35,14 @@ InlineChatDefaultModel = ( __decorate([( __param(0, ILanguageModelsService)), (
 ( Registry.as(Extensions.Configuration)).registerConfiguration({
     ...{
         id: "inlineChat",
-        title: ( localize(11335, "Inline Chat")),
+        title: ( localize(13081, "Inline Chat")),
         order: 30,
         type: "object"
     },
     properties: {
         [InlineChatConfigKeys.DefaultModel]: {
             description: ( localize(
-                11336,
+                13082,
                 "Select the default language model to use for inline chat from the available providers. Model names may include the provider in parentheses, for example 'Claude Haiku 4.5 (copilot)'."
             )),
             type: "string",

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatEditReviewSession.d.ts

@@ -0,0 +1,59 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IObservable, IReader } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
+import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { IFilesConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service";
+import { ITextFileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service";
+import { IChatEditReviewSession, IModifiedFileEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService";
+import { IChatResponseModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
+/**
+ * Provides inline-chat review UI for changes an agent host writes directly to disk.
+ */
+export declare class InlineChatEditReviewSession extends Disposable implements IChatEditReviewSession {
+    readonly chatSessionResource: URI;
+    private readonly _targetUri;
+    private readonly _instantiationService;
+    private readonly _textModelService;
+    private readonly _textFileService;
+    private readonly _filesConfigurationService;
+    private readonly _logService;
+    private readonly _fileService;
+    readonly isGlobalEditingSession = false;
+    private readonly _entriesObs;
+    readonly entries: IObservable<readonly IModifiedFileEntry[]>;
+    private readonly _entries;
+    private readonly _initialContents;
+    private readonly _readonlyLocks;
+    private readonly _externalEditListener;
+    private readonly _externalEditEntriesInFlight;
+    private readonly _onDidDispose;
+    readonly onDidDispose: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
+    private _requestId;
+    constructor(chatSessionResource: URI, _targetUri: URI, _instantiationService: IInstantiationService, _textModelService: ITextModelService, _textFileService: ITextFileService, _filesConfigurationService: IFilesConfigurationService, _logService: ILogService, _fileService: IFileService);
+    /**
+     * Saves the target document, creates its review entry, and locks it read-only for the turn.
+     */
+    beginTurn(response: IChatResponseModel): Promise<void>;
+    /**
+     * Reverts models from disk, finalizes external edits, and unlocks the target.
+     */
+    endTurn(response: IChatResponseModel): Promise<void>;
+    getEntry(uri: URI): IModifiedFileEntry | undefined;
+    readEntry(uri: URI, reader: IReader): IModifiedFileEntry | undefined;
+    accept(...uris: URI[]): Promise<void>;
+    reject(...uris: URI[]): Promise<void>;
+    dispose(): void;
+    private _getEntries;
+    private _processExternalEdits;
+    private _getOrCreateExternalEditEntry;
+    private _createExternalEditEntry;
+    private _readCurrentContent;
+    private _readBeforeContent;
+    private _getOrCreateEntry;
+    private _getTelemetryInfo;
+    private _getReadonlyMessage;
+    private _resetReadonlyLocks;
+}